Resource -> OResource

author: drw <drw> 2005-05-17 23:23:27 (UTC)
committer: drw <drw> 2005-05-17 23:23:27 (UTC)
commit: 73738d14ca541eaa41b8ee81168e98826752a98c (patch) (unidiff)
tree: ee5bef46dcfbdee51f87716979e85577e34d8fae /noncore
parent: f37c642f417a58ee489ab5a8bab56e5efb59bada (diff)
download: opie-73738d14ca541eaa41b8ee81168e98826752a98c.zip
opie-73738d14ca541eaa41b8ee81168e98826752a98c.tar.gz
opie-73738d14ca541eaa41b8ee81168e98826752a98c.tar.bz2
2 files changed, 40 insertions, 45 deletions
diff --git a/noncore/apps/tableviewer/tableviewer.cpp b/noncore/apps/tableviewer/tableviewer.cpp
index 9538cb3..8668368 100644
--- a/noncore/apps/tableviewer/tableviewer.cpp
+++ b/noncore/apps/tableviewer/tableviewer.cpp
@@ -30,4 +30,4 @@
 #include <opie2/odebug.h>
+#include <opie2/oresource.h>
 #include <qpe/fileselector.h>
-#include <qpe/resource.h>
 using namespace Opie::Core;
@@ -95,13 +95,14 @@ TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f
    /* Build tool bar */
+    bool useBigIcon = qApp->desktop()->size().width() > 330;
    navigation = new QToolBar(this, "navigation");
-    QToolButton *newItemButton = new QToolButton(
+    QToolButton *btn = new QToolButton( Opie::Core::OResource::loadPixmap("new", Opie::Core::OResource::SmallIcon),
-      QIconSet(Resource::loadPixmap("new")), "New Item", QString::null,
+                                        "New Item", QString::null, this, SLOT(newItemSlot()), navigation, "New Item");
-      this, SLOT(newItemSlot()), navigation, "New Item");
+    btn->setUsesBigPixmap( useBigIcon );
-    QToolButton *editItemButton = new QToolButton(
+    btn = new QToolButton( Opie::Core::OResource::loadPixmap("edit", Opie::Core::OResource::SmallIcon),
-      QIconSet(Resource::loadPixmap("edit")), "Edit Item", QString::null,
+                           "Edit Item", QString::null, this, SLOT(editItemSlot()), navigation, "Edit Item");
-      this, SLOT(editItemSlot()), navigation, "Edit Item");
+    btn->setUsesBigPixmap( useBigIcon );
-    QToolButton *deleteItemButton = new QToolButton(
+    btn = new QToolButton( Opie::Core::OResource::loadPixmap("trash", Opie::Core::OResource::SmallIcon),
-      QIconSet(Resource::loadPixmap("trash")), "Delete Item", 
+                           "Delete Item", QString::null, this, SLOT(deleteItemSlot()), navigation, "Delete Item");
-      QString::null, this, 
+    btn->setUsesBigPixmap( useBigIcon );
-      SLOT(deleteItemSlot()), navigation, "Delete Item");
@@ -109,32 +110,24 @@ TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f
-    QToolButton *firstItemButton = new QToolButton(
+    btn = new QToolButton( Opie::Core::OResource::loadPixmap("fastback", Opie::Core::OResource::SmallIcon),
-      QIconSet(Resource::loadPixmap("fastback")), "First Item", 
+                           "First Item", QString::null, this, SLOT(firstItem()), navigation, "First Item");
-      QString::null, this, 
+    btn->setUsesBigPixmap( useBigIcon );
-      SLOT(firstItem()), navigation, "First Item");
+    btn = new QToolButton( Opie::Core::OResource::loadPixmap("back", Opie::Core::OResource::SmallIcon),
-    QToolButton *previousItemButton = new QToolButton(
+                           "Previous Item", QString::null, this, SLOT(previousItem()), navigation, "Previous Item");
-      QIconSet(Resource::loadPixmap("back")), "Previous Item", 
+    btn->setUsesBigPixmap( useBigIcon );
-      QString::null, this, 
+    btn = new QToolButton( Opie::Core::OResource::loadPixmap("forward", Opie::Core::OResource::SmallIcon),
-      SLOT(previousItem()), navigation, "Previous Item");
+                           "Next Item", QString::null, this, SLOT(nextItem()), navigation, "Next Item");
-    QToolButton *nextItemButton = new QToolButton(
+    btn->setUsesBigPixmap( useBigIcon );
-      QIconSet(Resource::loadPixmap("forward")), "Next Item", 
+    btn = new QToolButton( Opie::Core::OResource::loadPixmap("fastforward", Opie::Core::OResource::SmallIcon),
-      QString::null, this, 
+                           "Last Item", QString::null, this, SLOT(lastItem()), navigation, "Last Item");
-      SLOT(nextItem()), navigation, "Next Item");
+    btn->setUsesBigPixmap( useBigIcon );
-    QToolButton *lastItemButton = new QToolButton(
-      QIconSet(Resource::loadPixmap("fastforward")), "Last Item", 
-      QString::null, this, 
-      SLOT(lastItem()), navigation, "Last Item");
    navigation->addSeparator();
