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

roll back

Browse Source
This commit is contained in:
arcan1s
2014-08-01 09:37:09 +04:00
parent 0aa162b71b
commit 0d26d6230e
27 changed files with 117 additions and 4148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,9 +13,6 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../${PROJECT_LIBRARY}/includ
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR})
link_directories (${PROJECT_LIBRARY}/src/lib)
foreach (3RDPARTY ${GUI_3RDPARTY})
include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../${3RDPARTY}/src)
endforeach ()
if (USE_QT5)
find_package(Qt5Core REQUIRED)
@ -25,6 +22,7 @@ if (USE_QT5)
add_definitions(${Qt5Widgets_DEFINITIONS})
add_definitions(${Qt5LinguistTools_DEFINITIONS})
include_directories (${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
set (QT_NEEDED_LIBS ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES})
qt5_wrap_cpp (MOC_SOURCES ${HEADERS})
qt5_wrap_ui (UI_HEADERS ${FORMS})
qt5_add_resources (QRC_SOURCES ${RESOURCES})
@ -41,6 +39,7 @@ if (USE_QT5)
else ()
find_package (Qt4 REQUIRED)
include (${QT_USE_FILE})
set (QT_NEEDED_LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
qt4_wrap_cpp (MOC_SOURCES ${HEADERS})
qt4_wrap_ui (UI_HEADERS ${FORMS})
qt4_add_resources (QRC_SOURCES ${RESOURCES})
@ -57,6 +56,6 @@ else ()
endif()
add_executable (${SUBPROJECT} ${UI_HEADERS} ${HEADERS} ${SOURCES} ${MOC_SOURCES} ${QRC_SOURCES} ${TRANSLATIONS})
target_link_libraries (${SUBPROJECT} ${GUI_3RDPARTY} ${PROJECT_LIBRARY} ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES})
target_link_libraries (${SUBPROJECT} ${PROJECT_LIBRARY} ${QT_NEEDED_LIBS})
# install properties
install (TARGETS ${SUBPROJECT} DESTINATION bin)

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

@ -24,7 +24,6 @@
#include <QProcess>
#include <netctlgui/netctlgui.h>
#include <reportabug/reportabug.h>
#include "aboutwindow.h"
#include "bridgewidget.h"
@ -92,7 +91,6 @@ MainWindow::MainWindow(QWidget *parent,
aboutWin = new AboutWindow(this, debug);
errorWin = new ErrorWindow(this, debug);
netctlAutoWin = new NetctlAutoWindow(this, debug, configuration);
reportWin = new Reportabug(this, debug);
// profile widgets
generalWid = new GeneralWidget(this, configuration);
ui->scrollAreaWidgetContents->layout()->addWidget(generalWid);
@ -175,7 +173,6 @@ MainWindow::~MainWindow()
delete errorWin;
delete netctlAutoWin;
delete settingsWin;
delete reportWin;
delete ui;
}
@ -234,7 +231,6 @@ void MainWindow::createActions()
connect(ui->actionNetctlAuto, SIGNAL(triggered(bool)), netctlAutoWin, SLOT(showWindow()));
connect(ui->actionSettings, SIGNAL(triggered(bool)), settingsWin, SLOT(showWindow()));
connect(ui->actionQuit, SIGNAL(triggered(bool)), this, SLOT(close()));
connect(ui->actionReport, SIGNAL(triggered(bool)), reportWin, SLOT(showWindow()));
// actions menu
connect(ui->menuActions, SIGNAL(aboutToShow()), this, SLOT(updateMenu()));

2
sources/gui/src/mainwindow.h
View File

@ -37,7 +37,6 @@ class NetctlProfile;
class PasswdWidget;
class PppoeWidget;
class SettingsWindow;
class Reportabug;
class TunnelWidget;
class TuntapWidget;
class VlanWidget;
@ -110,7 +109,6 @@ private:
AboutWindow *aboutWin;
ErrorWindow *errorWin;
NetctlAutoWindow *netctlAutoWin;
Reportabug *reportWin;
PasswdWidget *passwdWid;
SettingsWindow *settingsWin;
BridgeWidget *bridgeWid;

19
sources/gui/src/mainwindow.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>477</width>
<height>505</height>
<width>479</width>
<height>507</height>
</rect>
</property>
<property name="windowTitle">
@ -367,7 +367,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>477</width>
<width>479</width>
<height>22</height>
</rect>
</property>
@ -402,7 +402,6 @@
<property name="title">
<string>Help</string>
</property>
<addaction name="actionReport"/>
<addaction name="actionAbout"/>
</widget>
<addaction name="menuMenu"/>
@ -563,22 +562,12 @@
</action>
<action name="actionAbout">
<property name="icon">
<iconset theme="help-about">
<normaloff/>
</iconset>
<iconset theme="help-about"/>
</property>
<property name="text">
<string>About</string>
</property>
</action>
<action name="actionReport">
<property name="icon">
<iconset theme="tools-report-bug"/>
</property>
<property name="text">
<string>Report a bug</string>
</property>
</action>
</widget>
<tabstops>
<tabstop>tabWidget</tabstop>