[labeling] When in line orientation placement mode, rename above/

below options to left of line/right of line Makes their meaning clearer
qgis · Oct 11, 2016 · c36c242 · c36c242
1 parent 01a402c
commit c36c242
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -2124,6 +2124,20 @@ void QgsLabelingGui::on_mChkNoObstacle_toggled( bool active )
   mObstaclePriorityFrame->setEnabled( active );
 }
 
+void QgsLabelingGui::on_chkLineOrientationDependent_toggled( bool active )
+{
+  if ( active )
+  {
+    chkLineAbove->setText( tr( "Left of line" ) );
+    chkLineBelow->setText( tr( "Right of line" ) );
+  }
+  else
+  {
+    chkLineAbove->setText( tr( "Above line" ) );
+    chkLineBelow->setText( tr( "Below line" ) );
+  }
+}
+
 void QgsLabelingGui::on_mToolButtonConfigureSubstitutes_clicked()
 {
   QgsPanelWidget* panel = QgsPanelWidget::findParentPanel( this );

diff --git a/src/app/qgslabelinggui.h b/src/app/qgslabelinggui.h
@@ -94,6 +94,7 @@ class APP_EXPORT QgsLabelingGui : public QWidget, private Ui::QgsLabelingGuiBase
     void on_mDirectSymbLeftToolBtn_clicked();
     void on_mDirectSymbRightToolBtn_clicked();
     void on_mChkNoObstacle_toggled( bool active );
+    void on_chkLineOrientationDependent_toggled( bool active );
 
     void on_mToolButtonConfigureSubstitutes_clicked();
 

diff --git a/src/ui/qgslabelingguibase.ui b/src/ui/qgslabelingguibase.ui
@@ -618,7 +618,7 @@
               <item>
                <widget class="QStackedWidget" name="mLabelStackedWidget">
                 <property name="currentIndex">
-                 <number>0</number>
+                 <number>5</number>
                 </property>
                 <widget class="QWidget" name="mLabelPage_Text">
                  <layout class="QVBoxLayout" name="verticalLayout_6">
@@ -1439,8 +1439,8 @@ font-style: italic;</string>
                       <rect>
                        <x>0</x>
                        <y>0</y>
-                       <width>466</width>
-                       <height>356</height>
+                       <width>342</width>
+                       <height>338</height>
                       </rect>
                      </property>
                      <layout class="QVBoxLayout" name="verticalLayout_14">
@@ -2074,8 +2074,8 @@ font-style: italic;</string>
                       <rect>
                        <x>0</x>
                        <y>0</y>
-                       <width>466</width>
-                       <height>376</height>
+                       <width>285</width>
+                       <height>245</height>
                       </rect>
                      </property>
                      <layout class="QVBoxLayout" name="verticalLayout_12">
@@ -2456,7 +2456,7 @@ font-style: italic;</string>
                       <rect>
                        <x>0</x>
                        <y>0</y>
-                       <width>452</width>
+                       <width>431</width>
                        <height>628</height>
                       </rect>
                      </property>
@@ -3276,7 +3276,7 @@ font-style: italic;</string>
                       <rect>
                        <x>0</x>
                        <y>0</y>
-                       <width>452</width>
+                       <width>305</width>
                        <height>398</height>
                       </rect>
                      </property>