We are currently indexing your data, so search results may be incomplete until we finish.
Merge with Yuki
by
Changes to 6 files · Browse files at 5dd022f188a4 Showing diff from parent b6c86c5563aa 3c13ffdc5d9a Diff from another changeset...
|
@@ -744,6 +744,7 @@ rev = self.currev
dialog = datamine.DataMineDialog(self.ui, self.repo, self.cwd, [], {})
dialog.display()
+ dialog.close_current_page()
dialog.add_annotate_page(self.curfile, str(rev))
def file_history(self, menuitem):
@@ -752,6 +753,8 @@ # If this changeset browser is embedded in glog, send
# send this event to the main app
opts = {'pats' : [self.curfile]}
+ self.glog_parent.filtercombo.set_active(1)
+ self.glog_parent.filterentry.set_text(self.curfile)
self.glog_parent.custombutton.set_active(True)
self.glog_parent.filter = 'custom'
self.glog_parent.reload_log(**opts)
|
||
|
@@ -269,7 +269,7 @@
def close_notebook(self, notebook):
if notebook.get_n_pages() <= 1:
- gtklib.thgexit(self)
+ gtklib.thgclose(self)
else:
self.close_current_page()
@@ -443,8 +443,7 @@
model.clear()
search_hbox.set_sensitive(False)
- self.stbar.begin()
- self.stbar.set_status_text('hg ' + ' '.join(args[2:]))
+ self.stbar.begin(msg='hg ' + ' '.join(args[2:]))
hbox = gtk.HBox()
lbl = gtk.Label(_('Search "%s"') % retext.split()[0])
@@ -580,7 +579,7 @@ graphopts['filehist'] = path
# File log revision graph
- graphview = LogTreeView(self.repo, 5000, self.stbar)
+ graphview = LogTreeView(self.repo, 5000)
graphview.connect('revisions-loaded', self.revisions_loaded, rev)
graphview.refresh(True, [path], graphopts)
graphview.set_property('rev-column-visible', True)
@@ -668,6 +667,8 @@ treeview.connect('popup-menu', self.ann_popup_menu, objs)
treeview.connect('row-activated', self.ann_row_act, objs)
+ self.stbar.begin(msg=_('Loading history...'))
+
def search_in_file(self, model, column, key, iter):
"""Searches all fields shown in the tree when the user hits crtr+f,
not just the ones that are set via tree.set_search_column.
@@ -702,6 +703,7 @@ self.trigger_annotate(rev, wfile, objs)
def revisions_loaded(self, graphview, rev):
+ self.stbar.end()
graphview.set_revision_id(rev)
treeview = graphview.treeview
path, column = treeview.get_cursor()
@@ -737,8 +739,7 @@
model, rows = treeview.get_selection().get_selected_rows()
model.clear()
- self.stbar.begin()
- self.stbar.set_status_text(hglib.toutf('hg ' + ' '.join(args[2:])))
+ self.stbar.begin(msg=hglib.toutf('hg ' + ' '.join(args[2:])))
hbox = gtk.HBox()
lbl = gtk.Label(hglib.toutf(os.path.basename(path) + '@' + str(rev)))
|
||
|
@@ -222,7 +222,7 @@
class CmdWidget(gtk.VBox):
- def __init__(self, style=STYLE_NORMAL):
+ def __init__(self, style=STYLE_NORMAL, tooltips=None):
gtk.VBox.__init__(self)
self.hgthread = None
@@ -230,6 +230,10 @@ self.is_normal = style == STYLE_NORMAL
self.is_compact = style == STYLE_COMPACT
+ # tooltips
+ if tooltips is None:
+ tooltips = gtk.Tooltips()
+
# log viewer
if self.is_normal:
self.log = CmdLogWidget()
@@ -247,17 +251,17 @@ raise _('unknown CmdWidget style: %s') % style
# progress bar box
- self.progbox = progbox = gtklib.SlimToolbar()
+ self.progbox = progbox = gtklib.SlimToolbar(tooltips)
self.pack_start(progbox)
- def add_button(stock_id, handler, toggle=False):
- btn = progbox.append_stock(stock_id, toggle=toggle)
+ def add_button(stock_id, tooltip, handler, toggle=False):
+ btn = progbox.append_stock(stock_id, tooltip, toggle)
btn.connect('clicked', handler)
return btn
## log toggle button
self.log_btn = add_button(gtk.STOCK_JUSTIFY_LEFT,
- self.log_toggled, toggle=True)
+ _('Toggle log window'), self.log_toggled, toggle=True)
## progress bar
self.pbar = gtk.ProgressBar()
@@ -265,8 +269,10 @@
## stop & close buttons
if self.is_compact:
- self.stop_btn = add_button(gtk.STOCK_STOP, self.stop_clicked)
- self.close_btn = add_button(gtk.STOCK_CLOSE, self.close_clicked)
+ self.stop_btn = add_button(gtk.STOCK_STOP,
+ _('Stop current transaction'), self.stop_clicked)
+ self.close_btn = add_button(gtk.STOCK_CLOSE,
+ _('Close command bar'), self.close_clicked)
def after_init():
self.set_buttons(stop=False)
|
||
|
@@ -1374,8 +1374,8 @@ parents = [x.node() for x in self.repo.parents()]
if rev == self.repo.parents()[0].rev():
rev = self.revrange[1]
- dialog = merge.MergeDialog(rev)
- dialog.set_notify_func(self.merge_completed, parents, len(self.repo))
+ dlg = merge.MergeDialog(rev)
+ dlg.set_notify_func(self.merge_completed, parents, len(self.repo))
self.show_dialog(dlg)
def merge_completed(self, args):
|
||
|
@@ -361,7 +361,7 @@ gobject.idle_add(self.populate, self.currevid)
else:
self.treeview.set_model(None)
- self.pbar.set_status_text('Repository is empty')
+ self.pbar.set_status_text(_('Repository is empty'))
def set_author_color(self):
# If user has configured authorcolor in [tortoisehg], color
|
||
|
@@ -178,7 +178,8 @@ pane.add(self.list)
## command widget
- self.cmd = hgcmd.CmdWidget(style=hgcmd.STYLE_COMPACT)
+ self.cmd = hgcmd.CmdWidget(style=hgcmd.STYLE_COMPACT,
+ tooltips=tooltips)
mainbox.pack_start(self.cmd, False, False)
# accelerator
|
||
Add a tag
Loading...