Preferences: move units to the new dialog

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 1 insertions, 488 deletions

diff --git a/desktop-widgets/preferences.ui b/desktop-widgets/preferences.ui
index a799d966c..12ba10d4b 100644
--- a/desktop-widgets/preferences.ui
+++ b/desktop-widgets/preferences.ui
@@ -85,16 +85,6 @@
        </property>
        <item>
         <property name="text">
-         <string>Units</string>
-        </property>
-        <property name="icon">
-         <iconset>
-          <normalon>:/units</normalon>
-         </iconset>
-        </property>
-       </item>
-       <item>
-        <property name="text">
          <string>Graph</string>
         </property>
         <property name="icon">
@@ -134,309 +124,8 @@
         </sizepolicy>
        </property>
        <property name="currentIndex">
-        <number>3</number>
+        <number>0</number>
        </property>
-       <widget class="QWidget" name="units_page">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout">
-         <property name="spacing">
-          <number>5</number>
-         </property>
-         <property name="margin">
-          <number>5</number>
-         </property>
-         <item>
-          <widget class="QGroupBox" name="groupBox_units">
-           <property name="title">
-            <string>Unit system</string>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout">
-            <item>
-             <widget class="QLabel" name="label_6">
-              <property name="text">
-               <string>System</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QRadioButton" name="metric">
-              <property name="text">
-               <string>&amp;Metric</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">buttonGroup_6</string>
-              </attribute>
-             </widget>
-            </item>
-            <item>
-             <widget class="QRadioButton" name="imperial">
-              <property name="text">
-               <string>Imperial</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">buttonGroup_6</string>
-              </attribute>
-             </widget>
-            </item>
-            <item>
-             <widget class="QRadioButton" name="personalize">
-              <property name="text">
-               <string>Personali&amp;ze</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">buttonGroup_6</string>
-              </attribute>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QGroupBox" name="units_group">
-           <property name="title">
-            <string>Individual settings</string>
-           </property>
-           <property name="checkable">
-            <bool>false</bool>
-           </property>
-           <property name="checked">
-            <bool>false</bool>
-           </property>
-           <layout class="QGridLayout" name="gridLayout">
-            <item row="0" column="0">
-             <widget class="QLabel" name="label">
-              <property name="text">
-               <string>Depth</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QRadioButton" name="meter">
-              <property name="text">
-               <string>meter</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">buttonGroup</string>
-              </attribute>
-             </widget>
-            </item>
-            <item row="0" column="2">
-             <widget class="QRadioButton" name="feet">
-              <property name="text">
-               <string>feet</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">buttonGroup</string>
-              </attribute>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="label_2">
-              <property name="text">
-               <string>Pressure</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="QRadioButton" name="bar">
-              <property name="text">
-               <string>bar</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">buttonGroup_2</string>
-              </attribute>
-             </widget>
-            </item>
-            <item row="1" column="2">
-             <widget class="QRadioButton" name="psi">
-              <property name="text">
-               <string>psi</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">buttonGroup_2</string>
-              </attribute>
-             </widget>
-            </item>
-            <item row="2" column="0">
-             <widget class="QLabel" name="label_3">
-              <property name="text">
-               <string>Volume</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="1">
-             <widget class="QRadioButton" name="liter">
-              <property name="text">
-               <string>&amp;liter</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">buttonGroup_3</string>
-              </attribute>
-             </widget>
-            </item>
-            <item row="2" column="2">
-             <widget class="QRadioButton" name="cuft">
-              <property name="text">
-               <string>cu ft</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">buttonGroup_3</string>
-              </attribute>
-             </widget>
-            </item>
-            <item row="3" column="0">
-             <widget class="QLabel" name="label_4">
-              <property name="text">
-               <string>Temperature</string>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="1">
-             <widget class="QRadioButton" name="celsius">
-              <property name="text">
-               <string>celsius</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">buttonGroup_4</string>
-              </attribute>
-             </widget>
-            </item>
-            <item row="3" column="2">
-             <widget class="QRadioButton" name="fahrenheit">
-              <property name="text">
-               <string>fahrenheit</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">buttonGroup_4</string>
-              </attribute>
-             </widget>
-            </item>
-            <item row="4" column="0">
-             <widget class="QLabel" name="label_5">
-              <property name="text">
-               <string>Weight</string>
-              </property>
-             </widget>
-            </item>
-            <item row="4" column="1">
-             <widget class="QRadioButton" name="kg">
-              <property name="text">
-               <string>kg</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">buttonGroup_5</string>
-              </attribute>
-             </widget>
-            </item>
-            <item row="4" column="2">
-             <widget class="QRadioButton" name="lbs">
-              <property name="text">
-               <string>lbs</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">buttonGroup_5</string>
-              </attribute>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <layout class="QHBoxLayout">
-           <item>
-            <widget class="QGroupBox" name="groupBox">
-             <property name="title">
-              <string>Time units</string>
-             </property>
-             <layout class="QGridLayout">
-              <item row="0" column="0">
-               <widget class="QLabel" name="label13">
-                <property name="text">
-                 <string>Ascent/descent speed denominator</string>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="1">
-               <widget class="QRadioButton" name="vertical_speed_minutes">
-                <property name="text">
-                 <string>Minutes</string>
-                </property>
-                <attribute name="buttonGroup">
-                 <string notr="true">verticalSpeed</string>
-                </attribute>
-               </widget>
-              </item>
-              <item row="0" column="2">
-               <widget class="QRadioButton" name="vertical_speed_seconds">
-                <property name="text">
-                 <string>Seconds</string>
-                </property>
-                <attribute name="buttonGroup">
-                 <string notr="true">verticalSpeed</string>
-                </attribute>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <widget class="QGroupBox" name="groupBox_11">
-           <property name="title">
-            <string>GPS coordinates</string>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_12">
-            <item>
-             <widget class="QLabel" name="label_27">
-              <property name="text">
-               <string>Location Display</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QRadioButton" name="gpsTraditional">
-              <property name="text">
-               <string>traditional (dms)</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">buttonGroup_7</string>
-              </attribute>
-             </widget>
-            </item>
-            <item>
-             <widget class="QRadioButton" name="gpsDecimal">
-              <property name="text">
-               <string>decimal</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">buttonGroup_7</string>
-              </attribute>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <spacer name="verticalSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>0</width>
-             <height>0</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </widget>
        <widget class="QWidget" name="graph_page">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
