From e13a6f150781976b37443c41c08bf38841e9e1f1 Mon Sep 17 00:00:00 2001 From: Maksym Veremeyenko Date: Tue, 14 Jun 2011 17:53:06 +0300 Subject: [PATCH] move label_directory into filedir pane --- src/interface.c | 43 +++++++++++++++++++------------------------ 1 files changed, 19 insertions(+), 24 deletions(-) diff --git a/src/interface.c b/src/interface.c index d149f51..e8abeff 100644 --- a/src/interface.c +++ b/src/interface.c @@ -665,10 +665,24 @@ create_pane_filedir( GtkWidget* top ) GtkWidget* vpaned; GtkWidget* scrolledwindow[2]; GtkWidget* list[2]; + GtkWidget* label_directory; + GtkWidget* vbox; + + /* create vbox for label pack */ + vbox = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox); + + /* create a label for dir name */ + label_directory = gtk_label_new (_("Disconnected")); + gtk_widget_show (label_directory); + gtk_box_pack_start (GTK_BOX (vbox), label_directory, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label_directory), 0, 0.5); + GLADE_HOOKUP_OBJECT (top, label_directory, "label_directory"); /* create a vertical pane for dirs list and clips list */ vpaned = gtk_vpaned_new (); gtk_widget_show (vpaned); + gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE, TRUE, 0); /* create two scrolled window for lists areas */ scrolledwindow[0] = gtk_scrolled_window_new (NULL, NULL); @@ -704,7 +718,7 @@ create_pane_filedir( GtkWidget* top ) gtk_widget_grab_focus (list[0]); - return vpaned; + return vbox; }; static @@ -756,9 +770,6 @@ GtkWidget* create_page_operate (void) { GtkWidget *page_clips; - GtkWidget *vbox8; - GtkWidget *hbox26; - GtkWidget *label_directory; GtkWidget *hpaned1; GtkWidget *hpaned0; GtkWidget *frame1, *frame2; @@ -789,23 +800,10 @@ create_page_operate (void) 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); - - 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); + hpaned1 = gtk_hpaned_new (); + gtk_widget_show (hpaned1); + gtk_container_add (GTK_CONTAINER (frame1), hpaned1); + gtk_paned_set_position (GTK_PANED (hpaned1), 120); gtk_paned_pack1 (GTK_PANED (hpaned1), create_pane_filedir(page_clips), @@ -818,9 +816,6 @@ create_page_operate (void) /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT (page_clips, vbox8, "vbox8"); - GLADE_HOOKUP_OBJECT (page_clips, hbox26, "hbox26"); - GLADE_HOOKUP_OBJECT (page_clips, label_directory, "label_directory"); GLADE_HOOKUP_OBJECT (page_clips, hpaned1, "hpaned1"); return page_clips; -- 1.7.4.4