diff options
author | Jonathan Bauer | 2012-02-01 15:31:48 +0100 |
---|---|---|
committer | Jonathan Bauer | 2012-02-01 15:31:48 +0100 |
commit | 1fe9c90f77990e740c205a5113340583146536e8 (patch) | |
tree | 834545bffba0be9fe8895fdf3bc90f91f285b120 /src/fbgui/ndgui.h | |
parent | new abstract class agui for common gui functions, new console class for debug... (diff) | |
download | fbgui-1fe9c90f77990e740c205a5113340583146536e8.tar.gz fbgui-1fe9c90f77990e740c205a5113340583146536e8.tar.xz fbgui-1fe9c90f77990e740c205a5113340583146536e8.zip |
adapted existing classes to reflect changes
Diffstat (limited to 'src/fbgui/ndgui.h')
-rw-r--r-- | src/fbgui/ndgui.h | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/src/fbgui/ndgui.h b/src/fbgui/ndgui.h index 18fe5c7..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(); @@ -73,20 +72,17 @@ signals: private slots: void setUserChoiceTrue(); - void toggleDebugConsole(); private: - QString _tag; + void addActions(); - void createAction(); + QString _tag; bool _userChoice; bool _started; - QWebView* _webView; - QAction* _allowUserChoice; QAction* _tryAgain; @@ -98,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(); - - - }; #endif // NDGUI_H |