We are currently indexing your data, so search results may be incomplete until we finish.
merge
by
Changes to 15 files · Browse files at c24ea27f9b21 Showing diff from parent 4833809e1016 7a747b414310 Diff from another changeset...
|
@@ -34,11 +34,7 @@ tbuttons = [
self._toolbutton(gtk.STOCK_GO_BACK, 'Backout',
self._backout_clicked,
- 'Backout selected changeset'),
- sep,
- self._toolbutton(gtk.STOCK_CLOSE, 'Close',
- self._close_clicked,
- 'Close Window')
+ 'Backout selected changeset')
]
for btn in tbuttons:
self.tbar.insert(btn, -1)
@@ -76,9 +72,6 @@ ' effect of the change being backed out.')
vbox.pack_start(frame, True, True, 4)
- def _close_clicked(self, toolbutton, data=None):
- self.destroy()
-
def set_notify_func(self, func, *args):
self.notify_func = func
self.notify_args = args
|
||
|
@@ -68,13 +68,6 @@ ]
for btn in tbuttons:
self.tbar.insert(btn, -1)
- sep = gtk.SeparatorToolItem()
- sep.set_expand(True)
- sep.set_draw(False)
- self.tbar.insert(sep, -1)
- button = self._toolbutton(gtk.STOCK_CLOSE, 'Close',
- self._close_clicked, tip='Close Application')
- self.tbar.insert(button, -1)
vbox = gtk.VBox()
self.add(vbox)
vbox.pack_start(self.tbar, False, False, 2)
@@ -185,9 +178,6 @@ vbox.pack_end(self._remote_cmd, False, False, 1)
vbox.pack_end(lbl, False, False, 1)
- def _close_clicked(self, toolbutton, data=None):
- gtk.main_quit()
-
def _toolbutton(self, stock, label, handler,
menu=None, userdata=None, tip=None):
if menu:
|
||
|
@@ -283,28 +283,9 @@ tbuttons = self.get_tbbuttons()
for tbutton in tbuttons:
toolbar.insert(tbutton, -1)
- sep = gtk.SeparatorToolItem()
- sep.set_expand(True)
- sep.set_draw(False)
- toolbar.insert(sep, -1)
- if self.main:
- name = 'Quit'
- tip = 'Close Application'
- else:
- name = 'Close'
- tip = 'Close Window'
- button = self.make_toolbutton(gtk.STOCK_CLOSE, name,
- self._quit_clicked, tip=tip)
- toolbar.insert(button, -1)
self.toolbar = toolbar
vbox.pack_start(toolbar, False, False, 0)
- # ctrl-Q quits
- accel_group = gtk.AccelGroup()
- self.add_accel_group(accel_group)
- button.add_accelerator("clicked", accel_group, ord("q"),
- gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
-
# Subclass returns the main body
body = self.get_body()
vbox.pack_start(body, True, True, 0)
@@ -318,12 +299,6 @@ self.connect('delete_event', self.should_live)
-
- def _quit_clicked(self, button, data=None):
- if not self.should_live():
- self.destroy()
-
-
def _destroying(self, gtkobj):
try:
settings = self.save_settings()
|
||
|
@@ -44,12 +44,6 @@ self.connect('delete-event', self._delete)
self.connect('response', self._response)
- # ctrl-Q quits
- accel_group = gtk.AccelGroup()
- self.add_accel_group(accel_group)
- self._button_ok.add_accelerator("clicked", accel_group, ord("q"),
- gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
-
self.pbar = None
if progressbar:
self.last_pbar_update = 0
|
||
|
@@ -31,12 +31,6 @@ self.tbar = gtk.Toolbar()
self.tips = gtk.Tooltips()
- sep = gtk.SeparatorToolItem()
- sep.set_expand(True)
- sep.set_draw(False)
- self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close',
- self._close_clicked, 'Close Window')
-
tbuttons = [
self._toolbutton(gtk.STOCK_GOTO_LAST, 'Send',
self._on_send_clicked,
@@ -44,9 +38,7 @@ gtk.SeparatorToolItem(),
self._toolbutton(gtk.STOCK_PREFERENCES, 'configure',
self._on_conf_clicked,
- 'Configure email settings'),
- sep,
- self._btn_close
+ 'Configure email settings')
]
for btn in tbuttons:
self.tbar.insert(btn, -1)
@@ -174,9 +166,6 @@
self.connect('map_event', self._on_window_map_event)
- def _close_clicked(self, toolbutton, data=None):
- self.destroy()
-
def _toolbutton(self, stock, label, handler, tip):
tbutton = gtk.ToolButton(stock)
tbutton.set_label(label)
|
||
|
@@ -24,19 +24,11 @@ self.tbar = gtk.Toolbar()
self.tips = gtk.Tooltips()
- sep = gtk.SeparatorToolItem()
- sep.set_expand(True)
- sep.set_draw(False)
- self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close',
- self._close_clicked, 'Close Window')
-
tbuttons = [
self._toolbutton(gtk.STOCK_REFRESH,
'Refresh',
self._refresh_clicked,
- tip='Reload hgignore'),
- sep,
- self._btn_close
+ tip='Reload hgignore')
]
for btn in tbuttons:
self.tbar.insert(btn, -1)
@@ -194,9 +186,6 @@ shell_notify(self.repo.wjoin('.hgignore'))
if self.notify_func: self.notify_func()
- def _close_clicked(self, toolbutton, data=None):
- self.destroy()
-
def _toolbutton(self, stock, label, handler, tip):
tbutton = gtk.ToolButton(stock)
tbutton.set_label(label)
|
||
|
@@ -124,9 +124,9 @@
def _get_hg_history(self, rev=None, limit=10):
# get history
- options = {}
- if rev: options['rev'] = [rev]
- if limit: options['limit'] = limit
+ options = []
+ if rev: options += ['--rev', rev]
+ if limit: options += ['--limit', str(limit)]
self._do_hg_cmd('log', options)
# parse log output
@@ -142,7 +142,7 @@ name, value = re.split(':\s+', x, 1)
if name not in cs:
cs[name] = []
- cs[name].append(value)
+ cs[name].append(hglib.toutf(value))
if cs:
histlist.append(cs)
@@ -176,7 +176,7 @@
try:
q = Queue.Queue()
- args = [cmd] + [os.path.join(self.root, x) for x in self.files]
+ args = [cmd] + options + [os.path.join(self.root, x) for x in self.files]
hglib.hgcmd_toq(self.root, q, *args, **{})
out = ''
while q.qsize(): out += q.get(0)
|
||
|
@@ -59,17 +59,10 @@ self._btn_unmerge_clicked,
tip='Undo merging and return working directory to'
' one of it parent revision')
- sep = gtk.SeparatorToolItem()
- sep.set_expand(True)
- sep.set_draw(False)
- self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close',
- self._close_clicked, tip='Close Application')
tbuttons = [
self._btn_merge,
gtk.SeparatorToolItem(),
- self._btn_unmerge,
- sep,
- self._btn_close
+ self._btn_unmerge
]
for btn in tbuttons:
self.tbar.insert(btn, -1)
@@ -113,9 +106,6 @@ # show them all
self._refresh()
- def _close_clicked(self, toolbutton, data=None):
- self.destroy()
-
def _toolbutton(self, stock, label, handler,
menu=None, userdata=None, tip=None):
if menu:
|
||
|
@@ -73,23 +73,10 @@ ]
for btn in tbuttons:
self.tbar.insert(btn, -1)
- sep = gtk.SeparatorToolItem()
- sep.set_expand(True)
- sep.set_draw(False)
- self.tbar.insert(sep, -1)
- button = self._toolbutton(gtk.STOCK_CLOSE, 'Close',
- self._close_clicked, tip='Close Application')
- self.tbar.insert(button, -1)
vbox = gtk.VBox()
self.add(vbox)
vbox.pack_start(self.tbar, False, False, 2)
- # ctrl-Q quits
- accel_group = gtk.AccelGroup()
- self.add_accel_group(accel_group)
- button.add_accelerator("clicked", accel_group, ord("q"),
- gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
-
# hg output window
scrolledwindow = gtk.ScrolledWindow()
scrolledwindow.set_shadow_type(gtk.SHADOW_ETCHED_IN)
@@ -105,9 +92,6 @@ self.stbar = gtklib.StatusBar()
vbox.pack_start(self.stbar, False, False, 2)
- def _close_clicked(self, *args):
- self._do_close()
-
def _delete(self, widget, event):
self._do_close()
return True
|
||
|
@@ -74,17 +74,6 @@ 'Configure',
self._on_conf_clicked,
None)
- sep = gtk.SeparatorToolItem()
- sep.set_expand(True)
- sep.set_draw(False)
- self._button_close = self._toolbutton(gtk.STOCK_CLOSE, 'Quit',
- self._close_clicked)
-
- # ctrl-Q quits
- accel_group = gtk.AccelGroup()
- self.add_accel_group(accel_group)
- self._button_close.add_accelerator("clicked", accel_group, ord("q"),
- gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
tbuttons = [
self._button_start,
@@ -93,8 +82,6 @@ self._button_browse,
gtk.SeparatorToolItem(),
self._button_conf,
- sep,
- self._button_close,
]
for btn in tbuttons:
self.tbar.insert(btn, -1)
@@ -151,10 +138,6 @@ tbutton.connect('clicked', handler, userdata)
return tbutton
- def _close_clicked(self, *args):
- if self._server_stopped() == True:
- gtk.main_quit()
-
def _delete(self, widget, event):
if self._server_stopped() == True:
gtk.main_quit()
|
||
|
@@ -8,6 +8,7 @@ """
import os
+import gtk
import shelve
import time
@@ -129,6 +130,13 @@
def set_tortoise_icon(window, icon):
window.set_icon_from_file(get_tortoise_icon(icon))
+ # Global keybindings for TortoiseHg
+ window.connect('key-press-event', window_key)
+
+def window_key(window, event):
+ if event.keyval == ord('q') and (event.state & gtk.gdk.CONTROL_MASK):
+ devent = gtk.gdk.Event(gtk.gdk.DELETE)
+ window.emit('delete_event', devent)
def get_tortoise_icon(icon):
'''Find a tortoise icon, apply to PyGtk window'''
|
||
|
@@ -97,13 +97,6 @@ ]
for btn in tbuttons:
self.tbar.insert(btn, -1)
- sep = gtk.SeparatorToolItem()
- sep.set_expand(True)
- sep.set_draw(False)
- self.tbar.insert(sep, -1)
- button = self._toolbutton(gtk.STOCK_CLOSE, 'Quit',
- self._close_clicked, tip='Quit Application')
- self.tbar.insert(button, -1)
vbox = gtk.VBox()
self.add(vbox)
vbox.pack_start(self.tbar, False, False, 2)
|
||
|
@@ -48,12 +48,6 @@ self.tbar = gtk.Toolbar()
self.tips = gtk.Tooltips()
- sep = gtk.SeparatorToolItem()
- sep.set_expand(True)
- sep.set_draw(False)
- self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close',
- self._close_clicked, tip='Close Application')
-
self._btn_addtag = self._toolbutton(
gtk.STOCK_ADD,
'Add',
@@ -66,9 +60,7 @@ tip='Remove tag from repository')
tbuttons = [
self._btn_addtag,
- self._btn_rmtag,
- sep,
- self._btn_close,
+ self._btn_rmtag
]
for btn in tbuttons:
self.tbar.insert(btn, -1)
@@ -149,9 +141,6 @@ continue
self._tagslist.append([tagname])
- def _close_clicked(self, toolbutton, data=None):
- self.destroy()
-
def _btn_tag_clicked(self, button):
""" select tag from tags dialog """
import tags
|
||
|
@@ -55,15 +55,8 @@ 'Update',
self._btn_update_clicked,
tip='Update working directory to selected revision')
- sep = gtk.SeparatorToolItem()
- sep.set_expand(True)
- sep.set_draw(False)
- self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close',
- self._close_clicked, tip='Close Application')
tbuttons = [
self._btn_update,
- sep,
- self._btn_close,
]
for btn in tbuttons:
self.tbar.insert(btn, -1)
@@ -112,9 +105,6 @@ # show them all
self._refresh()
- def _close_clicked(self, toolbutton, data=None):
- self.destroy()
-
def _toolbutton(self, stock, label, handler,
menu=None, userdata=None, tip=None):
if menu:
|
||
Add a tag
Loading...