Skip to content

Commit c6565da

Browse files
DelazJDelazJ
committedOct 11, 2017
[needs-docs] Move Locale tab to General tab
1 parent 5dce8ed commit c6565da

File tree

1 file changed

+71
-128
lines changed

1 file changed

+71
-128
lines changed
 

‎src/ui/qgsoptionsbase.ui

Lines changed: 71 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -227,18 +227,6 @@
227227
<normaloff>:/images/themes/default/propertyicons/CRS.svg</normaloff>:/images/themes/default/propertyicons/CRS.svg</iconset>
228228
</property>
229229
</item>
230-
<item>
231-
<property name="text">
232-
<string>Locale</string>
233-
</property>
234-
<property name="toolTip">
235-
<string>Locale</string>
236-
</property>
237-
<property name="icon">
238-
<iconset resource="../../images/images.qrc">
239-
<normaloff>:/images/themes/default/propertyicons/locale.png</normaloff>:/images/themes/default/propertyicons/locale.png</iconset>
240-
</property>
241-
</item>
242230
<item>
243231
<property name="text">
244232
<string>Authentication</string>
@@ -354,6 +342,52 @@
354342
</rect>
355343
</property>
356344
<layout class="QVBoxLayout" name="verticalLayout_28">
345+
<item>
346+
<widget class="QgsCollapsibleGroupBox" name="grpLocale">
347+
<property name="title">
348+
<string>O&amp;verride system locale</string>
349+
</property>
350+
<property name="checkable">
351+
<bool>true</bool>
352+
</property>
353+
<layout class="QVBoxLayout">
354+
<property name="spacing">
355+
<number>12</number>
356+
</property>
357+
<item>
358+
<layout class="QGridLayout" name="gridLayout_25">
359+
<item row="0" column="0">
360+
<widget class="QLabel" name="label_5">
361+
<property name="text">
362+
<string>Locale to use instead</string>
363+
</property>
364+
</widget>
365+
</item>
366+
<item row="0" column="1">
367+
<widget class="QComboBox" name="cboLocale"/>
368+
</item>
369+
<item row="1" column="0" colspan="2">
370+
<widget class="QLabel" name="label_7">
371+
<property name="text">
372+
<string>&lt;b&gt;Note:&lt;/b&gt; Enabling / changing override on locale requires an application restart</string>
373+
</property>
374+
<property name="wordWrap">
375+
<bool>true</bool>
376+
</property>
377+
</widget>
378+
</item>
379+
</layout>
380+
</item>
381+
<item>
382+
<widget class="QLabel" name="lblSystemLocale">
383+
<property name="text">
384+
<string>Detected active locale on your system</string>
385+
</property>
386+
</widget>
387+
</item>
388+
</layout>
389+
</widget>
390+
</item>
357391
<item>
358392
<widget class="QgsCollapsibleGroupBox" name="groupBox">
359393
<property name="title">
@@ -960,7 +994,7 @@
960994
<property name="sizeHint" stdset="0">
961995
<size>
962996
<width>20</width>
963-
<height>40</height>
997+
<height>0</height>
964998
</size>
965999
</property>
9661000
</spacer>
@@ -4757,105 +4791,6 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
47574791
</item>
47584792
</layout>
47594793
</widget>
4760-
<widget class="QWidget" name="mOptionsPageLocale">
4761-
<layout class="QVBoxLayout" name="verticalLayout_19">
4762-
<property name="leftMargin">
4763-
<number>0</number>
4764-
</property>
4765-
<property name="topMargin">
4766-
<number>0</number>
4767-
</property>
4768-
<property name="rightMargin">
4769-
<number>0</number>
4770-
</property>
4771-
<property name="bottomMargin">
4772-
<number>0</number>
4773-
</property>
4774-
<item>
4775-
<widget class="QgsScrollArea" name="mOptionsScrollArea_09">
4776-
<property name="frameShape">
4777-
<enum>QFrame::NoFrame</enum>
4778-
</property>
4779-
<property name="widgetResizable">
4780-
<bool>true</bool>
4781-
</property>
4782-
<widget class="QWidget" name="mOptionsScrollAreaContents_09">
4783-
<property name="geometry">
4784-
<rect>
4785-
<x>0</x>
4786-
<y>0</y>
4787-
<width>268</width>
4788-
<height>232</height>
4789-
</rect>
4790-
</property>
4791-
<layout class="QVBoxLayout" name="verticalLayout_32">
4792-
<item>
4793-
<widget class="QGroupBox" name="grpLocale">
4794-
<property name="title">
4795-
<string>O&amp;verride system locale</string>
4796-
</property>
4797-
<property name="checkable">
4798-
<bool>true</bool>
4799-
</property>
4800-
<layout class="QGridLayout" name="_12">
4801-
<item row="0" column="0">
4802-
<widget class="QLabel" name="label_5">
4803-
<property name="text">
4804-
<string>Locale to use instead</string>
4805-
</property>
4806-
</widget>
4807-
</item>
4808-
<item row="0" column="1">
4809-
<widget class="QComboBox" name="cboLocale"/>
4810-
</item>
4811-
<item row="1" column="0" colspan="2">
4812-
<widget class="QLabel" name="label_7">
4813-
<property name="text">
4814-
<string>&lt;b&gt;Note:&lt;/b&gt; Enabling / changing override on local requires an application restart</string>
4815-
</property>
4816-
<property name="wordWrap">
4817-
<bool>true</bool>
4818-
</property>
4819-
</widget>
4820-
</item>
4821-
</layout>
4822-
</widget>
4823-
</item>
4824-
<item>
4825-
<widget class="QGroupBox" name="groupBox_12">
4826-
<property name="title">
4827-
<string>Additional Info</string>
4828-
</property>
4829-
<layout class="QGridLayout" name="_13">
4830-
<item row="0" column="0">
4831-
<widget class="QLabel" name="lblSystemLocale">
4832-
<property name="text">
4833-
<string>Detected active locale on your system</string>
4834-
</property>
4835-
</widget>
4836-
</item>
4837-
</layout>
4838-
</widget>
4839-
</item>
4840-
<item>
4841-
<spacer name="verticalSpacer_2">
4842-
<property name="orientation">
4843-
<enum>Qt::Vertical</enum>
4844-
</property>
4845-
<property name="sizeHint" stdset="0">
4846-
<size>
4847-
<width>20</width>
4848-
<height>40</height>
4849-
</size>
4850-
</property>
4851-
</spacer>
4852-
</item>
4853-
</layout>
4854-
</widget>
4855-
</widget>
4856-
</item>
4857-
</layout>
4858-
</widget>
48594794
<widget class="QWidget" name="mOptionsPageAuth">
48604795
<layout class="QVBoxLayout" name="verticalLayout_45">
48614796
<property name="bottomMargin">
@@ -5405,12 +5340,23 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
54055340
</widget>
54065341
<layoutdefault spacing="6" margin="11"/>
54075342
<customwidgets>
5343+
<customwidget>
5344+
<class>QgsColorButton</class>
5345+
<extends>QToolButton</extends>
5346+
<header>qgscolorbutton.h</header>
5347+
<container>1</container>
5348+
</customwidget>
54085349
<customwidget>
54095350
<class>QgsScrollArea</class>
54105351
<extends>QScrollArea</extends>
54115352
<header>qgsscrollarea.h</header>
54125353
<container>1</container>
54135354
</customwidget>
5355+
<customwidget>
5356+
<class>QgsSpinBox</class>
5357+
<extends>QSpinBox</extends>
5358+
<header>qgsspinbox.h</header>
5359+
</customwidget>
54145360
<customwidget>
54155361
<class>QgsCollapsibleGroupBox</class>
54165362
<extends>QGroupBox</extends>
@@ -5439,17 +5385,6 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
54395385
<extends>QLineEdit</extends>
54405386
<header>qgsfilterlineedit.h</header>
54415387
</customwidget>
5442-
<customwidget>
5443-
<class>QgsColorButton</class>
5444-
<extends>QToolButton</extends>
5445-
<header>qgscolorbutton.h</header>
5446-
<container>1</container>
5447-
</customwidget>
5448-
<customwidget>
5449-
<class>QgsSpinBox</class>
5450-
<extends>QSpinBox</extends>
5451-
<header>qgsspinbox.h</header>
5452-
</customwidget>
54535388
<customwidget>
54545389
<class>QgsColorSchemeList</class>
54555390
<extends>QWidget</extends>
@@ -5476,9 +5411,11 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
54765411
</customwidget>
54775412
</customwidgets>
54785413
<tabstops>
5414+
<tabstop>mSearchLineEdit</tabstop>
54795415
<tabstop>mOptionsListWidget</tabstop>
54805416
<tabstop>mOptionsScrollArea_01</tabstop>
5481-
<tabstop>groupBox</tabstop>
5417+
<tabstop>grpLocale</tabstop>
5418+
<tabstop>cboLocale</tabstop>
54825419
<tabstop>cmbStyle</tabstop>
54835420
<tabstop>cmbUITheme</tabstop>
54845421
<tabstop>cmbIconSize</tabstop>
@@ -5488,15 +5425,21 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
54885425
<tabstop>spinFontSize</tabstop>
54895426
<tabstop>mMessageTimeoutSpnBx</tabstop>
54905427
<tabstop>groupBox_11</tabstop>
5428+
<tabstop>cbxHideSplash</tabstop>
5429+
<tabstop>cbxCheckVersion</tabstop>
5430+
<tabstop>mDataSourceManagerNonModal</tabstop>
5431+
<tabstop>mCustomGroupBoxChkBx</tabstop>
5432+
<tabstop>mNativeColorDialogsChkBx</tabstop>
5433+
<tabstop>mLiveColorDialogsChkBx</tabstop>
54915434
<tabstop>mProjectOnLaunchCmbBx</tabstop>
54925435
<tabstop>mProjectOnLaunchLineEdit</tabstop>
54935436
<tabstop>mProjectOnLaunchPushBtn</tabstop>
54945437
<tabstop>cbxProjectDefaultNew</tabstop>
54955438
<tabstop>pbnProjectDefaultSetCurrent</tabstop>
54965439
<tabstop>pbnProjectDefaultReset</tabstop>
5497-
<tabstop>leTemplateFolder</tabstop>
54985440
<tabstop>pbnTemplateFolderBrowse</tabstop>
54995441
<tabstop>pbnTemplateFolderReset</tabstop>
5442+
<tabstop>leTemplateFolder</tabstop>
55005443
<tabstop>chbAskToSaveProjectChanges</tabstop>
55015444
<tabstop>mLayerDeleteConfirmationChkBx</tabstop>
55025445
<tabstop>chbWarnOldProjectVersion</tabstop>
@@ -5543,6 +5486,7 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
55435486
<tabstop>cbxAddOracleDC</tabstop>
55445487
<tabstop>cbxCompileExpressions</tabstop>
55455488
<tabstop>groupBox_28</tabstop>
5489+
<tabstop>cbxEvaluateDefaultValues</tabstop>
55465490
<tabstop>mBtnRemoveHiddenPath</tabstop>
55475491
<tabstop>mListHiddenBrowserPaths</tabstop>
55485492
<tabstop>mOptionsScrollArea_04</tabstop>
@@ -5669,6 +5613,7 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
56695613
<tabstop>pbnEditPyramidsOptions</tabstop>
56705614
<tabstop>lstGdalDrivers</tabstop>
56715615
<tabstop>mOptionsScrollArea_08</tabstop>
5616+
<tabstop>leProjectGlobalCrs</tabstop>
56725617
<tabstop>radPromptForProjection</tabstop>
56735618
<tabstop>radUseProjectProjection</tabstop>
56745619
<tabstop>radUseGlobalProjection</tabstop>
@@ -5678,9 +5623,6 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
56785623
<tabstop>mAddDefaultTransformButton</tabstop>
56795624
<tabstop>mRemoveDefaultTransformButton</tabstop>
56805625
<tabstop>mDefaultDatumTransformTreeWidget</tabstop>
5681-
<tabstop>mOptionsScrollArea_09</tabstop>
5682-
<tabstop>grpLocale</tabstop>
5683-
<tabstop>cboLocale</tabstop>
56845626
<tabstop>mAuthConfigsGrpBx</tabstop>
56855627
<tabstop>mOptionsScrollArea_10</tabstop>
56865628
<tabstop>leWmsSearch</tabstop>
@@ -5702,6 +5644,7 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
57025644
<tabstop>mExcludeUrlListWidget</tabstop>
57035645
<tabstop>mAdvancedSettingsEnableButton</tabstop>
57045646
<tabstop>grpProjectionBehavior</tabstop>
5647+
<tabstop>mDefaultZValueSpinBox</tabstop>
57055648
</tabstops>
57065649
<resources>
57075650
<include location="../../images/images.qrc"/>

0 commit comments

Comments
 (0)
Please sign in to comment.