We are currently indexing your data, so search results may be incomplete until we finish.
gdialog: remove obsolete main argument from GDialog
Changeset d392e86e5e04…
Parent 1ef3bac66caf…
by
Changes to 9 files · Browse files at d392e86e5e04 Showing diff from parent 1ef3bac66caf Diff from another changeset...
|
@@ -54,4 +54,4 @@ return vbox
def run(_ui, *pats, **opts):
- return BugReport(_ui, None, None, None, opts, True)
+ return BugReport(_ui, None, None, None, opts)
|
||
|
@@ -20,8 +20,8 @@ class ChangeSet(GDialog):
"""GTK+ based dialog for displaying repository logs
"""
- def __init__(self, ui, repo, cwd, pats, opts, main, stbar=None):
- GDialog.__init__(self, ui, repo, cwd, pats, opts, main)
+ def __init__(self, ui, repo, cwd, pats, opts, stbar=None):
+ GDialog.__init__(self, ui, repo, cwd, pats, opts)
self.stbar = stbar
self.glog_parent = None
@@ -695,7 +695,7 @@ '''User selected annotate file from the file list context menu'''
from datamine import DataMineDialog
rev = self.currev
- dialog = DataMineDialog(self.ui, self.repo, self.cwd, [], {}, False)
+ dialog = DataMineDialog(self.ui, self.repo, self.cwd, [], {})
dialog.display()
dialog.add_annotate_page(self.curfile, str(rev))
@@ -711,7 +711,7 @@ # Else launch our own GLog instance
import history
dialog = history.GLog(self.ui, self.repo, self.cwd,
- [self.repo.root], {}, False)
+ [self.repo.root], {})
dialog.open_with_file(self.curfile)
dialog.display()
|
||
|
@@ -655,4 +655,4 @@ 'exclude':[], 'include':[],
'check': True, 'git':False, 'addremove':False,
}
- return GCommit(_ui, None, None, pats, cmdoptions, True)
+ return GCommit(_ui, None, None, pats, cmdoptions)
|
||
|
@@ -123,7 +123,7 @@ def _cmenu_display(self, menuitem):
from changeset import ChangeSet
statopts = {'rev' : [self.currev] }
- dialog = ChangeSet(self.ui, self.repo, self.cwd, [], statopts, False)
+ dialog = ChangeSet(self.ui, self.repo, self.cwd, [], statopts)
dialog.display()
def _cmenu_annotate(self, menuitem):
@@ -131,7 +131,7 @@
def _cmenu_file_log(self, menuitem):
from history import GLog
- dialog = GLog(self.ui, self.repo, self.cwd, [self.repo.root], {}, False)
+ dialog = GLog(self.ui, self.repo, self.cwd, [self.repo.root], {})
dialog.open_with_file(self.curpath)
dialog.display()
@@ -702,4 +702,4 @@ 'only_merges':None, 'prune':[], 'git':False, 'verbose':False,
'include':[], 'exclude':[]
}
- return DataMineDialog(ui, None, None, pats, cmdoptions, True)
+ return DataMineDialog(ui, None, None, pats, cmdoptions)
|
||
|
@@ -88,7 +88,7 @@ # "Constants"
settings_version = 1
- def __init__(self, ui, repo, cwd, pats, opts, main):
+ def __init__(self, ui, repo, cwd, pats, opts):
gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
self.cwd = cwd or os.getcwd()
self.ui = ui
@@ -96,7 +96,6 @@ self.repo = repo or hg.repository(ui, path=hglib.rootpath())
self.pats = pats
self.opts = opts
- self.main = main
self.tmproot = None
self.toolbuttons = {}
self.settings = shlib.Settings(self.__class__.__name__)
@@ -142,10 +141,7 @@
def should_live(self, widget=None, event=None):
- if self.main:
- self._destroying(widget)
- else:
- self.destroy()
+ self._destroying(widget)
return False
@@ -287,18 +283,14 @@ vbox.pack_end(extras, False, False, 0)
self.connect('destroy', self._destroying)
- self.connect('delete_event', self.should_live)
+ #self.connect('delete_event', self.should_live)
def _destroying(self, gtkobj):
- try:
- settings = self.save_settings()
- self.settings.set_value('settings_version', GDialog.settings_version)
- self.settings.set_value('dialogs', settings)
- self.settings.write()
- finally:
- if self.main:
- gtk.main_quit()
+ settings = self.save_settings()
+ self.settings.set_value('settings_version', GDialog.settings_version)
+ self.settings.set_value('dialogs', settings)
+ self.settings.write()
def _load_settings(self):
|
||
|
@@ -83,7 +83,7 @@
def _datamine_clicked(self, toolbutton, data=None):
from datamine import DataMineDialog
- dialog = DataMineDialog(self.ui, self.repo, self.cwd, [], {}, False)
+ dialog = DataMineDialog(self.ui, self.repo, self.cwd, [], {})
dialog.display()
def _filter_clicked(self, toolbutton, data=None):
@@ -256,7 +256,7 @@
# Allocate ChangeSet instance to use internally
self.changeview = ChangeSet(self.ui, self.repo, self.cwd, [],
- self.opts, False, self.stbar)
+ self.opts, self.stbar)
self.changeview.display(False)
self.changeview.glog_parent = self
@@ -513,7 +513,7 @@ statopts['added'] = True
statopts['removed'] = True
dialog = GStatus(self.ui, self.repo, self.cwd, self.pats,
- statopts, False)
+ statopts)
dialog.display()
return True
@@ -580,7 +580,7 @@ def _show_status(self, menuitem):
rev = self.currow[treemodel.REVID]
statopts = {'rev' : [str(rev)] }
- dialog = ChangeSet(self.ui, self.repo, self.cwd, [], statopts, False)
+ dialog = ChangeSet(self.ui, self.repo, self.cwd, [], statopts)
dialog.display()
def _copy_hash(self, menuitem):
@@ -750,4 +750,4 @@ canonpats = []
for f in pats:
canonpats.append(util.canonpath(root, os.getcwd(), f))
- return GLog(ui, None, None, canonpats, cmdoptions, True)
+ return GLog(ui, None, None, canonpats, cmdoptions)
|
||
|
@@ -1060,7 +1060,7 @@ def _log_file(self, stat, wfile):
from history import GLog
# Might want to include 'rev' here... trying without
- dialog = GLog(self.ui, self.repo, self.cwd, [wfile], self.opts, False)
+ dialog = GLog(self.ui, self.repo, self.cwd, [wfile], self.opts)
dialog.display()
return True
@@ -1330,4 +1330,4 @@ 'exclude':[], 'include':[], 'debug':True, 'verbose':True, 'git':False,
'check':True
}
- return GStatus(ui, None, None, pats, cmdoptions, True)
+ return GStatus(ui, None, None, pats, cmdoptions)
|
||
|
@@ -216,4 +216,4 @@ 'exclude':[], 'include':[],
'check': True, 'git':False, 'addremove':False,
}
- return GShelve(_ui, None, None, pats, cmdoptions, True)
+ return GShelve(_ui, None, None, pats, cmdoptions)
|
||
Add a tag
Loading...