Fixed the menubar layout and QAction variables

master
Yohann Dedy 2016-07-17 10:54:00 +02:00
parent 608e9f1754
commit 601b5d1790
2 changed files with 14 additions and 10 deletions

View File

@ -20,18 +20,19 @@ mainWindow::mainWindow(QWidget *parent) :
// Layout // Layout
QWidget *mainWidget = new QWidget(this); QWidget *mainWidget = new QWidget(this);
QHBoxLayout *mainLayout = new QHBoxLayout(mainWidget); QVBoxLayout *mainLayout = new QVBoxLayout(mainWidget);
QHBoxLayout *tableLayout = new QHBoxLayout;
// Menu Bar // Menu Bar
QMenu* menu1 = new QMenu("File", _menuBar); QMenu* mainMenu = new QMenu("File", _menuBar);
menu1->addAction("Settings"); QAction* settings = mainMenu->addAction("Settings");
menu1->addSeparator(); mainMenu->addSeparator();
menu1->addMenu("Send"); QMenu* send = mainMenu->addMenu("Send");
menu1->addMenu("Receive"); QAction* sendSingle = send->addAction("Send this preset");
QAction* sendAll = send->addAction("Send all presets");
_menuBar->addMenu(menu1); _menuBar->addMenu(mainMenu);
mainLayout->addWidget(_menuBar); mainLayout->addWidget(_menuBar);
// Table // Table
@ -54,8 +55,10 @@ mainWindow::mainWindow(QWidget *parent) :
_presetSettingsTable->setHorizontalHeaderLabels(settingsList); _presetSettingsTable->setHorizontalHeaderLabels(settingsList);
mainLayout->addWidget(_presetsTable); tableLayout->addWidget(_presetsTable);
mainLayout->addWidget(_presetSettingsTable); tableLayout->addWidget(_presetSettingsTable);
mainLayout->addLayout(tableLayout);
mainWidget->setLayout(mainLayout); mainWidget->setLayout(mainLayout);
setCentralWidget(mainWidget); setCentralWidget(mainWidget);

View File

@ -54,6 +54,7 @@ signals:
public slots: public slots:
void onMidiMessageReceive(QMidiMessage* message); void onMidiMessageReceive(QMidiMessage* message);
//void openSettingsWindow();
//void updateDeviceConfig(std::bitset<3> thru, int mastChn); //void updateDeviceConfig(std::bitset<3> thru, int mastChn);
//void updatePresetSettings(std::vector<unsigned int>* presetSettings); //void updatePresetSettings(std::vector<unsigned int>* presetSettings);