# HG changeset patch
# User Adrian Buehlmann <adr...@cadifra.com>
# Date 1253531833 -7200
# Node ID 2d7d36e0e3e0df048c095f7d2328a4f1a9092bfb
# Parent  b28303073a800b0a28690aab26209372de2aa98e
status: always create file selection TreeViewColumn

just set it invisible when merging

diff --git a/tortoisehg/hgtk/status.py b/tortoisehg/hgtk/status.py
--- a/tortoisehg/hgtk/status.py
+++ b/tortoisehg/hgtk/status.py
@@ -241,21 +241,17 @@ class GStatus(gdialog.GDialog):
         path_cell = gtk.CellRendererText()
         stat_cell = gtk.CellRendererText()
 
-        if self.merging:
-            self.selcb = None
+        # file selection checkboxes
+        col0 = gtk.TreeViewColumn('', toggle_cell)
+        col0.set_visible(not self.merging) # hide when merging
+        col0.add_attribute(toggle_cell, 'active', FM_CHECKED)
+        if gtk.pygtk_version >= (2, 12, 0):
+            col0.add_attribute(toggle_cell, 'inconsistent', 
FM_PARTIAL_SELECTED)
         else:
-            # show file selection checkboxes only when applicable
-            col0 = gtk.TreeViewColumn('', toggle_cell)
-            col0.add_attribute(toggle_cell, 'active', FM_CHECKED)
-            if gtk.pygtk_version >= (2, 12, 0):
-                col0.add_attribute(toggle_cell, 'inconsistent',
-                        FM_PARTIAL_SELECTED)
-            else:
-                col0.add_attribute(toggle_cell, 'radio',
-                        FM_PARTIAL_SELECTED)
-            col0.set_resizable(False)
-            self.filetree.append_column(col0)
-            self.selcb = self.add_header_checkbox(col0, self.sel_clicked)
+            col0.add_attribute(toggle_cell, 'radio', FM_PARTIAL_SELECTED)
+        col0.set_resizable(False)
+        self.filetree.append_column(col0)
+        self.selcb = self.add_header_checkbox(col0, self.sel_clicked)
 
         col1 = gtk.TreeViewColumn(_('st'), stat_cell)
         col1.add_attribute(stat_cell, 'text', FM_STATUS)

------------------------------------------------------------------------------
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

Reply via email to