[WIP] Finish remaining TODOs

Author: Warchamp7

frontend/settings/OBSBasicSettings_A11y.cpp

@@ -111,7 +111,7 @@ void OBSBasicSettings::SaveA11ySettings()
 	config_set_int(config, "Accessibility", "MixerYellowActive", mixerYellowActive);
 	config_set_int(config, "Accessibility", "MixerRedActive", mixerRedActive);
 
-	// TODO: FIXME main->refreshVolumeColors();
+	emit main->userSettingChanged("Accessibility", "SettingsChanged");
 }
 
 static void SetStyle(QLabel *label, uint32_t colorVal)

frontend/widgets/AudioMixer.cpp

@@ -250,6 +250,10 @@ AudioMixer::AudioMixer(QWidget *parent) : QFrame(parent)
 					updateShowHidden();
 				} else if (category == "BasicWindow" && name == "MixerKeepHiddenRight") {
 					updateKeepHiddenRight();
+				} else if (category == "BasicWindow" && name == "ShowListboxToolbars") {
+					updateShowToolbar();
+				} else if (category == "Accessibility" && name == "SettingsChanged") {
+					refreshVolumeColors();
 				}
 			});
 
@@ -261,6 +265,7 @@ AudioMixer::AudioMixer(QWidget *parent) : QFrame(parent)
 		connect(layoutButton, &QAction::triggered, main, &OBSBasic::toggleMixerLayout);
 	}
 
+	updateShowToolbar();
 	updatePreviewSources();
 	updateGlobalSources();
 
@@ -922,6 +927,19 @@ void AudioMixer::updateKeepHiddenRight()
 	queueLayoutUpdate();
 }
 
+void AudioMixer::updateShowToolbar()
+{
+	bool settingShowToolbar = config_get_bool(App()->GetUserConfig(), "BasicWindow", "ShowListboxToolbars");
+
+	if (showToolbar == settingShowToolbar) {
+		return;
+	}
+
+	showToolbar = settingShowToolbar;
+
+	showToolbar ? mixerToolbar->show() : mixerToolbar->hide();
+}
+
 void AudioMixer::obsSourceActivated(void *data, calldata_t *params)
 {
 	obs_source_t *source = (obs_source_t *)calldata_ptr(params, "source");

frontend/widgets/AudioMixer.hpp

@@ -69,6 +69,8 @@ class AudioMixer : public QFrame {
 	bool keepInactiveRight = false;
 	bool keepHiddenRight = false;
 
+	bool showToolbar = true;
+
 	QFrame *mixerFrame = nullptr;
 	QVBoxLayout *mainLayout = nullptr;
 	QVBoxLayout *mixerLayout = nullptr;
@@ -106,6 +108,7 @@ class AudioMixer : public QFrame {
 	void updateKeepInactiveRight();
 	void updateShowHidden();
 	void updateKeepHiddenRight();
+	void updateShowToolbar();
 
 	QTimer updateTimer;
 	void updateVolumeLayouts();

frontend/widgets/OBSBasic_ContextToolbar.cpp

@@ -57,19 +57,6 @@ void OBSBasic::copyActionsDynamicProperties()
 			temp->setProperty(y, x->property(y));
 		}
 	}
-	// TODO: FIXME
-	/*
-	for (QAction *x : ui->mixerToolbar->actions()) {
-		QWidget *temp = ui->mixerToolbar->widgetForAction(x);
-
-		if (!temp)
-			continue;
-
-		for (QByteArray &y : x->dynamicPropertyNames()) {
-			temp->setProperty(y, x->property(y));
-		}
-	}
-	*/
 }
 
 void OBSBasic::ClearContextBar()

frontend/widgets/OBSBasic_MainControls.cpp

@@ -520,9 +520,9 @@ void OBSBasic::on_toggleListboxToolbars_toggled(bool visible)
 {
 	ui->sourcesToolbar->setVisible(visible);
 	ui->scenesToolbar->setVisible(visible);
-	// TODO: FIXME ui->mixerToolbar->setVisible(visible);
 
 	config_set_bool(App()->GetUserConfig(), "BasicWindow", "ShowListboxToolbars", visible);
+	emit userSettingChanged("BasicWindow", "ShowListboxToolbars");
 }
 
 void OBSBasic::on_toggleStatusBar_toggled(bool visible)

frontend/widgets/OBSBasic_Profiles.cpp

@@ -706,7 +706,7 @@ void OBSBasic::ActivateProfile(const OBSProfile &profile, bool reset)
 	RefreshProfiles();
 
 	UpdateTitleBar();
-	// TODO: FIXME updateDecayRate();
+	emit profileSettingChanged("Audio", "MeterDecayRate");
 
 	Auth::Load();
 #ifdef YOUTUBE_ENABLED

frontend/widgets/OBSBasic_SceneCollections.cpp

@@ -1494,7 +1494,6 @@ void OBSBasic::ClearSceneData()
 
 	CloseDialogs();
 
-	// TODO: FIXME clearVolumeControls();
 	ClearListItems(ui->scenes);
 	ui->sources->Clear();
 	ClearQuickTransitions();

frontend/widgets/VolControl.cpp

@@ -973,12 +973,7 @@ void VolControl::setHideInMixer(bool hidden)
 
 void VolControl::refreshColors()
 {
-	volMeter->setBackgroundNominalColor(volMeter->getBackgroundNominalColor());
-	volMeter->setBackgroundWarningColor(volMeter->getBackgroundWarningColor());
-	volMeter->setBackgroundErrorColor(volMeter->getBackgroundErrorColor());
-	volMeter->setForegroundNominalColor(volMeter->getForegroundNominalColor());
-	volMeter->setForegroundWarningColor(volMeter->getForegroundWarningColor());
-	volMeter->setForegroundErrorColor(volMeter->getForegroundErrorColor());
+	volMeter->refreshColors();
 }
 
 void VolControl::debugHideControls()

frontend/widgets/VolumeMeter.cpp

@@ -456,6 +456,18 @@ void VolumeMeter::setMuted(bool mute)
 	muted = mute;
 }
 
+void VolumeMeter::refreshColors()
+{
+	setBackgroundNominalColor(getBackgroundNominalColor());
+	setBackgroundWarningColor(getBackgroundWarningColor());
+	setBackgroundErrorColor(getBackgroundErrorColor());
+	setForegroundNominalColor(getForegroundNominalColor());
+	setForegroundWarningColor(getForegroundWarningColor());
+	setForegroundErrorColor(getForegroundErrorColor());
+
+	updateBackgroundCache();
+}
+
 // When this is called from the constructor, obs_volmeter_get_nr_channels has not
 // yet been called and Q_PROPERTY settings have not yet been read from the
 // stylesheet.

frontend/widgets/VolumeMeter.hpp

@@ -147,6 +147,8 @@ class VolumeMeter : public QWidget {
 	void setUseDisabledColors(bool enable);
 	void setMuted(bool mute);
 
+	void refreshColors();
+
 	QColor getBackgroundNominalColor() const;
 	void setBackgroundNominalColor(QColor c);
 	QColor getBackgroundWarningColor() const;