sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-09 00:35:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5232 from boundlessgeo/move_project_properties

Browse Source 
[needs-docs] KDE: Moved project properties menu item from settings into the projects menu
This commit is contained in:
Alessandro Pasotti 2017-10-27 21:29:59 +02:00 committed by GitHub
commit 2fdf30c70d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/qgisapp.cpp
View File

@ -2172,10 +2172,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)
@ -2200,20 +2196,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
@ -2228,7 +2215,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 );

3
src/ui/qgisapp.ui
View File

@ -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"/>