Remove corner widget for profiles. Make it normal menu

Hopefully for now until I work out better UX
qgis · Jul 24, 2017 · b9e545a · 3nids · Jul 24, 2017 · NathanW2
1 parent 601dd41
commit b9e545a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 19 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1283,7 +1283,6 @@ QgisApp::QgisApp()
   , mDatabaseMenu( nullptr )
   , mWebMenu( nullptr )
   , mConfigMenu( nullptr )
-  , mConfigMenuBar( nullptr )
   , mToolPopupOverviews( nullptr )
   , mToolPopupDisplay( nullptr )
   , mMapCanvas( nullptr )
@@ -2302,40 +2301,52 @@ void QgisApp::refreshProfileMenu()
 {
   mConfigMenu->clear();
   QgsUserProfile *profile = userProfileManager()->userProfile();
-  mConfigMenu->setTitle( tr( "&User Profile: %1" ).arg( profile->alias() ) );
+  QString activeName = profile->name();
+  mConfigMenu->setTitle( tr( "&User Profiles" ) );
+
+  mConfigMenu->addSection( tr( "Active Profile" ) );
+
+  QAction *profileSection = mConfigMenu->addSection( tr( "Profiles" ) );
+
+  QAction *configSection = mConfigMenu->addSection( tr( "Config" ) );
+
+  QAction *openProfileFolderAction = mConfigMenu->addAction( tr( "Open current profile folder" ) );
+  connect( openProfileFolderAction, &QAction::triggered, this, [this]()
+  {
+    QDesktopServices::openUrl( QUrl::fromLocalFile( userProfileManager()->userProfile()->folder() ) );
+  } );
+
+  QAction *newProfileAction = mConfigMenu->addAction( tr( "New profile" ) );
+  connect( newProfileAction, &QAction::triggered, this, &QgisApp::newProfile );
 
   Q_FOREACH ( const QString &name, userProfileManager()->allProfiles() )
   {
     profile = userProfileManager()->profileForName( name );
-    QAction *action = mConfigMenu->addAction( profile->icon(), profile->alias() );
+    QAction *action = new QAction( profile->icon(), profile->alias() );
+    action->setToolTip( profile->folder() );
     action->setToolTip( profile->folder() );
     delete profile;
+
+    if ( name == activeName )
+    {
+      mConfigMenu->insertAction( profileSection, action );
+    }
+    else
+    {
+      mConfigMenu->insertAction( configSection, action );
+    }
     connect( action, &QAction::triggered, this, [this, name]()
     {
       userProfileManager()->loadUserProfile( name );
     } );
   }
-  mConfigMenu->addSeparator();
-  QAction *openProfileFolderAction = mConfigMenu->addAction( tr( "Open profile folder" ) );
-  connect( openProfileFolderAction, &QAction::triggered, this, [this]()
-  {
-    QDesktopServices::openUrl( QUrl::fromLocalFile( userProfileManager()->userProfile()->folder() ) );
-  } );
-
-  QAction *newProfileAction = mConfigMenu->addAction( tr( "New profile" ) );
-  connect( newProfileAction, &QAction::triggered, this, &QgisApp::newProfile );
 }
 
 void QgisApp::createProfileMenu()
 {
   mConfigMenu = new QMenu();
-  mConfigMenu->addSeparator();
-  mConfigMenu->addAction( tr( "Manage Configs" ) );
 
-  mConfigMenuBar = new QMenuBar( menuBar() );
-  mConfigMenuBar->addMenu( mConfigMenu );
-  menuBar()->setCornerWidget( mConfigMenuBar );
-  mConfigMenuBar->show();
+  menuBar()->addMenu( mConfigMenu );
 
   refreshProfileMenu();
 }

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -1891,7 +1891,6 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     QMenu *mWebMenu = nullptr;
 
     QMenu *mConfigMenu = nullptr;
-    QMenuBar *mConfigMenuBar = nullptr;
 
     //! Popup menu for the map overview tools
     QMenu *mToolPopupOverviews = nullptr;