Changeset ba80f5bb8085…
Parent a05aebba91df…
by
Changes to 7 files · Browse files at ba80f5bb8085 Showing diff from parent a05aebba91df Diff from another changeset...
@@ -390,6 +390,7 @@ if not preferred or preferred not in tools:
Prompt(_('No visual diff configured'),
_('Please select a visual diff application.'), self).run()
+ from thgconfig import ConfigDialog
dlg = ConfigDialog(self.repo.root, False)
dlg.show_all()
dlg.focus_field('tortoisehg.vdiff')
|
@@ -213,7 +213,7 @@ try:
repo = hg.repository(ui.ui(), path=self.root)
self.repo = repo
- except RepoError:
+ except hglib.RepoError:
self.repo = None
return
|
@@ -163,7 +163,7 @@ model, upaths = sel.get_selected()
if not upaths:
return
- self.glob_entry.set_text(model[uupaths][0])
+ self.glob_entry.set_text(model[upaths][0])
def add_glob(self, widget, glob_entry):
newglob = hglib.fromutf(glob_entry.get_text())
|
@@ -394,7 +394,7 @@
# PyGtk 2.6 and below did not automatically register types
if gobject.pygtk_version < (2, 8, 0):
- gobject.type_register(TreeView)
+ gobject.type_register(LogTreeView)
self.tree = self.graphview.treeview
self.graphview.connect('revision-selected', self.selection_changed)
|
@@ -12,7 +12,7 @@ from thgutil.i18n import _
from thgutil import hglib
-from hggtk import gtklib
+from hggtk import gtklib, gdialog
class FilterDialog(gtk.Dialog):
""" Dialog for creating log filters """
@@ -190,7 +190,8 @@ util.matchdate(date)
opts['date'] = date
except (ValueError, util.Abort), e:
- Prompt(_('Invalid date specification'), str(e), self).run()
+ gdialog.Prompt(_('Invalid date specification'),
+ str(e), self).run()
self.dateentry.grab_focus()
return
elif self.revradio.get_active():
@@ -204,7 +205,7 @@ rrange.reverse()
opts['revrange'] = rrange
except Exception, e:
- Prompt(_('Invalid revision range'), str(e), self).run()
+ gdialog.Prompt(_('Invalid revision range'), str(e), self).run()
self.rev0Entry.grab_focus()
return
elif self.branchradio.get_active():
|
@@ -454,7 +454,7 @@ def fileselect(self, combo):
'select another hgrc file'
if self.dirty:
- gdialog.Confirm(_('Unapplied changes'), [], self,
+ ret = gdialog.Confirm(_('Unapplied changes'), [], self,
_('Lose changes and switch files?.')).run()
if ret != gtk.RESPONSE_YES:
return
|
@@ -130,7 +130,8 @@ if file:
hlist = [cid for cid in hlist if chunks[cid].filename() == file]
if not hlist:
- Prompt(_('Shelve'), _('Please select diff chunks to shelve'),
+ gdialog.Prompt(_('Shelve'),
+ _('Please select diff chunks to shelve'),
self).run()
return
|
Loading...