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

Books -> Documents/Books for the internal storage

Browse source 
To safisfy Jolla harbour requirements
This commit is contained in:
Slava Monich 2015-07-06 17:16:17 +03:00
parent 6385be36c0
commit 54247bb4d0
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/BooksDefs.h
View file

@ -43,7 +43,8 @@
#define BOOKS_DATA_DIR BOOKS_DATA_ROOT "/data"
#define BOOKS_QML_FILE BOOKS_QML_DIR "/BooksMain.qml"
#define BOOKS_ROOT_SHELF_DIR "Books"
#define BOOKS_INTERNAL_ROOT "Documents/Books"
#define BOOKS_REMOVABLE_ROOT "Books"
#define BOOKS_QML_PLUGIN "harbour.books"
#define BOOKS_QML_PLUGIN_V1 1

6
app/src/BooksStorage.cpp
View file

@ -275,7 +275,7 @@ BooksStorageManager::Private::Private() :
QString homeBooks = QDir::homePath();
QString homeMount(BooksStorage::Private::mountPoint(homeBooks));
if (!homeBooks.endsWith('/')) homeBooks += '/';
homeBooks += QLatin1String(BOOKS_ROOT_SHELF_DIR);
homeBooks += QLatin1String(BOOKS_INTERNAL_ROOT);
HDEBUG("home mount" << qPrintable(homeMount));
HDEBUG("home books path" << qPrintable(homeBooks));
@ -297,7 +297,7 @@ BooksStorageManager::Private::Private() :
QString dev = entries.at(0);
QString path = mount;
if (!path.endsWith('/')) path += '/';
path += QLatin1String(BOOKS_ROOT_SHELF_DIR);
path += QLatin1String(BOOKS_REMOVABLE_ROOT);
HDEBUG("removable device" << dev << path);
iStorageList.append(BooksStorage(dev, path, false));
}
@ -486,7 +486,7 @@ bool BooksStorageManager::scanMounts()
if (index < 0) {
QString path = mount;
if (!path.endsWith('/')) path += '/';
path += QLatin1String(BOOKS_ROOT_SHELF_DIR);
path += QLatin1String(BOOKS_REMOVABLE_ROOT);
HDEBUG("new removable device" << dev << path);
BooksStorage storage(dev, path, false);
iPrivate->iStorageList.append(storage);