Commit 8de7e7d6 authored by Wolfgang Steitz's avatar Wolfgang Steitz Committed by Jim Nelson

Remove icon closed string, follow-state for hover effect: Bug #719284

parent 961f3d1f
......@@ -120,8 +120,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string ICON_NO_EVENT = "no-event";
public const string ICON_ONE_TAG = "one-tag";
public const string ICON_TAGS = "multiple-tags";
public const string ICON_FOLDER_CLOSED = "folder";
public const string ICON_FOLDER_OPEN = "folder-open";
public const string ICON_FOLDER = "folder";
public const string ICON_FOLDER_DOCUMENTS = "folder-documents";
public const string ICON_IMPORTING = "go-down";
public const string ICON_LAST_IMPORT = "document-open-recent";
......
......@@ -5,7 +5,7 @@
*/
public class Camera.Branch : Sidebar.Branch {
internal static string? cameras_icon = null;
internal static string? cameras_icon = Resources.ICON_CAMERAS;
private Gee.HashMap<DiscoveredCamera, Camera.SidebarEntry> camera_map = new Gee.HashMap<
DiscoveredCamera, Camera.SidebarEntry>();
......@@ -23,11 +23,9 @@ public class Camera.Branch : Sidebar.Branch {
}
internal static void init() {
cameras_icon = Resources.ICON_CAMERAS;
}
internal static void terminate() {
cameras_icon = null;
}
private static int camera_comparator(Sidebar.Entry a, Sidebar.Entry b) {
......
......@@ -5,7 +5,7 @@
*/
public class Events.Branch : Sidebar.Branch {
internal static string icon = Resources.ICON_FOLDER_CLOSED;
internal static string icon = Resources.ICON_FOLDER;
internal static string events_icon = Resources.ICON_EVENTS;
internal static string single_event_icon = Resources.ICON_ONE_EVENT;
internal static string no_event_icon = Resources.ICON_NO_EVENT;
......
......@@ -19,7 +19,7 @@ static string? icon = null;
static string? have_photos_icon = null;
public void init() throws Error {
icon = Resources.ICON_FOLDER_CLOSED;
icon = Resources.ICON_FOLDER;
have_photos_icon = Resources.ICON_FOLDER_DOCUMENTS;
}
......
......@@ -25,8 +25,6 @@ public interface Sidebar.Entry : Object {
}
public interface Sidebar.ExpandableEntry : Sidebar.Entry {
public signal void sidebar_open_closed_icons_changed(string? open, string? closed);
public abstract bool expand_on_select();
}
......
......@@ -91,10 +91,12 @@ public class Sidebar.Tree : Gtk.TreeView {
public Tree(Gtk.TargetEntry[] target_entries, Gdk.DragAction actions,
ExternalDropHandler drop_handler) {
set_model(store);
get_style_context().add_class("sidebar");
Gtk.TreeViewColumn text_column = new Gtk.TreeViewColumn();
text_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED);
Gtk.CellRendererPixbuf icon_renderer = new Gtk.CellRendererPixbuf();
icon_renderer.follow_state = true;
text_column.pack_start(icon_renderer, false);
text_column.add_attribute(icon_renderer, "icon_name", Columns.ICON);
text_renderer = new Gtk.CellRendererText();
......@@ -709,7 +711,6 @@ public class Sidebar.Tree : Gtk.TreeView {
EntryWrapper? wrapper = get_wrapper_at_iter(iter);
if (wrapper == null)
return;
string? icon = wrapper.entry.get_sidebar_icon();
store.set(iter, Columns.ICON, icon);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment