edited changelog

changed license notes since project had beed renamed to netctl-gui

AUTHORS

@@ -0,0 +1,2 @@
+Current developers:
+Evgeniy Alekseev aka arcanis <esalexeev (at) gmail (dot) com>

CHANGELOG

@@ -0,0 +1,17 @@
+Ver.1.0.4:
++ [gui] added Qt5 gui (by default)
++ [plasmoid] added notifications
+* [plasmoid] fix run command with sudo from plasmoid
+
+Ver.1.0.3:
++ [plasmoid] edited russian translation
+* [all] refactoring
+
+Ver.1.0.2:
+* [plasmoid] fix layout margins
+
+Ver.1.0.1:
+- [all] removed scripts
+
+Ver.1.0:
+First release

COPYING

@@ -631,7 +631,7 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    netctl-plasmoid
+    netctl-gui
     Copyright (C) 2014  Evgeniy Alekseev
 
     This program is free software: you can redistribute it and/or modify
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    netctl-plasmoid  Copyright (C) 2014  Evgeniy Alekseev
+    netctl-gui  Copyright (C) 2014  Evgeniy Alekseev
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

PKGBUILD

@@ -1,33 +1,42 @@
 # Maintainer: Evgeniy "arcanis" Alexeev <arcanis.arch at gmail dot com>
 
 # comment out needed line if you dont need this component
+#_use_qt5=0
 #_build_gui=0
 #_build_plasmoid=0
 
 pkgname=netctl-gui
-pkgver=1.0.1
+pkgver=1.0.4
 pkgrel=1
-pkgdesc="Qt4 GUI for netctl. Provides a plasmoid for KDE4"
+pkgdesc="Qt4/Qt5 GUI for netctl. Provides a plasmoid for KDE4"
 arch=('i686' 'x86_64')
 url="http://arcanis.name/projects/netctl-gui"
 license=('GPLv3')
-depends=('netctl' 'qt4')
-makedepends=('automoc4' 'cmake' 'desktop-file-utils' 'xdg-utils')
+depends=('netctl' 'qt5-base')
+makedepends=('automoc4' 'cmake' 'qt5-tools')
 optdepends=('kdebase-runtime: sudo support'
             'sudo: sudo support'
             'wpa_supplicant: wifi support')
-source=("https://github.com/arcan1s/netctlplasmoid/releases/download/V.${pkgver}/${pkgname}-${pkgver}-src.tar.xz")
+source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgname}-${pkgver}-src.tar.xz")
 install="${pkgname}.install"
-md5sums=('b2bdfabd96a436823c9d46fc0d58bbe8')
+md5sums=('1e790c31d135b91c7ec80791508e6e92')
 
 # flags
 _cmakekeys="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release"
+if [[ ${_use_qt5} == 0 ]]; then
+  _cmakekeys=${_cmakekeys}" -DUSE_QT5:BOOL=0"
+  depends=('netctl' 'qt4')
+  makedepends=('automoc4' 'cmake' 'desktop-file-utils' 'xdg-utils')
+fi
 [[ ${_build_gui} == 0 ]] && _cmakekeys=${_cmakekeys}" -DBUILD_GUI:BOOL=0"
-[[ ${_build_plasmoid} == 0 ]] && _cmakekeys=${_cmakekeys}" -DBUILD_DATAENGINE:BOOL=0 -DBUILD_PLASMOID:BOOL=0" || depends[1]='kdebase-workspace'
+[[ ${_build_plasmoid} == 0 ]] && _cmakekeys=${_cmakekeys}" -DBUILD_DATAENGINE:BOOL=0 -DBUILD_PLASMOID:BOOL=0" || depends+=('kdebase-workspace')
 
