Merge lp:~victored/pantheon-photos/lp-1275115 into lp:~pantheon-photos/pantheon-photos/trunk

[Victor Martinez]

- Group 'Photos', 'Flagged', 'Last Import', 'Import Queue', 'Offline', and 'Trash' sidebar entries under a new category called 'Library'.
- Move 'Trash' sidebar entry below 'Last Import'.
- Use bold text with no icons for Category headers. Fixes lp:1275115.

- Move 'Trash' sidebar entry below 'Last Import'.
- Use bold text with no icons for Category headers. Fixes lp:1275115.

[Danielle Foré (danrabbit)]

Victor can we rename "Library" to "Photos" and then put a header "Library" that includes Photos, Last Import, and Trash?

[Victor Martinez (victored)]

I'll look into it.

[lp:~victored/pantheon-photos/lp-1275115]

2525. By Victor Martinez on 2014-06-09

Group 'Photos', 'Flagged', 'Last Import', 'Import Queue', 'Offline', and 'Trash' sidebar entries under a new category called 'Library'.

[Victor Martinez (victored)]

Daniel, I've implemented the 'library' category you've requested.

[lp:~victored/pantheon-photos/lp-1275115]

2526. By Victor Martinez on 2014-06-09

Rename source files under src/library to reflect the names of the classes they contain, as they no longer contain sidebar branches.

[Corentin Noël (tintou)]

It simply looks better with this, thanks victor!

review: Approve

