Skip to content

Commit

Permalink
[composer] Fix tab order in some item widgets
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Oct 20, 2014
1 parent 129ab4a commit 4f9f67e
Show file tree
Hide file tree
Showing 14 changed files with 284 additions and 146 deletions.
45 changes: 21 additions & 24 deletions src/ui/qgsatlascompositionwidgetbase.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 All @@ -41,24 +32,15 @@
<enum>QFrame::StyledPanel</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="horizontalSpacing">
<number>0</number>
</property>
<property name="verticalSpacing">
<number>3</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item row="0" column="1">
<widget class="QCheckBox" name="mUseAtlasCheckBox">
<property name="text">
Expand Down Expand Up @@ -109,7 +91,7 @@
<x>0</x>
<y>0</y>
<width>431</width>
<height>569</height>
<height>567</height>
</rect>
</property>
<layout class="QVBoxLayout" name="mainLayout">
Expand Down Expand Up @@ -302,7 +284,7 @@
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
<header>qgscollapsiblegroupbox.h</header>
<header location="global">qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget>
Expand All @@ -316,6 +298,21 @@
<header location="global">qgsfieldcombobox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mUseAtlasCheckBox</tabstop>
<tabstop>scrollArea</tabstop>
<tabstop>mAtlasCoverageLayerComboBox</tabstop>
<tabstop>mAtlasHideCoverageCheckBox</tabstop>
<tabstop>mAtlasFeatureFilterCheckBox</tabstop>
<tabstop>mAtlasFeatureFilterEdit</tabstop>
<tabstop>mAtlasFeatureFilterButton</tabstop>
<tabstop>mAtlasFilenamePatternEdit</tabstop>
<tabstop>mAtlasFilenameExpressionButton</tabstop>
<tabstop>mAtlasSingleFileCheckBox</tabstop>
<tabstop>mAtlasSortFeatureCheckBox</tabstop>
<tabstop>mAtlasSortFeatureKeyComboBox</tabstop>
<tabstop>mAtlasSortFeatureDirectionButton</tabstop>
</tabstops>
<resources>
<include location="../../images/images.qrc"/>
</resources>
Expand Down
36 changes: 35 additions & 1 deletion src/ui/qgscomposerattributetablewidgetbase.ui
View file
Expand Up @@ -45,7 +45,7 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-91</y>
<y>-400</y>
<width>392</width>
<height>1192</height>
</rect>
Expand Down Expand Up @@ -704,6 +704,40 @@
<header location="global">qgsmaplayercombobox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>scrollArea</tabstop>
<tabstop>mSourceComboBox</tabstop>
<tabstop>mLayerComboBox</tabstop>
<tabstop>mRelationsComboBox</tabstop>
<tabstop>mRefreshPushButton</tabstop>
<tabstop>mAttributesPushButton</tabstop>
<tabstop>mMaximumRowsSpinBox</tabstop>
<tabstop>mUniqueOnlyCheckBox</tabstop>
<tabstop>mShowOnlyVisibleFeaturesCheckBox</tabstop>
<tabstop>mComposerMapComboBox</tabstop>
<tabstop>mIntersectAtlasCheckBox</tabstop>
<tabstop>mFeatureFilterCheckBox</tabstop>
<tabstop>mFeatureFilterEdit</tabstop>
<tabstop>mFeatureFilterButton</tabstop>
<tabstop>mDrawEmptyCheckBox</tabstop>
<tabstop>mMarginSpinBox</tabstop>
<tabstop>mHeaderModeComboBox</tabstop>
<tabstop>mEmptyModeComboBox</tabstop>
<tabstop>mEmptyMessageLineEdit</tabstop>
<tabstop>mBackgroundColorButton</tabstop>
<tabstop>mShowGridGroupCheckBox</tabstop>
<tabstop>mGridStrokeWidthSpinBox</tabstop>
<tabstop>mGridColorButton</tabstop>
<tabstop>mHeaderFontPushButton</tabstop>
<tabstop>mHeaderFontColorButton</tabstop>
<tabstop>mHeaderHAlignmentComboBox</tabstop>
<tabstop>mContentFontPushButton</tabstop>
<tabstop>mContentFontColorButton</tabstop>
<tabstop>mResizeModeComboBox</tabstop>
<tabstop>mAddFramePushButton</tabstop>
<tabstop>mEmptyFrameCheckBox</tabstop>
<tabstop>mHideEmptyBgCheckBox</tabstop>
</tabstops>
<resources>
<include location="../../images/images.qrc"/>
</resources>
Expand Down
36 changes: 23 additions & 13 deletions src/ui/qgscomposerhtmlwidgetbase.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 @@ -54,9 +45,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-84</y>
<width>390</width>
<height>448</height>
<y>-157</y>
<width>391</width>
<height>517</height>
</rect>
</property>
<layout class="QVBoxLayout" name="mainLayout">
Expand Down Expand Up @@ -293,6 +284,25 @@
<header>qgsdatadefinedbutton.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>scrollArea</tabstop>
<tabstop>mRadioUrlSource</tabstop>
<tabstop>mUrlLineEdit</tabstop>
<tabstop>mFileToolButton</tabstop>
<tabstop>mUrlDDBtn</tabstop>
<tabstop>mRadioManualSource</tabstop>
<tabstop>mInsertExpressionButton</tabstop>
<tabstop>mEvaluateExpressionsCheckbox</tabstop>
<tabstop>mReloadPushButton</tabstop>
<tabstop>mResizeModeComboBox</tabstop>
<tabstop>mAddFramePushButton</tabstop>
<tabstop>mEmptyFrameCheckBox</tabstop>
<tabstop>mHideEmptyBgCheckBox</tabstop>
<tabstop>mUseSmartBreaksCheckBox</tabstop>
<tabstop>mMaxDistanceSpinBox</tabstop>
<tabstop>mUserStylesheetCheckBox</tabstop>
<tabstop>mReloadPushButton2</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
48 changes: 42 additions & 6 deletions src/ui/qgscomposeritemwidgetbase.ui
View file
Expand Up @@ -671,9 +671,14 @@
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
<header>qgscollapsiblegroupbox.h</header>
<header location="global">qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbutton.h</header>
</customwidget>
<customwidget>
<class>QgsColorButtonV2</class>
<extends>QToolButton</extends>
Expand All @@ -684,17 +689,48 @@
<extends>QComboBox</extends>
<header>qgspenstylecombobox.h</header>
</customwidget>
<customwidget>
<class>QgsDataDefinedButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbutton.h</header>
</customwidget>
<customwidget>
<class>QgsBlendModeComboBox</class>
<extends>QComboBox</extends>
<header>qgsblendmodecombobox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mPageSpinBox</tabstop>
<tabstop>mXPosSpin</tabstop>
<tabstop>mXPositionDDBtn</tabstop>
<tabstop>mYPosSpin</tabstop>
<tabstop>mYPositionDDBtn</tabstop>
<tabstop>mWidthSpin</tabstop>
<tabstop>mWidthDDBtn</tabstop>
<tabstop>mHeightSpin</tabstop>
<tabstop>mHeightDDBtn</tabstop>
<tabstop>mUpperLeftCheckBox</tabstop>
<tabstop>mUpperMiddleCheckBox</tabstop>
<tabstop>mUpperRightCheckBox</tabstop>
<tabstop>mMiddleLeftCheckBox</tabstop>
<tabstop>mMiddleCheckBox</tabstop>
<tabstop>mMiddleRightCheckBox</tabstop>
<tabstop>mLowerLeftCheckBox</tabstop>
<tabstop>mLowerMiddleCheckBox</tabstop>
<tabstop>mLowerRightCheckBox</tabstop>
<tabstop>mItemRotationSpinBox</tabstop>
<tabstop>mItemRotationDDBtn</tabstop>
<tabstop>mFrameGroupBox</tabstop>
<tabstop>mFrameColorButton</tabstop>
<tabstop>mOutlineWidthSpinBox</tabstop>
<tabstop>mFrameJoinStyleCombo</tabstop>
<tabstop>mBackgroundGroupBox</tabstop>
<tabstop>mBackgroundColorButton</tabstop>
<tabstop>mItemIdLineEdit</tabstop>
<tabstop>mBlendModeCombo</tabstop>
<tabstop>mBlendModeDDBtn</tabstop>
<tabstop>mTransparencySlider</tabstop>
<tabstop>mTransparencySpnBx</tabstop>
<tabstop>mTransparencyDDBtn</tabstop>
<tabstop>mExcludeFromPrintsCheckBox</tabstop>
<tabstop>mExcludePrintsDDBtn</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
30 changes: 18 additions & 12 deletions src/ui/qgscomposerlabelwidgetbase.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 @@ -62,7 +53,7 @@
<x>0</x>
<y>0</y>
<width>302</width>
<height>686</height>
<height>682</height>
</rect>
</property>
<layout class="QVBoxLayout" name="mainLayout">
Expand Down Expand Up @@ -324,10 +315,25 @@
<header>qgscolorbuttonv2.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>scrollArea</tabstop>
<tabstop>mTextEdit</tabstop>
<tabstop>mHtmlCheckBox</tabstop>
<tabstop>mInsertExpressionButton</tabstop>
<tabstop>mFontButton</tabstop>
<tabstop>mFontColorButton</tabstop>
<tabstop>mMarginDoubleSpinBox</tabstop>
<tabstop>mLeftRadioButton</tabstop>
<tabstop>mCenterRadioButton</tabstop>
<tabstop>mRightRadioButton</tabstop>
<tabstop>mTopRadioButton</tabstop>
<tabstop>mMiddleRadioButton</tabstop>
<tabstop>mBottomRadioButton</tabstop>
</tabstops>
<resources/>
<connections/>
<buttongroups>
<buttongroup name="buttonGroup"/>
<buttongroup name="buttonGroup_2"/>
<buttongroup name="buttonGroup"/>
</buttongroups>
</ui>

0 comments on commit 4f9f67e

Please sign in to comment.