Skip to content

Commit

Permalink
Move labeling settings button to map item toolbar
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Dec 18, 2018
1 parent 1b98247 commit 524bc79
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 64 deletions.
2 changes: 1 addition & 1 deletion src/app/layout/qgslayoutmapwidget.cpp
View file
Expand Up @@ -78,7 +78,7 @@ QgsLayoutMapWidget::QgsLayoutMapWidget( QgsLayoutItemMap *item )
connect( mOverviewCheckBox, &QgsCollapsibleGroupBoxBasic::toggled, this, &QgsLayoutMapWidget::mOverviewCheckBox_toggled ); connect( mOverviewCheckBox, &QgsCollapsibleGroupBoxBasic::toggled, this, &QgsLayoutMapWidget::mOverviewCheckBox_toggled );
connect( mOverviewListWidget, &QListWidget::currentItemChanged, this, &QgsLayoutMapWidget::mOverviewListWidget_currentItemChanged ); connect( mOverviewListWidget, &QListWidget::currentItemChanged, this, &QgsLayoutMapWidget::mOverviewListWidget_currentItemChanged );
connect( mOverviewListWidget, &QListWidget::itemChanged, this, &QgsLayoutMapWidget::mOverviewListWidget_itemChanged ); connect( mOverviewListWidget, &QListWidget::itemChanged, this, &QgsLayoutMapWidget::mOverviewListWidget_itemChanged );
connect( mLabelSettingsButton, &QPushButton::clicked, this, &QgsLayoutMapWidget::showLabelSettings ); connect( mActionLabelSettings, &QAction::triggered, this, &QgsLayoutMapWidget::showLabelSettings );


connect( mActionMoveContent, &QAction::triggered, this, &QgsLayoutMapWidget::switchToMoveContentTool ); connect( mActionMoveContent, &QAction::triggered, this, &QgsLayoutMapWidget::switchToMoveContentTool );
setPanelTitle( tr( "Map Properties" ) ); setPanelTitle( tr( "Map Properties" ) );
Expand Down
118 changes: 55 additions & 63 deletions src/ui/layout/qgslayoutmapwidgetbase.ui
View file
Expand Up @@ -71,6 +71,8 @@
<addaction name="mActionViewScaleInCanvas"/> <addaction name="mActionViewScaleInCanvas"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="mActionMoveContent"/> <addaction name="mActionMoveContent"/>
<addaction name="separator"/>
<addaction name="mActionLabelSettings"/>
</widget> </widget>
</item> </item>
<item> <item>
Expand All @@ -87,7 +89,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>368</width> <width>368</width>
<height>1373</height> <height>1253</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
Expand Down Expand Up @@ -297,29 +299,27 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="1" column="1">
<widget class="QLabel" name="mXMinLabel"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="enabled"> <item>
<bool>true</bool> <widget class="QLineEdit" name="mYMinLineEdit"/>
</property> </item>
<property name="text"> <item>
<string>X min</string> <widget class="QgsPropertyOverrideButton" name="mYMinDDBtn">
</property> <property name="text">
<property name="wordWrap"> <string>…</string>
<bool>false</bool> </property>
</property> </widget>
<property name="buddy"> </item>
<cstring>mXMinLineEdit</cstring> </layout>
</property>
</widget>
</item> </item>
<item row="0" column="1"> <item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<item> <item>
<widget class="QLineEdit" name="mXMinLineEdit"/> <widget class="QLineEdit" name="mXMaxLineEdit"/>
</item> </item>
<item> <item>
<widget class="QgsPropertyOverrideButton" name="mXMinDDBtn"> <widget class="QgsPropertyOverrideButton" name="mXMaxDDBtn">
<property name="text"> <property name="text">
<string>…</string> <string>…</string>
</property> </property>
Expand All @@ -340,13 +340,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<item> <item>
<widget class="QLineEdit" name="mYMinLineEdit"/> <widget class="QLineEdit" name="mYMaxLineEdit"/>
</item> </item>
<item> <item>
<widget class="QgsPropertyOverrideButton" name="mYMinDDBtn"> <widget class="QgsPropertyOverrideButton" name="mYMaxDDBtn">
<property name="text"> <property name="text">
<string>…</string> <string>…</string>
</property> </property>
Expand All @@ -367,71 +367,52 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QLineEdit" name="mXMaxLineEdit"/> <widget class="QLineEdit" name="mXMinLineEdit"/>
</item> </item>
<item> <item>
<widget class="QgsPropertyOverrideButton" name="mXMaxDDBtn"> <widget class="QgsPropertyOverrideButton" name="mXMinDDBtn">
<property name="text"> <property name="text">
<string>…</string> <string>…</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item row="3" column="0"> <item row="0" column="0">
<widget class="QLabel" name="mYMaxLabel"> <widget class="QLabel" name="mXMinLabel">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text"> <property name="text">
<string>Y max</string> <string>X min</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>mYMaxLineEdit</cstring> <cstring>mXMinLineEdit</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_5"> <widget class="QLabel" name="mYMaxLabel">
<item>
<widget class="QLineEdit" name="mYMaxLineEdit"/>
</item>
<item>
<widget class="QgsPropertyOverrideButton" name="mYMaxDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="4" column="0" colspan="2">
<widget class="QPushButton" name="mSetToMapCanvasExtentButton">
<property name="text"> <property name="text">
<string>Set to Map Canvas Extent</string> <string>Y max</string>
</property> </property>
</widget> <property name="wordWrap">
</item> <bool>false</bool>
<item row="5" column="0" colspan="2"> </property>
<widget class="QPushButton" name="mViewExtentInCanvasButton"> <property name="buddy">
<property name="text"> <cstring>mYMaxLineEdit</cstring>
<string>View Extent in Map Canvas</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="mLabelSettingsButton">
<property name="text">
<string>Label Settings…</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QgsCollapsibleGroupBoxBasic" name="mAtlasCheckBox"> <widget class="QgsCollapsibleGroupBoxBasic" name="mAtlasCheckBox">
<property name="title"> <property name="title">
Expand Down Expand Up @@ -877,6 +858,18 @@
<string>Set Map Scale to Match Main Canvas Scale</string> <string>Set Map Scale to Match Main Canvas Scale</string>
</property> </property>
</action> </action>
<action name="mActionLabelSettings">
<property name="icon">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/labelingSingle.svg</normaloff>:/images/themes/default/labelingSingle.svg</iconset>
</property>
<property name="text">
<string>Label Settings</string>
</property>
<property name="toolTip">
<string>Labeling Settings</string>
</property>
</action>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<customwidgets> <customwidgets>
Expand Down Expand Up @@ -954,7 +947,6 @@
<tabstop>mXMaxDDBtn</tabstop> <tabstop>mXMaxDDBtn</tabstop>
<tabstop>mYMaxLineEdit</tabstop> <tabstop>mYMaxLineEdit</tabstop>
<tabstop>mYMaxDDBtn</tabstop> <tabstop>mYMaxDDBtn</tabstop>
<tabstop>mLabelSettingsButton</tabstop>
<tabstop>mAtlasCheckBox</tabstop> <tabstop>mAtlasCheckBox</tabstop>
<tabstop>mAtlasMarginRadio</tabstop> <tabstop>mAtlasMarginRadio</tabstop>
<tabstop>mAtlasMarginSpinBox</tabstop> <tabstop>mAtlasMarginSpinBox</tabstop>
Expand Down

0 comments on commit 524bc79

Please sign in to comment.