[composer] Improved fix for tab order in item widgets

Setting the focus policy to strong for QgsCollapsibleGroupBoxes in Qt designer allows for the tab order to be correctly set.
qgis · Oct 20, 2014 · 447ec0f · 447ec0f
1 parent 9dff7ab
commit 447ec0f
Show file tree

Hide file tree

Showing 14 changed files with 214 additions and 16 deletions.
diff --git a/src/ui/qgsatlascompositionwidgetbase.ui b/src/ui/qgsatlascompositionwidgetbase.ui
@@ -79,6 +79,9 @@
       </item>
       <item row="1" column="0" colspan="3">
        <widget class="QScrollArea" name="scrollArea">
+        <property name="focusPolicy">
+         <enum>Qt::WheelFocus</enum>
+        </property>
         <property name="widgetResizable">
          <bool>true</bool>
         </property>
@@ -103,6 +106,9 @@
             <property name="enabled">
              <bool>false</bool>
             </property>
+            <property name="focusPolicy">
+             <enum>Qt::StrongFocus</enum>
+            </property>
             <property name="title">
              <string>Configuration</string>
             </property>
@@ -185,6 +191,9 @@
             <property name="enabled">
              <bool>false</bool>
             </property>
+            <property name="focusPolicy">
+             <enum>Qt::StrongFocus</enum>
+            </property>
             <property name="title">
              <string>Output</string>
             </property>
@@ -300,12 +309,13 @@
  </customwidgets>
  <tabstops>
   <tabstop>mUseAtlasCheckBox</tabstop>
-  <tabstop>scrollArea</tabstop>
+  <tabstop>mConfigurationGroup</tabstop>
   <tabstop>mAtlasCoverageLayerComboBox</tabstop>
   <tabstop>mAtlasHideCoverageCheckBox</tabstop>
   <tabstop>mAtlasFeatureFilterCheckBox</tabstop>
   <tabstop>mAtlasFeatureFilterEdit</tabstop>
   <tabstop>mAtlasFeatureFilterButton</tabstop>
+  <tabstop>mOutputGroup</tabstop>
   <tabstop>mAtlasFilenamePatternEdit</tabstop>
   <tabstop>mAtlasFilenameExpressionButton</tabstop>
   <tabstop>mAtlasSingleFileCheckBox</tabstop>

diff --git a/src/ui/qgscomposerarrowwidgetbase.ui b/src/ui/qgscomposerarrowwidgetbase.ui
@@ -17,16 +17,7 @@
    <property name="spacing">
     <number>0</number>
    </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
+   <property name="margin">
     <number>0</number>
    </property>
    <item>
@@ -56,12 +47,15 @@
         <x>0</x>
         <y>0</y>
         <width>332</width>
-        <height>364</height>
+        <height>360</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="mainLayout">
        <item>
         <widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="title">
           <string>Main properties</string>
          </property>
@@ -84,6 +78,9 @@
        </item>
        <item>
         <widget class="QgsCollapsibleGroupBoxBasic" name="mArrowMarkersGroupBox">
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="title">
           <string>Arrow markers</string>
          </property>
@@ -279,8 +276,26 @@
    <class>QgsColorButtonV2</class>
    <extends>QToolButton</extends>
    <header>qgscolorbuttonv2.h</header>
+   <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>scrollArea</tabstop>
+  <tabstop>groupBox</tabstop>
+  <tabstop>mLineStyleButton</tabstop>
+  <tabstop>mArrowMarkersGroupBox</tabstop>
+  <tabstop>mDefaultMarkerRadioButton</tabstop>
+  <tabstop>mNoMarkerRadioButton</tabstop>
+  <tabstop>mSvgMarkerRadioButton</tabstop>
+  <tabstop>mArrowHeadOutlineColorButton</tabstop>
+  <tabstop>mArrowHeadFillColorButton</tabstop>
+  <tabstop>mOutlineWidthSpinBox</tabstop>
+  <tabstop>mArrowHeadWidthSpinBox</tabstop>
+  <tabstop>mStartMarkerLineEdit</tabstop>
+  <tabstop>mStartMarkerToolButton</tabstop>
+  <tabstop>mEndMarkerLineEdit</tabstop>
+  <tabstop>mEndMarkerToolButton</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/ui/qgscomposerattributetablewidgetbase.ui b/src/ui/qgscomposerattributetablewidgetbase.ui
@@ -53,6 +53,9 @@
       <layout class="QVBoxLayout" name="mainLayout">
        <item>
         <widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="title">
           <string>Main properties</string>
          </property>
