Move Configure option under the Actions menu, allowing me to remove the top-level menu 'Options' (which only had the Config entry under it).

1 files changed, 6 insertions, 11 deletions

diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 7fa311d..b597e03 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -129,16 +129,22 @@ MainWindow :: MainWindow()
     actionDownload->addTo( bar );
 
     a = new QAction( tr( "Apply changes" ), Resource::loadPixmap( "aqpkg/apply" ), QString::null, 0, this, 0 );
     a->setWhatsThis( tr( "Click here to install, remove or upgrade currently selected package(s)." ) );
     connect( a, SIGNAL( activated() ), this, SLOT( applyChanges() ) );
     a->addTo( popup );
     a->addTo( bar );
 
+    popup->insertSeparator();
+
+    a = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), QString::null, 0, this, 0 );
+    a->setWhatsThis( tr( "Click here to configure this application." ) );
+    connect( a, SIGNAL( activated() ), this, SLOT( displaySettings() ) );
+    a->addTo( popup );
     mb->insertItem( tr( "Actions" ), 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." ) );
@@ -188,27 +194,16 @@ MainWindow :: MainWindow()
     popup->insertSeparator();
 
     a = new QAction( tr( "Quick Jump keypad" ), Resource::loadPixmap( "aqpkg/keyboard" ),  QString::null, 0, this, 0 );
     a->setWhatsThis( tr( "Click here to display/hide keypad to allow quick movement through the package list." ) );
     connect( a, SIGNAL( activated() ), this, SLOT( displayJumpBar() ) );
     a->addTo( popup );
     
     mb->insertItem( tr( "View" ), popup );
-
-    
-    // Options menu
-    popup = new QPopupMenu( this );
-
-    a = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), QString::null, 0, this, 0 );
-    a->setWhatsThis( tr( "Click here to configure this application." ) );
-    connect( a, SIGNAL( activated() ), this, SLOT( displaySettings() ) );
-    a->addTo( 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 );
     findBar->hide();