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

diff --git a/src/interface.c b/src/interface.c
index 85d1a43..223a7a7 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -658,6 +658,99 @@ create_playlist_buttons( GtkWidget* parent, GtkWidget* top )
 	return parent;
 }
 
+static
+GtkWidget*
+create_pane_filedir( GtkWidget* top )
+{
+	GtkWidget* vpaned;
+	GtkWidget* scrolledwindow[2];
+	GtkWidget* list[2];
+
+	/* create a vertical pane for dirs list and clips list */
+	vpaned = gtk_vpaned_new ();
+	gtk_widget_show (vpaned);
+
+	/* create two scrolled window for lists areas */
+	scrolledwindow[0] = gtk_scrolled_window_new (NULL, NULL);
+	gtk_widget_show (scrolledwindow[0]);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow[0]),
+		GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	scrolledwindow[1] = gtk_scrolled_window_new (NULL, NULL);
+	gtk_widget_show (scrolledwindow[1]);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow[1]),
+		GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+	/* pane them */
+	gtk_widget_set_size_request (vpaned, 400 , -1);
+	gtk_paned_pack1 (GTK_PANED (vpaned), scrolledwindow[0], FALSE, FALSE);
+	gtk_widget_set_size_request (scrolledwindow[0], 150, -1);
+	gtk_paned_pack2 (GTK_PANED (vpaned), scrolledwindow[1], TRUE, FALSE);
+	gtk_widget_set_size_request (scrolledwindow[1], 250, -1);
+
+	/* list_dirs */
+	list[0] = gtk_tree_view_new ();
+	gtk_widget_show (list[0]);
+	gtk_container_add (GTK_CONTAINER (scrolledwindow[0]), list[0]);
+	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (list[0]), FALSE);
+	GLADE_HOOKUP_OBJECT (top, list[0], "list_dir");
+
+	/* list_clips */
+	list[1] = gtk_tree_view_new ();
+	gtk_widget_show (list[1]);
+	gtk_container_add (GTK_CONTAINER (scrolledwindow[1]), list[1]);
+	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (list[1]), FALSE);
+	gtk_tree_view_set_enable_search (GTK_TREE_VIEW (list[1]), FALSE);
+	GLADE_HOOKUP_OBJECT (top, list[1], "list_clips");
+
+	gtk_widget_grab_focus (list[0]);
+
+	return vpaned;
+};
+
+static
+GtkWidget*
+create_pane_playlist( GtkWidget* top )
+{
+	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);
+
+	hbox = gtk_hbox_new (FALSE, 0);
+	gtk_widget_show (hbox);
+	gtk_container_add (GTK_CONTAINER (alignment), hbox);
+
+	create_playlist_buttons(hbox, top);
+
+	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 table;
+};
 
 GtkWidget*
 create_page_operate (void)
@@ -673,18 +766,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 +838,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);
-
-  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_pack1 (GTK_PANED (hpaned1),
+		create_pane_filedir(page_clips),
+		FALSE, TRUE);
+
+	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");
@@ -832,20 +859,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;
 }