History - Kiln » TortoiseHg » TortoiseHg

Kiln »

TortoiseHg »

TortoiseHg

Clone URL:

Pushed to one repository ·

View In Graph Contained in 0.8, 0.8.1, and 0.8.2

hggtk: cleanup/simplify dialog state save/restore

Changeset 0850fac729cb …

Parent ed62fe66d79e …

by Steve Borho May 9 09 at 3:36 AM

Changes to 10 files · Browse files at 0850fac729cb Showing diff from parent ed62fe66d79e Diff from another changeset...

Change 1 of 4 Show Changes Only Show Entire File Loading... hggtk/clone.py Stacked
19 20 21 22 23 24 25 27 28 29 30 31 32 33 34 35 38 39 40 41 42 43 44 45 46 47 48 76 77 78 79 80 81 82 83 84	19 20 21 22 23 24 25 27 28 29 30 31 32 35 36 37 38 39 40 68 69 70 71 72 73 74 75 76 77	@@ -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:`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/commit.py Stacked
133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148	133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149	@@ -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):`

Change 1 of 3 Show Changes Only Show Entire File Loading... hggtk/gdialog.py Stacked
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576	`# gdialog.py - base dialog for gtools` `#` `# Copyright 2007 Brad Schick, brad at gmail . com` `#` `# This software may be used and distributed according to the terms` `# of the GNU General Public License, incorporated herein by reference.` `#` `import gtk` `import gobject` `import pango` `import shlex` `import os` `import threading` `import cStringIO` `import sys` `import shutil` `import tempfile` `from mercurial.i18n import _` `from mercurial.node import short` `from mercurial import cmdutil, util, ui, hg, commands` `from gtklib import MessageDialog` `import shlib` `import hglib` `class SimpleMessage(MessageDialog):` `def run(self):` `response = MessageDialog.run(self)` `self.destroy()` `return response` `class Prompt(SimpleMessage):` `def __init__(self, title, message, parent):` `SimpleMessage.__init__(self, parent, gtk.DIALOG_MODAL,` `gtk.MESSAGE_INFO, gtk.BUTTONS_CLOSE)` `self.set_title(hglib.toutf(title))` `self.set_markup('<b>' + hglib.toutf(message) + '</b>')` `mod = shlib.get_thg_modifier()` `key, modifier = gtk.accelerator_parse(mod+'Return')` `accel_group = gtk.AccelGroup()` `self.add_accel_group(accel_group)` `buttons = self.get_children()[0].get_children()[1].get_children()` `buttons[0].add_accelerator("clicked", accel_group, key,` `modifier, gtk.ACCEL_VISIBLE)` `class CustomPrompt(gtk.MessageDialog):` `''' Custom prompt dialog. Provide a list of choices with ampersands` `to delineate response given for each choice (and keyboard` `accelerator). Default must be one of the choice responses.` `'''` `# ret = CustomPrompt('Title', 'Message', self, ('&Yes', 'N&o'), 'o').run()` `# ret will be (gtk.RESPONSE_DELETE_EVENT, ord('y'), or ord('o'))` `def __init__(self, title, message, parent, choices, default=None):` `gtk.MessageDialog.__init__(self, parent, gtk.DIALOG_MODAL,` `gtk.MESSAGE_QUESTION)` `self.set_title(hglib.toutf(title))` `self.format_secondary_markup('<b>' + hglib.toutf(message) + '</b>')` `accel_group = gtk.AccelGroup()` `self.add_accel_group(accel_group)` `for s in choices:` `char = s[s.index('&')+1].lower()` `button = self.add_button(s.replace('&', '_'), ord(char))` `button.add_accelerator('clicked', accel_group, ord(char), 0,` `gtk.ACCEL_VISIBLE)` `if default:` `self.set_default_response(ord(default))` `class Confirm(SimpleMessage):` `"""Dialog returns gtk.RESPONSE_YES or gtk.RESPONSE_NO` `"""` `def __init__(self, title, files, parent, primary=None):` `SimpleMessage.__init__(self, parent, gtk.DIALOG_MODAL,` `gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO)` `self.set_title(hglib.toutf(title))` `if primary is None:` `primary = title + ' file' + ((len(files) > 1 and 's') or '') + '?'` `primary = '<b>' + primary + '</b>'` `self.set_markup(hglib.toutf(primary))` `message = ''` `for i, f in enumerate(files):` `message += ' ' + f + '\n'` `if i == 9:` `message += ' ...\n'` `break` `self.format_secondary_text(hglib.toutf(message))` `accel_group = gtk.AccelGroup()` `self.add_accel_group(accel_group)` `buttons = self.get_children()[0].get_children()[1].get_children()` `buttons[1].add_accelerator("clicked", accel_group, ord("y"),` `0, gtk.ACCEL_VISIBLE)` `buttons[0].add_accelerator("clicked", accel_group, ord("n"),` `0, gtk.ACCEL_VISIBLE)` `class GDialog(gtk.Window):` `"""GTK+ based dialog for displaying mercurial information` `The following methods are meant to be overridden by subclasses. At this` `point GCommit is really the only intended subclass.` `parse_opts(self)` `get_title(self)` `get_minsize(self)` `get_defsize(self)` `get_tbbuttons(self)` `get_body(self)` `get_extras(self)` `prepare_display(self)` `should_live(self, widget, event)` `save_settings(self)` `load_settings(self, settings)` `"""` `# "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()` `self.ui = ui` `self.ui.setconfig('ui', 'interactive', 'off')` `self.repo = repo or hg.repository(ui, path=hglib.rootpath())` `self.pats = pats` `self.opts = opts` `self.tmproot = None` `self.toolbuttons = {}` `self.settings = shlib.Settings(self.__class__.__name__)` `self.init()` `### Following methods are meant to be overridden by subclasses ###` `def init(self):` `pass` `def parse_opts(self):` `pass` `def get_title(self):` `return ''` `def get_icon(self):` `return ''` `def get_minsize(self):` `return (395, 200)` `def get_defsize(self):` `return self._setting_defsize` `def get_tbbuttons(self):` `return []` `def get_body(self):` `return None` `def get_extras(self):` `return None` `def prepare_display(self):` `pass` `def should_live(self, widget=None, event=None):` `self._destroying(widget)` `return False` `def save_settings(self):` `settings = {}` `rect = self.get_allocation()` `if self.ismaximized:` `settings['gdialog-rect'] = self._setting_defsize` `settings['gdialog-pos'] = self._setting_winpos` `else:` `settings['gdialog-rect'] = (rect.width, rect.height)` `settings['gdialog-pos'] = self.lastpos` `settings['gdialog-ismax'] = self.ismaximized` `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 ###` `def display(self, opengui=True):` `self._parse_config()` `self._load_settings()` `if opengui:` `self._setup_gtk()` `self._parse_opts()` `self.prepare_display()` `self.show_all()` `else:` `self._parse_opts()` `self.tooltips = gtk.Tooltips()` `def test_opt(self, opt):` `return opt in self.opts and self.opts[opt]` `def _parse_config(self):` `# defaults` `self.fontcomment = 'monospace 10'` `self.fontdiff = 'monospace 10'` `self.fontlist = 'monospace 9'` `self.diffbottom = ''` `for attr, setting in self.ui.configitems('gtools'):` `if setting : setattr(self, attr, setting)` `if not self.diffbottom:` `self.diffbottom = False` `elif self.diffbottom.lower() == 'false' or self.diffbottom == '0':` `self.diffbottom = False` `else:` `self.diffbottom = True` `def _parse_opts(self):` `# Remove dry_run since Hg only honors it for certain commands` `self.opts['dry_run'] = False` `self.opts['force_editor'] = False` `self.parse_opts()` `def merge_opts(self, defaults, mergelist=()):` `"""Merge default options with the specified local options and globals.` `Results is defaults + merglist + globals` `"""` `newopts = {}` `for hgopt in defaults:` `newopts[hgopt[1].replace('-', '_')] = hgopt[2]` `for mergeopt in mergelist:` `newopts[mergeopt] = self.opts[mergeopt]` `newopts.update(self.global_opts())` `return newopts` `def global_opts(self):` `globalopts = {}` `hgglobals = [opt[1] for opt in commands.globalopts if opt[1] != 'help']` `hgglobals = [f.replace('-', '_') for f in hgglobals]` `for key in self.opts:` `if key in hgglobals :` `globalopts[key] = self.opts[key]` `return globalopts` `def count_revs(self):` `cnt = 0` `if self.test_opt('rev'):` `for rev in self.opts['rev']:` `cnt += len(rev.split(cmdutil.revrangesep, 1))` `return cnt` `def make_toolbutton(self, stock, label, handler,` `userdata=None, menu=None, tip=None):` `if menu:` `tbutton = gtk.MenuToolButton(stock)` `tbutton.set_menu(menu)` `else:` `tbutton = gtk.ToolButton(stock)` `if tip:` `tbutton.set_tooltip(self.tooltips, tip)` `tbutton.set_use_underline(True)` `tbutton.set_label(label)` `tbutton.connect('clicked', handler, userdata)` `self.toolbuttons[label] = tbutton` `return tbutton` `def get_toolbutton(self, label):` `return self.toolbuttons[label]` `def windowstate(self, window, event):` `if event.changed_mask & gtk.gdk.WINDOW_STATE_MAXIMIZED:` `if event.new_window_state & gtk.gdk.WINDOW_STATE_MAXIMIZED:` `self.ismaximized = True` `else:` `self.ismaximized = False` `def setfocus(self, window, event):` `self.lastpos = self.get_position()` `def _setup_gtk(self):` `self.set_title(self.get_title())` `shlib.set_tortoise_icon(self, self.get_icon())` `shlib.set_tortoise_keys(self)` `self.ismaximized = False` `self.lastpos = self._setting_winpos` `self.connect('window-state-event', self.windowstate)` `self.connect('set-focus', self.setfocus)` `# Minimum size` `minx, miny = self.get_minsize()` `self.set_size_request(minx, miny)` `# Initial size` `defx, defy = self.get_defsize()` `self.set_default_size(defx, defy)` `if self._setting_wasmax:` `self.maximize()` `self.move(self._setting_winpos[0], self._setting_winpos[1])` `vbox = gtk.VBox(False, 0)` `self.add(vbox)` `self.tooltips = gtk.Tooltips()` `toolbar = gtk.Toolbar()` `tbuttons = self.get_tbbuttons()` `for tbutton in tbuttons:` `toolbar.insert(tbutton, -1)` `self.toolbar = toolbar` `vbox.pack_start(toolbar, False, False, 0)` `# Subclass returns the main body` `body = self.get_body()` `vbox.pack_start(body, True, True, 0)` `# Subclass provides extra stuff in bottom hbox` `extras = self.get_extras()` `if extras:` `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)` `def _hg_call_wrapper(self, title, command, showoutput=True):` `"""Run the specified command and display any resulting aborts,` `messages, and errors` `"""` `textout = ''` `saved = sys.stderr` `errors = cStringIO.StringIO()` `try:` `sys.stderr = errors` `self.ui.pushbuffer()` `try:` `command()` `except util.Abort, inst:` `Prompt(title + _(' Aborted'), str(inst), self).run()` `return False, ''` `finally:` `sys.stderr = saved` `textout = self.ui.popbuffer()` `prompttext = ''` `if showoutput:` `prompttext = textout + '\n'` `prompttext += errors.getvalue()` `errors.close()` `if len(prompttext) > 1:` `Prompt(title + _(' Messages and Errors'),` `prompttext, self).run()` `return True, textout` `def _do_diff(self, patterns, options, modal=False):` `import visdiff` `if self.ui.configbool('tortoisehg', 'vdiffnowin'):` `from hgext import extdiff` `tools = visdiff.readtools(self.ui)` `preferred = self.ui.config('tortoisehg', 'vdiff', 'vdiff')` `if not preferred or preferred not in tools:` `Prompt(_('No visual diff configured'),` `_('Please select a visual diff application.'), self).run()` `dlg = ConfigDialog(self.repo.root, False)` `dlg.show_all()` `dlg.focus_field('tortoisehg.vdiff')` `dlg.run()` `dlg.hide()` `self.ui = ui.ui()` `self._parse_config()` `return` `file = len(patterns) == 1 and patterns[0] or ''` `diffcmd, diffopts = tools[preferred]` `opts = {'change': options.get('change')}` `if not opts['change']:` `opts['rev'] = options.get('rev')` `def dodiff():` `extdiff.dodiff(self.ui, self.repo, diffcmd, diffopts,` `[self.repo.wjoin(file)], opts)` `thread = threading.Thread(target=dodiff, name='diff:' + file)` `thread.setDaemon(True)` `thread.start()` `else:` `dialog = visdiff.FileSelectionDialog(patterns, options)` `dialog.show_all()` `if modal:` `dialog.run()` `dialog.hide()` `def _diff_file(self, stat, file):` `self._do_diff(file and [file] or [], self.opts)` `def _view_file(self, stat, file, force_left=False):` `import atexit` `def cleanup():` `shutil.rmtree(self.tmproot)` `if not self.tmproot:` `self.tmproot = tempfile.mkdtemp(prefix='gtools.')` `atexit.register(cleanup)` `def snapshot_node(ui, repo, files, node, tmproot):` `'''` `snapshot files as of some revision` `(adapted from Extdiff extension)` `'''` `mf = repo.changectx(node).manifest()` `dirname = os.path.basename(repo.root)` `if dirname == "":` `dirname = "root"` `dirname = '%s.%s' % (dirname, short(node))` `base = os.path.join(tmproot, dirname)` `try:` `os.mkdir(base)` `except:` `pass` `ui.note(_('making snapshot of %d files from rev %s\n') %` `(len(files), short(node)))` `for fn in files:` `if not fn in mf:` `# skipping new file after a merge ?` `continue` `wfn = util.pconvert(fn)` `ui.note(' %s\n' % wfn)` `dest = os.path.join(base, wfn)` `destdir = os.path.dirname(dest)` `if not os.path.isdir(destdir):` `os.makedirs(destdir)` `data = repo.wwritedata(wfn, repo.file(wfn).read(mf[wfn]))` `open(dest, 'wb').write(data)` `return dirname` `def doedit():` `pathroot = self.repo.root` `copynode = None` `# if we aren't looking at the wc, copy the node...` `if stat in 'R!' or force_left:` `copynode = self._node1` `elif self._node2:` `copynode = self._node2` `if copynode:` `copydir = snapshot_node(self.ui, self.repo,` `[util.pconvert(file)], copynode, self.tmproot)` `pathroot = os.path.join(self.tmproot, copydir)` `file_path = os.path.join(pathroot, file)` `util.system("%s \"%s\"" % (editor, file_path),` `environ={'HGUSER': self.ui.username()},` `onerr=util.Abort, errprefix=_('edit failed'))` `editor = (self.ui.config('tortoisehg', 'editor') or` `self.ui.config('gtools', 'editor') or` `os.environ.get('HGEDITOR') or` `self.ui.config('ui', 'editor') or` `os.environ.get('EDITOR', 'vi'))` `if os.path.basename(editor) in ('vi', 'vim', 'hgeditor'):` `from thgconfig import ConfigDialog` `Prompt(_('No visual editor configured'),` `_('Please configure a visual editor.'), self).run()` `dlg = ConfigDialog(False)` `dlg.show_all()` `dlg.focus_field('tortoisehg.editor')` `dlg.run()` `dlg.hide()` `self.ui = ui.ui()` `self._parse_config()` `return` `file = util.localpath(file)` `thread = threading.Thread(target=doedit, name='edit:'+file)` `thread.setDaemon(True)` `thread.start()` `class NativeSaveFileDialogWrapper:` `"""Wrap the windows file dialog, or display default gtk dialog if` `that isn't available"""` `def __init__(self, InitialDir = None, Title = _('Save File'),` `Filter = {"All files": "."}, FilterIndex = 1, FileName = ''):` `import os.path` `if InitialDir == None:` `InitialDir = os.path.expanduser("~")` `self.InitialDir = InitialDir` `self.FileName = FileName` `self.Title = Title` `self.Filter = Filter` `self.FilterIndex = FilterIndex` `def run(self):` `"""run the file dialog, either return a file name, or False if` `the user aborted the dialog"""` `try:` `return self.runWindows()` `except ImportError:` `return self.runCompatible()` `def runWindows(self):` `import win32gui, win32con` `#filter = ""` `#for name, pattern in self.Filter.iteritems():` `# filter += name + "\0" + pattern + "\0"` `#customfilter = "\0"` `fname, customfilter, flags=win32gui.GetSaveFileNameW(` `InitialDir=self.InitialDir,` `Flags=win32con.OFN_EXPLORER,` `File=self.FileName,` `DefExt='py',` `Title=self.Title,` `Filter="",` `CustomFilter="",` `FilterIndex=1)` `if fname:` `return fname` `else:` `return False` `def runCompatible(self):` `file_save = gtk.FileChooserDialog(self.Title,None,` `gtk.FILE_CHOOSER_ACTION_SAVE` `, (gtk.STOCK_CANCEL` `, gtk.RESPONSE_CANCEL` `, gtk.STOCK_SAVE` `, gtk.RESPONSE_OK))` `file_save.set_do_overwrite_confirmation(True)` `file_save.set_default_response(gtk.RESPONSE_OK)` `file_save.set_current_folder(self.InitialDir)` `file_save.set_current_name(self.FileName)` `for name, pattern in self.Filter.iteritems():` `fi = gtk.FileFilter()` `fi.set_name(name)` `fi.add_pattern(pattern)` `file_save.add_filter(fi)` `if file_save.run() == gtk.RESPONSE_OK:` `result = file_save.get_filename();` `else:` `result = False` `file_save.destroy()` `return result`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/guess.py Stacked
46 47 48 49 50 51 52	46 47 48 49 50 51 52	@@ -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])`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/hgemail.py Stacked
205 206 207 208 209 210 211	205 206 207 208 209 210 211	@@ -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`

Change 1 of 4 Show Changes Only Show Entire File Loading... hggtk/history.py Stacked
145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 259 260 261 262 263 264 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301	145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 237 238 239 240 241 242 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294	@@ -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"""`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/shlib.py Stacked
55 56 57 58 59 60 61 62	55 56 57 58 59 60	@@ -55,8 +55,6 @@ `class Settings(object):`-`version = 1.0`- `def __init__(self, appname, path=None):` `self._appname = appname` `self._data = {}`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/status.py Stacked
194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213	194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213	@@ -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`

Change 1 of 2 Show Changes Only Show Entire File Loading... hggtk/synch.py Stacked
32 33 34 35 36 37 38 555 556 557 558 559 560 561 562	32 33 34 35 36 37 554 555 556 557 558 559 560 561	@@ -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`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/thgconfig.py Stacked
408 409 410 411 412 413 414	408 409 410 411 412 413 414	@@ -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')`

Diff Options

hggtk: cleanup/simplify dialog state save/restore

Attach a Trello Card

Your session has expired

Diff Options

Add a bookmark

hggtk: cleanup/simplify dialog state save/restore

Diff to 0850fac729cb

Attach a Trello Card

Add a tag

Your session has expired