-build() {
+prepare() {
   rm -rf "${srcdir}/build"
   mkdir "${srcdir}/build"
+}
+
+build() {
   cd "${srcdir}/build"
   cmake ${_cmakekeys} "../${pkgname}"
   make

README.md

@@ -1,4 +1,74 @@
-netctl-plasmoid
-===============
+Netctl GUI
+==========
 
-[Homepage](http://arcanis.name/projects/netctl-gui)
+Information
+-----------
+Graphical interface for netctl. Now it may work with profiles and may create new profiles. Also it may create a connection to WiFi. Moreover, it provides a widget and DataEngine for KDE.
+
+**NOTE** LOOKING FOR TRANSLATORS!
+
+Configuration
+-------------
+It is recommended to use graphical interface for widget configuration. DataEngine settings are stored in `/usr/share/config/netctl.conf`:
+
+* `CMD` - netctl command. Default value is `/usr/bin/netctl`.
+* `IPCMD` - ip command. `/usr/bin/ip` by default.
+* `NETDIR` - a directory, which contains subdirectories with names of network interfaces. Default is `/sys/class/net/`.
+* `EXTIPCMD` - a command, which returns external IP address. Default value is `wget -qO- http://ifconfig.me/ip`.
+* `EXTIP` - `true` will enable external IP definition. Default is `false`.
+
+All settings of GUI are stored in `$HOME/.config/netctl-gui.conf`. It is highly recommended to edit it from graphical interface.
+
+Instruction
+===========
+
+Dependencies
+------------
+* netctl
+* qt4
+
+Optional dependencies
+---------------------
+* kdebase-workspace (widget)
+* sudo (sudo support)
+* wpa_supplicant (WiFi support)
+
+Make dependencies
+-----------------
+* automoc4
+* cmake
+
+Installation
+------------
+* download sources
+* extract it and install the application:
+
+        cd /path/to/extracted/archive
+        mkdir build && cd build
+        cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ../
+        make
+        sudo make install
+
+  If you want install it without KDE widget just run:
+
+        cd /path/to/extracted/archive
+        mkdir build && cd build
+        cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DBUILD_DATAENGINE:BOOL=0 -DBUILD_PLASMOID:BOOL=0 ../
+        make
+        sudo make install
+
+  If you want install it without GUI run:
+
+        cd /path/to/extracted/archive
+        mkdir build && cd build
+        cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI:BOOL=0 ../
+        make
+        sudo make install
+
+Additional information
+======================
+
+Links
+-----
+* [Homepage](http://arcanis.name/projects/netctl-gui)
+* Archlinux [AUR](https://aur.archlinux.org/packages/netctl-gui) package

create_archive.sh

@@ -2,17 +2,17 @@
 
 ARCHIVE="netctl-gui"
 SRCDIR="sources"
-FILES="LICENSE README.md"
+FILES="AUTHORS CHANGELOG COPYING README.md"
 IGNORELIST="gui/resources/translations/english.qm gui/resources/translations/russian.qm"
 VERSION=$(grep -m1 PROJECT_VERSION_MAJOR sources/CMakeLists.txt | awk '{print $3}' | cut -c 1).\
 $(grep -m1 PROJECT_VERSION_MINOR sources/CMakeLists.txt | awk '{print $3}' | cut -c 1).\
 $(grep -m1 PROJECT_VERSION_PATCH sources/CMakeLists.txt | awk '{print $3}' | cut -c 1)
 
 # create archive
-[[ -e ${ARCHIVE}-${VERSION}.tar.xz ]] && rm -f "${ARCHIVE}-${VERSION}-src.tar.xz"
+[[ -e ${ARCHIVE}-${VERSION}-src.tar.xz ]] && rm -f "${ARCHIVE}-${VERSION}-src.tar.xz"
 [[ -d ${ARCHIVE} ]] && rm -rf "${ARCHIVE}"
 cp -r "${SRCDIR}" "${ARCHIVE}"
-for FILE in ${FILES[*]}; do cp "$FILE" "${ARCHIVE}"; done
+for FILE in ${FILES[*]}; do cp -r "$FILE" "${ARCHIVE}"; done
 for FILE in ${IGNORELIST[*]}; do rm -f "${ARCHIVE}/${FILE}"; done
 tar cvJf "${ARCHIVE}-${VERSION}-src.tar.xz" "${ARCHIVE}" > /dev/null
 rm -rf "${ARCHIVE}"

sources/CMakeLists.txt

@@ -5,16 +5,17 @@ cmake_policy (SET CMP0002 OLD)
 cmake_policy (SET CMP0011 NEW)
 cmake_policy (SET CMP0015 NEW)
 
-project (netctl-plasmoid)
+project (netctl-gui)
 set (PROJECT_VERSION_MAJOR 1)
 set (PROJECT_VERSION_MINOR 0)
-set (PROJECT_VERSION_PATCH 1)
+set (PROJECT_VERSION_PATCH 4)
 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)
 
 message (STATUS "Version: ${PROJECT_VERSION}")
 
 # install options
+option (USE_QT5 "Use Qt5 instead of Qt4" ON)
 option (BUILD_GUI "Build GUI" ON)
 option (BUILD_DATAENGINE "Build data engine" ON)
 option (BUILD_PLASMOID "Build plasmoid" ON)
@@ -29,11 +30,12 @@ else ()
   message (STATUS "Unknown compiler")
 endif ()
 
+add_subdirectory (icons)
+
 if (BUILD_PLASMOID)
   set (BUILD_DATAENGINE ON)
 endif ()
 
-add_subdirectory (icons)
 if (BUILD_GUI)
   add_subdirectory (gui)
 endif ()

sources/dataengine/netctl.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #include "netctl.h"
@@ -52,11 +52,11 @@ QStringList Netctl::sources() const
 bool Netctl::readConfiguration()
 {
     // default configuration
-    checkExtIP = QString("false");
-    cmd = QString("/usr/bin/netctl");
-    extIpCmd = QString("wget -qO- http://ifconfig.me/ip");
-    ipCmd = QString("/usr/bin/ip");
-    netDir = QString("/sys/class/net/");
+    configuration[QString("CMD")] = QString("/usr/bin/netctl");
+    configuration[QString("EXTIP")] = QString("false");
+    configuration[QString("EXTIPCMD")] = QString("wget -qO- http://ifconfig.me/ip");
+    configuration[QString("IPCMD")] = QString("/usr/bin/ip");
+    configuration[QString("NETDIR")] = QString("/sys/class/net/");
 
     QString fileStr;
     // FIXME: define configuration file
@@ -72,18 +72,10 @@ bool Netctl::readConfiguration()
     while (true) {
         fileStr = QString(confFile.readLine());
         if (fileStr[0] != '#') {
-            if (fileStr.split(QString("="), QString::SkipEmptyParts).count() == 2) {
-                if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("EXTIP"))
-                    checkExtIP = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
-                else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("CMD"))
-                    cmd = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
-                else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("EXTIPCMD"))
-                    extIpCmd = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
-                else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("IPCMD"))
-                    ipCmd = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
-                else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("NETDIR"))
-                    netDir = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
-            }
+            if (fileStr.contains(QString("=")))
+                configuration[fileStr.split(QString("="))[0]] = fileStr.split(QString("="))[1]
+                      .remove(QString(" "))
+                      .trimmed();
         }
         if (confFile.atEnd())
             break;
@@ -107,7 +99,7 @@ bool Netctl::updateSourceEvent(const QString &source)
     QString value = QString("");
 
     if (source == QString("currentProfile")) {
-        command.start(cmd + QString(" list"));
+        command.start(configuration[QString("CMD")] + QString(" list"));
         command.waitForFinished(-1);
         cmdOutput = command.readAllStandardOutput();
         if (!cmdOutput.isEmpty()) {
@@ -121,8 +113,8 @@ bool Netctl::updateSourceEvent(const QString &source)
         setData(source, QString("value"), value);
     }
     else if (source == QString("extIp")) {
-        if (checkExtIP == QString("true")) {
-            command.start(extIpCmd);
+        if (configuration[QString("EXTIP")] == QString("true")) {
+            command.start(configuration[QString("EXTIPCMD")]);
             command.waitForFinished(-1);
             cmdOutput = command.readAllStandardOutput();
             if (!cmdOutput.isEmpty())
@@ -131,18 +123,18 @@ bool Netctl::updateSourceEvent(const QString &source)
         setData(source, QString("value"), value);
     }
     else if (source == QString("interfaces")) {
-        if (QDir(netDir).exists())
-            value = QDir(netDir).entryList(QDir::Dirs | QDir::NoDotAndDotDot).join(QString(","));
+        if (QDir(configuration[QString("NETDIR")]).exists())
+            value = QDir(configuration[QString("NETDIR")]).entryList(QDir::Dirs | QDir::NoDotAndDotDot).join(QString(","));
         setData(source, QString("value"), value);
     }
     else if (source == QString("intIp")) {
-        if (QDir(netDir).exists()) {
+        if (QDir(configuration[QString("NETDIR")]).exists()) {
             value = QString("127.0.0.1/8");
-            QStringList netDevices = QDir(netDir).entryList(QDir::Dirs | QDir::NoDotAndDotDot);
+            QStringList netDevices = QDir(configuration[QString("NETDIR")]).entryList(QDir::Dirs | QDir::NoDotAndDotDot);
             for (int i=0; i<netDevices.count(); i++)
                 if (netDevices[i] != QString("lo")) {
                     cmdOutput = QString("");
-                    command.start(ipCmd + QString(" addr show ") + netDevices[i]);
+                    command.start(configuration[QString("IPCMD")] + QString(" addr show ") + netDevices[i]);
                     command.waitForFinished(-1);
                     cmdOutput = command.readAllStandardOutput();
                     if (!cmdOutput.isEmpty()) {
@@ -156,7 +148,7 @@ bool Netctl::updateSourceEvent(const QString &source)
         setData(source, QString("value"), value);
     }
     else if (source == QString("profiles")) {
-        command.start(cmd + QString(" list"));
+        command.start(configuration[QString("CMD")] + QString(" list"));
         command.waitForFinished(-1);
         cmdOutput = command.readAllStandardOutput();
         QStringList list;
@@ -172,7 +164,7 @@ bool Netctl::updateSourceEvent(const QString &source)
         setData(source, QString("value"), value);
     }
     else if (source == QString("statusBool")) {
-        command.start(cmd + QString(" list"));
+        command.start(configuration[QString("CMD")] + QString(" list"));
         command.waitForFinished(-1);
         cmdOutput = command.readAllStandardOutput();
         value = QString("false");
@@ -187,7 +179,7 @@ bool Netctl::updateSourceEvent(const QString &source)
         setData(source, QString("value"), value);
     }
     else if (source == QString("statusString")) {
-        command.start(cmd + QString(" list"));
+        command.start(configuration[QString("CMD")] + QString(" list"));
         command.waitForFinished(-1);
         cmdOutput = command.readAllStandardOutput();
         QString currentProfile;
@@ -199,7 +191,7 @@ bool Netctl::updateSourceEvent(const QString &source)
                     break;
                 }
         }
-        command.start(cmd + QString(" status ") + currentProfile);
+        command.start(configuration[QString("CMD")] + QString(" status ") + currentProfile);
         command.waitForFinished(-1);
         cmdOutput = command.readAllStandardOutput();
         if (!cmdOutput.isEmpty()) {

sources/dataengine/netctl.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef NETCTL_DE_H
@@ -36,16 +36,7 @@ protected:
 
 private:
     // configuration
-    // enable check external IP
-    QString checkExtIP;
-    // path to netctl command
-    QString cmd;
-    // command to check external IP
-    QString extIpCmd;
-    // path to ip command
-    QString ipCmd;
-    // path to directory with network device configuration
-    QString netDir;
+    QMap<QString, QString> configuration;
 };
 
 

sources/gui/src/CMakeLists.txt

@@ -14,6 +14,36 @@ message (STATUS "${SUBPROJECT} Forms: ${FORMS}")
 # include_path
 include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../)
 
+if (USE_QT5)
+    find_package(Qt5Core REQUIRED)
+    find_package(Qt5Widgets REQUIRED)
+    find_package(Qt5LinguistTools REQUIRED)
+    add_definitions(${Qt5Core_DEFINITIONS})
+    add_definitions(${Qt5Widgets_DEFINITIONS})
+    add_definitions(${Qt5LinguistTools_DEFINITIONS})
+    qt5_wrap_cpp (MOC_SOURCES ${HEADERS})
+    qt5_wrap_ui (UI_HEADERS ${FORMS})
+    qt5_add_resources (QRC_SOURCES ${RESOURCES})
+
+    foreach (LANGUAGE ${LANGUAGES})
+        set (TS ${SUBPROJECT_TRANSLATION_DIR}/${LANGUAGE}.ts)
+        set (QM ${SUBPROJECT_TRANSLATION_DIR}/${LANGUAGE}.qm)
+        set (TRANSLATIONS ${TRANSLATIONS} ${TS})
+        set (TRANSLATIONS_BINARY ${TRANSLATIONS_BINARY} ${QM})
+        add_custom_command (OUTPUT ${QM} COMMAND ${Qt5_LRELEASE_EXECUTABLE} ${TS} MAIN_DEPENDENCY ${TS})
+    endforeach ()
+    add_custom_target (translations COMMAND ${Qt5_LUPDATE_EXECUTABLE} ${HEADERS} ${SOURCES} ${UI_HEADERS} -ts ${TRANSLATIONS})
+    add_custom_command (TARGET translations COMMAND ${Qt5_LRELEASE_EXECUTABLE} ${TRANSLATIONS})
+    message (STATUS "${SUBPROJECT} Translations: ${TRANSLATIONS_BINARY}")
+
+    source_group ("Header Files" FILES ${HEADERS})
+    source_group ("Source Files" FILES ${SOURCES})
+    source_group ("Generated Files" FILES ${MOC_SOURCES})
+
+    include_directories (${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
+    add_executable (${SUBPROJECT} ${UI_HEADERS} ${HEADERS} ${SOURCES} ${MOC_SOURCES} ${QRC_SOURCES} ${TRANSLATIONS})
+    target_link_libraries (${SUBPROJECT} ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES})
+else ()
     find_package (Qt4 REQUIRED)
     include (${QT_USE_FILE})
     qt4_wrap_cpp (MOC_SOURCES ${HEADERS})
@@ -37,6 +67,7 @@ source_group ("Generated Files" FILES ${MOC_SOURCES})
 
     add_executable (${SUBPROJECT} ${UI_HEADERS} ${HEADERS} ${SOURCES} ${MOC_SOURCES} ${QRC_SOURCES} ${TRANSLATIONS})
     target_link_libraries (${SUBPROJECT} ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY})
+endif()
 
 # install properties
 install (TARGETS ${SUBPROJECT} DESTINATION bin)

sources/gui/src/bridgewidget.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #include "bridgewidget.h"

sources/gui/src/bridgewidget.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef BRIDGEWIDGET_H

sources/gui/src/errorwindow.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #include "errorwindow.h"

sources/gui/src/errorwindow.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef ERRORWINDOW_H

sources/gui/src/ethernetwidget.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #include "ethernetwidget.h"
@@ -86,7 +86,7 @@ void EthernetWidget::selectWpaConfig()
 void EthernetWidget::showAdvanced()
 {
     if (ui->pushButton_ethernetAdvanced->isChecked()) {
-        ui->widget_ethernetAdvanced->setShown(true);
+        ui->widget_ethernetAdvanced->setHidden(false);
         ui->pushButton_ethernetAdvanced->setText(QApplication::translate("EthernetWidget", "Hide advanced"));
     }
     else {
@@ -101,7 +101,7 @@ void EthernetWidget::showWpa(const int state)
     if (state == 0)
         ui->widget_wpa->setHidden(true);
     else
-        ui->widget_wpa->setShown(true);
+        ui->widget_wpa->setHidden(false);
 }
 
 

sources/gui/src/ethernetwidget.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef ETHERNETWIDGET_H

sources/gui/src/generalwidget.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #include "generalwidget.h"
@@ -112,7 +112,7 @@ void GeneralWidget::keyPressEvent(QKeyEvent *pressedKey)
 void GeneralWidget::showAdvanced()
 {
     if (ui->pushButton_generalAdvanced->isChecked()) {
-        ui->widget_generalAdvanced->setShown(true);
+        ui->widget_generalAdvanced->setHidden(false);
         ui->pushButton_generalAdvanced->setText(QApplication::translate("GeneralWidget", "Hide advanced"));
     }
     else {

sources/gui/src/generalwidget.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef GENERALWIDGET_H

sources/gui/src/ipwidget.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #include "ipwidget.h"
@@ -306,7 +306,7 @@ void IpWidget::changeIpMode(const QString currentText)
     if (currentText == QString("dhcp"))
         ui->widget_ip->setHidden(true);
     else if (currentText == QString("static"))
-        ui->widget_ip->setShown(true);
+        ui->widget_ip->setHidden(false);
 }
 
 
@@ -332,7 +332,7 @@ void IpWidget::changeIp6Mode(const QString currentText)
         ui->widget_ip6->setHidden(true);
     else if ((currentText == QString("static")) ||
              (currentText == QString("stateless")))
-        ui->widget_ip6->setShown(true);
+        ui->widget_ip6->setHidden(false);
 }
 
 
@@ -354,12 +354,12 @@ void IpWidget::ip6Enable(const int state)
 void IpWidget::changeDhcpClient(const QString currentText)
 {
     if (currentText == QString("dhcpcd")) {
-        ui->widget_dhcpcdOpt->setShown(true);
+        ui->widget_dhcpcdOpt->setHidden(false);
         ui->widget_dhclientOpt->setHidden(true);
     }
     else if (currentText == QString("dhclient")) {
         ui->widget_dhcpcdOpt->setHidden(true);
-        ui->widget_dhclientOpt->setShown(true);
+        ui->widget_dhclientOpt->setHidden(false);
     }
 }
 
@@ -367,7 +367,7 @@ void IpWidget::changeDhcpClient(const QString currentText)
 void IpWidget::showAdvanced()
 {
     if (ui->pushButton_ipAdvanced->isChecked()) {
-        ui->widget_ipAdvanced->setShown(true);
+        ui->widget_ipAdvanced->setHidden(false);
         ui->pushButton_ipAdvanced->setText(QApplication::translate("IpWidget", "Hide advanced"));
     }
     else {

sources/gui/src/ipwidget.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef IPWIDGET_H

sources/gui/src/main.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 

sources/gui/src/mainwindow.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #include "mainwindow.h"
@@ -224,7 +224,11 @@ void MainWindow::updateMainTab()
 
     ui->tableWidget_main->setSortingEnabled(true);
     ui->tableWidget_main->resizeRowsToContents();
+#if QT_VERSION >= 0x050000
+    ui->tableWidget_main->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+#else
     ui->tableWidget_main->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
+#endif
     ui->tabWidget->setEnabled(true);
     ui->statusBar->showMessage(QApplication::translate("MainWindow", "Updated"));
 
@@ -284,7 +288,11 @@ void MainWindow::updateWifiTab()
 
     ui->tableWidget_wifi->setSortingEnabled(true);
     ui->tableWidget_wifi->resizeRowsToContents();
+#if QT_VERSION >= 0x050000
+    ui->tableWidget_wifi->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+#else
     ui->tableWidget_wifi->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
+#endif
     ui->tabWidget->setEnabled(true);
     ui->statusBar->showMessage(QApplication::translate("MainWindow", "Updated"));
 

sources/gui/src/mainwindow.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef MAINWINDOW_H

sources/gui/src/mobilewidget.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #include "mobilewidget.h"
@@ -87,7 +87,7 @@ void MobileWidget::selectOptionsFile()
 void MobileWidget::showAdvanced()
 {
     if (ui->pushButton_mobileAdvanced->isChecked()) {
-        ui->widget_mobileAdvanced->setShown(true);
+        ui->widget_mobileAdvanced->setHidden(false);
         ui->pushButton_mobileAdvanced->setText(QApplication::translate("MobileWidget", "Hide advanced"));
     }
     else {

sources/gui/src/mobilewidget.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef MOBILEWIDGET_H

sources/gui/src/netctlinteract.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #include "netctlinteract.h"

sources/gui/src/netctlinteract.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef NETCTLINTERACT_H

sources/gui/src/netctlprofile.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #include "netctlprofile.h"

sources/gui/src/netctlprofile.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef NETCTLPROFILE_H

sources/gui/src/passwdwidget.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #include "passwdwidget.h"

sources/gui/src/passwdwidget.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef PASSWDWIDGET_H

sources/gui/src/pppoewidget.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #include "pppoewidget.h"
@@ -96,7 +96,7 @@ void PppoeWidget::changeMode(const QString currentText)
     if (currentText == QString("persist"))
         ui->widget_timeout->setHidden(true);
     else if (currentText == QString("demand"))
-        ui->widget_timeout->setShown(true);
+        ui->widget_timeout->setHidden(false);
 }
 
 
@@ -115,7 +115,7 @@ void PppoeWidget::selectOptionsFile()
 void PppoeWidget::showAdvanced()
 {
     if (ui->pushButton_pppoeAdvanced->isChecked()) {
-        ui->widget_pppoeAdvanced->setShown(true);
+        ui->widget_pppoeAdvanced->setHidden(false);
         ui->pushButton_pppoeAdvanced->setText(QApplication::translate("PppoeWidget", "Hide advanced"));
     }
     else {

sources/gui/src/pppoewidget.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef PPPOEWIDGET_H

sources/gui/src/settingswindow.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #include "settingswindow.h"

sources/gui/src/settingswindow.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef SETTINGSWINDOW_H

sources/gui/src/sleepthread.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef SLEEPTHREAD_H

sources/gui/src/tunnelwidget.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #include "tunnelwidget.h"

sources/gui/src/tunnelwidget.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef TUNNELWIDGET_H

sources/gui/src/tuntapwidget.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #include "tuntapwidget.h"

sources/gui/src/tuntapwidget.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef TUNTAPWIDGET_H

sources/gui/src/vlanwidget.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #include "vlanwidget.h"

sources/gui/src/vlanwidget.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef VLANWIDGET_H

sources/gui/src/wirelesswidget.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #include "wirelesswidget.h"
@@ -153,28 +153,28 @@ void WirelessWidget::addOption()
 void WirelessWidget::changeSecurity(const QString currentText)
 {
     if (currentText == QString("none")) {
-        ui->widget_essid->setShown(true);
+        ui->widget_essid->setHidden(false);
         ui->widget_wpaConfigSection->setHidden(true);
         ui->widget_wpaConfig->setHidden(true);
         ui->widget_key->setHidden(true);
     }
     else if ((currentText == QString("wep")) ||
              (currentText == QString("wpa"))) {
-        ui->widget_essid->setShown(true);
+        ui->widget_essid->setHidden(false);
         ui->widget_wpaConfigSection->setHidden(true);
         ui->widget_wpaConfig->setHidden(true);
-        ui->widget_key->setShown(true);
+        ui->widget_key->setHidden(false);
     }
     else if (currentText == QString("wpa-configsection")) {
         ui->widget_essid->setHidden(true);
-        ui->widget_wpaConfigSection->setShown(true);
+        ui->widget_wpaConfigSection->setHidden(false);
         ui->widget_wpaConfig->setHidden(true);
         ui->widget_key->setHidden(true);
     }
     else if (currentText == QString("wpa-config")) {
         ui->widget_essid->setHidden(true);
         ui->widget_wpaConfigSection->setHidden(true);
-        ui->widget_wpaConfig->setShown(true);
+        ui->widget_wpaConfig->setHidden(false);
         ui->widget_key->setHidden(true);
     }
 }
@@ -195,7 +195,7 @@ void WirelessWidget::selectWpaConfig()
 void WirelessWidget::showAdvanced()
 {
     if (ui->pushButton_wirelessAdvanced->isChecked()) {
-        ui->widget_wirelessAdvanced->setShown(true);
+        ui->widget_wirelessAdvanced->setHidden(false);
         ui->pushButton_wirelessAdvanced->setText(QApplication::translate("WirelessWidget", "Hide advanced"));
     }
     else {

sources/gui/src/wirelesswidget.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef WIRELESSWIDGET_H

sources/gui/src/wpasupinteract.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #include "wpasupinteract.h"

sources/gui/src/wpasupinteract.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef WPASUPINTERACT_H

sources/plasmoid/configwindow.ui

@@ -127,9 +127,6 @@
            <property name="text">
             <string>Browse</string>
            </property>
-           <property name="default">
-            <bool>true</bool>
-           </property>
           </widget>
          </item>
         </layout>
@@ -163,9 +160,6 @@
            <property name="text">
             <string>Browse</string>
            </property>
-           <property name="default">
-            <bool>true</bool>
-           </property>
           </widget>
          </item>
         </layout>
@@ -577,9 +571,6 @@
            <property name="text">
             <string>Browse</string>
            </property>
-           <property name="default">
-            <bool>true</bool>
-           </property>
           </widget>
          </item>
         </layout>
@@ -613,9 +604,6 @@
            <property name="text">
             <string>Browse</string>
            </property>
-           <property name="default">
-            <bool>true</bool>
-           </property>
           </widget>
          </item>
         </layout>

sources/plasmoid/netctl.cpp

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #include "netctl.h"
@@ -47,7 +47,7 @@ Netctl::~Netctl()
 //    delete startProfile;
 //    delete stopProfile;
 //    delete restartProfile;
-//    delete enableProfileAutoload;
+//    delete enableProfile;
 
 //    delete iconWidget;
 
@@ -57,11 +57,18 @@ Netctl::~Netctl()
 
 void Netctl::init()
 {
+    info[QString("name")] = QString("N\\A");
+    info[QString("status")] = QString("N\\A");
+    info[QString("intIp")] = QString("N\\A");
+    info[QString("extIp")] = QString("N\\A");
+    info[QString("interfaces")] = QString("lo");
+
     netctlEngine = dataEngine(QString("netctl"));
     createActions();
     // generate ui
     // main layout
     fullSpaceLayout = new QGraphicsLinearLayout();
+    fullSpaceLayout->setContentsMargins(1, 1, 1, 1);
     setLayout(fullSpaceLayout);
 
     // frames
@@ -96,18 +103,43 @@ void Netctl::updateInterface(bool setShown)
 
 
 // context menu
+void Netctl::enableProfileSlot()
+{
+    QProcess command;
+    QString commandLine, enableStatus;
+    if (info[QString("status")].contains(QString("enabled"))) {
+        enableStatus = QString(" disable ");
+        sendNotification(QString("Info"), i18n("Set profile %1 disabled", info[QString("name")]));
+    }
+    else {
+        enableStatus = QString(" enable ");
+        sendNotification(QString("Info"), i18n("Set profile %1 enabled", info[QString("name")]));
+    }
+    if (useSudo)
+        commandLine = paths[QString("sudo")] + QString(" ") + paths[QString("netctl")] +
+                enableStatus + info[QString("name")];
+    else
+        commandLine = paths[QString("netctl")] + enableStatus + info[QString("name")];
+    command.startDetached(commandLine);
+}
+
+
 void Netctl::startProfileSlot(QAction *profile)
 {
     QProcess command;
     QString commandLine;
     commandLine = QString("");
+    sendNotification(QString("Info"), i18n("Start profile %1", profile->text().remove(QString("&"))));
     if (status)
-        commandLine = netctlPath + QString(" stop ") + profileName +  QString(" && ");
+        commandLine = paths[QString("netctl")] + QString(" stop ") +
+                info[QString("name")] +  QString(" && ");
     if (useSudo)
-        commandLine = sudoPath + QString(" \"") + commandLine +
-                netctlPath + QString(" start ") + profile->text().remove(QString("&")) + QString("\"");
+        commandLine = paths[QString("sudo")] + QString(" ") + commandLine +
+                paths[QString("netctl")] + QString(" start ") +
+                profile->text().remove(QString("&"));
     else
-        commandLine = commandLine + netctlPath + QString(" start ") + profile->text().remove(QString("&"));
+        commandLine = commandLine + paths[QString("netctl")] + QString(" start ") +
+                profile->text().remove(QString("&"));
     command.startDetached(commandLine);
 }
 
@@ -116,10 +148,12 @@ void Netctl::stopProfileSlot()
 {
     QProcess command;
     QString commandLine;
+    sendNotification(QString("Info"), i18n("Stop profile %1", info[QString("name")]));
     if (useSudo)
-        commandLine = sudoPath + QString(" \"") + netctlPath + QString(" stop ") + profileName + QString("\"");
+        commandLine = paths[QString("sudo")] + QString(" ") + paths[QString("netctl")] +
+                QString(" stop ") + info[QString("name")];
     else
-        commandLine = netctlPath + QString(" stop ") + profileName;
+        commandLine = paths[QString("netctl")] + QString(" stop ") + info[QString("name")];
     command.startDetached(commandLine);
 }
 
@@ -128,73 +162,35 @@ void Netctl::restartProfileSlot()
 {
     QProcess command;
     QString commandLine;
+    sendNotification(QString("Info"), i18n("Restart profile %1", info[QString("name")]));
     if (useSudo)
-        commandLine = sudoPath + QString(" \"") + netctlPath + QString(" restart ") + profileName + QString("\"");
+        commandLine = paths[QString("sudo")] + QString(" ") + paths[QString("netctl")] +
+                QString(" restart ") + info[QString("name")];
     else
-        commandLine = netctlPath + QString(" restart ") + profileName;
+        commandLine = paths[QString("netctl")] + QString(" restart ") + info[QString("name")];
     command.startDetached(commandLine);
 }
 
 
-void Netctl::enableProfileAutoloadSlot()
-{
-    QProcess command;
-    QString commandLine, enableStatus;
-    if (profileStatus.contains(QString("enabled")))
-        enableStatus = QString(" disable ");
-    else
-        enableStatus = QString(" enable ");
-    if (useSudo)
-        commandLine = sudoPath + QString(" \"") + netctlPath + enableStatus + profileName + QString("\"");
-    else
-        commandLine = netctlPath + enableStatus + profileName;
-    command.startDetached(commandLine);
-}
-
-
-void Netctl::createActions()
-{
-    menuActions.clear();
-
-    startProfile = new QAction(QString("Start profile"), this);
-    startProfileMenu = new QMenu(NULL);
-    startProfile->setMenu(startProfileMenu);
-    connect(startProfileMenu, SIGNAL(triggered(QAction *)), this, SLOT(startProfileSlot(QAction *)));
-    menuActions.append(startProfile);
-
-    stopProfile = new QAction(QString("Stop profile"), this);
-    connect(stopProfile, SIGNAL(triggered(bool)), this, SLOT(stopProfileSlot()));
-    menuActions.append(stopProfile);
-
-    restartProfile = new QAction(QString("Restart profile"), this);
-    connect(restartProfile, SIGNAL(triggered(bool)), this, SLOT(restartProfileSlot()));
-    menuActions.append(restartProfile);
-
-    enableProfileAutoload = new QAction(QString("Enable profile"), this);
-    connect(enableProfileAutoload, SIGNAL(triggered(bool)), this, SLOT(enableProfileAutoloadSlot()));
-    menuActions.append(enableProfileAutoload);
-}
-
-
 QList<QAction*> Netctl::contextualActions()
 {
     if (status) {
-        startProfile->setText(QString("Start another profile"));
+        startProfile->setText(i18n("Start another profile"));
         stopProfile->setVisible(true);
-        stopProfile->setText(QString("Stop ") + profileName);
+        stopProfile->setText(i18n("Stop ") + info[QString("name")]);
         restartProfile->setVisible(true);
-        restartProfile->setText(QString("Restart ") + profileName);
-        enableProfileAutoload->setVisible(true);
-        if (profileStatus.contains(QString("enabled")))
-            enableProfileAutoload->setText(QString("Disable ") + profileName);
+        restartProfile->setText(i18n("Restart ") + info[QString("name")]);
+        enableProfile->setVisible(true);
+        if (info[QString("status")].contains(QString("enabled")))
+            enableProfile->setText(i18n("Disable ") + info[QString("name")]);
         else
-            enableProfileAutoload->setText(QString("Enable ") + profileName);
+            enableProfile->setText(i18n("Enable ") + info[QString("name")]);
     }
     else {
-        startProfile->setText(QString("Start profile"));
+        startProfile->setText(i18n("Start profile"));
         stopProfile->setVisible(false);
         restartProfile->setVisible(false);
-        enableProfileAutoload->setVisible(false);
+        enableProfile->setVisible(false);
     }
 
     startProfileMenu->clear();
@@ -207,25 +203,51 @@ QList<QAction*> Netctl::contextualActions()
 }
 
 
-// events
-void Netctl::showGui()
+void Netctl::createActions()
 {
-    QProcess command;
-    command.startDetached(guiPath);
+    menuActions.clear();
+
+    startProfile = new QAction(i18n("Start profile"), this);
+    startProfileMenu = new QMenu(NULL);
+    startProfile->setMenu(startProfileMenu);
+    connect(startProfileMenu, SIGNAL(triggered(QAction *)), this,
+            SLOT(startProfileSlot(QAction *)));
+    menuActions.append(startProfile);
+
+    stopProfile = new QAction(i18n("Stop profile"), this);
+    connect(stopProfile, SIGNAL(triggered(bool)), this, SLOT(stopProfileSlot()));
+    menuActions.append(stopProfile);
+
+    restartProfile = new QAction(i18n("Restart profile"), this);
+    connect(restartProfile, SIGNAL(triggered(bool)), this, SLOT(restartProfileSlot()));
+    menuActions.append(restartProfile);
+
+    enableProfile = new QAction(i18n("Enable profile"), this);
+    connect(enableProfile, SIGNAL(triggered(bool)), this, SLOT(enableProfileSlot()));
+    menuActions.append(enableProfile);
 }
 
 
+// events
 void Netctl::sendNotification(const QString eventId, const QString message)
 {
     KNotification *notification = new KNotification(eventId);
     notification->setComponentData(KComponentData("plasma_applet_netctl"));
-    notification->setTitle(eventId);
+    notification->setTitle(QString("Netctl ::: ") + eventId);
     notification->setText(message);
     notification->sendEvent();
     delete notification;
 }
 
 
+void Netctl::showGui()
+{
+    sendNotification(QString("Info"), i18n("Start GUI"));
+    QProcess command;
+    command.startDetached(paths[QString("gui")]);
+}
+
+
 // data engine interaction
 void Netctl::connectToEngine()
 {
@@ -234,36 +256,18 @@ void Netctl::connectToEngine()
     netctlEngine->connectSource(QString("currentProfile"), this, autoUpdateInterval);
     netctlEngine->connectSource(QString("statusString"), this, autoUpdateInterval);
     updateInterface(false);
-    if (showBigInterface) {
-        if (showExtIp)
+    if (bigInterface[QString("main")]) {
+        if (bigInterface[QString("extIp")])
             netctlEngine->connectSource(QString("extIp"), this, autoUpdateInterval);
-        if (showIntIp)
+        if (bigInterface[QString("intIp")])
             netctlEngine->connectSource(QString("intIp"), this, autoUpdateInterval);
-        if (showNetDev)
+        if (bigInterface[QString("netDev")])
             netctlEngine->connectSource(QString("interfaces"), this, autoUpdateInterval);
         updateInterface(true);
     }
 }
 
 
-void Netctl::disconnectFromEngine()
-{
-    netctlEngine->disconnectSource(QString("profiles"), this);
-    netctlEngine->disconnectSource(QString("statusBool"), this);
-    netctlEngine->disconnectSource(QString("currentProfile"), this);
-    netctlEngine->disconnectSource(QString("statusString"), this);
-    if (showBigInterface) {
-        if (showExtIp)
-            netctlEngine->disconnectSource(QString("extIp"), this);
-        if (showIntIp)
-            netctlEngine->disconnectSource(QString("intIp"), this);
-        if (showNetDev)
-            netctlEngine->disconnectSource(QString("interfaces"), this);
-    }
-    updateInterface(false);
-}
-
-
 void Netctl::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Data &data)
 {
     if (data.keys().count() == 0)
@@ -273,80 +277,102 @@ void Netctl::dataUpdated(const QString &sourceName, const Plasma::DataEngine::Da
         value = QString("N\\A");
 
     if (sourceName == QString("currentProfile")) {
-        profileName = value;
+        info[QString("name")] = value;
 
         // update text
         QStringList text;
-        text.append(profileName + QString(" ") + profileStatus);
-        if (showIntIp)
-            text.append(intIp);
-        if (showExtIp)
-            text.append(extIp);
-        if (showNetDev)
-            text.append(interfaces);
-        if (showBigInterface)
+        text.append(info[QString("name")] + QString(" ") + info[QString("status")]);
+        if (bigInterface[QString("intIp")])
+            text.append(info[QString("intIp")]);
+        if (bigInterface[QString("extIp")])
+            text.append(info[QString("extIp")]);
+        if (bigInterface[QString("netDev")])
+            text.append(info[QString("interfaces")]);
+        if (bigInterface[QString("main")])
             textLabel->setText(formatLine[0] + text.join(QString("<br>")) + formatLine[1]);
     }
     else if (sourceName == QString("extIp")) {
-        extIp = value;
+        info[QString("extIp")] = value;
     }
     else if (sourceName == QString("intIp")) {
-        intIp = value;
+        info[QString("intIp")] = value;
     }
     else if (sourceName == QString("interfaces")) {
-        interfaces = value;
+        info[QString("interfaces")] = value;
     }
     else if (sourceName == QString("profiles")) {
         profileList = value.split(QString(","));
     }
     else if (sourceName == QString("statusBool")) {
         if (value == QString("true")) {
+            if (! status)
+                sendNotification(QString("Info"), i18n("Network is up"));
             status = true;
-            iconWidget->setIcon(activeIconPath);
+            iconWidget->setIcon(paths[QString("active")]);
         }
         else {
-            iconWidget->setIcon(inactiveIconPath);
+            if (status)
+                sendNotification(QString("Info"), i18n("Network is down"));
             status = false;
+            iconWidget->setIcon(paths[QString("inactive")]);
         }
     }
     else if (sourceName == QString("statusString")) {
-        profileStatus = QString("(") + value + QString(")");
+        info[QString("status")] = QString("(") + value + QString(")");
     }
 
     update();
 }
 
 
+void Netctl::disconnectFromEngine()
+{
+    netctlEngine->disconnectSource(QString("profiles"), this);
+    netctlEngine->disconnectSource(QString("statusBool"), this);
+    netctlEngine->disconnectSource(QString("currentProfile"), this);
+    netctlEngine->disconnectSource(QString("statusString"), this);
+    if (bigInterface[QString("main")]) {
+        if (bigInterface[QString("extIp")])
+            netctlEngine->disconnectSource(QString("extIp"), this);
+        if (bigInterface[QString("intIp")])
+            netctlEngine->disconnectSource(QString("intIp"), this);
+        if (bigInterface[QString("netDev")])
+            netctlEngine->disconnectSource(QString("interfaces"), this);
+    }
+    updateInterface(false);
+}
+
+
 //  configuration interface
-void Netctl::selectGuiExe()
-{
-    KUrl guiUrl = KFileDialog::getOpenUrl(KUrl(), "*");
-    if (!guiUrl.isEmpty())
-        uiConfig.lineEdit_gui->setText(guiUrl.path());
-}
-
-
-void Netctl::selectNetctlExe()
-{
-    KUrl netctlUrl = KFileDialog::getOpenUrl(KUrl(), "*");
-    if (!netctlUrl.isEmpty())
-        uiConfig.lineEdit_netctl->setText(netctlUrl.path());
-}
-
-
 void Netctl::selectActiveIcon()
 {
-    KUrl activeIconUrl = KFileDialog::getOpenUrl(KUrl(), "*");
-    if (!activeIconUrl.isEmpty())
-        uiConfig.lineEdit_activeIcon->setText(activeIconUrl.path());
+    KUrl url = KFileDialog::getOpenUrl(KUrl(), "*");
+    if (!url.isEmpty())
+        uiConfig.lineEdit_activeIcon->setText(url.path());
+}
+
+
+void Netctl::selectGuiExe()
+{
+    KUrl url = KFileDialog::getOpenUrl(KUrl(), "*");
+    if (!url.isEmpty())
+        uiConfig.lineEdit_gui->setText(url.path());
 }
 
 
 void Netctl::selectInactiveIcon()
 {
-    KUrl inactiveIconUrl = KFileDialog::getOpenUrl(KUrl(), "*");
-    if (!inactiveIconUrl.isEmpty())
-        uiConfig.lineEdit_inactiveIcon->setText(inactiveIconUrl.path());
+    KUrl url = KFileDialog::getOpenUrl(KUrl(), "*");
+    if (!url.isEmpty())
+        uiConfig.lineEdit_inactiveIcon->setText(url.path());
+}
+
+
+void Netctl::selectNetctlExe()
+{
+    KUrl url = KFileDialog::getOpenUrl(KUrl(), "*");
+    if (!url.isEmpty())
+        uiConfig.lineEdit_netctl->setText(url.path());
 }
 
 
@@ -354,35 +380,42 @@ void Netctl::createConfigurationInterface(KConfigDialog *parent)
 {
     QWidget *configwin = new QWidget;
     uiConfig.setupUi(configwin);
-    QString text = QString(NAME) + " - " + QString(VERSION) + "\n" + "(c) " + QString(DATE) + " " + QString(AUTHOR);
+    QString text = QString(NAME) + " - " + QString(VERSION) + "\n" + "(c) " +
+            QString(DATE) + " " + QString(AUTHOR);
     uiConfig.label_info->setText(text);
 
     uiConfig.spinBox_autoUpdate->setValue(autoUpdateInterval);
-    uiConfig.lineEdit_gui->setText(guiPath);
-    uiConfig.lineEdit_netctl->setText(netctlPath);
+    uiConfig.lineEdit_gui->setText(paths[QString("gui")]);
+    uiConfig.lineEdit_netctl->setText(paths[QString("netctl")]);
     if (useSudo)
         uiConfig.checkBox_sudo->setCheckState(Qt::Checked);
     else
         uiConfig.checkBox_sudo->setCheckState(Qt::Unchecked);
-    uiConfig.lineEdit_sudo->setText(sudoPath);
-    if (showBigInterface)
+    uiConfig.lineEdit_sudo->setText(paths[QString("sudo")]);
+    if (bigInterface[QString("main")])
         uiConfig.checkBox_showBigInterface->setCheckState(Qt::Checked);
     else
         uiConfig.checkBox_showBigInterface->setCheckState(Qt::Unchecked);
-    if (showNetDev)
+    if (bigInterface[QString("netDev")])
         uiConfig.checkBox_showNetDev->setCheckState(Qt::Checked);
     else
         uiConfig.checkBox_showNetDev->setCheckState(Qt::Unchecked);
-    if (showExtIp)
+    if (bigInterface[QString("extIp")])
         uiConfig.checkBox_showExtIp->setCheckState(Qt::Checked);
     else
         uiConfig.checkBox_showExtIp->setCheckState(Qt::Unchecked);
-    if (showIntIp)
+    if (bigInterface[QString("intIp")])
         uiConfig.checkBox_showIntIp->setCheckState(Qt::Checked);
     else
         uiConfig.checkBox_showIntIp->setCheckState(Qt::Unchecked);
     setBigInterface();
 
+    KConfigGroup cg = config();
+    QString fontFamily = cg.readEntry("fontFamily", "Terminus");
+    int fontSize = cg.readEntry("fontSize", 10);
+    QString fontColor = cg.readEntry("fontColor", "#000000");
+    int fontWeight = cg.readEntry("fontWeight", 400);
+    QString fontStyle = cg.readEntry("fontStyle", "normal");
     QFont font = QFont(fontFamily, 12, 400, FALSE);
     uiConfig.fontComboBox_font->setCurrentFont(font);
     uiConfig.spinBox_fontSize->setValue(fontSize);
@@ -392,12 +425,13 @@ void Netctl::createConfigurationInterface(KConfigDialog *parent)
         uiConfig.comboBox_fontStyle->setCurrentIndex(0);
     else if (fontStyle == "italic")
         uiConfig.comboBox_fontStyle->setCurrentIndex(1);
-    uiConfig.lineEdit_activeIcon->setText(activeIconPath);
-    uiConfig.lineEdit_inactiveIcon->setText(inactiveIconPath);
+    uiConfig.lineEdit_activeIcon->setText(paths[QString("active")]);
+    uiConfig.lineEdit_inactiveIcon->setText(paths[QString("inactive")]);
 
     parent->addPage(configwin, i18n("Netctl plasmoid"), Applet::icon());
 
-    connect(uiConfig.checkBox_showBigInterface, SIGNAL(stateChanged(int)), this, SLOT(setBigInterface()));
+    connect(uiConfig.checkBox_showBigInterface, SIGNAL(stateChanged(int)), this,
+            SLOT(setBigInterface()));
     connect(uiConfig.checkBox_sudo, SIGNAL(stateChanged(int)), this, SLOT(setSudo()));
 
     connect(uiConfig.pushButton_gui, SIGNAL(clicked()), this, SLOT(selectGuiExe()));
@@ -455,22 +489,24 @@ void Netctl::configChanged()
     KConfigGroup cg = config();
 
     autoUpdateInterval = cg.readEntry("autoUpdateInterval", 1000);
-    guiPath = cg.readEntry("guiPath", "/usr/bin/netctl-gui");
-    netctlPath = cg.readEntry("netctlPath", "/usr/bin/netctl");
+    paths[QString("gui")] = cg.readEntry("guiPath", "/usr/bin/netctl-gui");
+    paths[QString("netctl")] = cg.readEntry("netctlPath", "/usr/bin/netctl");
     useSudo = cg.readEntry("useSudo", true);
-    sudoPath = cg.readEntry("sudoPath", "/usr/bin/kdesu -c");
-    showBigInterface = cg.readEntry("showBigInterface", true);
-    showNetDev = cg.readEntry("showNetDev", true);
-    showExtIp = cg.readEntry("showExtIp", false);
-    showIntIp = cg.readEntry("showIntIp", true);
+    paths[QString("sudo")] = cg.readEntry("sudoPath", "/usr/bin/kdesu");
+    bigInterface[QString("main")] = cg.readEntry("showBigInterface", true);
+    bigInterface[QString("extIp")] = cg.readEntry("showExtIp", false);
+    bigInterface[QString("netDev")] = cg.readEntry("showNetDev", true);
+    bigInterface[QString("intIp")] = cg.readEntry("showIntIp", true);
 
-    fontFamily = cg.readEntry("fontFamily", "Terminus");
-    fontSize = cg.readEntry("fontSize", 10);
-    fontColor = cg.readEntry("fontColor", "#000000");
-    fontWeight = cg.readEntry("fontWeight", 400);
-    fontStyle = cg.readEntry("fontStyle", "normal");
-    activeIconPath = cg.readEntry("activeIconPath", "/usr/share/icons/hicolor/64x64/apps/netctl-idle.png");
-    inactiveIconPath = cg.readEntry("inactiveIconPath", "/usr/share/icons/hicolor/64x64/apps/netctl-offline.png");
+    QString fontFamily = cg.readEntry("fontFamily", "Terminus");
+    int fontSize = cg.readEntry("fontSize", 10);
+    QString fontColor = cg.readEntry("fontColor", "#000000");
+    int fontWeight = cg.readEntry("fontWeight", 400);
+    QString fontStyle = cg.readEntry("fontStyle", "normal");
+    paths[QString("active")] = cg.readEntry("activeIconPath",
+                                            "/usr/share/icons/hicolor/64x64/apps/netctl-idle.png");
+    paths[QString("inactive")] = cg.readEntry("inactiveIconPath",
+                                              "/usr/share/icons/hicolor/64x64/apps/netctl-offline.png");
 
     formatLine[0] = ("<p align=\"center\"><span style=\" font-family:'" + fontFamily + \
                      "'; font-style:" + fontStyle + \

sources/plasmoid/netctl.h

@@ -1,18 +1,18 @@
 /***************************************************************************
- *   This file is part of netctl-plasmoid                                  *
+ *   This file is part of netctl-gui                                       *
  *                                                                         *
- *   netctl-plasmoid is free software: you can redistribute it and/or      *
+ *   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-plasmoid is distributed in the hope that it will be useful,    *
+ *   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-plasmoid. If not, see http://www.gnu.org/licenses/  *
+ *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
  ***************************************************************************/
 
 #ifndef NETCTL_PLASMOID_H
@@ -41,8 +41,8 @@ public:
 
 public slots:
     // events
-    void showGui();
     void sendNotification(const QString eventId, const QString message);
+    void showGui();
     // dataengine
     void dataUpdated(const QString &sourceName, const Plasma::DataEngine::Data &data);
     // configuration interface
@@ -55,15 +55,15 @@ private slots:
     // ui
     void updateInterface(bool setHidden);
     // configuration interface
-    void selectGuiExe();
-    void selectNetctlExe();
     void selectActiveIcon();
+    void selectGuiExe();
     void selectInactiveIcon();
+    void selectNetctlExe();
     // context menu
+    void enableProfileSlot();
     void startProfileSlot(QAction *profile);
     void stopProfileSlot();
     void restartProfileSlot();
-    void enableProfileAutoloadSlot();
 
 protected:
     void createConfigurationInterface(KConfigDialog *parent);
@@ -77,21 +77,16 @@ private:
     // text
     Plasma::Label *textLabel;
     bool status;
-    QString profileName;
-    QString profileStatus;
-    QString intIp;
-    QString extIp;
-    QString interfaces;
+    QMap<QString, QString> info;
     QStringList profileList;
-    QStringList formatLine;
     // context menu
     void createActions();
     QList<QAction*> menuActions;
-    QAction *startProfile;
     QMenu *startProfileMenu;
+    QAction *enableProfile;
+    QAction *startProfile;
     QAction *stopProfile;
     QAction *restartProfile;
-    QAction *enableProfileAutoload;
     // data engine
     Plasma::DataEngine *netctlEngine;
     void connectToEngine();
@@ -102,21 +97,10 @@ private:
     Ui::ConfigWindow uiConfig;
     // configuration
     int autoUpdateInterval;
-    QString guiPath;
-    QString netctlPath;
+    QMap<QString, bool> bigInterface;
+    QStringList formatLine;
+    QMap<QString, QString> paths;
     bool useSudo;
-    QString sudoPath;
-    bool showBigInterface;
-    bool showNetDev;
-    bool showExtIp;
-    bool showIntIp;
-    QString fontFamily;
-    int fontSize;
-    QString fontColor;
-    int fontWeight;
-    QString fontStyle;
-    QString activeIconPath;
-    QString inactiveIconPath;
 };
 
 K_EXPORT_PLASMA_APPLET(netctl, Netctl)

sources/plasmoid/po/en.po

@@ -6,19 +6,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=98925\n"
-"POT-Creation-Date: 2014-03-25 10:52+0400\n"
-"PO-Revision-Date: 2014-03-25 10:54+0400\n"
+"POT-Creation-Date: 2014-04-07 00:27+0400\n"
+"PO-Revision-Date: 2014-04-07 00:28+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
-"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: netctl.cpp:398
+#: netctl.cpp:112
+msgid "Set profile %1 disabled"
+msgstr "Set profile %1 disabled"
+
+#: netctl.cpp:116
+msgid "Set profile %1 enabled"
+msgstr "Set profile %1 enabled"
+
+#: netctl.cpp:132
+msgid "Start profile %1"
+msgstr "Start profile %1"
+
+#: netctl.cpp:151
+msgid "Stop profile %1"
+msgstr "Stop profile %1"
+
+#: netctl.cpp:165
+msgid "Restart profile %1"
+msgstr "Restart profile %1"
+
+#: netctl.cpp:178
+msgid "Start another profile"
+msgstr "Start another profile"
+
+#: netctl.cpp:180
+msgid "Stop "
+msgstr "Stop "
+
+#: netctl.cpp:182
+msgid "Restart "
+msgstr "Restart "
+
+#: netctl.cpp:185
+msgid "Disable "
+msgstr "Disable "
+
+#: netctl.cpp:187
+msgid "Enable "
+msgstr "Enable "
+
+#: netctl.cpp:190 netctl.cpp:210
+msgid "Start profile"
+msgstr "Start profile"
+
+#: netctl.cpp:217
+msgid "Stop profile"
+msgstr "Stop profile"
+
+#: netctl.cpp:221
+msgid "Restart profile"
+msgstr "Restart profile"
+
+#: netctl.cpp:225
+msgid "Enable profile"
+msgstr "Enable profile"
+
+#: netctl.cpp:245
+msgid "Start GUI"
+msgstr "Start GUI"
+
+#: netctl.cpp:309
+msgid "Network is up"
+msgstr "Network is up"
+
+#: netctl.cpp:315
+msgid "Network is down"
+msgstr "Network is down"
+
+#: netctl.cpp:431
 msgid "Netctl plasmoid"
 msgstr "Netctl plasmoid"
 
@@ -42,146 +110,146 @@ msgstr "Path to GUI"
 
 #. i18n: file: configwindow.ui:128
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_gui)
-#. i18n: file: configwindow.ui:164
+#. i18n: file: configwindow.ui:161
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl)
-#. i18n: file: configwindow.ui:578
+#. i18n: file: configwindow.ui:572
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon)
-#. i18n: file: configwindow.ui:614
+#. i18n: file: configwindow.ui:605
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon)
 #. i18n: file: configwindow.ui:128
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_gui)
-#. i18n: file: configwindow.ui:164
+#. i18n: file: configwindow.ui:161
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl)
-#. i18n: file: configwindow.ui:578
+#. i18n: file: configwindow.ui:572
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon)
-#. i18n: file: configwindow.ui:614
+#. i18n: file: configwindow.ui:605
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon)
 #: po/rc.cpp:12 po/rc.cpp:18 po/rc.cpp:78 po/rc.cpp:84 rc.cpp:12 rc.cpp:18
 #: rc.cpp:78 rc.cpp:84
 msgid "Browse"
 msgstr "Browse"
 
-#. i18n: file: configwindow.ui:148
+#. i18n: file: configwindow.ui:145
 #. i18n: ectx: property (text), widget (QLabel, label_netctl)
 #: po/rc.cpp:15 rc.cpp:15
 msgid "Path to netctl"
 msgstr "Path to netctl"
 
-#. i18n: file: configwindow.ui:184
+#. i18n: file: configwindow.ui:178
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_sudo)
 #: po/rc.cpp:21 rc.cpp:21
 msgid "Use sudo for netctl"
 msgstr "Use sudo for netctl"
 
-#. i18n: file: configwindow.ui:199
+#. i18n: file: configwindow.ui:193
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showBigInterface)
 #: po/rc.cpp:24 rc.cpp:24
 msgid "Show more detailed interface"
 msgstr "Show more detailed interface"
 
-#. i18n: file: configwindow.ui:209
+#. i18n: file: configwindow.ui:203
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showNetDev)
 #: po/rc.cpp:27 rc.cpp:27
 msgid "Show network devices"
 msgstr "Show network devices"
 
-#. i18n: file: configwindow.ui:219
+#. i18n: file: configwindow.ui:213
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showExtIp)
 #: po/rc.cpp:30 rc.cpp:30
 msgid "Show external IP"
 msgstr "Show external IP"
 
-#. i18n: file: configwindow.ui:229
+#. i18n: file: configwindow.ui:223
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showIntIp)
 #: po/rc.cpp:33 rc.cpp:33
 msgid "Show internal IP"
 msgstr "Show internal IP"
 
-#. i18n: file: configwindow.ui:253
+#. i18n: file: configwindow.ui:247
 #. i18n: ectx: attribute (title), widget (QWidget, tabAppearance)
 #: po/rc.cpp:36 rc.cpp:36
 msgid "Appearance"
 msgstr "Appearance"
 
-#. i18n: file: configwindow.ui:267
+#. i18n: file: configwindow.ui:261
 #. i18n: ectx: property (text), widget (QLabel, label_font)
 #: po/rc.cpp:39 rc.cpp:39
 msgid "Font"
 msgstr "Font"
 
-#. i18n: file: configwindow.ui:299
+#. i18n: file: configwindow.ui:293
 #. i18n: ectx: property (toolTip), widget (QFontComboBox, fontComboBox_font)
 #: po/rc.cpp:42 rc.cpp:42
 msgid "Set font family"
 msgstr "Set font family"
 
-#. i18n: file: configwindow.ui:316
+#. i18n: file: configwindow.ui:310
 #. i18n: ectx: property (text), widget (QLabel, label_fontSize)
 #: po/rc.cpp:45 rc.cpp:45
 msgid "Font size"
 msgstr "Font size"
 
-#. i18n: file: configwindow.ui:348
+#. i18n: file: configwindow.ui:342
 #. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontSize)
 #: po/rc.cpp:48 rc.cpp:48
 msgid "Set font size"
 msgstr "Set font size"
 
-#. i18n: file: configwindow.ui:377
+#. i18n: file: configwindow.ui:371
 #. i18n: ectx: property (text), widget (QLabel, label_fontColor)
 #: po/rc.cpp:51 rc.cpp:51
 msgid "Font color"
 msgstr "Font color"
 
-#. i18n: file: configwindow.ui:409
+#. i18n: file: configwindow.ui:403
 #. i18n: ectx: property (toolTip), widget (KColorCombo, kcolorcombo_fontColor)
 #: po/rc.cpp:54 rc.cpp:54
 msgid "Set font color"
 msgstr "Set font color"
 
-#. i18n: file: configwindow.ui:426
+#. i18n: file: configwindow.ui:420
 #. i18n: ectx: property (text), widget (QLabel, label_fontWeight)
 #: po/rc.cpp:57 rc.cpp:57
 msgid "Font weight"
 msgstr "Font weight"
 
-#. i18n: file: configwindow.ui:458
+#. i18n: file: configwindow.ui:452
 #. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontWeight)
 #: po/rc.cpp:60 rc.cpp:60
 msgid "Set font weight"
 msgstr "Set font weight"
 
-#. i18n: file: configwindow.ui:490
+#. i18n: file: configwindow.ui:484
 #. i18n: ectx: property (text), widget (QLabel, label_fontStyle)
 #: po/rc.cpp:63 rc.cpp:63
 msgid "Font style"
 msgstr "Font style"
 
-#. i18n: file: configwindow.ui:522
+#. i18n: file: configwindow.ui:516
 #. i18n: ectx: property (toolTip), widget (QComboBox, comboBox_fontStyle)
 #: po/rc.cpp:66 rc.cpp:66
 msgid "Set font style"
 msgstr "Set font style"
 
-#. i18n: file: configwindow.ui:526
+#. i18n: file: configwindow.ui:520
 #. i18n: ectx: property (text), item, widget (QComboBox, comboBox_fontStyle)
 #: po/rc.cpp:69 rc.cpp:69
 msgid "normal"
 msgstr "normal"
 
-#. i18n: file: configwindow.ui:531
+#. i18n: file: configwindow.ui:525
 #. i18n: ectx: property (text), item, widget (QComboBox, comboBox_fontStyle)
 #: po/rc.cpp:72 rc.cpp:72
 msgid "italic"
 msgstr "italic"
 
-#. i18n: file: configwindow.ui:562
+#. i18n: file: configwindow.ui:556
 #. i18n: ectx: property (text), widget (QLabel, label_activeIcon)
 #: po/rc.cpp:75 rc.cpp:75
 msgid "Active icon"
 msgstr "Active icon"
 
-#. i18n: file: configwindow.ui:598
+#. i18n: file: configwindow.ui:589
 #. i18n: ectx: property (text), widget (QLabel, label_inactiveIcon)
 #: po/rc.cpp:81 rc.cpp:81
 msgid "Inactive icon"

sources/plasmoid/po/plasma_applet_netctl.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=98925\n"
-"POT-Creation-Date: 2014-03-25 10:52+0400\n"
+"POT-Creation-Date: 2014-04-07 00:27+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,75 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: netctl.cpp:398
+#: netctl.cpp:112
+msgid "Set profile %1 disabled"
+msgstr ""
+
+#: netctl.cpp:116
+msgid "Set profile %1 enabled"
+msgstr ""
+
+#: netctl.cpp:132
+msgid "Start profile %1"
+msgstr ""
+
+#: netctl.cpp:151
+msgid "Stop profile %1"
+msgstr ""
+
+#: netctl.cpp:165
+msgid "Restart profile %1"
+msgstr ""
+
+#: netctl.cpp:178
+msgid "Start another profile"
+msgstr ""
+
+#: netctl.cpp:180
+msgid "Stop "
+msgstr ""
+
+#: netctl.cpp:182
+msgid "Restart "
+msgstr ""
+
+#: netctl.cpp:185
+msgid "Disable "
+msgstr ""
+
+#: netctl.cpp:187
+msgid "Enable "
+msgstr ""
+
+#: netctl.cpp:190 netctl.cpp:210
+msgid "Start profile"
+msgstr ""
+
+#: netctl.cpp:217
+msgid "Stop profile"
+msgstr ""
+
+#: netctl.cpp:221
+msgid "Restart profile"
+msgstr ""
+
+#: netctl.cpp:225
+msgid "Enable profile"
+msgstr ""
+
+#: netctl.cpp:245
+msgid "Start GUI"
+msgstr ""
+
+#: netctl.cpp:309
+msgid "Network is up"
+msgstr ""
+
+#: netctl.cpp:315
+msgid "Network is down"
+msgstr ""
+
+#: netctl.cpp:431
 msgid "Netctl plasmoid"
 msgstr ""
 
@@ -41,146 +109,146 @@ msgstr ""
 
 #. i18n: file: configwindow.ui:128
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_gui)
-#. i18n: file: configwindow.ui:164
+#. i18n: file: configwindow.ui:161
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl)
-#. i18n: file: configwindow.ui:578
+#. i18n: file: configwindow.ui:572
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon)
-#. i18n: file: configwindow.ui:614
+#. i18n: file: configwindow.ui:605
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon)
 #. i18n: file: configwindow.ui:128
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_gui)
-#. i18n: file: configwindow.ui:164
+#. i18n: file: configwindow.ui:161
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl)
-#. i18n: file: configwindow.ui:578
+#. i18n: file: configwindow.ui:572
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon)
-#. i18n: file: configwindow.ui:614
+#. i18n: file: configwindow.ui:605
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon)
 #: po/rc.cpp:12 po/rc.cpp:18 po/rc.cpp:78 po/rc.cpp:84 rc.cpp:12 rc.cpp:18
 #: rc.cpp:78 rc.cpp:84
 msgid "Browse"
 msgstr ""
 
