added completions

removed wpa_actiond dependency

CHANGELOG

@@ -10,6 +10,7 @@ Ver.1.2.0:
 + [gui] added about window
 + [gui] more command line options
 + [gui] added workaround for wireless-wep example
++ [gui] added shell completions
 + [lib] detached backend from frontend
 + [lib] added error checking
 + [lib] added doxygen documentation

PKGBUILD

@@ -12,7 +12,6 @@ makedepends=('automoc4' 'cmake' 'kdelibs' 'qt5-base' 'qt5-tools')
 optdepends=('kdebase-runtime: sudo support'
             'kdeplasma-applets-netctl-gui: KDE widget'
             'sudo: sudo support'
-            'wpa_actiond: netctl-auto support'
             'wpa_supplicant: wifi support')
 source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz")
 install="${pkgbase}.install"

README.md

@@ -27,7 +27,6 @@ Optional dependencies
 
 * kdebase-workspace (widget)
 * sudo (sudo support)
-* wpa_actiond (netctl-auto support)
 * wpa_supplicant (WiFi support)
 
 Make dependencies

sources/gui/CMakeLists.txt

@@ -22,3 +22,5 @@ configure_file (${SUBPROJECT_MAN_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MA
 
 install (FILES ${SUBPROJECT}.desktop DESTINATION share/applications/)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MAN} DESTINATION share/man/man1/)
+install (FILES bash-completions DESTINATION share/bash-completion/completions/ RENAME _${SUBPROJECT})
+install (FILES zsh-completions DESTINATION share/zsh/site-functions/ RENAME _${SUBPROJECT})

sources/gui/bash-completions

@@ -0,0 +1,99 @@
+###########################################################################
+#   This file is part of netctl-gui                                       #
+#                                                                         #
+#   netctl-gui is free software: you can redistribute it and/or           #
+#   modify it under the terms of the GNU General Public License as        #
+#   published by the Free Software Foundation, either version 3 of the    #
+#   License, or (at your option) any later version.                       #
+#                                                                         #
+#   netctl-gui is distributed in the hope that it will be useful,         #
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of        #
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         #
+#   GNU General Public License for more details.                          #
+#                                                                         #
+#   You should have received a copy of the GNU General Public License     #
+#   along with netctl-gui. If not, see http://www.gnu.org/licenses/       #
+###########################################################################
+
+
+# variables
+_netctl_gui_arglist=(
+    '--about'
+    '--netctl-auto'
+    '--settings'
+    '-e'
+    '--essid'
+    '-o'
+    '--open'
+    '-s'
+    '--select'
+    '-c'
+    '--config'
+    '-d'
+    '--debug'
+    '--default'
+    '--set-opts'
+    '-t'
+    '--tab'
+    '-v'
+    '--version'
+    '-i'
+    '--info'
+    '-h'
+    '--help'
+)
+
+_netctl_gui_settings=(
+    'CTRL_DIR='
+    'CTRL_GROUP='
+    'IFACE_DIR='
+    'LANGUAGE='
+    'NETCTLAUTO_PATH='
+    'NETCTLAUTO_SERVICE='
+    'NETCTL_PATH='
+    'PID_FILE='
+    'PREFERED_IFACE='
+    'PROFILE_DIR='
+    'RFKILL_DIR='
+    'SUDO_PATH='
+    'SYSTEMCTL_PATH='
+    'WPAACTIOND_PATH='
+    'WPACLI_PATH='
+    'WPASUP_PATH='
+    'WPA_DRIVERS='
+)
+
+_netctl_gui_tabs=(
+    '1'
+    '2'
+    '3'
+)
+
+_netctl_profiles=($(find /etc/netctl -maxdepth 1 -type f -printf "%f\n"))
+
+
+# work block
+_netctl_gui() {
+    COMPREPLY=()
+    wantfiles='-@(c|-config)'
+    wantprofiles='-@(o|-open|s|-select)'
+    wantsettings='-@(-set-opts)'
+    wanttabs='-@(t|-tab)'
+    _get_comp_words_by_ref cur prev
+
+    if [[ $prev = $wantfiles ]]; then
+        _filedir
+    elif [[ $prev = $wantprofiles ]]; then
+        COMPREPLY=($(compgen -W '${_netctl_profiles[@]}' -- "$cur"))
+    elif [[ $prev = $wantsettings ]]; then
+        COMPREPLY=($(compgen -S ',' -W '${_netctl_gui_settings[@]}' -- "$cur"))
+    elif [[ $prev = $wanttabs ]]; then
+        COMPREPLY=($(compgen -W '${_netctl_gui_tabs[@]}' -- "$cur"))
+    else
+        COMPREPLY=($(compgen -W '${_netctl_gui_arglist[@]}' -- "$cur"))
+    fi
+
+    true
+}
+
+complete -F _netctl_gui netctl-gui

