From: Maksym Veremeyenko Date: Tue, 14 Jun 2011 12:45:10 +0000 (+0300) Subject: move files pane creation into separate function X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=e8ed3917cb3ec74bb919e694b135285e2ecf6e79;hp=4ee34e0112ff6138e92568d0bf602d66d8a04297;p=rugen move files pane creation into separate function --- diff --git a/src/interface.c b/src/interface.c index 85d1a43..0ed9059 100644 --- a/src/interface.c +++ b/src/interface.c @@ -658,6 +658,35 @@ create_playlist_buttons( GtkWidget* parent, GtkWidget* top ) return parent; } +static +GtkWidget* +create_pane_filedir( GtkWidget* top ) +{ + GtkWidget* table1, *scrolledwindow1, *list_dir; + + table1 = gtk_table_new (1, 1, FALSE); + gtk_widget_show (table1); + + scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (scrolledwindow1); + gtk_table_attach (GTK_TABLE (table1), scrolledwindow1, 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 (scrolledwindow1), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + list_dir = gtk_tree_view_new (); + gtk_widget_show (list_dir); + gtk_container_add (GTK_CONTAINER (scrolledwindow1), list_dir); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (list_dir), FALSE); + + GLADE_HOOKUP_OBJECT (top, table1, "table1"); + GLADE_HOOKUP_OBJECT (top, scrolledwindow1, "scrolledwindow1"); + GLADE_HOOKUP_OBJECT (top, list_dir, "list_dir"); + + gtk_widget_grab_focus (list_dir); + + return table1; +}; GtkWidget* create_page_operate (void) @@ -673,9 +702,6 @@ create_page_operate (void) GtkWidget *mode_2; GtkWidget *mode_3; GtkWidget *hpaned1; - GtkWidget *table1; - GtkWidget *scrolledwindow1; - GtkWidget *list_dir; GtkWidget *vpaned1; GtkWidget *table5; GtkWidget *scrolledwindow6; @@ -757,21 +783,9 @@ create_page_operate (void) gtk_box_pack_start (GTK_BOX (vbox8), hpaned1, TRUE, TRUE, 0); gtk_paned_set_position (GTK_PANED (hpaned1), 120); - table1 = gtk_table_new (1, 1, FALSE); - gtk_widget_show (table1); - gtk_paned_pack1 (GTK_PANED (hpaned1), table1, FALSE, TRUE); - - scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (scrolledwindow1); - gtk_table_attach (GTK_TABLE (table1), scrolledwindow1, 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 (scrolledwindow1), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - - list_dir = gtk_tree_view_new (); - gtk_widget_show (list_dir); - gtk_container_add (GTK_CONTAINER (scrolledwindow1), list_dir); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (list_dir), FALSE); + gtk_paned_pack1 (GTK_PANED (hpaned1), + create_pane_filedir(page_clips), + FALSE, TRUE); vpaned1 = gtk_vpaned_new (); gtk_widget_show (vpaned1); @@ -832,9 +846,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, table1, "table1"); - GLADE_HOOKUP_OBJECT (page_clips, scrolledwindow1, "scrolledwindow1"); - GLADE_HOOKUP_OBJECT (page_clips, list_dir, "list_dir"); GLADE_HOOKUP_OBJECT (page_clips, vpaned1, "vpaned1"); GLADE_HOOKUP_OBJECT (page_clips, table5, "table5"); GLADE_HOOKUP_OBJECT (page_clips, scrolledwindow6, "scrolledwindow6"); @@ -845,7 +856,6 @@ create_page_operate (void) GLADE_HOOKUP_OBJECT (page_clips, alignment12, "alignment12"); GLADE_HOOKUP_OBJECT (page_clips, hbox19, "hbox19"); - gtk_widget_grab_focus (list_dir); return page_clips; }