diff --git a/gui/playlist.c b/gui/playlist.c index af5fcd5a..d1a43f7f 100644 --- a/gui/playlist.c +++ b/gui/playlist.c @@ -80,7 +80,6 @@ static gchar *__playlist_name(GtkTreeIter *iter) void __playlist_selection_changed(GtkTreeSelection *selection, gpointer data) { - GtkStack *stack = GTK_STACK(gui_builder_widget("o_stack")); GtkTreeModel *model = GTK_TREE_MODEL(p_store); struct queue *queue; GtkTreeIter iter; @@ -90,7 +89,6 @@ void __playlist_selection_changed(GtkTreeSelection *selection, gpointer data) g_free(p_name); p_name = __playlist_name(&iter); - gtk_stack_set_visible_child_name(stack, "queues"); queue = playlist_get_queue(__playlist_type(&iter), p_name); gui_sidebar_selected(SB_PLAYLIST, gui_queue(queue)); } diff --git a/gui/sidebar.c b/gui/sidebar.c index a4d7fcb7..09a5b768 100644 --- a/gui/sidebar.c +++ b/gui/sidebar.c @@ -87,14 +87,12 @@ out: void __sidebar_selection_changed(GtkTreeSelection *selection, gpointer data) { - GtkStack *stack = GTK_STACK(gui_builder_widget("o_stack")); GtkTreeModel *model = GTK_TREE_MODEL(sb_store); GtkTreeIter iter; if (gtk_tree_selection_get_selected(selection, &model, &iter)) { GtkTreePath *path = gtk_tree_model_get_path(model, &iter); - gtk_stack_set_visible_child_name(stack, "queues"); gui_sidebar_selected(SB_SIDEBAR, __sidebar_get_queue(&iter)); gtk_tree_path_free(path); } diff --git a/include/gui/sidebar.h b/include/gui/sidebar.h index 5a29f770..5a4dd06b 100644 --- a/include/gui/sidebar.h +++ b/include/gui/sidebar.h @@ -8,7 +8,6 @@ #include enum sidebar_selection_t { - SB_COLLECTION, SB_PLAYLIST, SB_SIDEBAR, }; diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina6.glade index a83b9619..b02535a6 100644 --- a/share/ocarina/ocarina6.glade +++ b/share/ocarina/ocarina6.glade @@ -2,23 +2,6 @@ - - - - - - - - - - - - - - - inode/directory - - True False @@ -26,11 +9,6 @@ 10 media-playlist-repeat - - True - False - dialog-ok - True False @@ -871,9 +849,9 @@ True True + 1 5 5 - 1 in @@ -1014,318 +992,40 @@ 3 2 - + True False - True - True - over-up-down + 5 - + True - False - vertical - 5 - - - True - False - 5 - - - True - True - center - edit-find-symbolic - False - False - Type here to filter - - - - - True - True - 0 - - - - - True - True - center - 8 - True - - - - False - True - 1 - - - - - False - True - 0 - - - - - True - True - in - - - True - True - False - True - True - 9 - - - - - - multiple - - - - - True - fixed - 20 - # - True - - - - - - 10 - 0 - - - - - - - True - fixed - 300 - Title - True - - - - - - 10 - 1 - - - - - - - True - fixed - 60 - Length - True - - - - - - 10 - 2 - - - - - - - True - fixed - 100 - Artist - True - - - - - - 10 - 3 - - - - - - - True - fixed - 100 - Album - True - - - - - - 10 - 4 - - - - - - - True - fixed - 45 - Year - True - - - - - - 10 - 5 - - - - - - - True - fixed - 100 - Genre - True - - - - - - 10 - 6 - - - - - - - True - fixed - 60 - Count - True - - - - - - 10 - 7 - - - - - - - True - fixed - 1 - Played - True - - - - - - 10 - 8 - - - - - - - - - True - True - 1 - - + True + center + edit-find-symbolic + False + False + Type here to filter + + - queues - page0 + True + True + 0 - + True - False - vertical - - - True - False - select-folder - False - filefilter1 - False - False - - - True - True - 0 - - - - - True - False - 0.96862745098039216 - center - start - - - Add Selected Path - True - True - True - center - image11 - - - - True - True - end - 0 - - - - - False - False - 5 - 2 - - + True + center + 8 + True + - chooser - page1 + False + True 1 @@ -1334,7 +1034,199 @@ 0 0 3 - 2 + + + + + True + True + True + in + + + True + True + False + True + True + 9 + + + + + + multiple + + + + + True + fixed + 20 + # + True + + + + + + 10 + 0 + + + + + + + True + fixed + 300 + Title + True + + + + + + 10 + 1 + + + + + + + True + fixed + 60 + Length + True + + + + + + 10 + 2 + + + + + + + True + fixed + 100 + Artist + True + + + + + + 10 + 3 + + + + + + + True + fixed + 100 + Album + True + + + + + + 10 + 4 + + + + + + + True + fixed + 45 + Year + True + + + + + + 10 + 5 + + + + + + + True + fixed + 100 + Genre + True + + + + + + 10 + 6 + + + + + + + True + fixed + 60 + Count + True + + + + + + 10 + 7 + + + + + + + True + fixed + 1 + Played + True + + + + + + 10 + 8 + + + + + + + + + 0 + 1 + 3