| -rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 64 |
1 files changed, 31 insertions, 33 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 @@ -98,22 +98,26 @@ MainWindow :: MainWindow() mb->insertItem( tr( "Packages" ), popup ); - // Search menu + // View 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 ); + 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 ); - 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 ); + actionInstalled = new QAction( tr( "Show installed packages" ), QString::null, 0, this, 0 ); + actionInstalled->setToggleAction( TRUE ); + actionInstalled->setWhatsThis( tr( "Click here to show packages currently installed on this device." ) ); + connect( actionInstalled, SIGNAL( activated() ), this, SLOT( filterInstalledPackages() ) ); + actionInstalled->addTo( popup ); - // Show 'quick jump' keypad? + actionUpdated = new QAction( tr( "Show updated packages" ), QString::null, 0, this, 0 ); + actionUpdated->setToggleAction( TRUE ); + 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(); @@ -128,31 +132,25 @@ MainWindow :: MainWindow() connect( a, SIGNAL( activated() ), this, SLOT( setFilterCategory() ) ); a->addTo( popup ); - mb->insertItem( tr( "Search" ), popup ); - + popup->insertSeparator(); - // View 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 ); - 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 ); + 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 ); - actionInstalled = new QAction( tr( "Show installed packages" ), QString::null, 0, this, 0 ); - actionInstalled->setToggleAction( TRUE ); - actionInstalled->setWhatsThis( tr( "Click here to show packages currently installed on this device." ) ); - connect( actionInstalled, SIGNAL( activated() ), this, SLOT( filterInstalledPackages() ) ); - actionInstalled->addTo( popup ); + mb->insertItem( tr( "View" ), popup ); - actionUpdated = new QAction( tr( "Show updated packages" ), QString::null, 0, this, 0 ); - actionUpdated->setToggleAction( TRUE ); - 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(); + // 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." ) ); @@ -171,7 +169,7 @@ MainWindow :: MainWindow() 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 ); |