-    QToolButton *browseButton = new QToolButton(
+    btn = new QToolButton( Opie::Core::OResource::loadPixmap("day", Opie::Core::OResource::SmallIcon),
-      QIconSet(Resource::loadPixmap("day")), "View Single Item", 
+                           "View Single Item", QString::null, this, SLOT(browseViewSlot()), navigation, "View Single Item");
-      QString::null, this, 
+    btn->setUsesBigPixmap( useBigIcon );
-      SLOT(browseViewSlot()), navigation, "View Single Item");
+    btn = new QToolButton( Opie::Core::OResource::loadPixmap("month", Opie::Core::OResource::SmallIcon),
-    QToolButton *listButton = new QToolButton(
+                           "View Multiple Items", QString::null, this, SLOT(listViewSlot()), navigation, "View Multiple Items");
-      QIconSet(Resource::loadPixmap("month")), "View Multiple Items", 
+    btn->setUsesBigPixmap( useBigIcon );
-      QString::null, this, 
-      SLOT(listViewSlot()), navigation, "View Multiple Items");
    setToolBarsMovable(FALSE);
-    setToolBarsMovable(FALSE);
-    setToolBarsMovable(FALSE);
diff --git a/noncore/comm/keypebble/kvnc.cpp b/noncore/comm/keypebble/kvnc.cpp
index 3a8e919..c089551 100644
--- a/noncore/comm/keypebble/kvnc.cpp
+++ b/noncore/comm/keypebble/kvnc.cpp
@@ -1 +1,5 @@
+#include <opie2/oresource.h>
+#include <qpe/qpeapplication.h>
 #include <qaction.h>
@@ -5,4 +9,2 @@
 #include <qlistbox.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
