From d78d9597dad93a1563205d2224c6c734413b37af Mon Sep 17 00:00:00 2001 From: Maksym Veremeyenko Date: Tue, 14 Jun 2011 15:51:58 +0300 Subject: [PATCH] move playlist pane creation into separate function --- src/interface.c | 140 ++++++++++++++++++++++++++++++------------------------- 1 files changed, 77 insertions(+), 63 deletions(-) diff --git a/src/interface.c b/src/interface.c index 0ed9059..f969749 100644 --- a/src/interface.c +++ b/src/interface.c @@ -688,6 +688,80 @@ create_pane_filedir( GtkWidget* top ) return table1; }; +static +GtkWidget* +create_pane_playlist( GtkWidget* top ) +{ + GtkWidget *vpaned1; + GtkWidget *table5; + GtkWidget *scrolledwindow6; + GtkWidget *list_clips; + GtkWidget *table4; + GtkWidget *scrolledwindow5; + GtkWidget *treeview1; + GtkWidget *alignment12; + GtkWidget *hbox19; + + vpaned1 = gtk_vpaned_new (); + gtk_widget_show (vpaned1); + gtk_paned_set_position (GTK_PANED (vpaned1), 130); + + table5 = gtk_table_new (1, 1, FALSE); + gtk_widget_show (table5); + gtk_paned_pack1 (GTK_PANED (vpaned1), table5, TRUE, TRUE); + + scrolledwindow6 = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (scrolledwindow6); + gtk_table_attach (GTK_TABLE (table5), scrolledwindow6, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL), + (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL), 0, 0); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow6), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + list_clips = gtk_tree_view_new (); + gtk_widget_show (list_clips); + gtk_container_add (GTK_CONTAINER (scrolledwindow6), list_clips); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (list_clips), FALSE); + gtk_tree_view_set_enable_search (GTK_TREE_VIEW (list_clips), FALSE); + + table4 = gtk_table_new (2, 1, FALSE); + gtk_paned_pack2 (GTK_PANED (vpaned1), table4, TRUE, TRUE); + + scrolledwindow5 = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (scrolledwindow5); + gtk_table_attach (GTK_TABLE (table4), scrolledwindow5, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL), + (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL), 0, 0); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow5), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + treeview1 = gtk_tree_view_new (); + gtk_widget_show (treeview1); + gtk_container_add (GTK_CONTAINER (scrolledwindow5), treeview1); + + alignment12 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment12); + gtk_table_attach (GTK_TABLE (table4), alignment12, 0, 1, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + + hbox19 = gtk_hbox_new (FALSE, 0); + gtk_widget_show (hbox19); + gtk_container_add (GTK_CONTAINER (alignment12), hbox19); + + create_playlist_buttons(hbox19, top); + + GLADE_HOOKUP_OBJECT (top, vpaned1, "vpaned1"); + GLADE_HOOKUP_OBJECT (top, table5, "table5"); + GLADE_HOOKUP_OBJECT (top, scrolledwindow6, "scrolledwindow6"); + GLADE_HOOKUP_OBJECT (top, list_clips, "list_clips"); + GLADE_HOOKUP_OBJECT (top, table4, "table4"); + GLADE_HOOKUP_OBJECT (top, scrolledwindow5, "scrolledwindow5"); + GLADE_HOOKUP_OBJECT (top, treeview1, "treeview1"); + GLADE_HOOKUP_OBJECT (top, alignment12, "alignment12"); + GLADE_HOOKUP_OBJECT (top, hbox19, "hbox19"); + + return vpaned1; +}; + GtkWidget* create_page_operate (void) { @@ -702,15 +776,6 @@ create_page_operate (void) GtkWidget *mode_2; GtkWidget *mode_3; GtkWidget *hpaned1; - GtkWidget *vpaned1; - GtkWidget *table5; - GtkWidget *scrolledwindow6; - GtkWidget *list_clips; - GtkWidget *table4; - GtkWidget *scrolledwindow5; - GtkWidget *treeview1; - GtkWidget *alignment12; - GtkWidget *hbox19; GtkWidget *hpaned0; GtkWidget *frame1, *frame2; @@ -787,53 +852,11 @@ create_page_operate (void) create_pane_filedir(page_clips), FALSE, TRUE); - vpaned1 = gtk_vpaned_new (); - gtk_widget_show (vpaned1); - gtk_paned_pack2 (GTK_PANED (hpaned1), vpaned1, TRUE, TRUE); - gtk_paned_set_position (GTK_PANED (vpaned1), 130); - - table5 = gtk_table_new (1, 1, FALSE); - gtk_widget_show (table5); - gtk_paned_pack1 (GTK_PANED (vpaned1), table5, TRUE, TRUE); - - scrolledwindow6 = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (scrolledwindow6); - gtk_table_attach (GTK_TABLE (table5), scrolledwindow6, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL), - (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL), 0, 0); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow6), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - - list_clips = gtk_tree_view_new (); - gtk_widget_show (list_clips); - gtk_container_add (GTK_CONTAINER (scrolledwindow6), list_clips); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (list_clips), FALSE); - gtk_tree_view_set_enable_search (GTK_TREE_VIEW (list_clips), FALSE); - - table4 = gtk_table_new (2, 1, FALSE); - gtk_paned_pack2 (GTK_PANED (vpaned1), table4, TRUE, TRUE); - - scrolledwindow5 = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (scrolledwindow5); - gtk_table_attach (GTK_TABLE (table4), scrolledwindow5, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL), - (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL), 0, 0); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow5), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - - treeview1 = gtk_tree_view_new (); - gtk_widget_show (treeview1); - gtk_container_add (GTK_CONTAINER (scrolledwindow5), treeview1); - - alignment12 = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_widget_show (alignment12); - gtk_table_attach (GTK_TABLE (table4), alignment12, 0, 1, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); + gtk_paned_pack2 (GTK_PANED (hpaned1), + create_pane_playlist(page_clips), + FALSE, TRUE); - hbox19 = gtk_hbox_new (FALSE, 0); - gtk_widget_show (hbox19); - gtk_container_add (GTK_CONTAINER (alignment12), hbox19); - create_playlist_buttons(hbox19, page_clips); /* Store pointers to all widgets, for use by lookup_widget(). */ GLADE_HOOKUP_OBJECT (page_clips, vbox8, "vbox8"); @@ -846,15 +869,6 @@ create_page_operate (void) GLADE_HOOKUP_OBJECT (page_clips, mode_2, "mode_2"); GLADE_HOOKUP_OBJECT (page_clips, mode_3, "mode_3"); GLADE_HOOKUP_OBJECT (page_clips, hpaned1, "hpaned1"); - GLADE_HOOKUP_OBJECT (page_clips, vpaned1, "vpaned1"); - GLADE_HOOKUP_OBJECT (page_clips, table5, "table5"); - GLADE_HOOKUP_OBJECT (page_clips, scrolledwindow6, "scrolledwindow6"); - GLADE_HOOKUP_OBJECT (page_clips, list_clips, "list_clips"); - GLADE_HOOKUP_OBJECT (page_clips, table4, "table4"); - GLADE_HOOKUP_OBJECT (page_clips, scrolledwindow5, "scrolledwindow5"); - GLADE_HOOKUP_OBJECT (page_clips, treeview1, "treeview1"); - GLADE_HOOKUP_OBJECT (page_clips, alignment12, "alignment12"); - GLADE_HOOKUP_OBJECT (page_clips, hbox19, "hbox19"); return page_clips; } -- 1.7.4.4