Changeset 0850fac729cb…
Parent ed62fe66d79e…
by
Changes to 10 files · Browse files at 0850fac729cb Showing diff from parent ed62fe66d79e Diff from another changeset...
@@ -19,7 +19,7 @@ gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
shlib.set_tortoise_icon(self, 'menuclone.ico')
shlib.set_tortoise_keys(self)
-
+ self.set_default_size(520, 180)
self.set_title(_('TortoiseHg Clone'))
self.ui = ui.ui()
@@ -27,9 +27,6 @@ self._recent_src = self._settings.mrul('src_paths')
self._recent_dest = self._settings.mrul('dest_paths')
- sync_settings = shlib.Settings('synch')
- self._sync_src = sync_settings.mrul('src_paths')
-
self._src_path = os.getcwd()
self._dest_path = self._src_path
if len(repos) > 1:
@@ -38,11 +35,6 @@ elif len(repos):
self._src_path = repos[0]
- # build dialog
- self._create()
-
- def _create(self):
- self.set_default_size(520, 180)
ewidth = 18
vbox = gtk.VBox()
@@ -76,9 +68,10 @@ vbox.pack_start(srcbox, False, False, 2)
# add pre-defined src paths to pull-down list
+ sync_src = shlib.Settings('synch').mrul('src_paths')
sympaths = [x[1] for x in self.ui.configitems('paths')]
recent = [x for x in self._recent_src]
- syncsrc = [x for x in self._sync_src]
+ syncsrc = [x for x in sync_src]
paths = list(set(sympaths + recent + syncsrc))
paths.sort()
for p in paths:
|
@@ -133,16 +133,17 @@
def save_settings(self):
settings = GStatus.save_settings(self)
- settings['gcommit'] = self._vpaned.get_position()
+ settings['commit-vpane'] = self._vpaned.get_position()
return settings
def load_settings(self, settings):
GStatus.load_settings(self, settings)
- if settings:
- self._setting_vpos = settings['gcommit']
- else:
- self._setting_vpos = -1
+ self._setting_vpos = -1
+ try:
+ self._setting_vpos = settings['commit-vpane']
+ except KeyError:
+ pass
def get_tbbuttons(self):
|
@@ -115,8 +115,6 @@ """
# "Constants"
- settings_version = 1
-
def __init__(self, ui, repo, cwd, pats, opts):
gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
self.cwd = cwd or os.getcwd()
@@ -187,16 +185,16 @@ return settings
- def load_settings(self, settings={}):
+ def load_settings(self, settings):
self._setting_defsize = (678, 585)
self._setting_winpos = (0, 0)
self._setting_wasmax = False
- if 'gdialog-rect' in settings:
+ try:
self._setting_defsize = settings['gdialog-rect']
- if 'gdialog-pos' in settings:
self._setting_winpos = settings['gdialog-pos']
- if 'gdialog-ismax' in settings:
self._setting_wasmax = settings['gdialog-ismax']
+ except KeyError:
+ pass
### End of overridable methods ###
@@ -343,21 +341,16 @@ vbox.pack_end(extras, False, False, 0)
self.connect('destroy', self._destroying)
- #self.connect('delete_event', self.should_live)
def _destroying(self, gtkobj):
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):
- settings = {}
- version = self.settings.get_value('settings_version', None)
- if version == GDialog.settings_version:
- settings = self.settings.get_value('dialogs', {})
+ settings = self.settings.get_value('dialogs', {})
self.load_settings(settings)
|
@@ -46,7 +46,7 @@ self.notify_func = None
path = toutf(os.path.basename(self.root))
self.set_title(_('Detect Copies/Renames in ') + path)
- settings = shlib.Settings('rename')
+ settings = shlib.Settings('guess')
dims = settings.get_value('dims', (800, 600))
self.set_default_size(dims[0], dims[1])
|
@@ -205,7 +205,7 @@ for v in history.get_value(cpath):
vlist.append([v])
- history = shlib.Settings('config_history')
+ history = shlib.Settings('email')
try:
repo = hg.repository(ui.ui(), path=self.root)
self.repo = repo
|
@@ -145,25 +145,25 @@ button = gtk.CheckMenuItem(_('Show Rev'))
button.connect("toggled", self.toggle_view_column,
'rev-column-visible')
- button.set_active(self._show_rev)
+ button.set_active(self.showcol.get('rev', True))
button.set_draw_as_radio(True)
menu.append(button)
button = gtk.CheckMenuItem(_('Show ID'))
button.connect("toggled", self.toggle_view_column,
'id-column-visible')
- button.set_active(self._show_id)
+ button.set_active(self.showcol.get('id', False))
button.set_draw_as_radio(True)
menu.append(button)
button = gtk.CheckMenuItem(_('Show Date'))
button.connect("toggled", self.toggle_view_column,
'date-column-visible')
- button.set_active(self._show_date)
+ button.set_active(self.showcol.get('date', True))
button.set_draw_as_radio(True)
menu.append(button)
button = gtk.CheckMenuItem(_("Show Branch"))
button.connect("toggled", self.toggle_view_column,
'branch-column-visible')
- button.set_active(self._show_branch)
+ button.set_active(self.showcol.get('branch', False))
button.set_draw_as_radio(True)
menu.append(button)
menu.show_all()
@@ -237,16 +237,6 @@ else:
self.reload_log()
- def save_settings(self):
- settings = GDialog.save_settings(self)
- settings['glog'] = (self._vpaned.get_position(),
- self._hpaned.get_position(),
- self.graphview.get_property('rev-column-visible'),
- self.graphview.get_property('date-column-visible'),
- self.graphview.get_property('id-column-visible'),
- self.graphview.get_property('branch-column-visible'))
- return settings
-
def get_graphlimit(self, suggestion):
limit_opt = self.repo.ui.config('tortoisehg', 'graphlimit', '500')
l = 0
@@ -259,6 +249,15 @@ pass
return l or 500
+ def save_settings(self):
+ settings = GDialog.save_settings(self)
+ settings['glog-vpane'] = self._vpaned.get_position()
+ settings['glog-hpane'] = self._hpaned.get_position()
+ for col in ('rev', 'date', 'id', 'branch'):
+ vis = self.graphview.get_property(col+'-column-visible')
+ settings['glog-vis-'+col] = vis
+ return settings
+
def load_settings(self, settings):
'''Called at beginning of display() method'''
@@ -281,21 +280,15 @@ GDialog.load_settings(self, settings)
self._setting_vpos = -1
self._setting_hpos = -1
- (self._show_rev, self._show_date, self._show_id,
- self._show_branch) = True, True, False, False
- if settings:
- data = settings['glog']
- if type(data) == int:
- self._setting_vpos = data
- elif len(data) == 2:
- (self._setting_vpos, self._setting_hpos) = data
- elif len(data) == 5:
- (self._setting_vpos, self._setting_hpos,
- self._show_rev, self._show_date, self._show_id) = data
- elif len(data) == 6:
- (self._setting_vpos, self._setting_hpos,
- self._show_rev, self._show_date, self._show_id,
- self._show_branch) = data
+ self.showcol = {}
+ try:
+ self._setting_vpos = settings['glog-vpane']
+ self._setting_hpos = settings['glog-hpane']
+ for col in ('rev', 'date', 'id', 'branch'):
+ vis = settings['glog-vis-'+col]
+ self.showcol[col] = vis
+ except KeyError:
+ pass
def reload_log(self, filteropts={}):
"""Send refresh event to treeview object"""
|
@@ -55,8 +55,6 @@
class Settings(object):
- version = 1.0
-
def __init__(self, appname, path=None):
self._appname = appname
self._data = {}
|
@@ -194,20 +194,20 @@
def save_settings(self):
settings = GDialog.save_settings(self)
- settings['gstatus'] = (self._diffpane.get_position(),
- self._setting_lastpos)
+ settings['gstatus-hpane'] = self._diffpane.get_position()
+ settings['gstatus-lastpos'] = self._setting_lastpos
return settings
def load_settings(self, settings):
GDialog.load_settings(self, settings)
- if settings:
- mysettings = settings['gstatus']
- self._setting_pos = mysettings[0]
- self._setting_lastpos = mysettings[1]
- else:
- self._setting_pos = 270
- self._setting_lastpos = 64000
+ self._setting_pos = 270
+ self._setting_lastpos = 64000
+ try:
+ self._setting_pos = settings['gstatus-hpane']
+ self._setting_lastpos = settings['gstatus-lastpos']
+ except KeyError:
+ pass
self.mqmode = None
if hasattr(self.repo, 'mq') and self.repo.mq.applied:
self.mqmode = True
|
@@ -32,7 +32,6 @@
# persistent app data
self._settings = shlib.Settings('synch')
- self._recent_src = self._settings.mrul('src_paths')
self.set_default_size(655, 552)
@@ -555,8 +554,8 @@ if os.path.exists(src):
src = os.path.abspath(src)
- # save path to recent list in history
- self._recent_src.add(src)
+ # save src path to recent list in history (read by clone tool)
+ self._settings.mrul('src_paths').add(src)
self._settings.write()
# update drop-down list
|
@@ -408,7 +408,7 @@ self.dirty = False
self.pages = []
self.tooltips = gtk.Tooltips()
- self.history = shlib.Settings('config_history')
+ self.history = shlib.Settings('thgconfig')
# create pages for each section of configuration file
self.tortoise_frame = self.add_page(notebook, 'TortoiseHG')
|
Loading...