From bc982aee52989591760103b738bcbedb639c0999 Mon Sep 17 00:00:00 2001
From: Alessandro Pasotti <apasotti@boundlessgeo.com>
Date: Thu, 21 Sep 2017 15:12:51 +0200
Subject: [PATCH] Moved project properties menu item

---
 src/app/qgisapp.cpp | 15 +--------------
 src/ui/qgisapp.ui   |  3 ++-
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index 0dd9a882856..b9528c90d54 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -2087,10 +2087,6 @@ void QgisApp::createMenus()
    * The User Interface Guidelines for each platform specify different locations
    * for the following items.
    *
-   * Project Properties:
-   * Gnome, Mac, Win - File/Project menu above print commands (Win doesn't specify)
-   * Kde - Settings menu
-   *
    * Custom CRS, Options:
    * Gnome - bottom of Edit menu
    * Mac - Application menu (moved automatically by Qt)
@@ -2115,20 +2111,11 @@ void QgisApp::createMenus()
   QDialogButtonBox::ButtonLayout layout =
     QDialogButtonBox::ButtonLayout( style()->styleHint( QStyle::SH_DialogButtonLayout, nullptr, this ) );
 
-  // Project Menu
-
   // Connect once for the entire submenu.
   connect( mRecentProjectsMenu, &QMenu::triggered, this, static_cast < void ( QgisApp::* )( QAction *action ) >( &QgisApp::openProject ) );
   connect( mProjectFromTemplateMenu, &QMenu::triggered,
            this, &QgisApp::fileNewFromTemplateAction );
 
-  if ( layout == QDialogButtonBox::GnomeLayout || layout == QDialogButtonBox::MacLayout || layout == QDialogButtonBox::WinLayout )
-  {
-    QAction *before = mActionNewPrintComposer;
-    mSettingsMenu->removeAction( mActionProjectProperties );
-    mProjectMenu->insertAction( before, mActionProjectProperties );
-    mProjectMenu->insertSeparator( before );
-  }
 
   // View Menu
 
@@ -2143,7 +2130,7 @@ void QgisApp::createMenus()
   else
   {
     // on the top of the settings menu
-    QAction *before = mActionProjectProperties;
+    QAction *before = mSettingsMenu->actions().first();
     mSettingsMenu->insertMenu( before, mPanelMenu );
     mSettingsMenu->insertMenu( before, mToolbarMenu );
     mSettingsMenu->insertAction( before, mActionToggleFullScreen );
diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
index bf469bfa0e2..3b54d65138f 100755
--- a/src/ui/qgisapp.ui
+++ b/src/ui/qgisapp.ui
@@ -56,6 +56,8 @@
     <addaction name="separator"/>
     <addaction name="mActionSnappingOptions"/>
     <addaction name="separator"/>
+    <addaction name="mActionProjectProperties"/>
+    <addaction name="separator"/>
     <addaction name="mActionNewPrintComposer"/>
     <addaction name="mActionShowComposerManager"/>
     <addaction name="mPrintComposersMenu"/>
@@ -217,7 +219,6 @@
     <property name="title">
      <string>&amp;Settings</string>
     </property>
-    <addaction name="mActionProjectProperties"/>
     <addaction name="mActionStyleManager"/>
     <addaction name="mActionCustomProjection"/>
     <addaction name="separator"/>