-#. i18n: file: configwindow.ui:148
+#. i18n: file: configwindow.ui:145
 #. i18n: ectx: property (text), widget (QLabel, label_netctl)
 #: po/rc.cpp:15 rc.cpp:15
 msgid "Path to netctl"
 msgstr ""
 
-#. i18n: file: configwindow.ui:184
+#. i18n: file: configwindow.ui:178
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_sudo)
 #: po/rc.cpp:21 rc.cpp:21
 msgid "Use sudo for netctl"
 msgstr ""
 
-#. i18n: file: configwindow.ui:199
+#. i18n: file: configwindow.ui:193
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showBigInterface)
 #: po/rc.cpp:24 rc.cpp:24
 msgid "Show more detailed interface"
 msgstr ""
 
-#. i18n: file: configwindow.ui:209
+#. i18n: file: configwindow.ui:203
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showNetDev)
 #: po/rc.cpp:27 rc.cpp:27
 msgid "Show network devices"
 msgstr ""
 
-#. i18n: file: configwindow.ui:219
+#. i18n: file: configwindow.ui:213
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showExtIp)
 #: po/rc.cpp:30 rc.cpp:30
 msgid "Show external IP"
 msgstr ""
 
-#. i18n: file: configwindow.ui:229
+#. i18n: file: configwindow.ui:223
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showIntIp)
 #: po/rc.cpp:33 rc.cpp:33
 msgid "Show internal IP"
 msgstr ""
 
