Merge lp:~nataliabidart/ubuntuone-control-panel/fix-944120 into lp:ubuntuone-control-panel

[Natalia Bidart]

- 'Apply these settings' button should be at the topmost right corner
  in the Settings tab (LP: #944120).

[Roberto Alsina (ralsina)]

+1

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'data/qt/preferences.ui'
--- data/qt/preferences.ui	2012-03-02 13:37:00 +0000
+++ data/qt/preferences.ui	2012-03-02 19:02:18 +0000
@@ -191,6 +191,16 @@
       </spacer>
      </item>
      <item>
+      <widget class="QPushButton" name="restore_defaults_button">
+       <property name="text">
+        <string notr="true">Default settings</string>
+       </property>
+       <property name="secondary" stdset="0">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
       <widget class="QPushButton" name="apply_changes_button">
        <property name="text">
         <string notr="true">Apply these settings</string>
@@ -200,16 +210,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="restore_defaults_button">
-       <property name="text">
-        <string notr="true">Default settings</string>
-       </property>
-       <property name="secondary" stdset="0">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
   </layout>