parent
e40ece141f
commit
c529b6394a
|
@ -1,6 +1,6 @@
|
||||||
PROJECT (Pocketbook-Nextcloud-Client)
|
|
||||||
|
|
||||||
CMAKE_MINIMUM_REQUIRED (VERSION 3.10.1)
|
CMAKE_MINIMUM_REQUIRED (VERSION 3.10.1)
|
||||||
|
|
||||||
|
PROJECT (Pocketbook-Miniflux-Reader VERSION 0.72)
|
||||||
set(CMAKE_CXX_STANDARD 14)
|
set(CMAKE_CXX_STANDARD 14)
|
||||||
|
|
||||||
set(CMAKE_SYSTEM_NAME Linux)
|
set(CMAKE_SYSTEM_NAME Linux)
|
||||||
|
|
|
@ -120,7 +120,7 @@ void EventHandler::mainMenuHandler(const int index)
|
||||||
//Info
|
//Info
|
||||||
case 104:
|
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;
|
break;
|
||||||
}
|
}
|
||||||
//Exit
|
//Exit
|
||||||
|
|
|
@ -58,47 +58,6 @@ LoginView::~LoginView()
|
||||||
CloseFont(_loginFont);
|
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)
|
int LoginView::logginClicked(int x, int y)
|
||||||
{
|
{
|
||||||
_temp = "";
|
_temp = "";
|
||||||
|
@ -142,4 +101,45 @@ int LoginView::logginClicked(int x, int y)
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
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());
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -309,6 +309,7 @@ vector<Item> Nextcloud::getDataStructure(const string &pathUrl, const string &Us
|
||||||
}
|
}
|
||||||
|
|
||||||
Log::writeLog("Starting download of DataStructure");
|
Log::writeLog("Starting download of DataStructure");
|
||||||
|
Log::writeLog(_url + pathUrl);
|
||||||
|
|
||||||
string readBuffer;
|
string readBuffer;
|
||||||
CURLcode res;
|
CURLcode res;
|
||||||
|
|
Loading…
Reference in New Issue