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

diff --git a/src/interface.c b/src/interface.c
index 384f20d..f969749 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -658,108 +658,14 @@ create_playlist_buttons( GtkWidget* parent, GtkWidget* top )
 	return parent;
 }
 
-
+static
 GtkWidget*
-create_page_operate (void)
+create_pane_filedir( GtkWidget* top )
 {
-  GtkWidget *page_clips;
-  GtkWidget *vbox8;
-  GtkWidget *hbox26;
-  GtkWidget *label_directory;
-  GtkWidget *optionmenu1;
-  GtkWidget *menu1;
-  GtkWidget *mode_0;
-  GtkWidget *mode_1;
-  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;
-
-  page_clips = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (page_clips), _("page_operate"));
-  GLADE_HOOKUP_OBJECT_NO_REF (page_clips, page_clips, "page_operate");
-
-  hpaned0 = gtk_hpaned_new ();
-  gtk_widget_show (hpaned0);
-  gtk_container_add (GTK_CONTAINER (page_clips), hpaned0);
-  GLADE_HOOKUP_OBJECT (page_clips, hpaned0, "hpaned0");
-
-  frame1 = gtk_frame_new ("Playlist");
-  frame2 = gtk_frame_new ("Units");
-  gtk_frame_set_shadow_type (GTK_FRAME (frame1), GTK_SHADOW_IN);
-  gtk_frame_set_shadow_type (GTK_FRAME (frame2), GTK_SHADOW_IN);
-  gtk_widget_show(frame1);
-  GLADE_HOOKUP_OBJECT (page_clips, frame1, "page_clips");
-  gtk_widget_show(frame2);
-  GLADE_HOOKUP_OBJECT (page_clips, frame2, "page_status");
-
-  gtk_widget_set_size_request (hpaned0, 200 , -1);
-  gtk_paned_pack1 (GTK_PANED (hpaned0), frame1, TRUE, FALSE);
-  gtk_widget_set_size_request (frame1, 50, -1);
-  gtk_paned_pack2 (GTK_PANED (hpaned0), frame2, FALSE, FALSE);
-  gtk_widget_set_size_request (frame2, 250, -1);
-
-  create_pane_status (frame2, page_clips);
-
-  vbox8 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox8);
-  gtk_container_add (GTK_CONTAINER (frame1), vbox8);
-
-  hbox26 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox26);
-  gtk_box_pack_start (GTK_BOX (vbox8), hbox26, FALSE, FALSE, 0);
-
-  label_directory = gtk_label_new (_("Disconnected"));
-  gtk_widget_show (label_directory);
-  gtk_box_pack_start (GTK_BOX (hbox26), label_directory, TRUE, TRUE, 0);
-  gtk_misc_set_alignment (GTK_MISC (label_directory), 0, 0.5);
-
-  optionmenu1 = gtk_option_menu_new ();
-  gtk_widget_show (optionmenu1);
-  gtk_box_pack_start (GTK_BOX (hbox26), optionmenu1, FALSE, FALSE, 0);
-  GTK_WIDGET_UNSET_FLAGS (optionmenu1, GTK_CAN_FOCUS);
-
-  menu1 = gtk_menu_new ();
-
-  mode_0 = gtk_menu_item_new_with_mnemonic (_("Play"));
-  gtk_widget_show (mode_0);
-  gtk_container_add (GTK_CONTAINER (menu1), mode_0);
-
-  mode_1 = gtk_menu_item_new_with_mnemonic (_("Load"));
-  gtk_widget_show (mode_1);
-  gtk_container_add (GTK_CONTAINER (menu1), mode_1);
-
-  mode_2 = gtk_menu_item_new_with_mnemonic (_("Append"));
-  gtk_widget_show (mode_2);
-  gtk_container_add (GTK_CONTAINER (menu1), mode_2);
-
-  mode_3 = gtk_menu_item_new_with_mnemonic (_("Insert"));
-  gtk_widget_show (mode_3);
-  gtk_container_add (GTK_CONTAINER (menu1), mode_3);
-
-  gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu1), menu1);
-
-  hpaned1 = gtk_hpaned_new ();
-  gtk_widget_show (hpaned1);
-  gtk_box_pack_start (GTK_BOX (vbox8), hpaned1, TRUE, TRUE, 0);
-  gtk_paned_set_position (GTK_PANED (hpaned1), 120);
+  GtkWidget* table1, *scrolledwindow1, *list_dir;
 
   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);
@@ -773,9 +679,31 @@ create_page_operate (void)
   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_pack2 (GTK_PANED (hpaned1), vpaned1, TRUE, TRUE);
   gtk_paned_set_position (GTK_PANED (vpaned1), 130);
 
   table5 = gtk_table_new (1, 1, FALSE);
