Skip to content

Commit a0aba98

Browse files
nyalldawsonnyalldawson
committedMar 16, 2016
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
1 parent 87e6ec0 commit a0aba98

8 files changed

+479
-403
lines changed
 

‎src/gui/editorwidgets/qgsclassificationwidgetwrapperfactory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ QgsEditorWidgetWrapper*QgsClassificationWidgetWrapperFactory::create( QgsVectorL
3131

3232
QgsEditorConfigWidget*QgsClassificationWidgetWrapperFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const
3333
{
34-
return new QgsDummyConfigDlg( vl, fieldIdx, parent, QObject::tr( "Displays a combo box containing values of attributes used for classification." ) );
34+
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." ) );
3535
}

‎src/ui/editorwidgets/qgscheckboxconfigdlgbase.ui

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
16-
<layout class="QFormLayout" name="formLayout">
16+
<layout class="QGridLayout" name="gridLayout">
1717
<item row="0" column="0">
1818
<widget class="QLabel" name="label_2">
1919
<property name="text">
@@ -34,6 +34,19 @@
3434
<item row="1" column="1">
3535
<widget class="QLineEdit" name="leUncheckedState"/>
3636
</item>
37+
<item row="2" column="0">
38+
<spacer name="verticalSpacer">
39+
<property name="orientation">
40+
<enum>Qt::Vertical</enum>
41+
</property>
42+
<property name="sizeHint" stdset="0">
43+
<size>
44+
<width>20</width>
45+
<height>40</height>
46+
</size>
47+
</property>
48+
</spacer>
49+
</item>
3750
</layout>
3851
</widget>
3952
<resources/>

‎src/ui/editorwidgets/qgsdatetimeeditconfig.ui

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,22 +82,22 @@
8282
</property>
8383
<item>
8484
<property name="text">
85-
<string>date</string>
85+
<string>Date</string>
8686
</property>
8787
</item>
8888
<item>
8989
<property name="text">
90-
<string>time</string>
90+
<string>Time</string>
9191
</property>
9292
</item>
9393
<item>
9494
<property name="text">
95-
<string>date &amp; time</string>
95+
<string>Date &amp; time</string>
9696
</property>
9797
</item>
9898
<item>
9999
<property name="text">
100-
<string>custom format</string>
100+
<string>Custom format</string>
101101
</property>
102102
</item>
103103
</widget>
@@ -181,12 +181,12 @@
181181
</property>
182182
<item>
183183
<property name="text">
184-
<string>default</string>
184+
<string>Default</string>
185185
</property>
186186
</item>
187187
<item>
188188
<property name="text">
189-
<string>custom</string>
189+
<string>Custom</string>
190190
</property>
191191
</item>
192192
</widget>
@@ -214,14 +214,14 @@
214214
<enum>Qt::LeftToRight</enum>
215215
</property>
216216
<property name="text">
217-
<string>calendar popup</string>
217+
<string>Calendar popup</string>
218218
</property>
219219
</widget>
220220
</item>
221221
<item row="2" column="0" colspan="2">
222222
<widget class="QCheckBox" name="mAllowNullCheckBox">
223223
<property name="text">
224-
<string>allow NULL values</string>
224+
<string>Allow NULL values</string>
225225
</property>
226226
</widget>
227227
</item>
@@ -233,7 +233,7 @@
233233
<item>
234234
<widget class="QLabel" name="label">
235235
<property name="text">
236-
<string>preview</string>
236+
<string>Preview</string>
237237
</property>
238238
</widget>
239239
</item>

0 commit comments

Comments
 (0)