Merge lp:~nataliabidart/ubuntuone-control-panel/misc-tweaks into lp:ubuntuone-control-panel

[Natalia Bidart]

- Local device is listed first in the devices info result (LP: #727996).
- 'Show activity notifications' in devices config section.
- 'Limit file sync bandwidth usage' in devices config section.
- 'File sync' service should be listed on top og any other service in Services tab (all reported in LP: #727998).

Screenshot of changes are:

* local device is first and string changes: http://ubuntuone.com/p/fou/
* file sync service is first: http://ubuntuone.com/p/fov/

[Roberto Alsina (ralsina)]

+1

review: Approve

[lp:~nataliabidart/ubuntuone-control-panel/misc-tweaks]

90. By Natalia Bidart on 2011-03-02

Merged trunk in.

[Martin Albisetti (beuno)]

review: Approve

=== modified file 'data/device.ui'
--- data/device.ui	2011-02-28 23:24:53 +0000
+++ data/device.ui	2011-03-02 20:27:11 +0000
@@ -74,7 +74,7 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkCheckButton" id="show_all_notifications">
-                        <property name="label" translatable="yes">Show notifications</property>
+                        <property name="label" translatable="yes">Show activity notifications</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -94,7 +94,7 @@
                         <property name="can_focus">False</property>
                         <child>
                           <object class="GtkCheckButton" id="limit_bandwidth">
-                            <property name="label" translatable="yes">Limit bandwidth usage</property>
+                            <property name="label" translatable="yes">Limit file sync bandwidth usage</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>

=== modified file 'data/services.ui'
--- data/services.ui	2011-03-02 19:30:37 +0000
+++ data/services.ui	2011-03-02 20:27:11 +0000
@@ -24,6 +24,27 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
+                  <object class="GtkAlignment" id="alignment2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkVBox" id="files">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
                   <object class="GtkAlignment" id="alignment1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -41,27 +62,6 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkAlignment" id="alignment2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkVBox" id="files">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">5</property>
-                        <child>
-                          <placeholder/>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>

=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2011-02-27 15:45:21 +0000
+++ ubuntuone/controlpanel/backend.py	2011-03-02 20:27:11 +0000
@@ -195,7 +195,6 @@
         devices = yield self.wc.call_api(DEVICES_API)
         for d in devices:
             di = {}
-            result.append(di)
             di["type"] = d["kind"]
             di["name"] = d["description"]
             di["configurable"] = ''
@@ -225,6 +224,11 @@
             # di["available_services"] = ""
             # di["enabled_services"] = ""
 
+            if is_local:  # prepend the local device!
+                result.insert(0, di)
+            else:
+                result.append(di)
+
         returnValue(result)
 
     def type_n_id(self, device_id):

=== modified file 'ubuntuone/controlpanel/tests/__init__.py'
--- ubuntuone/controlpanel/tests/__init__.py	2011-02-16 18:44:08 +0000
+++ ubuntuone/controlpanel/tests/__init__.py	2011-03-02 20:27:11 +0000
@@ -88,6 +88,8 @@
     "email": "[e-mail]",
 }
 
+
+# note that local computer is not first, do not change!
 SAMPLE_DEVICES_JSON = """
 [
     {
@@ -108,15 +110,9 @@
 ]
 """
 
+# note that local computer should be first, do not change!
 EXPECTED_DEVICES_INFO = [
     {
-        "device_id": "ComputerABCDEF01234token",
-        "name": "Ubuntu One @ darkstar",
-        "type": "Computer",
-        "is_local": '',
-        "configurable": '',
-    },
-    {
         'is_local': 'True',
         'configurable': 'True',
         'device_id': 'ComputerABCDEF01234-localtoken',
@@ -125,7 +121,14 @@
         'max_download_speed': '-1',
         'max_upload_speed': '-1',
         'name': 'Ubuntu One @ localhost',
-        'type': 'Computer'
+        'type': 'Computer',
+    },
+    {
+        "device_id": "ComputerABCDEF01234token",
+        "name": "Ubuntu One @ darkstar",
+        "type": "Computer",
+        "is_local": '',
+        "configurable": '',
     },
     {
         "device_id": "Phone1000",

=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
--- ubuntuone/controlpanel/tests/test_backend.py	2011-02-16 18:44:08 +0000
+++ ubuntuone/controlpanel/tests/test_backend.py	2011-03-02 20:27:11 +0000
@@ -274,7 +274,7 @@
         result = yield self.be.device_is_local(self.local_token)
         self.assertTrue(result)
 
-        did = EXPECTED_DEVICES_INFO[0]['device_id']
+        did = EXPECTED_DEVICES_INFO[-1]['device_id']
         result = yield self.be.device_is_local(did)
         self.assertFalse(result)