Updating branch refs/heads/ristretto-0.0 to 137a15aa37549cfb88a9a3e80af6621d1e9be5a4 (commit) from 5cc4ebc2809050737072f9add17a1b2359c3049c (commit)
commit 137a15aa37549cfb88a9a3e80af6621d1e9be5a4 Author: Stephan Arts <step...@xfce.org> Date: Wed Jun 3 19:06:53 2009 +0200 Add open-folder question-bar src/main_window.c | 15 +++++++++++++++ src/main_window_ui.xml | 4 ++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/src/main_window.c b/src/main_window.c index c757808..8320a6c 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -72,6 +72,7 @@ struct _RsttoMainWindowPriv GtkWidget *menubar; GtkWidget *toolbar; + GtkWidget *message_bar; GtkWidget *image_list_toolbar; GtkWidget *image_list_toolbar_menu; GtkWidget *picture_viewer; @@ -249,6 +250,7 @@ static GtkActionEntry action_entries[] = /* Edit Menu */ { "edit-menu", NULL, N_ ("_Edit"), NULL, }, { "open-with-menu", NULL, N_ ("_Open with..."), NULL, }, + { "sorting-menu", NULL, N_ ("_Sorting"), NULL, }, { "delete", GTK_STOCK_DELETE, N_ ("_Delete"), "Delete", NULL, G_CALLBACK (cb_rstto_main_window_delete), }, { "preferences", GTK_STOCK_PREFERENCES, N_ ("_Preferences"), NULL, NULL, G_CALLBACK (cb_rstto_main_window_preferences), }, /* View Menu */ @@ -297,6 +299,12 @@ static const GtkToggleActionEntry toggle_action_entries[] = { "show-thumbnailbar", NULL, N_ ("Show Thumb_nailbar"), NULL, NULL, NULL, FALSE}, }; +static const GtkRadioActionEntry radio_action_sort_entries[] = +{ + {"sort-filename", NULL, N_("sort by filename"), NULL, NULL, 0}, + {"sort-date", NULL, N_("sort by date"), NULL, NULL, 1}, +}; + GType rstto_main_window_get_type () @@ -403,6 +411,7 @@ rstto_main_window_init (RsttoMainWindow *window) gtk_action_group_set_translation_domain (window->priv->action_group, GETTEXT_PACKAGE); gtk_action_group_add_actions (window->priv->action_group, action_entries, G_N_ELEMENTS (action_entries), GTK_WIDGET (window)); gtk_action_group_add_toggle_actions (window->priv->action_group, toggle_action_entries, G_N_ELEMENTS (toggle_action_entries), GTK_WIDGET (window)); + gtk_action_group_add_radio_actions (window->priv->action_group, radio_action_sort_entries , G_N_ELEMENTS (radio_action_sort_entries), 0, NULL, GTK_WIDGET (window)); gtk_ui_manager_add_ui_from_string (window->priv->ui_manager,main_window_ui, main_window_ui_length, NULL); window->priv->menubar = gtk_ui_manager_get_widget (window->priv->ui_manager, "/main-menu"); @@ -439,10 +448,16 @@ rstto_main_window_init (RsttoMainWindow *window) window->priv->statusbar = gtk_statusbar_new(); + window->priv->message_bar = gtk_hbox_new (FALSE,0); + gtk_container_set_border_width (window->priv->message_bar, 2); + gtk_box_pack_start (GTK_BOX (window->priv->message_bar), gtk_label_new (N_("Do you want to load the entire folder?")), TRUE,TRUE, 0); + gtk_box_pack_end (GTK_BOX (window->priv->message_bar), gtk_button_new_from_stock(GTK_STOCK_OPEN), FALSE,FALSE, 5); + gtk_box_pack_end (GTK_BOX (window->priv->message_bar), gtk_button_new_from_stock(GTK_STOCK_CANCEL), FALSE,FALSE, 5); gtk_container_add (GTK_CONTAINER (window), main_vbox); gtk_box_pack_start(GTK_BOX(main_vbox), window->priv->menubar, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(main_vbox), window->priv->toolbar, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(main_vbox), window->priv->message_bar, FALSE,FALSE, 0); gtk_box_pack_start(GTK_BOX(main_vbox), window->priv->hpaned, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(main_vbox), window->priv->image_list_toolbar, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(main_vbox), window->priv->statusbar, FALSE, FALSE, 0); diff --git a/src/main_window_ui.xml b/src/main_window_ui.xml index 517726f..6b5760b 100644 --- a/src/main_window_ui.xml +++ b/src/main_window_ui.xml @@ -22,6 +22,10 @@ <placeholder name="open-with-apps" /> </menu> <separator/> + <menu action="sorting-menu"> + <menuitem action="sort-filename"/> + <menuitem action="sort-date"/> + </menu> <menuitem action="delete"/> <separator/> <menuitem action="preferences"/> _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits