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

gui: Remove o_notebook 

Now that nothing uses it.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2016-01-21 11:43:42 -05:00
parent e97939a9cd
commit 2c65584e2d
3 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gui/sidebar.c
View File

@ -67,10 +67,8 @@ void __sidebar_resize(GtkPaned *pane, GParamSpec *pspec, gpointer data)
bool __sidebar_keypress(GtkTreeView *treeview, GdkEventKey *event, gpointer data) bool __sidebar_keypress(GtkTreeView *treeview, GdkEventKey *event, gpointer data)
{ {
GtkTreeSelection *selection = gtk_tree_view_get_selection(treeview); GtkTreeSelection *selection = gtk_tree_view_get_selection(treeview);
GtkNotebook *notebook = GTK_NOTEBOOK(gui_builder_widget("o_notebook"));
GtkTreeModel *model = GTK_TREE_MODEL(sb_store); GtkTreeModel *model = GTK_TREE_MODEL(sb_store);
struct gui_queue *queue; struct gui_queue *queue;
unsigned int page;
GtkTreePath *path; GtkTreePath *path;
GtkTreeIter iter; GtkTreeIter iter;
GList *rows; GList *rows;
@ -83,13 +81,10 @@ bool __sidebar_keypress(GtkTreeView *treeview, GdkEventKey *event, gpointer data
if (gtk_tree_model_get_iter(model, &iter, path)) if (gtk_tree_model_get_iter(model, &iter, path))
queue = __sidebar_get_queue(&iter); queue = __sidebar_get_queue(&iter);
page = gtk_tree_path_get_indices(path)[0];
if (tempq_index(queue->gq_queue) == -1) if (tempq_index(queue->gq_queue) == -1)
goto out; goto out;
tempq_free(queue->gq_queue); tempq_free(queue->gq_queue);
gtk_notebook_remove_page(notebook, page);
out: out:
g_list_free_full(rows, (GDestroyNotify)gtk_tree_path_free); g_list_free_full(rows, (GDestroyNotify)gtk_tree_path_free);
@ -98,17 +93,14 @@ out:
void __sidebar_selection_changed(GtkTreeSelection *selection, gpointer data) void __sidebar_selection_changed(GtkTreeSelection *selection, gpointer data)
{ {
GtkNotebook *notebook = GTK_NOTEBOOK(gui_builder_widget("o_notebook"));
GtkStack *stack = GTK_STACK(gui_builder_widget("o_stack")); GtkStack *stack = GTK_STACK(gui_builder_widget("o_stack"));
GtkTreeModel *model = GTK_TREE_MODEL(sb_store); GtkTreeModel *model = GTK_TREE_MODEL(sb_store);
GtkTreeIter iter; GtkTreeIter iter;
if (gtk_tree_selection_get_selected(selection, &model, &iter)) { if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
GtkTreePath *path = gtk_tree_model_get_path(model, &iter); GtkTreePath *path = gtk_tree_model_get_path(model, &iter);
unsigned int page = gtk_tree_path_get_indices(path)[0];
gtk_stack_set_visible_child_name(stack, "queues"); gtk_stack_set_visible_child_name(stack, "queues");
gtk_notebook_set_current_page(notebook, page);
gui_sidebar_selected(SB_SIDEBAR, __sidebar_get_queue(&iter)); gui_sidebar_selected(SB_SIDEBAR, __sidebar_get_queue(&iter));
gtk_tree_path_free(path); gtk_tree_path_free(path);
} }

22
share/ocarina/ocarina6.glade
View File

@ -1295,28 +1295,6 @@
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkNotebook" id="o_notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tab_pos">left</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<property name="scrollable">True</property>
<property name="enable_popup">True</property>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="name">queues</property> <property name="name">queues</property>

4
tests/gui/collection.c
View File

@ -25,7 +25,6 @@ static void test_collection_sidebar()
GtkProgressBar *progress; GtkProgressBar *progress;
GtkFileChooser *chooser; GtkFileChooser *chooser;
GtkTreeIter iter, child; GtkTreeIter iter, child;
GtkNotebook *notebook;
GtkTreeView *treeview; GtkTreeView *treeview;
GtkTreeModel *model; GtkTreeModel *model;
GtkTreePath *path; GtkTreePath *path;
@ -44,7 +43,6 @@ static void test_collection_sidebar()
window = GTK_WINDOW(gui_builder_widget("o_window")); window = GTK_WINDOW(gui_builder_widget("o_window"));
g_idle_add(test_on_idle, window); g_idle_add(test_on_idle, window);
notebook = GTK_NOTEBOOK(gui_builder_widget("o_notebook"));
progress = GTK_PROGRESS_BAR(gui_builder_widget("o_idle_progress")); progress = GTK_PROGRESS_BAR(gui_builder_widget("o_idle_progress"));
chooser = GTK_FILE_CHOOSER(gui_builder_widget("o_collection_chooser")); chooser = GTK_FILE_CHOOSER(gui_builder_widget("o_collection_chooser"));
treeview = GTK_TREE_VIEW(gui_builder_widget("o_collection_view")); treeview = GTK_TREE_VIEW(gui_builder_widget("o_collection_view"));
@ -62,8 +60,6 @@ static void test_collection_sidebar()
gtk_tree_view_set_cursor(treeview, path, NULL, false); gtk_tree_view_set_cursor(treeview, path, NULL, false);
gtk_tree_path_free(path); gtk_tree_path_free(path);
test_equal(gtk_tree_selection_count_selected_rows(selection), 1); test_equal(gtk_tree_selection_count_selected_rows(selection), 1);
test_equal(gtk_notebook_get_current_page(notebook),
gtk_notebook_get_n_pages(notebook) - 1);
gtk_file_chooser_set_filename(chooser, "tests/Music/Hyrule Symphony"); gtk_file_chooser_set_filename(chooser, "tests/Music/Hyrule Symphony");
g_main_loop_run(main_loop); g_main_loop_run(main_loop);