From 682b6c5b4f0cbd2c7dbd6942bbfdf60b5acbae3c Mon Sep 17 00:00:00 2001 From: arcan1s Date: Sun, 2 Mar 2014 18:45:07 +0400 Subject: [PATCH] small fixes before editing plasmoid --- PKGBUILD | 9 +++------ sources/CMakeLists.txt | 2 +- sources/dataengine/CMakeLists.txt | 2 +- sources/dataengine/netctl.cpp | 6 +++--- sources/dataengine/netctl.h | 3 +++ sources/gui/netctl-gui.desktop | 0 sources/plasmoid/CMakeLists.txt | 2 +- sources/plasmoid/netctl.cpp | 12 ++++++------ sources/plasmoid/netctl.h | 4 +++- 9 files changed, 21 insertions(+), 19 deletions(-) mode change 100755 => 100644 sources/gui/netctl-gui.desktop diff --git a/PKGBUILD b/PKGBUILD index a2a5882..dd4d02a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -18,21 +18,18 @@ optdepends=('kdebase-runtime: sudo support' 'wpa_supplicant: wifi support') source=("https://github.com/arcan1s/netctlplasmoid/releases/download/V.${pkgver}/${pkgname}-${pkgver}-src.tar.xz") install="${pkgname}.install" -md5sums=('5e7573643d528f770fca2dc3e2122e69') +md5sums=('866d6b7b819a43f1661ef133f3b255da') # flags _cmakekeys="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release" [[ ${_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' -prepare() { +build() { rm -rf "${srcdir}/build" mkdir "${srcdir}/build" -} - -build () { cd "${srcdir}/build" - cmake ${_cmakekeys} ../${pkgname} + cmake ${_cmakekeys} "../${pkgname}" make } diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 59330d4..410797d 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -32,7 +32,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) set (ADD_CXX_FLAGS "-Wall") set (CMAKE_CXX_FLAGS "-O0 ${ADD_CXX_FLAGS}") set (CMAKE_CXX_FLAGS_DEBUG "-g -O0") - set (CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") + set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") else () message (STATUS "Unknown compiler") endif () diff --git a/sources/dataengine/CMakeLists.txt b/sources/dataengine/CMakeLists.txt index 798eea9..3fd45c4 100644 --- a/sources/dataengine/CMakeLists.txt +++ b/sources/dataengine/CMakeLists.txt @@ -7,7 +7,7 @@ find_package (KDE4 REQUIRED) include (KDE4Defaults) add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) -include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}/../) +include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../) set (PLUGIN_NAME ${SUBPROJECT}) file (GLOB SUBPROJECT_DESKTOP_IN *.desktop) diff --git a/sources/dataengine/netctl.cpp b/sources/dataengine/netctl.cpp index 3d868b3..7aa4e2f 100644 --- a/sources/dataengine/netctl.cpp +++ b/sources/dataengine/netctl.cpp @@ -71,9 +71,7 @@ bool Netctl::readConfiguration() while (true) { fileStr = QString(confFile.readLine()); - if (confFile.atEnd()) - break; - else if (fileStr[0] != '#') { + 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]; @@ -87,6 +85,8 @@ bool Netctl::readConfiguration() netDir = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0]; } } + if (confFile.atEnd()) + break; } confFile.close(); diff --git a/sources/dataengine/netctl.h b/sources/dataengine/netctl.h index c5956a8..3f12f21 100644 --- a/sources/dataengine/netctl.h +++ b/sources/dataengine/netctl.h @@ -20,6 +20,7 @@ #include + class Netctl : public Plasma::DataEngine { Q_OBJECT @@ -33,6 +34,7 @@ protected: bool updateSourceEvent(const QString &source); QStringList sources() const; +private: // configuration // enable check external IP QString checkExtIP; @@ -46,4 +48,5 @@ protected: QString netDir; }; + #endif /* NETCTL_DE_H */ diff --git a/sources/gui/netctl-gui.desktop b/sources/gui/netctl-gui.desktop old mode 100755 new mode 100644 diff --git a/sources/plasmoid/CMakeLists.txt b/sources/plasmoid/CMakeLists.txt index a6069a1..481107a 100644 --- a/sources/plasmoid/CMakeLists.txt +++ b/sources/plasmoid/CMakeLists.txt @@ -7,7 +7,7 @@ find_package (KDE4 REQUIRED) include (KDE4Defaults) add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) -include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}/../) +include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../) # set sources set (PLUGIN_NAME ${SUBPROJECT}) diff --git a/sources/plasmoid/netctl.cpp b/sources/plasmoid/netctl.cpp index 9562c53..794e16b 100644 --- a/sources/plasmoid/netctl.cpp +++ b/sources/plasmoid/netctl.cpp @@ -17,7 +17,6 @@ #include "netctl.h" #include "ui_configwindow.h" -#include #include #include @@ -27,11 +26,12 @@ #include #include -#include + +#include -Netctl::Netctl(QObject *parent, const QVariantList &args) : - Plasma::Applet(parent, args) +Netctl::Netctl(QObject *parent, const QVariantList &args) + : Plasma::Applet(parent, args) { setBackgroundHints(DefaultBackground); setHasConfigurationInterface(true); @@ -463,8 +463,8 @@ void Netctl::configChanged() 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/network-idle.png"); - inactiveIconPath = cg.readEntry("inactiveIconPath", "/usr/share/icons/hicolor/64x64/apps/network-offline.png"); + 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"); formatLine[0] = ("

+ class QGraphicsLinearLayout; class Netctl : public Plasma::Applet @@ -96,7 +97,7 @@ private: void connectToEngine(); void disconnectFromEngine(); // notification - + // // configuration interface Ui::ConfigWindow uiConfig; // configuration @@ -120,4 +121,5 @@ private: K_EXPORT_PLASMA_APPLET(netctl, Netctl) + #endif /* NETCTL_PLASMOID_H */