Merge lp:~jelmer/bzr-gtk/vertical-layout into lp:bzr-gtk/gtk2

[Jelmer Vernooij]

Patch from Ximin Luo to allow using bzr viz in "widescreen mode" where the revision details are shown next to the graph.

https://bugs.launchpad.net/bzr-gtk/+bug/649273/+attachment/1645811/+files/bzr-gtk_vertical.png

[John A Meinel (jameinel)]

seems fine to me. I'm not 100% sure what to look for (other than noticing that there aren't any tests :).

When I tried this, setting the side-by-side layout did move the objects. However it caused it to stop updating the Revision text when selecting a revision. So i'm pretty sure there is a bug somewhere, where moving the items is causing it to lose linkage to the contents.

review: Needs Fixing

[lp:~jelmer/bzr-gtk/vertical-layout]

716. By Jelmer Vernooij on 2011-04-06

Merge trunk.

717. By Jelmer Vernooij on 2011-04-15

Fix some formatting.

718. By Jelmer Vernooij on 2011-04-15

Construct model early.

719. By Jelmer Vernooij on 2011-04-15

Fix signal handling.

[Jelmer Vernooij (jelmer)]

I've reproduced these issues here, they should now be fixed.

Unmerged revisions

=== modified file 'NEWS'
--- NEWS	2011-03-23 09:49:44 +0000
+++ NEWS	2011-04-15 01:09:25 +0000
@@ -41,6 +41,11 @@
  
   * Add lock dialog. (Daniel Schierbeck, #93652)
 
+ FEATURES
+
+  * Add option to use "bzr viz" with a vertical layout.
+    (Ximin Luo, #649273)
+
 0.99.1	2010-08-26
 
  BUG FIXES

=== modified file 'branchview/treeview.py'
--- branchview/treeview.py	2011-03-23 09:49:44 +0000
+++ branchview/treeview.py	2011-04-15 01:09:25 +0000
@@ -131,6 +131,7 @@
         self.maxnum = maxnum
         self.compact = compact
 
+        self.model = treemodel.TreeModel(self.branch, [])
         gobject.idle_add(self.populate)
 
         self.connect("destroy", self._on_destroy)
@@ -155,15 +156,23 @@
         elif property.name == 'branch':
             return self.branch
         elif property.name == 'revision':
+            if self.path is None:
+                return None
             return self.model.get_value(self.model.get_iter(self.path),
                                         treemodel.REVISION)
         elif property.name == 'revision-number':
+            if self.path is None:
+                return None
             return self.model.get_value(self.model.get_iter(self.path),
                                         treemodel.REVNO)
         elif property.name == 'children':
+            if self.path is None:
+                return None
             return self.model.get_value(self.model.get_iter(self.path),
                                         treemodel.CHILDREN)
         elif property.name == 'parents':
+            if self.path is None:
+                return None
             return self.model.get_value(self.model.get_iter(self.path),
                                         treemodel.PARENTS)
         else:
@@ -310,7 +319,7 @@
                                                             self.mainline_only,
                                                             self.progress_bar)
 
-            self.model = treemodel.TreeModel(self.branch, linegraphdata)
+            self.model.line_graph_data = linegraphdata
             self.graph_cell.columns_len = columns_len
             width = self.graph_cell.get_size(self.treeview)[2]
             if width > 500:
@@ -370,7 +379,7 @@
         cell.set_property("width-chars", 15)
         cell.set_property("ellipsize", pango.ELLIPSIZE_END)
         self.revno_column = gtk.TreeViewColumn("Revision No")
-        self.revno_column.set_resizable(False)
+        self.revno_column.set_resizable(True)
         self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
         self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
         self.revno_column.pack_start(cell, expand=True)
@@ -379,7 +388,7 @@
 
         self.graph_cell = CellRendererGraph()
         self.graph_column = gtk.TreeViewColumn()
-        self.graph_column.set_resizable(False)
+        self.graph_column.set_resizable(True)
         self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
         self.graph_column.pack_start(self.graph_cell, expand=True)
         self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
@@ -392,7 +401,7 @@
         cell.set_property("width-chars", 65)
         cell.set_property("ellipsize", pango.ELLIPSIZE_END)
         self.summary_column = gtk.TreeViewColumn("Summary")
-        self.summary_column.set_resizable(False)
+        self.summary_column.set_resizable(True)
         self.summary_column.set_expand(True)
         self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
         self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
@@ -416,7 +425,7 @@
         cell.set_property("ellipsize", pango.ELLIPSIZE_END)
         self.date_column = gtk.TreeViewColumn("Date")
         self.date_column.set_visible(False)
-        self.date_column.set_resizable(False)
+        self.date_column.set_resizable(True)
         self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
         self.date_column.set_fixed_width(130)
         self.date_column.pack_start(cell, expand=True)

=== modified file 'viz/branchwin.py'
--- viz/branchwin.py	2011-03-14 20:12:19 +0000
+++ viz/branchwin.py	2011-04-15 01:09:25 +0000
@@ -99,7 +99,7 @@
         self.refresh_action.connect("activate", self._refresh_clicked)
         self.refresh_action.connect_accelerator()
 
-        self.construct()
+        self.vbox = self.construct()
 
     def _save_size_on_destroy(self, widget, config_name):
         """Creates a hook that saves the size of widget to config option 
@@ -118,27 +118,34 @@
         vbox = gtk.VBox(spacing=0)
         self.add(vbox)
 
-        self.paned = gtk.VPaned()
-        self.paned.pack1(self.construct_top(), resize=False, shrink=True)
-        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
-        self.paned.show()
-
+        # order is important here
+        paned = self.construct_paned()
         nav = self.construct_navigation()
         menubar = self.construct_menubar()
+
         vbox.pack_start(menubar, expand=False, fill=True)
         vbox.pack_start(nav, expand=False, fill=True)
-
-        vbox.pack_start(self.paned, expand=True, fill=True)
-        vbox.set_focus_child(self.paned)
-
-        self.treeview.connect('revision-selected',
-                self._treeselection_changed_cb)
-        self.treeview.connect('revision-activated',
-                self._tree_revision_activated)
-
-        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
+        vbox.pack_start(paned, expand=True, fill=True)
+        vbox.set_focus_child(paned)
+
+
         vbox.show()
 
+        return vbox
+
+    def construct_paned(self):
+        """Construct the main HPaned/VPaned contents."""
+        if self.config.get_user_option('viz-vertical') == 'True':
+            self.paned = gtk.HPaned()
+        else:
+            self.paned = gtk.VPaned()
+
+        self.paned.pack1(self.construct_top(), resize=False, shrink=True)
+        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
+        self.paned.show()
+
+        return self.paned
+
     def construct_menubar(self):
         menubar = gtk.MenuBar()
 
@@ -190,6 +197,12 @@
         view_menu_compact.set_active(self.compact_view)
         view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
 
+        view_menu_vertical = gtk.CheckMenuItem("Side-by-side Layout")
+        view_menu_vertical.set_active(False)
+        if self.config.get_user_option('viz-vertical') == 'True':
+            view_menu_vertical.set_active(True)
+        view_menu_vertical.connect('toggled', self._vertical_layout)
+
         view_menu_diffs = gtk.CheckMenuItem("Show Diffs")
         view_menu_diffs.set_active(False)
         if self.config.get_user_option('viz-show-diffs') == 'True':
@@ -210,6 +223,7 @@
 
         view_menu.add(view_menu_toolbar)
         view_menu.add(view_menu_compact)
+        view_menu.add(view_menu_vertical)
         view_menu.add(gtk.SeparatorMenuItem())
         view_menu.add(view_menu_diffs)
         view_menu.add(view_menu_wide_diffs)
@@ -249,7 +263,8 @@
         go_menu.add(gtk.SeparatorMenuItem())
         go_menu.add(self.go_menu_tags)
 
-        self.revision_menu = RevisionMenu(self.branch.repository, [], self.branch, parent=self)
+        self.revision_menu = RevisionMenu(self.branch.repository, [],
+            self.branch, parent=self)
         revision_menuitem = gtk.MenuItem("_Revision")
         revision_menuitem.set_submenu(self.revision_menu)
 
@@ -279,7 +294,8 @@
         help_menuitem = gtk.MenuItem("_Help")
         help_menuitem.set_submenu(help_menu)
 
-        help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
+        help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT,
+            self.accel_group)
         help_about_menuitem.connect('activate', self._about_dialog_cb)
 
         help_menu.add(help_about_menuitem)
@@ -299,12 +315,14 @@
         """Construct the top-half of the window."""
         # FIXME: Make broken_line_length configurable
 
-        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
+        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum,
+            self.compact_view)
 
         for col in ["revno", "date"]:
             option = self.config.get_user_option(col + '-column-visible')
             if option is not None:
-                self.treeview.set_property(col + '-column-visible', option == 'True')
+                self.treeview.set_property(col + '-column-visible',
+                    option == 'True')
             else:
                 self.treeview.set_property(col + '-column-visible', False)
 
@@ -368,7 +386,12 @@
         self.revisionview.show()
         self.revisionview.set_show_callback(self._show_clicked_cb)
         self.revisionview.connect('notify::revision', self._go_clicked_cb)
-        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
+        self.treeview.connect('tag-added',
+            lambda w, t, r: self.revisionview.update_tags())
+        self.treeview.connect('revision-selected',
+                self._treeselection_changed_cb)
+        self.treeview.connect('revision-activated',
+                self._tree_revision_activated)
         self.diff_paned.pack1(self.revisionview)
 
         from bzrlib.plugins.gtk.diff import DiffWidget
@@ -390,9 +413,8 @@
         parents  = self.treeview.get_parents()
         children = self.treeview.get_children()
 
-        self.revision_menu.set_revision_ids([revision.revision_id])
-
-        if revision and revision != NULL_REVISION:
+        if revision and revision.revision_id != NULL_REVISION:
+            self.revision_menu.set_revision_ids([revision.revision_id])
             prev_menu = gtk.Menu()
             if len(parents) > 0:
                 self.prev_rev_action.set_sensitive(True)
@@ -400,7 +422,7 @@
                     if parent_id and parent_id != NULL_REVISION:
                         parent = self.branch.repository.get_revision(parent_id)
                         try:
-                            str = ' (' + parent.properties['branch-nick'] + ')'
+                            str = ' (%s)' % parent.properties['branch-nick']
                         except KeyError:
                             str = ""
 
@@ -421,7 +443,7 @@
                 for child_id in children:
                     child = self.branch.repository.get_revision(child_id)
                     try:
-                        str = ' (' + child.properties['branch-nick'] + ')'
+                        str = ' (%s)' % child.properties['branch-nick']
                     except KeyError:
                         str = ""
 
@@ -492,9 +514,11 @@
         _mod_index.index_url(self.branch.base)
 
     def _branch_search_cb(self, w):
-        from bzrlib.plugins.search import index as _mod_index
+        from bzrlib.plugins.search import (
+            index as _mod_index,
+            errors as search_errors,
+            )
         from bzrlib.plugins.gtk.search import SearchDialog
-        from bzrlib.plugins.search import errors as search_errors
 
         try:
             index = _mod_index.open_index_url(self.branch.base)
@@ -532,6 +556,25 @@
             self.toolbar.hide()
         self.config.set_user_option('viz-toolbar-visible', col.get_active())
 
+    def _vertical_layout(self, col):
+        """Toggle the layout vertical/horizontal"""
+        self.config.set_user_option('viz-vertical', str(col.get_active()))
+
+        old = self.paned
+        self.vbox.remove(old)
+        self.vbox.pack_start(self.construct_paned(), expand=True, fill=True)
+        self._make_diff_paned_nonzero_size()
+        self._make_diff_nonzero_size()
+
+        self.treeview.emit('revision-selected')
+
+    def _make_diff_paned_nonzero_size(self):
+        """make sure the diff/revision pane isn't zero-width or zero-height"""
+        alloc = self.diff_paned.get_allocation()
+        if (alloc.width < 10) or (alloc.height < 10):
+            width, height = self.get_size()
+            self.diff_paned.set_size_request(width/3, int(height / 2.5))
+
     def _make_diff_nonzero_size(self):
         """make sure the diff isn't zero-width or zero-height"""
         alloc = self.diff.get_allocation()