diff --git a/CHANGELOG b/CHANGELOG index 98de8d6..389b16c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Ver.1.0.6: +* [gui] fix error checking + Ver.1.0.5: + [plasmoid] added "Start WiFi menu" function * [plasmoid] refactoring diff --git a/PKGBUILD-qt4 b/PKGBUILD-qt4 index 74f8e9f..69742bd 100644 --- a/PKGBUILD-qt4 +++ b/PKGBUILD-qt4 @@ -2,7 +2,7 @@ pkgname=netctl-gui-qt4 _pkgname=netctl-gui -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="Qt4 graphical front-end for netctl. A part of netctl-gui" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ provides=('netctl-gui') conflicts=('netctl-gui') source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz") install="${_pkgname}.install" -md5sums=('1ed6e64f06865f129710101ca83624f7') +md5sums=('dc0e2f22f658d0c0ff159c95eb4fa413') _cmakekeys="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_QT5:BOOL=0 -DBUILD_DATAENGINE:BOOL=0 -DBUILD_PLASMOID:BOOL=0" diff --git a/PKGBUILD-qt5 b/PKGBUILD-qt5 index 9855b1f..44b20d4 100644 --- a/PKGBUILD-qt5 +++ b/PKGBUILD-qt5 @@ -1,7 +1,7 @@ # Maintainer: Evgeniy "arcanis" Alexeev pkgname=netctl-gui -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="Qt5 graphical front-end for netctl. A part of netctl-gui" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ optdepends=('kdebase-runtime: sudo support' 'wpa_supplicant: wifi support') source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgname}-${pkgver}-src.tar.xz") install="${pkgname}.install" -md5sums=('1ed6e64f06865f129710101ca83624f7') +md5sums=('dc0e2f22f658d0c0ff159c95eb4fa413') _cmakekeys="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DBUILD_DATAENGINE:BOOL=0 -DBUILD_PLASMOID:BOOL=0" diff --git a/PKGBUILD-widget b/PKGBUILD-widget index 0aab603..e010af0 100644 --- a/PKGBUILD-widget +++ b/PKGBUILD-widget @@ -2,7 +2,7 @@ pkgname=kdeplasma-applets-netctl-gui _pkgname=netctl-gui -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="A plasmoid, which interacts with netctl. A part of netctl-gui" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ optdepends=('kdebase-runtime: sudo support' 'sudo: sudo support') source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz") install="${_pkgname}.install" -md5sums=('1ed6e64f06865f129710101ca83624f7') +md5sums=('dc0e2f22f658d0c0ff159c95eb4fa413') _cmakekeys="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI:BOOL=0" diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 47407b1..7e2cdd1 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -8,7 +8,7 @@ cmake_policy (SET CMP0015 NEW) project (netctl-gui) set (PROJECT_VERSION_MAJOR 1) set (PROJECT_VERSION_MINOR 0) -set (PROJECT_VERSION_PATCH 5) +set (PROJECT_VERSION_PATCH 6) set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) configure_file (${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h) diff --git a/sources/gui/src/ethernetwidget.cpp b/sources/gui/src/ethernetwidget.cpp index 841d7fc..19678ff 100644 --- a/sources/gui/src/ethernetwidget.cpp +++ b/sources/gui/src/ethernetwidget.cpp @@ -44,7 +44,7 @@ void EthernetWidget::clear() ui->checkBox_skip->setCheckState(Qt::Unchecked); ui->checkBox_8021x->setCheckState(Qt::Unchecked); showWpa(ui->checkBox_8021x->checkState()); - ui->lineEdit_wpaConfig->setText(QString("/etc/wpa_supplicant.conf")); + ui->lineEdit_wpaConfig->clear(); ui->comboBox_driver->setCurrentIndex(0); ui->spinBox_timeoutCarrier->setValue(5); ui->spinBox_timeoutWpa->setValue(15); diff --git a/sources/gui/src/wirelesswidget.cpp b/sources/gui/src/wirelesswidget.cpp index f1f6786..fee0ac9 100644 --- a/sources/gui/src/wirelesswidget.cpp +++ b/sources/gui/src/wirelesswidget.cpp @@ -280,9 +280,8 @@ int WirelessWidget::isOk() return 3; // file wpa_supplicant doesn't exists if (ui->comboBox_security->currentText() == QString("wpa-config")) - if (!ui->lineEdit_wpaConfig->text().isEmpty()) - if (!QFile(ui->lineEdit_wpaConfig->text()).exists()) - return 4; + if (!QFile(ui->lineEdit_wpaConfig->text()).exists()) + return 4; // essid is not set if ((ui->comboBox_security->currentText() == QString("none")) || (ui->comboBox_security->currentText() == QString("wep")) ||