History - Kiln » TortoiseHg » TortoiseHg

Kiln »

TortoiseHg »

TortoiseHg

Clone URL:

Pushed to one repository ·

View In Graph Contained in 0.7, 0.7.1, and 0.7.2

hggtk: get rid of close buttons on toolbar

Changeset 88e98adbc4b2 …

Parent 4301178886fd …

by Germ├бn P├│o-Caama├▒o Jan 21 09 at 5:29 PM

Changes to 11 files · Browse files at 88e98adbc4b2 Showing diff from parent 4301178886fd Diff from another changeset...

Change 1 of 2 Show Changes Only Show Entire File Loading... hggtk/backout.py Stacked
34 35 36 37 38 39 40 41 42 43 44 76 77 78 79 80 81 82 83 84	34 35 36 37 38 39 40 72 73 74 75 76 77	@@ -34,11 +34,7 @@ `tbuttons = [` `self._toolbutton(gtk.STOCK_GO_BACK, 'Backout',` `self._backout_clicked,`-`'Backout selected changeset'),`-`sep,`-`self._toolbutton(gtk.STOCK_CLOSE, 'Close',`-`self._close_clicked,`-`'Close Window')`+`'Backout selected changeset')` `]` `for btn in tbuttons:` `self.tbar.insert(btn, -1)`@@ -76,9 +72,6 @@ `' effect of the change being backed out.')` `vbox.pack_start(frame, True, True, 4)` -`def _close_clicked(self, toolbutton, data=None):`-`self.destroy()`- `def set_notify_func(self, func, *args):` `self.notify_func = func` `self.notify_args = args`

Change 1 of 2 Show Changes Only Show Entire File Loading... hggtk/clone.py Stacked
68 69 70 71 72 73 74 75 76 77 78 79 80 185 186 187 188 189 190 191 192 193	68 69 70 71 72 73 178 179 180 181 182 183	@@ -68,13 +68,6 @@ `]` `for btn in tbuttons:` `self.tbar.insert(btn, -1)`-`sep = gtk.SeparatorToolItem()`-`sep.set_expand(True)`-`sep.set_draw(False)`-`self.tbar.insert(sep, -1)`-`button = self._toolbutton(gtk.STOCK_CLOSE, 'Close',`-`self._close_clicked, tip='Close Application')`-`self.tbar.insert(button, -1)` `vbox = gtk.VBox()` `self.add(vbox)` `vbox.pack_start(self.tbar, False, False, 2)`@@ -185,9 +178,6 @@ `vbox.pack_end(self._remote_cmd, False, False, 1)` `vbox.pack_end(lbl, False, False, 1)` -`def _close_clicked(self, toolbutton, data=None):`-`gtk.main_quit()`- `def _toolbutton(self, stock, label, handler,` `menu=None, userdata=None, tip=None):` `if menu:`

