X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmainwindow.cpp;h=f2adbf240c94a6e42afe8a2238553075f7cfcc38;hb=a60a2c892c08f6fab3a1e6b7cf4343cad8689058;hp=91234ceb23ff301b6194d9bda9b1f81fd0f7e34b;hpb=9ffd4f03f314cc6e0254449593def95c9bc203d6;p=nageru

diff --git a/nageru/mainwindow.cpp b/nageru/mainwindow.cpp
index 91234ce..f2adbf2 100644
--- a/nageru/mainwindow.cpp
+++ b/nageru/mainwindow.cpp
@@ -252,6 +252,9 @@ MainWindow::MainWindow()
 	connect(ui->me_live, &GLWidget::transition_names_updated, this, &MainWindow::set_transition_names);
 	qRegisterMetaType<Mixer::Output>("Mixer::Output");
 
+	connect(ui->me_live, &GLWidget::name_updated, this, &MainWindow::update_channel_name);
+	connect(ui->me_preview, &GLWidget::name_updated, this, &MainWindow::update_channel_name);
+
 	// Hook up the prev/next buttons on the audio views.
 	connect(ui->compact_prev_page, &QAbstractButton::clicked, this, &MainWindow::prev_page);
 	connect(ui->compact_next_page, &QAbstractButton::clicked, this, &MainWindow::next_page);
@@ -881,22 +884,44 @@ void MainWindow::update_eq_label(unsigned bus_index, EQBand band, float gain_db)
 
 void MainWindow::setup_theme_menu()
 {
-	std::vector<Theme::MenuEntry> theme_menu_entries = global_mixer->get_theme_menu();
+	Theme::MenuEntry *root_menu = global_mixer->get_theme_menu();
 
+	// Remove the old menu, if any.
 	if (theme_menu != nullptr) {
 		ui->menuBar->removeAction(theme_menu->menuAction());
 		theme_menu = nullptr;
 	}
 
-	if (!theme_menu_entries.empty()) {
-		theme_menu = new QMenu("&Theme");
-		for (const Theme::MenuEntry &entry : theme_menu_entries) {
-			QAction *action = theme_menu->addAction(QString::fromStdString(entry.text));
-			connect(action, &QAction::triggered, [entry] {
-				global_mixer->theme_menu_entry_clicked(entry.lua_ref);
-			});
+	if (root_menu != nullptr) {
+		assert(root_menu->is_submenu);
+		if (!root_menu->submenu.empty()) {
+			theme_menu = new QMenu("&Theme");
+			fill_menu_from_theme_menu(root_menu->submenu, theme_menu);
+			ui->menuBar->insertMenu(ui->menu_Help->menuAction(), theme_menu);
 		}
-		ui->menuBar->insertMenu(ui->menu_Help->menuAction(), theme_menu);
+	}
+}
+
+void MainWindow::fill_menu_from_theme_menu(const vector<unique_ptr<Theme::MenuEntry>> &entries, QMenu *menu)
+{
+	for (const unique_ptr<Theme::MenuEntry> &entry : entries) {
+		if (entry->is_submenu) {
+			QMenu *submenu = new QMenu(QString::fromStdString(entry->text));
+			fill_menu_from_theme_menu(entry->submenu, submenu);
+			menu->addMenu(submenu);
+			continue;
+		}
+
+		QAction *action = menu->addAction(QString::fromStdString(entry->text));
+		if (entry->entry.flags == Theme::MenuEntry::CHECKABLE) {
+			action->setCheckable(true);
+		} else if (entry->entry.flags == Theme::MenuEntry::CHECKED) {
+			action->setCheckable(true);
+			action->setChecked(true);
+		}
+		connect(action, &QAction::triggered, [lua_ref = entry->entry.lua_ref] {
+			global_mixer->theme_menu_entry_clicked(lua_ref);
+		});
 	}
 }
 
@@ -1481,7 +1506,11 @@ void MainWindow::set_transition_names(vector<string> transition_names)
 
 void MainWindow::update_channel_name(Mixer::Output output, const string &name)
 {
-	if (output >= Mixer::OUTPUT_INPUT0) {
+	if (output == Mixer::OUTPUT_LIVE) {
+		ui->label_live->setText(name.c_str());
+	} else if (output == Mixer::OUTPUT_PREVIEW) {
+		ui->label_preview->setText(name.c_str());
+	} else if (output >= Mixer::OUTPUT_INPUT0) {
 		unsigned channel = output - Mixer::OUTPUT_INPUT0;
 		previews[channel]->label->setText(name.c_str());
 	}