-#. i18n: file: configwindow.ui:253
+#. i18n: file: configwindow.ui:247
 #. i18n: ectx: attribute (title), widget (QWidget, tabAppearance)
 #: po/rc.cpp:36 rc.cpp:36
 msgid "Appearance"
 msgstr ""
 
-#. i18n: file: configwindow.ui:267
+#. i18n: file: configwindow.ui:261
 #. i18n: ectx: property (text), widget (QLabel, label_font)
 #: po/rc.cpp:39 rc.cpp:39
 msgid "Font"
 msgstr ""
 
-#. i18n: file: configwindow.ui:299
+#. i18n: file: configwindow.ui:293
 #. i18n: ectx: property (toolTip), widget (QFontComboBox, fontComboBox_font)
 #: po/rc.cpp:42 rc.cpp:42
 msgid "Set font family"
 msgstr ""
 
-#. i18n: file: configwindow.ui:316
+#. i18n: file: configwindow.ui:310
 #. i18n: ectx: property (text), widget (QLabel, label_fontSize)
 #: po/rc.cpp:45 rc.cpp:45
 msgid "Font size"
 msgstr ""
 
-#. i18n: file: configwindow.ui:348
+#. i18n: file: configwindow.ui:342
 #. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontSize)
 #: po/rc.cpp:48 rc.cpp:48
 msgid "Set font size"
 msgstr ""
 
