X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-window.c;h=d860d74589186daff904a6cb20c4dae0bd6eeadd;hb=b0083a8f9bb4ef2d2fd9bed4106ce61e042f7c5c;hp=cef9c24284a1f29e38bfb7e873f05827c34e44c1;hpb=5e2fe15d5965ed397f8bb3631c77926abba3ee99;p=evince.git diff --git a/shell/ev-window.c b/shell/ev-window.c index cef9c242..d860d745 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -61,6 +61,8 @@ #include "ev-application.h" #include "ev-stock-icons.h" #include "ev-metadata-manager.h" +#include "ev-file-helpers.h" +#include "ev-utils.h" #include @@ -152,7 +154,8 @@ static const GtkTargetEntry ev_drop_types[] = { #define GCONF_CHROME_TOOLBAR "/apps/evince/show_toolbar" #define GCONF_CHROME_SIDEBAR "/apps/evince/show_sidebar" #define GCONF_CHROME_STATUSBAR "/apps/evince/show_statusbar" - +#define GCONF_LOCKDOWN_SAVE "/desktop/gnome/lockdown/disable_save_to_disk" +#define GCONF_LOCKDOWN_PRINT "/desktop/gnome/lockdown/disable_printing" #define GCONF_SIDEBAR_SIZE "/apps/evince/sidebar_size" #define SIDEBAR_DEFAULT_SIZE 132 @@ -212,6 +215,7 @@ update_action_sensitivity (EvWindow *ev_window) gboolean ok_to_print = TRUE; gboolean ok_to_copy = TRUE; gboolean has_properties = TRUE; + GConfClient *client; view = EV_VIEW (ev_window->priv->view); @@ -240,6 +244,16 @@ update_action_sensitivity (EvWindow *ev_window) if (!info || info->fields_mask == 0) { has_properties = FALSE; } + + client = gconf_client_get_default (); + + if (gconf_client_get_bool (client, GCONF_LOCKDOWN_SAVE, NULL)) { + ok_to_copy = FALSE; + } + + if (gconf_client_get_bool (client, GCONF_LOCKDOWN_PRINT, NULL)) { + ok_to_print = FALSE; + } /* File menu */ /* "FileOpen": always sensitive */ @@ -576,11 +590,11 @@ update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_windo } if (doc_title == NULL && ev_window->priv->uri) { - char *basename; + char *display_name; - basename = g_path_get_basename (ev_window->priv->uri); - doc_title = gnome_vfs_unescape_string_for_display (basename); - g_free (basename); + display_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri); + doc_title = g_path_get_basename (display_name); + g_free (display_name); } if (password_needed) { @@ -753,20 +767,21 @@ ev_window_popup_password_dialog (EvWindow *ev_window) update_window_title (ev_window->priv->password_document, NULL, ev_window); if (ev_window->priv->password_dialog == NULL) { - gchar *basename, *file_name; + gchar *base_name, *file_name; - basename = g_path_get_basename (ev_window->priv->password_uri); - file_name = gnome_vfs_unescape_string_for_display (basename); + file_name = gnome_vfs_format_uri_for_display (ev_window->priv->password_uri); + base_name = g_path_get_basename (file_name); ev_window->priv->password_dialog = - ev_password_dialog_new (GTK_WIDGET (ev_window), file_name); + ev_password_dialog_new (GTK_WIDGET (ev_window), base_name); + g_free (base_name); + g_free (file_name); + g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog), (gpointer *) &(ev_window->priv->password_dialog)); g_signal_connect (ev_window->priv->password_dialog, "response", G_CALLBACK (password_dialog_response), ev_window); - g_free (basename); - g_free (file_name); gtk_widget_show (ev_window->priv->password_dialog); } else { ev_password_dialog_set_bad_pass (ev_window->priv->password_dialog); @@ -868,11 +883,10 @@ ev_window_load_job_cb (EvJobLoad *job, ev_window->priv->password_document = g_object_ref (document); ev_window->priv->password_uri = g_strdup (job->uri); - base_name = g_path_get_basename (job->uri); - file_name = gnome_vfs_unescape_string_for_display (base_name); - + file_name = gnome_vfs_format_uri_for_display (job->uri); + base_name = g_path_get_basename (file_name); ev_password_view_set_file_name (EV_PASSWORD_VIEW (ev_window->priv->password_view), - file_name); + base_name); g_free (file_name); g_free (base_name); ev_window_set_page_mode (ev_window, PAGE_MODE_PASSWORD); @@ -943,6 +957,7 @@ setup_view_from_metadata (EvWindow *window) GValue dual_page = { 0, }; GValue presentation = { 0, }; GValue fullscreen = { 0, }; + GValue rotation = { 0, }; /* Window size */ if (!GTK_WIDGET_VISIBLE (window)) { @@ -1005,6 +1020,25 @@ setup_view_from_metadata (EvWindow *window) ev_window_run_fullscreen (window); } } + + /* Rotation */ + if (ev_metadata_manager_get (uri, "rotation", &rotation)) { + if (g_value_get_int (&rotation)) { + switch (g_value_get_int (&rotation)) { + case 90: + ev_view_set_rotation (view, 90); + break; + case 180: + ev_view_set_rotation (view, 180); + break; + case 270: + ev_view_set_rotation (view, 270); + break; + default: + break; + } + } + } } void @@ -1041,7 +1075,7 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window) GtkWidget *chooser; static char *folder = NULL; - chooser = gtk_file_chooser_dialog_new (_("Open document"), + chooser = gtk_file_chooser_dialog_new (_("Open Document"), GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, @@ -1199,7 +1233,8 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) GtkWidget *fc; gchar *uri; - gchar *basename; + gchar *base_name; + gchar *file_name; static char* folder = NULL; gboolean success; @@ -1220,9 +1255,11 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) folder); } - basename = g_path_get_basename (ev_window->priv->uri); - gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), basename); - g_free (basename); + file_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri); + base_name = g_path_get_basename (file_name); + gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name); + g_free (file_name); + g_free (base_name); gtk_widget_show (fc); @@ -1334,8 +1371,12 @@ save_print_config_to_file (GnomePrintConfig *config) file_name = g_build_filename (ev_dot_dir (), PRINT_CONFIG_FILENAME, NULL); - + +#ifdef HAVE_G_FILE_SET_CONTENTS g_file_set_contents (file_name, str, -1, NULL); +#else + ev_file_set_contents (file_name, str, -1, NULL); +#endif g_free (file_name); g_free (str); @@ -1555,6 +1596,9 @@ ev_window_update_fullscreen_popup (EvWindow *window) g_return_if_fail (popup != NULL); + if (GTK_WIDGET (window)->window == NULL) + return; + toolbar = (window->priv->chrome & EV_CHROME_TOOLBAR) != 0 || (window->priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0; popup_width = popup->requisition.width; @@ -2016,11 +2060,27 @@ ev_window_cmd_edit_toolbar_cb (GtkDialog *dialog, gint response, gpointer data) gtk_widget_destroy (GTK_WIDGET (dialog)); } +/* should these be hooked up to properties?? */ +static void +save_rotation_to_file (EvWindow *window) +{ + int rotation; + + if (window->priv->uri) { + rotation = ev_view_get_rotation (EV_VIEW (window->priv->view)); + ev_metadata_manager_set_int (window->priv->uri, "rotation", + rotation); + } + + +} + static void ev_window_cmd_edit_rotate_left (GtkAction *action, EvWindow *ev_window) { ev_view_rotate_left (EV_VIEW (ev_window->priv->view)); ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (ev_window->priv->sidebar_thumbs)); + save_rotation_to_file (ev_window); } static void @@ -2028,6 +2088,7 @@ ev_window_cmd_edit_rotate_right (GtkAction *action, EvWindow *ev_window) { ev_view_rotate_right (EV_VIEW (ev_window->priv->view)); ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (ev_window->priv->sidebar_thumbs)); + save_rotation_to_file (ev_window); } static void @@ -2195,6 +2256,7 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window) widget = gtk_window_get_focus (GTK_WINDOW (window)); if (widget && gtk_widget_get_ancestor (widget, EGG_TYPE_FIND_BAR)) { update_chrome_flag (window, EV_CHROME_FINDBAR, NULL, FALSE); + gtk_widget_grab_focus (window->priv->view); } else { gboolean fullscreen; gboolean presentation; @@ -2802,16 +2864,16 @@ static const GtkActionEntry entries[] = { { "Help", NULL, N_("_Help") }, /* File menu */ - { "FileOpen", GTK_STOCK_OPEN, NULL, "O", + { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "O", N_("Open an existing document"), G_CALLBACK (ev_window_cmd_file_open) }, { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), NULL, N_("Save the current document with a new filename"), G_CALLBACK (ev_window_cmd_save_as) }, - { "FilePrint", GTK_STOCK_PRINT, N_("Print..."), "P", + { "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "P", N_("Print this document"), G_CALLBACK (ev_window_cmd_file_print) }, - { "FileProperties", GTK_STOCK_PROPERTIES, N_("Properties"), "Return", + { "FileProperties", GTK_STOCK_PROPERTIES, N_("P_roperties"), "Return", N_("View the properties of this document"), G_CALLBACK (ev_window_cmd_file_properties) }, { "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "W", @@ -2939,7 +3001,7 @@ static const GtkToggleActionEntry toggle_entries[] = { { "ViewStatusbar", NULL, N_("_Statusbar"), NULL, N_("Show or hide the statusbar"), G_CALLBACK (ev_window_view_statusbar_cb), TRUE }, - { "ViewSidebar", NULL, N_("Side _pane"), "F9", + { "ViewSidebar", NULL, N_("Side _Pane"), "F9", N_("Show or hide the side pane"), G_CALLBACK (ev_window_view_sidebar_cb), TRUE }, { "ViewContinuous", EV_STOCK_VIEW_CONTINUOUS, N_("_Continuous"), NULL,