summaryrefslogtreecommitdiff
authordrw <drw>2003-01-10 21:36:13 (UTC)
committer drw <drw>2003-01-10 21:36:13 (UTC)
commit5199ee62d5478bbf5a8eb898c148352704f288e7 (patch) (side-by-side diff)
tree15d48407fee127e10569a410659c954533f932c4
parent3d5b0fdc15ed9b3ee392e52254aa9db73e2b7dac (diff)
downloadopie-5199ee62d5478bbf5a8eb898c148352704f288e7.zip
opie-5199ee62d5478bbf5a8eb898c148352704f288e7.tar.gz
opie-5199ee62d5478bbf5a8eb898c148352704f288e7.tar.bz2
Changed menu layout
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/mainwin.cpp68
1 files changed, 33 insertions, 35 deletions
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index e184f6b..e489d2d 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -95,48 +95,15 @@ MainWindow :: MainWindow()
connect( a, SIGNAL( activated() ), networkPkgWindow, SLOT( applyChanges() ) );
a->addTo( popup );
a->addTo( bar );
mb->insertItem( tr( "Packages" ), popup );
- // Search menu
- popup = new QPopupMenu( this );
-
- a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 );
- a->setWhatsThis( tr( "Click here to search for text in package names." ) );
- connect( a, SIGNAL( activated() ), this, SLOT( displayFindBar() ) );
- a->addTo( popup );
-
- actionFindNext = new QAction( tr( "Find next" ), Resource::loadIconSet( "next" ), QString::null, 0, this, 0 );
- actionFindNext->setEnabled( FALSE );
- actionFindNext->setWhatsThis( tr( "Click here to search for the package name containing the text you are searching for." ) );
- connect( actionFindNext, SIGNAL( activated() ), this, SLOT( repeatFind() ) );
- actionFindNext->addTo( popup );
- actionFindNext->addTo( findBar );
-
- // Show 'quick jump' keypad?
-
- popup->insertSeparator();
-
- actionFilter = new QAction( tr( "Filter by category" ), Resource::loadPixmap( "aqpkg/filter" ), QString::null, 0, this, 0 );
- actionFilter->setToggleAction( TRUE );
- actionFilter->setWhatsThis( tr( "Click here to list packages belonging to one category." ) );
- connect( actionFilter, SIGNAL( activated() ), this, SLOT( filterCategory() ) );
- actionFilter->addTo( popup );
-
- a = new QAction( tr( "Set filter category" ), QString::null, 0, this, 0 );
- a->setWhatsThis( tr( "Click here to change package category to used filter." ) );
- connect( a, SIGNAL( activated() ), this, SLOT( setFilterCategory() ) );
- a->addTo( popup );
-
- mb->insertItem( tr( "Search" ), popup );
-
-
// View menu
popup = new QPopupMenu( this );
-
+
actionUninstalled = new QAction( tr( "Show packages not installed" ), QString::null, 0, this, 0 );
actionUninstalled->setToggleAction( TRUE );
actionUninstalled->setWhatsThis( tr( "Click here to show packages available which have not been installed." ) );
connect( actionUninstalled, SIGNAL( activated() ), this, SLOT( filterUninstalledPackages() ) );
actionUninstalled->addTo( popup );
@@ -151,12 +118,43 @@ MainWindow :: MainWindow()
actionUpdated->setWhatsThis( tr( "Click here to show packages currently installed on this device which have a newer version available." ) );
connect( actionUpdated, SIGNAL( activated() ), this, SLOT( filterUpgradedPackages() ) );
actionUpdated->addTo( popup );
popup->insertSeparator();
+ actionFilter = new QAction( tr( "Filter by category" ), Resource::loadPixmap( "aqpkg/filter" ), QString::null, 0, this, 0 );
+ actionFilter->setToggleAction( TRUE );
+ actionFilter->setWhatsThis( tr( "Click here to list packages belonging to one category." ) );
+ connect( actionFilter, SIGNAL( activated() ), this, SLOT( filterCategory() ) );
+ actionFilter->addTo( popup );
+
+ a = new QAction( tr( "Set filter category" ), QString::null, 0, this, 0 );
+ a->setWhatsThis( tr( "Click here to change package category to used filter." ) );
+ connect( a, SIGNAL( activated() ), this, SLOT( setFilterCategory() ) );
+ a->addTo( popup );
+
+ popup->insertSeparator();
+
+ a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 );
+ a->setWhatsThis( tr( "Click here to search for text in package names." ) );
+ connect( a, SIGNAL( activated() ), this, SLOT( displayFindBar() ) );
+ a->addTo( popup );
+
+ actionFindNext = new QAction( tr( "Find next" ), Resource::loadIconSet( "next" ), QString::null, 0, this, 0 );
+ actionFindNext->setEnabled( FALSE );
+ actionFindNext->setWhatsThis( tr( "Click here to find the next package name containing the text you are searching for." ) );
+ connect( actionFindNext, SIGNAL( activated() ), this, SLOT( repeatFind() ) );
+ actionFindNext->addTo( popup );
+ actionFindNext->addTo( findBar );
+
+ mb->insertItem( tr( "View" ), popup );
+
+
+ // Options menu
+ popup = new QPopupMenu( this );
+
a = new QAction( tr( "Configure" ), Resource::loadPixmap( "aqpkg/config" ), QString::null, 0, this, 0 );
a->setWhatsThis( tr( "Click here to configure this application." ) );
connect( a, SIGNAL( activated() ), this, SLOT( displaySettings() ) );
a->addTo( popup );
popup->insertSeparator();
@@ -168,13 +166,13 @@ MainWindow :: MainWindow()
a = new QAction( tr( "About" ), Resource::loadPixmap( "UtilsIcon" ), QString::null, 0, this, 0 );
a->setWhatsThis( tr( "Click here for software version information." ) );
connect( a, SIGNAL( activated() ), this, SLOT( displayAbout() ) );
a->addTo( popup );
- mb->insertItem( tr( "View" ), popup );
+ mb->insertItem( tr( "Options" ), popup );
// Finish find toolbar creation
a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
a->setWhatsThis( tr( "Click here to hide the find toolbar." ) );
connect( a, SIGNAL( activated() ), this, SLOT( hideFindBar() ) );
a->addTo( findBar );