Change 1 of 2 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	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	`# 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 mercurial.demandimport; mercurial.demandimport.disable()` `import os` `import threading` `import StringIO` `import sys` `import shutil` `import tempfile` `import datetime` `import cPickle` `import pygtk` `pygtk.require('2.0')` `import gtk` `import gobject` `import pango` `from mercurial.i18n import _` `from mercurial.node import ` `from mercurial import cmdutil, util, ui, hg, commands, patch` `from hgext import extdiff` `from shlib import shell_notify, set_tortoise_icon, Settings` `from thgconfig import ConfigDialog` `from gtklib import MessageDialog` `from hglib import toutf` `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(toutf(title))` `self.set_markup('<b>' + toutf(message) + '</b>')` `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(toutf('Confirm ' + title))` `if primary is None:` `primary = title + ' file' + ((len(files) > 1 and 's') or '') + '?'` `primary = '<b>' + primary + '</b>'` `self.set_markup(toutf(primary))` `message = ''` `for i, file in enumerate(files):` `message += ' ' + file + '\n'` `if i == 9:` `message += ' ...\n'` `break` `self.format_secondary_text(toutf(message))` `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, main):` `gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)` `self.cwd = cwd` `self.ui = ui` `self.ui.interactive=False` `self.repo = repo` `self.pats = pats` `self.opts = opts` `self.main = main` `self.tmproot = None` `self.toolbuttons = {}` `self.settings = 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):` `return False` `def save_settings(self):` `rect = self.get_allocation()` `return {'gdialog': (rect.width, rect.height)}` `def load_settings(self, settings):` `if settings:` `self._setting_defsize = settings['gdialog']` `else:` `self._setting_defsize = (678, 585)` `### 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.diffopts = ''` `self.diffcmd = ''` `self.diffbottom = ''` `for attr, setting in self.ui.configitems('gtools'):` `if setting : setattr(self, attr, setting)` `if not self.diffcmd :` `# default to tortoisehg's configuration` `vdiff = self.ui.config('tortoisehg', 'vdiff')` `if vdiff:` `self.diffcmd = self.ui.config('extdiff', 'cmd.'+vdiff) or vdiff` `else:` `self.diffcmd = 'diff'` `if not self.diffopts :` `self.diffopts = '-Npru'` `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):` `globals = {}` `hgglobals = [opt[1].replace('-', '_') for opt in commands.globalopts if opt[1] != 'help']` `for key in self.opts:` `if key in hgglobals :` `globals[key] = self.opts[key]` `return globals` `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 _setup_gtk(self):` `self.set_title(self.get_title())` `set_tortoise_icon(self, self.get_icon())` `# 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)` `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)`-`sep = gtk.SeparatorToolItem()`-`sep.set_expand(True)`-`sep.set_draw(False)`-`toolbar.insert(sep, -1)`-`if self.main:`-`name = 'Quit'`-`tip = 'Close Application'`-`else:`-`name = 'Close'`-`tip = 'Close Window'`-`button = self.make_toolbutton(gtk.STOCK_CLOSE, name,`-`self._quit_clicked, tip=tip)`-`toolbar.insert(button, -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 _quit_clicked(self, button, data=None):`-`if not self.should_live():`-`self.destroy()`-- `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()` `def _load_settings(self):` `settings = {}` `version = self.settings.get_value('settings_version', None)` `if version == GDialog.settings_version:` `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 = StringIO.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 _diff_file(self, stat, file):` `def dodiff():` `extdiff.dodiff(self.ui, self.repo, self.diffcmd, [self.diffopts],` `[self.repo.wjoin(file)], self.opts)` `if self.diffcmd == 'diff':` `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` `thread = threading.Thread(target=dodiff, name='diff:'+file)` `thread.setDaemon(True)` `thread.start()` `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'):` `Prompt('No visual editor configured',` `'Please configure a visual editor.', self).run()` `dlg = ConfigDialog(self.repo.root, 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:` `import win32gui` `if self.tortoiseHgIsInstalled(): #as of 20071021, the file dialog will hang if the tortoiseHg shell extension is installed. I have no clue why, yet - Tyberius Prime` `return self.runCompatible()` `else:` `return self.runWindows()` `except ImportError:` `return self.runCompatible()` `def tortoiseHgIsInstalled(self):` `import _winreg` `try:` `_winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE,` `r"Software\TortoiseHg")` `return True` `except WindowsError: #reg key not found` `pass` `return False` `def runWindows(self):` `import win32gui, win32con, os` `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_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 3 Show Changes Only Show Entire File Loading... hggtk/hgemail.py Stacked
31 32 33 34 35 36 37 38 39 40 41 42 44 45 46 47 48 49 50 51 52 174 175 176 177 178 179 180 181 182	31 32 33 34 35 36 38 39 40 41 42 43 44 166 167 168 169 170 171	@@ -31,12 +31,6 @@ `self.tbar = gtk.Toolbar()` `self.tips = gtk.Tooltips()` -`sep = gtk.SeparatorToolItem()`-`sep.set_expand(True)`-`sep.set_draw(False)`-`self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close',`-`self._close_clicked, 'Close Window')`- `tbuttons = [` `self._toolbutton(gtk.STOCK_GOTO_LAST, 'Send',` `self._on_send_clicked,`@@ -44,9 +38,7 @@ `gtk.SeparatorToolItem(),` `self._toolbutton(gtk.STOCK_PREFERENCES, 'configure',` `self._on_conf_clicked,`-`'Configure email settings'),`-`sep,`-`self._btn_close`+`'Configure email settings')` `]` `for btn in tbuttons:` `self.tbar.insert(btn, -1)`@@ -174,9 +166,6 @@ `self.connect('map_event', self._on_window_map_event)` -`def _close_clicked(self, toolbutton, data=None):`-`self.destroy()`- `def _toolbutton(self, stock, label, handler, tip):` `tbutton = gtk.ToolButton(stock)` `tbutton.set_label(label)`

