From eca1da350003809c67889625f51c62483c718f25 Mon Sep 17 00:00:00 2001 From: Nikolay Sinyov Date: Tue, 21 Nov 2023 23:20:45 +0300 Subject: [PATCH 1/4] Updated gitignore and desktop file --- .gitignore | 1 + app/org.monich.harbour.books.desktop | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5f7e50e..8f7ad19 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ moc_*.cpp *.moc Makefile *.a +*.so *.list org.monich.harbour.books*.qm org.monich.harbour.books*.ts diff --git a/app/org.monich.harbour.books.desktop b/app/org.monich.harbour.books.desktop index 2c0aa73..e033f97 100644 --- a/app/org.monich.harbour.books.desktop +++ b/app/org.monich.harbour.books.desktop @@ -10,7 +10,7 @@ Name[pt_BR]=Livros Name[ru]=Книги Name[sv]=Böcker Comment=E-Book Reader -Exec=org.monich.harbour.books +Exec=/usr/bin/org.monich.harbour.books Icon=org.monich.harbour.books X-Nemo-Application-Type=silica-qt5 @@ -19,4 +19,3 @@ Permissions=Documents;Downloads;RemovableMedia;Audio OrganizationName=org.monich ApplicationName=harbour.books ExecDBus=/usr/bin/org.monich.harbour.books %u - -- 2.43.0 From ca5d36226715cec369a9f8f69ca893bb30d3b6a3 Mon Sep 17 00:00:00 2001 From: Nikolay Sinyov Date: Wed, 22 Nov 2023 01:33:25 +0300 Subject: [PATCH 2/4] Fixed issues with saving book and position after relaunching app --- app/org.monich.harbour.books.desktop | 5 +++-- app/src/BooksDefs.h | 1 + app/src/BooksStorage.cpp | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/org.monich.harbour.books.desktop b/app/org.monich.harbour.books.desktop index e033f97..e9b0465 100644 --- a/app/org.monich.harbour.books.desktop +++ b/app/org.monich.harbour.books.desktop @@ -10,7 +10,7 @@ Name[pt_BR]=Livros Name[ru]=Книги Name[sv]=Böcker Comment=E-Book Reader -Exec=/usr/bin/org.monich.harbour.books +Exec=org.monich.harbour.books Icon=org.monich.harbour.books X-Nemo-Application-Type=silica-qt5 @@ -18,4 +18,5 @@ X-Nemo-Application-Type=silica-qt5 Permissions=Documents;Downloads;RemovableMedia;Audio OrganizationName=org.monich ApplicationName=harbour.books -ExecDBus=/usr/bin/org.monich.harbour.books %u +ExecDBus=/usr/bin/org.monich.harbour.books + diff --git a/app/src/BooksDefs.h b/app/src/BooksDefs.h index b00139b..abc17e4 100644 --- a/app/src/BooksDefs.h +++ b/app/src/BooksDefs.h @@ -45,6 +45,7 @@ # define BOOKS_SETTINGS_MENU true #endif +#define BOOKS_SETTINGS_PATH "org.monich/harbour.books" #define BOOKS_DBUS_SERVICE BOOKS_DBUS_INTERFACE #define BOOKS_DCONF_ROOT "/apps/" BOOKS_APP_NAME "/" #define BOOKS_DATA_ROOT "usr/share/" BOOKS_APP_NAME diff --git a/app/src/BooksStorage.cpp b/app/src/BooksStorage.cpp index 7bffcda..df27154 100644 --- a/app/src/BooksStorage.cpp +++ b/app/src/BooksStorage.cpp @@ -104,6 +104,7 @@ BooksStorage::Private::Private( { QString cfgDir; cfgDir = QString::fromStdString(ZLibrary::ApplicationWritableDirectory()); + cfgDir.replace(QString(BOOKS_APP_NAME),QString(BOOKS_SETTINGS_PATH)); if (!cfgDir.endsWith('/')) cfgDir += '/'; QString subDir; switch (aType) { -- 2.43.0 From ca2aded9e308667a951cbbb791d9ab18af4f83eb Mon Sep 17 00:00:00 2001 From: Nikolay Sinyov Date: Wed, 22 Nov 2023 01:45:30 +0300 Subject: [PATCH 3/4] update release version --- rpm/org.monich.harbour.books.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/org.monich.harbour.books.spec b/rpm/org.monich.harbour.books.spec index 2aad8bd..d5b6ed4 100644 --- a/rpm/org.monich.harbour.books.spec +++ b/rpm/org.monich.harbour.books.spec @@ -1,7 +1,7 @@ Name: org.monich.harbour.books Summary: E-book reader Version: 1.1.5 -Release: 1 +Release: 2 License: BSD Group: Applications/File URL: https://github.com/sprainbrains/harbour-books/tree/auroraos -- 2.43.0 From 76b3650865cdaab900b1adfbf5436e9f17391e0c Mon Sep 17 00:00:00 2001 From: Nikolai Sinyov Date: Wed, 22 Nov 2023 01:56:40 +0300 Subject: [PATCH 4/4] Updated git ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8f7ad19..2e6bae5 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ org.monich.harbour.books*.qm org.monich.harbour.books*.ts org.monich.harbour.books RPMS/ +.DS_Store -- 2.43.0