Disable options related to interpretation and threatment of above/bel…

…ow line labeling when online labeling is requested.
qgis · Nov 8, 2011 · 627d25c · 627d25c
1 parent 62ed7ef
commit 627d25c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -190,6 +190,8 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QgsM
   connect( chkBuffer, SIGNAL( toggled( bool ) ), this, SLOT( updateUi() ) );
   connect( chkScaleBasedVisibility, SIGNAL( toggled( bool ) ), this, SLOT( updateUi() ) );
   connect( chkFormattedNumbers, SIGNAL( toggled( bool ) ), this, SLOT( updateUi() ) );
+  connect( chkLineAbove, SIGNAL( toggled( bool ) ), this, SLOT( updateUi() ) );
+  connect( chkLineBelow, SIGNAL( toggled( bool ) ), this, SLOT( updateUi() ) );
 
   // setup connection to changes in the placement
   QRadioButton* placementRadios[] =
@@ -518,6 +520,9 @@ void QgsLabelingGui::updateUi()
   spinScaleMax->setEnabled( scale );
 
   spinDecimals->setEnabled( chkFormattedNumbers->isChecked() );
+
+  bool offline = chkLineAbove->isChecked() || chkLineBelow->isChecked();
+  offlineOptions->setEnabled ( offline );
 }
 
 void QgsLabelingGui::changeBufferColor()

diff --git a/src/ui/qgslabelingguibase.ui b/src/ui/qgslabelingguibase.ui
@@ -821,6 +821,10 @@
                     </property>
                    </widget>
                   </item>
+
+<item><widget class="QWidget" name="offlineOptions"><!-- { -->
+<layout class="QVBoxLayout" name="offlineOptionsLayout">
+
                   <item>
                    <layout class="QHBoxLayout" name="horizontalLayout_13">
                     <item>
@@ -849,6 +853,7 @@
                     </item>
                    </layout>
                   </item>
+
                   <item>
                    <layout class="QHBoxLayout" name="horizontalLayout_14">
                     <item>
@@ -887,6 +892,11 @@
                     </item>
                    </layout>
                   </item>
+
+</layout><!-- offlineOptionsLayout -->
+</widget><!-- offlineOptions } -->
+</item>
+
                  </layout>
                 </widget>
                 <widget class="QWidget" name="pageOptionsEmpty"/>