-#. i18n: file: configwindow.ui:377
+#. i18n: file: configwindow.ui:371
 #. i18n: ectx: property (text), widget (QLabel, label_fontColor)
 #: po/rc.cpp:51 rc.cpp:51
 msgid "Font color"
 msgstr ""
 
-#. i18n: file: configwindow.ui:409
+#. i18n: file: configwindow.ui:403
 #. i18n: ectx: property (toolTip), widget (KColorCombo, kcolorcombo_fontColor)
 #: po/rc.cpp:54 rc.cpp:54
 msgid "Set font color"
 msgstr ""
 
-#. i18n: file: configwindow.ui:426
+#. i18n: file: configwindow.ui:420
 #. i18n: ectx: property (text), widget (QLabel, label_fontWeight)
 #: po/rc.cpp:57 rc.cpp:57
 msgid "Font weight"
 msgstr ""
 
-#. i18n: file: configwindow.ui:458
+#. i18n: file: configwindow.ui:452
 #. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontWeight)
 #: po/rc.cpp:60 rc.cpp:60
 msgid "Set font weight"
 msgstr ""
 
-#. i18n: file: configwindow.ui:490
+#. i18n: file: configwindow.ui:484
 #. i18n: ectx: property (text), widget (QLabel, label_fontStyle)
 #: po/rc.cpp:63 rc.cpp:63
 msgid "Font style"
 msgstr ""
 
