remove method to set start folder

pull/23/head
JuanJakobo 2022-07-20 15:21:07 +02:00
parent ef72cbe678
commit 83aa3b6eb4
5 changed files with 8 additions and 41 deletions

View File

@ -10,7 +10,6 @@ A basic client to access an existing nextcloud instance via Pocketbook.
* Remove files from local storage system * Remove files from local storage system
* Show local files that are saved but no longer available in the cloud * Show local files that are saved but no longer available in the cloud
* Open epub, pdf, text, html, word and mobi with default ebook reader application * Open epub, pdf, text, html, word and mobi with default ebook reader application
* Set Start folder to custom path
* Offline Modus * Offline Modus
* Navigaten via keys and touch * Navigaten via keys and touch

View File

@ -43,24 +43,6 @@ WebDAV::WebDAV()
_url = Util::accessConfig(CONFIG_PATH, Action::IReadString, "url"); _url = Util::accessConfig(CONFIG_PATH, Action::IReadString, "url");
} }
} }
/*
//TODO is just getDatastructure?
bool Nextcloud::login()
{
string tempPath = getStartFolder();
if (tempPath.empty())
tempPath = NEXTCLOUD_ROOT_PATH + this->getUUID() + "/";
if (setItems(getDataStructure(tempPath)))
{
_loggedIn = true;
return true;
}
return false;
}
*/
//TODO pass in vector and change that one? //TODO pass in vector and change that one?
@ -90,7 +72,6 @@ std::vector<WebDAVItem> WebDAV::login(const string &Url, const string &Username,
Util::accessConfig(CONFIG_PATH, Action::IWriteString, "username", Username); Util::accessConfig(CONFIG_PATH, Action::IWriteString, "username", Username);
Util::accessConfig(CONFIG_PATH, Action::IWriteString, "uuid", uuid); Util::accessConfig(CONFIG_PATH, Action::IWriteString, "uuid", uuid);
Util::accessConfig(CONFIG_PATH, Action::IWriteSecret, "password", Pass); Util::accessConfig(CONFIG_PATH, Action::IWriteSecret, "password", Pass);
Util::accessConfig(CONFIG_PATH, Action::IWriteString, "startFolder", tempPath);
} }
return tempItems; return tempItems;
} }

View File

@ -39,7 +39,6 @@ EventHandler::EventHandler()
//explanation on first login? //explanation on first login?
//TODO here mark folders that are unsynced? //TODO here mark folders that are unsynced?
//compare both datasets, if fromDB etag is different, mark as unsycned //compare both datasets, if fromDB etag is different, mark as unsycned
//std::string getStartFolder() { return Util::accessConfig(Action::IReadString, "startFolder"); };
string tempPath = NEXTCLOUD_ROOT_PATH + Util::accessConfig(CONFIG_PATH, Action::IReadString,"UUID"); string tempPath = NEXTCLOUD_ROOT_PATH + Util::accessConfig(CONFIG_PATH, Action::IReadString,"UUID");
_currentWebDAVItems = _webDAV.getDataStructure(tempPath); _currentWebDAVItems = _webDAV.getDataStructure(tempPath);
fromDB = _sqllite.getItemsChildren(tempPath); fromDB = _sqllite.getItemsChildren(tempPath);
@ -107,22 +106,13 @@ void EventHandler::mainMenuHandler(const int index)
{ {
switch (index) switch (index)
{ {
//TODO resync button //TODO actualize current folder
//offlineModus
case 101: case 101:
{ {
break; break;
} }
//Make startfolder
case 102:
{
//Util::accessConfig(Action::IWriteString, "startFolder", Path);
//Message(ICON_INFORMATION, "Info", ("On the next startup the folder" + _tempPath + " will be shown.").c_str(), 1200);
break;
}
//Logout //Logout
case 103: case 102:
{ {
int dialogResult = DialogSynchro(ICON_QUESTION, "Action", "Do you want to delete local files?", "Yes", "No", "Cancel"); int dialogResult = DialogSynchro(ICON_QUESTION, "Action", "Do you want to delete local files?", "Yes", "No", "Cancel");
switch (dialogResult) switch (dialogResult)
@ -142,13 +132,13 @@ void EventHandler::mainMenuHandler(const int index)
break; break;
} }
//Info //Info
case 104: case 103:
{ {
Message(ICON_INFORMATION, "Information", "Version 0.73 \n For support please open a ticket at https://github.com/JuanJakobo/Pocketbook-Nextcloud-Client/issues", 1200); Message(ICON_INFORMATION, "Information", "Version 0.73 \n For support please open a ticket at https://github.com/JuanJakobo/Pocketbook-Nextcloud-Client/issues", 1200);
break; break;
} }
//Exit //Exit
case 105: case 104:
CloseApp(); CloseApp();
break; break;
default: default:

View File

@ -40,7 +40,6 @@ MainMenu::~MainMenu()
CloseFont(_menuFont); CloseFont(_menuFont);
free(_syncFolder); free(_syncFolder);
free(_menu); free(_menu);
free(_makeStartfolder);
free(_logout); free(_logout);
free(_info); free(_info);
free(_exit); free(_exit);
@ -59,11 +58,10 @@ int MainMenu::createMenu(bool loggedIn, iv_menuhandler handler)
{ITEM_HEADER, 0, _menu, NULL}, {ITEM_HEADER, 0, _menu, NULL},
//show logged in //show logged in
{loggedIn ? (short)ITEM_ACTIVE : (short)ITEM_HIDDEN, 101, _syncFolder, NULL}, {loggedIn ? (short)ITEM_ACTIVE : (short)ITEM_HIDDEN, 101, _syncFolder, NULL},
{loggedIn ? (short)ITEM_ACTIVE : (short)ITEM_HIDDEN, 102, _makeStartfolder, NULL}, {loggedIn ? (short)ITEM_ACTIVE : (short)ITEM_HIDDEN, 102, _logout, NULL},
{loggedIn ? (short)ITEM_ACTIVE : (short)ITEM_HIDDEN, 103, _logout, NULL},
//show always //show always
{ITEM_ACTIVE, 104, _info, NULL}, {ITEM_ACTIVE, 103, _info, NULL},
{ITEM_ACTIVE, 105, _exit, NULL}, {ITEM_ACTIVE, 104, _exit, NULL},
{0, 0, NULL, NULL}}; {0, 0, NULL, NULL}};
OpenMenu(mainMenu, 0, _panelMenuBeginX, _panelMenuBeginY, handler); OpenMenu(mainMenu, 0, _panelMenuBeginX, _panelMenuBeginY, handler);

View File

@ -50,8 +50,7 @@ private:
irect _contentRect; irect _contentRect;
char *_menu = strdup("Menu"); char *_menu = strdup("Menu");
char *_syncFolder = strdup("Sync folder"); char *_syncFolder = strdup("Actualize folder");
char *_makeStartfolder = strdup("Make startfolder");
char *_logout = strdup("Logout"); char *_logout = strdup("Logout");
char *_info = strdup("Info"); char *_info = strdup("Info");
char *_exit = strdup("Close App"); char *_exit = strdup("Close App");