Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

history: clean up startup logic

Changeset ec82f96167f3…

Parent c9653a1ac112…

by Steve Borho

Changes to one file · Browse files at ec82f96167f3 Showing diff from parent c9653a1ac112 Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​history.py Stacked
 
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
 
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
 
481
482
483
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
484
485
486
 
69
70
71
 
72
73
74
75
76
77
 
78
79
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
80
81
82
 
292
293
294
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
295
296
297
 
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
@@ -69,31 +69,14 @@
  self.refresh_clicked,   tip=_('Reload revision history')),   gtk.SeparatorToolItem(), - ] + self.changeview.get_tbbuttons() + ]   if not self.opts.get('from-synch'):   self.synctb = self.make_toolbutton(gtk.STOCK_NETWORK,   _('Synchronize'),   self.synch_clicked,   tip=_('Launch synchronize tool')) - tbar += [gtk.SeparatorToolItem(), self.synctb] + tbar += [self.synctb, gtk.SeparatorToolItem() ]   - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - self.nextbutton = self.make_toolbutton(gtk.STOCK_GO_DOWN, - _('Load more'), self.more_clicked, tip=_('load more revisions')) - self.allbutton = self.make_toolbutton(gtk.STOCK_GOTO_BOTTOM, - _('Load all'), self.load_all_clicked, tip=_('load all revisions')) - - vmenu = gtk.MenuToolButton('') - vmenu.set_menu(self.view_menu()) - # A MenuToolButton has two parts; a Button and a ToggleButton - # we want to see the togglebutton, but not the button - b = vmenu.child.get_children()[0] - b.unmap() - b.set_sensitive(False) - - tbar += [sep, self.nextbutton, self.allbutton, vmenu]   return tbar     def synch_clicked(self, toolbutton, data): @@ -309,25 +292,6 @@
    def load_settings(self, settings):   'Called at beginning of display() method' - - # This stuff is here in load_settings in order to have access to - # self.changeview when building the toolbar. TODO: clean this up - self.stbar = gtklib.StatusBar() - self.limit = self.get_graphlimit(None) - - # Allocate TreeView instance to use internally - if self.opts['limit']: - firstlimit = self.get_graphlimit(self.opts['limit']) - self.graphview = LogTreeView(self.repo, firstlimit, self.stbar) - else: - self.graphview = LogTreeView(self.repo, self.limit, self.stbar) - - # Allocate ChangeSet instance to use internally - self.changeview = changeset.ChangeSet(self.ui, self.repo, self.cwd, [], - self.opts, self.stbar) - self.changeview.display(False) - self.changeview.glog_parent = self -   gdialog.GDialog.load_settings(self, settings)   self.setting_vpos = -1   self.setting_hpos = -1 @@ -481,6 +445,43 @@
  self.gorev_dialog = None   self._menu = self.tree_context_menu()   self._menu2 = self.tree_diff_context_menu() + self.stbar = gtklib.StatusBar() + self.limit = self.get_graphlimit(None) + + # Allocate TreeView instance to use internally + if self.opts['limit']: + firstlimit = self.get_graphlimit(self.opts['limit']) + self.graphview = LogTreeView(self.repo, firstlimit, self.stbar) + else: + self.graphview = LogTreeView(self.repo, self.limit, self.stbar) + + # Allocate ChangeSet instance to use internally + self.changeview = changeset.ChangeSet(self.ui, self.repo, self.cwd, [], + self.opts, self.stbar) + self.changeview.display(False) + self.changeview.glog_parent = self + + # Add extra toolbar buttons + sep = gtk.SeparatorToolItem() + sep.set_expand(True) + sep.set_draw(False) + self.nextbutton = self.make_toolbutton(gtk.STOCK_GO_DOWN, + _('Load more'), self.more_clicked, tip=_('load more revisions')) + self.allbutton = self.make_toolbutton(gtk.STOCK_GOTO_BOTTOM, + _('Load all'), self.load_all_clicked, tip=_('load all revisions')) + + vmenu = gtk.MenuToolButton('') + vmenu.set_menu(self.view_menu()) + # A MenuToolButton has two parts; a Button and a ToggleButton + # we want to see the togglebutton, but not the button + b = vmenu.child.get_children()[0] + b.unmap() + b.set_sensitive(False) + + tbar = self.changeview.get_tbbuttons() + tbar += [sep, self.nextbutton, self.allbutton, vmenu] + for tbutton in tbar: + self.toolbar.insert(tbutton, -1)     treeframe = gtk.Frame()   treeframe.set_shadow_type(gtk.SHADOW_ETCHED_IN)