diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | NEWS | 37 | ||||
| -rw-r--r-- | backend/djvu/meson.build | 2 | ||||
| -rw-r--r-- | backend/dvi/meson.build | 2 | ||||
| -rw-r--r-- | backend/epub/meson.build | 2 | ||||
| -rw-r--r-- | backend/pdf/meson.build | 2 | ||||
| -rw-r--r-- | backend/pixbuf/meson.build | 2 | ||||
| -rw-r--r-- | backend/ps/meson.build | 2 | ||||
| -rw-r--r-- | backend/tiff/meson.build | 2 | ||||
| -rw-r--r-- | backend/xps/meson.build | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | help/es/es.po | 2 | ||||
| -rw-r--r-- | help/fr/fr.po | 7 | ||||
| -rw-r--r-- | help/pl/pl.po | 2 | ||||
| -rw-r--r-- | help/pt_BR/pt_BR.po | 13 | ||||
| -rw-r--r-- | libdocument/meson.build | 2 | ||||
| -rw-r--r-- | libview/ev-jobs.c | 122 | ||||
| -rw-r--r-- | libview/meson.build | 4 | ||||
| -rw-r--r-- | meson.build | 6 | ||||
| -rw-r--r-- | po/eo.po | 2 | ||||
| -rw-r--r-- | po/es.po | 2 | ||||
| -rw-r--r-- | po/fr.po | 6 | ||||
| -rw-r--r-- | po/kab.po | 9 | ||||
| -rw-r--r-- | po/nan.po | 4 | ||||
| -rw-r--r-- | po/nds.po | 8 | ||||
| -rw-r--r-- | po/pl.po | 2 | ||||
| -rw-r--r-- | po/uk.po | 4 | ||||
| -rw-r--r-- | shell/ev-sidebar-thumbnails.c | 6 | ||||
| -rw-r--r-- | shell/ev-window.c | 3 | ||||
| -rwxr-xr-x | test-driver | 148 |
30 files changed, 99 insertions, 310 deletions
diff --git a/.travis.yml b/.travis.yml index ea4fbcfe..c5bacb9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ deploy: - provider: pages edge: branch: v2.0.5 - token: $GITHUB_TOKEN + github_token: $GITHUB_TOKEN keep_history: false committer_from_gh: true target_branch: gh-pages @@ -1,9 +1,44 @@ +### atril 1.28.2 + * Translations update + * epub: Disable thumbnailing sidebar + * (meson) fix: rename all backend files + * (meson) fix: generate dbus generated with the correct prefix + * (meson) fix: building atrild with explicit sources + * (meson) fix: building atril target + * (meson) fix: shell/meson.build missing files + * (meson) fix: correct dependeny on mate-submodules + * (meson) fix: properly build cut-n-paste/toolbar-editor + * (meson) fix: add missing properties/meson.build + * (meson) fix all build errors with meson + * (meson) fix more build errors + * (meson) fix more build errors + * (meson) fix: disable maintainer mode per default + * (meson) fix: #error "Only <atril-document.h> can be included directly." + * (meson) fix: libdocument! meson automatically adds lib prefix + * (meson) chore: clean references to xreader + * (meson) chore: add subprojects/mate-submodules.wrap + * (meson) fix: remove non existing source in shell + * (meson) fix: correct typo missing .in in filename + * (meson) fix: use mate-submodules correctly + * (meson) chore: fix warnings for meson.build + * (meson) chore: pin meson version, add missing ATRIL_MIME_TYPES + * (meson) chore: reorganinze meson.build + * (meson) chore: add maintainer mode + * (meson) chore: remove unused intltool + * (meson) meson: make ps and epub optional backends + * (meson) Initial support for meson + * Fix .cbr mimetype + * Wayland: stop segfaults on some systems + * replace deprecated gtk_menu_tool_button_new_from_stock + * libview/ev-document-model.c remove one more deprecation warning + * replace ev_document_model_get_dual_page with + ### atril 1.28.1 * Translations update * Update CBR library to libarchive in README.md * ci: fix travis build failures caused by recent travis changes * Cleanup icons Makefile - * icons: Include higher resolution icons (#608) + * icons: Include higher resolution icons (#608) ### atril 1.28.0 diff --git a/backend/djvu/meson.build b/backend/djvu/meson.build index 25ce393c..011503e3 100644 --- a/backend/djvu/meson.build +++ b/backend/djvu/meson.build @@ -28,7 +28,7 @@ shared_module( i18n.merge_file( input: 'djvudocument.atril-backend.desktop.in', - output: 'djvudocument.atril-backed', + output: 'djvudocument.atril-backend', type: 'desktop', po_dir: po_dir, install: true, diff --git a/backend/dvi/meson.build b/backend/dvi/meson.build index 4ea861d4..8b4d0ed0 100644 --- a/backend/dvi/meson.build +++ b/backend/dvi/meson.build @@ -33,7 +33,7 @@ shared_module( i18n.merge_file( input: 'dvidocument.atril-backend.desktop.in', - output: 'dvidocument.atril-backed', + output: 'dvidocument.atril-backend', type: 'desktop', po_dir: po_dir, install: true, diff --git a/backend/epub/meson.build b/backend/epub/meson.build index 5e3f00b0..7249286b 100644 --- a/backend/epub/meson.build +++ b/backend/epub/meson.build @@ -27,7 +27,7 @@ shared_module( i18n.merge_file( input: 'epubdocument.atril-backend.desktop.in', - output: 'epubdocument.atril-backed', + output: 'epubdocument.atril-backend', type: 'desktop', po_dir: po_dir, install: true, diff --git a/backend/pdf/meson.build b/backend/pdf/meson.build index 489cc649..2a81d71a 100644 --- a/backend/pdf/meson.build +++ b/backend/pdf/meson.build @@ -22,7 +22,7 @@ shared_module( i18n.merge_file( input: 'pdfdocument.atril-backend.desktop.in', - output: 'pdfdocument.atril-backed', + output: 'pdfdocument.atril-backend', type: 'desktop', po_dir: po_dir, install: true, diff --git a/backend/pixbuf/meson.build b/backend/pixbuf/meson.build index 1b0af653..68afb36f 100644 --- a/backend/pixbuf/meson.build +++ b/backend/pixbuf/meson.build @@ -22,7 +22,7 @@ shared_module( i18n.merge_file( input: 'pixbuf.atril-backend.desktop.in', - output: 'pixbuf.atril-backed', + output: 'pixbuf.atril-backend', type: 'desktop', po_dir: po_dir, install: true, diff --git a/backend/ps/meson.build b/backend/ps/meson.build index e0f57df2..ba8ea301 100644 --- a/backend/ps/meson.build +++ b/backend/ps/meson.build @@ -23,7 +23,7 @@ shared_module( i18n.merge_file( input: 'psdocument.atril-backend.desktop.in', - output: 'psdocument.atril-backed', + output: 'psdocument.atril-backend', type: 'desktop', po_dir: po_dir, install: true, diff --git a/backend/tiff/meson.build b/backend/tiff/meson.build index 96b9dbd1..04f8f462 100644 --- a/backend/tiff/meson.build +++ b/backend/tiff/meson.build @@ -26,7 +26,7 @@ shared_module( i18n.merge_file( input: 'tiffdocument.atril-backend.desktop.in', - output: 'tiffdocument.atril-backed', + output: 'tiffdocument.atril-backend', type: 'desktop', po_dir: po_dir, install: true, diff --git a/backend/xps/meson.build b/backend/xps/meson.build index 41c65bba..3dfc45e0 100644 --- a/backend/xps/meson.build +++ b/backend/xps/meson.build @@ -23,7 +23,7 @@ shared_module( i18n.merge_file( input: 'xpsdocument.atril-backend.desktop.in', - output: 'xpsdocument.atril-backed', + output: 'xpsdocument.atril-backend', type: 'desktop', po_dir: po_dir, install: true, diff --git a/configure.ac b/configure.ac index b8ccda8a..65d1c05d 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ m4_define([ev_major_version], [1]) m4_define([ev_minor_version], [28]) -m4_define([ev_micro_version], [1]) +m4_define([ev_micro_version], [2]) m4_define([ev_extra_version], []) m4_define([ev_version], [ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version]) diff --git a/help/es/es.po b/help/es/es.po index fdf9b5b6..e13dc0e6 100644 --- a/help/es/es.po +++ b/help/es/es.po @@ -9,7 +9,7 @@ # Emiliano Fascetti, 2021 # Toni Estévez <[email protected]>, 2021 # Joaquín Ruiz Luque, 2022 -# Albireo67 <[email protected]>, 2022 +# e8719986fb0e918e5504827f4b7020b9_54697cc <5c2a49c554c358fed470d27243585bdf_851518>, 2022 # Francisco Serrador, 2023 # msgid "" diff --git a/help/fr/fr.po b/help/fr/fr.po index ae74674e..acfff26c 100644 --- a/help/fr/fr.po +++ b/help/fr/fr.po @@ -10,13 +10,14 @@ # Yoshida Shouyou, 2021 # clefebvre <[email protected]>, 2021 # Adrien Golinelli, 2022 +# David D, 2025 # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2023-08-31 17:43+0200\n" "PO-Revision-Date: 2018-09-18 09:08+0000\n" -"Last-Translator: Adrien Golinelli, 2022\n" +"Last-Translator: David D, 2025\n" "Language-Team: French (https://app.transifex.com/mate/teams/13566/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2307,7 +2308,7 @@ msgstr "Imprime le document actuel." #. (itstool) path: td/p #: C/shortcuts.page:67 msgid "<keyseq><key>Ctrl</key><key>P</key></keyseq>" -msgstr "" +msgstr "<keyseq><key>Ctrl</key><key>P</key></keyseq>" #. (itstool) path: td/p #: C/shortcuts.page:70 @@ -2327,7 +2328,7 @@ msgstr "" #. (itstool) path: td/p #: C/shortcuts.page:76 msgid "<keyseq><key>Ctrl</key><key>R</key></keyseq>" -msgstr "" +msgstr "<keyseq><key>Ctrl</key><key>R</key></keyseq>" #. (itstool) path: td/p #: C/shortcuts.page:85 diff --git a/help/pl/pl.po b/help/pl/pl.po index f07039a5..c8a95874 100644 --- a/help/pl/pl.po +++ b/help/pl/pl.po @@ -1,7 +1,7 @@ # # Translators: # Piotr Drąg <[email protected]>, 2018 -# Piotr Strębski <[email protected]>, 2018 +# Piotr Strebski <[email protected]>, 2018 # Stefano Karapetsas <[email protected]>, 2021 # Michal Herman <[email protected]>, 2021 # Marcin Kralka <[email protected]>, 2021 diff --git a/help/pt_BR/pt_BR.po b/help/pt_BR/pt_BR.po index 020440c3..4e5ead30 100644 --- a/help/pt_BR/pt_BR.po +++ b/help/pt_BR/pt_BR.po @@ -8,15 +8,15 @@ # George Silva <[email protected]>, 2021 # Aldo Oliveira <[email protected]>, 2021 # Vitor Henrique, 2023 -# Davi Ricieri, 2024 # Antonio Neto, 2024 +# Davi Ricieri, 2025 # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2023-08-31 17:43+0200\n" "PO-Revision-Date: 2018-09-18 09:08+0000\n" -"Last-Translator: Antonio Neto, 2024\n" +"Last-Translator: Davi Ricieri, 2025\n" "Language-Team: Portuguese (Brazil) (https://app.transifex.com/mate/teams/13566/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -700,7 +700,7 @@ msgstr "atril --fullscreen arquivo.pdf" #. (itstool) path: section/title #: C/commandline.page:54 msgid "Opening a document in presentation mode" -msgstr "" +msgstr "Abrindo um documento no modo de apresentação" #. (itstool) path: section/screen #: C/commandline.page:55 @@ -711,7 +711,7 @@ msgstr "atril --presentation arquivo.pdf" #. (itstool) path: section/title #: C/commandline.page:58 msgid "Opening a document in preview mode" -msgstr "" +msgstr "Abrindo um documento no modo de visualização" #. (itstool) path: section/screen #: C/commandline.page:59 @@ -722,7 +722,7 @@ msgstr "atril --preview arquivo.pdf" #. (itstool) path: info/desc #: C/convertpdf.page:7 msgid "You can convert a document to PDF by \"printing\" it to a file." -msgstr "" +msgstr "Você pode converter um documento PDF \"imprimindo\" ele para um arquivo." #. (itstool) path: credit/name #: C/convertpdf.page:14 C/convertPostScript.page:14 C/convertSVG.page:14 @@ -768,6 +768,9 @@ msgid "" "style=\"menuitem\">Print</gui></guiseq> and select <gui>Print</gui> or press" " <keyseq><key>Ctrl</key><key>P</key></keyseq> on your keyboard." msgstr "" +"Vá para <guiseq><gui style=\"menuitem\">Arquivo</gui> <gui " +"style=\"menuitem\">Imprimir</gui></guiseq> e selecione <gui>Imprimir</gui> " +"ou pressione <keyseq><key>Ctrl</key><key>P</key></keyseq> no seu teclado." #. (itstool) path: item/p #: C/convertpdf.page:45 C/forms-saving.page:65 diff --git a/libdocument/meson.build b/libdocument/meson.build index b19242e3..f93ccd3c 100644 --- a/libdocument/meson.build +++ b/libdocument/meson.build @@ -124,7 +124,7 @@ libdocument_deps = [ ] libdocument = library( - 'document', + 'atrildocument', libdocument_private_headers + libdocument_sources, dependencies: libdocument_deps, include_directories: include_root, diff --git a/libview/ev-jobs.c b/libview/ev-jobs.c index 5db40cab..8e33ee5d 100644 --- a/libview/ev-jobs.c +++ b/libview/ev-jobs.c @@ -41,9 +41,6 @@ #include "ev-debug.h" #include <gtk/gtk.h> -#if ENABLE_EPUB -#include <webkit2/webkit2.h> -#endif #include <errno.h> #include <glib/gstdio.h> #include <glib/gi18n-lib.h> @@ -823,77 +820,6 @@ ev_job_thumbnail_dispose (GObject *object) (* G_OBJECT_CLASS (ev_job_thumbnail_parent_class)->dispose) (object); } -#if ENABLE_EPUB -static void -snapshot_callback(WebKitWebView *webview, - GAsyncResult *results, - EvJobThumbnail *job_thumb) -{ - GError *error = NULL; - - ev_document_doc_mutex_lock (); - - EvPage *page = ev_document_get_page (EV_JOB(job_thumb)->document, job_thumb->page); - job_thumb->surface = webkit_web_view_get_snapshot_finish (webview, - results, - &error); - - if (error) { - g_warning ("Error retrieving a snapshot: %s", error->message); - } - - EvRenderContext *rc = ev_render_context_new (page, job_thumb->rotation, job_thumb->scale); - EvPage *screenshotpage; - screenshotpage = ev_page_new(job_thumb->page); - screenshotpage->backend_page = (EvBackendPage)job_thumb->surface; - screenshotpage->backend_destroy_func = (EvBackendPageDestroyFunc)cairo_surface_destroy; - ev_render_context_set_page(rc,screenshotpage); - - job_thumb->thumbnail = ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (EV_JOB(job_thumb)->document), - rc, TRUE); - g_object_unref(screenshotpage); - g_object_unref(rc); - - ev_document_doc_mutex_unlock (); - ev_job_succeeded (EV_JOB(job_thumb)); - - gtk_widget_destroy (gtk_widget_get_toplevel (GTK_WIDGET (webview))); -} - -static void -web_thumbnail_get_screenshot_cb (WebKitWebView *webview, - WebKitLoadEvent event, - EvJobThumbnail *job_thumb) -{ - if (event != WEBKIT_LOAD_FINISHED || ev_job_is_failed (EV_JOB(job_thumb))) { - return; - } - - webkit_web_view_get_snapshot (webview, - WEBKIT_SNAPSHOT_REGION_VISIBLE, - WEBKIT_SNAPSHOT_OPTIONS_NONE, - NULL, - (GAsyncReadyCallback)snapshot_callback, - g_object_ref (job_thumb)); -} - -static gboolean -webview_load_failed_cb (WebKitWebView *webview, - WebKitLoadEvent event, - gchar *failing_uri, - gpointer error, - EvJobThumbnail *job_thumb) -{ - GError *e = (GError *) error; - g_warning ("Error loading data from %s: %s", failing_uri, e->message); - ev_job_failed_from_error (EV_JOB(job_thumb), e); - - gtk_widget_destroy (gtk_widget_get_toplevel (GTK_WIDGET (webview))); - return TRUE; -} - -#endif /* ENABLE_EPUB */ - static gboolean ev_job_thumbnail_run (EvJob *job) { @@ -903,53 +829,19 @@ ev_job_thumbnail_run (EvJob *job) ev_debug_message (DEBUG_JOBS, "%d (%p)", job_thumb->page, job); ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job); - if (job->document->iswebdocument) { - /* Do not block the main loop */ - if (!ev_document_doc_mutex_trylock ()) - return TRUE; - } else { - ev_document_doc_mutex_lock (); - } + ev_document_doc_mutex_lock (); page = ev_document_get_page (job->document, job_thumb->page); ev_document_doc_mutex_unlock (); - if (job->document->iswebdocument == TRUE ) { - rc = ev_render_context_new (page, 0, job_thumb->scale); - } else { - rc = ev_render_context_new (page, job_thumb->rotation, job_thumb->scale); - } + rc = ev_render_context_new (page, job_thumb->rotation, job_thumb->scale); g_object_unref (page); -#if ENABLE_EPUB - if (job->document->iswebdocument == TRUE) { - GtkWidget *webview; - GtkWidget *offscreenwindow; - - webview = webkit_web_view_new (); - offscreenwindow = gtk_offscreen_window_new (); - - gtk_container_add (GTK_CONTAINER(offscreenwindow), GTK_WIDGET (webview)); - gtk_window_set_default_size (GTK_WINDOW(offscreenwindow), 800, 1080); - gtk_widget_show_all (offscreenwindow); - - g_signal_connect (WEBKIT_WEB_VIEW (webview), "load-changed", - G_CALLBACK (web_thumbnail_get_screenshot_cb), - g_object_ref (job_thumb)); - g_signal_connect (WEBKIT_WEB_VIEW(webview), "load-failed", - G_CALLBACK(webview_load_failed_cb), - g_object_ref (job_thumb)); - webkit_web_view_load_uri (WEBKIT_WEB_VIEW (webview), (gchar*) rc->page->backend_page); - } - else -#endif /* ENABLE_EPUB */ - { - ev_document_doc_mutex_lock (); - job_thumb->thumbnail = ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (job->document), - rc, TRUE); - ev_document_doc_mutex_unlock (); - ev_job_succeeded (job); - } + ev_document_doc_mutex_lock (); + job_thumb->thumbnail = ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (job->document), + rc, TRUE); + ev_document_doc_mutex_unlock (); + ev_job_succeeded (job); g_object_unref (rc); return FALSE; diff --git a/libview/meson.build b/libview/meson.build index e8cad36f..0075c154 100644 --- a/libview/meson.build +++ b/libview/meson.build @@ -85,7 +85,7 @@ if get_option('epub') endif libview = library( - 'view', + 'atrilview', libview_sources + libview_private_headers + libdoc_enums + libview_marshal, include_directories: include_dirs, dependencies: libview_deps, @@ -108,7 +108,7 @@ install_headers( if get_option('introspection') libview_gir = gnome.generate_gir( libview, - namespace: 'XreaderView', + namespace: 'AtrilView', nsversion: api_version, sources: libview_sources, identifier_prefix: 'Ev', diff --git a/meson.build b/meson.build index 1ae9885c..bf3ee890 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('atril', 'c', 'cpp', - version: '1.28.1', + version: '1.28.2', meson_version: '>=0.56.0', default_options: [ 'warning_level=1', @@ -22,7 +22,7 @@ major_version = version_list[0] minor_version = version_list[1] micro_version = version_list[2] -api_version = '1.5' +api_version = '1.5.0' binary_version = '3.0.0' binary_major_version = binary_version.split('.')[0] @@ -66,7 +66,7 @@ xml = dependency('libxml-2.0', version: '>= 2.5.0') zlib = dependency('zlib') libsecret = dependency('libsecret-1', version: '>= 0.5', required: get_option('keyring')) gtk_unix_print = dependency('gtk+-unix-print-3.0', version: '>= ' + gtk_version, required: get_option('gtk_unix_print')) -mate_desktop = dependency('mate-desktop-2.0') +mate_desktop = dependency('mate-desktop-2.0', version: '>= 1.27.1') # Backend configuration enabled_backend_names = [] @@ -8,7 +8,7 @@ # 9a7df1f0a3f5f4de7c0fff80f6fa8bdc_64f795c <c0e0e9e34d0b00c2c039f4b25af104bd_91457>, 2018 # Michael Moroni <[email protected]>, 2018 # fenris <[email protected]>, 2019 -# Warut Bunprasert <[email protected]>, 2020 +# Warut Bunprasert <[email protected]>, 2020 # kristjan <[email protected]>, 2020 # Stefano Karapetsas <[email protected]>, 2021 # @@ -15,7 +15,7 @@ # Arcenio Cid <[email protected]>, 2018 # Luis Armando Medina <[email protected]>, 2018 # ZenWalker <[email protected]>, 2018 -# Adolfo Jayme-Barrientos, 2019 +# Adolfo Jayme Barrientos, 2019 # 5eb873a56a0ef4b82a9609ebd37adb5c, 2019 # Joel Barrios <[email protected]>, 2019 # Emiliano Fascetti, 2021 @@ -397,17 +397,17 @@ msgstr "%s: Fichier corrompu ou ce n'est pas un fichier TFM\n" #: backend/dvi/mdvi-lib/tt.c:151 #, c-format msgid "(tt) %s: could not load face: %s\n" -msgstr "" +msgstr "(tt) %s: n'a pas pu charger la face : %s\n" #: backend/dvi/mdvi-lib/tt.c:159 #, c-format msgid "(tt) %s: could not create face: %s\n" -msgstr "" +msgstr "(tt) %s: n'a pas pu créer la face: %s\n" #: backend/dvi/mdvi-lib/tt.c:168 #, c-format msgid "(tt) %s: could not create glyph: %s\n" -msgstr "" +msgstr "(tt) %s: n'a pas pu créer le glyphe : %s\n" #: backend/dvi/mdvi-lib/tt.c:201 #, c-format @@ -5,7 +5,8 @@ # # Translators: # Mohammed Belkacem <[email protected]>, 2018 -# Slimane Selyan AMIRI <[email protected]>, 2021 +# Azwaw <[email protected]>, 2021 +# ButterflyOfFire, 2024 # msgid "" msgstr "" @@ -13,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: https://github.com/mate-desktop/atril/issues\n" "POT-Creation-Date: 2023-08-31 17:43+0200\n" "PO-Revision-Date: 2018-03-11 14:35+0000\n" -"Last-Translator: Slimane Selyan AMIRI <[email protected]>, 2021\n" +"Last-Translator: ButterflyOfFire, 2024\n" "Language-Team: Kabyle (https://app.transifex.com/mate/teams/13566/kab/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1370,7 +1371,7 @@ msgstr "" #: shell/ev-annotation-properties-dialog.c:105 msgid "Help" -msgstr "" +msgstr "Tallalt" #: shell/ev-annotation-properties-dialog.c:106 msgid "New Paragraph" @@ -1787,7 +1788,7 @@ msgstr "" #: shell/ev-window.c:5406 msgid "GNOME Documentation Team" -msgstr "" +msgstr "Agraw n tsemlit n GNOME" #: shell/ev-window.c:5411 msgid "" @@ -1096,11 +1096,11 @@ msgstr "" #: properties/ev-properties-view.c:67 msgid "Created:" -msgstr "" +msgstr "建立佇:" #: properties/ev-properties-view.c:68 msgid "Modified:" -msgstr "" +msgstr "修改佇:" #: properties/ev-properties-view.c:69 msgid "Number of Pages:" @@ -5,7 +5,7 @@ # # Translators: # Stefano Karapetsas <[email protected]>, 2021 -# Benedikt Straub <[email protected]>, 2023 +# Benedikt Straub <[email protected]>, 2025 # msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: https://github.com/mate-desktop/atril/issues\n" "POT-Creation-Date: 2023-08-31 17:43+0200\n" "PO-Revision-Date: 2018-03-11 14:35+0000\n" -"Last-Translator: Benedikt Straub <[email protected]>, 2023\n" +"Last-Translator: Benedikt Straub <[email protected]>, 2025\n" "Language-Team: Low German (https://app.transifex.com/mate/teams/13566/nds/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1783,11 +1783,11 @@ msgstr "" #: shell/ev-window.c:5405 msgid "MATE Documentation Team" -msgstr "" +msgstr "MATE-Dokumenteren-Klottje" #: shell/ev-window.c:5406 msgid "GNOME Documentation Team" -msgstr "" +msgstr "GNOME Documentation Team" #: shell/ev-window.c:5411 msgid "" @@ -7,7 +7,7 @@ # Bogusław B. <[email protected]>, 2018 # Wiktor Jezioro <[email protected]>, 2018 # Piotr Drąg <[email protected]>, 2018 -# Piotr Strębski <[email protected]>, 2018 +# Piotr Strebski <[email protected]>, 2018 # Stefano Karapetsas <[email protected]>, 2018 # Marcin Kralka <[email protected]>, 2018 # Kajetan Rosiak <[email protected]>, 2018 @@ -8,9 +8,9 @@ # Stefano Karapetsas <[email protected]>, 2018 # zubr139, 2018 # 8368efb4263ae7005ba7cc0c0f943bdd_16f29c1, 2018 -# Шаповалов Анатолій Романович <[email protected]>, 2018 +# Анатолій Романович Шаповалов <[email protected]>, 2018 # Микола Ткач <[email protected]>, 2021 -# Sergiy <[email protected]>, 2022 +# Serhii Horichenko <[email protected]>, 2022 # Yaroslav Belograd, 2022 # Anton Gladky <[email protected]>, 2022 # diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c index 11e43267..c12a7a10 100644 --- a/shell/ev-sidebar-thumbnails.c +++ b/shell/ev-sidebar-thumbnails.c @@ -581,6 +581,10 @@ ev_sidebar_thumbnails_fill_model (EvSidebarThumbnails *sidebar_thumbnails) GtkTreeIter iter; int i; + if (priv->document->iswebdocument) { + return; + } + for (i = 0; i < sidebar_thumbnails->priv->n_pages; i++) { gchar *page_label; gchar *page_string; @@ -1018,7 +1022,7 @@ static gboolean ev_sidebar_thumbnails_support_document (EvSidebarPage *sidebar_page, EvDocument *document) { - return (EV_IS_DOCUMENT_THUMBNAILS (document)); + return (EV_IS_DOCUMENT_THUMBNAILS (document) && !document->iswebdocument); } static const gchar* diff --git a/shell/ev-window.c b/shell/ev-window.c index 9d625708..5281acda 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -1592,7 +1592,8 @@ ev_window_refresh_window_thumbnail (EvWindow *ev_window) EvDocument *document = ev_window->priv->document; if (!document || ev_document_get_n_pages (document) <= 0 || - !ev_document_check_dimensions (document)) { + !ev_document_check_dimensions (document) || + document->iswebdocument) { return; } diff --git a/test-driver b/test-driver deleted file mode 100755 index b8521a48..00000000 --- a/test-driver +++ /dev/null @@ -1,148 +0,0 @@ -#! /bin/sh -# test-driver - basic testsuite driver script. - -scriptversion=2018-03-07.03; # UTC - -# Copyright (C) 2011-2018 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <https://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <[email protected]> or send patches to -# <[email protected]>. - -# Make unconditional expansion of undefined variables an error. This -# helps a lot in preventing typo-related bugs. -set -u - -usage_error () -{ - echo "$0: $*" >&2 - print_usage >&2 - exit 2 -} - -print_usage () -{ - cat <<END -Usage: - test-driver --test-name=NAME --log-file=PATH --trs-file=PATH - [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--] - TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] -The '--test-name', '--log-file' and '--trs-file' options are mandatory. -END -} - -test_name= # Used for reporting. -log_file= # Where to save the output of the test script. -trs_file= # Where to save the metadata of the test run. -expect_failure=no -color_tests=no -enable_hard_errors=yes -while test $# -gt 0; do - case $1 in - --help) print_usage; exit $?;; - --version) echo "test-driver $scriptversion"; exit $?;; - --test-name) test_name=$2; shift;; - --log-file) log_file=$2; shift;; - --trs-file) trs_file=$2; shift;; - --color-tests) color_tests=$2; shift;; - --expect-failure) expect_failure=$2; shift;; - --enable-hard-errors) enable_hard_errors=$2; shift;; - --) shift; break;; - -*) usage_error "invalid option: '$1'";; - *) break;; - esac - shift -done - -missing_opts= -test x"$test_name" = x && missing_opts="$missing_opts --test-name" -test x"$log_file" = x && missing_opts="$missing_opts --log-file" -test x"$trs_file" = x && missing_opts="$missing_opts --trs-file" -if test x"$missing_opts" != x; then - usage_error "the following mandatory options are missing:$missing_opts" -fi - -if test $# -eq 0; then - usage_error "missing argument" -fi - -if test $color_tests = yes; then - # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. - red='[0;31m' # Red. - grn='[0;32m' # Green. - lgn='[1;32m' # Light green. - blu='[1;34m' # Blue. - mgn='[0;35m' # Magenta. - std='[m' # No color. -else - red= grn= lgn= blu= mgn= std= -fi - -do_exit='rm -f $log_file $trs_file; (exit $st); exit $st' -trap "st=129; $do_exit" 1 -trap "st=130; $do_exit" 2 -trap "st=141; $do_exit" 13 -trap "st=143; $do_exit" 15 - -# Test script is run here. -"$@" >$log_file 2>&1 -estatus=$? - -if test $enable_hard_errors = no && test $estatus -eq 99; then - tweaked_estatus=1 -else - tweaked_estatus=$estatus -fi - -case $tweaked_estatus:$expect_failure in - 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; - 0:*) col=$grn res=PASS recheck=no gcopy=no;; - 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; - 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; - *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; - *:*) col=$red res=FAIL recheck=yes gcopy=yes;; -esac - -# Report the test outcome and exit status in the logs, so that one can -# know whether the test passed or failed simply by looking at the '.log' -# file, without the need of also peaking into the corresponding '.trs' -# file (automake bug#11814). -echo "$res $test_name (exit status: $estatus)" >>$log_file - -# Report outcome to console. -echo "${col}${res}${std}: $test_name" - -# Register the test result, and other relevant metadata. -echo ":test-result: $res" > $trs_file -echo ":global-test-result: $res" >> $trs_file -echo ":recheck: $recheck" >> $trs_file -echo ":copy-in-global-log: $gcopy" >> $trs_file - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" -# time-stamp-end: "; # UTC" -# End: |
