RPJosh
/
Pocketbook-Nextcloud-Client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

increase log for download of Datastructure

pull/23/head 0.72
JuanJakobo 2021-07-05 13:09:45 +02:00
parent e40ece141f
commit c529b6394a
4 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -1,6 +1,6 @@
PROJECT (Pocketbook-Nextcloud-Client)
CMAKE_MINIMUM_REQUIRED (VERSION 3.10.1)
PROJECT (Pocketbook-Miniflux-Reader VERSION 0.72)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_SYSTEM_NAME Linux)

2
src/handler/eventHandler.cpp
View File

@ -120,7 +120,7 @@ void EventHandler::mainMenuHandler(const int index)
//Info
case 104:
{
Message(ICON_INFORMATION, "Warning", "Version 0.62 \n For support please open a ticket at https://github.com/JuanJakobo/Pocketbook-Nextcloud-Client/issues", 1200);
Message(ICON_INFORMATION, "Information", "Version 0.72 \n For support please open a ticket at https://github.com/JuanJakobo/Pocketbook-Nextcloud-Client/issues", 1200);
break;
}
//Exit

82
src/ui/loginView.cpp
View File

@ -58,47 +58,6 @@ LoginView::~LoginView()
CloseFont(_loginFont);
}
void LoginView::keyboardHandlerStatic(char *text)
{
_loginViewStatic->keyboardHandler(text);
}
void LoginView::keyboardHandler(char *text)
{
if (!text)
return;
string s(text);
if (s.empty())
return;
if (_target == KeyboardTarget::IURL)
{
_url = s.c_str();
FillAreaRect(&_urlButton, WHITE);
DrawTextRect2(&_urlButton, s.c_str());
}
else if (_target == KeyboardTarget::IUSERNAME)
{
_username = s.c_str();
FillAreaRect(&_usernameButton, WHITE);
DrawTextRect2(&_usernameButton, s.c_str());
}
else
{
_password = s.c_str();
FillAreaRect(&_passwordButton, WHITE);
string pass;
for (unsigned int i = 0; i < s.length(); i++)
{
pass += "*";
}
DrawTextRect2(&_passwordButton, pass.c_str());
}
}
int LoginView::logginClicked(int x, int y)
{
_temp = "";
@ -142,4 +101,45 @@ int LoginView::logginClicked(int x, int y)
}
return 0;
}
void LoginView::keyboardHandlerStatic(char *text)
{
_loginViewStatic->keyboardHandler(text);
}
void LoginView::keyboardHandler(char *text)
{
if (!text)
return;
string s(text);
if (s.empty())
return;
if (_target == KeyboardTarget::IURL)
{
_url = s.c_str();
FillAreaRect(&_urlButton, WHITE);
DrawTextRect2(&_urlButton, s.c_str());
}
else if (_target == KeyboardTarget::IUSERNAME)
{
_username = s.c_str();
FillAreaRect(&_usernameButton, WHITE);
DrawTextRect2(&_usernameButton, s.c_str());
}
else
{
_password = s.c_str();
FillAreaRect(&_passwordButton, WHITE);
string pass;
for (unsigned int i = 0; i < s.length(); i++)
{
pass += "*";
}
DrawTextRect2(&_passwordButton, pass.c_str());
}
}

1
src/util/nextcloud.cpp
View File

@ -309,6 +309,7 @@ vector<Item> Nextcloud::getDataStructure(const string &pathUrl, const string &Us
}
Log::writeLog("Starting download of DataStructure");
Log::writeLog(_url + pathUrl);
string readBuffer;
CURLcode res;