Merge lp:~xnox/ubiquity/move-back-button into lp:ubiquity

[Dimitri John Ledkov]

  * Navigation control changes:
    - Move back button to the left.
    - Remove quit button.

[Dimitri John Ledkov (xnox)]

Screenshots of before & after:
https://plus.google.com/photos/105922848292507689403/albums/5885564615781297057/5885564617016942722?pid=5885564617016942722&oid=105922848292507689403

[Adolfo Jayme Barrientos (fitojb)]

It’s been over a year now. What if you go ahead with this change instead of waiting on an unresponsive design team?

[Dimitri John Ledkov (xnox)]

review: Disapprove

Unmerged revisions

5936. By Dimitri John Ledkov on 2013-06-04

* Navigation control changes:
  - Move back button to the left.
  - Remove quit button.

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-29 11:10:06 +0000
+++ debian/changelog	2013-06-04 10:11:39 +0000
@@ -1,3 +1,11 @@
+ubiquity (2.15.6ubuntu1) UNRELEASED; urgency=low
+
+  * Navigation control changes:
+    - Move back button to the left.
+    - Remove quit button.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Tue, 04 Jun 2013 10:54:23 +0100
+
 ubiquity (2.15.6) saucy; urgency=low
 
   * Merge U1 plugin, without activating it by default at the moment. This

=== modified file 'gui/gtk/ubiquity.ui'
--- gui/gtk/ubiquity.ui	2013-03-15 13:03:27 +0000
+++ gui/gtk/ubiquity.ui	2013-06-04 10:11:39 +0000
@@ -777,6 +777,7 @@
                               <object class="GtkBox" id="hbox_navigation">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="orientation">vertical</property>
                                 <child>
                                   <object class="GtkAlignment" id="alignment1">
                                     <property name="visible">True</property>
@@ -785,6 +786,7 @@
                                       <object class="GtkBox" id="hbox_connecting">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
+                                        <property name="halign">start</property>
                                         <property name="spacing">6</property>
                                         <child>
                                           <object class="GtkSpinner" id="connecting_spinner">
@@ -823,20 +825,21 @@
                                     <property name="spacing">6</property>
                                     <property name="layout_style">end</property>
                                     <child>
-                                      <object class="GtkButton" id="quit">
-                                        <property name="label">gtk-quit</property>
+                                      <object class="GtkButton" id="back">
+                                        <property name="label">gtk-go-back</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="can_default">True</property>
                                         <property name="receives_default">True</property>
                                         <property name="use_underline">True</property>
                                         <property name="use_stock">True</property>
-                                        <signal name="clicked" handler="on_quit_clicked" swapped="no"/>
+                                        <signal name="clicked" handler="on_back_clicked" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
                                         <property name="position">0</property>
+                                        <property name="secondary">True</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -851,23 +854,6 @@
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="back">
-                                        <property name="label">gtk-go-back</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="can_default">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="use_stock">True</property>
-                                        <signal name="clicked" handler="on_back_clicked" swapped="no"/>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
                                         <property name="position">2</property>
                                       </packing>
                                     </child>

=== modified file 'ubiquity/frontend/gtk_ui.py'
--- ubiquity/frontend/gtk_ui.py	2013-05-29 09:22:35 +0000
+++ ubiquity/frontend/gtk_ui.py	2013-06-04 10:11:39 +0000
@@ -929,7 +929,6 @@
             self.live_installer.set_title(
                 self.get_string('oem_user_config_title'))
             self.live_installer.set_icon_name("preferences-system")
-            self.quit.hide()
             self.back.hide()
 
         self.progress_section.show()
@@ -1016,7 +1015,6 @@
 
             gsettings.set(gs_schema, gs_key, True)
 
-        self.quit.hide()
         f = (Gdk.WMFunction.RESIZE | Gdk.WMFunction.MAXIMIZE |
              Gdk.WMFunction.MOVE)
         if not 'UBIQUITY_ONLY' in os.environ:
@@ -1044,8 +1042,6 @@
                 gs_value = self.gsettings_previous[gs_previous]
                 gsettings.set(gs_schema, gs_key, gs_value)
 
-        if not self.oem_user_config:
-            self.quit.show()
         f = Gdk.WMFunction.RESIZE | Gdk.WMFunction.MAXIMIZE | \
             Gdk.WMFunction.MOVE | Gdk.WMFunction.CLOSE
         if not 'UBIQUITY_ONLY' in os.environ: