/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to viz/branchwin.py

  • Committer: Daniel Schierbeck
  • Date: 2007-11-20 12:21:07 UTC
  • Revision ID: daniel.schierbeck@gmail.com-20071120122107-vgape11qkdozckh5
Made the tag list appear sorted in the viz.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
121
121
        file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
122
122
        file_menu_quit.connect('activate', lambda x: gtk.main_quit())
123
123
        
124
 
        if self._parent is not None:
125
 
            file_menu.add(file_menu_close)
 
124
        file_menu.add(file_menu_close)
126
125
        file_menu.add(file_menu_quit)
127
126
 
128
127
        edit_menu = gtk.Menu()
134
133
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
135
134
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
136
135
 
137
 
        edit_menu_globopts = gtk.MenuItem("Global Settings")
138
 
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
 
136
        edit_menu_prefs = gtk.ImageMenuItem(gtk.STOCK_PREFERENCES)
 
137
        edit_menu_prefs.connect('activate', lambda x: PreferencesWindow().show())
139
138
 
140
139
        edit_menu.add(edit_menu_find)
141
140
        edit_menu.add(edit_menu_branchopts)
142
 
        edit_menu.add(edit_menu_globopts)
 
141
        edit_menu.add(edit_menu_prefs)
143
142
 
144
143
        view_menu = gtk.Menu()
145
144
        view_menuitem = gtk.MenuItem("_View")
178
177
        if self.branch.supports_tags():
179
178
            tags = self.branch.tags.get_tag_dict().items()
180
179
            tags.sort()
181
 
            tags.reverse()
182
180
            for tag, revid in tags:
183
181
                tag_item = gtk.MenuItem(tag)
184
182
                tag_item.connect('activate', self._tag_selected_cb, revid)
185
183
                tags_menu.add(tag_item)
186
184
 
187
 
            go_menu_tags.set_sensitive(len(tags) != 0)
188
 
        else:
189
 
            go_menu_tags.set_sensitive(False)
190
 
 
191
185
        go_menu.add(go_menu_next)
192
186
        go_menu.add(go_menu_prev)
193
187
        go_menu.add(gtk.SeparatorMenuItem())
214
208
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
215
209
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
216
210
 
 
211
        help_menu = gtk.Menu()
 
212
        help_menuitem = gtk.MenuItem("_Help")
 
213
        help_menuitem.set_submenu(help_menu)
 
214
 
 
215
        help_menu_about = gtk.ImageMenuItem(gtk.STOCK_ABOUT)
 
216
        help_menu_about.connect('activate', self._show_about_cb)
 
217
 
 
218
        help_menu.add(help_menu_about)
 
219
       
217
220
        menubar.add(file_menuitem)
218
221
        menubar.add(edit_menuitem)
219
222
        menubar.add(view_menuitem)
220
223
        menubar.add(go_menuitem)
221
224
        menubar.add(revision_menuitem)
222
225
        menubar.add(branch_menuitem)
 
226
        menubar.add(help_menuitem)
223
227
        menubar.show_all()
224
228
 
225
229
        return menubar
245
249
    def construct_top(self):
246
250
        """Construct the top-half of the window."""
247
251
        # FIXME: Make broken_line_length configurable
 
252
        if self.compact_view:
 
253
            brokenlines = 32
 
254
        else:
 
255
            brokenlines = None
248
256
 
249
 
        self.treeview = TreeView(self.branch, self.start, self.maxnum, self.compact_view)
 
257
        self.treeview = TreeView(self.branch, self.start, self.maxnum, brokenlines)
250
258
 
251
259
        self.treeview.connect('revision-selected',
252
260
                self._treeselection_changed_cb)
279
287
        self.next_button = self.next_rev_action.create_tool_item()
280
288
        self.toolbar.insert(self.next_button, -1)
281
289
 
282
 
        self.toolbar.insert(gtk.SeparatorToolItem(), -1)
283
 
 
284
 
        refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
285
 
        refresh_button.connect('clicked', self._refresh_clicked)
286
 
        self.toolbar.insert(refresh_button, -1)
287
 
 
288
290
        self.toolbar.show_all()
289
291
 
290
292
        return self.toolbar
386
388
            option = 'no'
387
389
 
388
390
        self.config.set_user_option('viz-compact-view', option)
389
 
        self.treeview.set_property('compact', self.compact_view)
390
 
        self.treeview.refresh()
 
391
 
 
392
        revision = self.treeview.get_revision()
 
393
 
 
394
        self.paned.get_child1().destroy()
 
395
        self.paned.pack1(self.construct_top(), resize=True, shrink=False)
 
396
 
 
397
        gobject.idle_add(self.set_revision, revision.revision_id)
391
398
 
392
399
    def _tag_revision_cb(self, w):
393
400
        try:
426
433
        dialog = AboutDialog()
427
434
        dialog.connect('response', lambda d,r: d.destroy())
428
435
        dialog.run()
429
 
 
430
 
    def _refresh_clicked(self, w):
431
 
        self.treeview.update()