summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-bartender/bartender.cpp36
1 files changed, 19 insertions, 17 deletions
diff --git a/noncore/apps/opie-bartender/bartender.cpp b/noncore/apps/opie-bartender/bartender.cpp
index bee164c..57b28d4 100644
--- a/noncore/apps/opie-bartender/bartender.cpp
+++ b/noncore/apps/opie-bartender/bartender.cpp
@@ -20,6 +20,6 @@
/* OPIE */
#include <opie2/odebug.h>
+#include <opie2/oresource.h>
#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
using namespace Opie::Core;
@@ -49,19 +49,16 @@ Bartender::Bartender( QWidget* parent, const char* name, WFlags fl )
: QMainWindow( parent, name, fl ) {
if ( !name )
- setName( "Bartender" );
- QGridLayout *layout = new QGridLayout( this );
- layout->setSpacing( 2);
- layout->setMargin( 2);
+ setName( "Bartender" );
+
connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
setCaption( tr( "Bartender" ) );
- setToolBarsMovable( FALSE );
-
- ToolBar1 = new QToolBar( this, "ToolBar1" );
- ToolBar1->setFixedHeight(22);
- layout->addMultiCellWidget( ToolBar1, 0, 0, 0, 4 );
+ setToolBarsMovable( false );
+ QToolBar *dock = new QToolBar( this );
+ dock->setHorizontalStretchable( true );
- QMenuBar *menuBar = new QMenuBar( ToolBar1 );
+ QMenuBar *menuBar = new QMenuBar( dock );
+ menuBar->setMargin( 0 );
QPopupMenu *fileMenu;
fileMenu = new QPopupMenu( this);
@@ -81,18 +78,23 @@ Bartender::Bartender( QWidget* parent, const char* name, WFlags fl )
connect( editMenu, SIGNAL( activated(int) ), this, SLOT( editMenuActivated(int) ));
+ ToolBar1 = new QToolBar( this );
- QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), "New", 0, this, 0 );
+ QAction *a = new QAction( tr( "New" ), Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
+ "New", 0, this, 0 );
connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
a->addTo( ToolBar1 );
- a = new QAction( tr( "Open" ), Resource::loadPixmap( "bartender/bartender_sm" ), "open", 0, this, 0 );
+ a = new QAction( tr( "Open" ), Opie::Core::OResource::loadPixmap( "bartender/bartender_sm", Opie::Core::OResource::SmallIcon ),
+ "open", 0, this, 0 );
connect( a, SIGNAL( activated() ), this, SLOT( openCurrentDrink() ) );
a->addTo( ToolBar1 );
- a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), "Find", 0, this, 0 );
+ a = new QAction( tr( "Find" ), Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ),
+ "Find", 0, this, 0 );
connect( a, SIGNAL( activated() ), this, SLOT( askSearch() ) );
a->addTo( ToolBar1 );
- a = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ),"Edit", 0, this, 0 );
+ a = new QAction( tr( "Edit" ), Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ),
+ "Edit", 0, this, 0 );
connect( a, SIGNAL( activated() ), this, SLOT( doEdit() ) );
a->addTo( ToolBar1 );
@@ -104,5 +106,4 @@ Bartender::Bartender( QWidget* parent, const char* name, WFlags fl )
DrinkView = new QListView( this, "DrinkView" );
DrinkView->addColumn( tr( "Name of Drink" ) );
-// DrinkView->setRootIsDecorated( TRUE );
DrinkView->header()->hide();
@@ -113,5 +114,4 @@ Bartender::Bartender( QWidget* parent, const char* name, WFlags fl )
this,SLOT( showDrink(int,QListViewItem*,const QPoint&,int)));
- layout->addMultiCellWidget( DrinkView, 1, 2, 0, 4 );
if(QDir("db").exists())
drinkDB.setFile("db/drinkdb.txt");
@@ -122,4 +122,6 @@ Bartender::Bartender( QWidget* parent, const char* name, WFlags fl )
DrinkView->setFocus();
+
+ setCentralWidget( DrinkView );
}