release 1.1.0

CHANGELOG

@@ -1,3 +1,8 @@
+Ver.1.1.0 (netctl-1.7 update):
++ [gui] added frequency
+* [gui] changed definition if profile is enabled
+* [dataengine] changed definition if profile is enabled
+
 Ver.1.0.6:
 * [gui] fix error checking
 

PKGBUILD-qt4

@@ -2,7 +2,7 @@
 
 pkgname=netctl-gui-qt4
 _pkgname=netctl-gui
-pkgver=1.0.6
+pkgver=1.1.0
 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=('dc0e2f22f658d0c0ff159c95eb4fa413')
+md5sums=('7c25aa8597a2a89555e7b04c253d9019')
 
 _cmakekeys="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_QT5:BOOL=0 -DBUILD_DATAENGINE:BOOL=0 -DBUILD_PLASMOID:BOOL=0"
 

PKGBUILD-qt5

@@ -1,7 +1,7 @@
 # Maintainer: Evgeniy "arcanis" Alexeev <arcanis.arch at gmail dot com>
 
 pkgname=netctl-gui
-pkgver=1.0.6
+pkgver=1.1.0
 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=('dc0e2f22f658d0c0ff159c95eb4fa413')
+md5sums=('7c25aa8597a2a89555e7b04c253d9019')
 
 _cmakekeys="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DBUILD_DATAENGINE:BOOL=0 -DBUILD_PLASMOID:BOOL=0"
 

PKGBUILD-widget

@@ -2,7 +2,7 @@
 
 pkgname=kdeplasma-applets-netctl-gui
 _pkgname=netctl-gui
-pkgver=1.0.6
+pkgver=1.1.0
 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=('dc0e2f22f658d0c0ff159c95eb4fa413')
+md5sums=('7c25aa8597a2a89555e7b04c253d9019')
 
 _cmakekeys="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI:BOOL=0"
 

sources/CMakeLists.txt

@@ -7,8 +7,8 @@ cmake_policy (SET CMP0015 NEW)
 
 project (netctl-gui)
 set (PROJECT_VERSION_MAJOR 1)
-set (PROJECT_VERSION_MINOR 0)
+set (PROJECT_VERSION_MINOR 1)
-set (PROJECT_VERSION_PATCH 6)
+set (PROJECT_VERSION_PATCH 0)
 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)
 

sources/dataengine/netctl.cpp

@@ -201,16 +201,10 @@ QString Netctl::getProfileStringStatus(const QString cmd)
     QProcess command;
     QString status = QString("static");
     QString profile = getCurrentProfile(cmd);
-    command.start(cmd + QString(" status ") + profile);
+    command.start(cmd + QString(" is-enabled ") + profile);
     command.waitForFinished(-1);
-    QString cmdOutput = QTextCodec::codecForMib(106)->toUnicode(command.readAllStandardOutput());
+    if (command.exitCode() == 0)
-    QStringList profileStatus = cmdOutput.split(QChar('\n'), QString::SkipEmptyParts);
+        status = QString("enabled");
-    for (int i=0; i<profileStatus.count(); i++)
-        if (profileStatus[i].split(QChar(' '), QString::SkipEmptyParts)[0] == QString("Loaded:")) {
-            if (profileStatus[i].contains(QString("enabled")))
-                status = QString("enabled");
-            break;
-        }
     return status;
 }
 

sources/gui/resources/translations/english.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="en">
+<TS version="2.1" language="en">
 <context>
     <name>BridgeWidget</name>
     <message>
@@ -133,7 +133,7 @@
         <source>Skip no carrier</source>
         <translation>Skip no carrier</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>Set to ‘yes’ to use 802.1x authentication</source>
         <translation>Set to ‘yes’ to use 802.1x authentication</translation>
     </message>
@@ -268,7 +268,7 @@
         <source>A command that is executed before a connection is brought down</source>
         <translation>A command that is executed before a connection is brought down</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>Set to ‘yes’ to force connecting even if the interface is up</source>
         <translation>Set to ‘yes’ to force connecting even if the interface is up</translation>
     </message>
@@ -319,7 +319,7 @@
         <source>Add</source>
         <translation>Add</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>An array of IP addresses suffixed with ‘/&lt;netmask&gt;’</source>
         <translation>An array of IP addresses suffixed with ‘/&lt;netmask&gt;’</translation>
     </message>
@@ -399,7 +399,7 @@
         <source>Timeout DAD</source>
         <translation>Timeout DAD</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>Set to ‘yes’ to release the DHCP lease when the profile is stopped</source>
         <translation>Set to ‘yes’ to release the DHCP lease when the profile is stopped</translation>
     </message>
@@ -459,7 +459,7 @@
         <source>DNS domain</source>
         <translation>DNS domain</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>A ‘domain’ line for /etc/resolv.conf</source>
         <translation>A ‘domain’ line for /etc/resolv.conf</translation>
     </message>
@@ -467,7 +467,7 @@
         <source>DNS search</source>
         <translation>DNS search</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>A ‘search’ line for /etc/resolv.conf</source>
         <translation>A ‘search’ line for /etc/resolv.conf</translation>
     </message>
