Navigation Menu

Skip to content

Commit

Permalink
Fix tab focus order in dialogs (#4013)
Browse files Browse the repository at this point in the history
  • Loading branch information
@DelazJ @nirvn
DelazJ authored and nirvn committed Jan 22, 2017
1 parent 66f5d06 commit 57aee18
Show file tree
Hide file tree
Showing 54 changed files with 738 additions and 363 deletions.
13 changes: 3 additions & 10 deletions src/ui/composer/qgscomposerattributetablewidgetbase.ui
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -840,6 +831,8 @@
<tabstop>mShowGridGroupCheckBox</tabstop>
<tabstop>mGridStrokeWidthSpinBox</tabstop>
<tabstop>mGridColorButton</tabstop>
<tabstop>mDrawHorizontalGrid</tabstop>
<tabstop>mDrawVerticalGrid</tabstop>
<tabstop>groupBox_3</tabstop>
<tabstop>mHeaderFontPushButton</tabstop>
<tabstop>mHeaderFontColorButton</tabstop>
Expand Down
3 changes: 3 additions & 0 deletions src/ui/composer/qgscomposermapgridwidgetbase.ui
View file
Expand Up @@ -777,6 +777,7 @@
<tabstop>mGridLineStyleButton</tabstop>
<tabstop>mGridMarkerStyleButton</tabstop>
<tabstop>mGridBlendComboBox</tabstop>
<tabstop>mGridFrameGroupBox</tabstop>
<tabstop>mFrameStyleComboBox</tabstop>
<tabstop>mFrameWidthSpinBox</tabstop>
<tabstop>mGridFramePenSizeSpinBox</tabstop>
Expand All @@ -791,6 +792,7 @@
<tabstop>mCheckGridRightSide</tabstop>
<tabstop>mCheckGridTopSide</tabstop>
<tabstop>mCheckGridBottomSide</tabstop>
<tabstop>mDrawAnnotationGroupBox</tabstop>
<tabstop>mAnnotationFormatComboBox</tabstop>
<tabstop>mAnnotationFormatButton</tabstop>
<tabstop>mAnnotationDisplayLeftComboBox</tabstop>
Expand All @@ -806,6 +808,7 @@
<tabstop>mAnnotationPositionBottomComboBox</tabstop>
<tabstop>mAnnotationDirectionComboBoxBottom</tabstop>
<tabstop>mAnnotationFontButton</tabstop>
<tabstop>mAnnotationFontColorButton</tabstop>
<tabstop>mDistanceToMapFrameSpinBox</tabstop>
<tabstop>mCoordinatePrecisionSpinBox</tabstop>
</tabstops>
Expand Down
15 changes: 4 additions & 11 deletions src/ui/composer/qgscomposermapwidgetbase.ui
View file
Expand Up @@ -23,16 +23,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>
Expand Down Expand Up @@ -827,8 +818,8 @@
</customwidget>
</customwidgets>
<tabstops>
<tabstop>groupBox</tabstop>
<tabstop>scrollArea</tabstop>
<tabstop>groupBox</tabstop>
<tabstop>mPreviewModeComboBox</tabstop>
<tabstop>mUpdatePreviewButton</tabstop>
<tabstop>mScaleLineEdit</tabstop>
Expand Down Expand Up @@ -867,6 +858,8 @@
<tabstop>mGridUpButton</tabstop>
<tabstop>mGridDownButton</tabstop>
<tabstop>mGridListWidget</tabstop>
<tabstop>mDrawGridCheckBox</tabstop>
<tabstop>mGridPropertiesButton</tabstop>
<tabstop>mOverviewsGroupBox</tabstop>
<tabstop>mAddOverviewPushButton</tabstop>
<tabstop>mRemoveOverviewPushButton</tabstop>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/composer/qgscomposerpolygonwidgetbase.ui
View file
Expand Up @@ -104,8 +104,8 @@
</customwidget>
</customwidgets>
<tabstops>
<tabstop>groupBox</tabstop>
<tabstop>scrollArea</tabstop>
<tabstop>groupBox</tabstop>
<tabstop>mPolygonStyleButton</tabstop>
</tabstops>
<resources/>
Expand Down
1 change: 1 addition & 0 deletions src/ui/composer/qgscomposerpolylinewidgetbase.ui
View file
Expand Up @@ -92,6 +92,7 @@
</customwidgets>
<tabstops>
<tabstop>scrollArea</tabstop>
<tabstop>groupBox</tabstop>
<tabstop>mLineStyleButton</tabstop>
</tabstops>
<resources/>
Expand Down
14 changes: 14 additions & 0 deletions src/ui/editorwidgets/qgsdatetimeeditconfig.ui
View file
Expand Up @@ -242,12 +242,26 @@
<property name="enabled">
<bool>false</bool>
</property>
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<tabstops>
<tabstop>mFieldFormatComboBox</tabstop>
<tabstop>mFieldFormatEdit</tabstop>
<tabstop>mFieldHelpToolButton</tabstop>
<tabstop>mDisplayFormatComboBox</tabstop>
<tabstop>mDisplayFormatEdit</tabstop>
<tabstop>mDisplayHelpToolButton</tabstop>
<tabstop>mCalendarPopupCheckBox</tabstop>
<tabstop>mAllowNullCheckBox</tabstop>
<tabstop>mHelpScrollArea</tabstop>
</tabstops>
<resources>
<include location="../../../images/images.qrc"/>
</resources>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/editorwidgets/qgsexternalresourceconfigdlg.ui
View file
Expand Up @@ -45,7 +45,7 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-210</y>
<y>0</y>
<width>465</width>
<height>621</height>
</rect>
Expand Down
7 changes: 4 additions & 3 deletions src/ui/editorwidgets/qgsrangeconfigdlgbase.ui
View file
Expand Up @@ -227,13 +227,14 @@
</customwidgets>
<tabstops>
<tabstop>rangeWidget</tabstop>
<tabstop>minimumDoubleSpinBox</tabstop>
<tabstop>maximumDoubleSpinBox</tabstop>
<tabstop>stepDoubleSpinBox</tabstop>
<tabstop>minimumSpinBox</tabstop>
<tabstop>maximumSpinBox</tabstop>
<tabstop>stepSpinBox</tabstop>
<tabstop>minimumDoubleSpinBox</tabstop>
<tabstop>maximumDoubleSpinBox</tabstop>
<tabstop>stepDoubleSpinBox</tabstop>
<tabstop>allowNullCheckBox</tabstop>
<tabstop>groupBox</tabstop>
<tabstop>suffixLineEdit</tabstop>
</tabstops>
<resources/>
Expand Down
10 changes: 8 additions & 2 deletions src/ui/editorwidgets/qgsrelationreferenceconfigdlgbase.ui
View file
Expand Up @@ -39,7 +39,11 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QgsFieldExpressionWidget" name="mExpressionWidget" native="true"/>
<widget class="QgsFieldExpressionWidget" name="mExpressionWidget" native="true">
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
Expand Down Expand Up @@ -100,7 +104,7 @@
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../images/images.qrc">
<iconset>
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
</property>
</widget>
Expand Down Expand Up @@ -172,12 +176,14 @@
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mExpressionWidget</tabstop>
<tabstop>mComboRelation</tabstop>
<tabstop>mCbxAllowNull</tabstop>
<tabstop>mCbxOrderByValue</tabstop>
<tabstop>mCbxShowForm</tabstop>
<tabstop>mCbxMapIdentification</tabstop>
<tabstop>mCbxReadOnly</tabstop>
<tabstop>mCbxAllowAddFeatures</tabstop>
<tabstop>mFilterGroupBox</tabstop>
<tabstop>mAvailableFieldsList</tabstop>
<tabstop>mAddFilterButton</tabstop>
Expand Down
7 changes: 7 additions & 0 deletions src/ui/editorwidgets/qgsvaluemapconfigdlgbase.ui
View file
Expand Up @@ -94,6 +94,13 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>loadFromLayerButton</tabstop>
<tabstop>loadFromCSVButton</tabstop>
<tabstop>tableWidget</tabstop>
<tabstop>addNullButton</tabstop>
<tabstop>removeSelectedButton</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
1 change: 0 additions & 1 deletion src/ui/qgsaddattrdialogbase.ui
View file
Expand Up @@ -128,7 +128,6 @@
<tabstop>mTypeBox</tabstop>
<tabstop>mLength</tabstop>
<tabstop>mPrec</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
<connections>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgsaddtaborgroupbase.ui
View file
Expand Up @@ -115,7 +115,7 @@
<tabstop>mTabButton</tabstop>
<tabstop>mGroupButton</tabstop>
<tabstop>mTabList</tabstop>
<tabstop>buttonBox</tabstop>
<tabstop>mColumnCountSpinBox</tabstop>
</tabstops>
<resources/>
<connections>
Expand Down
1 change: 1 addition & 0 deletions src/ui/qgsalignrasterdialog.ui
View file
Expand Up @@ -237,6 +237,7 @@
<tabstop>mViewLayers</tabstop>
<tabstop>mCboReferenceLayer</tabstop>
<tabstop>mChkCustomCRS</tabstop>
<tabstop>mCrsSelector</tabstop>
<tabstop>mChkCustomCellSize</tabstop>
<tabstop>mSpinCellSizeX</tabstop>
<tabstop>mSpinCellSizeY</tabstop>
Expand Down
6 changes: 5 additions & 1 deletion src/ui/qgsattributeactiondialogbase.ui
View file
Expand Up @@ -255,11 +255,15 @@
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mAttributeActionTable</tabstop>
<tabstop>groupBoxActionList</tabstop>
<tabstop>mMoveUpButton</tabstop>
<tabstop>mMoveDownButton</tabstop>
<tabstop>mRemoveButton</tabstop>
<tabstop>mAddButton</tabstop>
<tabstop>mAddDefaultActionsButton</tabstop>
<tabstop>mShowInAttributeTable</tabstop>
<tabstop>mAttributeTableWidgetType</tabstop>
<tabstop>mAttributeActionTable</tabstop>
</tabstops>
<resources>
<include location="../../images/images.qrc"/>
Expand Down
11 changes: 10 additions & 1 deletion src/ui/qgsattributeactionpropertiesdialogbase.ui
View file
Expand Up @@ -136,7 +136,11 @@
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QgsFieldExpressionWidget" name="mFieldExpression"/>
<widget class="QgsFieldExpressionWidget" name="mFieldExpression">
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mInsertFieldOrExpression">
Expand Down Expand Up @@ -252,6 +256,9 @@
</item>
<item row="4" column="0" colspan="3">
<widget class="QGroupBox" name="mActionScopesGroupBox">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="title">
<string>Action Scopes</string>
</property>
Expand Down Expand Up @@ -281,7 +288,9 @@
<tabstop>mShortTitle</tabstop>
<tabstop>mActionIcon</tabstop>
<tabstop>mChooseIconButton</tabstop>
<tabstop>mActionScopesGroupBox</tabstop>
<tabstop>mBrowseButton</tabstop>
<tabstop>mFieldExpression</tabstop>
<tabstop>mInsertFieldOrExpression</tabstop>
</tabstops>
<resources>
Expand Down
4 changes: 4 additions & 0 deletions src/ui/qgsattributetabledialog.ui
View file
Expand Up @@ -240,6 +240,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
</item>
<item>
Expand Down Expand Up @@ -651,6 +654,7 @@
</customwidgets>
<tabstops>
<tabstop>mFieldCombo</tabstop>
<tabstop>mUpdateExpressionText</tabstop>
<tabstop>mRunFieldCalc</tabstop>
<tabstop>mRunFieldCalcSelected</tabstop>
<tabstop>mFilterButton</tabstop>
Expand Down
5 changes: 4 additions & 1 deletion src/ui/qgsattributetypeedit.ui
View file
Expand Up @@ -16,6 +16,9 @@
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="1">
<widget class="QgsCollapsibleGroupBox" name="groupBox">
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="title">
<string>Constraints</string>
</property>
Expand Down Expand Up @@ -210,6 +213,7 @@
</customwidget>
</customwidgets>
<tabstops>
<tabstop>selectionListWidget</tabstop>
<tabstop>isFieldEditableCheckBox</tabstop>
<tabstop>labelOnTopCheckBox</tabstop>
<tabstop>mExpressionWidget</tabstop>
Expand All @@ -221,7 +225,6 @@
<tabstop>constraintExpressionWidget</tabstop>
<tabstop>leConstraintExpressionDescription</tabstop>
<tabstop>mCheckBoxEnforceExpression</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
<connections>
Expand Down
13 changes: 7 additions & 6 deletions src/ui/qgscategorizedsymbolrendererv2widget.ui
View file
Expand Up @@ -32,6 +32,9 @@
<height>16777215</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
</item>
<item row="1" column="0">
Expand Down Expand Up @@ -200,12 +203,6 @@
<zorder>label_10</zorder>
<zorder>mExpressionWidget</zorder>
<zorder>label_3</zorder>
<zorder>viewCategories</zorder>
<zorder>btnChangeCategorizedSymbol</zorder>
<zorder>label_9</zorder>
<zorder>label_10</zorder>
<zorder>mExpressionWidget</zorder>
<zorder>label_3</zorder>
</widget>
<customwidgets>
<customwidget>
Expand All @@ -222,11 +219,15 @@
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mExpressionWidget</tabstop>
<tabstop>btnChangeCategorizedSymbol</tabstop>
<tabstop>btnColorRamp</tabstop>
<tabstop>btnAddCategories</tabstop>
<tabstop>btnAddCategory</tabstop>
<tabstop>btnDeleteCategories</tabstop>
<tabstop>btnDeleteAllCategories</tabstop>
<tabstop>btnAdvanced</tabstop>
<tabstop>viewCategories</tabstop>
</tabstops>
<resources>
<include location="../../images/images.qrc"/>
Expand Down

0 comments on commit 57aee18

Please sign in to comment.