Skip to content
Permalink
Browse files

Move labeling settings button to map item toolbar

  • Loading branch information
nyalldawson committed Dec 17, 2018
1 parent 1b98247 commit 524bc797a7be1ea7460558255a2d483ace26a492
Showing with 56 additions and 64 deletions.
  1. +1 −1 src/app/layout/qgslayoutmapwidget.cpp
  2. +55 −63 src/ui/layout/qgslayoutmapwidgetbase.ui
@@ -78,7 +78,7 @@ QgsLayoutMapWidget::QgsLayoutMapWidget( QgsLayoutItemMap *item )
connect( mOverviewCheckBox, &QgsCollapsibleGroupBoxBasic::toggled, this, &QgsLayoutMapWidget::mOverviewCheckBox_toggled );
connect( mOverviewListWidget, &QListWidget::currentItemChanged, this, &QgsLayoutMapWidget::mOverviewListWidget_currentItemChanged );
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 );
setPanelTitle( tr( "Map Properties" ) );
@@ -71,6 +71,8 @@
<addaction name="mActionViewScaleInCanvas"/>
<addaction name="separator"/>
<addaction name="mActionMoveContent"/>
<addaction name="separator"/>
<addaction name="mActionLabelSettings"/>
</widget>
</item>
<item>
@@ -87,7 +89,7 @@
<x>0</x>
<y>0</y>
<width>368</width>
<height>1373</height>
<height>1253</height>
</rect>
</property>
<property name="sizePolicy">
@@ -297,29 +299,27 @@
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="mXMinLabel">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>X min</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="buddy">
<cstring>mXMinLineEdit</cstring>
</property>
</widget>
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLineEdit" name="mYMinLineEdit"/>
</item>
<item>
<widget class="QgsPropertyOverrideButton" name="mYMinDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLineEdit" name="mXMinLineEdit"/>
<widget class="QLineEdit" name="mXMaxLineEdit"/>
</item>
<item>
<widget class="QgsPropertyOverrideButton" name="mXMinDDBtn">
<widget class="QgsPropertyOverrideButton" name="mXMaxDDBtn">
<property name="text">
<string>…</string>
</property>
@@ -340,13 +340,13 @@
</property>
</widget>
</item>
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QLineEdit" name="mYMinLineEdit"/>
<widget class="QLineEdit" name="mYMaxLineEdit"/>
</item>
<item>
<widget class="QgsPropertyOverrideButton" name="mYMinDDBtn">
<widget class="QgsPropertyOverrideButton" name="mYMaxDDBtn">
<property name="text">
<string>…</string>
</property>
@@ -367,71 +367,52 @@
</property>
</widget>
</item>
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="mXMaxLineEdit"/>
<widget class="QLineEdit" name="mXMinLineEdit"/>
</item>
<item>
<widget class="QgsPropertyOverrideButton" name="mXMaxDDBtn">
<widget class="QgsPropertyOverrideButton" name="mXMinDDBtn">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0">
<widget class="QLabel" name="mYMaxLabel">
<item row="0" column="0">
<widget class="QLabel" name="mXMinLabel">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Y max</string>
<string>X min</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="buddy">
<cstring>mYMaxLineEdit</cstring>
<cstring>mXMinLineEdit</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<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">
<item row="3" column="0">
<widget class="QLabel" name="mYMaxLabel">
<property name="text">
<string>Set to Map Canvas Extent</string>
<string>Y max</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QPushButton" name="mViewExtentInCanvasButton">
<property name="text">
<string>View Extent in Map Canvas</string>
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="buddy">
<cstring>mYMaxLineEdit</cstring>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QPushButton" name="mLabelSettingsButton">
<property name="text">
<string>Label Settings…</string>
</property>
</widget>
</item>
<item>
<widget class="QgsCollapsibleGroupBoxBasic" name="mAtlasCheckBox">
<property name="title">
@@ -877,6 +858,18 @@
<string>Set Map Scale to Match Main Canvas Scale</string>
</property>
</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>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
@@ -954,7 +947,6 @@
<tabstop>mXMaxDDBtn</tabstop>
<tabstop>mYMaxLineEdit</tabstop>
<tabstop>mYMaxDDBtn</tabstop>
<tabstop>mLabelSettingsButton</tabstop>
<tabstop>mAtlasCheckBox</tabstop>
<tabstop>mAtlasMarginRadio</tabstop>
<tabstop>mAtlasMarginSpinBox</tabstop>

0 comments on commit 524bc79

Please sign in to comment.
You can’t perform that action at this time.