Print previewer: Multiple small fixes

- Remove MATE branding
- Switch to symbolic icons
- Give the toolbar a smaller icon size

Author: clefebvre

previewer/ev-previewer-window.c

@@ -1,4 +1,4 @@
-/* ev-previewer-window.c: 
+/* ev-previewer-window.c:
  *  this file is part of xreader, a generic document viewer
  *
  * Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
@@ -246,7 +246,7 @@ ev_previewer_window_enumerate_finished (EvPreviewerWindow *window)
 			     GTK_PRINT_ERROR_GENERAL,
 			     _("The selected printer '%s' could not be found"),
 			     gtk_print_settings_get_printer (window->print_settings));
-				     
+
 		ev_previewer_window_error_dialog_run (window, error);
 		g_error_free (error);
 	}
@@ -291,24 +291,24 @@ static const GtkActionEntry action_entries[] = {
 	{ "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "<control>W",
 	  NULL,
 	  G_CALLBACK (ev_previewer_window_close) },
-	{ "GoPreviousPage", GTK_STOCK_GO_UP, N_("_Previous Page"), "<control>Page_Up",
+	{ "GoPreviousPage", "go-previous-symbolic", N_("_Previous Page"), "<control>Page_Up",
           N_("Go to the previous page"),
           G_CALLBACK (ev_previewer_window_previous_page) },
-        { "GoNextPage", GTK_STOCK_GO_DOWN, N_("_Next Page"), "<control>Page_Down",
+        { "GoNextPage", "go-next-symbolic", N_("_Next Page"), "<control>Page_Down",
           N_("Go to the next page"),
           G_CALLBACK (ev_previewer_window_next_page) },
-        { "ViewZoomIn", GTK_STOCK_ZOOM_IN, NULL, "<control>plus",
+        { "ViewZoomIn", "zoom-in-symbolic", NULL, "<control>plus",
           N_("Enlarge the document"),
           G_CALLBACK (ev_previewer_window_zoom_in) },
-        { "ViewZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "<control>minus",
+        { "ViewZoomOut", "zoom-out-symbolic", NULL, "<control>minus",
           N_("Shrink the document"),
           G_CALLBACK (ev_previewer_window_zoom_out) },
-        { "ViewZoomReset", GTK_STOCK_ZOOM_100, NULL, "<control>0",
+        { "ViewZoomReset", "zoom-original-symbolic", NULL, "<control>0",
           N_("Original size"),
           G_CALLBACK (ev_previewer_window_zoom_reset) },
 #if GTKUNIXPRINT_ENABLED
 	/* translators: Print document currently shown in the Print Preview window */
-	{ "PreviewPrint", GTK_STOCK_PRINT, N_("Print"), NULL,
+	{ "PreviewPrint", "document-print-symbolic", N_("Print"), NULL,
 	  N_("Print this document"),
 	  G_CALLBACK (ev_previewer_window_print) }
 #endif
@@ -353,10 +353,10 @@ static const GtkActionEntry accel_entries[] = {
 };
 
 static const GtkToggleActionEntry toggle_action_entries[] = {
-	{ "ViewBestFit", EV_STOCK_ZOOM_PAGE, N_("_Best Fit"), NULL,
+	{ "ViewBestFit", "zoom-fit-best-symbolic", N_("_Best Fit"), NULL,
 	  N_("Make the current document fill the window"),
 	  G_CALLBACK (ev_previewer_window_zoom_best_fit) },
-	{ "ViewPageWidth", EV_STOCK_ZOOM_WIDTH, N_("Fit Page _Width"), NULL,
+	{ "ViewPageWidth", "view-paged-symbolic", N_("Fit Page _Width"), NULL,
 	  N_("Make the current document fill the window width"),
 	  G_CALLBACK (ev_previewer_window_zoom_page_width) }
 };
@@ -592,6 +592,7 @@ ev_previewer_window_constructor (GType                  type,
 	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 
 	toolbar = gtk_ui_manager_get_widget (window->ui_manager, "/PreviewToolbar");
+	gtk_toolbar_set_icon_size ( GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_SMALL_TOOLBAR);
 	gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, FALSE, 0);
 	gtk_widget_show (toolbar);
 

previewer/ev-previewer-window.h

@@ -1,5 +1,4 @@
-/* ev-previewer-window.h: 
- *  this file is part of xreader, a mate document viewer
+/* ev-previewer-window.h:
  *
  * Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
  *

previewer/ev-previewer.c

@@ -1,5 +1,4 @@
-/* ev-previewer.c: 
- *  this file is part of xreader, a mate document viewer
+/* ev-previewer.c:
  *
  * Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
  *
@@ -103,33 +102,30 @@ main (gint argc, gchar **argv)
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 #endif
-	
-	context = g_option_context_new (_("MATE Document Previewer"));
+
+	context = g_option_context_new (_("Print Preview"));
 	g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
 	g_option_context_add_main_entries (context, goption_options, GETTEXT_PACKAGE);
 
 	g_option_context_add_group (context, gtk_get_option_group (TRUE));
-	
+
 	if (!g_option_context_parse (context, &argc, &argv, &error)) {
 		g_warning ("Error parsing command line arguments: %s", error->message);
 		g_error_free (error);
 		g_option_context_free (context);
-
 		return 1;
 	}
 	g_option_context_free (context);
 
 	if (!filenames) {
 		g_warning ("File argument is required");
-		
 		return 1;
 	}
 
 	filename = filenames[0];
-	
+
 	if (!g_file_test (filename, G_FILE_TEST_IS_REGULAR)) {
 		g_warning ("Filename \"%s\" does not exist or is not a regular file", filename);
-
 		return 1;
 	}
 
@@ -138,21 +134,19 @@ main (gint argc, gchar **argv)
 
 	ev_stock_icons_init ();
 
-	g_set_application_name (_("MATE Document Previewer"));
+	g_set_application_name (_("Print Preview"));
 	gtk_window_set_default_icon_name ("xreader");
 
 	model = ev_document_model_new ();
 	window = ev_previewer_window_new (model);
 	ev_previewer_window_set_source_file (EV_PREVIEWER_WINDOW (window), filename);
 	ev_previewer_window_set_print_settings (EV_PREVIEWER_WINDOW (window), print_settings);
-	g_signal_connect (window, "delete-event",
-			  G_CALLBACK (gtk_main_quit), NULL);
-	g_signal_connect (window, "destroy",
-			  G_CALLBACK (gtk_main_quit), NULL);
+	g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL);
+	g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 	gtk_widget_show (window);
 
 	ev_previewer_load_document (filename, model);
-	
+
 	gtk_main ();
 
 	if (unlink_temp_file)
@@ -163,6 +157,6 @@ main (gint argc, gchar **argv)
 	ev_shutdown ();
 	ev_stock_icons_shutdown ();
 	g_object_unref (model);
-	
+
 	return 0;
 }

previewer/xreader-previewer.1

@@ -4,7 +4,7 @@ xreader\-previewer \- show print preview for a document
 .SH SYNOPSIS
 \fBxreader\-previewer\fR \fB[file]\fR 
 .SH DESCRIPTION
-xreader\-previewer is a MATE program to
+xreader\-previewer is a program to
 show print preview dialog for files supported by xreader.
 .SH OPTIONS
 xreader\-previewer obeys all normal GTK+ 
@@ -13,4 +13,4 @@ command line options.
 \fBxreader\fR(1),
 \fBgtk\-options\fR(7).
 .PP
-http://www.mate-desktop.org/
+https://www.github.com/linuxmint/xreader/