diff options
| author | André Nusser <andre.nusser@googlemail.com> | 2017-05-26 00:42:40 +0200 | 
|---|---|---|
| committer | André Nusser <andre.nusser@googlemail.com> | 2017-05-26 00:42:40 +0200 | 
| commit | 7202cbf9e1ffdc19c5fbe46017ce8d1c9f8e467a (patch) | |
| tree | d236eba31f7fe09c567cf5fa9c997bf24fb37717 /plugingui | |
| parent | dc244432932a2e727f0dec191861e4b46c327269 (diff) | |
Modify look of bleed control frame and add switch.
Also remove useless TODO and FIXME.
Diffstat (limited to 'plugingui')
| -rw-r--r-- | plugingui/bleedcontrolframecontent.cc | 9 | ||||
| -rw-r--r-- | plugingui/maintab.cc | 5 | ||||
| -rw-r--r-- | plugingui/maintab.h | 2 | 
3 files changed, 7 insertions, 9 deletions
| diff --git a/plugingui/bleedcontrolframecontent.cc b/plugingui/bleedcontrolframecontent.cc index 51ecf2a..5d28169 100644 --- a/plugingui/bleedcontrolframecontent.cc +++ b/plugingui/bleedcontrolframecontent.cc @@ -41,7 +41,7 @@ BleedcontrolframeContent::BleedcontrolframeContent(Widget* parent,  	, settings(settings)  	, settings_notifier(settings_notifier)  { -	label_text.setText("Amount of Microphone Bleed:"); +	label_text.setText("Master Bleed Volume:");  	label_text.setAlignment(TextAlignment::center);  	label_value.setText("0 %"); @@ -58,10 +58,11 @@ void BleedcontrolframeContent::resize(std::size_t width, std::size_t height)  	Widget::resize(width, height);  	slider_width = 0.8 * width; +	auto x_start = 0.1 * width; -	label_text.move(0, 0); -	slider.move(0, 20); -	label_value.move(0, 40); +	label_text.move(x_start, 0); +	slider.move(x_start, 20); +	label_value.move(x_start, 40);  	label_text.resize(slider_width, 15);  	slider.resize(slider_width, 15); diff --git a/plugingui/maintab.cc b/plugingui/maintab.cc index 8238988..8bc4962 100644 --- a/plugingui/maintab.cc +++ b/plugingui/maintab.cc @@ -26,13 +26,9 @@   */  #include "maintab.h" -// FIXME: -#include <iostream> -  namespace GUI  { -// TODO: Reduce boilerplate code in this constructor  MainTab::MainTab(Widget* parent,                   Settings& settings,                   SettingsNotifier& settings_notifier, @@ -66,6 +62,7 @@ MainTab::MainTab(Widget* parent,  	        &resampling_frame, &FrameWidget::setOnSwitch);  	CONNECT(&humanizer_frame, onSwitchChangeNotifier,  	        this, &MainTab::humanizerOnChange); +	// TODO: Connect bleed control switch to settings  	CONNECT(&resampling_frame, onSwitchChangeNotifier,  	        this, &MainTab::resamplingOnChange);  } diff --git a/plugingui/maintab.h b/plugingui/maintab.h index 3463355..de78474 100644 --- a/plugingui/maintab.h +++ b/plugingui/maintab.h @@ -67,7 +67,7 @@ private:  	FrameWidget status_frame{this, false};  	FrameWidget humanizer_frame{this, true};  	FrameWidget diskstreaming_frame{this, false}; -	FrameWidget bleedcontrol_frame{this, false}; +	FrameWidget bleedcontrol_frame{this, true};  	FrameWidget resampling_frame{this, true};  	DrumkitframeContent drumkitframe_content; | 
