X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Finterface.c;h=f96974911883238a2e195472786cd1b6a50b38ec;hb=d78d9597dad93a1563205d2224c6c734413b37af;hp=85d1a4314c2a475b1c753977a114a483de2628b6;hpb=4ee34e0112ff6138e92568d0bf602d66d8a04297;p=rugen

diff --git a/src/interface.c b/src/interface.c
index 85d1a43..f969749 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -658,6 +658,109 @@ 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;
+};
+
+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)
@@ -673,18 +776,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;
-  GtkWidget *list_clips;
-  GtkWidget *table4;
-  GtkWidget *scrolledwindow5;
-  GtkWidget *treeview1;
-  GtkWidget *alignment12;
-  GtkWidget *hbox19;
 	GtkWidget *hpaned0;
 	GtkWidget *frame1, *frame2;
 
@@ -757,69 +848,15 @@ 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);
-
-  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);
+	gtk_paned_pack1 (GTK_PANED (hpaned1),
+		create_pane_filedir(page_clips),
+		FALSE, TRUE);
 
-  treeview1 = gtk_tree_view_new ();
-  gtk_widget_show (treeview1);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow5), treeview1);
+	gtk_paned_pack2 (GTK_PANED (hpaned1),
+		create_pane_playlist(page_clips),
+		FALSE, TRUE);
 
-  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, page_clips);
 
   /* Store pointers to all widgets, for use by lookup_widget(). */
   GLADE_HOOKUP_OBJECT (page_clips, vbox8, "vbox8");
@@ -832,20 +869,7 @@ 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");
-  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");
 
-  gtk_widget_grab_focus (list_dir);
   return page_clips;
 }