[thg-dev] [PATCH] update: eliminate 'Ways' label, kill 'Show changeset summaries'

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adr...@cadifra.com>
# Date 1253818443 -7200
# Node ID d511e32612db7d1e9396da8b3a718073331d506f
# Parent  b13d485dec5a26dd813f30c21de23517b94a638f
update: eliminate 'Ways' label, kill 'Show changeset summaries'

An option to turn off the changeset summaries is uneeded and
needlessly complicates the dialog for the user.

diff --git a/tortoisehg/hgtk/update.py b/tortoisehg/hgtk/update.py
--- a/tortoisehg/hgtk/update.py
+++ b/tortoisehg/hgtk/update.py
@@ -87,24 +87,25 @@ class UpdateDialog(gtk.Dialog):
         self.tables['summary'] = table
         self.vbox.pack_start(table)
 
-        # options
-        self.expander = gtk.Expander('Options')
+        # advanced expander
+        self.expander = gtk.Expander(_('Advanced options'))
         self.vbox.pack_start(self.expander, True, True, 2)
-        table = gtklib.LayoutTable()
-        self.expander.add(table)
+        vb = gtk.VBox()
+        self.expander.add(vb)
+        hb = gtk.HBox()
+        vb.pack_start(hb, True, True, 4)
+        expbox = gtk.VBox()
+        hb.pack_start(expbox, True, True, 16)
 
-        ## update ways
+        ## update method
         group = gtk.RadioButton(None, _('Interactive'))
-        table.add_row(_('Ways:'), group)
+        expbox.pack_start(group)
         btn = gtk.RadioButton(group, _('Discard local changes, '
                                        'no backup (-C/--clean)'))
-        table.add_row(None, btn)
+        expbox.pack_start(btn)
         self.opt_clean = btn
 
-        ## summary displays
-        self.opt_summary = gtk.CheckButton(_('Show changeset summaries'))
-        self.opt_summary.connect('toggled', self.summary_toggled)
-        table.add_row(self.opt_summary)
+        self.show_summaries(True)
 
         # prepare to show
         self.load_settings()
@@ -167,10 +168,6 @@ class UpdateDialog(gtk.Dialog):
     def store_settings(self):
         expanded = self.expander.get_property('expanded')
         self.settings.set_value('expanded', expanded)
-
-        summary = self.opt_summary.get_active()
-        self.settings.set_value('summary', summary)
-
         self.settings.write()
 
     def dialog_response(self, dialog, response_id):
@@ -188,9 +185,6 @@ class UpdateDialog(gtk.Dialog):
         self.store_settings()
         self.destroy()
 
-    def summary_toggled(self, button):
-        self.show_summaries(button.get_active())
-
     def cancel_clicked(self, button):
         self.cmd.stop()
         self.cmd.show_log()
@@ -224,11 +218,6 @@ class UpdateDialog(gtk.Dialog):
         table = self.tables['summary']
         table.set_property('visible', visible)
 
-        # change check state
-        self.opt_summary.handler_block_by_func(self.summary_toggled)
-        self.opt_summary.set_active(visible)
-        self.opt_summary.handler_unblock_by_func(self.summary_toggled)
-
     def update_summaries(self):
         def setlabel(label, ctx):
             revision = str(ctx.rev())

------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop