X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=4d76b6f2925b72be8e01a35ceddac18932f633ad;hb=13380e3af645c5597e22cc8e35d23acf3c7b4695;hp=9c74f3970fd45443ba53630e9fc860c9a01ae43e;hpb=67dbdd12a75b63b11f1a7ebe7324445ad17ceb13;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 9c74f397..4d76b6f2 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -94,6 +94,8 @@
 
 #include <string.h>
 
+char *xdg_user_dir_lookup (char *type);
+
 typedef enum {
 	PAGE_MODE_DOCUMENT,
 	PAGE_MODE_PASSWORD
@@ -898,8 +900,14 @@ setup_size_from_metadata (EvWindow *window)
         if (window->priv->page_cache &&
     	    ev_metadata_manager_get (uri, "window_width_ratio", &width_ratio, FALSE) &&
 	    ev_metadata_manager_get (uri, "window_height_ratio", &height_ratio, FALSE)) {
+		
 		gint document_width;
 		gint document_height;
+		
+		GdkScreen *screen;
+		
+		gint request_width;
+		gint request_height;
 
 		ev_page_cache_get_max_width (window->priv->page_cache, 
 					     0, 1.0,
@@ -908,9 +916,19 @@ setup_size_from_metadata (EvWindow *window)
 					     0, 1.0,
 					     &document_height);			
 		
+		request_width = g_value_get_double (&width_ratio) * document_width;
+		request_height = g_value_get_double (&height_ratio) * document_height;
+		
+		screen = gtk_window_get_screen (GTK_WINDOW (window));
+		
+		if (screen) {
+			request_width = MIN (request_width, gdk_screen_get_width (screen));
+			request_height = MIN (request_width, gdk_screen_get_height (screen));
+		}
+			        
 		gtk_window_resize (GTK_WINDOW (window),
-				   g_value_get_double (&width_ratio) * document_width,
-				   g_value_get_double (&height_ratio) * document_height);
+				   request_width,
+				   request_height);
 	    	g_value_unset (&width_ratio);
 		g_value_unset (&height_ratio);
 	}
@@ -1259,8 +1277,11 @@ ev_window_load_job_cb  (EvJobLoad *job,
 			g_object_unref (ev_window->priv->document);
 		ev_window->priv->document = g_object_ref (document);
 
-		if (!ev_window->priv->unlink_temp_file) {
+		if (job->mode != EV_WINDOW_MODE_PREVIEW) {
 			setup_view_from_metadata (ev_window);
+		}
+
+		if (!ev_window->priv->unlink_temp_file) {
 			ev_window_add_recent (ev_window, ev_window->priv->uri);
 		}
 
@@ -1491,6 +1512,13 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
 		gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (chooser),
 					  window->priv->uri);
 	}
+	else {
+		char *folder;
+		folder = xdg_user_dir_lookup ("DOCUMENTS");
+		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser),
+						     folder);
+		free (folder);
+	}
 	
 	g_signal_connect (chooser, "response",
 			  G_CALLBACK (file_open_dialog_response_cb),
@@ -1920,6 +1948,7 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 	GtkWidget *fc;
 	gchar *base_name;
 	gchar *file_name;
+	gchar *folder;
 
 	fc = gtk_file_chooser_dialog_new (
 		_("Save a Copy"),
@@ -1934,10 +1963,13 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 	gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER (fc), TRUE);	
 	file_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri);
 	base_name = g_path_get_basename (file_name);
+        folder = xdg_user_dir_lookup ("DOCUMENTS");
 	gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name);
+        gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (fc), folder);
 	g_free (file_name);
 	g_free (base_name);
-
+        free (folder);
+        
 	g_signal_connect (fc, "response",
 			  G_CALLBACK (file_save_dialog_response_cb),
 			  ev_window);
@@ -4056,7 +4088,7 @@ static const GtkActionEntry entries[] = {
 	{ "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "<control>O",
 	  N_("Open an existing document"),
 	  G_CALLBACK (ev_window_cmd_file_open) },
-	{ "FileOpenCopy", NULL, N_("Open a _Copy"), NULL,
+	{ "FileOpenCopy", NULL, N_("Op_en a Copy"), NULL,
 	  N_("Open a copy of the current document in a new window"),
 	  G_CALLBACK (ev_window_cmd_file_open_copy) },
        	{ "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), "<control>S",
@@ -4484,10 +4516,45 @@ launch_action (EvWindow *window, EvLinkAction *action)
 	   allowing to launch executables is a good idea though. -- marco */
 }
 
+static gboolean
+uri_is_valid (const gchar *uri)
+{
+	gchar *p = (gchar *) uri;
+	
+	if (!p || !g_ascii_isalpha (*p))
+		return FALSE;
+	
+	p++;
+	while (g_ascii_isalnum (*p))
+		p++;
+
+	return (g_ascii_strncasecmp (p, "://", strlen ("://")) == 0);
+}
+
 static void
 launch_external_uri (EvWindow *window, EvLinkAction *action)
 {
-	gnome_vfs_url_show (ev_link_action_get_uri (action));
+	const gchar *uri = ev_link_action_get_uri (action);
+	
+	if (!uri_is_valid (uri)) {
+		GtkWidget *dialog;
+
+		dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+						 GTK_DIALOG_DESTROY_WITH_PARENT,
+						 GTK_MESSAGE_ERROR,
+						 GTK_BUTTONS_CLOSE,
+						 _("Unable to open external link"));
+		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+							  _("Invalid URI: “%s”"), uri);
+		g_signal_connect (dialog, "response",
+				  G_CALLBACK (gtk_widget_destroy),
+				  NULL);
+		gtk_widget_show (dialog);
+
+		return;
+	}
+	
+	gnome_vfs_url_show (uri);
 }
 
 static void