@@ -819,7 +747,116 @@ create_page_operate (void)
   gtk_widget_show (hbox19);
   gtk_container_add (GTK_CONTAINER (alignment12), hbox19);
 
-	create_playlist_buttons(hbox19, page_clips);
+	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)
+{
+  GtkWidget *page_clips;
+  GtkWidget *vbox8;
+  GtkWidget *hbox26;
+  GtkWidget *label_directory;
+  GtkWidget *optionmenu1;
+  GtkWidget *menu1;
+  GtkWidget *mode_0;
+  GtkWidget *mode_1;
+  GtkWidget *mode_2;
+  GtkWidget *mode_3;
+  GtkWidget *hpaned1;
+	GtkWidget *hpaned0;
+	GtkWidget *frame1, *frame2;
+
+	page_clips = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_title (GTK_WINDOW (page_clips), _("page_operate"));
+	GLADE_HOOKUP_OBJECT_NO_REF (page_clips, page_clips, "page_operate");
+
+	hpaned0 = gtk_hpaned_new ();
+	gtk_widget_show (hpaned0);
+	gtk_container_add (GTK_CONTAINER (page_clips), hpaned0);
+	GLADE_HOOKUP_OBJECT (page_clips, hpaned0, "hpaned0");
+
+	frame1 = gtk_frame_new ("Playlist");
+	frame2 = gtk_frame_new ("Units");
+	gtk_frame_set_shadow_type (GTK_FRAME (frame1), GTK_SHADOW_IN);
+	gtk_frame_set_shadow_type (GTK_FRAME (frame2), GTK_SHADOW_IN);
+	gtk_widget_show(frame1);
+	GLADE_HOOKUP_OBJECT (page_clips, frame1, "page_clips");
+	gtk_widget_show(frame2);
+	GLADE_HOOKUP_OBJECT (page_clips, frame2, "page_status");
+
+	gtk_widget_set_size_request (hpaned0, 200 , -1);
+	gtk_paned_pack1 (GTK_PANED (hpaned0), frame1, TRUE, FALSE);
+	gtk_widget_set_size_request (frame1, 50, -1);
+	gtk_paned_pack2 (GTK_PANED (hpaned0), frame2, FALSE, FALSE);
+	gtk_widget_set_size_request (frame2, 250, -1);
+
+	create_pane_status (frame2, page_clips);
+
+  vbox8 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_show (vbox8);
+	gtk_container_add (GTK_CONTAINER (frame1), vbox8);
+
+  hbox26 = gtk_hbox_new (FALSE, 0);
+  gtk_widget_show (hbox26);
+  gtk_box_pack_start (GTK_BOX (vbox8), hbox26, FALSE, FALSE, 0);
+
+  label_directory = gtk_label_new (_("Disconnected"));
+  gtk_widget_show (label_directory);
+  gtk_box_pack_start (GTK_BOX (hbox26), label_directory, TRUE, TRUE, 0);
+  gtk_misc_set_alignment (GTK_MISC (label_directory), 0, 0.5);
+
+  optionmenu1 = gtk_option_menu_new ();
+  gtk_widget_show (optionmenu1);
+  gtk_box_pack_start (GTK_BOX (hbox26), optionmenu1, FALSE, FALSE, 0);
+  GTK_WIDGET_UNSET_FLAGS (optionmenu1, GTK_CAN_FOCUS);
+
+  menu1 = gtk_menu_new ();
+
+  mode_0 = gtk_menu_item_new_with_mnemonic (_("Play"));
+  gtk_widget_show (mode_0);
+  gtk_container_add (GTK_CONTAINER (menu1), mode_0);
+
+  mode_1 = gtk_menu_item_new_with_mnemonic (_("Load"));
+  gtk_widget_show (mode_1);
+  gtk_container_add (GTK_CONTAINER (menu1), mode_1);
+
+  mode_2 = gtk_menu_item_new_with_mnemonic (_("Append"));
+  gtk_widget_show (mode_2);
+  gtk_container_add (GTK_CONTAINER (menu1), mode_2);
+
+  mode_3 = gtk_menu_item_new_with_mnemonic (_("Insert"));
+  gtk_widget_show (mode_3);
+  gtk_container_add (GTK_CONTAINER (menu1), mode_3);
+
+  gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu1), menu1);
+
+  hpaned1 = gtk_hpaned_new ();
+  gtk_widget_show (hpaned1);
+  gtk_box_pack_start (GTK_BOX (vbox8), hpaned1, TRUE, TRUE, 0);
+  gtk_paned_set_position (GTK_PANED (hpaned1), 120);
+
+	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);
+
+
 
   /* 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;
 }