-#. i18n: file: configwindow.ui:522
+#. i18n: file: configwindow.ui:516
 #. i18n: ectx: property (toolTip), widget (QComboBox, comboBox_fontStyle)
 #: po/rc.cpp:66 rc.cpp:66
 msgid "Set font style"
 msgstr ""
 
-#. i18n: file: configwindow.ui:526
+#. i18n: file: configwindow.ui:520
 #. i18n: ectx: property (text), item, widget (QComboBox, comboBox_fontStyle)
 #: po/rc.cpp:69 rc.cpp:69
 msgid "normal"
 msgstr ""
 
-#. i18n: file: configwindow.ui:531
+#. i18n: file: configwindow.ui:525
 #. i18n: ectx: property (text), item, widget (QComboBox, comboBox_fontStyle)
 #: po/rc.cpp:72 rc.cpp:72
 msgid "italic"
 msgstr ""
 
-#. i18n: file: configwindow.ui:562
+#. i18n: file: configwindow.ui:556
 #. i18n: ectx: property (text), widget (QLabel, label_activeIcon)
 #: po/rc.cpp:75 rc.cpp:75
 msgid "Active icon"
 msgstr ""
 
-#. i18n: file: configwindow.ui:598
+#. i18n: file: configwindow.ui:589
 #. i18n: ectx: property (text), widget (QLabel, label_inactiveIcon)
 #: po/rc.cpp:81 rc.cpp:81
 msgid "Inactive icon"