sources/gui/src/main.cpp

@@ -43,9 +43,9 @@ int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
 
+    // config path
+    QString configPath = QString(QDir::homePath() + QString("/.config/netctl-gui.conf"));
     // translation
-    QString configPath = QDir::homePath() + QDir::separator() + QString(".config") +
-            QDir::separator() + QString("netctl-gui.conf");
     QString language = Language::defineLanguage(configPath);
     QTranslator translator;
     translator.load(QString(":/translations/") + language);
@@ -103,8 +103,8 @@ int main(int argc, char *argv[])
         }
         // additional functions
         // config path
-        else if (QString(argv[i]) == QString("--config")) {
-            configPath = QString(argv[i+1]);
+        else if ((QString(argv[i]) == QString("-c")) || (QString(argv[i]) == QString("--config"))) {
+            configPath = QDir().absoluteFilePath(argv[i+1]);
             i++;
         }
         // debug
@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
     helpMessage += QString("netctl-gui [ --about ] [ --netctl-auto ] [ --settings ]\n");
     helpMessage += QString("           [ -e ESSID | --essid ESSID ] [ -o PROFILE | --open PROFILE ]\n");
     helpMessage += QString("           [ -s PROFILE | --select PROFILE ]\n");
-    helpMessage += QString("           [ --config FILE ] [ -d | --debug ] [ --default ]\n");
+    helpMessage += QString("           [ -c FILE | --config FILE ] [ -d | --debug ] [ --default ]\n");
     helpMessage += QString("           [ --set-opts OPTIONS ] [ -t NUM | --tab NUM ]\n");
     helpMessage += QString("           [ -v | --version ] [ -i | --info ] [ -h | --help]\n\n");
     helpMessage += QString("%1\n").arg(QApplication::translate("MainWindow", "Parametrs:"));
@@ -190,7 +190,7 @@ int main(int argc, char *argv[])
             .arg(QApplication::translate("MainWindow", "select profile %1").arg(selectProfile));
     // additional functions
     helpMessage += QString("%1\n").arg(QApplication::translate("MainWindow", "Additional flags:"));
-    helpMessage += QString("                   --config %1\n")
+    helpMessage += QString("   -c %1   --config %1\n")
             .arg(configPath, -10);
     helpMessage += QString("                                         - %1\n")
             .arg(QApplication::translate("MainWindow", "read configuration from this file"));

sources/gui/src/mainwindow.cpp

@@ -197,9 +197,6 @@ bool MainWindow::checkExternalApps(const QString apps = QString("all"))
         commandLine.append(configuration[QString("WPACLI_PATH")]);
         commandLine.append(configuration[QString("WPASUP_PATH")]);
     }
-    if ((apps == QString("wpaact")) || (apps == QString("all"))) {
-        commandLine.append(configuration[QString("WPAACTIOND_PATH")]);
-    }
     QProcess command;
     if (debug) qDebug() << "[MainWindow]" << "[checkExternalApps]" << ":" << "Run cmd" << commandLine.join(QChar(' '));
     command.start(commandLine.join(QChar(' ')));

sources/gui/src/settingswindow.cpp

@@ -65,7 +65,6 @@ void SettingsWindow::createActions()
     connect(ui->pushButton_rfkill, SIGNAL(clicked(bool)), SLOT(selectRfkillDir()));
     connect(ui->pushButton_sudo, SIGNAL(clicked(bool)), SLOT(selectSudoPath()));
     connect(ui->pushButton_systemctlPath, SIGNAL(clicked(bool)), SLOT(selectSystemctlPath()));
-    connect(ui->pushButton_wpaActiondPath, SIGNAL(clicked(bool)), SLOT(selectWpaActiondPath()));
     connect(ui->pushButton_wpaCliPath, SIGNAL(clicked(bool)), SLOT(selectWpaCliPath()));
     connect(ui->pushButton_wpaSupPath, SIGNAL(clicked(bool)), SLOT(selectWpaSupPath()));
 }
@@ -222,20 +221,6 @@ void SettingsWindow::selectSystemctlPath()
 }
 
 
