3 files changed, 102 insertions, 83 deletions
diff --git a/noncore/apps/checkbook/checkbook.cpp b/noncore/apps/checkbook/checkbook.cpp
index 44d3764..b325f45 100644
--- a/noncore/apps/checkbook/checkbook.cpp
+++ b/noncore/apps/checkbook/checkbook.cpp
@@ -1,24 +1,24 @@
 /*
-                             This file is part of the OPIE Project
+                     This file is part of the OPIE Project
               =.
-             .=l.            Copyright (c)  2002 Dan Williams <drw@handhelds.org>
+      .=l.            Copyright (c)  2002 Dan Williams <drw@handhelds.org>
-           .>+-=
+     .>+-=
- _;:,     .>    :=|.         This file is free software; you can
+_;:,   .>  :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
+.> <`_,  > .  <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+:`=1 )Y*s>-.--  :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
+.="- .-=="i,   .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
+- .  .-<_>   .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
+  ._= =}    :          or (at your option) any later version.
-    .%`+i>       _;_.
+  .%`+i>    _;_.
-    .i_,=:_.      -<s.       This file is distributed in the hope that
+  .i_,=:_.   -<s.       This file is distributed in the hope that
-     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
+  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
+  : ..  .:,   . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
+ _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
-..}^=.=       =       ;      Public License for more details.
+..}^=.=    =    ;      Public License for more details.
-++=   -.     .`     .:
++=  -.   .`   .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
+:   = ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
+-.  .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
+ -_. . .  )=. =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
+  --    :-=`           Free Software Foundation, Inc.,
                             59 Temple Place - Suite 330,
@@ -37,5 +37,7 @@
+#include <opie2/oresource.h>
+#include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpemessagebox.h>
-#include <qpe/resource.h>
@@ -249,3 +251,5 @@ QWidget *Checkbook::initTransactions()
    // Buttons
-    QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), control );
+    QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
+                                        tr( "New" ), control );
+    btn->setFixedHeight( AppLnk::smallIconSize()+4 );
    QWhatsThis::add( btn, tr( "Click here to add a new transaction." ) );
@@ -254,3 +258,5 @@ QWidget *Checkbook::initTransactions()
-    btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Edit" ), control );
+    btn = new QPushButton( Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ),
+                           tr( "Edit" ), control );
+    btn->setFixedHeight( AppLnk::smallIconSize()+4 );
    QWhatsThis::add( btn, tr( "Select a transaction and then click here to edit it." ) );
@@ -259,3 +265,5 @@ QWidget *Checkbook::initTransactions()
-    btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), control );
+    btn = new QPushButton( Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ),
+                           tr( "Delete" ), control );
+    btn->setFixedHeight( AppLnk::smallIconSize()+4 );
    QWhatsThis::add( btn, tr( "Select a checkbook and then click here to delete it." ) );
@@ -291,3 +299,5 @@ QWidget *Checkbook::initCharts()
-    QPushButton *btn = new QPushButton( Resource::loadPixmap( "checkbook/drawbtn" ), tr( "Draw" ), control );
+    QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "checkbook/drawbtn", Opie::Core::OResource::SmallIcon ),
+                                        tr( "Draw" ), control );
+    btn->setFixedHeight( AppLnk::smallIconSize()+4 );
    QWhatsThis::add( btn, tr( "Click here to draw the selected chart." ) );
diff --git a/noncore/apps/checkbook/listedit.cpp b/noncore/apps/checkbook/listedit.cpp
index 2612488..e40377b 100644
--- a/noncore/apps/checkbook/listedit.cpp
+++ b/noncore/apps/checkbook/listedit.cpp
@@ -1,24 +1,24 @@
 /*
-                             This file is part of the OPIE Project
+                     This file is part of the OPIE Project
               =.
-             .=l.            Copyright (c)  2002 Dan Williams <drw@handhelds.org>
+      .=l.            Copyright (c)  2002 Dan Williams <drw@handhelds.org>
-           .>+-=
+     .>+-=
- _;:,     .>    :=|.         This file is free software; you can
+_;:,   .>  :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
+.> <`_,  > .  <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+:`=1 )Y*s>-.--  :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
+.="- .-=="i,   .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
+- .  .-<_>   .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
+  ._= =}    :          or (at your option) any later version.
-    .%`+i>       _;_.
+  .%`+i>    _;_.
-    .i_,=:_.      -<s.       This file is distributed in the hope that
+  .i_,=:_.   -<s.       This file is distributed in the hope that
-     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
+  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
+  : ..  .:,   . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
+ _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
-..}^=.=       =       ;      Public License for more details.
+..}^=.=    =    ;      Public License for more details.
-++=   -.     .`     .:
++=  -.   .`   .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
+:   = ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
+-.  .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
+ -_. . .  )=. =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
+  --    :-=`           Free Software Foundation, Inc.,
                             59 Temple Place - Suite 330,
@@ -32,3 +32,6 @@
 #include <opie2/odebug.h>
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
+#include <qpe/applnk.h>
 using namespace Opie::Core;
@@ -80,3 +83,5 @@ ListEdit::ListEdit( QWidget *parent, const char *sName )
    // add button
-    QPushButton *btn = new QPushButton( Resource::loadPixmap( "checkbook/add" ), tr( "Add" ), this );
+    QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
+                                        tr( "Add" ), this );
+    btn->setFixedHeight( AppLnk::smallIconSize()+4 );
        connect( btn, SIGNAL( clicked() ), this, SLOT( slotAdd() ) );
@@ -85,4 +90,5 @@ ListEdit::ListEdit( QWidget *parent, const char *sName )
    // delete button
-    btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), this );
+    btn = new QPushButton( Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ), tr( "Delete" ), this );
-        connect( btn, SIGNAL( clicked() ), this, SLOT( slotDel() ) );
+    btn->setFixedHeight( AppLnk::smallIconSize()+4 );
+    connect( btn, SIGNAL( clicked() ), this, SLOT( slotDel() ) );
        layout->addWidget( btn, 5, 4 );
diff --git a/noncore/apps/checkbook/mainwindow.cpp b/noncore/apps/checkbook/mainwindow.cpp
index c7ffa7c..d9e2047 100644
--- a/noncore/apps/checkbook/mainwindow.cpp
+++ b/noncore/apps/checkbook/mainwindow.cpp
@@ -1,24 +1,24 @@
 /*
-                             This file is part of the OPIE Project
+                     This file is part of the OPIE Project
               =.
-             .=l.            Copyright (c)  2002 Dan Williams <drw@handhelds.org>
+      .=l.            Copyright (c)  2002 Dan Williams <drw@handhelds.org>
-           .>+-=
+     .>+-=
- _;:,     .>    :=|.         This file is free software; you can
+_;:,   .>  :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
+.> <`_,  > .  <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+:`=1 )Y*s>-.--  :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
+.="- .-=="i,   .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
+- .  .-<_>   .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
+  ._= =}    :          or (at your option) any later version.
-    .%`+i>       _;_.
+  .%`+i>    _;_.
-    .i_,=:_.      -<s.       This file is distributed in the hope that
+  .i_,=:_.   -<s.       This file is distributed in the hope that
-     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
+  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
+  : ..  .:,   . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
+ _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
-..}^=.=       =       ;      Public License for more details.
+..}^=.=    =    ;      Public License for more details.
-++=   -.     .`     .:
++=  -.   .`   .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
+:   = ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
+-.  .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
+ -_. . .  )=. =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
+  --    :-=`           Free Software Foundation, Inc.,
                             59 Temple Place - Suite 330,
@@ -34,2 +34,4 @@
+#include <opie2/oresource.h>
 #include <qpe/config.h>
@@ -37,8 +39,7 @@
 #include <qpe/qpemessagebox.h>
-#include <qtoolbar.h>
-#include <qpe/resource.h>
-#include <qmenubar.h>
 #include <qaction.h>
 #include <qdir.h>
+#include <qmenubar.h>
+#include <qtoolbar.h>
 #include <qwhatsthis.h>
@@ -52,3 +53,3 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags /*fl*/ )
    cbDir = Global::applicationFileName( "checkbook", "" );
