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

change lineEdit to comboBox

Browse Source 
add clear() function to profile tab
This commit is contained in:
arcan1s
2014-07-11 11:06:01 +04:00
parent 06bd1ce198
commit ace3a141e4
15 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -8,6 +8,7 @@ Ver.1.2.0:
+ [lib] detached backend from frontend
* [all] small changes in the project architecture
* [gui] more debug information
* [gui] changed lineEdit_profile to comboBox
* [plasmoid] edited configuration interface
Ver.1.1.0 (netctl-1.7 update):

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

@ -72,6 +72,7 @@ int BridgeWidget::isOk()
void BridgeWidget::setSettings(const QMap<QString, QString> settings)
{
clear();
QMap<QString, QString> bridgeSettings = settings;
if (bridgeSettings.contains(QString("SkipForwardingDelay")))

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

@ -141,6 +141,7 @@ int EthernetWidget::isOk()
void EthernetWidget::setSettings(const QMap<QString, QString> settings)
{
clear();
QMap<QString, QString> ethernetSettings = settings;
if (ethernetSettings.contains(QString("SkipNoCarrier")))

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

@ -175,6 +175,7 @@ int GeneralWidget::isOk()
void GeneralWidget::setSettings(const QMap<QString, QString> settings)
{
clear();
QMap<QString, QString> generalSettings = settings;
if (generalSettings.contains(QString("Description")))

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

@ -488,6 +488,7 @@ int IpWidget::isOk()
void IpWidget::setSettings(const QMap<QString, QString> settings)
{
clear();
QMap<QString, QString> ipSettings = settings;
if (ipSettings.contains(QString("IP"))) {

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

@ -82,6 +82,7 @@ int MacvlanWidget::isOk()
void MacvlanWidget::setSettings(const QMap<QString, QString> settings)
{
clear();
QMap<QString, QString> macvlanSettings = settings;
if (macvlanSettings.contains(QString("Mode")))

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

@ -194,11 +194,9 @@ void MainWindow::createActions()
connect(ui->tableWidget_main, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(mainTabContextualMenu(QPoint)));
// profile tab events
connect(ui->lineEdit_profile, SIGNAL(returnPressed()), this, SLOT(profileTabLoadProfile()));
connect(ui->pushButton_profile, SIGNAL(clicked(bool)), this, SLOT(profileTabBrowseProfile()));
connect(ui->comboBox_profile, SIGNAL(currentIndexChanged(QString)), this, SLOT(profileTabLoadProfile()));
connect(ui->pushButton_profileClear, SIGNAL(clicked(bool)), this, SLOT(profileTabClear()));
connect(ui->pushButton_profileSave, SIGNAL(clicked(bool)), this, SLOT(profileTabCreateProfile()));
connect(ui->pushButton_profileLoad, SIGNAL(clicked(bool)), this, SLOT(profileTabLoadProfile()));
connect(generalWid->connectionType, SIGNAL(currentIndexChanged(QString)), this, SLOT(profileTabChangeState(QString)));
// wifi tab events
@ -210,6 +208,16 @@ void MainWindow::createActions()
}
void MainWindow::keyPressEvent(QKeyEvent *pressedKey)
{
if (debug) qDebug() << "[MainWindow]" << "[keyPressEvent]";
if (pressedKey->key() == Qt::Key_Return)
if (ui->comboBox_profile->hasFocus())
profileTabLoadProfile();
}
void MainWindow::setIconsToButtons()
{
if (debug) qDebug() << "[MainWindow]" << "[setIconsToButtons]";
@ -226,7 +234,6 @@ void MainWindow::setIconsToButtons()
// profile tab
ui->pushButton_profileClear->setIcon(QIcon::fromTheme("edit-clear"));
ui->pushButton_profileSave->setIcon(QIcon::fromTheme("document-save"));
ui->pushButton_profileLoad->setIcon(QIcon::fromTheme("document-open"));
// wifi tab
@ -384,7 +391,7 @@ void MainWindow::updateMenuProfile()
if (debug) qDebug() << "[MainWindow]" << "[updateMenuProfile]";
ui->actionProfileClear->setVisible(true);
if (ui->lineEdit_profile->text().isEmpty()) {
if (ui->comboBox_profile->currentText().isEmpty()) {
ui->actionProfileLoad->setVisible(false);
ui->actionProfileRemove->setVisible(false);
ui->actionProfileSave->setVisible(false);
@ -552,7 +559,7 @@ void MainWindow::mainTabEditProfile()
ui->tabWidget->setDisabled(true);
QString profile = ui->tableWidget_main->item(ui->tableWidget_main->currentItem()->row(), 0)->text();
ui->tabWidget->setCurrentIndex(1);
ui->lineEdit_profile->setText(profile);
ui->comboBox_profile->setCurrentIndex(ui->comboBox_profile->findText(profile));
profileTabLoadProfile();
}
@ -697,20 +704,6 @@ void MainWindow::mainTabRefreshButtons(QTableWidgetItem *current, QTableWidgetIt
// profile tab slots
void MainWindow::profileTabBrowseProfile()
{
if (debug) qDebug() << "[MainWindow]" << "[profileTabBrowseProfile]";
QString filename = QFileDialog::getSaveFileName(
this,
QApplication::translate("MainWindow", "Save profile as..."),
QString("/etc/netctl/"),
QApplication::translate("MainWindow", "Profile (*)"));
if (!filename.isEmpty())
ui->lineEdit_profile->setText(filename);
}
void MainWindow::profileTabChangeState(const QString current)
{
if (debug) qDebug() << "[MainWindow]" << "[profileTabChangeState]";
@ -854,7 +847,11 @@ void MainWindow::profileTabClear()
{
if (debug) qDebug() << "[MainWindow]" << "[profileTabClear]";
ui->lineEdit_profile->clear();
ui->comboBox_profile->clear();
QList<QStringList> profiles = netctlCommand->getProfileList();
for (int i=0; i<profiles.count(); i++)
ui->comboBox_profile->addItem(profiles[i][0]);
ui->comboBox_profile->setCurrentIndex(-1);
generalWid->clear();
ipWid->clear();
@ -877,7 +874,7 @@ void MainWindow::profileTabCreateProfile()
if (debug) qDebug() << "[MainWindow]" << "[profileTabCreateProfile]";
// error checking
if (ui->lineEdit_profile->text().isEmpty()) {
if (ui->comboBox_profile->currentText().isEmpty()) {
errorWin = new ErrorWindow(this, debug, 3);
errorWin->show();
return;
@ -1013,7 +1010,7 @@ void MainWindow::profileTabCreateProfile()
ui->tabWidget->setDisabled(true);
// read settings
QString profile = netctlProfile->getNameByString(ui->lineEdit_profile->text());
QString profile = netctlProfile->getNameByString(ui->comboBox_profile->currentText());
QMap<QString, QString> settings;
settings = generalWid->getSettings();
if (generalWid->connectionType->currentText() == QString("ethernet")) {
@ -1110,7 +1107,7 @@ void MainWindow::profileTabLoadProfile()
{
if (debug) qDebug() << "[MainWindow]" << "[profileTabLoadProfile]";
QString profile = netctlProfile->getNameByString(ui->lineEdit_profile->text());
QString profile = netctlProfile->getNameByString(ui->comboBox_profile->currentText());
QMap<QString, QString> settings = netctlProfile->getSettingsFromProfile(profile);
generalWid->setSettings(settings);
@ -1163,7 +1160,7 @@ void MainWindow::profileTabRemoveProfile()
ui->tabWidget->setDisabled(true);
// call netctlprofile
QString profile = netctlProfile->getNameByString(ui->lineEdit_profile->text());
QString profile = netctlProfile->getNameByString(ui->comboBox_profile->currentText());
if (netctlProfile->removeProfile(profile))
ui->statusBar->showMessage(QApplication::translate("MainWindow", "Done"));
else

2
sources/gui/src/mainwindow.h
View File

@ -82,7 +82,6 @@ private slots:
void mainTabStartProfile();
void mainTabRefreshButtons(QTableWidgetItem *current, QTableWidgetItem *previous);
// profile tab slots
void profileTabBrowseProfile();
void profileTabChangeState(const QString current);
void profileTabClear();
void profileTabCreateProfile();
@ -118,6 +117,7 @@ private:
bool checkExternalApps(const QString apps);
bool checkState(const QString state, const QString item);
void createActions();
void keyPressEvent(QKeyEvent *pressedKey);
void setIconsToButtons();
bool debug;
// configuration

22
sources/gui/src/mainwindow.ui
View File

@ -159,12 +159,12 @@
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_profile"/>
</item>
<item>
<widget class="QPushButton" name="pushButton_profile">
<property name="text">
<string>Browse</string>
<widget class="QComboBox" name="comboBox_profile">
<property name="acceptDrops">
<bool>true</bool>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
@ -203,13 +203,6 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_profileLoad">
<property name="text">
<string>Load</string>
</property>
</widget>
</item>
<item>
<spacer name="spacer_newProfileButtons">
<property name="orientation">
@ -508,11 +501,8 @@
<tabstop>pushButton_mainRefresh</tabstop>
<tabstop>pushButton_mainRestart</tabstop>
<tabstop>pushButton_mainStart</tabstop>
<tabstop>lineEdit_profile</tabstop>
<tabstop>pushButton_profile</tabstop>
<tabstop>scrollArea</tabstop>
<tabstop>pushButton_profileClear</tabstop>
<tabstop>pushButton_profileLoad</tabstop>
<tabstop>pushButton_profileSave</tabstop>
<tabstop>tableWidget_wifi</tabstop>
<tabstop>pushButton_wifiRefresh</tabstop>

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

@ -143,6 +143,7 @@ int MobileWidget::isOk()
void MobileWidget::setSettings(const QMap<QString, QString> settings)
{
clear();
QMap<QString, QString> mobileSettings = settings;
if (mobileSettings.contains(QString("User")))

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

@ -196,6 +196,7 @@ int PppoeWidget::isOk()
void PppoeWidget::setSettings(const QMap<QString, QString> settings)
{
clear();
QMap<QString, QString> pppoeSettings = settings;
if (pppoeSettings.contains(QString("User")))

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

@ -109,6 +109,7 @@ int TunnelWidget::isOk()
void TunnelWidget::setSettings(const QMap<QString, QString> settings)
{
clear();
QMap<QString, QString> tunnelSettings = settings;
if (tunnelSettings.contains(QString("Mode")))

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

@ -81,6 +81,7 @@ int TuntapWidget::isOk()
void TuntapWidget::setSettings(const QMap<QString, QString> settings)
{
clear();
QMap<QString, QString> tuntapSettings = settings;
if (tuntapSettings.contains(QString("Mode")))

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

@ -71,6 +71,7 @@ int VlanWidget::isOk()
void VlanWidget::setSettings(const QMap<QString, QString> settings)
{
clear();
QMap<QString, QString> vlanSettings = settings;
if (vlanSettings.contains(QString("VLANID")))

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

@ -298,6 +298,7 @@ int WirelessWidget::isOk()
void WirelessWidget::setSettings(const QMap<QString, QString> settings)
{
clear();
QMap<QString, QString> wirelessSettings = settings;
if (wirelessSettings.contains(QString("Security")))