| -rw-r--r-- | noncore/apps/opie-bartender/bartender.cpp | 36 | ||||
| -rw-r--r-- | noncore/apps/opie-bartender/opie-bartender.control | 4 |
2 files changed, 20 insertions, 20 deletions
diff --git a/noncore/apps/opie-bartender/bartender.cpp b/noncore/apps/opie-bartender/bartender.cpp index cd0a364..740478f 100644 --- a/noncore/apps/opie-bartender/bartender.cpp +++ b/noncore/apps/opie-bartender/bartender.cpp @@ -20,5 +20,5 @@ #include <qpe/qpetoolbar.h> #include <qmenubar.h> -#include <opie/colorpopupmenu.h> +//#include <opie2/colorpopupmenu.h> #include <qpe/qpeapplication.h> #include <qpe/resource.h> @@ -77,10 +77,10 @@ Bartender::Bartender( QWidget* parent, const char* name, WFlags fl ) fileMenu->insertItem(tr("Find by Drink Name")); fileMenu->insertItem(tr("Find by Alcohol")); - + QPopupMenu *editMenu; editMenu = new QPopupMenu( this); menuBar->insertItem( tr("Edit"), editMenu ); editMenu->insertItem(tr("edit")); - + connect( fileMenu, SIGNAL( activated(int) ), this, SLOT( fileMenuActivated(int) )); connect( editMenu, SIGNAL( activated(int) ), this, SLOT( editMenuActivated(int) )); @@ -106,8 +106,8 @@ Bartender::Bartender( QWidget* parent, const char* name, WFlags fl ) t= new QPushButton( "BAC", ToolBar1, "bacButtin"); connect( t, SIGNAL( clicked() ), this, SLOT( doBac() ) ); - + DrinkView = new QListView( this, "DrinkView" ); DrinkView->addColumn( tr( "Name of Drink" ) ); -// DrinkView->setRootIsDecorated( TRUE ); +// DrinkView->setRootIsDecorated( TRUE ); DrinkView->header()->hide(); @@ -187,8 +187,8 @@ void Bartender::fileNew() { clearList(); dbFile.close(); - + initDrinkDb(); } - delete newDrinks; + delete newDrinks; } @@ -211,5 +211,5 @@ void Bartender::showDrink( QListViewItem *item) { showDrinks = new Show_Drink(this, myDrink, TRUE); QTextStream t( &dbFile); - + QString s, s2; while ( !t.eof()) { @@ -276,5 +276,5 @@ void Bartender::doSearchByDrink() { QStringList searchList; QString searchForDrinkName, lastDrinkName, tempName; - + InputDialog *fileDlg; fileDlg = new InputDialog(this,tr("Find by Alcohol"),TRUE, 0); @@ -285,10 +285,10 @@ void Bartender::doSearchByDrink() { dbFile.at(0); QTextStream t( &dbFile); - + QString s, s2; while ( !t.eof()) { s = t.readLine(); if(s.find("#",0,TRUE) != -1) { - lastDrinkName=s.right(s.length()-2); + lastDrinkName=s.right(s.length()-2); // qDebug("last drink name "+lastDrinkName); } @@ -314,5 +314,5 @@ void Bartender::showSearchResult(QStringList &searchList) { searchList.sort(); - + searchDlg = new Search_Results(this, "Search Results", TRUE); searchDlg->ListBox1->insertStringList( searchList,-1); @@ -376,5 +376,5 @@ void Bartender::doEdit() { int fd = dbFile.handle(); lseek( fd, foundAt, SEEK_SET); - + // dbFile.at( foundAt); #warning FIXME problems with editing drinks db @@ -385,7 +385,7 @@ void Bartender::doEdit() { dbFile.writeBlock( newDrink.latin1(), newDrink.length()); clearList(); - + dbFile.flush(); - + initDrinkDb(); } @@ -425,5 +425,5 @@ void Bartender::fileMenuActivated( int item) { break; - + } } @@ -436,7 +436,7 @@ void Bartender::editMenuActivated(int item) { switch(item) { case -8: - doEdit() ; + doEdit() ; break; - + } } diff --git a/noncore/apps/opie-bartender/opie-bartender.control b/noncore/apps/opie-bartender/opie-bartender.control index acd3304..a8bf860 100644 --- a/noncore/apps/opie-bartender/opie-bartender.control +++ b/noncore/apps/opie-bartender/opie-bartender.control @@ -6,5 +6,5 @@ Maintainer: L.J. Potter <lpotter@trolltech.com> Architecture: arm Version: $QPE_VERSION-$SUB_VERSION -Depends: qpe-base ($QPE_VERSION) +Depends: task-opie-minimal Description: Bartender drink receipe database lookup, and -blood alcohol estimator. + blood alcohol estimator. |