X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Finterface.c;h=223a7a76651759bdc01262b7c89883dfccc775d0;hb=d53453fd92464ac2140b7b0da1ffa8a6b1985329;hp=552c2f598100d1acba016ed1d78d0fd1e947bbe9;hpb=238f85cfbe00b3f598e4ba330f773e75732e88d6;p=rugen diff --git a/src/interface.c b/src/interface.c index 552c2f5..223a7a7 100644 --- a/src/interface.c +++ b/src/interface.c @@ -493,7 +493,7 @@ create_window_connection (void) return window_connection; } -static void create_pane_status (GtkWidget* parent) +static GtkWidget* create_pane_status (GtkWidget* parent, GtkWidget* top) { int i; char buf[32]; @@ -506,21 +506,22 @@ static void create_pane_status (GtkWidget* parent) // create a scrolled area scrolledwindow = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (scrolledwindow); - gtk_container_add (GTK_CONTAINER (parent), scrolledwindow); + if ( parent ) + gtk_container_add (GTK_CONTAINER (parent), scrolledwindow); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - GLADE_HOOKUP_OBJECT (parent, scrolledwindow, "scrolledwindow4"); + GLADE_HOOKUP_OBJECT (top, scrolledwindow, "scrolledwindow4"); // create a viewport viewport = gtk_viewport_new (NULL, NULL); gtk_widget_show (viewport); gtk_container_add (GTK_CONTAINER (scrolledwindow), viewport); - GLADE_HOOKUP_OBJECT (parent, viewport, "viewport1"); + GLADE_HOOKUP_OBJECT (top, viewport, "viewport1"); // create a table for displaying radios table = gtk_table_new (32, 1, FALSE); gtk_widget_show (table); gtk_container_add (GTK_CONTAINER (viewport), table); - GLADE_HOOKUP_OBJECT (parent, table, "table3"); + GLADE_HOOKUP_OBJECT (top, table, "table3"); for (i = 0; i < 16; i++) { @@ -536,7 +537,7 @@ static void create_pane_status (GtkWidget* parent) gtk_label_set_justify (GTK_LABEL (label_unit), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (label_unit), 0, 0.5); snprintf(buf, sizeof(buf), "label_unit_%d", i); - GLADE_HOOKUP_OBJECT (parent, label_unit, buf); + GLADE_HOOKUP_OBJECT (top, label_unit, buf); // radio button radiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("")); @@ -546,26 +547,213 @@ static void create_pane_status (GtkWidget* parent) gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton), radiobutton_group); radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton)); snprintf(buf, sizeof(buf), "radiobutton_%d", i); - GLADE_HOOKUP_OBJECT (parent, radiobutton, buf); + GLADE_HOOKUP_OBJECT (top, radiobutton, buf); } + + return scrolledwindow; } +static GtkWidget* -create_page_status (void) +create_playlist_buttons( GtkWidget* parent, GtkWidget* top ) { - GtkWidget *page_status; + int i; + const static struct + { + gchar* tooltip; + gchar* stock; + gchar* label; + gchar* hookup; + } buttons[] = + { + { + "Refresh", + "gtk-refresh", + "", + "button_clips_refresh", + }, + { + "Load root folder", + "gtk-home", + "", + "button_clips_home" + }, + { + "Move clip up", + "gtk-go-up", + "", + "button_up" + }, + { + "Move clip down", + "gtk-go-down", + "", + "button_down" + }, + { + "Remove clip", + "gtk-delete", + "", + "button_remove" + }, + { + "Remove all but current clip", + "gtk-clear", + "", + "button_clean" + }, + { + NULL, NULL, NULL, NULL + } + }; + + GtkWidget *label44, *label45, *hbuttonbox5; + + label44 = gtk_label_new (_(" ")); + gtk_widget_show (label44); + gtk_box_pack_start (GTK_BOX (parent), label44, TRUE, TRUE, 0); + gtk_label_set_justify (GTK_LABEL (label44), GTK_JUSTIFY_LEFT); + + for(i = 0; buttons[i].stock; i++) + { + GtkWidget *button, *alignment, *hbox, *image, *label; + + button = gtk_button_new (); + gtk_widget_show (button); + gtk_box_pack_start (GTK_BOX (parent), button, FALSE, FALSE, 0); + GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS); + GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); + gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text (button, buttons[i].tooltip); + + alignment = gtk_alignment_new (0, 0.5, 0, 0); + gtk_widget_show (alignment); + gtk_container_add (GTK_CONTAINER (button), alignment); + + hbox = gtk_hbox_new (FALSE, 2); + gtk_widget_show (hbox); + gtk_container_add (GTK_CONTAINER (alignment), hbox); + + image = gtk_image_new_from_stock (buttons[i].stock, GTK_ICON_SIZE_MENU); + gtk_widget_show (image); + gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); + + label = gtk_label_new_with_mnemonic (buttons[i].label); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); + + GLADE_HOOKUP_OBJECT (top, button, buttons[i].hookup); + }; + + hbuttonbox5 = gtk_hbutton_box_new (); + gtk_widget_show (hbuttonbox5); + gtk_box_pack_start (GTK_BOX (parent), hbuttonbox5, FALSE, FALSE, 0); + + label45 = gtk_label_new (_(" ")); + gtk_widget_show (label45); + gtk_box_pack_start (GTK_BOX (parent), label45, TRUE, TRUE, 0); + gtk_label_set_justify (GTK_LABEL (label45), GTK_JUSTIFY_LEFT); + + return parent; +} - 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"); +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; +}; - create_pane_status (page_status); +static +GtkWidget* +create_pane_playlist( GtkWidget* top ) +{ + GtkWidget *table; + GtkWidget *scrolledwindow; + GtkWidget *treeview; + GtkWidget *alignment; + GtkWidget *hbox; - return page_status; -} + 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_clips (void) +create_page_operate (void) { GtkWidget *page_clips; GtkWidget *vbox8; @@ -578,46 +766,38 @@ create_page_clips (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 *label44; - GtkWidget *button_clips_refresh; - GtkWidget *alignment5; - GtkWidget *hbox12; - GtkWidget *image5; - GtkWidget *label36; - GtkWidget *button_clips_home; - GtkWidget *alignment6; - GtkWidget *hbox13; - GtkWidget *image6; - GtkWidget *label37; - GtkWidget *button_up; - GtkWidget *image21; - GtkWidget *button_down; - GtkWidget *image22; - GtkWidget *button_remove; - GtkWidget *image23; - GtkWidget *button_clean; - GtkWidget *image24; - GtkWidget *hbuttonbox5; - GtkWidget *label45; - - page_clips = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title (GTK_WINDOW (page_clips), _("page_clips")); + 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 (page_clips), vbox8); + gtk_container_add (GTK_CONTAINER (frame1), vbox8); hbox26 = gtk_hbox_new (FALSE, 0); gtk_widget_show (hbox26); @@ -658,182 +838,17 @@ create_page_clips (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); - - label44 = gtk_label_new (_(" ")); - gtk_widget_show (label44); - gtk_box_pack_start (GTK_BOX (hbox19), label44, TRUE, TRUE, 0); - gtk_label_set_justify (GTK_LABEL (label44), GTK_JUSTIFY_LEFT); - - button_clips_refresh = gtk_button_new (); - gtk_widget_show (button_clips_refresh); - gtk_box_pack_start (GTK_BOX (hbox19), button_clips_refresh, FALSE, FALSE, 0); - GTK_WIDGET_UNSET_FLAGS (button_clips_refresh, GTK_CAN_FOCUS); - GTK_WIDGET_SET_FLAGS (button_clips_refresh, GTK_CAN_DEFAULT); - gtk_button_set_relief (GTK_BUTTON (button_clips_refresh), GTK_RELIEF_NONE); - gtk_widget_set_tooltip_text (button_clips_refresh, _("Refresh")); - - alignment5 = gtk_alignment_new (0, 0.5, 0, 0); - gtk_widget_show (alignment5); - gtk_container_add (GTK_CONTAINER (button_clips_refresh), alignment5); - - hbox12 = gtk_hbox_new (FALSE, 2); - gtk_widget_show (hbox12); - gtk_container_add (GTK_CONTAINER (alignment5), hbox12); - - image5 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU); - gtk_widget_show (image5); - gtk_box_pack_start (GTK_BOX (hbox12), image5, FALSE, FALSE, 0); - - label36 = gtk_label_new_with_mnemonic (""); - gtk_widget_show (label36); - gtk_box_pack_start (GTK_BOX (hbox12), label36, FALSE, FALSE, 0); - gtk_label_set_justify (GTK_LABEL (label36), GTK_JUSTIFY_LEFT); - - button_clips_home = gtk_button_new (); - gtk_widget_show (button_clips_home); - gtk_box_pack_start (GTK_BOX (hbox19), button_clips_home, FALSE, FALSE, 0); - GTK_WIDGET_UNSET_FLAGS (button_clips_home, GTK_CAN_FOCUS); - GTK_WIDGET_SET_FLAGS (button_clips_home, GTK_CAN_DEFAULT); - gtk_button_set_relief (GTK_BUTTON (button_clips_home), GTK_RELIEF_NONE); - gtk_widget_set_tooltip_text (button_clips_home, _("Load root folder")); - - alignment6 = gtk_alignment_new (0, 0.5, 0, 0); - gtk_widget_show (alignment6); - gtk_container_add (GTK_CONTAINER (button_clips_home), alignment6); - - hbox13 = gtk_hbox_new (FALSE, 2); - gtk_widget_show (hbox13); - gtk_container_add (GTK_CONTAINER (alignment6), hbox13); - - image6 = gtk_image_new_from_stock ("gtk-home", GTK_ICON_SIZE_MENU); - gtk_widget_show (image6); - gtk_box_pack_start (GTK_BOX (hbox13), image6, FALSE, FALSE, 0); - - label37 = gtk_label_new_with_mnemonic (""); - gtk_widget_show (label37); - gtk_box_pack_start (GTK_BOX (hbox13), label37, FALSE, FALSE, 0); - gtk_label_set_justify (GTK_LABEL (label37), GTK_JUSTIFY_LEFT); - - button_up = gtk_button_new (); - gtk_widget_show (button_up); - gtk_box_pack_start (GTK_BOX (hbox19), button_up, FALSE, FALSE, 0); - GTK_WIDGET_UNSET_FLAGS (button_up, GTK_CAN_FOCUS); - GTK_WIDGET_SET_FLAGS (button_up, GTK_CAN_DEFAULT); - gtk_button_set_relief (GTK_BUTTON (button_up), GTK_RELIEF_NONE); - gtk_widget_set_tooltip_text (button_up, _("Move clip up")); - - image21 = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU); - gtk_widget_show (image21); - gtk_container_add (GTK_CONTAINER (button_up), image21); - - button_down = gtk_button_new (); - gtk_widget_show (button_down); - gtk_box_pack_start (GTK_BOX (hbox19), button_down, FALSE, FALSE, 0); - GTK_WIDGET_UNSET_FLAGS (button_down, GTK_CAN_FOCUS); - GTK_WIDGET_SET_FLAGS (button_down, GTK_CAN_DEFAULT); - gtk_button_set_relief (GTK_BUTTON (button_down), GTK_RELIEF_NONE); - gtk_widget_set_tooltip_text (button_down, _("Move clip down")); - - image22 = gtk_image_new_from_stock ("gtk-go-down", GTK_ICON_SIZE_MENU); - gtk_widget_show (image22); - gtk_container_add (GTK_CONTAINER (button_down), image22); - - button_remove = gtk_button_new (); - gtk_widget_show (button_remove); - gtk_box_pack_start (GTK_BOX (hbox19), button_remove, FALSE, FALSE, 0); - GTK_WIDGET_UNSET_FLAGS (button_remove, GTK_CAN_FOCUS); - GTK_WIDGET_SET_FLAGS (button_remove, GTK_CAN_DEFAULT); - gtk_button_set_relief (GTK_BUTTON (button_remove), GTK_RELIEF_NONE); - gtk_widget_set_tooltip_text (button_remove, _("Remove clip")); - - image23 = gtk_image_new_from_stock ("gtk-delete", GTK_ICON_SIZE_MENU); - gtk_widget_show (image23); - gtk_container_add (GTK_CONTAINER (button_remove), image23); - - button_clean = gtk_button_new (); - gtk_widget_show (button_clean); - gtk_box_pack_start (GTK_BOX (hbox19), button_clean, FALSE, FALSE, 0); - GTK_WIDGET_UNSET_FLAGS (button_clean, GTK_CAN_FOCUS); - GTK_WIDGET_SET_FLAGS (button_clean, GTK_CAN_DEFAULT); - gtk_button_set_relief (GTK_BUTTON (button_clean), GTK_RELIEF_NONE); - gtk_widget_set_tooltip_text (button_clean, _("Remove all but current clip")); - - image24 = gtk_image_new_from_stock ("gtk-clear", GTK_ICON_SIZE_MENU); - gtk_widget_show (image24); - gtk_container_add (GTK_CONTAINER (button_clean), image24); - - hbuttonbox5 = gtk_hbutton_box_new (); - gtk_widget_show (hbuttonbox5); - gtk_box_pack_start (GTK_BOX (hbox19), hbuttonbox5, FALSE, FALSE, 0); - - label45 = gtk_label_new (_(" ")); - gtk_widget_show (label45); - gtk_box_pack_start (GTK_BOX (hbox19), label45, TRUE, TRUE, 0); - 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"); @@ -844,41 +859,7 @@ create_page_clips (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"); - GLADE_HOOKUP_OBJECT (page_clips, label44, "label44"); - GLADE_HOOKUP_OBJECT (page_clips, button_clips_refresh, "button_clips_refresh"); - GLADE_HOOKUP_OBJECT (page_clips, alignment5, "alignment5"); - GLADE_HOOKUP_OBJECT (page_clips, hbox12, "hbox12"); - GLADE_HOOKUP_OBJECT (page_clips, image5, "image5"); - GLADE_HOOKUP_OBJECT (page_clips, label36, "label36"); - GLADE_HOOKUP_OBJECT (page_clips, button_clips_home, "button_clips_home"); - GLADE_HOOKUP_OBJECT (page_clips, alignment6, "alignment6"); - GLADE_HOOKUP_OBJECT (page_clips, hbox13, "hbox13"); - GLADE_HOOKUP_OBJECT (page_clips, image6, "image6"); - GLADE_HOOKUP_OBJECT (page_clips, label37, "label37"); - GLADE_HOOKUP_OBJECT (page_clips, button_up, "button_up"); - GLADE_HOOKUP_OBJECT (page_clips, image21, "image21"); - GLADE_HOOKUP_OBJECT (page_clips, button_down, "button_down"); - GLADE_HOOKUP_OBJECT (page_clips, image22, "image22"); - GLADE_HOOKUP_OBJECT (page_clips, button_remove, "button_remove"); - GLADE_HOOKUP_OBJECT (page_clips, image23, "image23"); - GLADE_HOOKUP_OBJECT (page_clips, button_clean, "button_clean"); - GLADE_HOOKUP_OBJECT (page_clips, image24, "image24"); - GLADE_HOOKUP_OBJECT (page_clips, hbuttonbox5, "hbuttonbox5"); - GLADE_HOOKUP_OBJECT (page_clips, label45, "label45"); - - gtk_widget_grab_focus (list_dir); + return page_clips; }