@@ -122,6 +125,9 @@
        </item>
        <item>
         <widget class="QgsCollapsibleGroupBoxBasic" name="groupBox_5">
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="title">
           <string>Feature filtering</string>
          </property>
@@ -227,6 +233,9 @@
        </item>
        <item>
         <widget class="QgsCollapsibleGroupBoxBasic" name="groupBox_6">
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="title">
           <string>Appearance</string>
          </property>
@@ -358,6 +367,9 @@
        </item>
        <item>
         <widget class="QgsCollapsibleGroupBoxBasic" name="mShowGridGroupCheckBox">
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="title">
           <string>Show grid</string>
          </property>
@@ -439,6 +451,9 @@
        </item>
        <item>
         <widget class="QgsCollapsibleGroupBoxBasic" name="groupBox_3">
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="title">
           <string>Fonts and text styling</string>
          </property>
@@ -623,6 +638,9 @@
        </item>
        <item>
         <widget class="QgsCollapsibleGroupBoxBasic" name="frameGroupBox">
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="title">
           <string>Frames</string>
          </property>
@@ -697,6 +715,7 @@
    <class>QgsColorButtonV2</class>
    <extends>QToolButton</extends>
    <header>qgscolorbuttonv2.h</header>
+   <container>1</container>
   </customwidget>
   <customwidget>
    <class>QgsMapLayerComboBox</class>
@@ -706,11 +725,13 @@
  </customwidgets>
  <tabstops>
   <tabstop>scrollArea</tabstop>
+  <tabstop>groupBox</tabstop>
   <tabstop>mSourceComboBox</tabstop>
   <tabstop>mLayerComboBox</tabstop>
   <tabstop>mRelationsComboBox</tabstop>
   <tabstop>mRefreshPushButton</tabstop>
   <tabstop>mAttributesPushButton</tabstop>
+  <tabstop>groupBox_5</tabstop>
   <tabstop>mMaximumRowsSpinBox</tabstop>
   <tabstop>mUniqueOnlyCheckBox</tabstop>
   <tabstop>mShowOnlyVisibleFeaturesCheckBox</tabstop>
@@ -719,6 +740,7 @@
   <tabstop>mFeatureFilterCheckBox</tabstop>
   <tabstop>mFeatureFilterEdit</tabstop>
   <tabstop>mFeatureFilterButton</tabstop>
+  <tabstop>groupBox_6</tabstop>
   <tabstop>mDrawEmptyCheckBox</tabstop>
   <tabstop>mMarginSpinBox</tabstop>
   <tabstop>mHeaderModeComboBox</tabstop>
@@ -728,11 +750,13 @@
   <tabstop>mShowGridGroupCheckBox</tabstop>
   <tabstop>mGridStrokeWidthSpinBox</tabstop>
   <tabstop>mGridColorButton</tabstop>
+  <tabstop>groupBox_3</tabstop>
   <tabstop>mHeaderFontPushButton</tabstop>
   <tabstop>mHeaderFontColorButton</tabstop>
   <tabstop>mHeaderHAlignmentComboBox</tabstop>
   <tabstop>mContentFontPushButton</tabstop>
   <tabstop>mContentFontColorButton</tabstop>
+  <tabstop>frameGroupBox</tabstop>
   <tabstop>mResizeModeComboBox</tabstop>
   <tabstop>mAddFramePushButton</tabstop>
   <tabstop>mEmptyFrameCheckBox</tabstop>

diff --git a/src/ui/qgscomposerhtmlwidgetbase.ui b/src/ui/qgscomposerhtmlwidgetbase.ui
@@ -53,6 +53,9 @@
       <layout class="QVBoxLayout" name="mainLayout">
        <item>
         <widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="title">
           <string>HTML Source</string>
          </property>
@@ -130,6 +133,9 @@
        </item>
        <item>
         <widget class="QgsCollapsibleGroupBoxBasic" name="frameGroupBox">
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="title">
           <string>Frames</string>
          </property>
@@ -286,6 +292,7 @@
  </customwidgets>
  <tabstops>
   <tabstop>scrollArea</tabstop>
+  <tabstop>groupBox</tabstop>
   <tabstop>mRadioUrlSource</tabstop>
   <tabstop>mUrlLineEdit</tabstop>
   <tabstop>mFileToolButton</tabstop>
