Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #5324 from DelazJ/locale
Remove Locale tab from Options dialog
  • Loading branch information
m-kuhn committed Oct 16, 2017
2 parents d4635d0 + c6565da commit 8dd8a9b
Showing 1 changed file with 60 additions and 117 deletions.
177 changes: 60 additions & 117 deletions src/ui/qgsoptionsbase.ui
Expand Up @@ -227,18 +227,6 @@
<normaloff>:/images/themes/default/propertyicons/CRS.svg</normaloff>:/images/themes/default/propertyicons/CRS.svg</iconset>
</property>
</item>
<item>
<property name="text">
<string>Locale</string>
</property>
<property name="toolTip">
<string>Locale</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/propertyicons/locale.png</normaloff>:/images/themes/default/propertyicons/locale.png</iconset>
</property>
</item>
<item>
<property name="text">
<string>Authentication</string>
Expand Down Expand Up @@ -354,6 +342,52 @@
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_28">
<item>
<widget class="QgsCollapsibleGroupBox" name="grpLocale">
<property name="title">
<string>O&amp;verride system locale</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<layout class="QVBoxLayout">
<property name="spacing">
<number>12</number>
</property>
<item>
<layout class="QGridLayout" name="gridLayout_25">
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Locale to use instead</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="cboLocale"/>
</item>
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="label_7">
<property name="text">
<string>&lt;b&gt;Note:&lt;/b&gt; Enabling / changing override on locale requires an application restart</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="lblSystemLocale">
<property name="text">
<string>Detected active locale on your system</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QgsCollapsibleGroupBox" name="groupBox">
<property name="title">
Expand Down Expand Up @@ -960,7 +994,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>0</height>
</size>
</property>
</spacer>
Expand Down Expand Up @@ -4757,105 +4791,6 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
</item>
</layout>
</widget>
<widget class="QWidget" name="mOptionsPageLocale">
<layout class="QVBoxLayout" name="verticalLayout_19">
<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>
<item>
<widget class="QgsScrollArea" name="mOptionsScrollArea_09">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="mOptionsScrollAreaContents_09">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>268</width>
<height>232</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_32">
<item>
<widget class="QGroupBox" name="grpLocale">
<property name="title">
<string>O&amp;verride system locale</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<layout class="QGridLayout" name="_12">
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Locale to use instead</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="cboLocale"/>
</item>
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="label_7">
<property name="text">
<string>&lt;b&gt;Note:&lt;/b&gt; Enabling / changing override on local requires an application restart</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_12">
<property name="title">
<string>Additional Info</string>
</property>
<layout class="QGridLayout" name="_13">
<item row="0" column="0">
<widget class="QLabel" name="lblSystemLocale">
<property name="text">
<string>Detected active locale on your system</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<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>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="mOptionsPageAuth">
<layout class="QVBoxLayout" name="verticalLayout_45">
<property name="bottomMargin">
Expand Down Expand Up @@ -5454,9 +5389,11 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mSearchLineEdit</tabstop>
<tabstop>mOptionsListWidget</tabstop>
<tabstop>mOptionsScrollArea_01</tabstop>
<tabstop>groupBox</tabstop>
<tabstop>grpLocale</tabstop>
<tabstop>cboLocale</tabstop>
<tabstop>cmbStyle</tabstop>
<tabstop>cmbUITheme</tabstop>
<tabstop>cmbIconSize</tabstop>
Expand All @@ -5466,15 +5403,21 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<tabstop>spinFontSize</tabstop>
<tabstop>mMessageTimeoutSpnBx</tabstop>
<tabstop>groupBox_11</tabstop>
<tabstop>cbxHideSplash</tabstop>
<tabstop>cbxCheckVersion</tabstop>
<tabstop>mDataSourceManagerNonModal</tabstop>
<tabstop>mCustomGroupBoxChkBx</tabstop>
<tabstop>mNativeColorDialogsChkBx</tabstop>
<tabstop>mLiveColorDialogsChkBx</tabstop>
<tabstop>mProjectOnLaunchCmbBx</tabstop>
<tabstop>mProjectOnLaunchLineEdit</tabstop>
<tabstop>mProjectOnLaunchPushBtn</tabstop>
<tabstop>cbxProjectDefaultNew</tabstop>
<tabstop>pbnProjectDefaultSetCurrent</tabstop>
<tabstop>pbnProjectDefaultReset</tabstop>
<tabstop>leTemplateFolder</tabstop>
<tabstop>pbnTemplateFolderBrowse</tabstop>
<tabstop>pbnTemplateFolderReset</tabstop>
<tabstop>leTemplateFolder</tabstop>
<tabstop>chbAskToSaveProjectChanges</tabstop>
<tabstop>mLayerDeleteConfirmationChkBx</tabstop>
<tabstop>chbWarnOldProjectVersion</tabstop>
Expand Down Expand Up @@ -5521,6 +5464,7 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<tabstop>cbxAddOracleDC</tabstop>
<tabstop>cbxCompileExpressions</tabstop>
<tabstop>groupBox_28</tabstop>
<tabstop>cbxEvaluateDefaultValues</tabstop>
<tabstop>mBtnRemoveHiddenPath</tabstop>
<tabstop>mListHiddenBrowserPaths</tabstop>
<tabstop>mOptionsScrollArea_04</tabstop>
Expand Down Expand Up @@ -5647,6 +5591,7 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<tabstop>pbnEditPyramidsOptions</tabstop>
<tabstop>lstGdalDrivers</tabstop>
<tabstop>mOptionsScrollArea_08</tabstop>
<tabstop>leProjectGlobalCrs</tabstop>
<tabstop>radPromptForProjection</tabstop>
<tabstop>radUseProjectProjection</tabstop>
<tabstop>radUseGlobalProjection</tabstop>
Expand All @@ -5656,9 +5601,6 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<tabstop>mAddDefaultTransformButton</tabstop>
<tabstop>mRemoveDefaultTransformButton</tabstop>
<tabstop>mDefaultDatumTransformTreeWidget</tabstop>
<tabstop>mOptionsScrollArea_09</tabstop>
<tabstop>grpLocale</tabstop>
<tabstop>cboLocale</tabstop>
<tabstop>mAuthConfigsGrpBx</tabstop>
<tabstop>mOptionsScrollArea_10</tabstop>
<tabstop>leWmsSearch</tabstop>
Expand All @@ -5680,6 +5622,7 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<tabstop>mExcludeUrlListWidget</tabstop>
<tabstop>mAdvancedSettingsEnableButton</tabstop>
<tabstop>grpProjectionBehavior</tabstop>
<tabstop>mDefaultZValueSpinBox</tabstop>
</tabstops>
<resources>
<include location="../../images/images.qrc"/>
Expand Down

0 comments on commit 8dd8a9b

Please sign in to comment.