arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-04-24 15:37:23 +00:00
Code Issues Projects Releases Wiki Activity

end porting of DE to KF5

Browse Source
This commit is contained in:
arcan1s 2014-10-21 16:26:35 +04:00
parent 0898a99878
commit 030dec5e14
3 changed files with 20 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8) cmake_minimum_required (VERSION 2.8.12)
cmake_policy (SET CMP0003 OLD) cmake_policy (SET CMP0003 OLD)
cmake_policy (SET CMP0002 OLD) cmake_policy (SET CMP0002 OLD)

54
sources/dataengine/CMakeLists.txt
View File

@ -3,49 +3,29 @@ set (SUBPROJECT plasma_engine_netctl)
message (STATUS "Subproject ${SUBPROJECT}") message (STATUS "Subproject ${SUBPROJECT}")
# find required libaries # find required libaries
set(QT_MIN_VERSION "5.3.0") find_package (Qt5 REQUIRED COMPONENTS Widgets Network)
set(KF5_MIN_VERSION "5.0.0") find_package (ECM 0.0.11 REQUIRED NO_MODULE)
set(INSTALL_SDDM_THEME TRUE) set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Test Script Network) find_package(KF5 REQUIRED COMPONENTS Plasma Service)
find_package(ECM 0.0.11 REQUIRED NO_MODULE) include (KDEInstallDirs)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include (KDECMakeSettings)
include (KDECompilerSettings)
add_definitions (${Qt5Core_DEFINITIONS} ${Qt5Network_DEFINITIONS})
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS set (Qt_INCLUDE ${Qt5Core_INCLUDE_DIRS}
Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff Wallet KCMUtils Baloo ${Qt5Network_INCLUDE_DIRS})
IdleTime Declarative WebKit TextWidgets KDELibs4Support Crash) set (Kf5_INCLUDE ${ConfigCore_INCLUDE_DIR}
${CoreAddons_INCLUDE_DIR}
# WARNING PlasmaQuick provides unversioned CMake config ${Plasma_INCLUDE_DIR}
find_package(KF5 REQUIRED COMPONENTS PlasmaQuick) ${Service_INCLUDE_DIR})
find_package(KF5 REQUIRED COMPONENTS SysGuard)
find_package(KF5 REQUIRED COMPONENTS Screen)
find_package(KF5TextEditor)
find_package(KWinDBusInterface CONFIG REQUIRED)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDECompilerSettings)
include(ECMPackageConfigHelpers)
include(ECMMarkNonGuiExecutable)
include(CMakePackageConfigHelpers)
include(WriteBasicConfigVersionFile)
include(CheckIncludeFiles)
include(FeatureSummary)
include_directories (/usr/include/KF5/KService
/usr/include/KF5/KConfigCore
/usr/include/KF5/KCoreAddons)
add_definitions(${Qt5Core_DEFINITIONS} ${Qt5Network_DEFINITIONS})
# add_definitions (${QT_DEFINITIONS} ${KF5_DEFINITIONS})
include_directories (${CMAKE_SOURCE_DIR} include_directories (${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${INTERFACE_INCLUDE_DIRECTORIES}
${Plasma_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../ ${CMAKE_CURRENT_BINARY_DIR}/../
${PROJECT_TRDPARTY_DIR} ${PROJECT_TRDPARTY_DIR}
${Qt5Core_INCLUDE_DIRS} ${Qt_INCLUDE}
${Qt5Network_INCLUDE_DIRS}) ${Kf5_INCLUDE})
set (PLUGIN_NAME ${SUBPROJECT}) set (PLUGIN_NAME ${SUBPROJECT})
file (GLOB SUBPROJECT_DESKTOP_IN *.desktop) file (GLOB SUBPROJECT_DESKTOP_IN *.desktop)
@ -60,7 +40,7 @@ configure_file (${SUBPROJECT_DESKTOP_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJEC
# make # make
qt5_wrap_cpp (TASK_MOC_SOURCE ${TASK_HEADER}) qt5_wrap_cpp (TASK_MOC_SOURCE ${TASK_HEADER})
add_library (${PLUGIN_NAME} MODULE ${SUBPROJECT_SOURCE} ${TASK_MOC_SOURCE}) add_library (${PLUGIN_NAME} MODULE ${SUBPROJECT_SOURCE} ${TASK_MOC_SOURCE})
target_link_libraries (${PLUGIN_NAME} KF5::Plasma ${Qt5Network_LIBRARIES}) target_link_libraries (${PLUGIN_NAME} ${Plasma_LIBRARIES} ${Qt5Network_LIBRARIES})
# install # install
install (TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGIN_INSTALL_DIR}) install (TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGIN_INSTALL_DIR})

4
sources/dataengine/netctl.cpp
View File

@ -23,6 +23,7 @@
#include <QFile> #include <QFile>
#include <QNetworkInterface> #include <QNetworkInterface>
#include <QProcessEnvironment> #include <QProcessEnvironment>
#include <QStandardPaths>
#include <QTextCodec> #include <QTextCodec>
#include <pdebug/pdebug.h> #include <pdebug/pdebug.h>
@ -87,8 +88,7 @@ void Netctl::readConfiguration()
rawConfig[QString("NETCTLCMD")] = QString("/usr/bin/netctl"); rawConfig[QString("NETCTLCMD")] = QString("/usr/bin/netctl");
rawConfig[QString("NETCTLAUTOCMD")] = QString("/usr/bin/netctl-auto"); rawConfig[QString("NETCTLAUTOCMD")] = QString("/usr/bin/netctl-auto");
// TODO: correct filename QString fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation, QString("netctl.conf"));
QString fileName = QString(".config/netctl.conf");
if (debug) qDebug() << PDEBUG << ":" << "Configuration file" << fileName; if (debug) qDebug() << PDEBUG << ":" << "Configuration file" << fileName;
QFile configFile(fileName); QFile configFile(fileName);
if (!configFile.open(QIODevice::ReadOnly)) { if (!configFile.open(QIODevice::ReadOnly)) {