Merge pull request #74 from 0xzer0x/release/1.2.6

v1.2.6
0xzer0x · Jun 1, 2024 · 899761a · 899761a
2 parents 6dcbd36 + 46379c0
commit 899761a
Show file tree

Hide file tree

Showing 115 changed files with 5,324 additions and 1,271 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .cache
 .clangd
+.ccls*
 .vscode
 *.exe
 *.run

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,14 @@
 
 ### التحديثات 💭
 
-- إضافة قائمة التلاوات في نافذة التحميل (#57)
-- إصدار نسخة أولية من البرنامج لأنظمة macos
+- دعم اللغة الروسية لواجهة البرنامج
+- تصليح بعض الأعطال في تصفح الأجزاء (#71)
+- إضافة رقم الربع و الحزب في صفحة القرآن (#70)
+
 </div>
 
 ### What's Changed 💭
 
-- Added recitations menu in downloads manager for a more clear UI (#57)
-- Initial MacOS application release
+- Russian UI translation
+- Bug fixes in Juz navigation (#71)
+- Added displaying of rub and hizb in the Quran page footer (#70)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.22)
 project(
   quran-companion
   LANGUAGES CXX
-  VERSION 1.2.4
+  VERSION 1.2.6
   DESCRIPTION "Quran reader and player"
   HOMEPAGE_URL "https://0xzer0x.github.io/projects/quran-companion/")
 
@@ -91,10 +91,32 @@ set(PROJECT_SOURCES
     src/dialogs/importexportdialog.ui
     src/interfaces/userdataimporter.h
     src/interfaces/userdataexporter.h
-    src/interfaces/downloadjob.h
-    src/interfaces/downloadtask.h
     src/interfaces/dbconnection.h
     src/interfaces/notificationsender.h
+    src/service/betaqatservice.h
+    src/service/bookmarkservice.h
+    src/service/quranservice.h
+    src/service/glyphservice.h
+    src/service/tafsirservice.h
+    src/service/translationservice.h
+    src/service/khatmahservice.h
+    src/service/thoughtsservice.h
+    src/service/impl/betaqatservicesqlimpl.h
+    src/service/impl/betaqatservicesqlimpl.cpp
+    src/service/impl/quranservicesqlimpl.h
+    src/service/impl/quranservicesqlimpl.cpp
+    src/service/impl/glyphservicesqlimpl.h
+    src/service/impl/glyphservicesqlimpl.cpp
+    src/service/impl/bookmarkservicesqlimpl.h
+    src/service/impl/bookmarkservicesqlimpl.cpp
+    src/service/impl/tafsirservicesqlimpl.h
+    src/service/impl/tafsirservicesqlimpl.cpp
+    src/service/impl/translationservicesqlimpl.h
+    src/service/impl/translationservicesqlimpl.cpp
+    src/service/impl/khatmahservicesqlimpl.h
+    src/service/impl/khatmahservicesqlimpl.cpp
+    src/service/impl/thoughtsservicesqlimpl.h
+    src/service/impl/thoughtsservicesqlimpl.cpp
     src/notifiers/bookmarksnotifier.h
     src/notifiers/bookmarksnotifier.cpp
     src/notifiers/updatenotifier.h
@@ -125,36 +147,42 @@ set(PROJECT_SOURCES
     src/utils/jsondataexporter.cpp
     src/utils/jsondataimporter.h
     src/utils/jsondataimporter.cpp
-    src/downloader/surahjob.h
-    src/downloader/surahjob.cpp
-    src/downloader/recitationtask.h
-    src/downloader/recitationtask.cpp
-    src/downloader/taskdownloader.h
-    src/downloader/taskdownloader.cpp
-    src/downloader/tafsirtask.h
-    src/downloader/tafsirtask.cpp
-    src/downloader/translationtask.h
-    src/downloader/translationtask.cpp
-    src/downloader/qcftask.h
-    src/downloader/qcftask.cpp
-    src/downloader/contentjob.h
-    src/downloader/contentjob.cpp
-    src/downloader/qcfjob.h
-    src/downloader/qcfjob.cpp
-    src/downloader/jobmanager.h
-    src/downloader/jobmanager.cpp
-    src/database/qurandb.h
-    src/database/qurandb.cpp
-    src/database/glyphsdb.h
-    src/database/glyphsdb.cpp
-    src/database/betaqatdb.h
-    src/database/betaqatdb.cpp
-    src/database/tafsirdb.h
-    src/database/tafsirdb.cpp
-    src/database/translationdb.h
-    src/database/translationdb.cpp
-    src/database/bookmarksdb.h
-    src/database/bookmarksdb.cpp
+    src/utils/servicefactory.h
+    src/utils/servicefactory.cpp
+    src/utils/stringconverter.h
+    src/utils/stringconverter.cpp
+    src/downloader/downloadjob.h
+    src/downloader/downloadtask.h
+    src/downloader/impl/surahjob.h
+    src/downloader/impl/surahjob.cpp
+    src/downloader/impl/recitationtask.h
+    src/downloader/impl/recitationtask.cpp
+    src/downloader/impl/taskdownloader.h
+    src/downloader/impl/taskdownloader.cpp
+    src/downloader/impl/tafsirtask.h
+    src/downloader/impl/tafsirtask.cpp
+    src/downloader/impl/translationtask.h
+    src/downloader/impl/translationtask.cpp
+    src/downloader/impl/qcftask.h
+    src/downloader/impl/qcftask.cpp
+    src/downloader/impl/contentjob.h
+    src/downloader/impl/contentjob.cpp
+    src/downloader/impl/qcfjob.h
+    src/downloader/impl/qcfjob.cpp
+    src/downloader/impl/jobmanager.h
+    src/downloader/impl/jobmanager.cpp
+    src/repository/quranrepository.h
+    src/repository/quranrepository.cpp
+    src/repository/glyphsrepository.h
+    src/repository/glyphsrepository.cpp
+    src/repository/betaqatrepository.h
+    src/repository/betaqatrepository.cpp
+    src/repository/tafsirrepository.h
+    src/repository/tafsirrepository.cpp
+    src/repository/translationrepository.h
+    src/repository/translationrepository.cpp
+    src/repository/bookmarksrepository.h
+    src/repository/bookmarksrepository.cpp
     src/widgets/quranpagebrowser.h
     src/widgets/quranpagebrowser.cpp
     src/widgets/clickablelabel.cpp
@@ -197,7 +225,6 @@ elseif(APPLE)
       MACOSX_BUNDLE_LONG_VERSION_STRING
       ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
       MACOSX_BUNDLE TRUE)
-  # And this part tells CMake where to find and install the file itself
   set(QURAN_COMPANION_ICON "resources/logo.icns")
   set_source_files_properties(${QURAN_COMPANION_ICON}
                               PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
@@ -220,7 +247,7 @@ else()
   file(INSTALL bismillah DESTINATION ${CMAKE_BINARY_DIR})
 endif()
 
-list(APPEND SUPPORTED_LANGUAGES ar tr)
+list(APPEND SUPPORTED_LANGUAGES ar tr ru)
 foreach(lang IN LISTS SUPPORTED_LANGUAGES)
   message(STATUS "Adding ${lang} translation file to QC_TS")
   list(APPEND QC_TS "dist/translations/out/qc_${lang}.ts")

diff --git a/README-AR.md b/README-AR.md
@@ -138,7 +138,7 @@
  <a href='https://flathub.org/apps/io.github._0xzer0x.qurancompanion'>
     <img width='240' alt='Download Flatpak' src='https://dl.flathub.org/assets/badges/flathub-badge-en.svg'/>
  </a>
- <a href='https://github.com/0xzer0x/quran-companion/releases/download/v1.2.5/Quran_Companion-1.2.5-x86_64.AppImage'>
+ <a href='https://github.com/0xzer0x/quran-companion/releases/download/v1.2.6/Quran_Companion-1.2.6-x86_64.AppImage'>
     <img width='260' alt='Download AppImage' src='https://docs.appimage.org/_images/download-appimage-banner.svg' style='border-radius: 10px'/>
  </a>
  <a href="https://snapcraft.io/quran-companion">
@@ -329,4 +329,4 @@ cmake --build .
 [win-installer]: https://github.com/0xzer0x/quran-companion/releases/download/v1.1.9/qc_online_installer_x64_win.exe
 [translation-wiki]: https://github.com/0xzer0x/quran-companion/wiki/Contributing-Translations
 [recitations-wiki]: https://github.com/0xzer0x/quran-companion/wiki/Contributing-Recitations
-[macos-dmg-url]: https://github.com/0xzer0x/quran-companion/releases/download/v1.2.5/Quran_Companion-1.2.5-x86_64.dmg
+[macos-dmg-url]: https://github.com/0xzer0x/quran-companion/releases/download/v1.2.6/Quran_Companion-1.2.6-x86_64.dmg
diff --git a/README.md b/README.md
@@ -135,7 +135,7 @@ The application can be downloaded in any of the available packages (snap, flatpa
  <a href='https://flathub.org/apps/io.github._0xzer0x.qurancompanion'>
     <img width='240' alt='Download Flatpak' src='https://dl.flathub.org/assets/badges/flathub-badge-en.svg'/>
  </a>
- <a href='https://github.com/0xzer0x/quran-companion/releases/download/v1.2.5/Quran_Companion-1.2.5-x86_64.AppImage'>
+ <a href='https://github.com/0xzer0x/quran-companion/releases/download/v1.2.6/Quran_Companion-1.2.6-x86_64.AppImage'>
     <img width='260' alt='Download AppImage' src='https://docs.appimage.org/_images/download-appimage-banner.svg' style='border-radius: 10px'/>
  </a>
  <a href="https://snapcraft.io/quran-companion">
@@ -311,4 +311,4 @@ Distributed under the [Waqf General Public License](https://ojuba.org/waqf-2.0:%
 [win-installer]: https://github.com/0xzer0x/quran-companion/releases/download/v1.1.9/qc_online_installer_x64_win.exe
 [translation-wiki]: https://github.com/0xzer0x/quran-companion/wiki/Contributing-Translations
 [recitations-wiki]: https://github.com/0xzer0x/quran-companion/wiki/Contributing-Recitations
-[macos-dmg-url]: https://github.com/0xzer0x/quran-companion/releases/download/v1.2.5/Quran_Companion-1.2.5-x86_64.dmg
+[macos-dmg-url]: https://github.com/0xzer0x/quran-companion/releases/download/v1.2.6/Quran_Companion-1.2.6-x86_64.dmg
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.5
+1.2.6
diff --git a/assets/quran.db b/assets/quran.db
diff --git a/crowdin.yml b/crowdin.yml
@@ -1,8 +1,9 @@
-commit_message: Update %language% translation
+commit_message: "crowdin: update %language% translation"
 append_commit_message: false
 files:
   - source: /dist/translations/template.ts
     translation: /dist/translations/out/qc_%two_letters_code%.ts
 export_languages:
   - ar
   - tr
+  - ru