-void SettingsWindow::selectWpaActiondPath()
-{
-    if (debug) qDebug() << "[SettingsWindow]" << "[selectWpaActiondPath]";
-
-    QString filename = QFileDialog::getOpenFileName(
-                this,
-                QApplication::translate("SettingsWindow", "Select wpa_actiond command"),
-                QString("/usr/bin/"),
-                QApplication::translate("SettingsWindow", "All files (*)"));
-    if (!filename.isEmpty())
-        ui->lineEdit_wpaActiondPath->setText(filename);
-}
-
-
 void SettingsWindow::selectWpaCliPath()
 {
     if (debug) qDebug() << "[SettingsWindow]" << "[selectWpaCliPath]";
@@ -293,7 +278,6 @@ QMap<QString, QString> SettingsWindow::readSettings()
     settings[QString("RFKILL_DIR")] = ui->lineEdit_rfkill->text();
     settings[QString("SUDO_PATH")] = ui->lineEdit_sudo->text();
     settings[QString("SYSTEMCTL_PATH")] = ui->lineEdit_systemctlPath->text();
-    settings[QString("WPAACTIOND_PATH")] = ui->lineEdit_wpaActiondPath->text();
     settings[QString("WPACLI_PATH")] = ui->lineEdit_wpaCliPath->text();
     settings[QString("WPASUP_PATH")] = ui->lineEdit_wpaSupPath->text();
     settings[QString("WPA_DRIVERS")] = ui->lineEdit_wpaSupDrivers->text();
@@ -325,7 +309,6 @@ void SettingsWindow::setSettings(const QMap<QString, QString> settings)
     ui->lineEdit_rfkill->setText(settings[QString("RFKILL_DIR")]);
     ui->lineEdit_sudo->setText(settings[QString("SUDO_PATH")]);
     ui->lineEdit_systemctlPath->setText(settings[QString("SYSTEMCTL_PATH")]);
-    ui->lineEdit_wpaActiondPath->setText(settings[QString("WPAACTIOND_PATH")]);
     ui->lineEdit_wpaCliPath->setText(settings[QString("WPACLI_PATH")]);
     ui->lineEdit_wpaSupPath->setText(settings[QString("WPASUP_PATH")]);
     ui->lineEdit_wpaSupDrivers->setText(settings[QString("WPA_DRIVERS")]);
@@ -353,7 +336,6 @@ QMap<QString, QString> SettingsWindow::getDefault()
     settings[QString("RFKILL_DIR")] = QString("/sys/class/rfkill/");
     settings[QString("SUDO_PATH")] = QString("/usr/bin/kdesu");
     settings[QString("SYSTEMCTL_PATH")] = QString("/usr/bin/systemctl");
-    settings[QString("WPAACTIOND_PATH")] = QString("/usr/bin/wpa_actiond");
     settings[QString("WPACLI_PATH")] = QString("/usr/bin/wpa_cli");
     settings[QString("WPASUP_PATH")] = QString("/usr/bin/wpa_supplicant");
     settings[QString("WPA_DRIVERS")] = QString("nl80211,wext");

sources/gui/src/settingswindow.h

@@ -57,7 +57,6 @@ private slots:
     void selectRfkillDir();
     void selectSudoPath();
     void selectSystemctlPath();
-    void selectWpaActiondPath();
     void selectWpaCliPath();
     void selectWpaSupPath();
 

sources/gui/src/settingswindow.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>670</width>
-    <height>331</height>
+    <width>668</width>
+    <height>329</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -127,8 +127,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>454</width>
-               <height>270</height>
+               <width>452</width>
+               <height>268</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_7">
@@ -194,8 +194,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>454</width>
-               <height>270</height>
+               <width>452</width>
+               <height>268</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -381,8 +381,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>454</width>
-               <height>270</height>
+               <width>452</width>
+               <height>268</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_9">
@@ -451,8 +451,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>454</width>
-               <height>270</height>
+               <width>452</width>
+               <height>268</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_10">
@@ -518,37 +518,6 @@
                 </item>
                </layout>
               </item>
-              <item>
-               <layout class="QHBoxLayout" name="layout_wpaActiondPath">
-                <item>
-                 <widget class="QLabel" name="label_wpaActiondPath">
-                  <property name="minimumSize">
-                   <size>
-                    <width>150</width>
-                    <height>0</height>
-                   </size>
-                  </property>
-                  <property name="text">
-                   <string>wpa_actiond path</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLineEdit" name="lineEdit_wpaActiondPath">
-                  <property name="toolTip">
-                   <string>Path to wpa_actiond</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QPushButton" name="pushButton_wpaActiondPath">
-                  <property name="text">
-                   <string>Browse</string>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
               <item>
                <layout class="QHBoxLayout" name="layout_pid">
                 <item>
@@ -679,8 +648,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>454</width>
-               <height>270</height>
+               <width>436</width>
+               <height>103</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_11">

sources/gui/zsh-completions

@@ -0,0 +1,93 @@
+#compdef netctl-gui
+###########################################################################
+#   This file is part of netctl-gui                                       #
+#                                                                         #
+#   netctl-gui is free software: you can redistribute it and/or           #
+#   modify it under the terms of the GNU General Public License as        #
+#   published by the Free Software Foundation, either version 3 of the    #
+#   License, or (at your option) any later version.                       #
+#                                                                         #
+#   netctl-gui is distributed in the hope that it will be useful,         #
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of        #
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         #
+#   GNU General Public License for more details.                          #
+#                                                                         #
+#   You should have received a copy of the GNU General Public License     #
+#   along with netctl-gui. If not, see http://www.gnu.org/licenses/       #
+###########################################################################
+
+
+# variables
+_netctl_gui_arglist=(
+    {'--about','--about'}'[show about window]'
+    {'--netctl-auto','--netctl-auto'}'[show netctl-auto window]'
+    {'--settings','--settings'}'[show settings window]'
+    {'(--essid)-e','(-e)--essid'}'[select ESSID]:essid:->essid'
+    {'(--open)-o','(-o)--open'}'[open profile]:filename:->profiles'
+    {'(--select)-s','(-s)--select'}'[select profile]:filename:->profiles'
+    {'(--config)-c','(-c)--config'}'[read configuration from this file]:filename:->files'
+    {'(--debug)-d','(-d)--debug'}'[print debug information]'
+    {'--default','--default'}'[start with default settings]'
+    {'--set-opts','--set-opts'}'[set options for this run, comma separated]:settings:->settings'
+    {'(--tab)-t','(-t)--tab'}'[open a tab with specified number]:tab:->tab'
+    {'(--version)-v','(-v)--version'}'[show version and exit]'
+    {'(--info)-i','(-i)--info'}'[show build information and exit]'
+    {'(--help)-h','(-h)--help'}'[show help and exit]'
+)
+
+_netctl_gui_settings=(
+    'CTRL_DIR='
+    'CTRL_GROUP='
+    'IFACE_DIR='
+    'LANGUAGE='
+    'NETCTLAUTO_PATH='
+    'NETCTLAUTO_SERVICE='
+    'NETCTL_PATH='
+    'PID_FILE='
+    'PREFERED_IFACE='
+    'PROFILE_DIR='
+    'RFKILL_DIR='
+    'SUDO_PATH='
+    'SYSTEMCTL_PATH='
+    'WPAACTIOND_PATH='
+    'WPACLI_PATH='
+    'WPASUP_PATH='
+    'WPA_DRIVERS='
+)
+
+_netctl_gui_tabs=(
+    '1'
+    '2'
+    '3'
+)
+
+_netctl_profiles=($(find /etc/netctl -maxdepth 1 -type f -printf "%f\n"))
+
+
+# work block
+_netctl-gui() {
+    _arguments $_netctl_gui_arglist
+    case "$state" in
+        essid)
+            _message "netctl"
+            ;;
+        files)
+            _files
+            ;;
+        profiles)
+            _values 'profiles' $_netctl_profiles
+            ;;
+        settings)
+            _values -s , 'settings' $_netctl_gui_settings
+            ;;
+        tab)
+            _values 'tab' $_netctl_gui_tabs
+            ;;
+    esac
+}
+
+case "$service" in
+    netctl-gui)
+        _netctl-gui "$@" && return 0
+        ;;
+esac

