Jasper
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [EMAIL PROTECTED] # target_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # testament_sha1: 812c257ef65f627d70981f0a491f4c49f7d2b094 # timestamp: 2008-07-20 18:59:50 +0200 # source_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # base_revision_id: [EMAIL PROTECTED] # # Begin patch === modified file 'olive/__init__.py' --- olive/__init__.py 2008-07-20 16:29:18 +0000 +++ olive/__init__.py 2008-07-20 16:59:34 +0000 @@ -142,7 +142,7 @@ # Acceptable errors when loading files/folders in the treeviews self.acceptable_errors = (errno.ENOENT, errno.ELOOP) - self._load_left() + self.refresh_left() # Apply menu state self.window.mb_view_showhidden.set_active(self.pref.get_preference('dotted_files', 'bool')) @@ -852,37 +852,7 @@ self.pref.write() self.window.destroy() - - def _load_left(self): - """ Load data into the left panel. (Bookmarks) """ - # Create TreeStore - treestore = gtk.TreeStore(str, str) - - # Get bookmarks - bookmarks = self.pref.get_bookmarks() - - # Add them to the TreeStore - titer = treestore.append(None, [_i18n('Bookmarks'), None]) - - # Get titles and sort by title - bookmarks = [[self.pref.get_bookmark_title(item), item] for item in bookmarks] - bookmarks.sort() - for title_item in bookmarks: - treestore.append(titer, title_item) - - # Create the column and add it to the TreeView - self.treeview_left.set_model(treestore) - tvcolumn_bookmark = gtk.TreeViewColumn(_i18n('Bookmark')) - self.treeview_left.append_column(tvcolumn_bookmark) - - # Set up the cells - cell = gtk.CellRendererText() - tvcolumn_bookmark.pack_start(cell, True) - tvcolumn_bookmark.add_attribute(cell, 'text', 0) - - # Expand the tree - self.treeview_left.expand_all() - + def _load_right(self): """ Load data into the right panel. (Filelist) """ # Create ListStore @@ -1096,9 +1066,9 @@ def refresh_left(self): """ Refresh the bookmark list. """ - # Get TreeStore and clear it - treestore = self.treeview_left.get_model() - treestore.clear() + # Get ListStore and clear it + liststore = self.window.bookmarklist + liststore.clear() # Re-read preferences self.pref.read() @@ -1106,20 +1076,14 @@ # Get bookmarks bookmarks = self.pref.get_bookmarks() - # Add them to the TreeStore - titer = treestore.append(None, [_i18n('Bookmarks'), None]) - # Get titles and sort by title - bookmarks = [[self.pref.get_bookmark_title(item), item] for item in bookmarks] + bookmarks = [[self.pref.get_bookmark_title(item), item, gtk.STOCK_DIRECTORY] for item in bookmarks] bookmarks.sort() for title_item in bookmarks: - treestore.append(titer, title_item) + liststore.append(title_item) - # Add the TreeStore to the TreeView - self.treeview_left.set_model(treestore) - - # Expand the tree - self.treeview_left.expand_all() + # Add the ListStore to the TreeView + self.window.treeview_left.set_model(liststore) def refresh_right(self, path=None): """ Refresh the file list. """
=== modified file 'olive/window.py'
--- olive/window.py 2008-07-20 16:02:18 +0000
+++ olive/window.py 2008-07-20 16:59:34 +0000
@@ -373,14 +373,26 @@
self.scrolledwindow_left.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
self.treeview_left = gtk.TreeView()
- self.treeview_left.set_headers_visible(False)
self.treeview_left.connect("button-press-event", self.signal.on_treeview_left_button_press_event)
self.treeview_left.connect("button-release-event", self.signal.on_treeview_left_button_release_event)
self.treeview_left.connect("row-activated", self.signal.on_treeview_left_row_activated)
self.scrolledwindow_left.add(self.treeview_left)
- # Move olive/__init__.py _load_left List creation here
-
+ self.bookmarklist = gtk.ListStore(gobject.TYPE_STRING,
+ gobject.TYPE_STRING,
+ gobject.TYPE_STRING)
+ self.treeview_left.set_model(self.bookmarklist)
+
+ icon = gtk.CellRendererPixbuf()
+ cell = gtk.CellRendererText()
+
+ col_bookmark = gtk.TreeViewColumn(_i18n('Bookmarks'))
+ col_bookmark.pack_start(icon, False)
+ col_bookmark.pack_start(cell, False)
+ col_bookmark.set_attributes(icon, stock_id=2)
+ col_bookmark.add_attribute(cell, 'text', 0)
+ self.treeview_left.append_column(col_bookmark)
+
def _create_filelist(self):
""" Creates the file list (a ListStore in a TreeView in a ScrolledWindow)"""
# Model: [ icon, dir, name, status text, status, size (int), size (human), mtime (int), mtime (local), fileid ]
# Begin bundle
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
signature.asc
Description: OpenPGP digital signature
-- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