-    lockIcon = Resource::loadPixmap( "locked" );
+    lockIcon = Opie::Core::OResource::loadPixmap( "locked", Opie::Core::OResource::SmallIcon );
@@ -69,3 +70,4 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags /*fl*/ )
    bar = new QToolBar( this );
-    QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
+    QAction *a = new QAction( tr( "New" ), Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
+                              QString::null, 0, this, 0 );
    a->setWhatsThis( tr( "Click here to create a new checkbook.\n\nYou also can select New from the Checkbook menu." ) );
@@ -75,4 +77,4 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags /*fl*/ )
-    actionOpen = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), QString::null,
+    actionOpen = new QAction( tr( "Edit" ), Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ),
-                              0, this, 0 );
+                              QString::null, 0, this, 0 );
    actionOpen->setWhatsThis( tr( "Select a checkbook and then click here to edit it.\n\nYou also can select Edit from the Checkbook menu, or click and hold on a checkbook name." ) );
@@ -82,4 +84,4 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags /*fl*/ )
-    actionDelete = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null,
+    actionDelete = new QAction( tr( "Delete" ), Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ),
-                                0, this, 0 );
+                                QString::null, 0, this, 0 );
    actionDelete->setWhatsThis( tr( "Select a checkbook and then click here delete it.\n\nYou also can select Delete from the Checkbook menu." ) );