@@ -1121,182 +810,6 @@
    </hints>
   </connection>
   <connection>
-   <sender>personalize</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>units_group</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>185</x>
-     <y>19</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>186</x>
-     <y>23</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>imperial</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>feet</receiver>
-   <slot>setChecked(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>164</x>
-     <y>19</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>175</x>
-     <y>34</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>metric</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>meter</receiver>
-   <slot>setChecked(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>142</x>
-     <y>19</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>153</x>
-     <y>34</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>imperial</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>psi</receiver>
-   <slot>setChecked(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>164</x>
-     <y>19</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>175</x>
-     <y>33</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>metric</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>bar</receiver>
-   <slot>setChecked(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>142</x>
-     <y>19</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>153</x>
-     <y>33</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>imperial</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>cuft</receiver>
-   <slot>setChecked(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>164</x>
-     <y>19</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>175</x>
-     <y>31</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>metric</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>liter</receiver>
-   <slot>setChecked(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>142</x>
-     <y>19</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>153</x>
-     <y>31</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>imperial</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>fahrenheit</receiver>
-   <slot>setChecked(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>164</x>
-     <y>19</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>175</x>
-     <y>29</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>metric</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>celsius</receiver>
-   <slot>setChecked(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>142</x>
-     <y>19</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>153</x>
-     <y>29</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>imperial</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>lbs</receiver>
-   <slot>setChecked(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>164</x>
-     <y>19</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>175</x>
-     <y>28</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>metric</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>kg</receiver>
-   <slot>setChecked(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>142</x>
-     <y>19</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>153</x>
-     <y>28</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
    <sender>proxyAuthRequired</sender>
    <signal>toggled(bool)</signal>
    <receiver>proxyUsername</receiver>