sources/resources/translations/en.ts

@@ -1587,7 +1587,7 @@
     </message>
     <message>
         <source>Select wpa_actiond command</source>
-        <translation>Select wpa_actiond command</translation>
+        <translation type="obsolete">Select wpa_actiond command</translation>
     </message>
     <message>
         <source>systemctl path</source>

sources/resources/translations/netctl-gui.ts

@@ -733,30 +733,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="407"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="520"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="403"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="516"/>
         <location filename="../../../build/gui/src/ui_mainwindow.h" line="500"/>
         <location filename="../../../build/gui/src/ui_mainwindow.h" line="516"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="408"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="404"/>
         <location filename="../../../build/gui/src/ui_mainwindow.h" line="502"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="409"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="521"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="405"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="517"/>
         <location filename="../../../build/gui/src/ui_mainwindow.h" line="504"/>
         <location filename="../../../build/gui/src/ui_mainwindow.h" line="518"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="590"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="1204"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="586"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="1200"/>
         <location filename="../../../build/gui/src/ui_mainwindow.h" line="483"/>
         <location filename="../../../build/gui/src/ui_mainwindow.h" line="490"/>
         <location filename="../../../build/gui/src/ui_mainwindow.h" line="505"/>
@@ -776,9 +776,9 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="781"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="1400"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="1405"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="777"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="1396"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="1401"/>
         <location filename="../../../build/gui/src/ui_mainwindow.h" line="508"/>
         <location filename="../../../build/gui/src/ui_mainwindow.h" line="525"/>
         <source>Start</source>
