| -rw-r--r-- | noncore/tools/calculator/calculatorimpl.cpp | 9 |
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 @@ -7,49 +7,48 @@ ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ /* * 01/14/2002 Charles-Edouard Ruault <ce@ruault.com> * Added support for Temperature conversions. */ // Sat 03-09-2002 L.J. Potter added the inlined pixmaps here #include "calculatorimpl.h" /* OPIE */ #include <opie2/odebug.h> -#include <qpe/resource.h> #include <qpe/qmath.h> #include <qpe/qpeapplication.h> using namespace Opie::Core; /* QT */ #include <qpushbutton.h> #include <qcombobox.h> #include <qlabel.h> #include <qfont.h> #include <qlayout.h> #include <qstringlist.h> #include <qfile.h> #include <qtextstream.h> #include <qmessagebox.h> /* STD */ #include <math.h> /* XPM */ static char *oneoverx_xpm[] = { /* width height num_colors chars_per_pixel */ " 13 11 2 1", /* colors */ ". c None", @@ -88,79 +87,75 @@ static char *ythrootofx_xpm[] = { "...#........." }; /* XPM */ static char *xtopowerofy_xpm[] = { /* width height num_colors chars_per_pixel */ " 9 8 2 1", /* colors */ ". c None", "# c #000000", /* pixels */ "......#.#", "......#.#", "......###", "#...#...#", ".#.#..###", "..#......", ".#.#.....", "#...#...." }; CalculatorImpl::CalculatorImpl( QWidget * parent, const char * name, WFlags f ) : Calculator( parent, name, f ) { -// xtopowerofy = Resource::loadPixmap("xtopowerofy"); -// ythrootofx = Resource::loadPixmap("ythrootofx"); -// oneoverx = Resource::loadPixmap("oneoverx"); - memMark = new QLabel( "m", LCD ); memMark->setFont( QFont( "helvetica", 12, QFont::Bold, TRUE ) ); memMark->resize( 12, 12 ); memMark->move( 4, 2 ); memMark->hide(); mem = 0; PushButtonMR->setEnabled( FALSE ); current_mode = max_mode = conversion_mode_count = 0; last_conversion = -1; // translation trick mode - with this stuff parsed in from a file is translatable QObject::tr("Standard"); QObject::tr("Weight"); QObject::tr("Distance"); QObject::tr("Area"); QObject::tr("Temperatures"); QObject::tr("Volume"); QObject::tr("acres"); - QObject::tr("°C"); + QObject::tr("C"); QObject::tr("carats"); QObject::tr("cm"); QObject::tr("cu cm"); QObject::tr("cu ft"); QObject::tr("cu in"); - QObject::tr("°F"); + QObject::tr("F"); QObject::tr("fl oz (US)"); QObject::tr("ft"); QObject::tr("g"); QObject::tr("gal (US)"); QObject::tr("hectares"); QObject::tr("in"); QObject::tr("kg"); QObject::tr("km"); QObject::tr("l"); QObject::tr("lb"); QObject::tr("Lg tons"); QObject::tr("m"); QObject::tr("mg"); QObject::tr("mi"); QObject::tr("ml"); QObject::tr("mm"); QObject::tr("naut. mi"); QObject::tr("oz"); QObject::tr("points"); QObject::tr("pt"); QObject::tr("qt"); QObject::tr("sq cm"); QObject::tr("sq ft"); QObject::tr("sq in"); |