Change 1 of 2 Show Changes Only Show Entire File Loading... hggtk/hgignore.py Stacked
26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 157 158 159 160 161 162 163 164 165	26 27 28 29 30 31 32 33 34 35 36 149 150 151 152 153 154	@@ -26,19 +26,11 @@ `self.tbar = gtk.Toolbar()` `self.tips = gtk.Tooltips()` -`sep = gtk.SeparatorToolItem()`-`sep.set_expand(True)`-`sep.set_draw(False)`-`self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close',`-`self._close_clicked, 'Close Window')`- `tbuttons = [` `self._toolbutton(gtk.STOCK_REFRESH,` `'Refresh',` `self._refresh_clicked,`-`tip='Reload hgignore'),`-`sep,`-`self._btn_close`+`tip='Reload hgignore')` `]` `for btn in tbuttons:` `self.tbar.insert(btn, -1)`@@ -157,9 +149,6 @@ `except IOError:` `pass` -`def _close_clicked(self, toolbutton, data=None):`-`self.destroy()`- `def _toolbutton(self, stock, label, handler, tip):` `tbutton = gtk.ToolButton(stock)` `tbutton.set_label(label)`

Change 1 of 2 Show Changes Only Show Entire File Loading... hggtk/merge.py Stacked
59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 113 114 115 116 117 118 119 120 121	59 60 61 62 63 64 65 66 67 68 106 107 108 109 110 111	@@ -59,17 +59,10 @@ `self._btn_unmerge_clicked,` `tip='Undo merging and return working directory to'` `' one of it parent revision')`-`sep = gtk.SeparatorToolItem()`-`sep.set_expand(True)`-`sep.set_draw(False)`-`self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close',`-`self._close_clicked, tip='Close Application')` `tbuttons = [` `self._btn_merge,` `gtk.SeparatorToolItem(),`-`self._btn_unmerge,`-`sep,`-`self._btn_close`+`self._btn_unmerge` `]` `for btn in tbuttons:` `self.tbar.insert(btn, -1)`@@ -113,9 +106,6 @@ `# show them all` `self._refresh()` -`def _close_clicked(self, toolbutton, data=None):`-`self.destroy()`- `def _toolbutton(self, stock, label, handler,` `menu=None, userdata=None, tip=None):` `if menu:`

Change 1 of 2 Show Changes Only Show Entire File Loading... hggtk/recovery.py Stacked
75 76 77 78 79 80 81 82 83 84 85 86 87 101 102 103 104 105 106 107 108 109	75 76 77 78 79 80 94 95 96 97 98 99	@@ -75,13 +75,6 @@ `]` `for btn in tbuttons:` `self.tbar.insert(btn, -1)`-`sep = gtk.SeparatorToolItem()`-`sep.set_expand(True)`-`sep.set_draw(False)`-`self.tbar.insert(sep, -1)`-`button = self._toolbutton(gtk.STOCK_CLOSE, 'Close',`-`self._close_clicked, tip='Close Application')`-`self.tbar.insert(button, -1)` `vbox = gtk.VBox()` `self.add(vbox)` `vbox.pack_start(self.tbar, False, False, 2)`@@ -101,9 +94,6 @@ `self.stbar = gtklib.StatusBar()` `vbox.pack_start(self.stbar, False, False, 2)` -`def _close_clicked(self, *args):`-`self._do_close()`- `def _delete(self, widget, event):` `self._do_close()` `return True`