@@ -831,13 +831,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="522"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="518"/>
         <location filename="../../../build/gui/src/ui_mainwindow.h" line="520"/>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="523"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="519"/>
         <location filename="../../../build/gui/src/ui_mainwindow.h" line="522"/>
         <source>Security</source>
         <translation type="unfinished"></translation>
@@ -878,35 +878,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="453"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="593"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="612"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="449"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="589"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="608"/>
         <location filename="../../../build/gui/src/ui_mainwindow.h" line="484"/>
         <source>Start profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="594"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="590"/>
         <location filename="../../../build/gui/src/ui_mainwindow.h" line="485"/>
         <source>Restart profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="462"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="596"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="620"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="458"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="592"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="616"/>
         <location filename="../../../build/gui/src/ui_mainwindow.h" line="486"/>
         <source>Enable profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="598"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="594"/>
         <location filename="../../../build/gui/src/ui_mainwindow.h" line="487"/>
         <source>Edit profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="600"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="596"/>
         <location filename="../../../build/gui/src/ui_mainwindow.h" line="488"/>
         <location filename="../../../build/gui/src/ui_mainwindow.h" line="494"/>
         <source>Remove profile</source>
@@ -938,72 +938,72 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="432"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="478"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="549"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="428"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="474"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="545"/>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="448"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="607"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="444"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="603"/>
         <source>Stop profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="458"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="616"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="454"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="612"/>
         <source>Disable profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="565"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="1213"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="561"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="1209"/>
         <source>Stop WiFi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="569"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="574"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="1207"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="1217"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="1222"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="565"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="570"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="1203"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="1213"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="1218"/>
         <source>Start WiFi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="673"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="669"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="693"/>
         <location filename="../../gui/src/mainwindow.cpp" line="697"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="701"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="722"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="718"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="742"/>
         <location filename="../../gui/src/mainwindow.cpp" line="746"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="750"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="1116"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="1187"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="1291"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="1112"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="1183"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="1287"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="1342"/>
         <location filename="../../gui/src/mainwindow.cpp" line="1346"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="1350"/>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="675"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="695"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="703"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="724"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="744"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="752"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="1118"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="1189"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="1293"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="1344"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="1352"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="671"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="691"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="699"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="720"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="740"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="748"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="1114"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="1185"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="1289"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="1340"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="1348"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/mainwindow.cpp" line="776"/>
-        <location filename="../../gui/src/mainwindow.cpp" line="1396"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="772"/>
+        <location filename="../../gui/src/mainwindow.cpp" line="1392"/>
         <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1919,7 +1919,6 @@
         <location filename="../../gui/src/settingswindow.cpp" line="219"/>
         <location filename="../../gui/src/settingswindow.cpp" line="233"/>
         <location filename="../../gui/src/settingswindow.cpp" line="247"/>
-        <location filename="../../gui/src/settingswindow.cpp" line="261"/>
         <source>All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1950,16 +1949,11 @@
     </message>
     <message>
         <location filename="../../gui/src/settingswindow.cpp" line="231"/>
-        <source>Select wpa_actiond command</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gui/src/settingswindow.cpp" line="245"/>
         <source>Select wpa_cli command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/src/settingswindow.cpp" line="259"/>
+        <location filename="../../gui/src/settingswindow.cpp" line="245"/>
         <source>Select wpa_supplicant command</source>
         <translation type="unfinished"></translation>
     </message>

sources/resources/translations/ru.ts

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