Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

status: disable checkbox column when merging

Changeset c43962dd33d2…

Parent 3ac9f0f8b27b…

by Steve Borho

Changes to one file · Browse files at c43962dd33d2 Showing diff from parent 3ac9f0f8b27b Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
24
25
26
27
28
29
30
 
125
126
127
 
128
129
130
 
24
25
26
 
27
28
29
 
124
125
126
127
128
129
130
@@ -24,7 +24,6 @@
 # Add some initial drag distance before starting QDrag  # (it interferes with selection the way it is now)  # double-click visual diffs -# Disable check column when wctx has two parents  # Thread refreshWctx, connect to an external progress bar  # Thread rowSelected, connect to an external progress bar  # Need mechanisms to clear pats and toggle visibility options @@ -125,6 +124,7 @@
  self.tv.sortByColumn(COL_PATH_DISPLAY)   for col in xrange(COL_PATH):   self.tv.resizeColumnToContents(col) + self.tv.setColumnHidden(COL_CHECK, self.isMerge())   self.tv.setColumnHidden(COL_MERGE_STATE, not tm.anyMerge())   self.connect(self.tv, SIGNAL('activated(QModelIndex)'), tm.toggleRow)   self.connect(self.tv, SIGNAL('pressed(QModelIndex)'), tm.pressedRow)