From 4c784366d767cff0e39bf06f63abd4de1979699c Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Tue, 19 Jan 2016 10:16:26 -0500 Subject: [PATCH] gui/view: Save and restore column widths Signed-off-by: Anna Schumaker --- gui/ocarina.cpp | 2 + gui/view.c | 51 +++++++++++++++++++++ include/gui/view.h | 10 ++++ include/tests/gui.h | 6 +++ share/ocarina/ocarina6.glade | 9 ++++ tests/gui/.gitignore | 1 + tests/gui/Sconscript | 1 + tests/gui/view.c | 88 ++++++++++++++++++++++++++++++++++++ 8 files changed, 168 insertions(+) create mode 100644 gui/view.c create mode 100644 include/gui/view.h create mode 100644 tests/gui/view.c diff --git a/gui/ocarina.cpp b/gui/ocarina.cpp index 4a11e0f5..969b104c 100644 --- a/gui/ocarina.cpp +++ b/gui/ocarina.cpp @@ -10,6 +10,7 @@ extern "C" { #include #include #include +#include #include } #include @@ -67,6 +68,7 @@ int main(int argc, char **argv) core_init(&argc, &argv, &init_data); gui_settings_init(); + gui_view_init(); gui_window_init(gui :: share_file("ocarina.png").c_str()); gui_sidebar_init(); gui_collection_init(); diff --git a/gui/view.c b/gui/view.c new file mode 100644 index 00000000..33b496c7 --- /dev/null +++ b/gui/view.c @@ -0,0 +1,51 @@ +/* + * Copyright 2016 (c) Anna Schumaker. + */ +#include +#include +#include +#include + +static const gchar *QUEUE_SETTINGS[Q_MODEL_N_COLUMNS] = { + [Q_MODEL_TRACK_NR] = "gui.queue.track", + [Q_MODEL_TITLE] = "gui.queue.title", + [Q_MODEL_LENGTH] = "gui.queue.length", + [Q_MODEL_ARTIST] = "gui.queue.artist", + [Q_MODEL_ALBUM] = "gui.queue.album", + [Q_MODEL_YEAR] = "gui.queue.year", + [Q_MODEL_GENRE] = "gui.queue.genre", + [Q_MODEL_COUNT] = "gui.queue.count", + [Q_MODEL_LAST_PLAY] = "gui.queue.played", + [Q_MODEL_FILE_PATH] = "gui.queue.filepath", +}; + +static GtkTreeView *view_treeview = NULL; + +void __view_column_resized(GtkTreeViewColumn *col, GParamSpec *pspec, + gpointer data) +{ + unsigned int i; + + for (i = 0; i < Q_MODEL_N_COLUMNS; i++) { + if (col == gtk_tree_view_get_column(view_treeview, i)) { + gui_settings_set(QUEUE_SETTINGS[i], + gtk_tree_view_column_get_width(col)); + break; + } + } +} + +void gui_view_init() +{ + GtkTreeViewColumn *col; + int i, pos; + + view_treeview = GTK_TREE_VIEW(gui_builder_widget("o_treeview")); + + for (i = 0; i < Q_MODEL_N_COLUMNS; i++) { + col = gtk_tree_view_get_column(view_treeview, i); + pos = gui_settings_get(QUEUE_SETTINGS[i]); + if (col && pos > 0) + gtk_tree_view_column_set_fixed_width(col, pos); + } +} diff --git a/include/gui/view.h b/include/gui/view.h new file mode 100644 index 00000000..1fa8a807 --- /dev/null +++ b/include/gui/view.h @@ -0,0 +1,10 @@ +/* + * Copyright 2016 (c) Anna Schumaker. + */ +#ifndef OCARINA_GUI_VIEW_H +#define OCARINA_GUI_VIEW_H + +/* Called to initialize structures needed by the treeview. */ +void gui_view_init(); + +#endif /* OCARINA_GUI_VIEW_H */ diff --git a/include/tests/gui.h b/include/tests/gui.h index 7cb08c32..6de47bd5 100644 --- a/include/tests/gui.h +++ b/include/tests/gui.h @@ -29,6 +29,12 @@ void __collection_toggled() {} void __playlist_selection_changed() {} #endif /* TEST_NEED_PLAYLIST */ +#ifdef TEST_NEED_QUEUE +void __queue_disabled() {} +void __queue_random() {} +void __queue_repeat() {} +#endif /* TEST_NEED_QUEUE */ + #ifdef TEST_NEED_WINDOW void __window_configure() {} void __window_state() {} diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina6.glade index cac3dad4..66218950 100644 --- a/share/ocarina/ocarina6.glade +++ b/share/ocarina/ocarina6.glade @@ -1121,6 +1121,7 @@ 20 # True + @@ -1136,6 +1137,7 @@ 300 Title True + @@ -1151,6 +1153,7 @@ 60 Length True + @@ -1166,6 +1169,7 @@ 100 Artist True + @@ -1181,6 +1185,7 @@ 100 Album True + @@ -1196,6 +1201,7 @@ 45 Year True + @@ -1211,6 +1217,7 @@ 100 Genre True + @@ -1226,6 +1233,7 @@ 60 Count True + @@ -1241,6 +1249,7 @@ 1 Played True + diff --git a/tests/gui/.gitignore b/tests/gui/.gitignore index 2313263b..13d7ae52 100644 --- a/tests/gui/.gitignore +++ b/tests/gui/.gitignore @@ -1,6 +1,7 @@ builder settings model +view queue window sidebar diff --git a/tests/gui/Sconscript b/tests/gui/Sconscript index e3c32463..694e46f3 100644 --- a/tests/gui/Sconscript +++ b/tests/gui/Sconscript @@ -27,6 +27,7 @@ env.UsePackage("gmodule-export-2.0") res += [ GuiTest("builder") ] res += [ GuiTest("settings") ] res += [ GuiTest("model") ] +res += [ GuiTest("view") ] res += [ GuiTest("queue") ] res += [ GuiTest("window") ] res += [ GuiTest("sidebar") ] diff --git a/tests/gui/view.c b/tests/gui/view.c new file mode 100644 index 00000000..61050f17 --- /dev/null +++ b/tests/gui/view.c @@ -0,0 +1,88 @@ +/* + * Copyright 2016 (c) Anna Schumaker. + */ +#define TEST_NEED_AUDIO +#define TEST_NEED_COLLECTION +#define TEST_NEED_PLAYLIST +#define TEST_NEED_QUEUE +#define TEST_NEED_SIDEBAR +#define TEST_NEED_WINDOW +#include +#include +#include +#include +#include +#include + +const gchar *QUEUE_SETTINGS[Q_MODEL_N_COLUMNS] = { + [Q_MODEL_TRACK_NR] = "gui.queue.track", + [Q_MODEL_TITLE] = "gui.queue.title", + [Q_MODEL_LENGTH] = "gui.queue.length", + [Q_MODEL_ARTIST] = "gui.queue.artist", + [Q_MODEL_ALBUM] = "gui.queue.album", + [Q_MODEL_YEAR] = "gui.queue.year", + [Q_MODEL_GENRE] = "gui.queue.genre", + [Q_MODEL_COUNT] = "gui.queue.count", + [Q_MODEL_LAST_PLAY] = "gui.queue.played", + [Q_MODEL_FILE_PATH] = "gui.queue.filepath", +}; + +GMainLoop *main_loop; + +static int test_on_idle(gpointer data) +{ + g_main_loop_quit(main_loop); + return G_SOURCE_CONTINUE; +} + +static void test_treeview() +{ + GtkTreeViewColumn *col; + GtkTreeView *treeview; + unsigned int i; + int argc = 0; + + gtk_init(&argc, NULL); + gui_builder_init("share/ocarina/ocarina6.glade"); + gui_settings_init(); + gui_view_init(); + + treeview = GTK_TREE_VIEW(gui_builder_widget("o_treeview")); + main_loop = g_main_loop_new(NULL, FALSE); + g_idle_add(test_on_idle, NULL); + + for (i = 0; i < Q_MODEL_N_COLUMNS; i++) { + test_loop_equal(gui_settings_has(QUEUE_SETTINGS[i]), + (bool)false, i); + } test_loop_passed(); + + for (i = 0; i < (Q_MODEL_N_COLUMNS - 1); i++) { + col = gtk_tree_view_get_column(treeview, i); + gtk_tree_view_column_set_fixed_width(col, (i + 1) * 10); + } + + g_main_loop_run(main_loop); + for (i = 0; i < (Q_MODEL_N_COLUMNS - 1); i++) { + test_loop_equal(gui_settings_has(QUEUE_SETTINGS[i]), + (bool)true, i); + /* The "Played" column gets any remaining space. */ + if (i != Q_MODEL_LAST_PLAY) + test_loop_equal(gui_settings_get(QUEUE_SETTINGS[i]), + (i + 1) * 10, i); + } test_loop_passed(); + test_equal(gui_settings_has("gui.queue.filepath"), (bool)false); + test_equal(gui_settings_get("gui.queue.filepath"), 0); + + for (i = 0; i < Q_MODEL_LAST_PLAY; i++) + gui_settings_set(QUEUE_SETTINGS[i], 42); + + gui_view_init(); + for (i = 0; i < Q_MODEL_LAST_PLAY; i++) { + col = gtk_tree_view_get_column(treeview, i); + test_loop_equal(gtk_tree_view_column_get_fixed_width(col), 42, i); + } test_loop_passed(); +} + +DECLARE_UNIT_TESTS( + UNIT_TEST("Treeview", test_treeview), +);