arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-04-24 15:37:23 +00:00
Code Issues Projects Releases Wiki Activity

settings type has been changed from QHash to QMap

Browse Source
This commit is contained in:
arcan1s 2014-02-26 04:07:50 +04:00
parent 9184aa78f4
commit 9b3902e971
25 changed files with 81 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sources/gui/show_scripts
View File

@ -1,4 +0,0 @@
#!/bin/bash
kate /usr/lib/network/wpa /usr/lib/network/globals /usr/bin/wifi-menu &> /dev/null

6
sources/gui/src/bridgewidget.cpp
View File

@ -49,9 +49,9 @@ void BridgeWidget::setShown(bool state)
}
QHash<QString, QString> BridgeWidget::getSettings()
QMap<QString, QString> BridgeWidget::getSettings()
{
QHash<QString, QString> bridgeSettings;
QMap<QString, QString> bridgeSettings;
if (isOk() == 0) {
if (ui->checkBox_skip->checkState() == Qt::Checked)
@ -69,7 +69,7 @@ int BridgeWidget::isOk()
}
void BridgeWidget::setSettings(QHash<QString, QString> settings)
void BridgeWidget::setSettings(QMap<QString, QString> settings)
{
if (settings.contains(QString("SkipForwardingDelay")))
if (settings[QString("SkipForwardingDelay")].remove(QString("'")) == QString("yes"))

4
sources/gui/src/bridgewidget.h
View File

@ -32,9 +32,9 @@ class BridgeWidget : public QWidget
public:
explicit BridgeWidget(QWidget *parent = 0);
~BridgeWidget();
QHash<QString, QString> getSettings();
QMap<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
void setSettings(QMap<QString, QString> settings);
public slots:
void clear();

6
sources/gui/src/ethernetwidget.cpp
View File

@ -105,9 +105,9 @@ void EthernetWidget::showWpa(int state)
}
QHash<QString, QString> EthernetWidget::getSettings()
QMap<QString, QString> EthernetWidget::getSettings()
{
QHash<QString, QString> ethernetSettings;
QMap<QString, QString> ethernetSettings;
if (isOk() == 0) {
if (ui->checkBox_skip->checkState() == Qt::Checked)
@ -138,7 +138,7 @@ int EthernetWidget::isOk()
}
void EthernetWidget::setSettings(QHash<QString, QString> settings)
void EthernetWidget::setSettings(QMap<QString, QString> settings)
{
if (settings.contains(QString("SkipNoCarrier")))
if (settings[QString("SkipNoCarrier")].remove(QString("'")) == QString("yes"))

6
sources/gui/src/ethernetwidget.h
View File

@ -18,7 +18,7 @@
#ifndef ETHERNETWIDGET_H
#define ETHERNETWIDGET_H
#include <QHash>
#include <QMap>
#include <QWidget>
@ -33,9 +33,9 @@ class EthernetWidget : public QWidget
public:
explicit EthernetWidget(QWidget *parent = 0);
~EthernetWidget();
QHash<QString, QString> getSettings();
QMap<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
void setSettings(QMap<QString, QString> settings);
public slots:
void clear();

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

@ -121,9 +121,9 @@ void GeneralWidget::showAdvanced()
}
QHash<QString, QString> GeneralWidget::getSettings()
QMap<QString, QString> GeneralWidget::getSettings()
{
QHash<QString, QString> generalSettings;
QMap<QString, QString> generalSettings;
if (isOk() == 0) {
generalSettings[QString("Description")] = QString("'") + ui->lineEdit_description->text() + QString("'");
@ -147,6 +147,8 @@ QHash<QString, QString> GeneralWidget::getSettings()
generalSettings[QString("ExecDownPre")] = QString("'") + ui->lineEdit_execDownPre->text() + QString("'");
if (ui->checkBox_forceConnect->checkState() == Qt::Checked)
generalSettings[QString("ForceConnect")] = QString("yes");
if (ui->checkBox_debug->checkState() == Qt::Checked)
generalSettings[QString("NETCTL_DEBUG")] = QString("yes");
}
return generalSettings;
@ -168,7 +170,7 @@ int GeneralWidget::isOk()
}
void GeneralWidget::setSettings(QHash<QString, QString> settings)
void GeneralWidget::setSettings(QMap<QString, QString> settings)
{
if (settings.contains(QString("Description")))
ui->lineEdit_description->setText(settings[QString("Description")].remove(QString("'")));
@ -191,4 +193,7 @@ void GeneralWidget::setSettings(QHash<QString, QString> settings)
if (settings.contains(QString("ForceConnect")))
if (settings[QString("ForceConnect")].remove(QString("'")) == QString("yes"))
ui->checkBox_forceConnect->setCheckState(Qt::Checked);
if (settings.contains(QString("NETCTL_DEBUG")))
if (settings[QString("NETCTL_DEBUG")].remove(QString("'")) == QString("yes"))
ui->checkBox_debug->setCheckState(Qt::Checked);
}

6
sources/gui/src/generalwidget.h
View File

@ -20,7 +20,7 @@
#include <QComboBox>
#include <QDir>
#include <QHash>
#include <QMap>
#include <QWidget>
@ -38,9 +38,9 @@ public:
QString profileDir = QString(""));
~GeneralWidget();
QComboBox *connectionType;
QHash<QString, QString> getSettings();
QMap<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
void setSettings(QMap<QString, QString> settings);
public slots:
void clear();

7
sources/gui/src/generalwidget.ui
View File

@ -333,6 +333,13 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_debug">
<property name="text">
<string>Debug mode</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

6
sources/gui/src/ipwidget.cpp
View File

@ -376,9 +376,9 @@ void IpWidget::showAdvanced()
}
QHash<QString, QString> IpWidget::getSettings()
QMap<QString, QString> IpWidget::getSettings()
{
QHash<QString, QString> ipSettings;
QMap<QString, QString> ipSettings;
if (isOk() == 0) {
if (ui->checkBox_ip->checkState() == Qt::Checked) {
@ -485,7 +485,7 @@ int IpWidget::isOk()
}
void IpWidget::setSettings(QHash<QString, QString> settings)
void IpWidget::setSettings(QMap<QString, QString> settings)
{
if (settings.contains(QString("IP"))) {
if (settings[QString("IP")].remove(QString("'")) == QString("no"))

4
sources/gui/src/ipwidget.h
View File

@ -32,9 +32,9 @@ class IpWidget : public QWidget
public:
explicit IpWidget(QWidget *parent = 0);
~IpWidget();
QHash<QString, QString> getSettings();
QMap<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
void setSettings(QMap<QString, QString> settings);
public slots:
void clear();

24
sources/gui/src/mainwindow.cpp
View File

@ -680,10 +680,10 @@ void MainWindow::profileTabCreateProfile()
ui->tabWidget->setDisabled(true);
// read settings
QString profile = ui->lineEdit_profile->text();
QHash<QString, QString> settings;
QMap<QString, QString> settings;
settings = generalWid->getSettings();
if (generalWid->connectionType->currentText() == QString("ethernet")) {
QHash<QString, QString> addSettings = ipWid->getSettings();
QMap<QString, QString> addSettings = ipWid->getSettings();
for (int i=0; i<addSettings.keys().count(); i++)
settings.insert(addSettings.keys()[i], addSettings[addSettings.keys()[i]]);
addSettings = ethernetWid->getSettings();
@ -691,7 +691,7 @@ void MainWindow::profileTabCreateProfile()
settings.insert(addSettings.keys()[i], addSettings[addSettings.keys()[i]]);
}
else if (generalWid->connectionType->currentText() == QString("wireless")) {
QHash<QString, QString> addSettings = ipWid->getSettings();
QMap<QString, QString> addSettings = ipWid->getSettings();
for (int i=0; i<addSettings.keys().count(); i++)
settings.insert(addSettings.keys()[i], addSettings[addSettings.keys()[i]]);
addSettings = wirelessWid->getSettings();
@ -700,12 +700,12 @@ void MainWindow::profileTabCreateProfile()
}
else if ((generalWid->connectionType->currentText() == QString("bond")) ||
(generalWid->connectionType->currentText() == QString("dummy"))) {
QHash<QString, QString> addSettings = ipWid->getSettings();
QMap<QString, QString> addSettings = ipWid->getSettings();
for (int i=0; i<addSettings.keys().count(); i++)
settings.insert(addSettings.keys()[i], addSettings[addSettings.keys()[i]]);
}
else if (generalWid->connectionType->currentText() == QString("bridge")) {
QHash<QString, QString> addSettings = ipWid->getSettings();
QMap<QString, QString> addSettings = ipWid->getSettings();
for (int i=0; i<addSettings.keys().count(); i++)
settings.insert(addSettings.keys()[i], addSettings[addSettings.keys()[i]]);
addSettings = bridgeWid->getSettings();
@ -713,17 +713,17 @@ void MainWindow::profileTabCreateProfile()
settings.insert(addSettings.keys()[i], addSettings[addSettings.keys()[i]]);
}
else if (generalWid->connectionType->currentText() == QString("pppoe")) {
QHash<QString, QString> addSettings = pppoeWid->getSettings();
QMap<QString, QString> addSettings = pppoeWid->getSettings();
for (int i=0; i<addSettings.keys().count(); i++)
settings.insert(addSettings.keys()[i], addSettings[addSettings.keys()[i]]);
}
else if (generalWid->connectionType->currentText() == QString("mobile_ppp")) {
QHash<QString, QString> addSettings = mobileWid->getSettings();
QMap<QString, QString> addSettings = mobileWid->getSettings();
for (int i=0; i<addSettings.keys().count(); i++)
settings.insert(addSettings.keys()[i], addSettings[addSettings.keys()[i]]);
}
else if (generalWid->connectionType->currentText() == QString("tunnel")) {
QHash<QString, QString> addSettings = ipWid->getSettings();
QMap<QString, QString> addSettings = ipWid->getSettings();
for (int i=0; i<addSettings.keys().count(); i++)
settings.insert(addSettings.keys()[i], addSettings[addSettings.keys()[i]]);
addSettings = tunnelWid->getSettings();
@ -731,7 +731,7 @@ void MainWindow::profileTabCreateProfile()
settings.insert(addSettings.keys()[i], addSettings[addSettings.keys()[i]]);
}
else if (generalWid->connectionType->currentText() == QString("tuntap")) {
QHash<QString, QString> addSettings = ipWid->getSettings();
QMap<QString, QString> addSettings = ipWid->getSettings();
for (int i=0; i<addSettings.keys().count(); i++)
settings.insert(addSettings.keys()[i], addSettings[addSettings.keys()[i]]);
addSettings = tuntapWid->getSettings();
@ -739,7 +739,7 @@ void MainWindow::profileTabCreateProfile()
settings.insert(addSettings.keys()[i], addSettings[addSettings.keys()[i]]);
}
else if (generalWid->connectionType->currentText() == QString("vlan")) {
QHash<QString, QString> addSettings = ipWid->getSettings();
QMap<QString, QString> addSettings = ipWid->getSettings();
for (int i=0; i<addSettings.keys().count(); i++)
settings.insert(addSettings.keys()[i], addSettings[addSettings.keys()[i]]);
addSettings = ethernetWid->getSettings();
@ -764,7 +764,7 @@ void MainWindow::profileTabCreateProfile()
void MainWindow::profileTabLoadProfile()
{
QString profile = ui->lineEdit_profile->text();
QHash<QString, QString> settings = netctlProfile->getSettingsFromProfile(profile);
QMap<QString, QString> settings = netctlProfile->getSettingsFromProfile(profile);
generalWid->setSettings(settings);
if (generalWid->connectionType->currentText() == QString("ethernet")) {
@ -827,7 +827,7 @@ void MainWindow::connectToUnknownEssid(QString passwd)
if (!passwd.isEmpty())
delete passwdWid;
QHash<QString, QString> settings;
QMap<QString, QString> settings;
settings[QString("Description")] = QString("'Automatically generated profile by Netctl GUI'");
settings[QString("Interface")] = wpaCommand->getInterfaceList()[0];
settings[QString("Connection")] = QString("wireless");

6
sources/gui/src/mobilewidget.cpp
View File

@ -97,9 +97,9 @@ void MobileWidget::showAdvanced()
}
QHash<QString, QString> MobileWidget::getSettings()
QMap<QString, QString> MobileWidget::getSettings()
{
QHash<QString, QString> mobileSettings;
QMap<QString, QString> mobileSettings;
if (isOk() == 0) {
if (!ui->lineEdit_username->text().isEmpty())
@ -140,7 +140,7 @@ int MobileWidget::isOk()
}
void MobileWidget::setSettings(QHash<QString, QString> settings)
void MobileWidget::setSettings(QMap<QString, QString> settings)
{
if (settings.contains(QString("User")))
ui->lineEdit_username->setText(settings[QString("User")].remove(QString("'")));

4
sources/gui/src/mobilewidget.h
View File

@ -32,9 +32,9 @@ class MobileWidget : public QWidget
public:
explicit MobileWidget(QWidget *parent = 0);
~MobileWidget();
QHash<QString, QString> getSettings();
QMap<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
void setSettings(QMap<QString, QString> settings);
public slots:
void clear();

6
sources/gui/src/netctlprofile.cpp
View File

@ -54,7 +54,7 @@ bool NetctlProfile::copyProfile(QString oldPath)
}
QString NetctlProfile::createProfile(QString profile, QHash<QString, QString> settings)
QString NetctlProfile::createProfile(QString profile, QMap<QString, QString> settings)
{
QString profileTempName = QDir::homePath() + QDir::separator() +
@ -88,9 +88,9 @@ QString NetctlProfile::createProfile(QString profile, QHash<QString, QString> se
}
QHash<QString, QString> NetctlProfile::getSettingsFromProfile(QString profile)
QMap<QString, QString> NetctlProfile::getSettingsFromProfile(QString profile)
{
QHash<QString, QString> settings;
QMap<QString, QString> settings;
QFile profileFile;
QString fileStr;

4
sources/gui/src/netctlprofile.h
View File

@ -34,8 +34,8 @@ public:
QString sudoPath = QString(""));
~NetctlProfile();
bool copyProfile(QString oldPath);
QString createProfile(QString profile, QHash<QString, QString> settings);
QHash<QString, QString> getSettingsFromProfile(QString profile);
QString createProfile(QString profile, QMap<QString, QString> settings);
QMap<QString, QString> getSettingsFromProfile(QString profile);
private:
MainWindow *parent;

6
sources/gui/src/pppoewidget.cpp
View File

@ -125,9 +125,9 @@ void PppoeWidget::showAdvanced()
}
QHash<QString, QString> PppoeWidget::getSettings()
QMap<QString, QString> PppoeWidget::getSettings()
{
QHash<QString, QString> pppoeSettings;
QMap<QString, QString> pppoeSettings;
if (isOk() == 0) {
if (!ui->lineEdit_username->text().isEmpty())
@ -193,7 +193,7 @@ int PppoeWidget::isOk()
}
void PppoeWidget::setSettings(QHash<QString, QString> settings)
void PppoeWidget::setSettings(QMap<QString, QString> settings)
{
if (settings.contains(QString("User")))
ui->lineEdit_username->setText(settings[QString("User")].remove(QString("'")));

4
sources/gui/src/pppoewidget.h
View File

@ -32,9 +32,9 @@ class PppoeWidget : public QWidget
public:
explicit PppoeWidget(QWidget *parent = 0);
~PppoeWidget();
QHash<QString, QString> getSettings();
QMap<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
void setSettings(QMap<QString, QString> settings);
public slots:
void clear();

6
sources/gui/src/tunnelwidget.cpp
View File

@ -83,9 +83,9 @@ QString TunnelWidget::getIp(QString rawIp)
}
QHash<QString, QString> TunnelWidget::getSettings()
QMap<QString, QString> TunnelWidget::getSettings()
{
QHash<QString, QString> tunnelSettings;
QMap<QString, QString> tunnelSettings;
if (isOk() == 0) {
tunnelSettings[QString("Mode")] = QString("'") + ui->comboBox_mode->currentText() + QString("'");
@ -106,7 +106,7 @@ int TunnelWidget::isOk()
}
void TunnelWidget::setSettings(QHash<QString, QString> settings)
void TunnelWidget::setSettings(QMap<QString, QString> settings)
{
if (settings.contains(QString("Mode")))
for (int i=0; i<ui->comboBox_mode->count(); i++)

4
sources/gui/src/tunnelwidget.h
View File

@ -32,9 +32,9 @@ class TunnelWidget : public QWidget
public:
explicit TunnelWidget(QWidget *parent = 0);
~TunnelWidget();
QHash<QString, QString> getSettings();
QMap<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
void setSettings(QMap<QString, QString> settings);
public slots:
void clear();

6
sources/gui/src/tuntapwidget.cpp
View File

@ -51,9 +51,9 @@ void TuntapWidget::setShown(bool state)
}
QHash<QString, QString> TuntapWidget::getSettings()
QMap<QString, QString> TuntapWidget::getSettings()
{
QHash<QString, QString> tuntapSettings;
QMap<QString, QString> tuntapSettings;
if (isOk() == 0) {
tuntapSettings[QString("Mode")] = QString("'") + ui->comboBox_mode->currentText() + QString("'");
@ -78,7 +78,7 @@ int TuntapWidget::isOk()
}
void TuntapWidget::setSettings(QHash<QString, QString> settings)
void TuntapWidget::setSettings(QMap<QString, QString> settings)
{
if (settings.contains(QString("Mode")))
for (int i=0; i<ui->comboBox_mode->count(); i++)

4
sources/gui/src/tuntapwidget.h
View File

@ -32,9 +32,9 @@ class TuntapWidget : public QWidget
public:
explicit TuntapWidget(QWidget *parent = 0);
~TuntapWidget();
QHash<QString, QString> getSettings();
QMap<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
void setSettings(QMap<QString, QString> settings);
public slots:
void clear();

6
sources/gui/src/vlanwidget.cpp
View File

@ -49,9 +49,9 @@ void VlanWidget::setShown(bool state)
}
QHash<QString, QString> VlanWidget::getSettings()
QMap<QString, QString> VlanWidget::getSettings()
{
QHash<QString, QString> vlanSettings;
QMap<QString, QString> vlanSettings;
if (isOk() == 0) {
vlanSettings[QString("VLANID")] = QString(ui->spinBox_vlan->value());
@ -68,7 +68,7 @@ int VlanWidget::isOk()
}
void VlanWidget::setSettings(QHash<QString, QString> settings)
void VlanWidget::setSettings(QMap<QString, QString> settings)
{
if (settings.contains(QString("VLANID")))
ui->spinBox_vlan->setValue(settings[QString("VLANID")].toInt());

4
sources/gui/src/vlanwidget.h
View File

@ -32,9 +32,9 @@ class VlanWidget : public QWidget
public:
explicit VlanWidget(QWidget *parent = 0);
~VlanWidget();
QHash<QString, QString> getSettings();
QMap<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
void setSettings(QMap<QString, QString> settings);
public slots:
void clear();

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

@ -205,9 +205,9 @@ void WirelessWidget::showAdvanced()
}
QHash<QString, QString> WirelessWidget::getSettings()
QMap<QString, QString> WirelessWidget::getSettings()
{
QHash<QString, QString> wirelessSettings;
QMap<QString, QString> wirelessSettings;
if (isOk() == 0) {
wirelessSettings[QString("Security")] = ui->comboBox_security->currentText();
@ -288,7 +288,7 @@ int WirelessWidget::isOk()
}
void WirelessWidget::setSettings(QHash<QString, QString> settings)
void WirelessWidget::setSettings(QMap<QString, QString> settings)
{
if (settings.contains(QString("Security")))
for (int i=0; i<ui->comboBox_security->count(); i++)

4
sources/gui/src/wirelesswidget.h
View File

@ -34,9 +34,9 @@ public:
explicit WirelessWidget(QWidget *parent = 0,
QString rfkillDir = QString(""));
~WirelessWidget();
QHash<QString, QString> getSettings();
QMap<QString, QString> getSettings();
int isOk();
void setSettings(QHash<QString, QString> settings);
void setSettings(QMap<QString, QString> settings);
public slots:
void clear();