From 601b5d17901deaad35d2df6cfb22d9c667be2252 Mon Sep 17 00:00:00 2001 From: Yohann Dedy Date: Sun, 17 Jul 2016 10:54:00 +0200 Subject: [PATCH] Fixed the menubar layout and QAction variables --- src/mainwindow.cpp | 23 +++++++++++++---------- src/mainwindow.h | 1 + 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index c6fb8b7..508b9ce 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -20,18 +20,19 @@ mainWindow::mainWindow(QWidget *parent) : // Layout QWidget *mainWidget = new QWidget(this); - QHBoxLayout *mainLayout = new QHBoxLayout(mainWidget); - + QVBoxLayout *mainLayout = new QVBoxLayout(mainWidget); + QHBoxLayout *tableLayout = new QHBoxLayout; // Menu Bar - QMenu* menu1 = new QMenu("File", _menuBar); - menu1->addAction("Settings"); - menu1->addSeparator(); - menu1->addMenu("Send"); - menu1->addMenu("Receive"); + QMenu* mainMenu = new QMenu("File", _menuBar); + QAction* settings = mainMenu->addAction("Settings"); + mainMenu->addSeparator(); + QMenu* send = mainMenu->addMenu("Send"); + QAction* sendSingle = send->addAction("Send this preset"); + QAction* sendAll = send->addAction("Send all presets"); - _menuBar->addMenu(menu1); + _menuBar->addMenu(mainMenu); mainLayout->addWidget(_menuBar); // Table @@ -54,8 +55,10 @@ mainWindow::mainWindow(QWidget *parent) : _presetSettingsTable->setHorizontalHeaderLabels(settingsList); - mainLayout->addWidget(_presetsTable); - mainLayout->addWidget(_presetSettingsTable); + tableLayout->addWidget(_presetsTable); + tableLayout->addWidget(_presetSettingsTable); + + mainLayout->addLayout(tableLayout); mainWidget->setLayout(mainLayout); setCentralWidget(mainWidget); diff --git a/src/mainwindow.h b/src/mainwindow.h index 1ce1bb6..88432e4 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -54,6 +54,7 @@ signals: public slots: void onMidiMessageReceive(QMidiMessage* message); + //void openSettingsWindow(); //void updateDeviceConfig(std::bitset<3> thru, int mastChn); //void updatePresetSettings(std::vector* presetSettings);