summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/calculator/calculatorimpl.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/noncore/tools/calculator/calculatorimpl.cpp b/noncore/tools/calculator/calculatorimpl.cpp
index 05cb9b5..21c1e2e 100644
--- a/noncore/tools/calculator/calculatorimpl.cpp
+++ b/noncore/tools/calculator/calculatorimpl.cpp
@@ -19,25 +19,24 @@
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// Sat 03-09-2002 L.J. Potter added the inlined pixmaps here
26 26
27#include "calculatorimpl.h" 27#include "calculatorimpl.h"
28 28
29/* OPIE */ 29/* OPIE */
30#include <opie2/odebug.h> 30#include <opie2/odebug.h>
31#include <qpe/resource.h>
32#include <qpe/qmath.h> 31#include <qpe/qmath.h>
33#include <qpe/qpeapplication.h> 32#include <qpe/qpeapplication.h>
34using namespace Opie::Core; 33using namespace Opie::Core;
35 34
36/* QT */ 35/* QT */
37#include <qpushbutton.h> 36#include <qpushbutton.h>
38#include <qcombobox.h> 37#include <qcombobox.h>
39#include <qlabel.h> 38#include <qlabel.h>
40#include <qfont.h> 39#include <qfont.h>
41#include <qlayout.h> 40#include <qlayout.h>
42#include <qstringlist.h> 41#include <qstringlist.h>
43#include <qfile.h> 42#include <qfile.h>
@@ -100,55 +99,51 @@ static char *xtopowerofy_xpm[] = {
100"......###", 99"......###",
101"#...#...#", 100"#...#...#",
102".#.#..###", 101".#.#..###",
103"..#......", 102"..#......",
104".#.#.....", 103".#.#.....",
105"#...#...." 104"#...#...."
106}; 105};
107 106
108CalculatorImpl::CalculatorImpl( QWidget * parent, const char * name, 107CalculatorImpl::CalculatorImpl( QWidget * parent, const char * name,
109 WFlags f ) 108 WFlags f )
110 : Calculator( parent, name, f ) 109 : Calculator( parent, name, f )
111{ 110{
112// xtopowerofy = Resource::loadPixmap("xtopowerofy");
113// ythrootofx = Resource::loadPixmap("ythrootofx");
114// oneoverx = Resource::loadPixmap("oneoverx");
115
116 memMark = new QLabel( "m", LCD ); 111 memMark = new QLabel( "m", LCD );
117 memMark->setFont( QFont( "helvetica", 12, QFont::Bold, TRUE ) ); 112 memMark->setFont( QFont( "helvetica", 12, QFont::Bold, TRUE ) );
118 memMark->resize( 12, 12 ); 113 memMark->resize( 12, 12 );
119 memMark->move( 4, 2 ); 114 memMark->move( 4, 2 );
120 memMark->hide(); 115 memMark->hide();
121 mem = 0; 116 mem = 0;
122 117
123 PushButtonMR->setEnabled( FALSE ); 118 PushButtonMR->setEnabled( FALSE );
124 119
125 current_mode = max_mode = conversion_mode_count = 0; 120 current_mode = max_mode = conversion_mode_count = 0;
126 last_conversion = -1; 121 last_conversion = -1;
127 122
128 // translation trick mode - with this stuff parsed in from a file is translatable 123 // translation trick mode - with this stuff parsed in from a file is translatable
129 QObject::tr("Standard"); 124 QObject::tr("Standard");
130 QObject::tr("Weight"); 125 QObject::tr("Weight");
131 QObject::tr("Distance"); 126 QObject::tr("Distance");
132 QObject::tr("Area"); 127 QObject::tr("Area");
133 QObject::tr("Temperatures"); 128 QObject::tr("Temperatures");
134 QObject::tr("Volume"); 129 QObject::tr("Volume");
135 QObject::tr("acres"); 130 QObject::tr("acres");
136 QObject::tr("°C"); 131 QObject::tr("C");
137 QObject::tr("carats"); 132 QObject::tr("carats");
138 QObject::tr("cm"); 133 QObject::tr("cm");
139 QObject::tr("cu cm"); 134 QObject::tr("cu cm");
140 QObject::tr("cu ft"); 135 QObject::tr("cu ft");
141 QObject::tr("cu in"); 136 QObject::tr("cu in");
142 QObject::tr("°F"); 137 QObject::tr("F");
143 QObject::tr("fl oz (US)"); 138 QObject::tr("fl oz (US)");
144 QObject::tr("ft"); 139 QObject::tr("ft");
145 QObject::tr("g"); 140 QObject::tr("g");
146 QObject::tr("gal (US)"); 141 QObject::tr("gal (US)");
147 QObject::tr("hectares"); 142 QObject::tr("hectares");
148 QObject::tr("in"); 143 QObject::tr("in");
149 QObject::tr("kg"); 144 QObject::tr("kg");
150 QObject::tr("km"); 145 QObject::tr("km");
151 QObject::tr("l"); 146 QObject::tr("l");
152 QObject::tr("lb"); 147 QObject::tr("lb");
153 QObject::tr("Lg tons"); 148 QObject::tr("Lg tons");
154 QObject::tr("m"); 149 QObject::tr("m");