Merge pull request 'aurora_fixes' (#3) from aurora_fixes into master
Reviewed-on: #3
This commit is contained in:
commit
b8129b4e62
4 changed files with 5 additions and 1 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -6,8 +6,10 @@ moc_*.cpp
|
||||||
*.moc
|
*.moc
|
||||||
Makefile
|
Makefile
|
||||||
*.a
|
*.a
|
||||||
|
*.so
|
||||||
*.list
|
*.list
|
||||||
org.monich.harbour.books*.qm
|
org.monich.harbour.books*.qm
|
||||||
org.monich.harbour.books*.ts
|
org.monich.harbour.books*.ts
|
||||||
org.monich.harbour.books
|
org.monich.harbour.books
|
||||||
RPMS/
|
RPMS/
|
||||||
|
.DS_Store
|
||||||
|
|
|
@ -18,5 +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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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) {
|
||||||
|
|
Loading…
Reference in a new issue