@@ -87,4 +89,4 @@ KVNC::KVNC(  QWidget *parent, const char *name, WFlags ) : QMainWindow( parent,
-                 QAction *n = new QAction( tr( "New Connection" ), Resource::loadPixmap( "new" ),
+         QAction *n = new QAction( tr( "New Connection" ), Opie::Core::OResource::loadPixmap( "new",
-                                QString::null, 0, this, 0 );
+                                   Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
                 connect( n, SIGNAL( activated() ),
@@ -93,4 +95,4 @@ KVNC::KVNC(  QWidget *parent, const char *name, WFlags ) : QMainWindow( parent,
-                 QAction *o = new QAction( tr( "Open Bookmark" ), Resource::loadPixmap( "fileopen" ),
+         QAction *o = new QAction( tr( "Open Bookmark" ), Opie::Core::OResource::loadPixmap( "fileopen",
-                                QString::null, 0, this, 0 );
+                                   Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
                 connect( o, SIGNAL( activated() ),
@@ -99,4 +101,4 @@ KVNC::KVNC(  QWidget *parent, const char *name, WFlags ) : QMainWindow( parent,
-                 QAction *d = new QAction( tr( "Delete Bookmark" ), Resource::loadPixmap( "trash" ),
+         QAction *d = new QAction( tr( "Delete Bookmark" ), Opie::Core::OResource::loadPixmap( "trash",
-                                QString::null, 0, this, 0 );
+                                   Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
                 connect( d, SIGNAL( activated() ),
author	drw <drw>	2005-05-17 23:23:27 (UTC)
committer	drw <drw>	2005-05-17 23:23:27 (UTC)
commit	73738d14ca541eaa41b8ee81168e98826752a98c (patch) (unidiff)
tree	ee5bef46dcfbdee51f87716979e85577e34d8fae /noncore
parent	f37c642f417a58ee489ab5a8bab56e5efb59bada (diff)
download	opie-73738d14ca541eaa41b8ee81168e98826752a98c.zip opie-73738d14ca541eaa41b8ee81168e98826752a98c.tar.gz opie-73738d14ca541eaa41b8ee81168e98826752a98c.tar.bz2

diff --git a/noncore/apps/tableviewer/tableviewer.cpp b/noncore/apps/tableviewer/tableviewer.cpp index 9538cb3..8668368 100644 --- a/noncore/apps/tableviewer/tableviewer.cpp +++ b/noncore/apps/tableviewer/tableviewer.cpp
@@ -30,4 +30,4 @@
30	#include <opie2/odebug.h>	30	#include <opie2/odebug.h>
		31	#include <opie2/oresource.h>
31	#include <qpe/fileselector.h>	32	#include <qpe/fileselector.h>
32	#include <qpe/resource.h>
33	using namespace Opie::Core;	33	using namespace Opie::Core;
@@ -95,13 +95,14 @@ TableViewerWindow::TableViewerWindow(QWidget parent, const char name, WFlags f
95	/* Build tool bar */	95	/* Build tool bar */
		96	bool useBigIcon = qApp->desktop()->size().width() > 330;
		97
96	navigation = new QToolBar(this, "navigation");	98	navigation = new QToolBar(this, "navigation");
97	QToolButton *newItemButton = new QToolButton(	99	QToolButton *btn = new QToolButton( Opie::Core::OResource::loadPixmap("new", Opie::Core::OResource::SmallIcon),
98	QIconSet(Resource::loadPixmap("new")), "New Item", QString::null,	100	"New Item", QString::null, this, SLOT(newItemSlot()), navigation, "New Item");
99	this, SLOT(newItemSlot()), navigation, "New Item");	101	btn->setUsesBigPixmap( useBigIcon );
100	QToolButton *editItemButton = new QToolButton(	102	btn = new QToolButton( Opie::Core::OResource::loadPixmap("edit", Opie::Core::OResource::SmallIcon),
101	QIconSet(Resource::loadPixmap("edit")), "Edit Item", QString::null,	103	"Edit Item", QString::null, this, SLOT(editItemSlot()), navigation, "Edit Item");
102	this, SLOT(editItemSlot()), navigation, "Edit Item");	104	btn->setUsesBigPixmap( useBigIcon );
103	QToolButton *deleteItemButton = new QToolButton(	105	btn = new QToolButton( Opie::Core::OResource::loadPixmap("trash", Opie::Core::OResource::SmallIcon),
104	QIconSet(Resource::loadPixmap("trash")), "Delete Item",	106	"Delete Item", QString::null, this, SLOT(deleteItemSlot()), navigation, "Delete Item");
105	QString::null, this,	107	btn->setUsesBigPixmap( useBigIcon );
106	SLOT(deleteItemSlot()), navigation, "Delete Item");
107		108
@@ -109,32 +110,24 @@ TableViewerWindow::TableViewerWindow(QWidget parent, const char name, WFlags f
109		110
110	QToolButton *firstItemButton = new QToolButton(	111	btn = new QToolButton( Opie::Core::OResource::loadPixmap("fastback", Opie::Core::OResource::SmallIcon),
111	QIconSet(Resource::loadPixmap("fastback")), "First Item",	112	"First Item", QString::null, this, SLOT(firstItem()), navigation, "First Item");
112	QString::null, this,	113	btn->setUsesBigPixmap( useBigIcon );
113	SLOT(firstItem()), navigation, "First Item");	114	btn = new QToolButton( Opie::Core::OResource::loadPixmap("back", Opie::Core::OResource::SmallIcon),
114	QToolButton *previousItemButton = new QToolButton(	115	"Previous Item", QString::null, this, SLOT(previousItem()), navigation, "Previous Item");
115	QIconSet(Resource::loadPixmap("back")), "Previous Item",	116	btn->setUsesBigPixmap( useBigIcon );
116	QString::null, this,	117	btn = new QToolButton( Opie::Core::OResource::loadPixmap("forward", Opie::Core::OResource::SmallIcon),
117	SLOT(previousItem()), navigation, "Previous Item");	118	"Next Item", QString::null, this, SLOT(nextItem()), navigation, "Next Item");
118	QToolButton *nextItemButton = new QToolButton(	119	btn->setUsesBigPixmap( useBigIcon );
119	QIconSet(Resource::loadPixmap("forward")), "Next Item",	120	btn = new QToolButton( Opie::Core::OResource::loadPixmap("fastforward", Opie::Core::OResource::SmallIcon),
120	QString::null, this,	121	"Last Item", QString::null, this, SLOT(lastItem()), navigation, "Last Item");
121	SLOT(nextItem()), navigation, "Next Item");	122	btn->setUsesBigPixmap( useBigIcon );
122	QToolButton *lastItemButton = new QToolButton(
123	QIconSet(Resource::loadPixmap("fastforward")), "Last Item",
124	QString::null, this,
125	SLOT(lastItem()), navigation, "Last Item");
126		123
127	navigation->addSeparator();	124	navigation->addSeparator();
128	QToolButton *browseButton = new QToolButton(	125	btn = new QToolButton( Opie::Core::OResource::loadPixmap("day", Opie::Core::OResource::SmallIcon),
129	QIconSet(Resource::loadPixmap("day")), "View Single Item",	126	"View Single Item", QString::null, this, SLOT(browseViewSlot()), navigation, "View Single Item");
130	QString::null, this,	127	btn->setUsesBigPixmap( useBigIcon );
131	SLOT(browseViewSlot()), navigation, "View Single Item");	128	btn = new QToolButton( Opie::Core::OResource::loadPixmap("month", Opie::Core::OResource::SmallIcon),
132	QToolButton *listButton = new QToolButton(	129	"View Multiple Items", QString::null, this, SLOT(listViewSlot()), navigation, "View Multiple Items");
133	QIconSet(Resource::loadPixmap("month")), "View Multiple Items",	130	btn->setUsesBigPixmap( useBigIcon );
134	QString::null, this,
135	SLOT(listViewSlot()), navigation, "View Multiple Items");
136		131
137	setToolBarsMovable(FALSE);	132	setToolBarsMovable(FALSE);
138	setToolBarsMovable(FALSE);
139	setToolBarsMovable(FALSE);
140		133


diff --git a/noncore/comm/keypebble/kvnc.cpp b/noncore/comm/keypebble/kvnc.cpp index 3a8e919..c089551 100644 --- a/noncore/comm/keypebble/kvnc.cpp +++ b/noncore/comm/keypebble/kvnc.cpp
@@ -1 +1,5 @@
		1	#include <opie2/oresource.h>
		2
		3	#include <qpe/qpeapplication.h>
		4
1	#include <qaction.h>	5	#include <qaction.h>
@@ -5,4 +9,2 @@
5	#include <qlistbox.h>	9	#include <qlistbox.h>
6	#include <qpe/qpeapplication.h>
7	#include <qpe/resource.h>
8		10
@@ -87,4 +89,4 @@ KVNC::KVNC( QWidget parent, const char name, WFlags ) : QMainWindow( parent,
87		89
88	QAction *n = new QAction( tr( "New Connection" ), Resource::loadPixmap( "new" ),	90	QAction *n = new QAction( tr( "New Connection" ), Opie::Core::OResource::loadPixmap( "new",
89	QString::null, 0, this, 0 );	91	Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
90	connect( n, SIGNAL( activated() ),	92	connect( n, SIGNAL( activated() ),
@@ -93,4 +95,4 @@ KVNC::KVNC( QWidget parent, const char name, WFlags ) : QMainWindow( parent,
93		95
94	QAction *o = new QAction( tr( "Open Bookmark" ), Resource::loadPixmap( "fileopen" ),	96	QAction *o = new QAction( tr( "Open Bookmark" ), Opie::Core::OResource::loadPixmap( "fileopen",
95	QString::null, 0, this, 0 );	97	Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
96	connect( o, SIGNAL( activated() ),	98	connect( o, SIGNAL( activated() ),
@@ -99,4 +101,4 @@ KVNC::KVNC( QWidget parent, const char name, WFlags ) : QMainWindow( parent,
99		101
100	QAction *d = new QAction( tr( "Delete Bookmark" ), Resource::loadPixmap( "trash" ),	102	QAction *d = new QAction( tr( "Delete Bookmark" ), Opie::Core::OResource::loadPixmap( "trash",
101	QString::null, 0, this, 0 );	103	Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 );
102	connect( d, SIGNAL( activated() ),	104	connect( d, SIGNAL( activated() ),