From 83aa3b6eb40a16a470d4cddb100b2317f956f2bf Mon Sep 17 00:00:00 2001 From: JuanJakobo Date: Wed, 20 Jul 2022 15:21:07 +0200 Subject: [PATCH] remove method to set start folder --- README.md | 1 - src/api/webDAV.cpp | 19 ------------------- src/handler/eventHandler.cpp | 18 ++++-------------- src/handler/mainMenu.cpp | 8 +++----- src/handler/mainMenu.h | 3 +-- 5 files changed, 8 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 0739a6b..72eca44 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,6 @@ A basic client to access an existing nextcloud instance via Pocketbook. * Remove files from local storage system * 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 -* Set Start folder to custom path * Offline Modus * Navigaten via keys and touch diff --git a/src/api/webDAV.cpp b/src/api/webDAV.cpp index 3dc0b94..14be03a 100644 --- a/src/api/webDAV.cpp +++ b/src/api/webDAV.cpp @@ -43,24 +43,6 @@ WebDAV::WebDAV() _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? @@ -90,7 +72,6 @@ std::vector WebDAV::login(const string &Url, const string &Username, Util::accessConfig(CONFIG_PATH, Action::IWriteString, "username", Username); Util::accessConfig(CONFIG_PATH, Action::IWriteString, "uuid", uuid); Util::accessConfig(CONFIG_PATH, Action::IWriteSecret, "password", Pass); - Util::accessConfig(CONFIG_PATH, Action::IWriteString, "startFolder", tempPath); } return tempItems; } diff --git a/src/handler/eventHandler.cpp b/src/handler/eventHandler.cpp index 2e103ef..21ac5d8 100644 --- a/src/handler/eventHandler.cpp +++ b/src/handler/eventHandler.cpp @@ -39,7 +39,6 @@ EventHandler::EventHandler() //explanation on first login? //TODO here mark folders that are unsynced? //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"); _currentWebDAVItems = _webDAV.getDataStructure(tempPath); fromDB = _sqllite.getItemsChildren(tempPath); @@ -107,22 +106,13 @@ void EventHandler::mainMenuHandler(const int index) { switch (index) { - //TODO resync button - //offlineModus + //TODO actualize current folder case 101: { 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 - case 103: + case 102: { int dialogResult = DialogSynchro(ICON_QUESTION, "Action", "Do you want to delete local files?", "Yes", "No", "Cancel"); switch (dialogResult) @@ -142,13 +132,13 @@ void EventHandler::mainMenuHandler(const int index) break; } //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); break; } //Exit - case 105: + case 104: CloseApp(); break; default: diff --git a/src/handler/mainMenu.cpp b/src/handler/mainMenu.cpp index fafd04c..8e7c279 100644 --- a/src/handler/mainMenu.cpp +++ b/src/handler/mainMenu.cpp @@ -40,7 +40,6 @@ MainMenu::~MainMenu() CloseFont(_menuFont); free(_syncFolder); free(_menu); - free(_makeStartfolder); free(_logout); free(_info); free(_exit); @@ -59,11 +58,10 @@ int MainMenu::createMenu(bool loggedIn, iv_menuhandler handler) {ITEM_HEADER, 0, _menu, NULL}, //show logged in {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, 103, _logout, NULL}, + {loggedIn ? (short)ITEM_ACTIVE : (short)ITEM_HIDDEN, 102, _logout, NULL}, //show always - {ITEM_ACTIVE, 104, _info, NULL}, - {ITEM_ACTIVE, 105, _exit, NULL}, + {ITEM_ACTIVE, 103, _info, NULL}, + {ITEM_ACTIVE, 104, _exit, NULL}, {0, 0, NULL, NULL}}; OpenMenu(mainMenu, 0, _panelMenuBeginX, _panelMenuBeginY, handler); diff --git a/src/handler/mainMenu.h b/src/handler/mainMenu.h index a5a4960..b5ba01f 100644 --- a/src/handler/mainMenu.h +++ b/src/handler/mainMenu.h @@ -50,8 +50,7 @@ private: irect _contentRect; char *_menu = strdup("Menu"); - char *_syncFolder = strdup("Sync folder"); - char *_makeStartfolder = strdup("Make startfolder"); + char *_syncFolder = strdup("Actualize folder"); char *_logout = strdup("Logout"); char *_info = strdup("Info"); char *_exit = strdup("Close App");