anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

gui/sidebar: Initialize the sidebar with default headers 

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
This commit is contained in:
Anna Schumaker 2016-08-25 09:30:46 -04:00
parent 18e76a7dca
commit 4fc8c72ea8
3 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gui/playlist.c
View File

@ -82,14 +82,19 @@ gboolean __playlist_on_select(GtkTreeSelection *selection, GtkTreeModel *model,
GtkTreePath *path, gboolean selected, gpointer data)
{
struct queue *queue = NULL;
enum playlist_type_t type;
GtkTreeIter iter, child;
gchar *name;
gtk_tree_model_get_iter(model, &iter, path);
__playlist_filter_get_iter(&iter, &child);
type = gui_sidebar_iter_type(&child);
if (type == PL_MAX_TYPE)
return false;
name = gui_sidebar_iter_name(&child);
queue = playlist_get_queue(gui_sidebar_iter_type(&child), name);
queue = playlist_get_queue(type, name);
g_free(name);
return queue != NULL;

22
gui/sidebar.c
View File

@ -12,6 +12,21 @@ enum sidebar_columns {
const gchar *SIDEBAR_SETTING = "gui.sidebar.pos";
static void __gui_sidebar_add_header(GtkTreeIter *iter, const gchar *name,
const gchar *image)
{
gchar *formatted = g_strdup_printf("<big>%s</big>", name);
gtk_tree_store_insert_with_values(gui_sidebar_store(), iter, NULL, -1,
SB_TYPE, PL_MAX_TYPE, -1);
gtk_tree_store_insert_with_values(gui_sidebar_store(), iter, NULL, -1,
SB_IMAGE, image,
SB_NAME, formatted,
SB_TYPE, PL_MAX_TYPE, -1);
g_free(formatted);
}
void __gui_sidebar_resized(GtkPaned *pane, GParamSpec *pspec, gpointer data)
{
@ -21,6 +36,13 @@ void __gui_sidebar_resized(GtkPaned *pane, GParamSpec *pspec, gpointer data)
void gui_sidebar_init()
{
int pos = settings_get(SIDEBAR_SETTING);
GtkTreeIter iter;
gui_sidebar_iter_first(&iter);
__gui_sidebar_add_header(&iter, "Playlists", "emblem-documents");
__gui_sidebar_add_header(&iter, "Dynamic", "emblem-generic");
__gui_sidebar_add_header(&iter, "Library", "emblem-system");
if (pos > 0)
gtk_paned_set_position(gui_sidebar(), pos);
}

17
tests/gui/sidebar.c
View File

@ -5,9 +5,14 @@
#include <gui/sidebar.h>
#include <tests/test.h>
const gchar *test_pl_names[6] = { "", "Playlists",
"", "Dynamic",
"", "Library" };
static void test_sidebar()
{
GtkTreeIter iter;
unsigned int i;
g_assert_nonnull(gui_sidebar_store());
g_assert_true(GTK_IS_TREE_STORE(gui_sidebar_store()));
@ -21,7 +26,17 @@ static void test_sidebar()
g_assert_nonnull(gui_sidebar_treeview());
g_assert_true(GTK_IS_TREE_VIEW(gui_sidebar_treeview()));
g_assert_false(gui_sidebar_iter_first(&iter));
g_assert_true(gui_sidebar_iter_first(&iter));
for (i = 0; i < 6; i++) {
g_assert_cmpstr_free(gui_sidebar_iter_name(&iter), ==,
test_pl_names[i]);
g_assert_cmpuint(gui_sidebar_iter_type(&iter), ==,
PL_MAX_TYPE);
if (i < 5)
g_assert_true(gui_sidebar_iter_next(&iter));
}
g_assert_false(gui_sidebar_iter_next(&iter));
}
static void test_sidebar_pos()