=== modified file 'src/library/Branch.vala'
--- src/library/Branch.vala	2013-01-21 21:16:09 +0000
+++ src/library/Branch.vala	2014-06-09 02:32:27 +0000
@@ -4,24 +4,98 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
-public class Library.Branch : Sidebar.RootOnlyBranch {
+public class Library.Branch : Sidebar.Branch {
+    private const string POSITION_DATA = "x-photos-entry-position";
+
+    public Library.PhotosEntry photos_entry { get; private set; }
+    public Library.FlaggedSidebarEntry flagged_entry { get; private set; }
+    public Library.LastImportSidebarEntry last_imported_entry { get; private set; }
+    public Library.ImportQueueSidebarEntry import_queue_entry { get; private set; }
+    public Library.OfflineSidebarEntry offline_entry { get; private set; }
+    public Library.TrashSidebarEntry trash_entry { get; private set; }
+    
+    // This lists the order of the library items in the sidebar. To re-order, simply move
+    // the item in this list to a new position. These numbers should *not* persist anywhere
+    // outside the app.
+    private enum EntryPosition {
+        PHOTOS,
+        FLAGGED,
+        LAST_IMPORTED,
+        IMPORT_QUEUE,
+        OFFLINE,
+        TRASH
+    }
+    
     public Branch() {
-        base (new Library.SidebarEntry());
+        base (new Sidebar.Grouping(_("Library"), null),
+            Sidebar.Branch.Options.STARTUP_OPEN_GROUPING, comparator);
+
+        photos_entry = new Library.PhotosEntry();
+        trash_entry = new Library.TrashSidebarEntry();
+        last_imported_entry = new Library.LastImportSidebarEntry();
+        flagged_entry = new Library.FlaggedSidebarEntry();
+        offline_entry = new Library.OfflineSidebarEntry();
+        import_queue_entry = new Library.ImportQueueSidebarEntry();
+
+        insert(photos_entry, EntryPosition.PHOTOS);
+        insert(trash_entry, EntryPosition.TRASH);
+
+        flagged_entry.visibility_changed.connect(on_flagged_visibility_changed);
+        on_flagged_visibility_changed();
+
+        last_imported_entry.visibility_changed.connect(on_last_imported_visibility_changed);
+        on_last_imported_visibility_changed();
+
+        import_queue_entry.visibility_changed.connect(on_import_queue_visibility_changed);
+        on_import_queue_visibility_changed();
+
+        offline_entry.visibility_changed.connect(on_offline_visibility_changed);
+        on_offline_visibility_changed();
     }
     
-    public Library.MainPage get_main_page() {
-        return (Library.MainPage) ((Library.SidebarEntry) get_root()).get_page();
+    private void insert(Sidebar.Entry entry, int position) {
+        entry.set_data<int>(POSITION_DATA, position);
+        graft(get_root(), entry);
+    }
+
+    private void on_flagged_visibility_changed() {
+        update_entry_visibility(flagged_entry, EntryPosition.FLAGGED);
+    }
+
+    private void on_last_imported_visibility_changed() {
+        update_entry_visibility(last_imported_entry, EntryPosition.LAST_IMPORTED);
+    }
+
+    private void on_import_queue_visibility_changed() {
+        update_entry_visibility(import_queue_entry, EntryPosition.IMPORT_QUEUE);
+    }
+
+    private void on_offline_visibility_changed() {
+        update_entry_visibility(offline_entry, EntryPosition.OFFLINE);
+    }
+
+    private void update_entry_visibility(Library.HideablePageEntry entry, int position) {
+        if (entry.visible) {
+            if (!has_entry(entry))
+                insert(entry, position);
+        } else if (has_entry(entry)) {
+            prune(entry);
+        }
+    }
+
+    private static int comparator(Sidebar.Entry a, Sidebar.Entry b) {
+        return a.get_data<int>(POSITION_DATA) - b.get_data<int>(POSITION_DATA);
     }
 }
 
-public class Library.SidebarEntry : Sidebar.SimplePageEntry {
+public class Library.PhotosEntry : Sidebar.SimplePageEntry {
     private Icon icon = new ThemedIcon(Resources.ICON_PHOTOS);
     
-    public SidebarEntry() {
+    public PhotosEntry() {
     }
     
     public override string get_sidebar_name() {
-        return Library.MainPage.NAME;
+        return _("Photos");
     }
     
     public override Icon? get_sidebar_icon() {
@@ -33,6 +107,26 @@
     }
 }
 
+public abstract class Library.HideablePageEntry : Sidebar.SimplePageEntry {
+    // container branch should listen to this signal
+    public signal void visibility_changed(bool visible);
+
+    private bool show_entry = false;
+    public bool visible {
+        get { return show_entry; }
+        set {
+            if (value == show_entry)
+                return;
+
+            show_entry = value;
+            visibility_changed(value);
+        }
+    }
+
+    public HideablePageEntry() {
+    }
+}
+
 public class Library.MainPage : CollectionPage {
     public const string NAME = _("Library");
     

=== renamed file 'src/library/FlaggedBranch.vala' => 'src/library/FlaggedSidebarEntry.vala'
--- src/library/FlaggedBranch.vala	2013-01-21 21:16:09 +0000
+++ src/library/FlaggedSidebarEntry.vala	2014-06-09 02:32:27 +0000
@@ -4,38 +4,19 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
-public class Library.FlaggedBranch : Sidebar.RootOnlyBranch {
-    public FlaggedBranch() {
-        base (new Library.FlaggedSidebarEntry());
-        
+public class Library.FlaggedSidebarEntry : Library.HideablePageEntry, Sidebar.InternalDropTargetEntry {
+    public FlaggedSidebarEntry() {
         foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all())
             media_sources.flagged_contents_altered.connect(on_flagged_contents_altered);
         
-        set_show_branch(get_total_flagged() != 0);
+        visible = (get_total_flagged() != 0);
     }
     
-    ~FlaggedBranch() {
+    ~FlaggedSidebarEntry() {
         foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all())
             media_sources.flagged_contents_altered.disconnect(on_flagged_contents_altered);
-    }
-    
-    private void on_flagged_contents_altered() {
-        set_show_branch(get_total_flagged() != 0);
-    }
-    
-    private int get_total_flagged() {
-        int total = 0;
-        foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all())
-            total += media_sources.get_flagged().size;
-        
-        return total;
-    }
-}
-
-public class Library.FlaggedSidebarEntry : Sidebar.SimplePageEntry, Sidebar.InternalDropTargetEntry {
-    public FlaggedSidebarEntry() {
-    }
-    
+    } 
+       
     public override string get_sidebar_name() {
         return FlaggedPage.NAME;
     }
@@ -57,5 +38,17 @@
     public bool internal_drop_received_arbitrary(Gtk.SelectionData data) {
         return false;
     }
+
+    private void on_flagged_contents_altered() {
+        visible = (get_total_flagged() != 0);
+    }
+    
+    private int get_total_flagged() {
+        int total = 0;
+        foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all())
+            total += media_sources.get_flagged().size;
+        
+        return total;
+    }
 }
 

=== renamed file 'src/library/ImportQueueBranch.vala' => 'src/library/ImportQueueSidebarEntry.vala'
--- src/library/ImportQueueBranch.vala	2013-01-21 21:16:09 +0000
+++ src/library/ImportQueueSidebarEntry.vala	2014-06-09 02:32:27 +0000
@@ -4,35 +4,34 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
-public class Library.ImportQueueBranch : Sidebar.RootOnlyBranch {
-    private Library.ImportQueueSidebarEntry entry;
-    
-    public ImportQueueBranch() {
-        // can't pass to base() an object that was allocated in declaration; see
-        // https://bugzilla.gnome.org/show_bug.cgi?id=646286
-        base (new Library.ImportQueueSidebarEntry());
-        
-        entry = (Library.ImportQueueSidebarEntry) get_root();
-        
+public class Library.ImportQueueSidebarEntry : Library.HideablePageEntry {
+    public ImportQueueSidebarEntry() {
         // only attach signals to the page when it's created
-        entry.page_created.connect(on_page_created);
-        entry.destroying_page.connect(on_destroying_page);
+        page_created.connect(on_page_created);
+        destroying_page.connect(on_destroying_page);
         
         // don't use entry.get_page() or get_queue_page() because (a) we don't want to
         // create the page during initialization, and (b) we know there's no import activity
         // at this moment
-        set_show_branch(false);
-    }
-    
-    ~ImportQueueBranch() {
-        entry.page_created.disconnect(on_page_created);
-        entry.destroying_page.disconnect(on_destroying_page);
-    }
-    
-    public ImportQueuePage get_queue_page() {
-        return (ImportQueuePage) entry.get_page();
-    }
-    
+        visible = false;
+    }
+    
+    public override string get_sidebar_name() {
+        return ImportQueuePage.NAME;
+    }
+    
+    public override Icon? get_sidebar_icon() {
+        return new ThemedIcon(Resources.ICON_IMPORTING);
+    }
+    
+    protected override Page create_page() {
+        return new ImportQueuePage();
+    }
+
+    private ImportQueuePage get_queue_page() {
+        return get_page() as ImportQueuePage;
+    }
+
     private void on_page_created() {
         get_queue_page().batch_added.connect(on_batch_added_or_removed);
         get_queue_page().batch_removed.connect(on_batch_added_or_removed);
@@ -44,31 +43,14 @@
     }
     
     private void on_batch_added_or_removed() {
-        set_show_branch(get_queue_page().get_batch_count() > 0);
+        visible = (get_queue_page().get_batch_count() > 0);
     }
     
     public void enqueue_and_schedule(BatchImport batch_import, bool allow_user_cancel) {
         // want to display the branch before passing to the page because this might result in the
         // page being created, and want it all hooked up in the tree prior to creating the page
-        set_show_branch(true);
+        visible = true;
         get_queue_page().enqueue_and_schedule(batch_import, allow_user_cancel);
     }
 }
 
-public class Library.ImportQueueSidebarEntry : Sidebar.SimplePageEntry {
-    public ImportQueueSidebarEntry() {
-    }
-    
-    public override string get_sidebar_name() {
-        return ImportQueuePage.NAME;
-    }
-    
-    public override Icon? get_sidebar_icon() {
-        return new ThemedIcon(Resources.ICON_IMPORTING);
-    }
-    
-    protected override Page create_page() {
-        return new ImportQueuePage();
-    }
-}
-

=== renamed file 'src/library/LastImportBranch.vala' => 'src/library/LastImportSidebarEntry.vala'
--- src/library/LastImportBranch.vala	2013-01-21 21:16:09 +0000
+++ src/library/LastImportSidebarEntry.vala	2014-06-09 02:32:27 +0000
@@ -4,34 +4,19 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
-public class Library.LastImportBranch : Sidebar.RootOnlyBranch {
-    public LastImportBranch() {
-        base (new Library.LastImportSidebarEntry());
-        
+public class Library.LastImportSidebarEntry : Library.HideablePageEntry {
+    public LastImportSidebarEntry() {
         foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all())
             media_sources.import_roll_altered.connect(on_import_rolls_altered);
         
-        set_show_branch(MediaCollectionRegistry.get_instance().get_last_import_id() != null);
+        visible = (MediaCollectionRegistry.get_instance().get_last_import_id() != null);
     }
     
-    ~LastImportBranch() {
+    ~LastImportSidebarEntry() {
         foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all())
             media_sources.import_roll_altered.disconnect(on_import_rolls_altered);
     }
     
-    public Library.LastImportSidebarEntry get_main_entry() {
-        return (Library.LastImportSidebarEntry) get_root();
-    }
-    
-    private void on_import_rolls_altered() {
-        set_show_branch(MediaCollectionRegistry.get_instance().get_last_import_id() != null);
-    }
-}
-
-public class Library.LastImportSidebarEntry : Sidebar.SimplePageEntry {
-    public LastImportSidebarEntry() {
-    }
-    
     public override string get_sidebar_name() {
         return LastImportPage.NAME;
     }
@@ -43,5 +28,9 @@
     protected override Page create_page() {
         return new LastImportPage();
     }
+
+    private void on_import_rolls_altered() {
+        visible = (MediaCollectionRegistry.get_instance().get_last_import_id() != null);
+    }
 }
 

=== modified file 'src/library/LibraryWindow.vala'
--- src/library/LibraryWindow.vala	2014-05-22 07:11:31 +0000
+++ src/library/LibraryWindow.vala	2014-06-09 02:32:27 +0000
@@ -42,16 +42,11 @@
     // outside the app.
     private enum SidebarRootPosition {
         LIBRARY,
-        FLAGGED,
-        LAST_IMPORTED,
         CAMERAS,
-        IMPORT_QUEUE,
         SAVED_SEARCH,
         EVENTS,
         FOLDERS,
         TAGS,
-        TRASH,
-        OFFLINE
     }
     
     public enum TargetType {
@@ -114,12 +109,7 @@
     private Library.Branch library_branch = new Library.Branch();
     private Tags.Branch tags_branch = new Tags.Branch();
     private Folders.Branch folders_branch = new Folders.Branch();
-    private Library.TrashBranch trash_branch = new Library.TrashBranch();
     private Events.Branch events_branch = new Events.Branch();
-    private Library.OfflineBranch offline_branch = new Library.OfflineBranch();
-    private Library.FlaggedBranch flagged_branch = new Library.FlaggedBranch();
-    private Library.LastImportBranch last_import_branch = new Library.LastImportBranch();
-    private Library.ImportQueueBranch import_queue_branch = new Library.ImportQueueBranch();
     private Camera.Branch camera_branch = new Camera.Branch();
     private Searches.Branch saved_search_branch = new Searches.Branch();
     private bool page_switching_enabled = true;
@@ -172,12 +162,7 @@
         sidebar_tree.graft(library_branch, SidebarRootPosition.LIBRARY);
         sidebar_tree.graft(tags_branch, SidebarRootPosition.TAGS);
         sidebar_tree.graft(folders_branch, SidebarRootPosition.FOLDERS);
-        sidebar_tree.graft(trash_branch, SidebarRootPosition.TRASH);
         sidebar_tree.graft(events_branch, SidebarRootPosition.EVENTS);
-        sidebar_tree.graft(offline_branch, SidebarRootPosition.OFFLINE);
-        sidebar_tree.graft(flagged_branch, SidebarRootPosition.FLAGGED);
-        sidebar_tree.graft(last_import_branch, SidebarRootPosition.LAST_IMPORTED);
-        sidebar_tree.graft(import_queue_branch, SidebarRootPosition.IMPORT_QUEUE);
         sidebar_tree.graft(camera_branch, SidebarRootPosition.CAMERAS);
         sidebar_tree.graft(saved_search_branch, SidebarRootPosition.SAVED_SEARCH);
         
@@ -207,7 +192,7 @@
         menubar.no_show_all = true;
         
         // create the main layout & start at the Library page
-        create_layout(library_branch.get_main_page());
+        create_layout(library_branch.photos_entry.get_page());
         
         // settings that should persist between sessions
         load_configuration();
@@ -879,7 +864,7 @@
     }
 
     public void enqueue_batch_import(BatchImport batch_import, bool allow_user_cancel) {
-        import_queue_branch.enqueue_and_schedule(batch_import, allow_user_cancel);
+        library_branch.import_queue_entry.enqueue_and_schedule(batch_import, allow_user_cancel);
     }
     
     private void import_reporter(ImportManifest manifest) {
@@ -1025,7 +1010,7 @@
     }
     
     public void switch_to_library_page() {
-        switch_to_page(library_branch.get_main_page());
+        switch_to_page(library_branch.photos_entry.get_page());
     }
     
     public void switch_to_event(Event event) {
@@ -1062,7 +1047,7 @@
     }
     
     public void switch_to_import_queue_page() {
-        switch_to_page(import_queue_branch.get_queue_page());
+        switch_to_page(library_branch.import_queue_entry.get_page());
     }
     
     private void on_camera_added(DiscoveredCamera camera) {
@@ -1449,7 +1434,7 @@
     private void on_destroying_page(Sidebar.PageRepresentative entry, Page page) {
         // if page is the current page, switch to fallback before destroying
         if (page == get_current_page())
-            switch_to_page(library_branch.get_main_page());
+            switch_to_page(library_branch.photos_entry.get_page());
         
         remove_from_notebook(page);
         
@@ -1467,9 +1452,11 @@
         // if the currently selected item is removed, want to jump to fallback page (which
         // depends on the item that was selected)
         
+        Library.LastImportSidebarEntry last_import_entry = library_branch.last_imported_entry;
+        
         // Importing... -> Last Import (if available)
-        if (selectable is Library.ImportQueueSidebarEntry && last_import_branch.get_show_branch()) {
-            switch_to_page(last_import_branch.get_main_entry().get_page());
+        if (selectable is Library.ImportQueueSidebarEntry && last_import_entry.visible) {
+            switch_to_page(last_import_entry.get_page());
             
             return;
         }
@@ -1489,7 +1476,7 @@
         }
         
         // basic all-around default: jump to the Library page
-        switch_to_page(library_branch.get_main_page());
+        switch_to_page(library_branch.photos_entry.get_page());
     }
     
     private void subscribe_for_basic_information(Page page) {

=== renamed file 'src/library/OfflineBranch.vala' => 'src/library/OfflineSidebarEntry.vala'
--- src/library/OfflineBranch.vala	2013-01-21 21:16:09 +0000
+++ src/library/OfflineSidebarEntry.vala	2014-06-09 02:32:27 +0000
@@ -4,38 +4,19 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
-public class Library.OfflineBranch : Sidebar.RootOnlyBranch {
-    public OfflineBranch() {
-        base (new Library.OfflineSidebarEntry());
-        
+public class Library.OfflineSidebarEntry : Library.HideablePageEntry {
+    public OfflineSidebarEntry() {
         foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all())
             media_sources.offline_contents_altered.connect(on_offline_contents_altered);
         
-        set_show_branch(get_total_offline() != 0);
+        visible = (get_total_offline() != 0);
     }
-    
-    ~OfflineBranch() {
+
+    ~OfflineSidebarEntry() {
         foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all())
             media_sources.trashcan_contents_altered.disconnect(on_offline_contents_altered);
     }
     
-    private void on_offline_contents_altered() {
-        set_show_branch(get_total_offline() != 0);
-    }
-    
-    private int get_total_offline() {
-        int total = 0;
-        foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all())
-            total += media_sources.get_offline_bin_contents().size;
-        
-        return total;
-    }
-}
-
-public class Library.OfflineSidebarEntry : Sidebar.SimplePageEntry {
-    public OfflineSidebarEntry() {
-    }
-    
     public override string get_sidebar_name() {
         return OfflinePage.NAME;
     }
@@ -47,5 +28,17 @@
     protected override Page create_page() {
         return new OfflinePage();
     }
+    
+    private void on_offline_contents_altered() {
+        visible = (get_total_offline() != 0);
+    }
+    
+    private int get_total_offline() {
+        int total = 0;
+        foreach (MediaSourceCollection media_sources in MediaCollectionRegistry.get_instance().get_all())
+            total += media_sources.get_offline_bin_contents().size;
+        
+        return total;
+    }
 }
 

=== renamed file 'src/library/TrashBranch.vala' => 'src/library/TrashSidebarEntry.vala'
--- src/library/TrashBranch.vala	2013-01-21 21:16:09 +0000
+++ src/library/TrashSidebarEntry.vala	2014-06-09 02:32:27 +0000
@@ -4,12 +4,6 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
-public class Library.TrashBranch : Sidebar.RootOnlyBranch {
-    public TrashBranch() {
-        base (new Library.TrashSidebarEntry());
-    }
-}
-
 public class Library.TrashSidebarEntry : Sidebar.SimplePageEntry, Sidebar.InternalDropTargetEntry {
     private static Icon? full_icon = null;
     private static Icon? empty_icon = null;

=== modified file 'src/library/mk/library.mk'
--- src/library/mk/library.mk	2013-01-12 00:20:39 +0000
+++ src/library/mk/library.mk	2014-06-09 02:32:27 +0000
@@ -13,11 +13,11 @@
 UNIT_FILES := \
 	LibraryWindow.vala \
 	Branch.vala \
-	TrashBranch.vala \
-	OfflineBranch.vala \
-	FlaggedBranch.vala \
-	LastImportBranch.vala \
-	ImportQueueBranch.vala \
+	TrashSidebarEntry.vala \
+	OfflineSidebarEntry.vala \
+	FlaggedSidebarEntry.vala \
+	LastImportSidebarEntry.vala \
+	ImportQueueSidebarEntry.vala \
 	FlaggedPage.vala \
 	ImportQueuePage.vala \
 	LastImportPage.vala \

=== modified file 'src/sidebar/Tree.vala'
--- src/sidebar/Tree.vala	2014-03-17 03:03:44 +0000
+++ src/sidebar/Tree.vala	2014-06-09 02:32:27 +0000
@@ -52,6 +52,7 @@
         PIXBUF,
         CLOSED_PIXBUF,
         OPEN_PIXBUF,
+        PIXBUF_VISIBLE,
         N_COLUMNS
     }
     
@@ -61,7 +62,8 @@
         typeof (EntryWrapper),      // WRAPPER
         typeof (Gdk.Pixbuf?),       // PIXBUF
         typeof (Gdk.Pixbuf?),       // CLOSED_PIXBUF
-        typeof (Gdk.Pixbuf?)        // OPEN_PIXBUF
+        typeof (Gdk.Pixbuf?),       // OPEN_PIXBUF
+        typeof (bool)               // PIXBUF_VISIBLE
     );
     
     private Gtk.UIManager ui = new Gtk.UIManager();
@@ -106,6 +108,7 @@
         text_column.add_attribute(icon_renderer, "pixbuf", Columns.PIXBUF);
         text_column.add_attribute(icon_renderer, "pixbuf_expander_closed", Columns.CLOSED_PIXBUF);
         text_column.add_attribute(icon_renderer, "pixbuf_expander_open", Columns.OPEN_PIXBUF);
+        text_column.add_attribute(icon_renderer, "visible", Columns.PIXBUF_VISIBLE);
         text_renderer = new Gtk.CellRendererText();
         text_renderer.editing_canceled.connect(on_editing_canceled);
         text_renderer.editing_started.connect(on_editing_started);
@@ -447,7 +450,6 @@
         assert(!entry_map.has_key(entry));
         entry_map.set(entry, wrapper);
         
-        store.set(assoc_iter, Columns.NAME, guarded_markup_escape_text(entry.get_sidebar_name()));
         store.set(assoc_iter, Columns.TOOLTIP, guarded_markup_escape_text(entry.get_sidebar_tooltip()));
         store.set(assoc_iter, Columns.WRAPPER, wrapper);
         load_entry_icons(assoc_iter);
@@ -468,9 +470,19 @@
         Sidebar.ExpandableEntry? expandable = entry as Sidebar.ExpandableEntry;
         if (expandable != null)
             expandable.sidebar_open_closed_icons_changed.connect(on_sidebar_open_closed_icons_changed);
+
+        string sidebar_name = guarded_markup_escape_text(entry.get_sidebar_name());
+        if (is_category_header(wrapper))
+            store.set(assoc_iter, Columns.NAME, "<b>%s</b>".printf(sidebar_name));
+        else
+            store.set(assoc_iter, Columns.NAME, sidebar_name);
         
         entry.grafted(this);
     }
+
+    private static bool is_category_header(EntryWrapper wrapper) {
+        return (wrapper.entry is Sidebar.ExpandableEntry) && (wrapper.get_path().get_depth() == 1);
+    }
     
     private EntryWrapper reparent_wrapper(Gtk.TreeIter new_iter, EntryWrapper current_wrapper) {
         Sidebar.Entry entry = current_wrapper.entry;
@@ -710,6 +722,7 @@
         assert(wrapper != null);
         
         store.set(wrapper.get_iter(), Columns.PIXBUF, fetch_icon_pixbuf(icon));
+        store.set(wrapper.get_iter(), Columns.PIXBUF_VISIBLE, !is_category_header(wrapper));
     }
     
     private void on_sidebar_page_created(Sidebar.PageRepresentative entry, Page page) {
@@ -727,6 +740,7 @@
         
         store.set(wrapper.get_iter(), Columns.OPEN_PIXBUF, fetch_icon_pixbuf(open));
         store.set(wrapper.get_iter(), Columns.CLOSED_PIXBUF, fetch_icon_pixbuf(closed));
+        store.set(wrapper.get_iter(), Columns.PIXBUF_VISIBLE, !is_category_header(wrapper));
     }
     
     private void on_sidebar_name_changed(Sidebar.RenameableEntry entry, string name) {
@@ -787,6 +801,7 @@
         store.set(iter, Columns.PIXBUF, fetch_icon_pixbuf(icon));
         store.set(iter, Columns.OPEN_PIXBUF, fetch_icon_pixbuf(open));
         store.set(iter, Columns.CLOSED_PIXBUF, fetch_icon_pixbuf(closed));
+        store.set(wrapper.get_iter(), Columns.PIXBUF_VISIBLE, !is_category_header(wrapper));
     }
     
     private void load_branch_icons(Gtk.TreeIter iter) {
@@ -1175,4 +1190,4 @@
         AppWindow.get_command_manager().execute(creation_command);
         LibraryWindow.get_app().rename_tag_in_sidebar(creation_command.get_created_tag());
     }    
-}
\ No newline at end of file
+}