summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS26
-rw-r--r--configure.ac26
-rw-r--r--data/icons/128x128/apps/atril.pngbin0 -> 5590 bytes
-rw-r--r--data/icons/16x16/Makefile.am3
-rw-r--r--data/icons/16x16/actions/Makefile.am27
-rw-r--r--data/icons/16x16/apps/Makefile.am16
-rw-r--r--data/icons/16x16/mimetypes/Makefile.am16
-rw-r--r--data/icons/22x22/Makefile.am3
-rw-r--r--data/icons/22x22/actions/Makefile.am28
-rw-r--r--data/icons/22x22/apps/Makefile.am16
-rw-r--r--data/icons/22x22/mimetypes/Makefile.am16
-rw-r--r--data/icons/24x24/Makefile.am3
-rw-r--r--data/icons/24x24/actions/Makefile.am23
-rw-r--r--data/icons/24x24/apps/Makefile.am16
-rw-r--r--data/icons/24x24/mimetypes/Makefile.am16
-rw-r--r--data/icons/32x32/Makefile.am3
-rw-r--r--data/icons/32x32/actions/Makefile.am19
-rw-r--r--data/icons/32x32/mimetypes/Makefile.am16
-rw-r--r--data/icons/48x48/Makefile.am4
-rw-r--r--data/icons/48x48/actions/Makefile.am20
-rw-r--r--data/icons/48x48/apps/Makefile.am16
-rw-r--r--data/icons/64x64/apps/atril.pngbin0 -> 2853 bytes
-rw-r--r--data/icons/Makefile.am64
-rw-r--r--data/icons/scalable/Makefile.am3
-rw-r--r--data/icons/scalable/actions/Makefile.am17
-rw-r--r--data/icons/scalable/apps/Makefile.am16
-rw-r--r--data/icons/scalable/mimetypes/Makefile.am16
27 files changed, 80 insertions, 349 deletions
diff --git a/NEWS b/NEWS
index d270e80d..460eb627 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
+### atril 1.28.0
+
+ * Translations update
+
### atril 1.27.1
- * update translations
+ * Translations update
* fix a incompatible pointer type warning for gcc14
* epub: Avoid crash when index list has extraneous entry
* epub: Prevent path traversal when extracting files
@@ -19,7 +23,7 @@
### atril 1.27.0
- * update translations
+ * Translations update
* epub: Fix index loading for certain documents - look for epub:type instead of epub:id.
* ci: drop -Wunused-parameter compiler cflag from debian build
* Fix implicit conversion changes signedness: 'gboolean' to 'guint'
@@ -33,7 +37,7 @@
### atril 1.26.0
- * update translations
+ * Translations update
* ev-window.c: only create a EvWebView if needed
* ev-sidebar-links: Optimize reverse link lookup for a page
* introspection: Fix bogus --library arguments.
@@ -44,7 +48,7 @@
### atril 1.25.1
- * update translations
+ * Translations update
* update help
* caja extension: Update copyright year
* dvi: use glib i18n macros
@@ -80,7 +84,7 @@
### atril 1.25.0
- * sync with transifex
+ * Translations update
* [ci] fix release tarball on travis CI failed
* Re-enable highlight_find_results
* Use ENABLE_SYNCTEX in libdocument/Makefile.am
@@ -109,13 +113,13 @@
### atril 1.24.0
- * update translations
+ * Translations update
* thumbnailer: Fix memory leak
* Fix year 2038 issue with signed 32-bit integers
### atril 1.23.2
- * update translations
+ * Translations update
* Fix atril.desktop file
* Fix memory leak ev_sidebar_thumbnails_document_changed_cb()
* pdf: Fix memory leak when adding new text annotations
@@ -142,7 +146,7 @@
### atril 1.23.1
- * update translations
+ * Translations update
* tx: sync with transifex
* Travis CI: 'cppcheck' with '-D__cplusplus'
* ev-view: Remove unused variables and assignment
@@ -205,7 +209,7 @@
### atril 1.23.0
- * update translations
+ * Translations update
* Remove trailing whitespaces
* test: get focus on frame
* let test7.py can works
@@ -223,7 +227,7 @@
### atril 1.22.0
- * update translations
+ * Translations update
* Add update-authors.pl script which helps to update atril.about
* Read authors (updated) from atril.about gresource
* Initialize Travis CI support
@@ -243,7 +247,7 @@
### atril 1.21.1
- * update translations
+ * Translations update
* Use make functions for HELP_LINGUAS
* comics: support application/vnd.rar MIME type
* shell: Save document to the same path it was opened from
diff --git a/configure.ac b/configure.ac
index 50045cbf..cd734add 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
# *****************************************************************************
m4_define([ev_major_version], [1])
-m4_define([ev_minor_version], [27])
-m4_define([ev_micro_version], [1])
+m4_define([ev_minor_version], [28])
+m4_define([ev_micro_version], [0])
m4_define([ev_extra_version], [])
m4_define([ev_version], [ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version])
@@ -742,28 +742,6 @@ data/atril.appdata.xml.in
data/atril.desktop.in
data/Makefile
data/icons/Makefile
-data/icons/16x16/Makefile
-data/icons/16x16/apps/Makefile
-data/icons/16x16/actions/Makefile
-data/icons/16x16/mimetypes/Makefile
-data/icons/22x22/Makefile
-data/icons/22x22/apps/Makefile
-data/icons/22x22/actions/Makefile
-data/icons/22x22/mimetypes/Makefile
-data/icons/24x24/Makefile
-data/icons/24x24/apps/Makefile
-data/icons/24x24/actions/Makefile
-data/icons/24x24/mimetypes/Makefile
-data/icons/32x32/Makefile
-data/icons/32x32/actions/Makefile
-data/icons/32x32/mimetypes/Makefile
-data/icons/48x48/Makefile
-data/icons/48x48/apps/Makefile
-data/icons/48x48/actions/Makefile
-data/icons/scalable/Makefile
-data/icons/scalable/apps/Makefile
-data/icons/scalable/actions/Makefile
-data/icons/scalable/mimetypes/Makefile
help/Makefile
help/reference/Makefile
help/reference/libdocument/Makefile
diff --git a/data/icons/128x128/apps/atril.png b/data/icons/128x128/apps/atril.png
new file mode 100644
index 00000000..5deac6ae
--- /dev/null
+++ b/data/icons/128x128/apps/atril.png
Binary files differ
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
deleted file mode 100644
index b02d3a8c..00000000
--- a/data/icons/16x16/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = actions apps mimetypes
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am
deleted file mode 100644
index d82ea2a3..00000000
--- a/data/icons/16x16/actions/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 16x16
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- view-page-continuous.png \
- view-page-facing.png \
- zoom.png \
- zoom-fit-height.png \
- zoom-fit-width.png \
- object-rotate-left.png \
- object-rotate-right.png
-
-noinst_DATA = \
- view-page-continuous.xcf \
- view-page-facing.xcf \
- zoom.svg \
- zoom-fit-page.svg \
- zoom-fit-width.svg
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/apps/Makefile.am b/data/icons/16x16/apps/Makefile.am
deleted file mode 100644
index aa82e2c4..00000000
--- a/data/icons/16x16/apps/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 16x16
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- atril.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/mimetypes/Makefile.am b/data/icons/16x16/mimetypes/Makefile.am
deleted file mode 100644
index 87840e2f..00000000
--- a/data/icons/16x16/mimetypes/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 16x16
-context = mimetypes
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- x-office-presentation.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
deleted file mode 100644
index b02d3a8c..00000000
--- a/data/icons/22x22/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = actions apps mimetypes
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/22x22/actions/Makefile.am
deleted file mode 100644
index eba54c2a..00000000
--- a/data/icons/22x22/actions/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 22x22
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- eye.png \
- object-rotate-left.png \
- object-rotate-right.png \
- view-page-continuous.png \
- view-page-facing.png \
- zoom.png \
- zoom-fit-page.png \
- zoom-fit-width.png
-
-noinst_DATA = \
- view-page-continuous.xcf \
- view-page-facing.xcf \
- zoom.svg \
- zoom-fit-page.svg \
- zoom-fit-width.svg
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/apps/Makefile.am b/data/icons/22x22/apps/Makefile.am
deleted file mode 100644
index f7d407d3..00000000
--- a/data/icons/22x22/apps/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 22x22
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- atril.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/mimetypes/Makefile.am b/data/icons/22x22/mimetypes/Makefile.am
deleted file mode 100644
index bfd92a28..00000000
--- a/data/icons/22x22/mimetypes/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 22x22
-context = mimetypes
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- x-office-presentation.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
deleted file mode 100644
index b02d3a8c..00000000
--- a/data/icons/24x24/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = actions apps mimetypes
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am
deleted file mode 100644
index f44f8b6b..00000000
--- a/data/icons/24x24/actions/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 24x24
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- stock_filters-invert.png \
- view-page-continuous.png \
- view-page-facing.png \
- zoom.png \
- zoom-fit-height.png \
- zoom-fit-width.png \
- object-rotate-left.png \
- object-rotate-right.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/24x24/apps/Makefile.am b/data/icons/24x24/apps/Makefile.am
deleted file mode 100644
index e23a2ba9..00000000
--- a/data/icons/24x24/apps/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 24x24
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- atril.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/24x24/mimetypes/Makefile.am b/data/icons/24x24/mimetypes/Makefile.am
deleted file mode 100644
index b4025de3..00000000
--- a/data/icons/24x24/mimetypes/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 24x24
-context = mimetypes
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- x-office-presentation.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
deleted file mode 100644
index 02d9f743..00000000
--- a/data/icons/32x32/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = actions mimetypes
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/32x32/actions/Makefile.am b/data/icons/32x32/actions/Makefile.am
deleted file mode 100644
index 09e20499..00000000
--- a/data/icons/32x32/actions/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 32x32
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- object-rotate-left.png \
- object-rotate-right.png \
- view-page-continuous.png \
- view-page-facing.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/32x32/mimetypes/Makefile.am b/data/icons/32x32/mimetypes/Makefile.am
deleted file mode 100644
index a347c0bd..00000000
--- a/data/icons/32x32/mimetypes/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 32x32
-context = mimetypes
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- x-office-presentation.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
deleted file mode 100644
index ae033087..00000000
--- a/data/icons/48x48/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = actions apps
-
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/48x48/actions/Makefile.am b/data/icons/48x48/actions/Makefile.am
deleted file mode 100644
index a8047edf..00000000
--- a/data/icons/48x48/actions/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 48x48
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- close.png \
- view-page-continuous.png \
- view-page-facing.png \
- resize-se.png \
- resize-sw.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/48x48/apps/Makefile.am b/data/icons/48x48/apps/Makefile.am
deleted file mode 100644
index c73ebc82..00000000
--- a/data/icons/48x48/apps/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 48x48
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- atril.png
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/64x64/apps/atril.png b/data/icons/64x64/apps/atril.png
new file mode 100644
index 00000000..57091d6e
--- /dev/null
+++ b/data/icons/64x64/apps/atril.png
Binary files differ
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 6101c565..8537a1d3 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,4 +1,66 @@
-SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable
+iconsdir = $(datadir)/icons/hicolor
+pkgiconsdir = $(pkgdatadir)/icons/hicolor
+nobase_dist_icons_DATA = \
+ 16x16/apps/atril.png \
+ 22x22/apps/atril.png \
+ 24x24/apps/atril.png \
+ 48x48/apps/atril.png \
+ 64x64/apps/atril.png \
+ 128x128/apps/atril.png \
+ scalable/apps/atril.svg
+
+nobase_dist_pkgicons_DATA = \
+ 16x16/actions/object-rotate-left.png \
+ 16x16/actions/object-rotate-right.png \
+ 16x16/actions/view-page-continuous.png \
+ 16x16/actions/view-page-facing.png \
+ 16x16/actions/zoom.png \
+ 16x16/actions/zoom-fit-height.png \
+ 16x16/actions/zoom-fit-width.png \
+ 16x16/mimetypes/x-office-presentation.png \
+ 22x22/actions/eye.png \
+ 22x22/actions/object-rotate-left.png \
+ 22x22/actions/object-rotate-right.png \
+ 22x22/actions/view-page-continuous.png \
+ 22x22/actions/view-page-facing.png \
+ 22x22/actions/zoom.png \
+ 22x22/actions/zoom-fit-page.png \
+ 22x22/actions/zoom-fit-width.png \
+ 22x22/mimetypes/x-office-presentation.png \
+ 24x24/actions/object-rotate-left.png \
+ 24x24/actions/object-rotate-right.png \
+ 24x24/actions/stock_filters-invert.png \
+ 24x24/actions/view-page-continuous.png \
+ 24x24/actions/view-page-facing.png \
+ 24x24/actions/zoom.png \
+ 24x24/actions/zoom-fit-height.png \
+ 24x24/actions/zoom-fit-width.png \
+ 24x24/mimetypes/x-office-presentation.png \
+ 32x32/actions/object-rotate-left.png \
+ 32x32/actions/object-rotate-right.png \
+ 32x32/actions/view-page-continuous.png \
+ 32x32/actions/view-page-facing.png \
+ 32x32/mimetypes/x-office-presentation.png \
+ 48x48/actions/close.png \
+ 48x48/actions/view-page-continuous.png \
+ 48x48/actions/view-page-facing.png \
+ 48x48/actions/resize-se.png \
+ 48x48/actions/resize-sw.png \
+ scalable/actions/object-rotate-left.svg \
+ scalable/actions/object-rotate-right.svg \
+ scalable/mimetypes/x-office-presentation.svg
+
+dist_noinst_DATA = \
+ 16x16/actions/view-page-continuous.xcf \
+ 16x16/actions/view-page-facing.xcf \
+ 16x16/actions/zoom.svg \
+ 16x16/actions/zoom-fit-page.svg \
+ 16x16/actions/zoom-fit-width.svg \
+ 22x22/actions/view-page-continuous.xcf \
+ 22x22/actions/view-page-facing.xcf \
+ 22x22/actions/zoom.svg \
+ 22x22/actions/zoom-fit-page.svg \
+ 22x22/actions/zoom-fit-width.svg
-include $(top_srcdir)/git.mk
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
deleted file mode 100644
index b02d3a8c..00000000
--- a/data/icons/scalable/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = actions apps mimetypes
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/scalable/actions/Makefile.am b/data/icons/scalable/actions/Makefile.am
deleted file mode 100644
index eb48907e..00000000
--- a/data/icons/scalable/actions/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = scalable
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- object-rotate-left.svg \
- object-rotate-right.svg
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/scalable/apps/Makefile.am b/data/icons/scalable/apps/Makefile.am
deleted file mode 100644
index a7d6c404..00000000
--- a/data/icons/scalable/apps/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = scalable
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- atril.svg
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/scalable/mimetypes/Makefile.am b/data/icons/scalable/mimetypes/Makefile.am
deleted file mode 100644
index c0cb8ea6..00000000
--- a/data/icons/scalable/mimetypes/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = scalable
-context = mimetypes
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
- x-office-presentation.svg
-
-noinst_DATA =
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(noinst_DATA)
-
--include $(top_srcdir)/git.mk