author | llornkcor <llornkcor> | 2002-03-09 21:46:21 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-03-09 21:46:21 (UTC) |
commit | 80be7dabb1e1390e4d412c785d9f44e2293b2d5d (patch) (unidiff) | |
tree | 04daeda225b3be914885adaf6c46cf3b83ce123c /noncore | |
parent | 53fd2f87c62cf60e8326110f11838661d0521b63 (diff) | |
download | opie-80be7dabb1e1390e4d412c785d9f44e2293b2d5d.zip opie-80be7dabb1e1390e4d412c785d9f44e2293b2d5d.tar.gz opie-80be7dabb1e1390e4d412c785d9f44e2293b2d5d.tar.bz2 |
fixed weirdness with the inlined xpm's- for some odd and unknown reason
they weren't showing correctly anymore...
-rw-r--r-- | noncore/tools/calculator/calculatorimpl.cpp | 73 |
1 files changed, 67 insertions, 6 deletions
diff --git a/noncore/tools/calculator/calculatorimpl.cpp b/noncore/tools/calculator/calculatorimpl.cpp index 3a6efe4..0925073 100644 --- a/noncore/tools/calculator/calculatorimpl.cpp +++ b/noncore/tools/calculator/calculatorimpl.cpp | |||
@@ -19,12 +19,13 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | /* | 21 | /* |
22 | * 01/14/2002 Charles-Edouard Ruault <ce@ruault.com> | 22 | * 01/14/2002 Charles-Edouard Ruault <ce@ruault.com> |
23 | * Added support for Temperature conversions. | 23 | * Added support for Temperature conversions. |
24 | */ | 24 | */ |
25 | // Sat 03-09-2002 L.J. Potter added the inlined pixmaps here | ||
25 | 26 | ||
26 | #include "calculatorimpl.h" | 27 | #include "calculatorimpl.h" |
27 | 28 | ||
28 | #include <qpe/resource.h> | 29 | #include <qpe/resource.h> |
29 | #include <qpe/qmath.h> | 30 | #include <qpe/qmath.h> |
30 | #include <qpe/qpeapplication.h> | 31 | #include <qpe/qpeapplication.h> |
@@ -36,20 +37,77 @@ | |||
36 | #include <qlayout.h> | 37 | #include <qlayout.h> |
37 | #include <qstringlist.h> | 38 | #include <qstringlist.h> |
38 | #include <qfile.h> | 39 | #include <qfile.h> |
39 | #include <qtextstream.h> | 40 | #include <qtextstream.h> |
40 | #include <qmessagebox.h> | 41 | #include <qmessagebox.h> |
41 | #include <math.h> | 42 | #include <math.h> |
43 | /* XPM */ | ||
44 | static char *oneoverx_xpm[] = { | ||
45 | /* width height num_colors chars_per_pixel */ | ||
46 | " 13 11 2 1", | ||
47 | /* colors */ | ||
48 | ". c None", | ||
49 | "# c #000000", | ||
50 | /* pixels */ | ||
51 | "......#......", | ||
52 | ".....##......", | ||
53 | "......#......" | ||
54 | ".....###.....", | ||
55 | ".............", | ||
56 | "..#########..", | ||
57 | ".............", | ||
58 | "....##.##....", | ||
59 | "......#......", | ||
60 | "......#......", | ||
61 | "....##.##....", | ||
62 | }; | ||
63 | /* XPM */ | ||
64 | static char *ythrootofx_xpm[] = { | ||
65 | /* width height num_colors chars_per_pixel */ | ||
66 | " 13 11 2 1", | ||
67 | /* colors */ | ||
68 | ". c None", | ||
69 | "# c #000000", | ||
70 | /* pixels */ | ||
71 | "#.#..........", | ||
72 | "#.#..........", | ||
73 | "###...#######", | ||
74 | "..#..#.......", | ||
75 | "###..#.......", | ||
76 | ".....#.#...#.", | ||
77 | ".#..#...#.#..", | ||
78 | "#.#.#....#...", | ||
79 | "..#.#...#.#..", | ||
80 | "...#...#...#.", | ||
81 | "...#........." | ||
82 | }; | ||
83 | /* XPM */ | ||
84 | static char *xtopowerofy_xpm[] = { | ||
85 | /* width height num_colors chars_per_pixel */ | ||
86 | " 9 8 2 1", | ||
87 | /* colors */ | ||
88 | ". c None", | ||
89 | "# c #000000", | ||
90 | /* pixels */ | ||
91 | "......#.#", | ||
92 | "......#.#", | ||
93 | "......###", | ||
94 | "#...#...#", | ||
95 | ".#.#..###", | ||
96 | "..#......", | ||
97 | ".#.#.....", | ||
98 | "#...#...." | ||
99 | }; | ||
42 | 100 | ||
43 | CalculatorImpl::CalculatorImpl( QWidget * parent, const char * name, | 101 | CalculatorImpl::CalculatorImpl( QWidget * parent, const char * name, |
44 | WFlags f ) | 102 | WFlags f ) |
45 | : Calculator( parent, name, f ) | 103 | : Calculator( parent, name, f ) |
46 | { | 104 | { |
47 | xtopowerofy = Resource::loadPixmap("xtopowerofy"); | 105 | // xtopowerofy = Resource::loadPixmap("xtopowerofy"); |
48 | ythrootofx = Resource::loadPixmap("ythrootofx"); | 106 | // ythrootofx = Resource::loadPixmap("ythrootofx"); |
49 | oneoverx = Resource::loadPixmap("oneoverx"); | 107 | // oneoverx = Resource::loadPixmap("oneoverx"); |
50 | 108 | ||
51 | memMark = new QLabel( "m", LCD ); | 109 | memMark = new QLabel( "m", LCD ); |
52 | memMark->setFont( QFont( "helvetica", 12, QFont::Bold, TRUE ) ); | 110 | memMark->setFont( QFont( "helvetica", 12, QFont::Bold, TRUE ) ); |
53 | memMark->resize( 12, 12 ); | 111 | memMark->resize( 12, 12 ); |
54 | memMark->move( 4, 2 ); | 112 | memMark->move( 4, 2 ); |
55 | memMark->hide(); | 113 | memMark->hide(); |
@@ -286,20 +344,23 @@ void CalculatorImpl::function_button(int mode){ | |||
286 | } else { | 344 | } else { |
287 | bgr_function.setExclusive(FALSE); | 345 | bgr_function.setExclusive(FALSE); |
288 | } | 346 | } |
289 | } | 347 | } |
290 | 348 | ||
291 | void CalculatorImpl::display_pixmap_faces() { | 349 | void CalculatorImpl::display_pixmap_faces() { |
350 | QPixmap image0( ( const char** ) xtopowerofy_xpm); | ||
292 | QPushButton* tmpbutton = func_buttons[5]; | 351 | QPushButton* tmpbutton = func_buttons[5]; |
293 | tmpbutton->setPixmap(xtopowerofy); | 352 | tmpbutton->setPixmap(image0); |
294 | 353 | ||
354 | QPixmap image1( ( const char** ) ythrootofx_xpm); | ||
295 | tmpbutton = func_buttons[6]; | 355 | tmpbutton = func_buttons[6]; |
296 | tmpbutton->setPixmap(ythrootofx); | 356 | tmpbutton->setPixmap(image1); |
297 | 357 | ||
358 | QPixmap image2( ( const char** ) oneoverx_xpm); | ||
298 | tmpbutton = func_buttons[3]; | 359 | tmpbutton = func_buttons[3]; |
299 | tmpbutton->setPixmap(oneoverx); | 360 | tmpbutton->setPixmap(image2); |
300 | } | 361 | } |
301 | 362 | ||
302 | void CalculatorImpl::clear() { | 363 | void CalculatorImpl::clear() { |
303 | acc = num = 0; | 364 | acc = num = 0; |
304 | operationStack.clear(); | 365 | operationStack.clear(); |
305 | state = sStart; | 366 | state = sStart; |