Fix always disabled layout extent decoration widget

qgis · Aug 2, 2017 · dfac996 · dfac996
1 parent 082dafe
commit dfac996
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 40 deletions.
diff --git a/src/app/qgsdecorationlayoutextentdialog.cpp b/src/app/qgsdecorationlayoutextentdialog.cpp
@@ -40,10 +40,6 @@ QgsDecorationLayoutExtentDialog::QgsDecorationLayoutExtentDialog( QgsDecorationL
   QgsSettings settings;
   restoreGeometry( settings.value( "/Windows/DecorationLayoutExtent/geometry" ).toByteArray() );
 
-  connect( mCheckBoxLabelExtents, &QCheckBox::toggled, mButtonFontStyle, &QPushButton::setEnabled );
-  mCheckBoxLabelExtents->setChecked( false );
-  mButtonFontStyle->setEnabled( false );
-
   updateGuiElements();
   connect( buttonBox->button( QDialogButtonBox::Apply ), &QAbstractButton::clicked, this, &QgsDecorationLayoutExtentDialog::apply );
 

diff --git a/src/ui/qgsdecorationlayoutextentdialog.ui b/src/ui/qgsdecorationlayoutextentdialog.ui
@@ -19,6 +19,9 @@
    </property>
    <item>
     <widget class="QGroupBox" name="grpEnable">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
      <property name="title">
       <string>Show layout extents</string>
      </property>
@@ -31,6 +34,9 @@
      <layout class="QGridLayout" name="gridLayout">
       <item row="1" column="0">
        <widget class="QCheckBox" name="mCheckBoxLabelExtents">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
         <property name="text">
          <string>Label extents</string>
         </property>
@@ -52,7 +58,7 @@
       <item row="0" column="0">
        <widget class="QLabel" name="mLineSymbolLabel">
         <property name="enabled">
-         <bool>false</bool>
+         <bool>true</bool>
         </property>
         <property name="text">
          <string>Symbol</string>
@@ -77,6 +83,9 @@
       </item>
       <item row="1" column="1">
        <widget class="QgsFontButton" name="mButtonFontStyle">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -91,7 +100,7 @@
       <item row="0" column="1">
        <widget class="QgsSymbolButton" name="mSymbolButton">
         <property name="enabled">
-         <bool>false</bool>
+         <bool>true</bool>
         </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -143,38 +152,5 @@
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources/>
- <connections>
-  <connection>
-   <sender>grpEnable</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>mLineSymbolLabel</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>146</x>
-     <y>47</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>108</x>
-     <y>43</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>grpEnable</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>mLineSymbolLabel</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>146</x>
-     <y>47</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>35</x>
-     <y>43</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>