sam/sfizz-ui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed sfizz version in option panel

Browse source
This commit is contained in:
redtide 2024-01-03 23:39:55 +01:00
parent 207367f690
commit d22cc4deee
No known key found for this signature in database
3 changed files with 41 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
plugins/editor/layout/main.fl
View file

@ -240,22 +240,22 @@ widget_class mainView {open
} { } {
Fl_Spinner oversamplingSlider_ { Fl_Spinner oversamplingSlider_ {
comment {tag=kTagSetOversampling} comment {tag=kTagSetOversampling}
xywh {180 195 70 25} xywh {180 170 70 25}
class ValueMenu class ValueMenu
} }
Fl_Box {} { Fl_Box {} {
label Oversampling label Oversampling
xywh {10 195 85 25} align 20 xywh {10 170 85 25} align 20
class Label class Label
} }
Fl_Box {} { Fl_Box {} {
label {Preload size} label {Preload size}
xywh {10 170 75 25} align 20 xywh {10 145 75 25} align 20
class Label class Label
} }
Fl_Spinner preloadSizeSlider_ { Fl_Spinner preloadSizeSlider_ {
comment {tag=kTagSetPreloadSize} comment {tag=kTagSetPreloadSize}
xywh {180 170 70 25} xywh {180 145 70 25}
class ValueMenu class ValueMenu
} }
Fl_Spinner sampleQualitySlider_ { Fl_Spinner sampleQualitySlider_ {
@ -357,19 +357,14 @@ widget_class mainView {open
} }
Fl_Box {} { Fl_Box {} {
label {Sustain cancels release} label {Sustain cancels release}
xywh {10 220 145 25} align 20 xywh {10 195 145 25} align 20
class Label class Label
} }
Fl_Check_Button sustainCancelsReleaseCheckbox_ { Fl_Check_Button sustainCancelsReleaseCheckbox_ {
comment {tag=kTagSetSustainCancelsRelease} comment {tag=kTagSetSustainCancelsRelease}
xywh {180 220 25 25} down_box DOWN_BOX xywh {180 195 25 25} down_box DOWN_BOX
class Checkbox class Checkbox
} }
Fl_Box sfizzVersionLabel_ {
label SFIZZ_VERSION
xywh {10 145 225 20}
class Label
}
Fl_Box {} { Fl_Box {} {
label {Rendering quality} label {Rendering quality}
xywh {270 115 110 25} align 20 xywh {270 115 110 25} align 20

8
plugins/editor/src/editor/Editor.cpp
View file

@ -11,7 +11,6 @@
#include "GUIComponents.h" #include "GUIComponents.h"
#include "GUIHelpers.h" #include "GUIHelpers.h"
#include "GUIPiano.h" #include "GUIPiano.h"
#include "GitBuildId.h"
#include "DlgAbout.h" #include "DlgAbout.h"
#include "ImageHelpers.h" #include "ImageHelpers.h"
#include "NativeHelpers.h" #include "NativeHelpers.h"
@ -182,8 +181,6 @@ struct Editor::Impl : EditorController::Receiver,
SharedPointer<CBitmap> defaultBackgroundBitmap_; SharedPointer<CBitmap> defaultBackgroundBitmap_;
SharedPointer<CBitmap> controlsBitmap_; SharedPointer<CBitmap> controlsBitmap_;
CTextLabel* sfizzVersionLabel_ = nullptr;
SKnobCCBox* getSecondaryCCKnob(unsigned cc) SKnobCCBox* getSecondaryCCKnob(unsigned cc)
{ {
switch (cc) { switch (cc) {
@ -1171,11 +1168,6 @@ void Editor::Impl::createFrameContents()
mainView_ = owned(mainView); mainView_ = owned(mainView);
} }
if (CTextLabel* label = sfizzVersionLabel_) {
std::string version = GitBuildId[0] ? absl::StrCat(SFIZZ_VERSION ".", GitBuildId) : SFIZZ_VERSION;
label->setText(absl::StrCat(u8"sfizz ", version));
}
/// ///
currentThemeName_ = theme->loadCurrentName(); currentThemeName_ = theme->loadCurrentName();
theme->load(currentThemeName_); theme->load(currentThemeName_);

73
plugins/editor/src/editor/layout/main.hpp
View file

@ -131,14 +131,14 @@ subPanels_[kPanelSettings] = view__47;
view__0->addView(view__47); view__0->addView(view__47);
auto* const view__48 = createSquaredGroup(CRect(0, 0, 775, 335), -1, "", kCenterText, 14); auto* const view__48 = createSquaredGroup(CRect(0, 0, 775, 335), -1, "", kCenterText, 14);
view__47->addView(view__48); view__47->addView(view__48);
auto* const view__49 = createValueMenu(CRect(180, 85, 250, 110), kTagSetOversampling, "", kCenterText, 14); auto* const view__49 = createValueMenu(CRect(180, 60, 250, 85), kTagSetOversampling, "", kCenterText, 14);
oversamplingSlider_ = view__49; oversamplingSlider_ = view__49;
view__48->addView(view__49); view__48->addView(view__49);
auto* const view__50 = createLabel(CRect(10, 85, 95, 110), -1, "Oversampling", kLeftText, 14); auto* const view__50 = createLabel(CRect(10, 60, 95, 85), -1, "Oversampling", kLeftText, 14);
view__48->addView(view__50); view__48->addView(view__50);
auto* const view__51 = createLabel(CRect(10, 60, 85, 85), -1, "Preload size", kLeftText, 14); auto* const view__51 = createLabel(CRect(10, 35, 85, 60), -1, "Preload size", kLeftText, 14);
view__48->addView(view__51); view__48->addView(view__51);
auto* const view__52 = createValueMenu(CRect(180, 60, 250, 85), kTagSetPreloadSize, "", kCenterText, 14); auto* const view__52 = createValueMenu(CRect(180, 35, 250, 60), kTagSetPreloadSize, "", kCenterText, 14);
preloadSizeSlider_ = view__52; preloadSizeSlider_ = view__52;
view__48->addView(view__52); view__48->addView(view__52);
auto* const view__53 = createValueMenu(CRect(430, 35, 510, 60), kTagSetSampleQuality, "", kCenterText, 14); auto* const view__53 = createValueMenu(CRect(430, 35, 510, 60), kTagSetSampleQuality, "", kCenterText, 14);
@ -189,59 +189,56 @@ view__48->addView(view__70);
auto* const view__71 = createValueMenu(CRect(430, 60, 510, 85), kTagSetFreewheelingSampleQuality, "", kCenterText, 14); auto* const view__71 = createValueMenu(CRect(430, 60, 510, 85), kTagSetFreewheelingSampleQuality, "", kCenterText, 14);
freewheelingSampleQualitySlider_ = view__71; freewheelingSampleQualitySlider_ = view__71;
view__48->addView(view__71); view__48->addView(view__71);
auto* const view__72 = createLabel(CRect(10, 110, 155, 135), -1, "Sustain cancels release", kLeftText, 14); auto* const view__72 = createLabel(CRect(10, 85, 155, 110), -1, "Sustain cancels release", kLeftText, 14);
view__48->addView(view__72); view__48->addView(view__72);
auto* const view__73 = createCheckbox(CRect(180, 110, 205, 135), kTagSetSustainCancelsRelease, "", kCenterText, 14); auto* const view__73 = createCheckbox(CRect(180, 85, 205, 110), kTagSetSustainCancelsRelease, "", kCenterText, 14);
sustainCancelsReleaseCheckbox_ = view__73; sustainCancelsReleaseCheckbox_ = view__73;
view__48->addView(view__73); view__48->addView(view__73);
auto* const view__74 = createLabel(CRect(10, 35, 235, 55), -1, "SFIZZ_VERSION", kCenterText, 14); auto* const view__74 = createLabel(CRect(270, 5, 380, 30), -1, "Rendering quality", kLeftText, 14);
sfizzVersionLabel_ = view__74;
view__48->addView(view__74); view__48->addView(view__74);
auto* const view__75 = createLabel(CRect(270, 5, 380, 30), -1, "Rendering quality", kLeftText, 14); auto* const view__75 = createHLine(CRect(10, 25, 250, 30), -1, "", kCenterText, 14);
view__48->addView(view__75); view__48->addView(view__75);
auto* const view__76 = createHLine(CRect(10, 25, 250, 30), -1, "", kCenterText, 14); auto* const view__76 = createLabel(CRect(10, 5, 105, 30), -1, "Engine options", kLeftText, 14);
view__48->addView(view__76); view__48->addView(view__76);
auto* const view__77 = createLabel(CRect(10, 5, 105, 30), -1, "Engine options", kLeftText, 14); auto* const view__77 = createLabel(CRect(525, 5, 565, 30), -1, "Other", kLeftText, 14);
view__48->addView(view__77); view__48->addView(view__77);
auto* const view__78 = createLabel(CRect(525, 5, 565, 30), -1, "Other", kLeftText, 14); auto* const view__78 = createLabel(CRect(525, 145, 750, 170), -1, "Tuning", kLeftText, 14);
view__48->addView(view__78); view__48->addView(view__78);
auto* const view__79 = createLabel(CRect(525, 145, 750, 170), -1, "Tuning", kLeftText, 14); auto* const view__79 = createHLine(CRect(270, 25, 509, 30), -1, "", kCenterText, 14);
view__48->addView(view__79); view__48->addView(view__79);
auto* const view__80 = createHLine(CRect(270, 25, 509, 30), -1, "", kCenterText, 14); auto* const view__80 = createHLine(CRect(525, 25, 765, 30), -1, "", kCenterText, 14);
view__48->addView(view__80); view__48->addView(view__80);
auto* const view__81 = createHLine(CRect(525, 25, 765, 30), -1, "", kCenterText, 14); auto* const view__81 = createHLine(CRect(525, 165, 750, 170), -1, "", kCenterText, 14);
view__48->addView(view__81); view__48->addView(view__81);
auto* const view__82 = createHLine(CRect(525, 165, 750, 170), -1, "", kCenterText, 14); auto* const view__82 = createChevronValueDropDown(CRect(725, 225, 750, 250), kTagSetTuningFrequency, "", kCenterText, 24);
tuningFrequencyDropdown_ = view__82;
view__48->addView(view__82); view__48->addView(view__82);
auto* const view__83 = createChevronValueDropDown(CRect(725, 225, 750, 250), kTagSetTuningFrequency, "", kCenterText, 24); auto* const view__83 = createTextEdit(CRect(665, 225, 725, 250), kTagSetTuningFrequency, "", kCenterText, 14);
tuningFrequencyDropdown_ = view__83; tuningFrequencyEdit_ = view__83;
view__48->addView(view__83); view__48->addView(view__83);
auto* const view__84 = createTextEdit(CRect(665, 225, 725, 250), kTagSetTuningFrequency, "", kCenterText, 14); auto* const view__84 = createLabel(CRect(270, 110, 415, 135), -1, "when freewheeling", kLeftText, 14);
tuningFrequencyEdit_ = view__84;
view__48->addView(view__84); view__48->addView(view__84);
auto* const view__85 = createLabel(CRect(270, 110, 415, 135), -1, "when freewheeling", kLeftText, 14); auto* const view__85 = createValueMenu(CRect(430, 110, 510, 135), kTagSetFreewheelingOscillatorQuality, "", kCenterText, 14);
freewheelingOscillatorQualitySlider_ = view__85;
view__48->addView(view__85); view__48->addView(view__85);
auto* const view__86 = createValueMenu(CRect(430, 110, 510, 135), kTagSetFreewheelingOscillatorQuality, "", kCenterText, 14); auto* const view__86 = createLabel(CRect(525, 85, 620, 110), -1, "Zoom", kLeftText, 14);
freewheelingOscillatorQualitySlider_ = view__86;
view__48->addView(view__86); view__48->addView(view__86);
auto* const view__87 = createLabel(CRect(525, 85, 620, 110), -1, "Zoom", kLeftText, 14); auto* const view__87 = createOptionMenu(CRect(665, 85, 765, 110), kTagZoomMenu, "", kCenterText, 14);
zoomMenu_ = view__87;
view__48->addView(view__87); view__48->addView(view__87);
auto* const view__88 = createOptionMenu(CRect(665, 85, 765, 110), kTagZoomMenu, "", kCenterText, 14); auto* const view__88 = createValueButton(CRect(665, 110, 765, 135), kTagSetDefaultZoom, "Set Default", kCenterText, 14);
zoomMenu_ = view__88; defaultZoomButton_ = view__88;
view__48->addView(view__88); view__48->addView(view__88);
auto* const view__89 = createValueButton(CRect(665, 110, 765, 135), kTagSetDefaultZoom, "Set Default", kCenterText, 14); auto* const view__89 = createPiano(CRect(0, 445, 775, 515), -1, "", kCenterText, 16);
defaultZoomButton_ = view__89; piano_ = view__89;
view__48->addView(view__89); view__0->addView(view__89);
auto* const view__90 = createPiano(CRect(0, 445, 775, 515), -1, "", kCenterText, 16); auto* const view__90 = createLogicalGroup(CRect(0, 110, 775, 445), -1, "", kCenterText, 14);
piano_ = view__90; subPanels_[kPanelGeneral] = view__90;
view__0->addView(view__90); view__0->addView(view__90);
auto* const view__91 = createLogicalGroup(CRect(0, 110, 775, 445), -1, "", kCenterText, 14); view__90->setVisible(false);
subPanels_[kPanelGeneral] = view__91; enterPalette(invertedPalette);
auto* const view__91 = createHoverBox(CRect(5, 105, 175, 130), -1, "", kCenterText, 14);
lblHover_ = view__91;
view__0->addView(view__91); view__0->addView(view__91);
view__91->setVisible(false); view__91->setVisible(false);
enterPalette(invertedPalette);
auto* const view__92 = createHoverBox(CRect(5, 105, 175, 130), -1, "", kCenterText, 14);
lblHover_ = view__92;
view__0->addView(view__92);
view__92->setVisible(false);
enterPalette(defaultPalette); enterPalette(defaultPalette);