...
 
Commits (23)
================
Evince 3.14.2
================
Bug fixes:
* Fix memory leak when adding new text annotations (Carlos Garcia
Campos)
* Add = and <Ctrl>= keybindings for zooming in (#738625, Lars
Uebernickel)
* Fix printing of landscape documents (#734788, Carlos Garcia
Campos)
* Fix a crash in recent-view when loading password protected
documents (#744049, Marek Kasik)
* Fix properties dialog shortcut (#739116, Boris Egorov)
* Bring back Open in new window action to the context menu
(#739046, Boris Egorov)
* Do not save n-copies when saving printing settings (#696203,
José Aliste)
* Use correct maximum size for thumbnail images in
evince-thumbnailer (#740877, Sebastian Keller)
* Fix a typo in configure.ac that made configure fail with
ligbnome-desktop (#733721, Marek Kasik)
* Correctly scroll to the search result selected by user when not
in continuous mode (#730252, Marek Kasik)
* Fix quoting issues in configure.ac (#739226, Alexander Tsoy)
* Fix runtime critical warning when starting in fullscreen mode
(#737864, Carlos Garcia Campos)
* Handle TIFF files reporting a 0 resolution (#646414, Gabor
Kelemen)
* Disable toggle-find action for documents not supporting find
(#738262, Carlos Garcia Campos)
Translation updates:
* Daniel Martinez (an)
* Christian Kirbach (de)
* Jiri Grönroos (fi)
================ ================
Evince 3.14.1 Evince 3.14.1
================ ================
......
...@@ -3206,7 +3206,7 @@ pdf_document_annotations_add_annotation (EvDocumentAnnotations *document_annotat ...@@ -3206,7 +3206,7 @@ pdf_document_annotations_add_annotation (EvDocumentAnnotations *document_annotat
annot_mapping->data = annot; annot_mapping->data = annot;
g_object_set_data_full (G_OBJECT (annot), g_object_set_data_full (G_OBJECT (annot),
"poppler-annot", "poppler-annot",
g_object_ref (poppler_annot), poppler_annot,
(GDestroyNotify) g_object_unref); (GDestroyNotify) g_object_unref);
if (pdf_document->annots) { if (pdf_document->annots) {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
m4_define([ev_major_version],[3]) m4_define([ev_major_version],[3])
m4_define([ev_minor_version],[14]) m4_define([ev_minor_version],[14])
m4_define([ev_micro_version],[1]) m4_define([ev_micro_version],[2])
m4_define([ev_extra_version],[]) m4_define([ev_extra_version],[])
m4_define([ev_version],[ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version]) m4_define([ev_version],[ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version])
...@@ -313,7 +313,7 @@ if test "$enable_gnome_desktop" != "no"; then ...@@ -313,7 +313,7 @@ if test "$enable_gnome_desktop" != "no"; then
PKG_CHECK_MODULES([LIBGNOME_DESKTOP], [gnome-desktop-3.0], has_libgnome_desktop=yes, has_libgnome_desktop=no) PKG_CHECK_MODULES([LIBGNOME_DESKTOP], [gnome-desktop-3.0], has_libgnome_desktop=yes, has_libgnome_desktop=no)
else else
PKG_CHECK_MODULES([LIBGNOME_DESKTOP], [gnome-desktop-3.0]) PKG_CHECK_MODULES([LIBGNOME_DESKTOP], [gnome-desktop-3.0])
has_libgnome_desktop = yes has_libgnome_desktop=yes
fi fi
if test x$has_libgnome_desktop = xyes; then if test x$has_libgnome_desktop = xyes; then
......
<page xmlns="http://projectmallard.org/1.0/" <page xmlns="http://projectmallard.org/1.0/"
xmlns:its="http://www.w3.org/2005/11/its"
type="topic" style="task" type="topic" style="task"
id="annotations-delete"> id="annotations-delete">
<info> <info>
<link type="guide" xref="index#annotations"/> <link type="guide" xref="index#annotations"/>
<desc>You can't remove annotations.</desc> <link type="seealso" xref="annotations-save"/>
<revision pkgversion="3.2" date="2011-09-05" status="final"/>
<revision pkgversion="3.14.0" date="2014-09-26" status="review"/>
<revision pkgversion="3.2" version="0.1" date="2011-09-05" status="final"/>
<credit type="author"> <credit type="author">
<name>Tiffany Antopolski</name> <name>David King</name>
<email>tiffany@antopolski.com</email> <email its:translate="no">davidk@gnome.org</email>
</credit> </credit>
<license>
<p>Creative Commons Share Alike 3.0</p>
</license>
<include href="legal-unported.xml" xmlns="http://www.w3.org/2001/XInclude"/>
<desc>Delete annotations from a PDF document.</desc>
</info> </info>
<title>Removing annotations</title> <title>Removing annotations</title>
<p>
You can't remove an annotation in the <app>document viewer</app> at this time. <p>An annotation is a note or comment added to a PDF document. You can remove
</p> annotations that you or other people have added.</p>
<steps>
<item>
<p>View a page that has an annotation. If you are not sure which pages
have annotations, find them in the
<link xref="annotations-navigate">annotation sidebar</link>.</p>
</item>
<item>
<p>Right-click on the annotation icon in the document, and click
<gui style="menuitem">Remove Annotation</gui></p>
</item>
<item>
<p>Save the changes to a new document by clicking the menu button in the
top right, followed by <gui style="menuitem">Save a Copy…</gui>.</p>
</item>
</steps>
</page> </page>
This diff is collapsed.
...@@ -8,15 +8,15 @@ ...@@ -8,15 +8,15 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: evince master\n" "Project-Id-Version: evince master\n"
"POT-Creation-Date: 2014-09-21 03:40+0000\n" "POT-Creation-Date: 2015-03-15 04:41+0000\n"
"PO-Revision-Date: 2014-09-21 11:37+0200\n" "PO-Revision-Date: 2015-03-15 11:09+0100\n"
"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n" "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n" "Language-Team: Hungarian <openscope at googlegroups dot com>\n"
"Language: hu\n" "Language: hu\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 1.4\n" "X-Generator: Lokalize 1.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
...@@ -33,18 +33,18 @@ msgstr "" ...@@ -33,18 +33,18 @@ msgstr ""
"A jegyzet szerzőjének. színének, stílusának vagy ikonjának személyre szabása." "A jegyzet szerzőjének. színének, stílusának vagy ikonjának személyre szabása."
#. (itstool) path: credit/name #. (itstool) path: credit/name
#: C/annotation-properties.page:11 C/annotations-delete.page:11 #: C/annotation-properties.page:11 C/annotations-disabled.page:11
#: C/annotations-disabled.page:11 C/annotations-navigate.page:11 #: C/annotations-navigate.page:11 C/annotations.page:11
#: C/annotations.page:11 C/annotations-save.page:10 C/bookmarks.page:13 #: C/annotations-save.page:10 C/bookmarks.page:13 C/bug-filing.page:11
#: C/bug-filing.page:11 C/commandline.page:15 C/develop.page:10 #: C/commandline.page:15 C/develop.page:10 C/documentation.page:9
#: C/documentation.page:9 C/duplex-10pages.page:12 C/duplex-11pages.page:12 #: C/duplex-10pages.page:12 C/duplex-11pages.page:12 C/duplex-12pages.page:12
#: C/duplex-12pages.page:12 C/duplex-13pages.page:12 C/duplex-14pages.page:12 #: C/duplex-13pages.page:12 C/duplex-14pages.page:12 C/duplex-15pages.page:12
#: C/duplex-15pages.page:12 C/duplex-16pages.page:12 C/duplex-3pages.page:12 #: C/duplex-16pages.page:12 C/duplex-3pages.page:12 C/duplex-4pages.page:12
#: C/duplex-4pages.page:12 C/duplex-5pages.page:12 C/duplex-6pages.page:12 #: C/duplex-5pages.page:12 C/duplex-6pages.page:12 C/duplex-7pages.page:12
#: C/duplex-7pages.page:12 C/duplex-8pages.page:12 C/duplex-9pages.page:12 #: C/duplex-8pages.page:12 C/duplex-9pages.page:12 C/duplex-npages.page:12
#: C/duplex-npages.page:12 C/forms.page:11 C/forms-saving.page:15 #: C/forms.page:11 C/forms-saving.page:15 C/index.page:18
#: C/index.page:18 C/introduction.page:12 C/openerror.page:13 #: C/introduction.page:12 C/openerror.page:13 C/opening.page:14
#: C/opening.page:14 C/print-booklet.page:12 C/shortcuts.page:15 #: C/print-booklet.page:12 C/shortcuts.page:15
#: C/singlesided-13-16pages.page:12 C/singlesided-17-20pages.page:12 #: C/singlesided-13-16pages.page:12 C/singlesided-17-20pages.page:12
#: C/singlesided-3-4pages.page:12 C/singlesided-5-8pages.page:12 #: C/singlesided-3-4pages.page:12 C/singlesided-5-8pages.page:12
#: C/singlesided-9-12pages.page:12 C/singlesided-npages.page:12 #: C/singlesided-9-12pages.page:12 C/singlesided-npages.page:12
...@@ -55,29 +55,28 @@ msgid "Tiffany Antopolski" ...@@ -55,29 +55,28 @@ msgid "Tiffany Antopolski"
msgstr "Tiffany Antopolski" msgstr "Tiffany Antopolski"
#. (itstool) path: license/p #. (itstool) path: license/p
#: C/annotation-properties.page:15 C/annotations-delete.page:15 #: C/annotation-properties.page:15 C/annotations-disabled.page:15
#: C/annotations-disabled.page:15 C/annotations-navigate.page:15 #: C/annotations-navigate.page:15 C/annotations.page:15
#: C/annotations.page:15 C/annotations-save.page:14 C/bookmarks.page:22 #: C/annotations-save.page:14 C/bookmarks.page:22 C/bug-filing.page:15
#: C/bug-filing.page:15 C/commandline.page:19 C/convertpdf.page:21 #: C/commandline.page:19 C/convertpdf.page:21 C/convertPostScript.page:21
#: C/convertPostScript.page:21 C/convertSVG.page:20 C/default-settings.page:15 #: C/convertSVG.page:20 C/default-settings.page:15 C/develop.page:15
#: C/develop.page:15 C/documentation.page:14 C/duplex-10pages.page:16 #: C/documentation.page:14 C/duplex-10pages.page:16 C/duplex-11pages.page:16
#: C/duplex-11pages.page:16 C/duplex-12pages.page:16 C/duplex-13pages.page:16 #: C/duplex-12pages.page:16 C/duplex-13pages.page:16 C/duplex-14pages.page:16
#: C/duplex-14pages.page:16 C/duplex-15pages.page:16 C/duplex-16pages.page:16 #: C/duplex-15pages.page:16 C/duplex-16pages.page:16 C/duplex-3pages.page:16
#: C/duplex-3pages.page:16 C/duplex-4pages.page:16 C/duplex-5pages.page:16 #: C/duplex-4pages.page:16 C/duplex-5pages.page:16 C/duplex-6pages.page:16
#: C/duplex-6pages.page:16 C/duplex-7pages.page:16 C/duplex-8pages.page:16 #: C/duplex-7pages.page:16 C/duplex-8pages.page:16 C/duplex-9pages.page:16
#: C/duplex-9pages.page:16 C/duplex-npages.page:16 C/editing.page:15 #: C/duplex-npages.page:16 C/editing.page:15 C/formats.page:22 C/forms.page:15
#: C/formats.page:22 C/forms.page:15 C/forms-saving.page:23 #: C/forms-saving.page:23 C/invert-colors.page:23 C/noprint.page:14
#: C/invert-colors.page:23 C/noprint.page:14 C/openerror.page:17 #: C/openerror.page:17 C/presentations.page:20 C/print-2sided.page:16
#: C/presentations.page:20 C/print-2sided.page:16 C/print-booklet.page:16 #: C/print-booklet.page:16 C/print-differentsize.page:15 C/printing.page:22
#: C/print-differentsize.page:15 C/printing.page:22 C/print-order.page:16 #: C/print-order.page:16 C/print-select.page:15 C/reload.page:18
#: C/print-select.page:15 C/reload.page:18 C/shortcuts.page:19 #: C/shortcuts.page:19 C/singlesided-13-16pages.page:16
#: C/singlesided-13-16pages.page:16 C/singlesided-17-20pages.page:16 #: C/singlesided-17-20pages.page:16 C/singlesided-3-4pages.page:16
#: C/singlesided-3-4pages.page:16 C/singlesided-5-8pages.page:16 #: C/singlesided-5-8pages.page:16 C/singlesided-9-12pages.page:16
#: C/singlesided-9-12pages.page:16 C/singlesided-npages.page:16 #: C/singlesided-npages.page:16 C/synctex-beamer.page:15
#: C/synctex-beamer.page:15 C/synctex-compile.page:15 #: C/synctex-compile.page:15 C/synctex-editors.page:15 C/synctex.page:16
#: C/synctex-editors.page:15 C/synctex.page:16 C/synctex-search.page:15 #: C/synctex-search.page:15 C/synctex-support.page:15 C/textselection.page:15
#: C/synctex-support.page:15 C/textselection.page:15 C/toolbar.page:18 #: C/toolbar.page:18 C/translate.page:19
#: C/translate.page:19
msgid "Creative Commons Share Alike 3.0" msgid "Creative Commons Share Alike 3.0"
msgstr "Creative Commons Share Alike 3.0" msgstr "Creative Commons Share Alike 3.0"
...@@ -136,24 +135,64 @@ msgstr "" ...@@ -136,24 +135,64 @@ msgstr ""
"<gui>vörösre</gui>. Jelenleg nincs lehetőség a jegyzettulajdonságok " "<gui>vörösre</gui>. Jelenleg nincs lehetőség a jegyzettulajdonságok "
"alapbeállításainak megváltoztatására." "alapbeállításainak megváltoztatására."
#. (itstool) path: credit/name
#: C/annotations-delete.page:14
msgid "David King"
msgstr "David King"
#. (itstool) path: info/desc #. (itstool) path: info/desc
#: C/annotations-delete.page:7 #: C/annotations-delete.page:20
msgid "You can't remove annotations." #| msgid "Right click on the annotation icon in the document."
msgstr "A jegyzetek nem távolíthatók el." msgid "Delete annotations from a PDF document."
msgstr "Jegyzetek törlése PDF-dokumentumból."
#. (itstool) path: page/title #. (itstool) path: page/title
#: C/annotations-delete.page:20 #: C/annotations-delete.page:23
msgid "Removing annotations" msgid "Removing annotations"
msgstr "Jegyzetek eltávolítása" msgstr "Jegyzetek eltávolítása"
#. (itstool) path: page/p #. (itstool) path: page/p
#: C/annotations-delete.page:21 #: C/annotations-delete.page:25
#| msgid ""
#| "An annotation is a note or comment added to a PDF document. You can add "
#| "annotations using the <app>document viewer</app>."
msgid ""
"An annotation is a note or comment added to a PDF document. You can remove "
"annotations that you or other people have added."
msgstr ""
"A jegyzet egy, a PDF-dokumentumhoz adott megjegyzés. Az Ön vagy mások által "
"készített jegyzetek eltávolíthatók."
#. (itstool) path: item/p
#: C/annotations-delete.page:30
msgid ""
"View a page that has an annotation. If you are not sure which pages have "
"annotations, find them in the <link xref=\"annotations-navigate\">annotation "
"sidebar</link>."
msgstr ""
"Nyisson meg egy jegyzetet tartalmazó oldalt. Ha nem biztos benne, hogy mely "
"oldalak tartalmaznak jegyzeteket, a <link xref=\"annotations-navigate"
"\">jegyzetek oldalsávon</link> megkeresheti ezeket."
#. (itstool) path: item/p
#: C/annotations-delete.page:35
#| msgid "Right click on the annotation icon in the document."
msgid ""
"Right-click on the annotation icon in the document, and click <gui style="
"\"menuitem\">Remove Annotation</gui>"
msgstr ""
"Kattintson a jobb egérgombbal a jegyzet ikonjára a dokumentumban, és "
"kattintson a <gui style=\"menuitem\">Jegyzet eltávolítása</gui> pontra."
#. (itstool) path: item/p
#: C/annotations-delete.page:39
msgid "" msgid ""
"You can't remove an annotation in the <app>document viewer</app> at this " "Save the changes to a new document by clicking the menu button in the top "
"time." "right, followed by <gui style=\"menuitem\">Save a Copy…</gui>."
msgstr "" msgstr ""
"Jelenleg nem távolíthatja el a jegyzeteket a <app>dokumentummegjelenítő</" "Mentse a változásokat egy új dokumentumba a jobb felső sarokban lévő menü "
"app> használatával." "gombra kattintással, és a <gui style=\"menuitem\">Másolat mentése…</gui> "
"menüpont kiválasztásával."
#. (itstool) path: info/desc #. (itstool) path: info/desc
#: C/annotations-disabled.page:7 #: C/annotations-disabled.page:7
...@@ -4708,6 +4747,16 @@ msgstr "" ...@@ -4708,6 +4747,16 @@ msgstr ""
"\">kezdőoldalán</link> megtalálja a magyar levelezőlista címét és a " "\">kezdőoldalán</link> megtalálja a magyar levelezőlista címét és a "
"fordítások megkezdéséhez szükséges információkat." "fordítások megkezdéséhez szükséges információkat."
#~ msgid "You can't remove annotations."
#~ msgstr "A jegyzetek nem távolíthatók el."
#~ msgid ""
#~ "You can't remove an annotation in the <app>document viewer</app> at this "
#~ "time."
#~ msgstr ""
#~ "Jelenleg nem távolíthatja el a jegyzeteket a <app>dokumentummegjelenítő</"
#~ "app> használatával."
#~ msgid "Scalable Vector Graphics (.svg)" #~ msgid "Scalable Vector Graphics (.svg)"
#~ msgstr "Scalable Vector Graphics (.svg)" #~ msgstr "Scalable Vector Graphics (.svg)"
......
This diff is collapsed.
...@@ -1824,27 +1824,6 @@ _print_context_get_hard_margins (GtkPrintContext *context, ...@@ -1824,27 +1824,6 @@ _print_context_get_hard_margins (GtkPrintContext *context,
} }
} }
static void
ev_print_operation_print_get_scaled_page_size (EvPrintOperationPrint *print,
gint page,
gdouble *width,
gdouble *height)
{
GtkPrintSettings *settings;
gdouble manual_scale;
ev_document_get_page_size (EV_PRINT_OPERATION (print)->document,
page, width, height);
settings = gtk_print_operation_get_print_settings (print->op);
manual_scale = gtk_print_settings_get_scale (settings) / 100.0;
if (manual_scale == 1.0)
return;
*width *= manual_scale;
*height *= manual_scale;
}
static void static void
ev_print_operation_print_draw_page (EvPrintOperationPrint *print, ev_print_operation_print_draw_page (EvPrintOperationPrint *print,
GtkPrintContext *context, GtkPrintContext *context,
...@@ -1855,7 +1834,6 @@ ev_print_operation_print_draw_page (EvPrintOperationPrint *print, ...@@ -1855,7 +1834,6 @@ ev_print_operation_print_draw_page (EvPrintOperationPrint *print,
gdouble cr_width, cr_height; gdouble cr_width, cr_height;
gdouble width, height, scale; gdouble width, height, scale;
gdouble x_scale, y_scale; gdouble x_scale, y_scale;
gdouble x_offset, y_offset;
gdouble top, bottom, left, right; gdouble top, bottom, left, right;
gtk_print_operation_set_defer_drawing (print->op); gtk_print_operation_set_defer_drawing (print->op);
...@@ -1879,16 +1857,12 @@ ev_print_operation_print_draw_page (EvPrintOperationPrint *print, ...@@ -1879,16 +1857,12 @@ ev_print_operation_print_draw_page (EvPrintOperationPrint *print,
cr = gtk_print_context_get_cairo_context (context); cr = gtk_print_context_get_cairo_context (context);
cr_width = gtk_print_context_get_width (context); cr_width = gtk_print_context_get_width (context);
cr_height = gtk_print_context_get_height (context); cr_height = gtk_print_context_get_height (context);
ev_print_operation_print_get_scaled_page_size (print, page, &width, &height); ev_document_get_page_size (op->document, page, &width, &height);
if (print->page_scale == EV_SCALE_NONE) { if (print->page_scale == EV_SCALE_NONE) {
/* Center document page on the printed page */ /* Center document page on the printed page */
if (print->autorotate) { if (print->autorotate)
x_offset = (cr_width - width) / 2; cairo_translate (cr, (cr_width - width) / 2, (cr_height - height) / 2);
y_offset = (cr_height - height) / 2;
cairo_device_to_user (cr, &x_offset, &y_offset);
cairo_translate (cr, x_offset, y_offset);
}
} else { } else {
_print_context_get_hard_margins (context, &top, &bottom, &left, &right); _print_context_get_hard_margins (context, &top, &bottom, &left, &right);
...@@ -1901,27 +1875,29 @@ ev_print_operation_print_draw_page (EvPrintOperationPrint *print, ...@@ -1901,27 +1875,29 @@ ev_print_operation_print_draw_page (EvPrintOperationPrint *print,
scale = 1.0; scale = 1.0;
if (print->autorotate) { if (print->autorotate) {
x_offset = (cr_width - scale * width) / 2; double left_right_sides, top_bottom_sides;
y_offset = (cr_height - scale * height) / 2;
cairo_device_to_user (cr, &x_offset, &y_offset); cairo_translate (cr, (cr_width - scale * width) / 2,
cairo_translate (cr, x_offset, y_offset); (cr_height - scale * height) / 2);
/* Ensure document page is within the margins. The /* Ensure document page is within the margins. The
* scale guarantees the document will fit in the * scale guarantees the document will fit in the
* margins so we just need to check each side and * margins so we just need to check each side and
* if it overhangs the margin, translate it to the * if it overhangs the margin, translate it to the
* margin. */ * margin. */
if (x_offset < left) left_right_sides = (cr_width - width*scale)/2;
cairo_translate (cr, left - x_offset, 0); top_bottom_sides = (cr_height - height*scale)/2;
if (left_right_sides < left)
cairo_translate (cr, left - left_right_sides, 0);
if (x_offset < right) if (left_right_sides < right)
cairo_translate (cr, -(right - x_offset), 0); cairo_translate (cr, -(right - left_right_sides), 0);
if (y_offset < top) if (top_bottom_sides < top)
cairo_translate (cr, 0, top - y_offset); cairo_translate (cr, 0, top - top_bottom_sides);
if (y_offset < bottom) if (top_bottom_sides < bottom)
cairo_translate (cr, 0, -(bottom - y_offset)); cairo_translate (cr, 0, -(bottom - top_bottom_sides));
} else { } else {
cairo_translate (cr, left, top); cairo_translate (cr, left, top);
} }
......
...@@ -8158,6 +8158,9 @@ jump_to_find_page (EvView *view, EvViewFindDirection direction, gint shift) ...@@ -8158,6 +8158,9 @@ jump_to_find_page (EvView *view, EvViewFindDirection direction, gint shift)
break; break;
} }
} }
if (!view->continuous)
ev_document_model_set_page (view->model, view->find_page);
} }
static void static void
...@@ -8247,6 +8250,8 @@ ev_view_find_next (EvView *view) ...@@ -8247,6 +8250,8 @@ ev_view_find_next (EvView *view)
if (view->find_result >= n_results) { if (view->find_result >= n_results) {
view->find_result = 0; view->find_result = 0;
jump_to_find_page (view, EV_VIEW_FIND_NEXT, 1); jump_to_find_page (view, EV_VIEW_FIND_NEXT, 1);
} else if (view->find_page != view->current_page) {
jump_to_find_page (view, EV_VIEW_FIND_NEXT, 0);
} }
jump_to_find_result (view); jump_to_find_result (view);
...@@ -8261,6 +8266,8 @@ ev_view_find_previous (EvView *view) ...@@ -8261,6 +8266,8 @@ ev_view_find_previous (EvView *view)
if (view->find_result < 0) { if (view->find_result < 0) {
jump_to_find_page (view, EV_VIEW_FIND_PREV, -1); jump_to_find_page (view, EV_VIEW_FIND_PREV, -1);
view->find_result = MAX (0, ev_view_find_get_n_results (view, view->find_page) - 1); view->find_result = MAX (0, ev_view_find_get_n_results (view, view->find_page) - 1);
} else if (view->find_page != view->current_page) {
jump_to_find_page (view, EV_VIEW_FIND_PREV, 0);
} }
jump_to_find_result (view); jump_to_find_result (view);
...@@ -8282,6 +8289,7 @@ ev_view_find_set_result (EvView *view, gint page, gint result) ...@@ -8282,6 +8289,7 @@ ev_view_find_set_result (EvView *view, gint page, gint result)
{ {
view->find_page = page; view->find_page = page;
view->find_result = result; view->find_result = result;
jump_to_find_page (view, EV_VIEW_FIND_NEXT, 0);
jump_to_find_result (view); jump_to_find_result (view);
gtk_widget_queue_draw (GTK_WIDGET (view)); gtk_widget_queue_draw (GTK_WIDGET (view));
} }
......
...@@ -10,6 +10,7 @@ bg ...@@ -10,6 +10,7 @@ bg
bn bn
bn_IN bn_IN
br br
bs
ca ca
ca@valencia ca@valencia
cs cs
...@@ -37,6 +38,7 @@ he ...@@ -37,6 +38,7 @@ he
hi hi
hu hu
id id
is
it it
ja ja
ka ka
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -1051,6 +1051,7 @@ ev_application_startup (GApplication *gapplication) ...@@ -1051,6 +1051,7 @@ ev_application_startup (GApplication *gapplication)
"win.open-copy", "<Ctrl>N", NULL, "win.open-copy", "<Ctrl>N", NULL,
"win.save-copy", "<Ctrl>S", NULL, "win.save-copy", "<Ctrl>S", NULL,
"win.print", "<Ctrl>P", NULL, "win.print", "<Ctrl>P", NULL,
"win.show-properties", "<alt>Return", NULL,
"win.copy", "<Ctrl>C", "<Ctrl>Insert", NULL, "win.copy", "<Ctrl>C", "<Ctrl>Insert", NULL,
"win.select-all", "<Ctrl>A", NULL, "win.select-all", "<Ctrl>A", NULL,
"win.save-settings", "<Ctrl>T", NULL, "win.save-settings", "<Ctrl>T", NULL,
...@@ -1061,7 +1062,7 @@ ev_application_startup (GApplication *gapplication) ...@@ -1061,7 +1062,7 @@ ev_application_startup (GApplication *gapplication)
"win.find-next", "<Ctrl>G", NULL, "win.find-next", "<Ctrl>G", NULL,
"win.find-previous", "<Ctrl><Shift>G", NULL, "win.find-previous", "<Ctrl><Shift>G", NULL,
"win.select-page", "<Ctrl>L", NULL, "win.select-page", "<Ctrl>L", NULL,
"win.go-backward", "<Shift>Page_Up", NULL, "win.go-backwards", "<Shift>Page_Up", NULL,
"win.go-forward", "<Shift>Page_Down", NULL, "win.go-forward", "<Shift>Page_Down", NULL,
"win.go-next-page", "n", NULL, "win.go-next-page", "n", NULL,
"win.go-previous-page", "p", NULL, "win.go-previous-page", "p", NULL,
...@@ -1071,7 +1072,7 @@ ev_application_startup (GApplication *gapplication) ...@@ -1071,7 +1072,7 @@ ev_application_startup (GApplication *gapplication)
"win.sizing-mode::fit-width", "w", NULL, "win.sizing-mode::fit-width", "w", NULL,
"win.open-menu", "F10", NULL, "win.open-menu", "F10", NULL,
"win.caret-navigation", "F7", NULL, "win.caret-navigation", "F7", NULL,
"win.zoom-in", "plus", "<Ctrl>plus", "KP_Add", "<Ctrl>KP_Add", NULL, "win.zoom-in", "plus", "<Ctrl>plus", "KP_Add", "<Ctrl>KP_Add", "equal", "<Ctrl>equal", NULL,
"win.zoom-out", "minus", "<Ctrl>minus", "KP_Subtract", "<Ctrl>KP_Subtract", NULL, "win.zoom-out", "minus", "<Ctrl>minus", "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
"win.show-side-pane", "F9", NULL, "win.show-side-pane", "F9", NULL,
"win.fullscreen", "F11", NULL, "win.fullscreen", "F11", NULL,
......
...@@ -366,7 +366,8 @@ document_load_job_completed_callback (EvJobLoad *job_load, ...@@ -366,7 +366,8 @@ document_load_job_completed_callback (EvJobLoad *job_load,
EvRecentViewPrivate *priv = data->ev_recent_view->priv; EvRecentViewPrivate *priv = data->ev_recent_view->priv;
EvDocument *document = EV_JOB (job_load)->document; EvDocument *document = EV_JOB (job_load)->document;
if (g_cancellable_is_cancelled (data->cancellable) || !document) { if (g_cancellable_is_cancelled (data->cancellable) ||
ev_job_is_failed (EV_JOB (job_load))) {
get_document_info_async_data_free (data); get_document_info_async_data_free (data);
return; return;
} }
......
...@@ -279,7 +279,6 @@ struct _EvWindowPrivate { ...@@ -279,7 +279,6 @@ struct _EvWindowPrivate {
#define FIND_PAGE_RATE_REFRESH 100 #define FIND_PAGE_RATE_REFRESH 100
static const gchar *document_print_settings[] = { static const gchar *document_print_settings[] = {
GTK_PRINT_SETTINGS_N_COPIES,
GTK_PRINT_SETTINGS_COLLATE, GTK_PRINT_SETTINGS_COLLATE,
GTK_PRINT_SETTINGS_REVERSE, GTK_PRINT_SETTINGS_REVERSE,
GTK_PRINT_SETTINGS_NUMBER_UP, GTK_PRINT_SETTINGS_NUMBER_UP,
...@@ -3080,6 +3079,9 @@ ev_window_save_print_settings (EvWindow *window, ...@@ -3080,6 +3079,9 @@ ev_window_save_print_settings (EvWindow *window,
key_file = get_print_settings_file (); key_file = get_print_settings_file ();
gtk_print_settings_to_key_file (print_settings, key_file, EV_PRINT_SETTINGS_GROUP); gtk_print_settings_to_key_file (print_settings, key_file, EV_PRINT_SETTINGS_GROUP);
/* Always Remove n_copies from global settings */
g_key_file_remove_key (key_file, EV_PRINT_SETTINGS_GROUP, GTK_PRINT_SETTINGS_N_COPIES, NULL);
/* Save print settings that are specific to the document */ /* Save print settings that are specific to the document */
for (i = 0; i < G_N_ELEMENTS (document_print_settings); i++) { for (i = 0; i < G_N_ELEMENTS (document_print_settings); i++) {
/* Remove it from global settings */ /* Remove it from global settings */
......
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
</item> </item>
<item> <item>
<attribute name="label" translatable="yes">Open in New _Window</attribute> <attribute name="label" translatable="yes">Open in New _Window</attribute>
<attribute name="action">win.open-link-in-window</attribute> <attribute name="action">win.open-link-new-window</attribute>
<attribute name='hidden-when'>action-disabled</attribute> <attribute name='hidden-when'>action-disabled</attribute>
</item> </item>
</section> </section>
......
...@@ -177,7 +177,7 @@ evince_thumbnail_pngenc_get (EvDocument *document, const char *thumbnail, int si ...@@ -177,7 +177,7 @@ evince_thumbnail_pngenc_get (EvDocument *document, const char *thumbnail, int si
ev_document_get_page_size (document, 0, &width, &height); ev_document_get_page_size (document, 0, &width, &height);
rc = ev_render_context_new (page, 0, size / width); rc = ev_render_context_new (page, 0, size / MAX (height, width));
pixbuf = ev_document_get_thumbnail (document, rc); pixbuf = ev_document_get_thumbnail (document, rc);
g_object_unref (rc); g_object_unref (rc);
g_object_unref (page); g_object_unref (page);
......