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

small fixes

Browse Source
This commit is contained in:
arcan1s 2014-07-17 19:36:15 +04:00
parent 78827d833d
commit 31f52e5d22
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sources/gui/src/wirelesswidget.cpp
View File

@ -63,6 +63,7 @@ void WirelessWidget::clear()
ui->comboBox_drivers->setCurrentIndex(0); ui->comboBox_drivers->setCurrentIndex(0);
ui->listWidget_drivers->setCurrentRow(-1); ui->listWidget_drivers->setCurrentRow(-1);
ui->listWidget_drivers->clear(); ui->listWidget_drivers->clear();
ui->comboBox_rfkill->clear();
ui->comboBox_rfkill->addItem(QString("auto")); ui->comboBox_rfkill->addItem(QString("auto"));
if (rfkillDirectory->exists()) { if (rfkillDirectory->exists()) {
QStringList rfkillDevices = rfkillDirectory->entryList(QDir::Dirs | QDir::NoDotAndDotDot); QStringList rfkillDevices = rfkillDirectory->entryList(QDir::Dirs | QDir::NoDotAndDotDot);

24
sources/netctlgui/src/netctlinteract.cpp
View File

@ -323,31 +323,32 @@ QList<QStringList> Netctl::getProfileListFromNetctlAuto()
/** /**
* @fn getProfileDescription * @fn getProfileDescription
*/ */
QString Netctl::getProfileDescription(const QString profileName) QString Netctl::getProfileDescription(const QString profile)
{ {
if (debug) qDebug() << "[Netctl]" << "[getProfileDescription]"; if (debug) qDebug() << "[Netctl]" << "[getProfileDescription]";
if (debug) qDebug() << "[Netctl]" << "[getProfileDescription]" << ":" << "Profile" << profileName; if (debug) qDebug() << "[Netctl]" << "[getProfileDescription]" << ":" << "Profile" << profile;
if (profileDirectory == 0) { if (profileDirectory == 0) {
if (debug) qDebug() << "[Netctl]" << "[getProfileDescription]" << ":" << "Could not find directory"; if (debug) qDebug() << "[Netctl]" << "[getProfileDescription]" << ":" << "Could not find directory";
return QString(); return QString();
} }
QString description = QString("<unknown>"); QString description = QString("<unknown>");
QString profileUrl = profileDirectory->absolutePath() + QDir::separator() + profileName; QString profileUrl = profileDirectory->absolutePath() + QDir::separator() + profile;
if (debug) qDebug() << "[Netctl]" << "[getProfileDescription]" << ":" << "Check" << profileUrl; if (debug) qDebug() << "[Netctl]" << "[getProfileDescription]" << ":" << "Check" << profileUrl;
QFile profile(profileUrl); QFile profileFile(profileUrl);
QString fileStr; QString fileStr;
if (!profile.open(QIODevice::ReadOnly)) if (!profileFile.open(QIODevice::ReadOnly))
return description; return description;
while (true) { while (true) {
fileStr = QString(profile.readLine()); fileStr = QString(profileFile.readLine());
if (fileStr[0] == QChar('#')) continue; if (fileStr[0] == QChar('#')) continue;
if (fileStr.split(QChar('='), QString::SkipEmptyParts).count() == 2) if (fileStr.split(QChar('='), QString::SkipEmptyParts).count() == 2)
if (fileStr.split(QChar('='), QString::SkipEmptyParts)[0] == QString("Description")) if (fileStr.split(QChar('='), QString::SkipEmptyParts)[0] == QString("Description"))
description = fileStr.split(QChar('='), QString::SkipEmptyParts)[1].trimmed(); description = fileStr.split(QChar('='), QString::SkipEmptyParts)[1].trimmed();
if (profile.atEnd()) if (profileFile.atEnd())
break; break;
} }
profileFile.close();
description.remove(QChar('\'')).remove(QChar('"')); description.remove(QChar('\'')).remove(QChar('"'));
return description; return description;
@ -371,21 +372,22 @@ QStringList Netctl::getProfileDescriptions(const QStringList profileList)
QString description = QString("<unknown>"); QString description = QString("<unknown>");
QString profileUrl = profileDirectory->absolutePath() + QDir::separator() + profileList[i]; QString profileUrl = profileDirectory->absolutePath() + QDir::separator() + profileList[i];
if (debug) qDebug() << "[Netctl]" << "[getProfileDescriptions]" << ":" << "Check" << profileUrl; if (debug) qDebug() << "[Netctl]" << "[getProfileDescriptions]" << ":" << "Check" << profileUrl;
QFile profile(profileUrl); QFile profileFile(profileUrl);
QString fileStr; QString fileStr;
if (!profile.open(QIODevice::ReadOnly)) { if (!profileFile.open(QIODevice::ReadOnly)) {
descriptions.append(description); descriptions.append(description);
continue; continue;
} }
while (true) { while (true) {
fileStr = QString(profile.readLine()); fileStr = QString(profileFile.readLine());
if (fileStr[0] == QChar('#')) continue; if (fileStr[0] == QChar('#')) continue;
if (fileStr.split(QChar('='), QString::SkipEmptyParts).count() == 2) if (fileStr.split(QChar('='), QString::SkipEmptyParts).count() == 2)
if (fileStr.split(QChar('='), QString::SkipEmptyParts)[0] == QString("Description")) if (fileStr.split(QChar('='), QString::SkipEmptyParts)[0] == QString("Description"))
description = fileStr.split(QChar('='), QString::SkipEmptyParts)[1].trimmed(); description = fileStr.split(QChar('='), QString::SkipEmptyParts)[1].trimmed();
if (profile.atEnd()) if (profileFile.atEnd())
break; break;
} }
profileFile.close();
description.remove(QChar('\'')).remove(QChar('"')); description.remove(QChar('\'')).remove(QChar('"'));
descriptions.append(description); descriptions.append(description);
} }