Merge lp:~ralsina/ubuntuone-control-panel/kibblebits into lp:ubuntuone-control-panel

[Roberto Alsina]

 - Replaced "Kilobits per second" labels with units in the spinboxes (Fixes lp:984484)

 - Replaced "Kilobits per second" labels with units in the spinboxes (Fixes lp:984484)

Before:

https://bugs.launchpad.net/ubuntuone-control-panel/+bug/985484/+attachment/3147527/+files/kibble-before.png

After:

https://bugs.launchpad.net/ubuntuone-control-panel/+bug/985484/+attachment/3147528/+files/kibble-after.png

Has OK from rtgrant

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Alejandro J. Cura (alecu)]

Works as expected, tests pass, plus... it looks *much* nicer!

review: Approve

=== modified file 'data/qt/preferences.ui'
--- data/qt/preferences.ui	2012-03-22 16:44:35 +0000
+++ data/qt/preferences.ui	2012-05-15 14:16:22 +0000
@@ -38,6 +38,9 @@
       </item>
       <item row="0" column="1">
        <widget class="QSpinBox" name="upload_speed_spinbox">
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
         <property name="minimum">
          <number>-1</number>
         </property>
@@ -46,13 +49,6 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="2">
-       <widget class="QLabel" name="kbps_label_1">
-        <property name="text">
-         <string notr="true">Kilobits per second</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="3">
        <spacer name="horizontalSpacer_2">
         <property name="orientation">
@@ -75,6 +71,9 @@
       </item>
       <item row="1" column="1">
        <widget class="QSpinBox" name="download_speed_spinbox">
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
         <property name="minimum">
          <number>-1</number>
         </property>
@@ -83,13 +82,6 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="2">
-       <widget class="QLabel" name="kbps_label_2">
-        <property name="text">
-         <string notr="true">Kilobits per second</string>
-        </property>
-       </widget>
-      </item>
       <item row="2" column="0">
        <spacer name="verticalSpacer_2">
         <property name="orientation">
 
=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2012-05-14 16:20:45 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2012-05-15 14:16:22 +0000
@@ -231,7 +231,7 @@
 SETTINGS_CHANGE_ERROR = _('The settings could not be changed,\n'
                           'previous values were restored.')
 SETTINGS_FILE_SYNC = _('File Sync Settings')
-SETTINGS_KILOBITS_PER_SECOND = _('Kilobits per second')
+SETTINGS_KILOBITS_PER_SECOND = _('KiB/s')
 SETTINGS_LIMIT_DOWNLOAD = _('Limit download speed to')
 SETTINGS_LIMIT_UPLOAD = _('Limit upload speed to')
 SETTINGS_SYNC_ALL_FOLDERS = _('Automatically sync all new cloud folders '
 
=== modified file 'ubuntuone/controlpanel/gui/qt/preferences.py'
--- ubuntuone/controlpanel/gui/qt/preferences.py	2012-04-17 18:08:45 +0000
+++ ubuntuone/controlpanel/gui/qt/preferences.py	2012-05-15 14:16:22 +0000
@@ -83,8 +83,10 @@
         self.ui.apply_changes_button.setText(SETTINGS_BUTTON_APPLY)
         self.ui.bandwidth_settings.setTitle(SETTINGS_BANDWIDTH)
         self.ui.file_sync_settings.setTitle(SETTINGS_FILE_SYNC)
-        self.ui.kbps_label_1.setText(SETTINGS_KILOBITS_PER_SECOND)
-        self.ui.kbps_label_2.setText(SETTINGS_KILOBITS_PER_SECOND)
+        self.ui.upload_speed_spinbox.setSuffix("  " +
+            SETTINGS_KILOBITS_PER_SECOND)
+        self.ui.download_speed_spinbox.setSuffix("  " +
+            SETTINGS_KILOBITS_PER_SECOND)
         self.ui.label_2.setText(SETTINGS_BANDWIDTH_ZERO_WARNING)
         self.ui.restore_defaults_button.setText(SETTINGS_BUTTON_DEFAULT)
 
@@ -188,8 +190,7 @@
     def resizeEvent(self, event):
         super(PreferencesPanel, self).resizeEvent(event)
         size_bandwidth = (self.ui.bandwidth_settings.width() -
-            self.ui.upload_speed_spinbox.width() -
-            self.ui.kbps_label_1.width())
+            self.ui.upload_speed_spinbox.width())
         padding = 160  # Padding to allow shrinking
         size_sync = (self.ui.file_sync_settings.width() - padding)
         force_wordwrap(self.ui.limit_uploads_checkbox, size_bandwidth,
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_preferences.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_preferences.py	2012-04-17 18:08:45 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_preferences.py	2012-05-15 14:16:22 +0000
@@ -308,8 +308,7 @@
                 wrap_calls, check, (size, text)))
         self.ui.setFixedWidth(1000)
         size_bandwidth = (self.ui.ui.bandwidth_settings.width() -
-            self.ui.ui.upload_speed_spinbox.width() -
-            self.ui.ui.kbps_label_1.width())
+            self.ui.ui.upload_speed_spinbox.width())
         padding = 160  # Left and Right Padding
         size_sync = (self.ui.ui.file_sync_settings.width() - padding)
         self.ui.show()