X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=cb3994034ffcbe07afa360282f55d3d31c4e5e6f;hb=cf271206c1243f87573bf59611fdc6f826728ed3;hp=81e4f316cf2f3c63b745434e69a0480dd7d09809;hpb=bb5ea194600d5ae09b18a147420f4fc42c0808df;p=evince.git diff --git a/shell/ev-window.c b/shell/ev-window.c index 81e4f316..cb399403 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -43,12 +43,13 @@ #include "ev-document-fonts.h" #include "ev-document-find.h" #include "ev-document-security.h" +#include "ev-document-types.h" #include "ev-job-queue.h" #include "ev-jobs.h" #include "ev-statusbar.h" #include "ev-sidebar-page.h" #include "eggfindbar.h" -#include "egg-recent-view-gtk.h" +#include "egg-recent-view-uimanager.h" #include "egg-recent-view.h" #include "egg-recent-model.h" #include "egg-toolbar-editor.h" @@ -59,6 +60,7 @@ #include "ev-application.h" #include "ev-stock-icons.h" #include "ev-file-helpers.h" + #include #include @@ -137,7 +139,7 @@ struct _EvWindowPrivate { /* recent file stuff */ EggRecentModel *recent_model; - EggRecentViewGtk *recent_view; + EggRecentViewUIManager *recent_view; }; static const GtkTargetEntry ev_drop_types[] = { @@ -958,14 +960,18 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *ev_window) } static void -ev_window_cmd_recent_file_activate (EggRecentViewGtk *view, EggRecentItem *item, +ev_window_cmd_recent_file_activate (GtkAction *action, EvWindow *ev_window) { char *uri; + EggRecentItem *item; GtkWidget *window; - uri = egg_recent_item_get_uri (item); + item = egg_recent_view_uimanager_get_item (ev_window->priv->recent_view, + action); + uri = egg_recent_item_get_uri (item); + window = GTK_WIDGET (ev_application_get_empty_window (EV_APP)); gtk_widget_show (window); ev_window_open_uri (EV_WINDOW (window), uri); @@ -986,23 +992,20 @@ ev_window_add_recent (EvWindow *window, const char *filename) static void ev_window_setup_recent (EvWindow *ev_window) { - GtkWidget *menu_item; - GtkWidget *menu; - menu_item = gtk_ui_manager_get_widget (ev_window->priv->ui_manager, "/MainMenu/FileMenu"); - menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu_item)); - menu_item = gtk_ui_manager_get_widget (ev_window->priv->ui_manager, "/MainMenu/FileMenu/RecentFilesMenu"); - g_return_if_fail (menu != NULL); - g_return_if_fail (menu_item != NULL); /* it would be better if we just filtered by mime-type, but there * doesn't seem to be an easy way to figure out which mime-types we * can handle */ ev_window->priv->recent_model = egg_recent_model_new (EGG_RECENT_MODEL_SORT_MRU); - ev_window->priv->recent_view = egg_recent_view_gtk_new (menu, menu_item); - egg_recent_view_gtk_show_icons (EGG_RECENT_VIEW_GTK (ev_window->priv->recent_view), FALSE); + ev_window->priv->recent_view = egg_recent_view_uimanager_new (ev_window->priv->ui_manager, + "/MainMenu/FileMenu/RecentFilesMenu", + G_CALLBACK (ev_window_cmd_recent_file_activate), + ev_window); + + egg_recent_view_uimanager_show_icons (EGG_RECENT_VIEW_UIMANAGER (ev_window->priv->recent_view), FALSE); egg_recent_model_set_limit (ev_window->priv->recent_model, 5); egg_recent_view_set_model (EGG_RECENT_VIEW (ev_window->priv->recent_view), @@ -1011,7 +1014,7 @@ ev_window_setup_recent (EvWindow *ev_window) egg_recent_model_set_filter_groups (ev_window->priv->recent_model, "Evince", NULL); - egg_recent_view_gtk_set_trailing_sep (ev_window->priv->recent_view, TRUE); + egg_recent_view_uimanager_set_trailing_sep (ev_window->priv->recent_view, TRUE); g_signal_connect (ev_window->priv->recent_view, "activate", G_CALLBACK (ev_window_cmd_recent_file_activate), ev_window); @@ -1087,8 +1090,11 @@ static void ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) { GtkWidget *fc; - GtkFileFilter *pdf_filter, *all_filter; - gchar *uri = NULL; + + gchar *uri; + gchar *basename; + static char* folder = NULL; + gboolean success; fc = gtk_file_chooser_dialog_new ( @@ -1099,18 +1105,17 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) NULL); gtk_window_set_modal (GTK_WINDOW (fc), TRUE); - pdf_filter = gtk_file_filter_new (); - gtk_file_filter_set_name (pdf_filter, _("PDF Documents")); - gtk_file_filter_add_mime_type (pdf_filter, "application/pdf"); - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fc), pdf_filter); - - all_filter = gtk_file_filter_new (); - gtk_file_filter_set_name (all_filter, _("All Files")); - gtk_file_filter_add_pattern (all_filter, "*"); - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fc), all_filter); - gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (fc), pdf_filter); - + ev_document_types_add_filters_for_type (fc, G_TYPE_FROM_INSTANCE (ev_window->priv->document)); gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK); + + if (folder) { + gtk_file_chooser_set_current_folder_uri(GTK_FILE_CHOOSER (fc), + folder); + } + + basename = g_path_get_basename (ev_window->priv->uri); + gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), basename); + g_free (basename); gtk_widget_show (fc); @@ -1132,6 +1137,12 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) else save_error_dialog (GTK_WINDOW (fc), uri); } + + if (folder != NULL) + g_free (folder); + + folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (fc)); + gtk_widget_destroy (fc); } @@ -2205,17 +2216,18 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspe EvWindow *ev_window) { GtkAction *action; - gboolean visible, fullscreen; + gboolean visible, fullscreen_mode; + + + fullscreen_mode = ev_view_get_presentation (EV_VIEW (ev_window->priv->view)) || + ev_view_get_fullscreen (EV_VIEW (ev_window->priv->view)); - g_object_get (ev_window->priv->view, - "fullscreen", &fullscreen, - NULL); visible = GTK_WIDGET_VISIBLE (ev_sidebar); /* In fullscreen mode the sidebar is not visible, * but we don't want to update the chrome */ - if (fullscreen) + if (fullscreen_mode) return; action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar");