mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: font color isn't supported on app log page

Browse source 
So let's remove all that markup.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-03-13 08:58:57 -07:00
parent 3efa20820a
commit 087cda05e6
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
qt-mobile/qmlmanager.cpp
View file

@ -75,7 +75,7 @@ void QMLManager::openLocalThenRemote(QString url)
int error = parse_file(fileNamePrt.data()); int error = parse_file(fileNamePrt.data());
prefs.git_local_only = false; prefs.git_local_only = false;
if (error) { if (error) {
appendTextToLog(QStringLiteral("<font color=\"red\">loading dives from cache failed %1</font>").arg(error)); appendTextToLog(QStringLiteral("loading dives from cache failed %1").arg(error));
} else { } else {
// if we can load from the cache, we know that we have at least a valid email // if we can load from the cache, we know that we have at least a valid email
if (credentialStatus() == UNKNOWN) if (credentialStatus() == UNKNOWN)
@ -112,7 +112,7 @@ void QMLManager::finishSetup()
openLocalThenRemote(url); openLocalThenRemote(url);
} else { } else {
setCredentialStatus(INCOMPLETE); setCredentialStatus(INCOMPLETE);
appendTextToLog(QStringLiteral("<font color=\"red\">no cloud credentials</font>")); appendTextToLog(QStringLiteral("no cloud credentials"));
setStartPageText(RED_FONT + tr("Please enter valid cloud credentials.") + END_FONT); setStartPageText(RED_FONT + tr("Please enter valid cloud credentials.") + END_FONT);
} }
setDistanceThreshold(prefs.distance_threshold); setDistanceThreshold(prefs.distance_threshold);
@ -259,7 +259,7 @@ void QMLManager::handleError(QNetworkReply::NetworkError nError)
void QMLManager::retrieveUserid() void QMLManager::retrieveUserid()
{ {
if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) != 302) { if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) != 302) {
appendTextToLog(QStringLiteral("<font color=\"red\">Cloud storage connection not working correctly: %1 </font>").arg(QString(reply->readAll()))); appendTextToLog(QStringLiteral("Cloud storage connection not working correctly: %1").arg(QString(reply->readAll())));
setAccessingCloud(false); setAccessingCloud(false);
return; return;
} }
@ -267,7 +267,7 @@ void QMLManager::retrieveUserid()
QString userid(prefs.userid); QString userid(prefs.userid);
if (userid.isEmpty()) { if (userid.isEmpty()) {
if (same_string(prefs.cloud_storage_email, "") || same_string(prefs.cloud_storage_password, "")) { if (same_string(prefs.cloud_storage_email, "") || same_string(prefs.cloud_storage_password, "")) {
appendTextToLog("<font color=\"red\">cloud user name or password are empty, can't retrieve web user id</font>"); appendTextToLog("cloud user name or password are empty, can't retrieve web user id");
setAccessingCloud(false); setAccessingCloud(false);
return; return;
} }
@ -298,7 +298,7 @@ void QMLManager::loadDiveProgress(int percent)
void QMLManager::loadDivesWithValidCredentials() void QMLManager::loadDivesWithValidCredentials()
{ {
if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) != 302) { if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) != 302) {
appendTextToLog(QStringLiteral("<font color=\"red\">Cloud storage connection not working correctly: </font>") + reply->readAll()); appendTextToLog(QStringLiteral("Cloud storage connection not working correctly: ") + reply->readAll());
setStartPageText(RED_FONT + tr("Cannot connect to cloud storage") + END_FONT); setStartPageText(RED_FONT + tr("Cannot connect to cloud storage") + END_FONT);
setAccessingCloud(false); setAccessingCloud(false);
return; return;