gui/sidebar: Add a function for getting the sidebar treeview

And rename the treeview from "o_playlist_view" to "sidebar_treeview"

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
This commit is contained in:
Anna Schumaker 2016-08-25 07:56:20 -04:00
parent c1c197acb5
commit bbac5e23be
5 changed files with 15 additions and 7 deletions

View File

@ -314,7 +314,7 @@ bool __gui_playlist_init_idle()
GtkTreeIter iter;
filter = GTK_TREE_MODEL(gui_sidebar_filter());
treeview = GTK_TREE_VIEW(gui_builder_widget("o_playlist_view"));
treeview = gui_sidebar_treeview();
selection = gtk_tree_view_get_selection(treeview);
gtk_tree_model_get_iter_first(filter, &iter);
gtk_tree_selection_select_iter(selection, &iter);
@ -339,7 +339,7 @@ void gui_playlist_init()
GtkTreeIter parent;
filter = gui_sidebar_filter();
treeview = GTK_TREE_VIEW(gui_builder_widget("o_playlist_view"));
treeview = gui_sidebar_treeview();
gtk_tree_model_filter_set_visible_func(filter, __playlist_visible_func,
NULL, NULL);
@ -403,8 +403,7 @@ void gui_playlist_add_library(struct library *library)
g_free(name);
}
gtk_tree_view_expand_all(
GTK_TREE_VIEW(gui_builder_widget("o_playlist_view")));
gtk_tree_view_expand_all(gui_sidebar_treeview());
}
void gui_playlist_add_artist(struct artist *artist)

View File

@ -32,4 +32,10 @@ static inline GtkTreeModelFilter *gui_sidebar_filter()
return GTK_TREE_MODEL_FILTER(gui_builder_object("sidebar_filter"));
}
/* Called to get the sidebar treeview. */
static inline GtkTreeView *gui_sidebar_treeview()
{
return GTK_TREE_VIEW(gui_builder_widget("sidebar_treeview"));
}
#endif /* OCARINA_GUI_SIDEBAR_H */

View File

@ -740,7 +740,7 @@ audio-volume-medium</property>
<property name="vexpand">True</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="o_playlist_view">
<object class="GtkTreeView" id="sidebar_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="model">sidebar_filter</property>

View File

@ -25,9 +25,9 @@ static void test_playlist_sidebar()
GtkTreePath *path;
GtkTreeIter iter;
g_assert_true(GTK_IS_TREE_VIEW(GTK_TREE_VIEW(gui_builder_widget("o_playlist_view"))));
g_assert_true(GTK_IS_TREE_VIEW(gui_sidebar_treeview()));
treeview = GTK_TREE_VIEW(gui_builder_widget("o_playlist_view"));
treeview = gui_sidebar_treeview();
selection = gtk_tree_view_get_selection(treeview);
model = gui_sidebar_model();

View File

@ -15,6 +15,9 @@ static void test_sidebar()
g_assert_nonnull(gui_sidebar_filter());
g_assert_true(GTK_IS_TREE_MODEL_FILTER(gui_sidebar_filter()));
g_assert_nonnull(gui_sidebar_treeview());
g_assert_true(GTK_IS_TREE_VIEW(gui_sidebar_treeview()));
}
static void test_sidebar_pos()