Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Cleanup editor widget config dialogs
- Standardise capitalization
- Add external resource config to a scroll area, otherwise options may
be hidden
- Add clarification to classification widget description that it only
is available if categorized renderer set
- Improve appearence of layouts so all widgets are left aligned
  • Loading branch information
nyalldawson committed Mar 16, 2016
1 parent 87e6ec0 commit a0aba98
Show file tree
Hide file tree
Showing 8 changed files with 479 additions and 403 deletions.
Expand Up @@ -31,5 +31,5 @@ QgsEditorWidgetWrapper*QgsClassificationWidgetWrapperFactory::create( QgsVectorL

QgsEditorConfigWidget*QgsClassificationWidgetWrapperFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const
{
return new QgsDummyConfigDlg( vl, fieldIdx, parent, QObject::tr( "Displays a combo box containing values of attributes used for classification." ) );
return new QgsDummyConfigDlg( vl, fieldIdx, parent, QObject::tr( "Displays a combo box containing values of attributes used for classification.\nOnly available when the layer uses a categorized symbol renderer." ) );
}
15 changes: 14 additions & 1 deletion src/ui/editorwidgets/qgscheckboxconfigdlgbase.ui
Expand Up @@ -13,7 +13,7 @@
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QFormLayout" name="formLayout">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
Expand All @@ -34,6 +34,19 @@
<item row="1" column="1">
<widget class="QLineEdit" name="leUncheckedState"/>
</item>
<item row="2" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources/>
Expand Down
18 changes: 9 additions & 9 deletions src/ui/editorwidgets/qgsdatetimeeditconfig.ui
Expand Up @@ -82,22 +82,22 @@
</property>
<item>
<property name="text">
<string>date</string>
<string>Date</string>
</property>
</item>
<item>
<property name="text">
<string>time</string>
<string>Time</string>
</property>
</item>
<item>
<property name="text">
<string>date &amp; time</string>
<string>Date &amp; time</string>
</property>
</item>
<item>
<property name="text">
<string>custom format</string>
<string>Custom format</string>
</property>
</item>
</widget>
Expand Down Expand Up @@ -181,12 +181,12 @@
</property>
<item>
<property name="text">
<string>default</string>
<string>Default</string>
</property>
</item>
<item>
<property name="text">
<string>custom</string>
<string>Custom</string>
</property>
</item>
</widget>
Expand Down Expand Up @@ -214,14 +214,14 @@
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>calendar popup</string>
<string>Calendar popup</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="mAllowNullCheckBox">
<property name="text">
<string>allow NULL values</string>
<string>Allow NULL values</string>
</property>
</widget>
</item>
Expand All @@ -233,7 +233,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>preview</string>
<string>Preview</string>
</property>
</widget>
</item>
Expand Down

0 comments on commit a0aba98

Please sign in to comment.