Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated options panel and random things in the UI #1022

Merged
merged 2 commits into from
Nov 12, 2021
Merged

Updated options panel and random things in the UI #1022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a882b9
Updated options panel and random things in the UI
paulfd Nov 11, 2021
aab807a
Add new config options and bind them to the UI
paulfd Nov 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
248 changes: 157 additions & 91 deletions plugins/editor/layout/main.fl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ version 1.0304
header_name {.h}
code_name {.cxx}
widget_class mainView {open
xywh {108 91 800 475} type Double
xywh {607 439 800 475} type Double
class LogicalGroup visible
} {
Fl_Box imageContainer_ {
image {../resources/background.png} xywh {5 110 790 285}
image {../resources/background.png} xywh {90 110 790 285}
class Background
}
Fl_Group {} {
comment {palette=invertedPalette} open
xywh {0 0 814 110}
class LogicalGroup
} {
Fl_Group {} {open
Fl_Group {} {
xywh {5 4 175 101} box ROUNDED_BOX align 0
class RoundedGroup
} {
Expand Down Expand Up @@ -45,7 +45,7 @@ widget_class mainView {open
class HomeButton
}
}
Fl_Group {} {open
Fl_Group {} {
xywh {185 5 390 100} box ROUNDED_BOX
class RoundedGroup
} {
Expand Down Expand Up @@ -126,7 +126,7 @@ widget_class mainView {open
class ChevronValueDropDown
}
}
Fl_Group {} {open
Fl_Group {} {
xywh {580 5 215 100} box ROUNDED_BOX
class RoundedGroup
} {
Expand Down Expand Up @@ -155,17 +155,17 @@ widget_class mainView {open
xywh {739 10 23 90} box BORDER_BOX
class VMeter
}
Fl_Box {meters_[1]} {selected
Fl_Box {meters_[1]} {
xywh {763 10 23 90} box BORDER_BOX
class VMeter
}
}
}
Fl_Group {subPanels_[kPanelInfo]} {
Fl_Group {subPanels_[kPanelInfo]} {open
xywh {5 110 790 285} hide
class LogicalGroup
} {
Fl_Group {} {open
Fl_Group {} {
xywh {5 110 790 285} box ROUNDED_BOX
class RoundedGroup
} {
Expand Down Expand Up @@ -225,7 +225,7 @@ widget_class mainView {open
xywh {5 110 790 285} hide
class LogicalGroup
} {
Fl_Group {} {open
Fl_Group {} {
xywh {5 110 790 285} box ROUNDED_BOX
class RoundedGroup
} {
Expand All @@ -235,150 +235,216 @@ widget_class mainView {open
} {}
}
}
Fl_Group {subPanels_[kPanelSettings]} {
xywh {5 110 790 285}
Fl_Group {subPanels_[kPanelSettings]} {open
xywh {0 110 825 360}
class LogicalGroup
} {
Fl_Group {} {
label Engine open
xywh {305 135 195 100} box ROUNDED_BOX labelsize 12 align 17
class TitleGroup
Fl_Group {} {open
xywh {5 110 790 285} box ROUNDED_BOX
class RoundedGroup
} {
Fl_Spinner oversamplingSlider_ {
comment {tag=kTagSetOversampling}
xywh {330 195 60 25} labelsize 12 textsize 12
xywh {175 195 70 25} labelsize 12 textsize 12
class ValueMenu
}
Fl_Box {} {
label Oversampling
xywh {320 155 80 25} labelsize 12
class ValueLabel
xywh {20 195 85 25} labelsize 12 align 20
class Label
}
Fl_Box {} {
label {Preload size}
xywh {405 155 80 25} labelsize 12
class ValueLabel
xywh {20 170 75 25} labelsize 12 align 20
class Label
}
Fl_Spinner preloadSizeSlider_ {
comment {tag=kTagSetPreloadSize}
xywh {415 195 60 25} labelsize 12 textsize 12
xywh {175 170 70 25} labelsize 12 textsize 12
class ValueMenu
}
Fl_Spinner sampleQualitySlider_ {
comment {tag=kTagSetSampleQuality}
xywh {435 145 80 25} labelsize 12 textsize 12
class ValueMenu
}
}
Fl_Group {} {
label Tuning open
xywh {175 270 415 100} box ROUNDED_BOX labelsize 12 align 17
class TitleGroup
} {
Fl_Box {} {
label {Root key}
xywh {330 290 80 25} labelsize 12
class ValueLabel
label Sample
xywh {290 145 50 25} labelsize 12 align 20
class Label
}
Fl_Spinner tuningFrequencySlider_ {
comment {tag=kTagSetTuningFrequency}
xywh {425 330 60 25} labelsize 12 textsize 12
Fl_Box {} {
label Oscillator
xywh {290 195 60 25} labelsize 12 align 20
class Label
}
Fl_Spinner oscillatorQualitySlider_ {
comment {tag=kTagSetOscillatorQuality}
xywh {435 195 80 25} labelsize 12 textsize 12
class ValueMenu
}
Fl_Spinner themeMenu_ {
comment {tag=kTagThemeMenu}
xywh {680 145 100 25} labelsize 12 textsize 12
class OptionMenu
}
Fl_Box {} {
label Theme
xywh {555 145 45 25} labelsize 12 align 20
class Label
}
Fl_Box {} {
label {User SFZ folder}
xywh {555 170 95 25} labelsize 12 align 20
class Label
}
Fl_Button userFilesDirButton_ {
label DefaultPath
comment {tag=kTagChooseUserFilesDir}
xywh {680 170 100 25} labelsize 12
class ValueButton
}
Fl_Box {} {
label {Root key}
xywh {555 285 60 25} labelsize 12 align 20
class Label
}
Fl_Box {} {
label Frequency
xywh {415 290 80 25} labelsize 12
class ValueLabel
xywh {555 310 70 25} labelsize 12 align 20
class Label
}
Fl_Dial stretchedTuningSlider_ {
comment {tag=kTagSetStretchedTuning}
xywh {515 315 48 48} value 0.5
xywh {720 337 48 48} value 0.5
class StyledKnob
}
Fl_Box {} {
label Stretch
xywh {500 290 80 25} labelsize 12
class ValueLabel
xywh {555 345 50 25} labelsize 12 align 20
class Label
}
Fl_Box {} {
label {Scala file}
xywh {195 290 100 25} labelsize 12
class ValueLabel
xywh {555 260 60 25} labelsize 12 align 20
class Label
}
Fl_Button scalaFileButton_ {
label DefaultScale
comment {tag=kTagLoadScalaFile}
xywh {195 330 100 25} labelsize 12
xywh {655 260 100 25} labelsize 12
class ValueButton
}
Fl_Spinner scalaRootKeySlider_ {
comment {tag=kTagSetScalaRootKey}
xywh {340 330 35 25} labelsize 12 textsize 12
xywh {715 285 35 25} labelsize 12 textsize 12
class ValueMenu
}
Fl_Spinner scalaRootOctaveSlider_ {
comment {tag=kTagSetScalaRootKey}
xywh {375 330 30 25} labelsize 12 textsize 12
xywh {750 285 30 25} labelsize 12 textsize 12
class ValueMenu
}
Fl_Button scalaResetButton_ {
comment {tag=kTagResetScalaFile}
xywh {295 330 25 25} labelsize 12
xywh {755 260 25 25} labelsize 12
class ResetSomethingButton
}
}
Fl_Group userFilesGroup_ {
label Files open
xywh {620 270 139 100} box ROUNDED_BOX labelsize 12 align 17
class TitleGroup
} {
Fl_Box {} {
label {User SFZ folder}
xywh {640 290 100 25} labelsize 12
class ValueLabel
}
Fl_Button userFilesDirButton_ {
label DefaultPath
comment {tag=kTagChooseUserFilesDir}
xywh {640 330 100 25} labelsize 12
class ValueButton
label {... when freewheeling}
xywh {290 170 145 25} labelsize 12 align 20
class Label
}
}
Fl_Group {} {
label Quality open
xywh {530 135 195 100} box ROUNDED_BOX labelsize 12 align 17
class TitleGroup
} {
Fl_Spinner sampleQualitySlider_ {
comment {tag=kTagSetSampleQuality}
xywh {545 195 80 25} labelsize 12 textsize 12
Fl_Spinner freewheelingSampleQualitySlider_ {
comment {tag=kTagSetFreewheelingSampleQuality}
xywh {435 170 80 25} labelsize 12 textsize 12
class ValueMenu
}
Fl_Box {} {
label Sample
xywh {545 155 80 25} labelsize 12
class ValueLabel
label {Sustain cancels release}
xywh {20 220 145 25} labelsize 12 align 20
class Label
}
Fl_Check_Button sustainCancelsReleaseCheckbox_ {
comment {tag=kTagSetSustainCancelsRelease} selected
xywh {200 220 25 25} down_box DOWN_BOX
class Checkbox
}
Fl_Box sfizzVersionLabel_ {
label SFIZZ_VERSION
xywh {20 145 225 20} labelsize 10
class Label
}
Fl_Box {} {
label Oscillator
xywh {630 155 80 25} labelsize 12
class ValueLabel
label {Rendering quality}
xywh {290 115 110 25} labelsize 12 align 20
class Label
}
Fl_Spinner oscillatorQualitySlider_ {
comment {tag=kTagSetOscillatorQuality}
xywh {630 195 80 25} labelsize 12 textsize 12
class ValueMenu
Fl_Box {} {
label {Separator 2}
xywh {20 135 225 5} box BORDER_BOX labeltype NO_LABEL
class HLine
}
}
Fl_Group {} {
label Appearance open
xywh {40 270 105 100} box ROUNDED_BOX labelsize 12 align 17
class TitleGroup
} {
Fl_Spinner themeMenu_ {
comment {tag=kTagThemeMenu}
xywh {60 330 65 25} labelsize 12 textsize 12
class OptionMenu
Fl_Box {} {
label {Engine options}
xywh {20 115 95 25} labelsize 12 align 20
class Label
}
Fl_Box {} {
label Theme
xywh {50 295 80 25} labelsize 12
class ValueLabel
label {Separator 2}
xywh {580 135 185 5} box BORDER_BOX labeltype NO_LABEL
class HLine
}
Fl_Box {} {
label Other
xywh {555 115 40 25} labelsize 12 align 20
class Label
}
Fl_Box {} {
label Tuning
xywh {555 230 225 25} labelsize 12 align 20
class Label
}
Fl_Box {} {
label {Separator 2}
xywh {290 135 225 5} box BORDER_BOX labeltype NO_LABEL
class HLine
}
Fl_Box {} {
label {Separator 2}
xywh {555 135 225 5} box BORDER_BOX labeltype NO_LABEL
class HLine
}
Fl_Box {} {
label {Separator 2}
xywh {555 250 225 5} box BORDER_BOX labeltype NO_LABEL
class HLine
}
Fl_Button tuningFrequencyDropdown_ {
comment {tag=kTagSetTuningFrequency}
xywh {755 310 25 25} labelsize 24
class ChevronValueDropDown
}
Fl_Text_Editor tuningFrequencyEdit_ {
comment {tag=kTagSetTuningFrequency}
xywh {695 310 60 25} labelsize 12
class TextEdit
}
Fl_Button settingsAboutButton_ {
label {About sfizz}
comment {tag=kTagAbout}
xywh {610 205 115 25} labelsize 12
class ValueButton
}
Fl_Box {} {
label {... when freewheeling}
xywh {290 220 145 25} labelsize 12 align 20
class Label
}
Fl_Spinner freewheelingOscillatorQualitySlider_ {
comment {tag=kTagSetFreewheelingOscillatorQuality}
xywh {435 220 80 25} labelsize 12 textsize 12
class ValueMenu
}
}
}
Expand Down
8 changes: 7 additions & 1 deletion plugins/editor/src/editor/EditIds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,15 @@ EditRange EditRange::get(EditId id)
case EditId::StretchTuning:
return { 0, 0, 1 };
case EditId::SampleQuality:
return { 1, 0, 10 };
return { 2, 0, 10 };
case EditId::OscillatorQuality:
return { 1, 0, 3 };
case EditId::FreewheelingSampleQuality:
return { 10, 0, 10 };
case EditId::FreewheelingOscillatorQuality:
return { 3, 0, 3 };
case EditId::SustainCancelsRelease:
return { 0, 0, 1 };
case EditId::UIActivePanel:
return { 0, 0, 255 };
}
Expand Down
3 changes: 3 additions & 0 deletions plugins/editor/src/editor/EditIds.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ enum class EditId : int {
StretchTuning,
SampleQuality,
OscillatorQuality,
FreewheelingSampleQuality,
FreewheelingOscillatorQuality,
SustainCancelsRelease,
CanEditUserFilesDir,
UserFilesDir,
FallbackFilesDir,
Expand Down
Loading