@@ -475,11 +475,11 @@
         <source>DNS options</source>
         <translation>DNS options</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>An array of ‘options’ lines for /etc/resolv.conf</source>
         <translation>An array of ‘options’ lines for /etc/resolv.conf</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>Maximum time, in seconds, to wait for IPv6’s Duplicate Address Detection to succeed</source>
         <translation>Maximum time, in seconds, to wait for IPv6’s Duplicate Address Detection to succeed</translation>
     </message>
@@ -879,7 +879,7 @@
         <source>Idle timeout</source>
         <translation>Idle timeout</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>This option specifies the idle time (in seconds) after which ‘pppd’ should disconnect</source>
         <translation>This option specifies the idle time (in seconds) after which ‘pppd’ should disconnect</translation>
     </message>
@@ -919,7 +919,7 @@
         <source>LCP echo interval</source>
         <translation>LCP echo interval</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>These options override default LCP parameters from ‘/etc/ppp/options’</source>
         <translation>These options override default LCP parameters from ‘/etc/ppp/options’</translation>
     </message>
@@ -1236,7 +1236,7 @@
         <source>tap</source>
         <translation>tap</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>Either ‘tun’, or ‘tap’</source>
         <translation>Either ‘tun’, or ‘tap’</translation>
     </message>
@@ -1450,5 +1450,9 @@
         <source>Exclude auto</source>
         <translation>Exclude auto</translation>
     </message>
+    <message>
+        <source>Frequency</source>
+        <translation>Frequency</translation>
+    </message>
 </context>
 </TS>

sources/gui/resources/translations/russian.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ru">
+<TS version="2.1" language="ru">
 <context>
     <name>BridgeWidget</name>
     <message>
@@ -133,7 +133,7 @@
         <source>Skip no carrier</source>
         <translation>Пропустить отсутствие оператора</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>Set to ‘yes’ to use 802.1x authentication</source>
         <translation>Установить &quot;да&quot;, чтобы использовать 802.1x авторизацию</translation>
     </message>
@@ -268,7 +268,7 @@
         <source>A command that is executed before a connection is brought down</source>
         <translation>Команда, которая будет запущена перед отключением</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>Set to ‘yes’ to force connecting even if the interface is up</source>
         <translation>Установить &quot;да&quot;, чтобы запустить соединение, даже если интерфейс уже поднят</translation>
     </message>
@@ -319,7 +319,7 @@
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>An array of IP addresses suffixed with ‘/&lt;netmask&gt;’</source>
         <translation>Массив IP адресов с суффиксом ‘/&lt;netmask&gt;’</translation>
     </message>
@@ -399,7 +399,7 @@
         <source>Timeout DAD</source>
         <translation>Таймаут DAD</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>Set to ‘yes’ to release the DHCP lease when the profile is stopped</source>
         <translation>Установить &quot;да&quot;, чтобы оставить выделенный DHCP, когда профиль отключен</translation>
     </message>
@@ -459,7 +459,7 @@
         <source>DNS domain</source>
         <translation>DNS домен</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>A ‘domain’ line for /etc/resolv.conf</source>
         <translation>Строка ‘domain’ в /etc/resolv.conf</translation>
     </message>
@@ -467,7 +467,7 @@
         <source>DNS search</source>
         <translation>Поиск DNS</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>A ‘search’ line for /etc/resolv.conf</source>
         <translation>Строка ‘search’ в /etc/resolv.conf</translation>
     </message>
@@ -475,11 +475,11 @@
         <source>DNS options</source>
         <translation>Опции DNS</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>An array of ‘options’ lines for /etc/resolv.conf</source>
         <translation>Массив строк ‘options’ в /etc/resolv.conf</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>Maximum time, in seconds, to wait for IPv6’s Duplicate Address Detection to succeed</source>
         <translation>Максимальное время в секундах для ожидания выполнения детектирования дубликации IPv6 адресов</translation>
     </message>
@@ -879,7 +879,7 @@
         <source>Idle timeout</source>
         <translation>Таймаут простоя</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>This option specifies the idle time (in seconds) after which ‘pppd’ should disconnect</source>
         <translation>Указывает таймаут простоя в секундах, после чего &apos;pppd&apos; будет отключен</translation>
     </message>
@@ -919,7 +919,7 @@
         <source>LCP echo interval</source>
         <translation>LCP echo интервал</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>These options override default LCP parameters from ‘/etc/ppp/options’</source>
         <translation>Эти опции заместят стандартные опции LCP из ‘/etc/ppp/options’</translation>
     </message>
@@ -1236,7 +1236,7 @@
         <source>tap</source>
         <translation>tap</translation>
     </message>
-    <message utf8="true">
+    <message>
         <source>Either ‘tun’, or ‘tap’</source>
         <translation>‘tun’ или ‘tap’</translation>
     </message>
@@ -1450,5 +1450,9 @@
         <source>Exclude auto</source>
         <translation>Исключить профиль</translation>
     </message>
+    <message>
+        <source>Frequency</source>
+        <translation>Частота</translation>
+    </message>
 </context>
 </TS>

sources/gui/src/netctlinteract.cpp

@@ -190,16 +190,7 @@ bool Netctl::isProfileActive(const QString profile)
 
 bool Netctl::isProfileEnabled(const QString profile)
 {
-    bool status = false;
+    return netctlCall(false, QString("is-enabled"), profile);
-    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;
 }
 
 

sources/gui/src/wirelesswidget.cpp

@@ -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")))

sources/gui/src/wirelesswidget.ui

@@ -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>