Commits

Anonymous committed 0de1954 Merge

merge with Steve

Comments (0)

Files changed (1)

                     menu=self._filter_menu(),
                     tip='Filter revisions for display'),
                 gtk.SeparatorToolItem(),
-                self.make_toolbutton(gtk.STOCK_ZOOM_IN,
-                    '_View',
-                    self._filter_clicked, # TODO What should this button do?
-                    menu=self._view_menu(),
-                    tip='Select columns to display'),
                 self.make_toolbutton(gtk.STOCK_FIND,
                     '_DataMine',
                     self._datamine_clicked,
         hbox = gtk.HBox()
         hbox.pack_start(self.graphview, True, True, 0)
         vbox = gtk.VBox()
+        self.colmenu = gtk.MenuToolButton('')
+        self.colmenu.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 = self.colmenu.child.get_children()[0]
+        b.unmap()
+        b.set_sensitive(False)
         self.nextbutton = gtk.ToolButton(gtk.STOCK_GO_DOWN)
         self.nextbutton.connect('clicked', self._more_clicked)
         self.allbutton = gtk.ToolButton(gtk.STOCK_GOTO_BOTTOM)
         self.allbutton.connect('clicked', self._load_all_clicked)
+        vbox.pack_start(self.colmenu, False, False)
         vbox.pack_start(gtk.Label(''), True, True) # expanding blank label
         vbox.pack_start(self.nextbutton, False, False)
         vbox.pack_start(self.allbutton, False, False)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.