arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-07-07 02:55:47 +00:00
Code Issues Projects Releases Wiki Activity

add debug information

Browse Source 
fix reading files
This commit is contained in:
arcan1s
2014-07-21 11:58:42 +04:00
parent 6cba836d98
commit 0070f910cc
9 changed files with 206 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sources/gui/src/language.cpp
View File

@ -60,28 +60,28 @@ QString Language::defineLanguage(const QString configPath, const QString options
QString Language::defineLanguageFromFile(const QString configPath)
{
QString language;
QMap<QString, QString> settings;
if (configPath.isEmpty())
return language;
return QString("");
QFile configFile(configPath);
QString fileStr;
if (!configFile.open(QIODevice::ReadOnly))
return language;
return QString("");
while (true) {
fileStr = QString(configFile.readLine());
if (fileStr.isEmpty()) continue;
if (fileStr[0] == QChar('#')) continue;
if (fileStr[0] == QChar(';')) continue;
if (fileStr.contains(QString("LANGUAGE=")))
language = fileStr.split(QChar('='))[1]
.remove(QChar(' '))
.trimmed();
if (configFile.atEnd())
break;
fileStr = QString(configFile.readLine()).trimmed();
if ((fileStr.isEmpty()) && (!configFile.atEnd())) continue;
if ((fileStr[0] == QChar('#')) && (!configFile.atEnd())) continue;
if ((fileStr[0] == QChar(';')) && (!configFile.atEnd())) continue;
if ((!fileStr.contains(QChar('='))) && (!configFile.atEnd())) continue;
settings[fileStr.split(QChar('='))[0]] = fileStr.split(QChar('='))[1];
if (configFile.atEnd()) break;
}
configFile.close();
return language;
if (settings.contains(QString("LANGUAGE")))
return settings[QString("LANGUAGE")];
else
return QString("");
}

11
sources/gui/src/settingswindow.cpp
View File

@ -358,13 +358,12 @@ QMap<QString, QString> SettingsWindow::getSettings()
return settings;
while (true) {
fileStr = QString(configFile.readLine()).trimmed();
if (fileStr.isEmpty()) continue;
if (fileStr[0] == QChar('#')) continue;
if (fileStr[0] == QChar(';')) continue;
if (!fileStr.contains(QChar('='))) continue;
if ((fileStr.isEmpty()) && (!configFile.atEnd())) continue;
if ((fileStr[0] == QChar('#')) && (!configFile.atEnd())) continue;
if ((fileStr[0] == QChar(';')) && (!configFile.atEnd())) continue;
if ((!fileStr.contains(QChar('='))) && (!configFile.atEnd())) continue;
settings[fileStr.split(QChar('='))[0]] = fileStr.split(QChar('='))[1];
if (configFile.atEnd())
break;
if (configFile.atEnd()) break;
}
configFile.close();
for (int i=0; i<settings.keys().count(); i++)