diff --git a/.gitignore b/.gitignore index 5f7e50e..2e6bae5 100644 --- a/.gitignore +++ b/.gitignore @@ -6,8 +6,10 @@ moc_*.cpp *.moc Makefile *.a +*.so *.list org.monich.harbour.books*.qm org.monich.harbour.books*.ts org.monich.harbour.books RPMS/ +.DS_Store diff --git a/app/org.monich.harbour.books.desktop b/app/org.monich.harbour.books.desktop index 2c0aa73..e9b0465 100644 --- a/app/org.monich.harbour.books.desktop +++ b/app/org.monich.harbour.books.desktop @@ -18,5 +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) { 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