qt4-gui: Move accounts to top level of system menu

The account manager should be easy to find as it's probably one of the
first things a new user needs to use.

qt4-gui/src/core/systemmenu.cpp

@@ -73,8 +73,6 @@ SystemMenu::SystemMenu(QWidget* parent)
   myOwnerAdmMenu = new QMenu(tr("S&ystem Functions"), this);
   myOwnerAdmMenu->addAction(tr("&View System Messages..."), gLicqGui, SLOT(showAllOwnerEvents()));
   myOwnerAdmMenu->addSeparator();
-  myOwnerAdmSeparator = myOwnerAdmMenu->addSeparator();
-  myAccountManagerAction = myOwnerAdmMenu->addAction(tr("&Account Manager..."), this, SLOT(showOwnerManagerDlg()));
 
   // Sub menu User Functions
   myUserAdmMenu = new QMenu(tr("User &Functions"), this);
@@ -173,6 +171,7 @@ SystemMenu::SystemMenu(QWidget* parent)
   myShowEmptyGroupsAction = addAction(tr("Sh&ow Empty Groups"), Config::ContactList::instance(), SLOT(setShowEmptyGroups(bool)));
   myShowEmptyGroupsAction->setCheckable(true);
   myOptionsAction = addAction(tr("S&ettings..."), this, SLOT(showSettingsDlg()));
+  myAccountManagerAction = addAction(tr("&Accounts..."), this, SLOT(showOwnerManagerDlg()));
   myKeyManagerAction = addAction(tr("GPG &Key Manager..."), this, SLOT(showGPGKeyManager()));
   if (!Licq::gDaemon.haveGpgSupport())
     myKeyManagerAction->setVisible(false);
@@ -317,7 +316,7 @@ void SystemMenu::addOwner(const Licq::UserId& userId)
       protocol->capabilities(), this);
   QMenu* ownerAdmin = newOwner->getOwnerAdmMenu();
   QMenu* ownerStatus = newOwner->getStatusMenu();
-  myOwnerAdmMenu->insertMenu(myOwnerAdmSeparator, ownerAdmin);
+  myOwnerAdmMenu->addMenu(ownerAdmin);
   myStatusMenu->insertMenu(myStatusSeparator, ownerStatus);
 
   if (myOwnerData.size() < 1)
@@ -327,7 +326,7 @@ void SystemMenu::addOwner(const Licq::UserId& userId)
     ownerAdmin->menuAction()->setVisible(false);
 
     foreach (QAction* a, ownerAdmin->actions())
-      myOwnerAdmMenu->insertAction(myOwnerAdmSeparator, a);
+      myOwnerAdmMenu->addAction(a);
   }
 
   if (myOwnerData.size() == 1)
@@ -371,7 +370,7 @@ void SystemMenu::removeOwner(const Licq::UserId& userId)
     QMenu* lastOwnerAdm = lastOwner->getOwnerAdmMenu();
     lastOwnerAdm->menuAction()->setVisible(false);
     foreach (QAction* a, lastOwnerAdm->actions())
-      myOwnerAdmMenu->insertAction(myOwnerAdmSeparator, a);
+      myOwnerAdmMenu->addAction(a);
   }
 }
 

qt4-gui/src/core/systemmenu.h

@@ -156,13 +156,11 @@ private slots:
   QAction* myShowOfflineAction;
   QAction* myShowEmptyGroupsAction;
   QAction* myOptionsAction;
+  QAction* myAccountManagerAction;
   QAction* myKeyManagerAction;
   QAction* mySaveOptionsAction;
   QAction* myShutdownAction;
 
-  // Actions on system menu
-  QAction* myAccountManagerAction;
-
   // Actions on user menu
   QAction* myAddGroupAction;
   QAction* myUserSearchAction;
@@ -201,7 +199,6 @@ private slots:
   QActionGroup* myUserGroupActions;
   QActionGroup* myFollowMeActions;
 
-  QAction* myOwnerAdmSeparator;
   QAction* myGroupSeparator;
   QAction* myStatusSeparator;
   QAction* myIcqFollowMeSeparator;