From 9bfc411cdf944f2619aed2682164593da60db84e Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 19 Jan 2022 14:08:11 +0100 Subject: [PATCH 1/4] Make generation script always use relative path in the qrc file. --- resources/generate_translation_qrc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/generate_translation_qrc.py b/resources/generate_translation_qrc.py index 7b91c334..dfc66a18 100755 --- a/resources/generate_translation_qrc.py +++ b/resources/generate_translation_qrc.py @@ -38,7 +38,7 @@ if node is not None: node.tail += " " * 8 node = ET.SubElement(qresource, "file") - node.text = str(json) + node.text = str(json.relative_to(script_path.parent)) node.tail = "\n" node.tail += " "*4 From 28422b5159f5e9720545a4cba9842faa8c18cd9e Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 19 Jan 2022 14:08:27 +0100 Subject: [PATCH 2/4] Update `resources/translations.qrc` --- resources/translations.qrc | 71 +++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/resources/translations.qrc b/resources/translations.qrc index 5584945d..a7854109 100644 --- a/resources/translations.qrc +++ b/resources/translations.qrc @@ -1,47 +1,56 @@ + i18n/br.json i18n/hi.json - i18n/zh-hans.json - i18n/nl.json - i18n/ca.json - i18n/ja.json - i18n/ru.json - i18n/he.json - i18n/roa-tara.json - i18n/sr-ec.json - i18n/en.json - i18n/mk.json i18n/id.json - i18n/pl.json - i18n/eo.json - i18n/qqq.json + i18n/skr-arab.json + i18n/zgh.json i18n/ar.json - i18n/de.json - i18n/es.json - i18n/tr.json - i18n/ko.json - i18n/fa.json - i18n/cs.json i18n/bn.json - i18n/skr-arab.json + i18n/ca.json + i18n/cs.json + i18n/da.json + i18n/gsw.json + i18n/ie.json + i18n/ms.json + i18n/roa-tara.json + i18n/sv.json + i18n/eo.json i18n/hy.json + i18n/pt-br.json + i18n/pt.json + i18n/de.json + i18n/ja.json + i18n/my.json + i18n/ro.json i18n/sc.json + i18n/ta.json i18n/diq.json - i18n/gsw.json - i18n/ro.json + i18n/ku-latn.json + i18n/pl.json + i18n/qqq.json + i18n/en.json + i18n/es.json + i18n/fa.json + i18n/fi.json i18n/fr.json + i18n/he.json i18n/io.json - i18n/zh-hant.json - i18n/da.json - i18n/zgh.json i18n/it.json - i18n/br.json - i18n/uk.json - i18n/fi.json - i18n/sv.json - i18n/pt-br.json - i18n/ku-latn.json + i18n/ko.json i18n/lb.json + i18n/mk.json + i18n/nl.json + i18n/ru.json + i18n/scn.json + i18n/sk.json + i18n/sq.json + i18n/sr-ec.json + i18n/th.json + i18n/tr.json + i18n/uk.json + i18n/zh-hans.json + i18n/zh-hant.json \ No newline at end of file From 7f5fe877f911fc4dcf33dd84b00381ce02b8bd22 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 19 Jan 2022 14:09:03 +0100 Subject: [PATCH 3/4] New version 2.1.0 --- ChangeLog | 33 +++++++++++++++++++++++++ kiwix-desktop.pro | 2 +- resources/org.kiwix.desktop.appdata.xml | 2 +- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9e09a7b..299633d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,36 @@ +kiwix-desktop 2.1.0 +=================== + + * Add a IPChooser in the server dialog windows and display a best IP address + on which the user can connect to (@juuz0 #735) + * Open multiple zim files from the command line (@juuz0 #720) + * Setting's zoom level change the zoom in all open tabs (@juuz0 #719) + * Properly display back and forward buttons on RTL environment (@juuz0 #721) + * Open new tabs just after the current tab (@juuz0 #716) + * Always open new url in background (@juuz0 #717) + * Make the server follow modification made in the library (@veloman-yunkan #714) + * Improved setting tab (@juuz0 #696) + * Display the shortcut of the action in its tootips (@juuz0 #682) + * Limit zoom changes to the current tab only (@juuz0 #689) + * Make the server use human-friendly name for zim files (@MananJethwany #676) + * Fix tooltips' position (@kelson42 #672) + * Improved server dialog (@HanYoung-uwu #638) + * Add shortcuts to navigate in web history : + - `BackButton`/`ForwardButton` (mouse buttons) (@Goutte #646) + - `Alt+Left`/`Alt+Right` (@kelson42 #621) + * Add `--version` and `--help` options (@HanYoung-uwu #631) + * Fix file dialog style on Windows (@HanYoung-uwu #634) + * Fix search result pagination (@maneeshpm #628) + * Add shortcut `Alt + ` to switch between tabs (@rishabh-soni #567) + * Fix fade-out tab when title is too long (@asashnov #573) + * Use secure connection (https) when possible (@kelson42 #589) + * Apply language filter to local library (@HanYoung-uwu #581) + * Make `Search` and `Main Menu` buttons visible to screen reader (@asashnov #583) + * Fix print support (@Ambrevar #557) + * Adpat to new libkiwix 10.0.0 API + * New SVG logo (@kelson42 #539) + * Various fixes (@legoktm @HanYoung-uwu @Saket-07 @rishabh-soni @asashnov @manneshpm @MananJethwany) + kiwix-desktop 2.0.5 =================== diff --git a/kiwix-desktop.pro b/kiwix-desktop.pro index d366de5f..191c0d2c 100644 --- a/kiwix-desktop.pro +++ b/kiwix-desktop.pro @@ -18,7 +18,7 @@ TEMPLATE = app QMAKE_CXXFLAGS += -std=c++11 QMAKE_LFLAGS += -std=c++11 -DEFINES += VERSION="2.0.5" +DEFINES += VERSION="2.1.0" # The following define makes your compiler emit warnings if you use # any feature of Qt which has been marked as deprecated (the exact warnings diff --git a/resources/org.kiwix.desktop.appdata.xml b/resources/org.kiwix.desktop.appdata.xml index 9212e603..dcca2fbc 100644 --- a/resources/org.kiwix.desktop.appdata.xml +++ b/resources/org.kiwix.desktop.appdata.xml @@ -13,7 +13,7 @@

- + org.kiwix.desktop.desktop From 8dc1984f0b7245ca42c2f40c3a03069ca6196ddd Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 19 Jan 2022 18:11:59 +0100 Subject: [PATCH 4/4] Check for the version of kiwix and libzim. --- kiwix-desktop.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kiwix-desktop.pro b/kiwix-desktop.pro index 191c0d2c..183d04b0 100644 --- a/kiwix-desktop.pro +++ b/kiwix-desktop.pro @@ -153,12 +153,12 @@ unix { INSTALLS += mime_file } -PKGCONFIG_CFLAGS = $$system(pkg-config --cflags $$PKGCONFIG_OPTION kiwix) +PKGCONFIG_CFLAGS = $$system(pkg-config --cflags $$PKGCONFIG_OPTION \"kiwix >= 10.0.0 libzim >= 7.2.0\") QMAKE_CXXFLAGS += $$PKGCONFIG_CFLAGS QMAKE_CFLAGS += $$PKGCONFIG_CFLAGS -LIBS += $$system(pkg-config --libs $$PKGCONFIG_OPTION kiwix) +LIBS += $$system(pkg-config --libs $$PKGCONFIG_OPTION \"kiwix >= 10.0.0 libzim >= 7.2.0\") RESOURCES += \ resources/kiwix.qrc \