arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-07-07 11:05:45 +00:00
Code Issues Projects Releases Wiki Activity

small fixes before editing plasmoid

Browse Source
This commit is contained in:
arcan1s
2014-03-02 18:45:07 +04:00
parent 996d2d5bee
commit 682b6c5b4f
9 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/CMakeLists.txt
View File

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

2
sources/dataengine/CMakeLists.txt
View File

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

6
sources/dataengine/netctl.cpp
View File

@ -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();

3
sources/dataengine/netctl.h
View File

@ -20,6 +20,7 @@
#include <Plasma/DataEngine>
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 */

0
sources/gui/netctl-gui.desktop Executable file → Normal file
View File

2
sources/plasmoid/CMakeLists.txt
View File

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

12
sources/plasmoid/netctl.cpp
View File

@ -17,7 +17,6 @@
#include "netctl.h"
#include "ui_configwindow.h"
#include <version.h>
#include <KConfigDialog>
#include <KFileDialog>
@ -27,11 +26,12 @@
#include <QGraphicsLinearLayout>
#include <QMenu>
#include <cstdio>
#include <version.h>
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] = ("<p align=\"center\"><span style=\" font-family:'" + fontFamily + \
"'; font-style:" + fontStyle + \

4
sources/plasmoid/netctl.h
View File

@ -27,6 +27,7 @@
#include <ui_configwindow.h>
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 */