diff --git a/editor/layout/main.fl b/editor/layout/main.fl index fe3824c2..ec6217c9 100644 --- a/editor/layout/main.fl +++ b/editor/layout/main.fl @@ -69,6 +69,16 @@ widget_class mainView {open xywh {195 76 60 25} labelsize 12 align 24 class Label } + Fl_Button {} { + comment {tag=kTagPreviousSfzFile} selected + xywh {455 14 25 25} labelsize 24 + class PreviousFileButton + } + Fl_Button {} { + comment {tag=kTagNextSfzFile} + xywh {480 14 25 25} labelsize 24 + class NextFileButton + } Fl_Button {} { comment {tag=kTagLoadSfzFile} xywh {505 14 25 25} labelsize 24 @@ -101,16 +111,6 @@ widget_class mainView {open xywh {500 76 50 25} labelsize 12 align 16 class Label } - Fl_Button {} { - comment {tag=kTagNextSfzFile} - xywh {480 14 25 25} labelsize 24 - class NextFileButton - } - Fl_Button {} { - comment {tag=kTagPreviousSfzFile} - xywh {455 14 25 25} labelsize 24 - class PreviousFileButton - } } Fl_Group {} {open xywh {570 5 225 100} box ROUNDED_BOX @@ -216,7 +216,7 @@ widget_class mainView {open } } } - Fl_Group {subPanels_[kPanelSettings]} {selected + Fl_Group {subPanels_[kPanelSettings]} { xywh {5 109 790 286} class LogicalGroup } { diff --git a/editor/src/editor/layout/main.hpp b/editor/src/editor/layout/main.hpp index f7121624..0a39b4a0 100644 --- a/editor/src/editor/layout/main.hpp +++ b/editor/src/editor/layout/main.hpp @@ -29,26 +29,26 @@ Label* const view__12 = createLabel(CRect(10, 39, 260, 69), -1, "Key switch:", k view__8->addView(view__12); Label* const view__13 = createLabel(CRect(10, 71, 70, 96), -1, "Voices:", kRightText, 12); view__8->addView(view__13); -LoadFileButton* const view__14 = createLoadFileButton(CRect(320, 9, 345, 34), kTagLoadSfzFile, "", kCenterText, 24); +PreviousFileButton* const view__14 = createPreviousFileButton(CRect(270, 9, 295, 34), kTagPreviousSfzFile, "", kCenterText, 24); view__8->addView(view__14); -EditFileButton* const view__15 = createEditFileButton(CRect(345, 9, 370, 34), kTagEditSfzFile, "", kCenterText, 24); +NextFileButton* const view__15 = createNextFileButton(CRect(295, 9, 320, 34), kTagNextSfzFile, "", kCenterText, 24); view__8->addView(view__15); -Label* const view__16 = createLabel(CRect(75, 71, 125, 96), -1, "", kCenterText, 12); -infoVoicesLabel_ = view__16; +LoadFileButton* const view__16 = createLoadFileButton(CRect(320, 9, 345, 34), kTagLoadSfzFile, "", kCenterText, 24); view__8->addView(view__16); -Label* const view__17 = createLabel(CRect(130, 71, 190, 96), -1, "Max:", kRightText, 12); +EditFileButton* const view__17 = createEditFileButton(CRect(345, 9, 370, 34), kTagEditSfzFile, "", kCenterText, 24); view__8->addView(view__17); -Label* const view__18 = createLabel(CRect(195, 71, 245, 96), -1, "", kCenterText, 12); -numVoicesLabel_ = view__18; +Label* const view__18 = createLabel(CRect(75, 71, 125, 96), -1, "", kCenterText, 12); +infoVoicesLabel_ = view__18; view__8->addView(view__18); -Label* const view__19 = createLabel(CRect(250, 71, 310, 96), -1, "Memory:", kRightText, 12); +Label* const view__19 = createLabel(CRect(130, 71, 190, 96), -1, "Max:", kRightText, 12); view__8->addView(view__19); -Label* const view__20 = createLabel(CRect(315, 71, 365, 96), -1, "", kCenterText, 12); -memoryLabel_ = view__20; +Label* const view__20 = createLabel(CRect(195, 71, 245, 96), -1, "", kCenterText, 12); +numVoicesLabel_ = view__20; view__8->addView(view__20); -NextFileButton* const view__21 = createNextFileButton(CRect(295, 9, 320, 34), kTagNextSfzFile, "", kCenterText, 24); +Label* const view__21 = createLabel(CRect(250, 71, 310, 96), -1, "Memory:", kRightText, 12); view__8->addView(view__21); -PreviousFileButton* const view__22 = createPreviousFileButton(CRect(270, 9, 295, 34), kTagPreviousSfzFile, "", kCenterText, 24); +Label* const view__22 = createLabel(CRect(315, 71, 365, 96), -1, "", kCenterText, 12); +memoryLabel_ = view__22; view__8->addView(view__22); RoundedGroup* const view__23 = createRoundedGroup(CRect(570, 5, 795, 105), -1, "", kCenterText, 14); view__2->addView(view__23);