We are currently indexing your data, so search results may be incomplete until we finish.
merge with crew
by
Changes to 5 files · Browse files at 07e16bac7dba Showing diff from parent 6496ec605e82 2b7f2f918a8c Diff from another changeset...
|
@@ -132,19 +132,19 @@ button = gtk.CheckMenuItem("Show Rev")
button.connect("toggled", self.toggle_view_column,
'rev-column-visible')
- button.set_active(True)
+ button.set_active(self._show_rev)
button.set_draw_as_radio(True)
menu.append(button)
button = gtk.CheckMenuItem("Show ID")
button.connect("toggled", self.toggle_view_column,
'id-column-visible')
- button.set_active(False)
+ button.set_active(self._show_id)
button.set_draw_as_radio(True)
menu.append(button)
button = gtk.CheckMenuItem("Show Date")
button.connect("toggled", self.toggle_view_column,
'date-column-visible')
- button.set_active(True)
+ button.set_active(self._show_date)
button.set_draw_as_radio(True)
menu.append(button)
menu.show_all()
@@ -218,7 +218,10 @@ def save_settings(self):
settings = GDialog.save_settings(self)
settings['glog'] = (self._vpaned.get_position(),
- self._hpaned.get_position())
+ self._hpaned.get_position(),
+ self.graphview.get_property('rev-column-visible'),
+ self.graphview.get_property('date-column-visible'),
+ self.graphview.get_property('id-column-visible'))
return settings
def get_graphlimit(self, suggestion):
@@ -253,16 +256,18 @@ self.changeview.glog_parent = self
GDialog.load_settings(self, settings)
+ self._setting_vpos = -1
+ self._setting_hpos = -1
+ self._show_rev, self._show_date, self._show_id = True, True, False
if settings:
data = settings['glog']
if type(data) == int:
self._setting_vpos = data
- self._setting_hpos = -1
- else:
+ elif len(data) == 2:
(self._setting_vpos, self._setting_hpos) = data
- else:
- self._setting_vpos = -1
- self._setting_hpos = -1
+ elif len(data) == 5:
+ (self._setting_vpos, self._setting_hpos,
+ self._show_rev, self._show_date, self._show_id) = data
def reload_log(self, filteropts={}):
"""Send refresh event to treeview object"""
|
||
|
@@ -7,6 +7,9 @@
"""
+import dumbdbm, anydbm
+anydbm._defaultmod = dumbdbm
+
import os
import gtk
import shelve
|
||
|
@@ -413,7 +413,8 @@ def copy_to_clipboard(self, treeview):
'Write highlighted hunks to the clipboard'
if not treeview.is_focus():
- # ignore ctrl-c not directed at treeview
+ w = self.get_focus()
+ w.emit('copy-clipboard')
return False
model, paths = treeview.get_selection().get_selected_rows()
cids = [ model[row][DM_CHUNK_ID] for row, in paths ]
@@ -955,9 +956,6 @@ return
self._hg_call_wrapper('Diff', dohgdiff)
- def _has_shelve_file(self):
- return os.path.exists(self.repo.join('shelve'))
-
def _showdiff_toggled(self, togglebutton, data=None):
# prevent movement events while setting position
self._diffpane.handler_block(self._diffpane_moved_id)
@@ -1285,6 +1283,7 @@
selection = self.filetree.get_selection()
selection.selected_foreach(toggler)
+ self._update_check_count()
return True
return False
|
||
|
@@ -195,6 +195,7 @@ self.response(gtk.RESPONSE_CANCEL)
# Catch close events
+ self.set_default_size(700, 300)
self.connect('delete-event', self._delete)
self.connect('response', self._response)
@@ -221,16 +222,6 @@ self.show_tabs = True
self.show_border = True
- descframe = gtk.Frame('Description')
- vbox = gtk.VBox()
- self.desctext = gtk.TextView()
- self.desctext.set_wrap_mode(gtk.WRAP_WORD)
- self.desctext.set_editable(False)
- vbox.pack_start(self.desctext, False, False)
- vbox.set_border_width(10)
- descframe.add(vbox)
- self.vbox.pack_start(descframe, True, True)
-
self._btn_apply = gtk.Button("Apply")
self._btn_apply.connect('clicked', self._apply_clicked)
self.action_area.pack_end(self._btn_apply)
@@ -422,21 +413,36 @@ self._delpathbutton.set_sensitive(path_selected)
self._testpathbutton.set_sensitive(repo_available and path_selected)
- def set_help(self, widget, event, tooltip):
- self.desctext.get_buffer().set_text(tooltip)
+ def set_help(self, widget, event, label, tooltip):
+ label.set_text(tooltip)
def fill_frame(self, frame, info):
widgets = []
+
+ descframe = gtk.Frame('Description')
+ fvbox = gtk.VBox()
+ desclabel = gtk.Label()
+ desclabel.set_line_wrap(True)
+ desclabel.set_alignment(0.0, 0.0)
+ fvbox.pack_start(desclabel, True, True, 2)
+ fvbox.set_border_width(5)
+ descframe.add(fvbox)
+
+ hbox = gtk.HBox()
+ vbox = gtk.VBox()
table = gtk.Table(len(info), 2, False)
- vbox = gtk.VBox()
- frame.add(vbox)
vbox.pack_start(table, False, False, 2)
+ hbox.pack_start(vbox, False, False, 2)
+ hbox.pack_start(descframe, True, True, 2)
+ frame.add(hbox)
+
for row, (label, cpath, values, tooltip) in enumerate(info):
vlist = gtk.ListStore(str, bool)
combo = gtk.ComboBoxEntry(vlist, 0)
combo.connect("changed", self.dirty_event)
- combo.child.connect("focus-in-event", self.set_help, tooltip)
+ combo.child.connect("focus-in-event", self.set_help,
+ desclabel, tooltip)
combo.set_row_separator_func(lambda model, path: model[path][1])
widgets.append(combo)
|
||
|
@@ -86,9 +86,6 @@ self._vpaned.add2(status_body)
self._vpaned.set_position(self._setting_vpos)
self._activate_shelve_buttons(True)
-
- #self.selectlabel.set_text(
- # _('toggle change hunks to leave them in your working directory'))
return self._vpaned
@@ -121,6 +118,9 @@
### End of overridable methods ###
+ def _has_shelve_file(self):
+ return os.path.exists(self.repo.join('shelve'))
+
def _activate_shelve_buttons(self, status):
if status:
self.shelve_btn.set_sensitive(True)
@@ -151,12 +151,12 @@ dialog.set_transient_for(self)
rval = dialog.run()
dialog.destroy()
- if rval == -1:
- return
if rval == 1:
doforce = True
- if rval == 2:
+ elif rval == 2:
doappend = True
+ else:
+ return
# capture the selected hunks to shelve
fc = []
|
||
Add a tag
Loading...