[Pkg-sugar-commit] [sugar-browse-activity] 04/05: Adapt toolbar for portrait mode

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to tag v149.4
in repository sugar-browse-activity.

commit bc272c54e8a78d2b5e3437ae1aab161c8d1fa6af
Author: Manuel Quiñones <manuq at laptop.org>
Date:   Thu Sep 5 19:25:12 2013 -0300

    Adapt toolbar for portrait mode
    
    Add a new row below the standard toolbar and place the URL entry
    inside, when the screen width is smaller than the heignt.  Otherwise,
    it looks as before.  Fixes #4212 .
---
 webtoolbar.py | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 74 insertions(+), 5 deletions(-)

diff --git a/webtoolbar.py b/webtoolbar.py
index a35f407..9cc3d20 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -245,6 +245,27 @@ class WebEntry(iconentry.IconEntry):
             self._search_popup()
 
 
+class UrlToolbar(Gtk.EventBox):
+    # This is used for the URL entry in portrait mode.
+
+    def __init__(self):
+        Gtk.EventBox.__init__(self)
+        self.modify_bg(Gtk.StateType.NORMAL,
+                       style.COLOR_TOOLBAR_GREY.get_gdk_color())
+
+        url_alignment = Gtk.Alignment(xscale=1.0, yscale=1.0)
+        url_alignment.set_padding(0, 0, style.LINE_WIDTH * 4,
+                                  style.LINE_WIDTH * 4)
+
+        self.add(url_alignment)
+        url_alignment.show()
+
+        self.toolbar = Gtk.Toolbar()
+        self.toolbar.set_size_request(-1, style.GRID_CELL_SIZE)
+        url_alignment.add(self.toolbar)
+        self.toolbar.show()
+
+
 class PrimaryToolbar(ToolbarBase):
     __gtype_name__ = 'PrimaryToolbar'
 
@@ -260,6 +281,8 @@ class PrimaryToolbar(ToolbarBase):
     def __init__(self, tabbed_view, act):
         ToolbarBase.__init__(self)
 
+        self._url_toolbar = UrlToolbar()
+
         self._activity = act
 
         self._tabbed_view = tabbed_view
@@ -286,13 +309,14 @@ class PrimaryToolbar(ToolbarBase):
         self.entry.connect('key-press-event', self.__key_press_event_cb)
         self.entry.connect('changed', self.__changed_cb)
 
-        entry_item = Gtk.ToolItem()
-        entry_item.set_expand(True)
-        entry_item.add(self.entry)
+        self._entry_item = Gtk.ToolItem()
+        self._entry_item.set_expand(True)
+        self._entry_item.add(self.entry)
         self.entry.show()
 
-        toolbar.insert(entry_item, -1)
-        entry_item.show()
+        toolbar.insert(self._entry_item, -1)
+
+        self._entry_item.show()
 
         self._back = ToolButton('go-previous-paired')
         self._back.set_tooltip(_('Back'))
@@ -328,6 +352,10 @@ class PrimaryToolbar(ToolbarBase):
         toolbar.insert(self._link_add, -1)
         self._link_add.show()
 
+        self._toolbar_separator = Gtk.SeparatorToolItem()
+        self._toolbar_separator.props.draw = False
+        self._toolbar_separator.set_expand(True)
+
         stop_button = StopButton(self._activity)
         toolbar.insert(stop_button, -1)
 
@@ -346,6 +374,11 @@ class PrimaryToolbar(ToolbarBase):
         tabbed_view.connect_after('switch-page', self.__switch_page_cb)
         tabbed_view.connect_after('page-added', self.__page_added_cb)
 
+        Gdk.Screen.get_default().connect('size-changed',
+                                         self.__screen_size_changed_cb)
+
+        self._configure_toolbar()
+
     def __key_press_event_cb(self, entry, event):
         self._tabbed_view.current_browser.loading_uri = entry.props.text
 
@@ -356,6 +389,42 @@ class PrimaryToolbar(ToolbarBase):
     def __page_added_cb(self, notebook, child, pagenum):
         self.entry._search_popdown()
 
+    def _configure_toolbar(self, screen=None):
+        # Adapt the toolbars for portrait or landscape mode.
+
+        if screen is None:
+            screen = Gdk.Screen.get_default()
+
+        if screen.get_width() < screen.get_height():
+            if self._entry_item in self._url_toolbar.toolbar.get_children():
+                return
+
+            self.toolbar.remove(self._entry_item)
+            self._url_toolbar.toolbar.insert(self._entry_item, -1)
+
+            separator_pos = len(self.toolbar.get_children()) - 1
+            self.toolbar.insert(self._toolbar_separator, separator_pos)
+            self._toolbar_separator.show()
+
+            self.pack_end(self._url_toolbar, True, True, 0)
+            self._url_toolbar.show()
+
+        else:
+            if self._entry_item in self.toolbar.get_children():
+                return
+
+            self.toolbar.remove(self._toolbar_separator)
+
+            position = len(self.toolbar.get_children()) - 4
+            self._url_toolbar.toolbar.remove(self._entry_item)
+            self.toolbar.insert(self._entry_item, position)
+
+            self._toolbar_separator.hide()
+            self.remove(self._url_toolbar)
+
+    def __screen_size_changed_cb(self, screen):
+        self._configure_toolbar(screen)
+
     def _connect_to_browser(self, browser):
         if self._browser is not None:
             self._browser.disconnect(self._uri_changed_hid)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-browse-activity.git