| -rw-r--r-- | noncore/apps/tableviewer/tableviewer.cpp | 67 | ||||
| -rw-r--r-- | noncore/comm/keypebble/kvnc.cpp | 18 |
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 @@ -27,10 +27,10 @@ #include "db/datacache.h" /* OPIE */ #include <opie2/odebug.h> +#include <opie2/oresource.h> #include <qpe/fileselector.h> -#include <qpe/resource.h> using namespace Opie::Core; /* QT */ #include <qmenubar.h> @@ -92,52 +92,45 @@ TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f QVBoxLayout *main_layout = new QVBoxLayout; /* Build tool bar */ + bool useBigIcon = qApp->desktop()->size().width() > 330; + navigation = new QToolBar(this, "navigation"); - QToolButton *newItemButton = new QToolButton( - QIconSet(Resource::loadPixmap("new")), "New Item", QString::null, - this, SLOT(newItemSlot()), navigation, "New Item"); - QToolButton *editItemButton = new QToolButton( - QIconSet(Resource::loadPixmap("edit")), "Edit Item", QString::null, - this, SLOT(editItemSlot()), navigation, "Edit Item"); - QToolButton *deleteItemButton = new QToolButton( - QIconSet(Resource::loadPixmap("trash")), "Delete Item", - QString::null, this, - SLOT(deleteItemSlot()), navigation, "Delete Item"); + QToolButton *btn = new QToolButton( Opie::Core::OResource::loadPixmap("new", Opie::Core::OResource::SmallIcon), + "New Item", QString::null, this, SLOT(newItemSlot()), navigation, "New Item"); + btn->setUsesBigPixmap( useBigIcon ); + btn = new QToolButton( Opie::Core::OResource::loadPixmap("edit", Opie::Core::OResource::SmallIcon), + "Edit Item", QString::null, this, SLOT(editItemSlot()), navigation, "Edit Item"); + btn->setUsesBigPixmap( useBigIcon ); + btn = new QToolButton( Opie::Core::OResource::loadPixmap("trash", Opie::Core::OResource::SmallIcon), + "Delete Item", QString::null, this, SLOT(deleteItemSlot()), navigation, "Delete Item"); + btn->setUsesBigPixmap( useBigIcon ); navigation->addSeparator(); - QToolButton *firstItemButton = new QToolButton( - QIconSet(Resource::loadPixmap("fastback")), "First Item", - QString::null, this, - SLOT(firstItem()), navigation, "First Item"); - QToolButton *previousItemButton = new QToolButton( - QIconSet(Resource::loadPixmap("back")), "Previous Item", - QString::null, this, - SLOT(previousItem()), navigation, "Previous Item"); - QToolButton *nextItemButton = new QToolButton( - QIconSet(Resource::loadPixmap("forward")), "Next Item", - QString::null, this, - SLOT(nextItem()), navigation, "Next Item"); - QToolButton *lastItemButton = new QToolButton( - QIconSet(Resource::loadPixmap("fastforward")), "Last Item", - QString::null, this, - SLOT(lastItem()), navigation, "Last Item"); + btn = new QToolButton( Opie::Core::OResource::loadPixmap("fastback", Opie::Core::OResource::SmallIcon), + "First Item", QString::null, this, SLOT(firstItem()), navigation, "First Item"); + btn->setUsesBigPixmap( useBigIcon ); + btn = new QToolButton( Opie::Core::OResource::loadPixmap("back", Opie::Core::OResource::SmallIcon), + "Previous Item", QString::null, this, SLOT(previousItem()), navigation, "Previous Item"); + btn->setUsesBigPixmap( useBigIcon ); + btn = new QToolButton( Opie::Core::OResource::loadPixmap("forward", Opie::Core::OResource::SmallIcon), + "Next Item", QString::null, this, SLOT(nextItem()), navigation, "Next Item"); + btn->setUsesBigPixmap( useBigIcon ); + btn = new QToolButton( Opie::Core::OResource::loadPixmap("fastforward", Opie::Core::OResource::SmallIcon), + "Last Item", QString::null, this, SLOT(lastItem()), navigation, "Last Item"); + btn->setUsesBigPixmap( useBigIcon ); navigation->addSeparator(); - QToolButton *browseButton = new QToolButton( - QIconSet(Resource::loadPixmap("day")), "View Single Item", - QString::null, this, - SLOT(browseViewSlot()), navigation, "View Single Item"); - QToolButton *listButton = new QToolButton( - QIconSet(Resource::loadPixmap("month")), "View Multiple Items", - QString::null, this, - SLOT(listViewSlot()), navigation, "View Multiple Items"); + btn = new QToolButton( Opie::Core::OResource::loadPixmap("day", Opie::Core::OResource::SmallIcon), + "View Single Item", QString::null, this, SLOT(browseViewSlot()), navigation, "View Single Item"); + btn->setUsesBigPixmap( useBigIcon ); + btn = new QToolButton( Opie::Core::OResource::loadPixmap("month", Opie::Core::OResource::SmallIcon), + "View Multiple Items", QString::null, this, SLOT(listViewSlot()), navigation, "View Multiple Items"); + btn->setUsesBigPixmap( useBigIcon ); setToolBarsMovable(FALSE); - setToolBarsMovable(FALSE); - setToolBarsMovable(FALSE); /* Build widgets */ browseView = new TVBrowseView(&ts, this, 0); listView = new TVListView(&ts, this, 0); 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,11 +1,13 @@ +#include <opie2/oresource.h> + +#include <qpe/qpeapplication.h> + #include <qaction.h> #include <qpopupmenu.h> #include <qpushbutton.h> #include <qmessagebox.h> #include <qlistbox.h> -#include <qpe/qpeapplication.h> -#include <qpe/resource.h> #include <assert.h> #include "kvnc.h" @@ -84,22 +86,22 @@ KVNC::KVNC( QWidget *parent, const char *name, WFlags ) : QMainWindow( parent, setToolBarsMovable( false ); setRightJustification(false); - QAction *n = new QAction( tr( "New Connection" ), Resource::loadPixmap( "new" ), - QString::null, 0, this, 0 ); + QAction *n = new QAction( tr( "New Connection" ), Opie::Core::OResource::loadPixmap( "new", + Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); connect( n, SIGNAL( activated() ), this, SLOT( newConnection() ) ); n->addTo( bar ); - QAction *o = new QAction( tr( "Open Bookmark" ), Resource::loadPixmap( "fileopen" ), - QString::null, 0, this, 0 ); + QAction *o = new QAction( tr( "Open Bookmark" ), Opie::Core::OResource::loadPixmap( "fileopen", + Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); connect( o, SIGNAL( activated() ), this, SLOT( openConnection() ) ); o->addTo( bar ); - QAction *d = new QAction( tr( "Delete Bookmark" ), Resource::loadPixmap( "trash" ), - QString::null, 0, this, 0 ); + QAction *d = new QAction( tr( "Delete Bookmark" ), Opie::Core::OResource::loadPixmap( "trash", + Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); connect( d, SIGNAL( activated() ), this, SLOT( deleteBookmark() ) ); d->addTo( bar ); } |