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

release 1.1.0

Browse Source
This commit is contained in:
arcan1s
2014-05-14 23:55:13 +04:00
parent 3506bd46a9
commit d582445597
11 changed files with 85 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,16 +190,7 @@ bool Netctl::isProfileActive(const QString profile)
bool Netctl::isProfileEnabled(const QString profile)
{
bool status = false;
QString cmdOutput = getNetctlOutput(false, QString("status"), profile);
if (!cmdOutput.isEmpty()) {
QStringList profileStatus = cmdOutput.split(QString("\n"), QString::SkipEmptyParts);
for (int i=0; i<profileStatus.count(); i++)
if (profileStatus[i].split(QString(" "), QString::SkipEmptyParts)[0] == QString("Loaded:"))
if (profileStatus[i].contains(QString("enabled")))
status = true;
}
return status;
return netctlCall(false, QString("is-enabled"), profile);
}

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

@ -56,6 +56,7 @@ void WirelessWidget::clear()
ui->spinBox_freq->setValue(2412);
ui->listWidget_freq->setCurrentRow(-1);
ui->listWidget_freq->clear();
ui->spinBox_frequency->setValue(2000);
ui->spinBox_priority->setValue(0);
ui->lineEdit_country->clear();
ui->lineEdit_wpaGroup->setText(QString("wheel"));
@ -240,6 +241,8 @@ QMap<QString, QString> WirelessWidget::getSettings()
freqs.append(ui->listWidget_freq->item(i)->text());
wirelessSettings[QString("ScanFrequencies")] = freqs.join(QString(" "));
}
if (ui->spinBox_frequency->value() != 2000)
wirelessSettings[QString("Frequency")] = QString::number(ui->spinBox_frequency->value());
if (ui->spinBox_priority->value() != 0)
wirelessSettings[QString("Priority")] = QString::number(ui->spinBox_priority->value());
if (!ui->lineEdit_country->text().isEmpty())
@ -324,6 +327,8 @@ void WirelessWidget::setSettings(const QMap<QString, QString> settings)
ui->checkBox_adhoc->setCheckState(Qt::Checked);
if (wirelessSettings.contains(QString("ScanFrequencies")))
ui->listWidget_freq->addItems(wirelessSettings[QString("ScanFrequencies")].split(QString("\n")));
if (wirelessSettings.contains(QString("Frequency")))
ui->spinBox_frequency->setValue(wirelessSettings[QString("Frequency")].toInt());
if (wirelessSettings.contains(QString("Priority")))
ui->spinBox_priority->setValue(wirelessSettings[QString("Priority")].toInt());
if (wirelessSettings.contains(QString("Country")))

31
sources/gui/src/wirelesswidget.ui
View File

@ -305,6 +305,36 @@
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="layout_frequency">
<item>
<widget class="QLabel" name="label_frequency">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Frequency</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_frequency">
<property name="toolTip">
<string>Priority group for the network</string>
</property>
<property name="minimum">
<number>2000</number>
</property>
<property name="maximum">
<number>6000</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="layout_priority">
<item>
@ -525,6 +555,7 @@
<tabstop>spinBox_freq</tabstop>
<tabstop>pushButton_freq</tabstop>
<tabstop>listWidget_freq</tabstop>
<tabstop>spinBox_frequency</tabstop>
<tabstop>spinBox_priority</tabstop>
<tabstop>lineEdit_country</tabstop>
<tabstop>lineEdit_wpaGroup</tabstop>