X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=836bc918a4b4e100e77e392387d6b88a8be04df0;hb=f7a5d890679d9ad31bd15a0ef2fcd39ec5e58726;hp=29141d224a588b9b73dcc2d95400be296efefc43;hpb=d93ec57b2282ee22ade99eba434e1b13de80bcf3;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 29141d22..836bc918 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -43,6 +43,7 @@
 #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"
@@ -59,6 +60,7 @@
 #include "ev-application.h"
 #include "ev-stock-icons.h"
 #include "ev-file-helpers.h"
+
 #include <poppler.h>
 
 #include <glib/gi18n.h>
@@ -211,13 +213,18 @@ update_action_sensitivity (EvWindow *ev_window)
 	int n_pages = 0, page = -1;
 	gboolean ok_to_print = TRUE;
 	gboolean ok_to_copy = TRUE;
+	gboolean has_properties = TRUE;
 
 	view = EV_VIEW (ev_window->priv->view);
+
 	document = ev_window->priv->document;
+
 	if (document)
 		info = ev_page_cache_get_info (ev_window->priv->page_cache);
+
 	page_mode = ev_window->priv->page_mode;
 	has_document = document != NULL;
+
 	if (has_document && ev_window->priv->page_cache) {
 		page = ev_page_cache_get_current_page (ev_window->priv->page_cache);
 		n_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache);
@@ -229,11 +236,15 @@ update_action_sensitivity (EvWindow *ev_window)
 		ok_to_copy = (info->permissions & EV_DOCUMENT_PERMISSIONS_OK_TO_COPY);
 	}
 
+	if (!info || info->fields_mask == 0) {
+		has_properties = FALSE;
+	}
+
 	/* File menu */
 	/* "FileOpen": always sensitive */
 	set_action_sensitive (ev_window, "FileSaveAs", has_document && ok_to_copy);
 	set_action_sensitive (ev_window, "FilePrint", has_pages && ok_to_print);
-	set_action_sensitive (ev_window, "FileProperties", has_document);
+	set_action_sensitive (ev_window, "FileProperties", has_document && has_properties);
 	/* "FileCloseWindow": always sensitive */
 
         /* Edit menu */
@@ -246,6 +257,8 @@ update_action_sensitivity (EvWindow *ev_window)
 			      has_pages && EV_IS_DOCUMENT_FIND (document));
 	set_action_sensitive (ev_window, "EditFindNext",
 			      ev_view_can_find_next (view));
+	set_action_sensitive (ev_window, "EditRotateLeft", has_document);
+	set_action_sensitive (ev_window, "EditRotateRight", has_document);
 
         /* View menu */
 	set_action_sensitive (ev_window, "ViewContinuous", has_pages);
@@ -1088,8 +1101,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 (
@@ -1100,18 +1116,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);
 
@@ -1133,6 +1148,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);
 }
 
@@ -2164,7 +2185,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
 		"name", _("Evince"),
 		"version", VERSION,
 		"copyright",
-		_("\xc2\xa9 1996-2004 The Evince authors"),
+		_("\xc2\xa9 1996-2005 The Evince authors"),
 		"license", license_trans,
 		"website", "http://www.gnome.org/projects/evince",
 		"comments", comments,
@@ -2206,17 +2227,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");