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

cleanup!

Browse Source 
(remove symlinks)
This commit is contained in:
arcan1s 2014-08-20 22:16:06 +04:00
parent 35d740b778
commit 16662f697b
48 changed files with 74 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sources/gui/src/about.ui → sources/3rdparty/about/about.ui vendored
View File

0
sources/gui/src/language.cpp → sources/3rdparty/language/language.cpp vendored
View File

0
sources/gui/src/language.h → sources/3rdparty/language/language.h vendored
View File

1
sources/CMakeLists.txt
View File

@ -61,6 +61,7 @@ endif ()
configure_file (${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h) configure_file (${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
# resources # resources
set (PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty)
set (PROJECT_LIBRARY netctlgui) set (PROJECT_LIBRARY netctlgui)
set (PROJECT_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/resources) set (PROJECT_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/resources)
add_subdirectory (${PROJECT_RESOURCE_DIR}) add_subdirectory (${PROJECT_RESOURCE_DIR})

11
sources/dataengine/CMakeLists.txt
View File

@ -7,13 +7,18 @@ find_package (KDE4 REQUIRED)
include (KDE4Defaults) include (KDE4Defaults)
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../) include_directories (${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${KDE4_INCLUDES}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../
${PROJECT_TRDPARTY_DIR})
set (PLUGIN_NAME ${SUBPROJECT}) set (PLUGIN_NAME ${SUBPROJECT})
file (GLOB SUBPROJECT_DESKTOP_IN *.desktop) file (GLOB SUBPROJECT_DESKTOP_IN *.desktop)
file (RELATIVE_PATH SUBPROJECT_DESKTOP ${CMAKE_SOURCE_DIR} ${SUBPROJECT_DESKTOP_IN}) file (RELATIVE_PATH SUBPROJECT_DESKTOP ${CMAKE_SOURCE_DIR} ${SUBPROJECT_DESKTOP_IN})
file (GLOB SUBPROJECT_SOURCE *.cpp) file (GLOB_RECURSE SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/task/*.cpp)
set (TASK_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/task.h) set (TASK_HEADER ${PROJECT_TRDPARTY_DIR}/task/task.h)
file (GLOB SUBPROJECT_CONF *.conf) file (GLOB SUBPROJECT_CONF *.conf)
# prepare # prepare

7
sources/dataengine/netctl.cpp
View File

@ -15,6 +15,8 @@
* along with netctl-gui. If not, see http://www.gnu.org/licenses/ * * along with netctl-gui. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/ ***************************************************************************/
#include "netctl.h"
#include <KGlobal> #include <KGlobal>
#include <KStandardDirs> #include <KStandardDirs>
#include <Plasma/DataContainer> #include <Plasma/DataContainer>
@ -25,9 +27,8 @@
#include <QProcessEnvironment> #include <QProcessEnvironment>
#include <QTextCodec> #include <QTextCodec>
#include "netctl.h" #include <pdebug/pdebug.h>
#include "pdebug.h" #include <task/taskadds.h>
#include "taskadds.h"
Netctl::Netctl(QObject *parent, const QVariantList &args) Netctl::Netctl(QObject *parent, const QVariantList &args)

1
sources/dataengine/pdebug.h
View File

@ -1 +0,0 @@
../3rdparty/pdebug/pdebug.h

1
sources/dataengine/task.h
View File

@ -1 +0,0 @@
../3rdparty/task/task.h

1
sources/dataengine/taskadds.cpp
View File

@ -1 +0,0 @@
../3rdparty/task/taskadds.cpp

1
sources/dataengine/taskadds.h
View File

@ -1 +0,0 @@
../3rdparty/task/taskadds.h

11
sources/gui/src/CMakeLists.txt
View File

@ -1,7 +1,9 @@
# set files # set files
file (GLOB SOURCES *.cpp) file (GLOB_RECURSE SOURCES *.cpp ${PROJECT_TRDPARTY_DIR}/task/*.cpp
file (GLOB HEADERS *.h) ${PROJECT_TRDPARTY_DIR}/language/*.cpp)
file (GLOB FORMS *.ui) file (GLOB_RECURSE HEADERS *.h ${PROJECT_TRDPARTY_DIR}/task/*.h
${PROJECT_TRDPARTY_DIR}/language/*.h)
file (GLOB_RECURSE FORMS *.ui ${PROJECT_TRDPARTY_DIR}/about/*.ui)
file (GLOB LANGUAGES ${SUBPROJECT_TRANSLATION_DIR}/*.ts) file (GLOB LANGUAGES ${SUBPROJECT_TRANSLATION_DIR}/*.ts)
set (RESOURCES ${SUBPROJECT_RESOURCE_DIR}/resources.qrc) set (RESOURCES ${SUBPROJECT_RESOURCE_DIR}/resources.qrc)
@ -11,7 +13,8 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../${PROJECT_LIBRARY}/includ
${CMAKE_CURRENT_BINARY_DIR}/../ ${CMAKE_CURRENT_BINARY_DIR}/../
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}) ${CMAKE_CURRENT_BINARY_DIR}
${PROJECT_TRDPARTY_DIR})
link_directories (${PROJECT_LIBRARY}/src/lib) link_directories (${PROJECT_LIBRARY}/src/lib)
if (USE_QT5) if (USE_QT5)

3
sources/gui/src/aboutwindow.cpp
View File

@ -22,7 +22,8 @@
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QPushButton> #include <QPushButton>
#include "pdebug.h" #include <pdebug/pdebug.h>
#include "version.h" #include "version.h"

2
sources/gui/src/dbusoperation.cpp
View File

@ -21,7 +21,7 @@
#include <QDBusMessage> #include <QDBusMessage>
#include <QDebug> #include <QDebug>
#include "pdebug.h" #include <pdebug/pdebug.h>
QList<netctlProfileInfo> parseOutputNetctl(const QList<QVariant> raw, QList<netctlProfileInfo> parseOutputNetctl(const QList<QVariant> raw,

2
sources/gui/src/errorwindow.cpp
View File

@ -22,7 +22,7 @@
#include <QSpacerItem> #include <QSpacerItem>
#include <QDebug> #include <QDebug>
#include "pdebug.h" #include <pdebug/pdebug.h>
ErrorWindow::ErrorWindow(QWidget *parent, const bool debugCmd) ErrorWindow::ErrorWindow(QWidget *parent, const bool debugCmd)

3
sources/gui/src/main.cpp
View File

@ -25,7 +25,8 @@
#include <iostream> #include <iostream>
#include <unistd.h> #include <unistd.h>
#include "language.h" #include <language/language.h>
#include "mainwindow.h" #include "mainwindow.h"
#include "messages.h" #include "messages.h"
#include "version.h" #include "version.h"

3
sources/gui/src/mainprivateslots.cpp
View File

@ -24,6 +24,8 @@
#include <QFileInfo> #include <QFileInfo>
#include <QUrl> #include <QUrl>
#include <pdebug/pdebug.h>
#include "bridgewidget.h" #include "bridgewidget.h"
#include "dbusoperation.h" #include "dbusoperation.h"
#include "errorwindow.h" #include "errorwindow.h"
@ -33,7 +35,6 @@
#include "macvlanwidget.h" #include "macvlanwidget.h"
#include "mobilewidget.h" #include "mobilewidget.h"
#include "passwdwidget.h" #include "passwdwidget.h"
#include "pdebug.h"
#include "pppoewidget.h" #include "pppoewidget.h"
#include "tunnelwidget.h" #include "tunnelwidget.h"
#include "tuntapwidget.h" #include "tuntapwidget.h"

7
sources/gui/src/mainpublicslots.cpp
View File

@ -24,15 +24,16 @@
#include <QTranslator> #include <QTranslator>
#include <QUrl> #include <QUrl>
#include <language/language.h>
#include <pdebug/pdebug.h>
#include <task/taskadds.h>
#include "aboutwindow.h" #include "aboutwindow.h"
#include "dbusoperation.h" #include "dbusoperation.h"
#include "errorwindow.h" #include "errorwindow.h"
#include "language.h"
#include "netctlautowindow.h" #include "netctlautowindow.h"
#include "passwdwidget.h" #include "passwdwidget.h"
#include "pdebug.h"
#include "settingswindow.h" #include "settingswindow.h"
#include "taskadds.h"
#include "trayicon.h" #include "trayicon.h"
#include "version.h" #include "version.h"

5
sources/gui/src/mainwindow.cpp
View File

@ -22,6 +22,9 @@
#include <QDBusMessage> #include <QDBusMessage>
#include <QDebug> #include <QDebug>
#include <pdebug/pdebug.h>
#include <task/taskadds.h>
#include "aboutwindow.h" #include "aboutwindow.h"
#include "bridgewidget.h" #include "bridgewidget.h"
#include "dbusoperation.h" #include "dbusoperation.h"
@ -34,10 +37,8 @@
#include "netctlautowindow.h" #include "netctlautowindow.h"
#include "netctlguiadaptor.h" #include "netctlguiadaptor.h"
#include "passwdwidget.h" #include "passwdwidget.h"
#include "pdebug.h"
#include "pppoewidget.h" #include "pppoewidget.h"
#include "settingswindow.h" #include "settingswindow.h"
#include "taskadds.h"
#include "trayicon.h" #include "trayicon.h"
#include "tunnelwidget.h" #include "tunnelwidget.h"
#include "tuntapwidget.h" #include "tuntapwidget.h"

2
sources/gui/src/netctlautowindow.cpp
View File

@ -21,9 +21,9 @@
#include <QDebug> #include <QDebug>
#include <netctlgui/netctlgui.h> #include <netctlgui/netctlgui.h>
#include <pdebug/pdebug.h>
#include "dbusoperation.h" #include "dbusoperation.h"
#include "pdebug.h"
#include "version.h" #include "version.h"

1
sources/gui/src/pdebug.h
View File

@ -1 +0,0 @@
../../3rdparty/pdebug/pdebug.h

5
sources/gui/src/settingswindow.cpp
View File

@ -23,9 +23,10 @@
#include <QFileDialog> #include <QFileDialog>
#include <QTextStream> #include <QTextStream>
#include "language.h" #include <language/language.h>
#include <pdebug/pdebug.h>
#include "mainwindow.h" #include "mainwindow.h"
#include "pdebug.h"
SettingsWindow::SettingsWindow(QWidget *parent, const bool debugCmd, const QString configFile) SettingsWindow::SettingsWindow(QWidget *parent, const bool debugCmd, const QString configFile)

1
sources/gui/src/task.h
View File

@ -1 +0,0 @@
../../3rdparty/task/task.h

1
sources/gui/src/taskadds.cpp
View File

@ -1 +0,0 @@
../../3rdparty/task/taskadds.cpp

1
sources/gui/src/taskadds.h
View File

@ -1 +0,0 @@
../../3rdparty/task/taskadds.h

3
sources/gui/src/trayicon.cpp
View File

@ -21,8 +21,9 @@
#include <QMenu> #include <QMenu>
#include <QMessageBox> #include <QMessageBox>
#include <pdebug/pdebug.h>
#include "mainwindow.h" #include "mainwindow.h"
#include "pdebug.h"
TrayIcon::TrayIcon(QObject *parent, const bool debugCmd) TrayIcon::TrayIcon(QObject *parent, const bool debugCmd)

9
sources/helper/src/CMakeLists.txt
View File

@ -1,6 +1,8 @@
# set files # set files
file (GLOB SOURCES *.cpp) file (GLOB_RECURSE SOURCES *.cpp ${PROJECT_TRDPARTY_DIR}/task/*.cpp
file (GLOB HEADERS *.h) ${PROJECT_TRDPARTY_DIR}/language/*.cpp)
file (GLOB_RECURSE HEADERS *.h ${PROJECT_TRDPARTY_DIR}/task/*.h
${PROJECT_TRDPARTY_DIR}/language/*.h)
file (GLOB LANGUAGES ${SUBPROJECT_TRANSLATION_DIR}/*.ts) file (GLOB LANGUAGES ${SUBPROJECT_TRANSLATION_DIR}/*.ts)
set (RESOURCES ${SUBPROJECT_RESOURCE_DIR}/resources-helper.qrc) set (RESOURCES ${SUBPROJECT_RESOURCE_DIR}/resources-helper.qrc)
@ -10,7 +12,8 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../${PROJECT_LIBRARY}/includ
${CMAKE_CURRENT_BINARY_DIR}/../ ${CMAKE_CURRENT_BINARY_DIR}/../
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}) ${CMAKE_CURRENT_BINARY_DIR}
${PROJECT_TRDPARTY_DIR})
link_directories (${PROJECT_LIBRARY}/src/lib) link_directories (${PROJECT_LIBRARY}/src/lib)
if (USE_QT5) if (USE_QT5)

1
sources/helper/src/language.cpp
View File

@ -1 +0,0 @@
../../gui/src/language.cpp

1
sources/helper/src/language.h
View File

@ -1 +0,0 @@
../../gui/src/language.h

3
sources/helper/src/main.cpp
View File

@ -25,7 +25,8 @@
#include <iostream> #include <iostream>
#include <unistd.h> #include <unistd.h>
#include "language.h" #include <language/language.h>
#include "messages.h" #include "messages.h"
#include "netctlhelper.h" #include "netctlhelper.h"
#include "version.h" #include "version.h"

2
sources/helper/src/netctlhelper.cpp
View File

@ -24,10 +24,10 @@
#include <unistd.h> #include <unistd.h>
#include <netctlgui/netctlgui.h> #include <netctlgui/netctlgui.h>
#include <pdebug/pdebug.h>
#include "controladaptor.h" #include "controladaptor.h"
#include "netctladaptor.h" #include "netctladaptor.h"
#include "pdebug.h"
#include "version.h" #include "version.h"

1
sources/helper/src/pdebug.h
View File

@ -1 +0,0 @@
../../3rdparty/pdebug/pdebug.h

8
sources/netctlgui/src/CMakeLists.txt
View File

@ -1,13 +1,15 @@
# set files # set files
file (GLOB SOURCES *.cpp) file (GLOB_RECURSE SOURCES *.cpp ${PROJECT_TRDPARTY_DIR}/task/*.cpp)
file (GLOB HEADERS *.h) file (GLOB_RECURSE HEADERS *.h ${SUBPROJECT_INCLUDE_DIR}/*h
${PROJECT_TRDPARTY_DIR}/task/*.h)
# include_path # include_path
include_directories (${SUBPROJECT_INCLUDE_DIR} include_directories (${SUBPROJECT_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../ ${CMAKE_CURRENT_BINARY_DIR}/../
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}) ${CMAKE_CURRENT_BINARY_DIR}
${PROJECT_TRDPARTY_DIR})
if (USE_QT5) if (USE_QT5)
find_package(Qt5 COMPONENTS Core REQUIRED) find_package(Qt5 COMPONENTS Core REQUIRED)

2
sources/netctlgui/src/main.cpp
View File

@ -23,7 +23,7 @@
*/ */
#include "netctlgui.h" #include <netctlgui/netctlgui.h>
/** /**

1
sources/netctlgui/src/netctlgui.h
View File

@ -1 +0,0 @@
../include/netctlgui/netctlgui.h

6
sources/netctlgui/src/netctlinteract.cpp
View File

@ -26,9 +26,9 @@
#include <QDebug> #include <QDebug>
#include <QDirIterator> #include <QDirIterator>
#include "netctlgui.h" #include <netctlgui/netctlgui.h>
#include "pdebug.h" #include <pdebug/pdebug.h>
#include "taskadds.h" #include <task/taskadds.h>
/** /**

1
sources/netctlgui/src/netctlinteract.h
View File

@ -1 +0,0 @@
../include/netctlgui/netctlinteract.h

6
sources/netctlgui/src/netctlprofile.cpp
View File

@ -29,9 +29,9 @@
#include <QFileInfo> #include <QFileInfo>
#include <QTextStream> #include <QTextStream>
#include "netctlgui.h" #include <netctlgui/netctlgui.h>
#include "pdebug.h" #include <pdebug/pdebug.h>
#include "taskadds.h" #include <task/taskadds.h>
/** /**

1
sources/netctlgui/src/netctlprofile.h
View File

@ -1 +0,0 @@
../include/netctlgui/netctlprofile.h

1
sources/netctlgui/src/pdebug.h
View File

@ -1 +0,0 @@
../../3rdparty/pdebug/pdebug.h

1
sources/netctlgui/src/task.h
View File

@ -1 +0,0 @@
../../3rdparty/task/task.h

1
sources/netctlgui/src/taskadds.cpp
View File

@ -1 +0,0 @@
../../3rdparty/task/taskadds.cpp

1
sources/netctlgui/src/taskadds.h
View File

@ -1 +0,0 @@
../../3rdparty/task/taskadds.h

6
sources/netctlgui/src/wpasupinteract.cpp
View File

@ -26,9 +26,9 @@
#include <QDebug> #include <QDebug>
#include <grp.h> #include <grp.h>
#include "netctlgui.h" #include <netctlgui/netctlgui.h>
#include "pdebug.h" #include <pdebug/pdebug.h>
#include "taskadds.h" #include <task/taskadds.h>
/** /**

1
sources/netctlgui/src/wpasupinteract.h
View File

@ -1 +0,0 @@
../include/netctlgui/wpasupinteract.h

9
sources/plasmoid/CMakeLists.txt
View File

@ -9,7 +9,12 @@ find_package (KDE4 REQUIRED)
include (KDE4Defaults) include (KDE4Defaults)
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../) include_directories (${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${KDE4_INCLUDES}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../
${PROJECT_TRDPARTY_DIR})
add_subdirectory (po) add_subdirectory (po)
@ -19,7 +24,7 @@ file (GLOB SUBPROJECT_DESKTOP_IN *.desktop)
file (RELATIVE_PATH SUBPROJECT_DESKTOP ${CMAKE_SOURCE_DIR} ${SUBPROJECT_DESKTOP_IN}) file (RELATIVE_PATH SUBPROJECT_DESKTOP ${CMAKE_SOURCE_DIR} ${SUBPROJECT_DESKTOP_IN})
file (GLOB SUBPROJECT_NOTIFY *.notifyrc) file (GLOB SUBPROJECT_NOTIFY *.notifyrc)
file (GLOB SUBPROJECT_SOURCE *.cpp) file (GLOB SUBPROJECT_SOURCE *.cpp)
file (GLOB SUBPROJECT_UI *.ui) file (GLOB_RECURSE SUBPROJECT_UI *.ui ${PROJECT_TRDPARTY_DIR}/about/*.ui)
# prepare # prepare
configure_file (${SUBPROJECT_DESKTOP_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_DESKTOP}) configure_file (${SUBPROJECT_DESKTOP_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_DESKTOP})

1
sources/plasmoid/about.ui
View File

@ -1 +0,0 @@
../gui/src/about.ui

3
sources/plasmoid/netctl.cpp
View File

@ -29,8 +29,9 @@
#include <QMenu> #include <QMenu>
#include <QProcessEnvironment> #include <QProcessEnvironment>
#include <pdebug/pdebug.h>
#include "netctl.h" #include "netctl.h"
#include "pdebug.h"
#include "ui_about.h" #include "ui_about.h"
#include "ui_appearance.h" #include "ui_appearance.h"
#include "ui_dataengine.h" #include "ui_dataengine.h"

1
sources/plasmoid/pdebug.h
View File

@ -1 +0,0 @@
../3rdparty/pdebug/pdebug.h