diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 79a275b..763a8e2 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -1,5 +1,7 @@ find_package(Qt5 COMPONENTS Widgets REQUIRED) +set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(HEADERS gui.h mainwindow.h @@ -27,5 +29,5 @@ add_definitions( -DGPUI_GUI_LIBRARY ) -add_gpui_library(gpui-gui ${SOURCES} ${UI_SOURCES} ${MOC_SOURCES}) +add_gpui_library(gpui-gui ${UI_SOURCES} ${MOC_SOURCES} ${SOURCES}) target_link_libraries(gpui-gui Qt5::Widgets) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index a39f444..825b44c 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -19,6 +19,7 @@ ***********************************************************************************************************************/ #include "mainwindow.h" +#include "ui_mainwindow.h" namespace gpui { @@ -29,12 +30,16 @@ public: MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) , d(new MainWindowPrivate()) + , ui(new Ui::MainWindow()) { + ui->setupUi(this); } MainWindow::~MainWindow() { delete d; + + delete ui; } } diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index 0360bbe..62ea58a 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -25,6 +25,10 @@ #include +QT_BEGIN_NAMESPACE +namespace Ui { class MainWindow; } +QT_END_NAMESPACE + namespace gpui { class MainWindowPrivate; @@ -40,6 +44,8 @@ namespace gpui { private: MainWindowPrivate* const d; + + Ui::MainWindow *ui; }; } diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui index 75127de..2f44259 100644 --- a/src/gui/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -6,7 +6,7 @@ 0 0 - 640 + 657 480 @@ -19,12 +19,215 @@ 0 0 - 640 + 657 22 + + + &File + + + + + + + + &Action + + + + + &View + + + + + + + + + + + + + + + &Help + + + + + + + + + toolBar + + + false + + + false + + + TopToolBarArea + + + false + + + + + + + + + + + + + + + + .. + + + Go &Back + + + Go Back + + + Alt+Left + + + + + + .. + + + Go &Forward + + + Go Forward + + + Alt+Right + + + + + + + + Go &Up + + + Go Up + + + Alt+Up + + + + + + + + &Reload + + + Reload + + + Ctrl+R + + + + + &Small Icon View + + + Small Icon View + + + + + &Large Icon View + + + Large Icon View + + + + + &Compact List View + + + Compact List View + + + + + + + + &Options + + + Options + + + + + + + + &Exit + + + Exit + + + + + &Add/Remove Columns + + + Add/Remove Columns + + + Ctrl+A + + + + + &Detailed List View + + + Detailed List View + + + + + &Select DC + + + Select Domain Controller + + + + + &Customize + + + Customize + +