@@ -91,3 +93,4 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags /*fl*/ )
-    a = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), QString::null, 0, this, 0 );
+    a = new QAction( tr( "Configure" ), Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ),
+                     QString::null, 0, this, 0 );
    a->setWhatsThis( tr( "Click here to configure this app." ) );
@@ -158,3 +161,3 @@ void MainWindow::buildList()
    {
-        cbList->addColumn( Resource::loadIconSet( "locked" ), "", 24 );
+        cbList->addColumn( lockIcon, "", 24 );
        posName = 1;

diff --git a/noncore/apps/checkbook/checkbook.cpp b/noncore/apps/checkbook/checkbook.cpp index 44d3764..b325f45 100644 --- a/noncore/apps/checkbook/checkbook.cpp +++ b/noncore/apps/checkbook/checkbook.cpp
@@ -1,24 +1,24 @@
1	/*	1	/*
2	This file is part of the OPIE Project	2	This file is part of the OPIE Project
3	=.	3	=.
4	.=l. Copyright (c) 2002 Dan Williams <drw@handhelds.org>	4	.=l. Copyright (c) 2002 Dan Williams <drw@handhelds.org>
5	.>+-=	5	.>+-=
6	_;:, .> :=\|. This file is free software; you can	6	_;:, .> :=\|. This file is free software; you can
7	.> <`_, > . <= redistribute it and/or modify it under	7	.> <`_, > . <= redistribute it and/or modify it under
8	:`=1 )Y*s>-.-- : the terms of the GNU General Public	8	:`=1 )Y*s>-.-- : the terms of the GNU General Public
9	.="- .-=="i, .._ License as published by the Free Software	9	.="- .-=="i, .._ License as published by the Free Software
10	- . .-<_> .<> Foundation; either version 2 of the License,	10	- . .-<_> .<> Foundation; either version 2 of the License,
11	._= =} : or (at your option) any later version.	11	._= =} : or (at your option) any later version.
12	.%`+i> _;_.	12	.%`+i> _;_.
13	.i_,=:_. -<s. This file is distributed in the hope that	13	.i_,=:_. -<s. This file is distributed in the hope that
14	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;	14	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
15	: .. .:, . . . without even the implied warranty of	15	: .. .:, . . . without even the implied warranty of
16	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A	16	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
17	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General	17	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General
18	..}^=.= = ; Public License for more details.	18	..}^=.= = ; Public License for more details.
19	++= -. .` .:	19	++= -. .` .:
20	: = ...= . :.=- You should have received a copy of the GNU	20	: = ...= . :.=- You should have received a copy of the GNU
21	-. .:....=;==+<; General Public License along with this file;	21	-. .:....=;==+<; General Public License along with this file;
22	-_. . . )=. = see the file COPYING. If not, write to the	22	-_. . . )=. = see the file COPYING. If not, write to the
23	-- :-=` Free Software Foundation, Inc.,	23	-- :-=` Free Software Foundation, Inc.,
24	59 Temple Place - Suite 330,	24	59 Temple Place - Suite 330,
@@ -37,5 +37,7 @@
37		37
		38	#include <opie2/oresource.h>
		39
		40	#include <qpe/applnk.h>
38	#include <qpe/qpeapplication.h>	41	#include <qpe/qpeapplication.h>
39	#include <qpe/qpemessagebox.h>	42	#include <qpe/qpemessagebox.h>
40	#include <qpe/resource.h>
41		43
@@ -249,3 +251,5 @@ QWidget *Checkbook::initTransactions()
249	// Buttons	251	// Buttons
250	QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), control );	252	QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
		253	tr( "New" ), control );
		254	btn->setFixedHeight( AppLnk::smallIconSize()+4 );
251	QWhatsThis::add( btn, tr( "Click here to add a new transaction." ) );	255	QWhatsThis::add( btn, tr( "Click here to add a new transaction." ) );
@@ -254,3 +258,5 @@ QWidget *Checkbook::initTransactions()
254		258
255	btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Edit" ), control );	259	btn = new QPushButton( Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ),
		260	tr( "Edit" ), control );
		261	btn->setFixedHeight( AppLnk::smallIconSize()+4 );
256	QWhatsThis::add( btn, tr( "Select a transaction and then click here to edit it." ) );	262	QWhatsThis::add( btn, tr( "Select a transaction and then click here to edit it." ) );
@@ -259,3 +265,5 @@ QWidget *Checkbook::initTransactions()
259		265
260	btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), control );	266	btn = new QPushButton( Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ),
		267	tr( "Delete" ), control );
		268	btn->setFixedHeight( AppLnk::smallIconSize()+4 );
261	QWhatsThis::add( btn, tr( "Select a checkbook and then click here to delete it." ) );	269	QWhatsThis::add( btn, tr( "Select a checkbook and then click here to delete it." ) );
@@ -291,3 +299,5 @@ QWidget *Checkbook::initCharts()
291		299
292	QPushButton *btn = new QPushButton( Resource::loadPixmap( "checkbook/drawbtn" ), tr( "Draw" ), control );	300	QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "checkbook/drawbtn", Opie::Core::OResource::SmallIcon ),
		301	tr( "Draw" ), control );
		302	btn->setFixedHeight( AppLnk::smallIconSize()+4 );
293	QWhatsThis::add( btn, tr( "Click here to draw the selected chart." ) );	303	QWhatsThis::add( btn, tr( "Click here to draw the selected chart." ) );


diff --git a/noncore/apps/checkbook/listedit.cpp b/noncore/apps/checkbook/listedit.cpp index 2612488..e40377b 100644 --- a/noncore/apps/checkbook/listedit.cpp +++ b/noncore/apps/checkbook/listedit.cpp
@@ -1,24 +1,24 @@
1	/*	1	/*
2	This file is part of the OPIE Project	2	This file is part of the OPIE Project
3	=.	3	=.
4	.=l. Copyright (c) 2002 Dan Williams <drw@handhelds.org>	4	.=l. Copyright (c) 2002 Dan Williams <drw@handhelds.org>
5	.>+-=	5	.>+-=
6	_;:, .> :=\|. This file is free software; you can	6	_;:, .> :=\|. This file is free software; you can
7	.> <`_, > . <= redistribute it and/or modify it under	7	.> <`_, > . <= redistribute it and/or modify it under
8	:`=1 )Y*s>-.-- : the terms of the GNU General Public	8	:`=1 )Y*s>-.-- : the terms of the GNU General Public
9	.="- .-=="i, .._ License as published by the Free Software	9	.="- .-=="i, .._ License as published by the Free Software
10	- . .-<_> .<> Foundation; either version 2 of the License,	10	- . .-<_> .<> Foundation; either version 2 of the License,
11	._= =} : or (at your option) any later version.	11	._= =} : or (at your option) any later version.
12	.%`+i> _;_.	12	.%`+i> _;_.
13	.i_,=:_. -<s. This file is distributed in the hope that	13	.i_,=:_. -<s. This file is distributed in the hope that
14	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;	14	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
15	: .. .:, . . . without even the implied warranty of	15	: .. .:, . . . without even the implied warranty of
16	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A	16	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
17	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General	17	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General
18	..}^=.= = ; Public License for more details.	18	..}^=.= = ; Public License for more details.
19	++= -. .` .:	19	++= -. .` .:
20	: = ...= . :.=- You should have received a copy of the GNU	20	: = ...= . :.=- You should have received a copy of the GNU
21	-. .:....=;==+<; General Public License along with this file;	21	-. .:....=;==+<; General Public License along with this file;
22	-_. . . )=. = see the file COPYING. If not, write to the	22	-_. . . )=. = see the file COPYING. If not, write to the
23	-- :-=` Free Software Foundation, Inc.,	23	-- :-=` Free Software Foundation, Inc.,
24	59 Temple Place - Suite 330,	24	59 Temple Place - Suite 330,
@@ -32,3 +32,6 @@
32	#include <opie2/odebug.h>	32	#include <opie2/odebug.h>
33	#include <qpe/resource.h>	33	#include <opie2/oresource.h>
		34
		35	#include <qpe/applnk.h>
		36
34	using namespace Opie::Core;	37	using namespace Opie::Core;
@@ -80,3 +83,5 @@ ListEdit::ListEdit( QWidget parent, const char sName )
80	// add button	83	// add button
81	QPushButton *btn = new QPushButton( Resource::loadPixmap( "checkbook/add" ), tr( "Add" ), this );	84	QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
		85	tr( "Add" ), this );
		86	btn->setFixedHeight( AppLnk::smallIconSize()+4 );
82	connect( btn, SIGNAL( clicked() ), this, SLOT( slotAdd() ) );	87	connect( btn, SIGNAL( clicked() ), this, SLOT( slotAdd() ) );
@@ -85,4 +90,5 @@ ListEdit::ListEdit( QWidget parent, const char sName )
85	// delete button	90	// delete button
86	btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), this );	91	btn = new QPushButton( Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ), tr( "Delete" ), this );
87	connect( btn, SIGNAL( clicked() ), this, SLOT( slotDel() ) );	92	btn->setFixedHeight( AppLnk::smallIconSize()+4 );
		93	connect( btn, SIGNAL( clicked() ), this, SLOT( slotDel() ) );
88	layout->addWidget( btn, 5, 4 );	94	layout->addWidget( btn, 5, 4 );


diff --git a/noncore/apps/checkbook/mainwindow.cpp b/noncore/apps/checkbook/mainwindow.cpp index c7ffa7c..d9e2047 100644 --- a/noncore/apps/checkbook/mainwindow.cpp +++ b/noncore/apps/checkbook/mainwindow.cpp
@@ -1,24 +1,24 @@
1	/*	1	/*
2	This file is part of the OPIE Project	2	This file is part of the OPIE Project
3	=.	3	=.
4	.=l. Copyright (c) 2002 Dan Williams <drw@handhelds.org>	4	.=l. Copyright (c) 2002 Dan Williams <drw@handhelds.org>
5	.>+-=	5	.>+-=
6	_;:, .> :=\|. This file is free software; you can	6	_;:, .> :=\|. This file is free software; you can
7	.> <`_, > . <= redistribute it and/or modify it under	7	.> <`_, > . <= redistribute it and/or modify it under
8	:`=1 )Y*s>-.-- : the terms of the GNU General Public	8	:`=1 )Y*s>-.-- : the terms of the GNU General Public
9	.="- .-=="i, .._ License as published by the Free Software	9	.="- .-=="i, .._ License as published by the Free Software
10	- . .-<_> .<> Foundation; either version 2 of the License,	10	- . .-<_> .<> Foundation; either version 2 of the License,
11	._= =} : or (at your option) any later version.	11	._= =} : or (at your option) any later version.
12	.%`+i> _;_.	12	.%`+i> _;_.
13	.i_,=:_. -<s. This file is distributed in the hope that	13	.i_,=:_. -<s. This file is distributed in the hope that
14	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;	14	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
15	: .. .:, . . . without even the implied warranty of	15	: .. .:, . . . without even the implied warranty of
16	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A	16	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
17	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General	17	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General
18	..}^=.= = ; Public License for more details.	18	..}^=.= = ; Public License for more details.
19	++= -. .` .:	19	++= -. .` .:
20	: = ...= . :.=- You should have received a copy of the GNU	20	: = ...= . :.=- You should have received a copy of the GNU
21	-. .:....=;==+<; General Public License along with this file;	21	-. .:....=;==+<; General Public License along with this file;
22	-_. . . )=. = see the file COPYING. If not, write to the	22	-_. . . )=. = see the file COPYING. If not, write to the
23	-- :-=` Free Software Foundation, Inc.,	23	-- :-=` Free Software Foundation, Inc.,
24	59 Temple Place - Suite 330,	24	59 Temple Place - Suite 330,
@@ -34,2 +34,4 @@
34		34
		35	#include <opie2/oresource.h>
		36
35	#include <qpe/config.h>	37	#include <qpe/config.h>
@@ -37,8 +39,7 @@
37	#include <qpe/qpemessagebox.h>	39	#include <qpe/qpemessagebox.h>
38	#include <qtoolbar.h>
39	#include <qpe/resource.h>
40		40
41	#include <qmenubar.h>
42	#include <qaction.h>	41	#include <qaction.h>
43	#include <qdir.h>	42	#include <qdir.h>
		43	#include <qmenubar.h>
		44	#include <qtoolbar.h>
44	#include <qwhatsthis.h>	45	#include <qwhatsthis.h>
@@ -52,3 +53,3 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags /fl/ )
52	cbDir = Global::applicationFileName( "checkbook", "" );	53	cbDir = Global::applicationFileName( "checkbook", "" );
53	lockIcon = Resource::loadPixmap( "locked" );	54	lockIcon = Opie::Core::OResource::loadPixmap( "locked", Opie::Core::OResource::SmallIcon );
54		55
@@ -69,3 +70,4 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags /fl/ )
69	bar = new QToolBar( this );	70	bar = new QToolBar( this );
70	QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );	71	QAction *a = new QAction( tr( "New" ), Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
		72	QString::null, 0, this, 0 );
71	a->setWhatsThis( tr( "Click here to create a new checkbook.\n\nYou also can select New from the Checkbook menu." ) );	73	a->setWhatsThis( tr( "Click here to create a new checkbook.\n\nYou also can select New from the Checkbook menu." ) );
@@ -75,4 +77,4 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags /fl/ )
75		77
76	actionOpen = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), QString::null,	78	actionOpen = new QAction( tr( "Edit" ), Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ),
77	0, this, 0 );	79	QString::null, 0, this, 0 );
78	actionOpen->setWhatsThis( tr( "Select a checkbook and then click here to edit it.\n\nYou also can select Edit from the Checkbook menu, or click and hold on a checkbook name." ) );	80	actionOpen->setWhatsThis( tr( "Select a checkbook and then click here to edit it.\n\nYou also can select Edit from the Checkbook menu, or click and hold on a checkbook name." ) );
@@ -82,4 +84,4 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags /fl/ )
82		84
83	actionDelete = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null,	85	actionDelete = new QAction( tr( "Delete" ), Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ),
84	0, this, 0 );	86	QString::null, 0, this, 0 );
85	actionDelete->setWhatsThis( tr( "Select a checkbook and then click here delete it.\n\nYou also can select Delete from the Checkbook menu." ) );	87	actionDelete->setWhatsThis( tr( "Select a checkbook and then click here delete it.\n\nYou also can select Delete from the Checkbook menu." ) );
@@ -91,3 +93,4 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags /fl/ )
91		93
92	a = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), QString::null, 0, this, 0 );	94	a = new QAction( tr( "Configure" ), Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ),
		95	QString::null, 0, this, 0 );
93	a->setWhatsThis( tr( "Click here to configure this app." ) );	96	a->setWhatsThis( tr( "Click here to configure this app." ) );
@@ -158,3 +161,3 @@ void MainWindow::buildList()
158	{	161	{
159	cbList->addColumn( Resource::loadIconSet( "locked" ), "", 24 );	162	cbList->addColumn( lockIcon, "", 24 );
160	posName = 1;	163	posName = 1;