diff options
author | Michael Neves | 2012-02-03 17:34:58 +0100 |
---|---|---|
committer | Michael Neves | 2012-02-03 17:34:58 +0100 |
commit | 785c497c07c6f55ac9a3364f36914bc6e755ca4d (patch) | |
tree | 2b4dc12a45227707f7f70ef4b3e5f0d0ecb5b6b9 /src/fbgui/ndgui.h | |
parent | mutual auth test (diff) | |
parent | fix merge error (diff) | |
download | fbgui-785c497c07c6f55ac9a3364f36914bc6e755ca4d.tar.gz fbgui-785c497c07c6f55ac9a3364f36914bc6e755ca4d.tar.xz fbgui-785c497c07c6f55ac9a3364f36914bc6e755ca4d.zip |
Merge branch 'ssl' of git.openslx.org:openslx-ng/fbgui into ssl
Diffstat (limited to 'src/fbgui/ndgui.h')
-rw-r--r-- | src/fbgui/ndgui.h | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/src/fbgui/ndgui.h b/src/fbgui/ndgui.h index 1cb285c..2e214df 100644 --- a/src/fbgui/ndgui.h +++ b/src/fbgui/ndgui.h @@ -21,6 +21,7 @@ #include <QVariant> #include "fbgui.h" +#include "agui.h" #include "networkdiscovery.h" @@ -29,12 +30,12 @@ extern bool gAutoUp; extern QString gSocketServerPath; extern QString gPathToDhcpExe; -class ndgui: public QMainWindow +class ndgui: public agui { Q_OBJECT public: - ndgui(QMainWindow *parent = 0); + ndgui(); ~ndgui(); Q_INVOKABLE QVariantList getManualConfInterfaces(); Q_INVOKABLE int ip4_setManualConfiguration(QVariantMap result); @@ -49,8 +50,6 @@ public slots: void chooseInterfaceDialog(QString msg); void handleAllProcessesFinished(); - void restartSystem(); - void shutDownSystem(); void continueBoot(QString ifName); void continueBootWithoutCheck(QString ifName); void tryAgain(); @@ -76,16 +75,14 @@ private slots: private: - QString _tag; + void addActions(); - void createAction(); + QString _tag; bool _userChoice; bool _started; - QWebView* _webView; - QAction* _allowUserChoice; QAction* _tryAgain; @@ -97,21 +94,6 @@ private: QList<QString> _manConfList; QString _manualConfInterfaces; - - // QSplitter to split the main window in two resizable frames. - QSplitter* _splitter; - // QTextEdit implementing a minimalistic debug console. - QTextEdit* _debugConsole; - - // triggers toggleDebugConsole() - QAction* _toggleDebugConsole; - - - void setupLayout(); - void createDebugConsole(); - void toggleDebugConsole(); - - }; #endif // NDGUI_H |