sources/plasmoid/po/ru.po

@@ -6,19 +6,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=98925\n"
-"POT-Creation-Date: 2014-03-25 10:52+0400\n"
-"PO-Revision-Date: 2014-03-25 10:58+0400\n"
+"POT-Creation-Date: 2014-04-07 00:27+0400\n"
+"PO-Revision-Date: 2014-04-07 00:28+0400\n"
 "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
-"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: netctl.cpp:398
+#: netctl.cpp:112
+msgid "Set profile %1 disabled"
+msgstr "Выключение автозагрузки профиля %1"
+
+#: netctl.cpp:116
+msgid "Set profile %1 enabled"
+msgstr "Включение автозагрузки профиля %1"
+
+#: netctl.cpp:132
+msgid "Start profile %1"
+msgstr "Запуск профиля %1"
+
+#: netctl.cpp:151
+msgid "Stop profile %1"
+msgstr "Остановка профиля %1"
+
+#: netctl.cpp:165
+msgid "Restart profile %1"
+msgstr "Перезапуск профиля %1"
+
+#: netctl.cpp:178
+msgid "Start another profile"
+msgstr "Запустить другой профиль"
+
+#: netctl.cpp:180
+msgid "Stop "
+msgstr "Остановить "
+
+#: netctl.cpp:182
+msgid "Restart "
+msgstr "Перезапустить "
+
+#: netctl.cpp:185
+msgid "Disable "
+msgstr "Отключить "
+
+#: netctl.cpp:187
+msgid "Enable "
+msgstr "Включить "
+
+#: netctl.cpp:190 netctl.cpp:210
+msgid "Start profile"
+msgstr "Запустить профиль"
+
+#: netctl.cpp:217
+msgid "Stop profile"
+msgstr "Остановить профиль"
+
+#: netctl.cpp:221
+msgid "Restart profile"
+msgstr "Перезапустить профиль"
+
+#: netctl.cpp:225
+msgid "Enable profile"
+msgstr "Включить профиль"
+
+#: netctl.cpp:245
+msgid "Start GUI"
+msgstr "Запуск GUI"
+
+#: netctl.cpp:309
+msgid "Network is up"
+msgstr "Сеть работает"
+
+#: netctl.cpp:315
+msgid "Network is down"
+msgstr "Сеть не работает"
+
+#: netctl.cpp:431
 msgid "Netctl plasmoid"
 msgstr "Netctl plasmoid"
 
