From d53453fd92464ac2140b7b0da1ffa8a6b1985329 Mon Sep 17 00:00:00 2001 From: Maksym Veremeyenko Date: Tue, 14 Jun 2011 16:13:33 +0300 Subject: [PATCH] cleanup and reindent create_pane_playlist --- src/interface.c | 91 +++++++++++++++++++++---------------------------------- 1 files changed, 35 insertions(+), 56 deletions(-) diff --git a/src/interface.c b/src/interface.c index 9b16055..223a7a7 100644 --- a/src/interface.c +++ b/src/interface.c @@ -711,66 +711,45 @@ static GtkWidget* create_pane_playlist( GtkWidget* top ) { - GtkWidget *vpaned1; - GtkWidget *table5; - GtkWidget *scrolledwindow6; - 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); - - 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); + GtkWidget *table; + GtkWidget *scrolledwindow; + GtkWidget *treeview; + GtkWidget *alignment; + GtkWidget *hbox; + + table = gtk_table_new (2, 1, FALSE); + + scrolledwindow = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (scrolledwindow); + gtk_table_attach (GTK_TABLE (table), scrolledwindow, 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 (scrolledwindow), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + treeview = gtk_tree_view_new (); + gtk_widget_show (treeview); + gtk_container_add (GTK_CONTAINER (scrolledwindow), treeview); + + alignment = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment); + gtk_table_attach (GTK_TABLE (table), alignment, 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); + hbox = gtk_hbox_new (FALSE, 0); + gtk_widget_show (hbox); + gtk_container_add (GTK_CONTAINER (alignment), hbox); - create_playlist_buttons(hbox19, top); + create_playlist_buttons(hbox, top); - GLADE_HOOKUP_OBJECT (top, vpaned1, "vpaned1"); - GLADE_HOOKUP_OBJECT (top, table5, "table5"); - GLADE_HOOKUP_OBJECT (top, scrolledwindow6, "scrolledwindow6"); - 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"); + GLADE_HOOKUP_OBJECT (top, table, "table4"); + GLADE_HOOKUP_OBJECT (top, scrolledwindow, "scrolledwindow5"); + GLADE_HOOKUP_OBJECT (top, treeview, "treeview1"); + GLADE_HOOKUP_OBJECT (top, alignment, "alignment12"); + GLADE_HOOKUP_OBJECT (top, hbox, "hbox19"); - return vpaned1; + return table; }; GtkWidget* -- 1.7.4.4