@@ -294,6 +301,7 @@
   <tabstop>mInsertExpressionButton</tabstop>
   <tabstop>mEvaluateExpressionsCheckbox</tabstop>
   <tabstop>mReloadPushButton</tabstop>
+  <tabstop>frameGroupBox</tabstop>
   <tabstop>mResizeModeComboBox</tabstop>
   <tabstop>mAddFramePushButton</tabstop>
   <tabstop>mEmptyFrameCheckBox</tabstop>

diff --git a/src/ui/qgscomposeritemwidgetbase.ui b/src/ui/qgscomposeritemwidgetbase.ui
@@ -19,6 +19,9 @@
    </property>
    <item>
     <widget class="QgsCollapsibleGroupBoxBasic" name="mGeneralOptionsGroupBox">
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
+     </property>
      <property name="title">
       <string>Position and size</string>
      </property>
@@ -308,6 +311,9 @@
    </item>
    <item>
     <widget class="QgsCollapsibleGroupBoxBasic" name="mTransformsGroupBox">
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
+     </property>
      <property name="title">
       <string>Rotation</string>
      </property>
@@ -537,6 +543,9 @@
    </item>
    <item>
     <widget class="QgsCollapsibleGroupBoxBasic" name="groupBox">
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
+     </property>
      <property name="title">
       <string>Item ID</string>
      </property>
@@ -562,6 +571,9 @@
    </item>
    <item>
     <widget class="QgsCollapsibleGroupBoxBasic" name="groupRendering">
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
+     </property>
      <property name="title">
       <string>Rendering</string>
      </property>
@@ -683,6 +695,7 @@
    <class>QgsColorButtonV2</class>
    <extends>QToolButton</extends>
    <header>qgscolorbuttonv2.h</header>
+   <container>1</container>
   </customwidget>
   <customwidget>
    <class>QgsPenJoinStyleComboBox</class>
@@ -696,6 +709,7 @@
   </customwidget>
  </customwidgets>
  <tabstops>
+  <tabstop>mGeneralOptionsGroupBox</tabstop>
   <tabstop>mPageSpinBox</tabstop>
   <tabstop>mXPosSpin</tabstop>
   <tabstop>mXPositionDDBtn</tabstop>
@@ -714,6 +728,7 @@
   <tabstop>mLowerLeftCheckBox</tabstop>
   <tabstop>mLowerMiddleCheckBox</tabstop>
   <tabstop>mLowerRightCheckBox</tabstop>
+  <tabstop>mTransformsGroupBox</tabstop>
   <tabstop>mItemRotationSpinBox</tabstop>
   <tabstop>mItemRotationDDBtn</tabstop>
   <tabstop>mFrameGroupBox</tabstop>
@@ -722,7 +737,9 @@
   <tabstop>mFrameJoinStyleCombo</tabstop>
   <tabstop>mBackgroundGroupBox</tabstop>
   <tabstop>mBackgroundColorButton</tabstop>
+  <tabstop>groupBox</tabstop>
   <tabstop>mItemIdLineEdit</tabstop>
+  <tabstop>groupRendering</tabstop>
   <tabstop>mBlendModeCombo</tabstop>
   <tabstop>mBlendModeDDBtn</tabstop>
   <tabstop>mTransparencySlider</tabstop>

diff --git a/src/ui/qgscomposerlabelwidgetbase.ui b/src/ui/qgscomposerlabelwidgetbase.ui
@@ -59,6 +59,9 @@
       <layout class="QVBoxLayout" name="mainLayout">
        <item>
         <widget class="QgsCollapsibleGroupBoxBasic" name="mTextGroupBox">
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="title">
           <string>Main properties</string>
          </property>
@@ -98,6 +101,9 @@
        </item>
        <item>
         <widget class="QgsCollapsibleGroupBoxBasic" name="mAppearanceGroup">
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="title">
           <string>Appearance</string>
          </property>
@@ -313,13 +319,16 @@
    <class>QgsColorButtonV2</class>
    <extends>QToolButton</extends>
    <header>qgscolorbuttonv2.h</header>
+   <container>1</container>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>scrollArea</tabstop>
+  <tabstop>mTextGroupBox</tabstop>
   <tabstop>mTextEdit</tabstop>
   <tabstop>mHtmlCheckBox</tabstop>
   <tabstop>mInsertExpressionButton</tabstop>
+  <tabstop>mAppearanceGroup</tabstop>
   <tabstop>mFontButton</tabstop>
   <tabstop>mFontColorButton</tabstop>
   <tabstop>mMarginDoubleSpinBox</tabstop>