We are currently indexing your data, so search results may be incomplete until we finish.
refactoring: move gtklib.StatusBar into new hgtk.statusbar module
Changeset e46f9a6cdc4e…
Parent 136e346259ef…
by
Changes to 9 files · Browse files at e46f9a6cdc4e Showing diff from parent 136e346259ef Diff from another changeset...
|
@@ -18,7 +18,7 @@ from tortoisehg.util.hglib import *
from tortoisehg.util import shlib, hglib
-from tortoisehg.hgtk import gdialog, gtklib, hgcmd
+from tortoisehg.hgtk import gdialog, gtklib, hgcmd, statusbar
class ChangeSet(gdialog.GDialog):
'GTK+ based dialog for displaying repository logs'
@@ -600,7 +600,7 @@ # add status bar for main app
vbox = gtk.VBox()
vbox.pack_start(self._hpaned, True, True)
- self.stbar = gtklib.StatusBar()
+ self.stbar = statusbar.StatusBar()
self.stbar.show()
vbox.pack_start(gtk.HSeparator(), False, False)
vbox.pack_start(self.stbar, False, False)
|
||
|
@@ -22,7 +22,7 @@ from tortoisehg.hgtk.logview.colormap import AnnotateColorSaturation
from tortoisehg.hgtk.logview.treeview import TreeView as LogTreeView
from tortoisehg.hgtk.logview import treemodel as LogTreeModelModule
-from tortoisehg.hgtk import gtklib, gdialog, changeset
+from tortoisehg.hgtk import gtklib, gdialog, changeset, statusbar
# Column indexes for grep
GCOL_REVID = 0
@@ -113,7 +113,7 @@ modifier, gtk.ACCEL_VISIBLE)
notebook.connect('thg-new', self.new_notebook)
- self.stbar = gtklib.StatusBar()
+ self.stbar = statusbar.StatusBar()
self.stbar.sttext.set_property('use-markup', True)
vbox.pack_start(self.stbar, False, False, 2)
self.stop_button.set_sensitive(False)
|
||
|
@@ -75,64 +75,6 @@ window.destroy()
return True
-class StatusBar(gtk.HBox):
- def __init__(self, extra=None):
- gtk.HBox.__init__(self)
- self.pbar = gtk.ProgressBar()
- self.sttext = gtk.Label("")
- self.sttext.set_alignment(0, 0.5)
-
- self.pbox = gtk.HBox()
- self.pbox.pack_start(gtk.VSeparator(), False, False)
- self.pbox.pack_start(self.pbar, False, False)
-
- self.pack_start(self.sttext, padding=4)
- if extra:
- self.pack_end(extra, False, False)
- self.right1_label = gtk.Label()
- self.pack_end(self.right1_label, False, False, padding=20)
- self.pack_end(self.pbox, False, False, padding=1)
- self.pbox.set_child_visible(False)
- self.right2_label = gtk.Label()
- self.pack_end(self.right2_label, False, False, padding=5)
- self.right3_label = gtk.Label()
- self.pack_end(self.right3_label, False, False, padding=20)
- self.show_all()
-
- def _pulse_timer(self, now=False):
- self.pbar.pulse()
- return True
-
- def begin(self, msg=_('Running'), timeout=100):
- self.pbox.set_child_visible(True)
- self.pbox.map()
- self.set_status_text(msg)
- self._timeout_event = gobject.timeout_add(timeout, self._pulse_timer)
-
- def end(self, msg='', unmap=True):
- gobject.source_remove(self._timeout_event)
- self.set_status_text(msg)
- if unmap:
- self.pbox.unmap()
- else:
- self.pbar.set_fraction(1.0)
-
- def set_status_text(self, msg):
- self.sttext.set_text(str(msg))
-
- def set_right1_text(self, msg):
- self.right1_label.set_text(str(msg))
-
- def set_right2_text(self, msg):
- self.right2_label.set_text(str(msg))
-
- def set_right3_text(self, msg):
- self.right3_label.set_text(str(msg))
-
- def set_pulse_step(self, val):
- self.pbar.set_pulse_step(val)
-
-
class MessageDialog(gtk.Dialog):
button_map = {
gtk.BUTTONS_NONE: None,
|
||
|
@@ -18,7 +18,7 @@ from tortoisehg.util.i18n import _
from tortoisehg.util import hglib, shlib, paths, thread2, settings
-from tortoisehg.hgtk import gtklib
+from tortoisehg.hgtk import gtklib, statusbar
# This function and some key bits below borrowed ruthelessly from
# Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
@@ -205,7 +205,7 @@ diffview.set_editable(False)
# status bar
- self.stbar = gtklib.StatusBar()
+ self.stbar = statusbar.StatusBar()
mainvbox.pack_start(self.stbar, False, False, 2)
# register signal handlers
|
||
|
@@ -25,6 +25,7 @@ from tortoisehg.hgtk import gdialog, gtklib, hgcmd, gorev, thgstrip
from tortoisehg.hgtk import backout, status, hgemail, tagadd, update, merge
from tortoisehg.hgtk import archive, changeset, thgconfig, thgmq, histdetails
+from tortoisehg.hgtk import statusbar
def create_menu(label, callback):
menuitem = gtk.MenuItem(label, True)
@@ -820,7 +821,7 @@
def get_body(self):
self.gorev_dialog = None
- self.stbar = gtklib.StatusBar()
+ self.stbar = statusbar.StatusBar()
self.limit = self.get_graphlimit(None)
# Allocate TreeView instance to use internally
|
||
|
@@ -18,7 +18,7 @@ from tortoisehg.util.i18n import _
from tortoisehg.util import hglib, shlib, paths
-from tortoisehg.hgtk import gdialog, dialog, gtklib, hgthread
+from tortoisehg.hgtk import gdialog, dialog, gtklib, hgthread, statusbar
class RecoveryDialog(gtk.Window):
def __init__(self):
@@ -89,7 +89,7 @@ foreground='#900000')
vbox.pack_start(scrolledwindow, True, True)
- self.stbar = gtklib.StatusBar()
+ self.stbar = statusbar.StatusBar()
vbox.pack_start(self.stbar, False, False, 2)
def _delete(self, widget, event):
|
||
|
@@ -21,7 +21,7 @@ from tortoisehg.util.i18n import _
from tortoisehg.util import hglib, shlib, paths, hgshelve
-from tortoisehg.hgtk import dialog, gdialog, gtklib, guess, hgignore
+from tortoisehg.hgtk import dialog, gdialog, gtklib, guess, hgignore, statusbar
# file model row enumerations
FM_CHECKED = 0
@@ -421,7 +421,7 @@ self.tree_sel_changed(filesel, difftree, page_num)
def get_extras(self):
- self.stbar = gtklib.StatusBar()
+ self.stbar = statusbar.StatusBar()
return self.stbar
def add_header_checkbox(self, col, post=None, pre=None, toggle=False):
|
||
|
|
@@ -0,0 +1,69 @@ + # statusbar.py - status bar widget for TortoiseHg
+#
+# Copyright 2008 TK Soh <teekaysoh@gmail.com>
+# Copyright 2009 Steve Borho <steve@borho.org>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
+
+import gtk
+import gobject
+
+from tortoisehg.util.i18n import _
+
+class StatusBar(gtk.HBox):
+ def __init__(self, extra=None):
+ gtk.HBox.__init__(self)
+ self.pbar = gtk.ProgressBar()
+ self.sttext = gtk.Label("")
+ self.sttext.set_alignment(0, 0.5)
+
+ self.pbox = gtk.HBox()
+ self.pbox.pack_start(gtk.VSeparator(), False, False)
+ self.pbox.pack_start(self.pbar, False, False)
+
+ self.pack_start(self.sttext, padding=4)
+ if extra:
+ self.pack_end(extra, False, False)
+ self.right1_label = gtk.Label()
+ self.pack_end(self.right1_label, False, False, padding=20)
+ self.pack_end(self.pbox, False, False, padding=1)
+ self.pbox.set_child_visible(False)
+ self.right2_label = gtk.Label()
+ self.pack_end(self.right2_label, False, False, padding=5)
+ self.right3_label = gtk.Label()
+ self.pack_end(self.right3_label, False, False, padding=20)
+ self.show_all()
+
+ def _pulse_timer(self, now=False):
+ self.pbar.pulse()
+ return True
+
+ def begin(self, msg=_('Running'), timeout=100):
+ self.pbox.set_child_visible(True)
+ self.pbox.map()
+ self.set_status_text(msg)
+ self._timeout_event = gobject.timeout_add(timeout, self._pulse_timer)
+
+ def end(self, msg='', unmap=True):
+ gobject.source_remove(self._timeout_event)
+ self.set_status_text(msg)
+ if unmap:
+ self.pbox.unmap()
+ else:
+ self.pbar.set_fraction(1.0)
+
+ def set_status_text(self, msg):
+ self.sttext.set_text(str(msg))
+
+ def set_right1_text(self, msg):
+ self.right1_label.set_text(str(msg))
+
+ def set_right2_text(self, msg):
+ self.right2_label.set_text(str(msg))
+
+ def set_right3_text(self, msg):
+ self.right3_label.set_text(str(msg))
+
+ def set_pulse_step(self, val):
+ self.pbar.set_pulse_step(val)
|
|
|
@@ -21,7 +21,7 @@ from tortoisehg.util import hglib, settings, paths
from tortoisehg.hgtk import dialog, gtklib, hgthread, thgconfig
-from tortoisehg.hgtk import thgshelve, hgemail, update
+from tortoisehg.hgtk import thgshelve, hgemail, update, statusbar
class SynchDialog(gtk.Window):
def __init__(self, repos=[], pushmode=False):
@@ -250,7 +250,7 @@ basevbox.pack_start(scrolledwindow, True, True)
# statusbar
- self.stbar = gtklib.StatusBar()
+ self.stbar = statusbar.StatusBar()
basevbox.pack_end(self.stbar, False, False, 2)
# support dropping of repos or bundle files
|
||
Add a tag
Loading...