@@ -42,146 +110,146 @@ msgstr "Путь к GUI"
 
 #. i18n: file: configwindow.ui:128
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_gui)
-#. i18n: file: configwindow.ui:164
+#. i18n: file: configwindow.ui:161
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl)
-#. i18n: file: configwindow.ui:578
+#. i18n: file: configwindow.ui:572
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon)
-#. i18n: file: configwindow.ui:614
+#. i18n: file: configwindow.ui:605
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon)
 #. i18n: file: configwindow.ui:128
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_gui)
-#. i18n: file: configwindow.ui:164
+#. i18n: file: configwindow.ui:161
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_netctl)
-#. i18n: file: configwindow.ui:578
+#. i18n: file: configwindow.ui:572
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_activeIcon)
-#. i18n: file: configwindow.ui:614
+#. i18n: file: configwindow.ui:605
 #. i18n: ectx: property (text), widget (QPushButton, pushButton_inactiveIcon)
 #: po/rc.cpp:12 po/rc.cpp:18 po/rc.cpp:78 po/rc.cpp:84 rc.cpp:12 rc.cpp:18
 #: rc.cpp:78 rc.cpp:84
 msgid "Browse"
 msgstr "Обзор"
 
-#. i18n: file: configwindow.ui:148
+#. i18n: file: configwindow.ui:145
 #. i18n: ectx: property (text), widget (QLabel, label_netctl)
 #: po/rc.cpp:15 rc.cpp:15
 msgid "Path to netctl"
 msgstr "Путь к netctl"
 
-#. i18n: file: configwindow.ui:184
+#. i18n: file: configwindow.ui:178
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_sudo)
 #: po/rc.cpp:21 rc.cpp:21
 msgid "Use sudo for netctl"
 msgstr "Использовать sudo для netctl"
 
-#. i18n: file: configwindow.ui:199
+#. i18n: file: configwindow.ui:193
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showBigInterface)
 #: po/rc.cpp:24 rc.cpp:24
 msgid "Show more detailed interface"
 msgstr "Показать более детальный интерфейс"
 
-#. i18n: file: configwindow.ui:209
+#. i18n: file: configwindow.ui:203
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showNetDev)
 #: po/rc.cpp:27 rc.cpp:27
 msgid "Show network devices"
 msgstr "Показать сетевые устройства"
 
-#. i18n: file: configwindow.ui:219
+#. i18n: file: configwindow.ui:213
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showExtIp)
 #: po/rc.cpp:30 rc.cpp:30
 msgid "Show external IP"
 msgstr "Показать внешний IP"
 
-#. i18n: file: configwindow.ui:229
+#. i18n: file: configwindow.ui:223
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_showIntIp)
 #: po/rc.cpp:33 rc.cpp:33
 msgid "Show internal IP"
 msgstr "Показать внутренний IP"
 
-#. i18n: file: configwindow.ui:253
+#. i18n: file: configwindow.ui:247
 #. i18n: ectx: attribute (title), widget (QWidget, tabAppearance)
 #: po/rc.cpp:36 rc.cpp:36
 msgid "Appearance"
 msgstr "Внешний вид"
 
-#. i18n: file: configwindow.ui:267
+#. i18n: file: configwindow.ui:261
 #. i18n: ectx: property (text), widget (QLabel, label_font)
 #: po/rc.cpp:39 rc.cpp:39
 msgid "Font"
 msgstr "Шрифт"
 
-#. i18n: file: configwindow.ui:299
+#. i18n: file: configwindow.ui:293
 #. i18n: ectx: property (toolTip), widget (QFontComboBox, fontComboBox_font)
 #: po/rc.cpp:42 rc.cpp:42
 msgid "Set font family"
 msgstr "Укажите шрифт"
 
-#. i18n: file: configwindow.ui:316
+#. i18n: file: configwindow.ui:310
 #. i18n: ectx: property (text), widget (QLabel, label_fontSize)
 #: po/rc.cpp:45 rc.cpp:45
 msgid "Font size"
 msgstr "Размер шрифта"
 
-#. i18n: file: configwindow.ui:348
+#. i18n: file: configwindow.ui:342
 #. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontSize)
 #: po/rc.cpp:48 rc.cpp:48
 msgid "Set font size"
 msgstr "Укажите размер шрифта"
 
-#. i18n: file: configwindow.ui:377
+#. i18n: file: configwindow.ui:371
 #. i18n: ectx: property (text), widget (QLabel, label_fontColor)
 #: po/rc.cpp:51 rc.cpp:51
 msgid "Font color"
 msgstr "Цвет шрифта"
 
-#. i18n: file: configwindow.ui:409
+#. i18n: file: configwindow.ui:403
 #. i18n: ectx: property (toolTip), widget (KColorCombo, kcolorcombo_fontColor)
 #: po/rc.cpp:54 rc.cpp:54
 msgid "Set font color"
 msgstr "Укажите цвет шрифта"
 
-#. i18n: file: configwindow.ui:426
+#. i18n: file: configwindow.ui:420
 #. i18n: ectx: property (text), widget (QLabel, label_fontWeight)
 #: po/rc.cpp:57 rc.cpp:57
 msgid "Font weight"
 msgstr "Толщина шрифта"
 
-#. i18n: file: configwindow.ui:458
+#. i18n: file: configwindow.ui:452
 #. i18n: ectx: property (toolTip), widget (QSpinBox, spinBox_fontWeight)
 #: po/rc.cpp:60 rc.cpp:60
 msgid "Set font weight"
 msgstr "Укажите ширину шрифта"
 
-#. i18n: file: configwindow.ui:490
+#. i18n: file: configwindow.ui:484
 #. i18n: ectx: property (text), widget (QLabel, label_fontStyle)
 #: po/rc.cpp:63 rc.cpp:63
 msgid "Font style"
 msgstr "Стиль шрифта"
 
-#. i18n: file: configwindow.ui:522
+#. i18n: file: configwindow.ui:516
 #. i18n: ectx: property (toolTip), widget (QComboBox, comboBox_fontStyle)
 #: po/rc.cpp:66 rc.cpp:66
 msgid "Set font style"
 msgstr "Укажите стиль шрифта"
 
-#. i18n: file: configwindow.ui:526
+#. i18n: file: configwindow.ui:520
 #. i18n: ectx: property (text), item, widget (QComboBox, comboBox_fontStyle)
 #: po/rc.cpp:69 rc.cpp:69
 msgid "normal"
 msgstr "normal"
 
-#. i18n: file: configwindow.ui:531
+#. i18n: file: configwindow.ui:525
 #. i18n: ectx: property (text), item, widget (QComboBox, comboBox_fontStyle)
 #: po/rc.cpp:72 rc.cpp:72
 msgid "italic"
 msgstr "italic"
 
-#. i18n: file: configwindow.ui:562
+#. i18n: file: configwindow.ui:556
 #. i18n: ectx: property (text), widget (QLabel, label_activeIcon)
 #: po/rc.cpp:75 rc.cpp:75
 msgid "Active icon"
 msgstr "Иконка активного подключения"
 
-#. i18n: file: configwindow.ui:598
+#. i18n: file: configwindow.ui:589
 #. i18n: ectx: property (text), widget (QLabel, label_inactiveIcon)
 #: po/rc.cpp:81 rc.cpp:81
 msgid "Inactive icon"
@@ -197,4 +265,3 @@ msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "esalexeev@gmail.com"
 
-