join clips and status control to same 'operate' page

[rugen] / src / interface.c

diff --git a/src/interface.c b/src/interface.c
index 3720315..adc7b86 100644 (file)
--- a/src/interface.c
+++ b/src/interface.c
@@ -554,21 +554,7 @@ static GtkWidget* create_pane_status (GtkWidget* parent, GtkWidget* top)
 }
 
 GtkWidget*
-create_page_status (void)
-{
-       GtkWidget *page_status;
-
-       page_status = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-       gtk_window_set_title (GTK_WINDOW (page_status), _("page_status"));
-       GLADE_HOOKUP_OBJECT_NO_REF (page_status, page_status, "page_status");
-
-       create_pane_status (page_status, page_status);
-
-       return page_status;
-}
-
-GtkWidget*
-create_page_clips (void)
+create_page_operate (void)
 {
   GtkWidget *page_clips;
   GtkWidget *vbox8;
@@ -618,7 +604,8 @@ create_page_clips (void)
   GtkWidget *frame1, *frame2;
 
   page_clips = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (page_clips), _("page_clips"));
+  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);
@@ -630,7 +617,9 @@ create_page_clips (void)
   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);
@@ -638,8 +627,7 @@ create_page_clips (void)
   gtk_paned_pack2 (GTK_PANED (hpaned0), frame2, FALSE, FALSE);
   gtk_widget_set_size_request (frame2, 250, -1);
 
-//  create_pane_status (page_clips, frame2);
-//  GLADE_HOOKUP_OBJECT_NO_REF (page_status, page_status, "page_status");
+  create_pane_status (frame2, page_clips);
 
   vbox8 = gtk_vbox_new (FALSE, 0);
   gtk_widget_show (vbox8);
@@ -859,7 +847,6 @@ create_page_clips (void)
   gtk_label_set_justify (GTK_LABEL (label45), GTK_JUSTIFY_LEFT);
 
   /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (page_clips, page_clips, "page_clips");
   GLADE_HOOKUP_OBJECT (page_clips, vbox8, "vbox8");
   GLADE_HOOKUP_OBJECT (page_clips, hbox26, "hbox26");
   GLADE_HOOKUP_OBJECT (page_clips, label_directory, "label_directory");