medvedych/harbour-books
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

aurora_fixes #3

Merged
medvedych merged 4 commits from aurora_fixes into master 2023-11-23 01:52:21 +03:00
Conversation 0 Commits 4 Files changed 5 +5 -2
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ca5d362267 - Show all commits

5
app/org.monich.harbour.books.desktop
View file

@ -10,7 +10,7 @@ Name[pt_BR]=Livros
Name[ru]=Книги Name[ru]=Книги
Name[sv]=Böcker Name[sv]=Böcker
Comment=E-Book Reader Comment=E-Book Reader
Exec=/usr/bin/org.monich.harbour.books Exec=org.monich.harbour.books
Icon=org.monich.harbour.books Icon=org.monich.harbour.books
X-Nemo-Application-Type=silica-qt5 X-Nemo-Application-Type=silica-qt5
@ -18,4 +18,5 @@ X-Nemo-Application-Type=silica-qt5
Permissions=Documents;Downloads;RemovableMedia;Audio Permissions=Documents;Downloads;RemovableMedia;Audio
OrganizationName=org.monich OrganizationName=org.monich
ApplicationName=harbour.books ApplicationName=harbour.books
ExecDBus=/usr/bin/org.monich.harbour.books %u ExecDBus=/usr/bin/org.monich.harbour.books

1
app/src/BooksDefs.h
View file

@ -45,6 +45,7 @@
# define BOOKS_SETTINGS_MENU true # define BOOKS_SETTINGS_MENU true
#endif #endif
#define BOOKS_SETTINGS_PATH "org.monich/harbour.books"
#define BOOKS_DBUS_SERVICE BOOKS_DBUS_INTERFACE #define BOOKS_DBUS_SERVICE BOOKS_DBUS_INTERFACE
#define BOOKS_DCONF_ROOT "/apps/" BOOKS_APP_NAME "/" #define BOOKS_DCONF_ROOT "/apps/" BOOKS_APP_NAME "/"
#define BOOKS_DATA_ROOT "usr/share/" BOOKS_APP_NAME #define BOOKS_DATA_ROOT "usr/share/" BOOKS_APP_NAME

1
app/src/BooksStorage.cpp
View file

@ -104,6 +104,7 @@ BooksStorage::Private::Private(
{ {
QString cfgDir; QString cfgDir;
cfgDir = QString::fromStdString(ZLibrary::ApplicationWritableDirectory()); cfgDir = QString::fromStdString(ZLibrary::ApplicationWritableDirectory());
cfgDir.replace(QString(BOOKS_APP_NAME),QString(BOOKS_SETTINGS_PATH));
if (!cfgDir.endsWith('/')) cfgDir += '/'; if (!cfgDir.endsWith('/')) cfgDir += '/';
QString subDir; QString subDir;
switch (aType) { switch (aType) {