diff --git a/plugins/editor/layout/main.fl b/plugins/editor/layout/main.fl index 394d9334..08f9c9ae 100644 --- a/plugins/editor/layout/main.fl +++ b/plugins/editor/layout/main.fl @@ -11,7 +11,7 @@ widget_class mainView {open class Background } Fl_Group {} { - comment {palette=invertedPalette} open + comment {palette=invertedPalette} open selected xywh {0 0 800 110} class LogicalGroup } { @@ -41,27 +41,27 @@ widget_class mainView {open } } Fl_Group {} {open - xywh {185 5 395 100} box ROUNDED_BOX + xywh {185 5 418 100} box ROUNDED_BOX class RoundedGroup } { Fl_Box {} { label {Separator 1} - xywh {195 41 375 5} box BORDER_BOX labeltype NO_LABEL + xywh {195 41 395 5} box BORDER_BOX labeltype NO_LABEL class HLine } Fl_Box {} { label {Separator 2} - xywh {195 73 375 5} box BORDER_BOX labeltype NO_LABEL + xywh {195 73 395 5} box BORDER_BOX labeltype NO_LABEL class HLine } Fl_Box sfzFileLabel_ { label {DefaultInstrument.sfz} comment {tag=kTagLoadSfzFile} - xywh {195 13 295 30} labelsize 20 align 20 + xywh {195 13 320 30} labelsize 20 align 20 class ClickableLabel } Fl_Box keyswitchLabel_ { - xywh {265 45 305 30} labelsize 20 align 20 + xywh {265 45 325 35} labelsize 20 align 20 class Label } Fl_Box keyswitchBadge_ { @@ -80,17 +80,17 @@ widget_class mainView {open } Fl_Button {} { comment {tag=kTagPreviousSfzFile} - xywh {495 18 25 25} labelsize 24 + xywh {515 18 25 25} labelsize 24 class PreviousFileButton } Fl_Button {} { comment {tag=kTagNextSfzFile} - xywh {520 18 25 25} labelsize 24 + xywh {540 18 25 25} labelsize 24 class NextFileButton } Fl_Button fileOperationsMenu_ { comment {tag=kTagFileOperations} - xywh {545 18 25 25} labelsize 24 + xywh {565 18 25 25} labelsize 24 class ChevronDropDown } Fl_Box infoVoicesLabel_ { @@ -99,30 +99,30 @@ widget_class mainView {open } Fl_Box {} { label {Max:} - xywh {325 78 40 25} labelsize 12 align 24 + xywh {332 78 40 25} labelsize 12 align 24 class Label } Fl_Box numVoicesLabel_ { - xywh {370 78 35 25} labelsize 12 align 16 + xywh {378 78 35 25} labelsize 12 align 16 class Label } Fl_Box {} { - label {Memory:} selected - xywh {440 78 60 25} labelsize 12 align 24 + label {Memory:} + xywh {459 78 60 25} labelsize 12 align 24 class Label } - Fl_Box memoryLabel_ {selected - xywh {505 78 60 25} labelsize 12 align 16 + Fl_Box memoryLabel_ { + xywh {525 78 60 25} labelsize 12 align 16 class Label } Fl_Button numVoicesSlider_ { comment {tag=kTagSetNumVoices} - xywh {405 82 20 20} labelsize 16 + xywh {420 82 20 20} labelsize 16 class ChevronValueDropDown } } Fl_Group {} {open - xywh {585 5 210 100} box ROUNDED_BOX + xywh {608 5 187 100} box ROUNDED_BOX class RoundedGroup } { Fl_Dial {} { @@ -137,21 +137,21 @@ widget_class mainView {open Fl_Box volumeCCKnob_ { label Volume comment {tag=kTagSetCCVolume} - xywh {595 10 70 90} box BORDER_BOX labelsize 12 align 17 + xywh {614 10 70 90} box BORDER_BOX labelsize 12 align 17 class KnobCCBox } Fl_Box panCCKnob_ { label Pan comment {tag=kTagSetCCPan} - xywh {670 10 70 90} box BORDER_BOX labelsize 12 align 17 + xywh {691 10 70 90} box BORDER_BOX labelsize 12 align 17 class KnobCCBox } Fl_Box leftMeter_ { - xywh {750 15 15 85} box BORDER_BOX + xywh {767 10 9 90} box BORDER_BOX class VMeter } Fl_Box rightMeter_ { - xywh {770 15 15 85} box BORDER_BOX + xywh {779 10 9 90} box BORDER_BOX class VMeter } } diff --git a/plugins/editor/src/editor/layout/main.hpp b/plugins/editor/src/editor/layout/main.hpp index 6e296644..5e6b208e 100644 --- a/plugins/editor/src/editor/layout/main.hpp +++ b/plugins/editor/src/editor/layout/main.hpp @@ -20,16 +20,16 @@ view__3->addView(view__6); auto* const view__7 = createSettingsButton(CRect(111, 69, 143, 101), kTagFirstChangePanel+kPanelSettings, "", kCenterText, 30); panelButtons_[kPanelSettings] = view__7; view__3->addView(view__7); -auto* const view__8 = createRoundedGroup(CRect(185, 5, 580, 105), -1, "", kCenterText, 14); +auto* const view__8 = createRoundedGroup(CRect(185, 5, 603, 105), -1, "", kCenterText, 14); view__2->addView(view__8); -auto* const view__9 = createHLine(CRect(10, 36, 385, 41), -1, "", kCenterText, 14); +auto* const view__9 = createHLine(CRect(10, 36, 405, 41), -1, "", kCenterText, 14); view__8->addView(view__9); -auto* const view__10 = createHLine(CRect(10, 68, 385, 73), -1, "", kCenterText, 14); +auto* const view__10 = createHLine(CRect(10, 68, 405, 73), -1, "", kCenterText, 14); view__8->addView(view__10); -auto* const view__11 = createClickableLabel(CRect(10, 8, 305, 38), kTagLoadSfzFile, "DefaultInstrument.sfz", kLeftText, 20); +auto* const view__11 = createClickableLabel(CRect(10, 8, 330, 38), kTagLoadSfzFile, "DefaultInstrument.sfz", kLeftText, 20); sfzFileLabel_ = view__11; view__8->addView(view__11); -auto* const view__12 = createLabel(CRect(80, 40, 385, 70), -1, "", kLeftText, 20); +auto* const view__12 = createLabel(CRect(80, 40, 405, 75), -1, "", kLeftText, 20); keyswitchLabel_ = view__12; view__8->addView(view__12); auto* const view__13 = createBadge(CRect(10, 42, 70, 68), -1, "", kCenterText, 20); @@ -41,47 +41,47 @@ view__8->addView(view__14); view__14->setVisible(false); auto* const view__15 = createLabel(CRect(10, 73, 70, 98), -1, "Voices:", kRightText, 12); view__8->addView(view__15); -auto* const view__16 = createPreviousFileButton(CRect(310, 13, 335, 38), kTagPreviousSfzFile, "", kCenterText, 24); +auto* const view__16 = createPreviousFileButton(CRect(330, 13, 355, 38), kTagPreviousSfzFile, "", kCenterText, 24); view__8->addView(view__16); -auto* const view__17 = createNextFileButton(CRect(335, 13, 360, 38), kTagNextSfzFile, "", kCenterText, 24); +auto* const view__17 = createNextFileButton(CRect(355, 13, 380, 38), kTagNextSfzFile, "", kCenterText, 24); view__8->addView(view__17); -auto* const view__18 = createChevronDropDown(CRect(360, 13, 385, 38), kTagFileOperations, "", kCenterText, 24); +auto* const view__18 = createChevronDropDown(CRect(380, 13, 405, 38), kTagFileOperations, "", kCenterText, 24); fileOperationsMenu_ = view__18; view__8->addView(view__18); auto* const view__19 = createLabel(CRect(75, 73, 115, 98), -1, "", kCenterText, 12); infoVoicesLabel_ = view__19; view__8->addView(view__19); -auto* const view__20 = createLabel(CRect(140, 73, 180, 98), -1, "Max:", kRightText, 12); +auto* const view__20 = createLabel(CRect(147, 73, 187, 98), -1, "Max:", kRightText, 12); view__8->addView(view__20); -auto* const view__21 = createLabel(CRect(185, 73, 220, 98), -1, "", kCenterText, 12); +auto* const view__21 = createLabel(CRect(193, 73, 228, 98), -1, "", kCenterText, 12); numVoicesLabel_ = view__21; view__8->addView(view__21); -auto* const view__22 = createLabel(CRect(255, 73, 315, 98), -1, "Memory:", kRightText, 12); +auto* const view__22 = createLabel(CRect(274, 73, 334, 98), -1, "Memory:", kRightText, 12); view__8->addView(view__22); -auto* const view__23 = createLabel(CRect(320, 73, 380, 98), -1, "", kCenterText, 12); +auto* const view__23 = createLabel(CRect(340, 73, 400, 98), -1, "", kCenterText, 12); memoryLabel_ = view__23; view__8->addView(view__23); -auto* const view__24 = createChevronValueDropDown(CRect(220, 77, 240, 97), kTagSetNumVoices, "", kCenterText, 16); +auto* const view__24 = createChevronValueDropDown(CRect(235, 77, 255, 97), kTagSetNumVoices, "", kCenterText, 16); numVoicesSlider_ = view__24; view__8->addView(view__24); -auto* const view__25 = createRoundedGroup(CRect(585, 5, 795, 105), -1, "", kCenterText, 14); +auto* const view__25 = createRoundedGroup(CRect(608, 5, 795, 105), -1, "", kCenterText, 14); view__2->addView(view__25); -auto* const view__26 = createKnob48(CRect(30, 15, 78, 63), -1, "", kCenterText, 14); +auto* const view__26 = createKnob48(CRect(7, 15, 55, 63), -1, "", kCenterText, 14); view__25->addView(view__26); view__26->setVisible(false); -auto* const view__27 = createValueLabel(CRect(25, 65, 85, 70), -1, "Center", kCenterText, 12); +auto* const view__27 = createValueLabel(CRect(2, 65, 62, 70), -1, "Center", kCenterText, 12); view__25->addView(view__27); view__27->setVisible(false); -auto* const view__28 = createKnobCCBox(CRect(10, 5, 80, 95), kTagSetCCVolume, "Volume", kCenterText, 12); +auto* const view__28 = createKnobCCBox(CRect(6, 5, 76, 95), kTagSetCCVolume, "Volume", kCenterText, 12); volumeCCKnob_ = view__28; view__25->addView(view__28); -auto* const view__29 = createKnobCCBox(CRect(85, 5, 155, 95), kTagSetCCPan, "Pan", kCenterText, 12); +auto* const view__29 = createKnobCCBox(CRect(83, 5, 153, 95), kTagSetCCPan, "Pan", kCenterText, 12); panCCKnob_ = view__29; view__25->addView(view__29); -auto* const view__30 = createVMeter(CRect(165, 10, 180, 95), -1, "", kCenterText, 14); +auto* const view__30 = createVMeter(CRect(159, 5, 168, 95), -1, "", kCenterText, 14); leftMeter_ = view__30; view__25->addView(view__30); -auto* const view__31 = createVMeter(CRect(185, 10, 200, 95), -1, "", kCenterText, 14); +auto* const view__31 = createVMeter(CRect(171, 5, 180, 95), -1, "", kCenterText, 14); rightMeter_ = view__31; view__25->addView(view__31); enterPalette(defaultPalette);