From 661b410db1d92200d4ae16bacf6f0433c5c814d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=A4rkl?= Date: Fri, 28 Jun 2019 12:44:57 +0200 Subject: [PATCH] Add basic ToolBar --- gui/include/mainwindow.h | 7 +++++-- gui/src/mainwindow.cpp | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/gui/include/mainwindow.h b/gui/include/mainwindow.h index f8e44f6..2685213 100644 --- a/gui/include/mainwindow.h +++ b/gui/include/mainwindow.h @@ -18,12 +18,12 @@ #ifndef CHIAKI_MAINWINDOW_H #define CHIAKI_MAINWINDOW_H -#include +#include class DynamicGridWidget; class ServerItemWidget; -class MainWindow : public QWidget +class MainWindow : public QMainWindow { Q_OBJECT @@ -37,6 +37,9 @@ class MainWindow : public QWidget public slots: void ServerItemWidgetSelected(); void ServerItemWidgetTriggered(); + + void RunDiscovery(); + void ShowSettings(); }; #endif //CHIAKI_MAINWINDOW_H diff --git a/gui/src/mainwindow.cpp b/gui/src/mainwindow.cpp index 527e1ef..4172f44 100644 --- a/gui/src/mainwindow.cpp +++ b/gui/src/mainwindow.cpp @@ -22,11 +22,32 @@ #include #include #include +#include +#include -MainWindow::MainWindow(QWidget *parent) : QWidget(parent) +MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { + auto main_widget = new QWidget(this); auto layout = new QVBoxLayout(); - setLayout(layout); + main_widget->setLayout(layout); + setCentralWidget(main_widget); + layout->setMargin(0); + + auto tool_bar = new QToolBar(this); + tool_bar->setMovable(false); + addToolBar(tool_bar); + + auto discover_action = new QAction(tr("Discover"), this); + tool_bar->addAction(discover_action); + connect(discover_action, &QAction::triggered, this, &MainWindow::RunDiscovery); + + auto tool_bar_spacer = new QWidget(); + tool_bar_spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Ignored); + tool_bar->addWidget(tool_bar_spacer); + + auto settings_action = new QAction(tr("Settings"), this); + tool_bar->addAction(settings_action); + connect(settings_action, &QAction::triggered, this, &MainWindow::ShowSettings); auto scroll_area = new QScrollArea(this); scroll_area->setWidgetResizable(true); @@ -76,4 +97,14 @@ void MainWindow::ServerItemWidgetTriggered() return; // TODO: connect -} \ No newline at end of file +} + +void MainWindow::RunDiscovery() +{ + qDebug() << "TODO: RunDiscovery()"; +} + +void MainWindow::ShowSettings() +{ + qDebug() << "TODO: ShowSettings()"; +}