mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-03-22 19:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify EqualizerOverlay a tad.

Browse Source
This commit is contained in:
casey langen 2018-12-21 20:22:24 -08:00
parent c1dac7ef8d
commit 9cc2d71c17
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/musikcube/app/overlay/EqualizerOverlay.cpp
View File

@ -63,7 +63,7 @@ static const std::vector<std::string> BANDS = {
}; };
static const int VERTICAL_PADDING = 2; static const int VERTICAL_PADDING = 2;
static const int MAX_HEIGHT = 8 + (int) BANDS.size(); static const int MAX_HEIGHT = 7 + (int) BANDS.size();
static const int DEFAULT_WIDTH = 46; static const int DEFAULT_WIDTH = 46;
static const int TRACK_WIDTH = 21; static const int TRACK_WIDTH = 21;
static const int DB_LABEL_WIDTH = 6; /* "-XY dB" */ static const int DB_LABEL_WIDTH = 6; /* "-XY dB" */
@ -107,12 +107,10 @@ EqualizerOverlay::EqualizerOverlay()
this->plugin = this->FindPlugin(); this->plugin = this->FindPlugin();
this->prefs = Preferences::ForPlugin(this->plugin->Name()); this->prefs = Preferences::ForPlugin(this->plugin->Name());
this->titleLabel = std::make_shared<TextLabel>();
this->titleLabel->SetText(_TSTR("equalizer_overlay_title"), text::AlignCenter);
this->titleLabel->SetBold(true);
this->enabledCb = std::make_shared<Checkbox>(); this->enabledCb = std::make_shared<Checkbox>();
this->enabledCb->SetText(_TSTR("equalizer_overlay_enabled")); this->enabledCb->SetText(_TSTR("equalizer_overlay_enabled"));
this->enabledCb->SetAlignment(text::AlignCenter);
this->enabledCb->SetBold(true);
this->enabledCb->SetChecked(this->prefs->GetBool("enabled", false)); this->enabledCb->SetChecked(this->prefs->GetBool("enabled", false));
this->enabledCb->CheckChanged.connect(this, &EqualizerOverlay::OnEnabledChanged); this->enabledCb->CheckChanged.connect(this, &EqualizerOverlay::OnEnabledChanged);
@ -129,7 +127,6 @@ EqualizerOverlay::EqualizerOverlay()
this->shortcuts->SetAlignment(text::AlignRight); this->shortcuts->SetAlignment(text::AlignRight);
/* add */ /* add */
this->AddWindow(this->titleLabel);
this->AddWindow(this->enabledCb); this->AddWindow(this->enabledCb);
this->AddWindow(this->listView); this->AddWindow(this->listView);
this->AddWindow(this->shortcuts); this->AddWindow(this->shortcuts);
@ -140,7 +137,6 @@ EqualizerOverlay::EqualizerOverlay()
this->listView->SetFocusOrder(order++); this->listView->SetFocusOrder(order++);
/* style */ /* style */
style(*this->titleLabel);
style(*this->enabledCb); style(*this->enabledCb);
style(*this->listView); style(*this->listView);
this->listView->SetFrameVisible(true); this->listView->SetFrameVisible(true);
@ -178,11 +174,9 @@ void EqualizerOverlay::Layout() {
x = 0; x = 0;
y = 0; y = 0;
this->titleLabel->MoveAndResize(x, y, cx, 1);
y += 2;
this->enabledCb->MoveAndResize(x, y, cx, 1); this->enabledCb->MoveAndResize(x, y, cx, 1);
y += 1; y += 2;
cy -= 3; cy -= 2;
this->listView->MoveAndResize(x, y, cx, cy - 1); this->listView->MoveAndResize(x, y, cx, cy - 1);
cy = this->GetContentHeight(); cy = this->GetContentHeight();

1
src/musikcube/app/overlay/EqualizerOverlay.h
View File

@ -84,7 +84,6 @@ namespace musik {
Plugin plugin; Plugin plugin;
Prefs prefs; Prefs prefs;
std::shared_ptr<BandsAdapter> adapter; std::shared_ptr<BandsAdapter> adapter;
std::shared_ptr<cursespp::TextLabel> titleLabel;
std::shared_ptr<cursespp::Checkbox> enabledCb; std::shared_ptr<cursespp::Checkbox> enabledCb;
std::shared_ptr<cursespp::ListWindow> listView; std::shared_ptr<cursespp::ListWindow> listView;
std::shared_ptr<cursespp::ShortcutsWindow> shortcuts; std::shared_ptr<cursespp::ShortcutsWindow> shortcuts;

3
src/musikcube/data/locales/en_US.json
View File

@ -162,8 +162,7 @@
"visualizer_overlay_title": "visualizers", "visualizer_overlay_title": "visualizers",
"visualizer_overlay_no_visualizers_message": "no visualizers found!", "visualizer_overlay_no_visualizers_message": "no visualizers found!",
"equalizer_overlay_title": "equalizer", "equalizer_overlay_enabled": "equalizer enabled",
"equalizer_overlay_enabled": "enabled",
"equalizer_overlay_frequencies": "frequency bands", "equalizer_overlay_frequencies": "frequency bands",
"equalizer_button_load": "load", "equalizer_button_load": "load",
"equalizer_button_save": "save", "equalizer_button_save": "save",