Change 1 of 3 Show Changes Only Show Entire File Loading... hggtk/serve.py Stacked
75 76 77 78 79 80 81 82 83 84 85 88 89 90 91 92 93 94 95 146 147 148 149 150 151 152 153 154 155	75 76 77 78 79 80 83 84 85 86 87 88 139 140 141 142 143 144	@@ -75,11 +75,6 @@ `'Configure',` `self._on_conf_clicked,` `None)`-`sep = gtk.SeparatorToolItem()`-`sep.set_expand(True)`-`sep.set_draw(False)`-`self._button_close = self._toolbutton(gtk.STOCK_CLOSE, 'Quit',`-`self._close_clicked)` `tbuttons = [` `self._button_start,`@@ -88,8 +83,6 @@ `self._button_browse,` `gtk.SeparatorToolItem(),` `self._button_conf,`-`sep,`-`self._button_close,` `]` `for btn in tbuttons:` `self.tbar.insert(btn, -1)`@@ -146,10 +139,6 @@ `tbutton.connect('clicked', handler, userdata)` `return tbutton` -`def _close_clicked(self, *args):`-`if self._server_stopped() == True:`-`gtk.main_quit()`- `def _delete(self, widget, event):` `if self._server_stopped() == True:` `gtk.main_quit()`

Change 1 of 1 Show Changes Only Show Entire File Loading... hggtk/synch.py Stacked
97 98 99 100 101 102 103 104 105 106 107 108 109	97 98 99 100 101 102	@@ -97,13 +97,6 @@ `]` `for btn in tbuttons:` `self.tbar.insert(btn, -1)`-`sep = gtk.SeparatorToolItem()`-`sep.set_expand(True)`-`sep.set_draw(False)`-`self.tbar.insert(sep, -1)`-`button = self._toolbutton(gtk.STOCK_CLOSE, 'Quit',`-`self._close_clicked, tip='Quit Application')`-`self.tbar.insert(button, -1)` `vbox = gtk.VBox()` `self.add(vbox)` `vbox.pack_start(self.tbar, False, False, 2)`

Change 1 of 3 Show Changes Only Show Entire File Loading... hggtk/tagadd.py Stacked
48 49 50 51 52 53 54 55 56 57 58 59 66 67 68 69 70 71 72 73 74 149 150 151 152 153 154 155 156 157	48 49 50 51 52 53 60 61 62 63 64 65 66 141 142 143 144 145 146	@@ -48,12 +48,6 @@ `self.tbar = gtk.Toolbar()` `self.tips = gtk.Tooltips()` -`sep = gtk.SeparatorToolItem()`-`sep.set_expand(True)`-`sep.set_draw(False)`-`self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close',`-`self._close_clicked, tip='Close Application')`- `self._btn_addtag = self._toolbutton(` `gtk.STOCK_ADD,` `'Add',`@@ -66,9 +60,7 @@ `tip='Remove tag from repository')` `tbuttons = [` `self._btn_addtag,`-`self._btn_rmtag,`-`sep,`-`self._btn_close,`+`self._btn_rmtag` `]` `for btn in tbuttons:` `self.tbar.insert(btn, -1)`@@ -149,9 +141,6 @@ `continue` `self._tagslist.append([tagname])` -`def _close_clicked(self, toolbutton, data=None):`-`self.destroy()`- `def _btn_tag_clicked(self, button):` `""" select tag from tags dialog """` `import tags`

Change 1 of 2 Show Changes Only Show Entire File Loading... hggtk/update.py Stacked
56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 113 114 115 116 117 118 119 120 121	56 57 58 59 60 61 62 63 106 107 108 109 110 111	@@ -56,15 +56,8 @@ `'Update',` `self._btn_update_clicked,` `tip='Update working directory to selected revision')`-`sep = gtk.SeparatorToolItem()`-`sep.set_expand(True)`-`sep.set_draw(False)`-`self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close',`-`self._close_clicked, tip='Close Application')` `tbuttons = [` `self._btn_update,`-`sep,`-`self._btn_close,` `]` `for btn in tbuttons:` `self.tbar.insert(btn, -1)`@@ -113,9 +106,6 @@ `# show them all` `self._refresh()` -`def _close_clicked(self, toolbutton, data=None):`-`self.destroy()`- `def _toolbutton(self, stock, label, handler,` `menu=None, userdata=None, tip=None):` `if menu:`

Diff Options

hggtk: get rid of close buttons on toolbar

Attach a Trello Card

Your session has expired

Diff Options

Add a bookmark

hggtk: get rid of close buttons on toolbar

Diff to 88e98adbc4b2

Attach a Trello Card

Add a tag

Your session has expired