Intro screen fixes

2 files changed, 27 insertions, 43 deletions

diff --git a/src/jarabe/intro/colorpicker.py b/src/jarabe/intro/colorpicker.py
index 5e0bd34..0faae22 100644
--- a/src/jarabe/intro/colorpicker.py
+++ b/src/jarabe/intro/colorpicker.py
@@ -29,10 +29,10 @@ class ColorPicker(gtk.HBox):
         self._xo = CanvasIcon(size=style.XLARGE_ICON_SIZE,
                               icon_name='computer-xo')
         self._set_random_colors()
-        self._xo.connect('button-press-event', self._xo_activated_cb)
+        self._xo.connect('activated', self._xo_activated_cb)
         self.add(self._xo)
 
-    def _xo_activated_cb(self, *args):
+    def _xo_activated_cb(self, item):
         self._set_random_colors()
 
     def get_color(self):
diff --git a/src/jarabe/intro/window.py b/src/jarabe/intro/window.py
index 10d06ab..9fd4076 100644
--- a/src/jarabe/intro/window.py
+++ b/src/jarabe/intro/window.py
@@ -80,31 +80,26 @@ class _Page(gtk.VBox):
 class _NamePage(_Page):
     def __init__(self, intro):
         _Page.__init__(self,
-                       background_color=_BACKGROUND_COLOR.get_int(),
                        spacing=style.DEFAULT_SPACING)
         self._intro = intro
 
-        alignment = gtk.Alignment(0.5, 1.0, 0.0, 0.0)
+        alignment = gtk.Alignment(0.5, 0.5, 0, 0)
+        self.pack_start(alignment, expand=True, fill=True)
 
-        vbox = gtk.VBox()
+        hbox = gtk.HBox(spacing=style.DEFAULT_SPACING)
+        alignment.add(hbox)
 
         label = gtk.Label(_('Name:'))
-        vbox.add(label)
+        hbox.pack_start(label, expand=False)
 
         self._entry = gtk.Entry()
-        # self._entry.set_background(_BACKGROUND_COLOR.get_html())
+        # TODO: do this in the theme?
+        self._entry.modify_bg(gtk.STATE_INSENSITIVE, _BACKGROUND_COLOR.get_gdk_color())
+        self._entry.modify_base(gtk.STATE_INSENSITIVE, _BACKGROUND_COLOR.get_gdk_color())
         self._entry.connect('notify::text', self._text_changed_cb)
+        self._entry.set_size_request(style.zoom(300), -1)
         self._entry.set_max_length(45)
-
-        vbox.add(self._entry)
-
-        alignment.add(vbox)
-        self.add(alignment)
-
-        # TODO(rgs): Do we need to do something here or GTK handles this
-        #            for us?
-        #if gtk.widget_get_default_direction() == gtk.TEXT_DIR_RTL:
-        #    self.reverse()
+        hbox.pack_start(self._entry, expand=False)
 
     def _text_changed_cb(self, entry, pspec):
         valid = len(entry.props.text.strip()) > 0
@@ -123,21 +118,16 @@ class _NamePage(_Page):
 class _ColorPage(_Page):
     def __init__(self, **kwargs):
         _Page.__init__(self,
-                       background_color=_BACKGROUND_COLOR.get_int(),
                        spacing=style.DEFAULT_SPACING)
 
-        vbox = gtk.VBox()
+        vbox = gtk.VBox(spacing=style.DEFAULT_SPACING)
+        self.pack_start(vbox, expand=True, fill=False)
 
         self._label = gtk.Label(_('Click to change color:'))
-        vbox.add(self._label)
+        vbox.pack_start(self._label)
 
         self._cp = colorpicker.ColorPicker()
-        vbox.add(self._cp)
-
-        a1 = gtk.Alignment(0.5, 1.0, 0.0, 0.0)
-        a1.add(vbox)
-
-        self.add(a1)
+        vbox.pack_start(self._cp)
 
         self._color = self._cp.get_color()
         self.set_valid(True)
@@ -159,8 +149,8 @@ class _IntroBox(gtk.VBox):
     PAGE_LAST = PAGE_COLOR
 
     def __init__(self):
-        # TODO(rgs): padding=style.zoom(30)
         gtk.VBox.__init__(self)
+        self.set_border_width(style.zoom(30))
 
         self._page = self.PAGE_NAME
         self._name_page = _NamePage(self)
@@ -188,19 +178,19 @@ class _IntroBox(gtk.VBox):
         elif self._page == self.PAGE_COLOR:
             self._current_page = self._color_page
 
-        self.add(self._current_page)
+        self.pack_start(self._current_page, expand=True)
 
-        button_box = gtk.HBox()
+        button_box = gtk.HButtonBox()
 
-        a1 = gtk.Alignment(0.5, 1.0, 0.0, 0.0)
-        if self._page != self.PAGE_FIRST:
+        if self._page == self.PAGE_FIRST:
+            button_box.set_layout(gtk.BUTTONBOX_END)
+        else:
+            button_box.set_layout(gtk.BUTTONBOX_EDGE)
             back_button = gtk.Button(_('Back'))
             image = Icon(icon_name='go-left')
             back_button.set_image(image)
             back_button.connect('clicked', self._back_activated_cb)
-            a1.add(back_button)
-
-        a2 = gtk.Alignment(0.5, 1.0, 0.0, 0.0)
+            button_box.pack_start(back_button)
 
         self._next_button = gtk.Button()
         image = Icon(icon_name='go-right')
@@ -216,19 +206,12 @@ class _IntroBox(gtk.VBox):
         self._current_page.activate()
 
         self._update_next_button()
-        a2.add(self._next_button)
+        button_box.pack_start(self._next_button)
 
         self._current_page.connect('notify::valid',
                                    self._page_valid_changed_cb)
 
-        button_box.add(a1)
-        button_box.add(a2)
-        self.add(button_box)
-
-        # TODO(rgs): Do we need to do something here or GTK handles this
-        #            for us?
-        #if gtk.widget_get_default_direction() == gtk.TEXT_DIR_RTL:
-        #    button_box.reverse()
+        self.pack_start(button_box, expand=False, fill=False)
         self.show_all()
 
     def remove_all(self):
@@ -271,6 +254,7 @@ class _IntroBox(gtk.VBox):
 class IntroWindow(gtk.Window):
     def __init__(self):
         gtk.Window.__init__(self)
+        self.modify_bg(gtk.STATE_NORMAL, _BACKGROUND_COLOR.get_gdk_color())
 
         self.props.decorated = False
         self.maximize()