From d178723f1e54f0d3d8c920335d9755b589cd97c3 Mon Sep 17 00:00:00 2001 From: EvanR Date: Tue, 6 Jan 2009 19:21:42 -0600 Subject: [PATCH] Rearranged the GUI. --- src/ui.cpp | 76 ++++++++++++++++++++++++++-------------------------- src/ui.fl | 90 +++++++++++++++++++++++++++++++------------------------------- src/ui.h | 24 ++++++++--------- 3 files changed, 95 insertions(+), 95 deletions(-) diff --git a/src/ui.cpp b/src/ui.cpp index e174357..f39145d 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -159,6 +159,20 @@ void UI::cb_record_button(fltk::Button* o, void* v) { ((UI*)(o->parent()->parent()->user_data()))->cb_record_button_i(o,v); } +inline void UI::cb_loop_toggle_i(fltk::Button*, void*) { + toggle_loop(); +} +void UI::cb_loop_toggle(fltk::Button* o, void* v) { + ((UI*)(o->parent()->parent()->user_data()))->cb_loop_toggle_i(o,v); +} + +inline void UI::cb_tool_button_i(fltk::Button*, void*) { + toggle_tool(); +} +void UI::cb_tool_button(fltk::Button* o, void* v) { + ((UI*)(o->parent()->parent()->parent()->user_data()))->cb_tool_button_i(o,v); +} + inline void UI::cb_qbutton4_i(fltk::Button*, void*) { set_quant(4); } @@ -208,13 +222,6 @@ void UI::cb_qbutton0(fltk::Button* o, void* v) { ((UI*)(o->parent()->parent()->parent()->user_data()))->cb_qbutton0_i(o,v); } -inline void UI::cb_tool_button_i(fltk::Button*, void*) { - toggle_tool(); -} -void UI::cb_tool_button(fltk::Button* o, void* v) { - ((UI*)(o->parent()->parent()->parent()->user_data()))->cb_tool_button_i(o,v); -} - inline void UI::cb_edit_button_i(fltk::Button*, void*) { set_songtool(0); } @@ -250,13 +257,6 @@ void UI::cb_join_button(fltk::Button* o, void* v) { ((UI*)(o->parent()->parent()->parent()->user_data()))->cb_join_button_i(o,v); } -inline void UI::cb_loop_toggle_i(fltk::Button*, void*) { - toggle_loop(); -} -void UI::cb_loop_toggle(fltk::Button* o, void* v) { - ((UI*)(o->parent()->parent()->user_data()))->cb_loop_toggle_i(o,v); -} - inline void UI::cb_conf_button_i(fltk::Button* o, void*) { if(o->state()){ ui->config_window->show(); @@ -701,6 +701,7 @@ UI::UI() { o->end(); } o->end(); + fltk::Group::current()->resizable(o); } {fltk::Group* o = new fltk::Group(0, 445, 640, 35); o->box(fltk::UP_BOX); @@ -722,13 +723,27 @@ UI::UI() { o->color((fltk::Color)56); o->labelcolor((fltk::Color)0xffffff00); } - {fltk::Group* o = new fltk::Group(125, 0, 20, 35); + {fltk::Button* o = loop_toggle = new fltk::Button(125, 5, 25, 25); + o->callback((fltk::Callback*)cb_loop_toggle); + o->tooltip("toggle looping"); + o->type(fltk::Button::TOGGLE); + } + {fltk::Group* o = new fltk::Group(155, 0, 20, 35); o->set_vertical(); fltk::Group::current()->resizable(o); } - {fltk::Group* o = pattern_buttons = new fltk::Group(145, 5, 310, 25); + {fltk::Group* o = pattern_buttons = new fltk::Group(200, 5, 310, 25); o->hide(); o->begin(); + {fltk::Button* o = quant1_button = new fltk::Button(35, 0, 25, 25, "qua"); + o->tooltip("quantize selected notes"); + } + {fltk::Button* o = quant0_button = new fltk::Button(60, 0, 25, 25, "qu_"); + o->tooltip("quantize length of selected notes"); + } + {fltk::Button* o = tool_button = new fltk::Button(85, 0, 25, 25, "tool"); + o->callback((fltk::Callback*)cb_tool_button); + } {fltk::Button* o = qbutton4 = new fltk::Button(135, 0, 25, 25); o->callback((fltk::Callback*)cb_qbutton4); o->type(fltk::Button::TOGGLE); @@ -758,18 +773,9 @@ UI::UI() { o->callback((fltk::Callback*)cb_qbutton0); o->type(fltk::Button::TOGGLE); } - {fltk::Button* o = quant1_button = new fltk::Button(15, 0, 25, 25, "qua"); - o->tooltip("quantize selected notes"); - } - {fltk::Button* o = quant0_button = new fltk::Button(45, 0, 25, 25, "qu_"); - o->tooltip("quantize length of selected notes"); - } - {fltk::Button* o = tool_button = new fltk::Button(75, 0, 25, 25, "tool"); - o->callback((fltk::Callback*)cb_tool_button); - } o->end(); } - {fltk::Group* o = song_buttons = new fltk::Group(330, 5, 145, 25); + {fltk::Group* o = song_buttons = new fltk::Group(385, 5, 145, 25); o->begin(); {fltk::Button* o = edit_button = new fltk::Button(0, 0, 25, 25); o->set_flag(fltk::STATE); @@ -798,22 +804,17 @@ UI::UI() { } o->end(); } - {fltk::Button* o = loop_toggle = new fltk::Button(490, 5, 25, 25); - o->callback((fltk::Callback*)cb_loop_toggle); - o->tooltip("toggle looping"); - o->type(fltk::Button::TOGGLE); - } - {fltk::Button* o = conf_button = new fltk::Button(520, 5, 25, 25); + {fltk::Button* o = conf_button = new fltk::Button(535, 5, 25, 25); o->callback((fltk::Callback*)cb_conf_button); o->tooltip("configuration"); o->type(fltk::Button::TOGGLE); } - {fltk::Button* o = scope_button = new fltk::Button(550, 5, 25, 25); + {fltk::Button* o = scope_button = new fltk::Button(560, 5, 25, 25); o->callback((fltk::Callback*)cb_scope_button); o->tooltip("scope"); o->type(fltk::Button::TOGGLE); } - {fltk::Button* o = file_button = new fltk::Button(580, 5, 25, 25); + {fltk::Button* o = file_button = new fltk::Button(585, 5, 25, 25); o->callback((fltk::Callback*)cb_file_button); o->tooltip("disk"); o->type(fltk::Button::TOGGLE); @@ -830,9 +831,8 @@ UI::UI() { o->size_range(640,455); o->resize(640,455); - o->resizable(o); } - {fltk::Window* o = config_window = new fltk::Window(320, 285, "controls"); + {fltk::Window* o = config_window = new fltk::Window(320, 285, "config"); o->shortcut(0xff1b); o->callback((fltk::Callback*)cb_config_window, (void*)(this)); o->begin(); @@ -1192,9 +1192,10 @@ track."); o->textfont(fltk::COURIER); o->color((fltk::Color)0x280000); o->textcolor((fltk::Color)0xff0000); + fltk::Group::current()->resizable(o); o->wrap_mode(1); } - {fltk::Group* o = new fltk::Group(5, 255, 410, 20); + {fltk::Group* o = new fltk::Group(5, 255, 415, 20); o->begin(); {fltk::Button* o = new fltk::Button(0, 0, 40, 20, "on"); o->callback((fltk::Callback*)cb_on); @@ -1206,7 +1207,6 @@ track."); o->end(); } o->end(); - o->resizable(o); } loop_toggle->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/loop.gif")); conf_button->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/conf.gif")); diff --git a/src/ui.fl b/src/ui.fl index 0d6ee42..aa35074 100644 --- a/src/ui.fl +++ b/src/ui.fl @@ -61,7 +61,7 @@ action_window->hide(); scope_window->hide(); o->hide(); -save_config();} +save_config();} open xywh {31 41 640 480} resizable extra_code {\#include @@ -73,12 +73,12 @@ o->size_range(640,455); o->resize(640,455);} visible } { {fltk::Group} {} { - xywh {0 0 640 445} + xywh {0 0 640 445} resizable } { - {fltk::Group} song_edit { + {fltk::Group} song_edit {open xywh {0 0 640 445} } { - {fltk::Group} {} { + {fltk::Group} {} {open xywh {0 0 255 445} box FLAT_BOX } { {fltk::Widget} track_info { @@ -104,7 +104,7 @@ o->label_scale=4;} class Timeline } } - {fltk::Group} song_scrollgroup {open + {fltk::Group} song_scrollgroup { xywh {255 15 385 430} resizable } { {fltk::Widget} arranger { @@ -257,7 +257,7 @@ ui->event_edit->redraw();} } } } - {fltk::Group} {} { + {fltk::Group} {} {open xywh {0 445 640 35} box UP_BOX } { {fltk::Button} play_button { @@ -282,12 +282,33 @@ ui->event_edit->redraw();} extra_code {\#include } class Metronome } + {fltk::Button} loop_toggle { + callback {toggle_loop();} + tooltip {toggle looping} + xywh {125 5 25 25} + extra_code {o->type(fltk::Button::TOGGLE);} + } {fltk::Group} {} {open - xywh {125 0 20 35} resizable + xywh {155 0 20 35} resizable } {} {fltk::Group} pattern_buttons { - xywh {145 5 310 25} hide + xywh {200 5 310 25} hide } { + {fltk::Button} quant1_button { + label qua + tooltip {quantize selected notes} + xywh {35 0 25 25} + } + {fltk::Button} quant0_button { + label qu_ + tooltip {quantize length of selected notes} + xywh {60 0 25 25} + } + {fltk::Button} tool_button { + label tool + callback {toggle_tool();} + xywh {85 0 25 25} + } {fltk::Button} qbutton4 { callback {set_quant(4);} xywh {135 0 25 25} @@ -324,24 +345,9 @@ o->state(1);} xywh {285 0 25 25} extra_code {o->type(fltk::Button::TOGGLE);} } - {fltk::Button} quant1_button { - label qua - tooltip {quantize selected notes} - xywh {15 0 25 25} - } - {fltk::Button} quant0_button { - label qu_ - tooltip {quantize length of selected notes} - xywh {45 0 25 25} - } - {fltk::Button} tool_button { - label tool - callback {toggle_tool();} - xywh {75 0 25 25} - } } {fltk::Group} song_buttons {open - xywh {330 5 145 25} + xywh {385 5 145 25} } { {fltk::Button} edit_button { callback {set_songtool(0);} @@ -373,12 +379,6 @@ o->state(1);} extra_code {o->type(fltk::Button::TOGGLE);} } } - {fltk::Button} loop_toggle { - callback {toggle_loop();} - tooltip {toggle looping} - xywh {490 5 25 25} - extra_code {o->type(fltk::Button::TOGGLE);} - } {fltk::Button} conf_button { callback {if(o->state()){ ui->config_window->show(); @@ -387,7 +387,7 @@ else{ ui->config_window->hide(); }} tooltip configuration - xywh {520 5 25 25} + xywh {535 5 25 25} extra_code {o->type(fltk::Button::TOGGLE);} } {fltk::Button} scope_button { @@ -398,7 +398,7 @@ else{ ui->scope_window->hide(); }} tooltip scope - xywh {550 5 25 25} + xywh {560 5 25 25} extra_code {o->type(fltk::Button::TOGGLE);} } {fltk::Button} file_button { @@ -409,7 +409,7 @@ else{ ui->action_window->hide(); }} tooltip disk - xywh {580 5 25 25} + xywh {585 5 25 25} extra_code {\#include "saveload.h" o->type(fltk::Button::TOGGLE);} } @@ -427,10 +427,10 @@ else{ } } {fltk::Window} config_window { - label controls + label config callback {ui->conf_button->state(0); -o->hide();} - xywh {52 125 320 285} visible +o->hide();} open selected + xywh {52 125 320 285} hide } { {fltk::TabGroup} {} {open xywh {0 0 320 285} @@ -806,10 +806,10 @@ set_defaultvelocity((int)o->value());} label help callback {ui->help_button->state(0); o->hide();} - xywh {519 345 580 370} resizable - extra_code {o->size_range(580,370);} visible + xywh {519 345 580 370} hide resizable + extra_code {o->size_range(580,370);} } { - {fltk::TabGroup} {} {open selected + {fltk::TabGroup} {} {open xywh {0 0 580 370} } { {fltk::Group} {} { @@ -870,7 +870,7 @@ o->hide();} label menu callback {ui->file_button->state(0); o->hide();} - xywh {286 302 100 130} horizontal visible + xywh {286 302 100 130} horizontal hide } { {fltk::Button} {} { label new @@ -915,15 +915,15 @@ savesmf(fltk::file_chooser("export file",NULL,get_last_dir()));} {fltk::Window} scope_window { label scope callback {ui->scope_button->state(0); -o->hide();} open - xywh {647 310 425 280} resizable visible +o->hide();} + xywh {647 310 425 280} hide resizable } { {fltk::TextDisplay} scope { - xywh {5 5 415 245} textfont 4 color 0x280000 textcolor 0xff0000 + xywh {5 5 415 245} resizable textfont 4 color 0x280000 textcolor 0xff0000 extra_code {o->wrap_mode(1);} } - {fltk::Group} {} { - xywh {5 255 410 20} + {fltk::Group} {} {open + xywh {5 255 415 20} } { {fltk::Button} {} { label on diff --git a/src/ui.h b/src/ui.h index 9612daa..1ea6554 100644 --- a/src/ui.h +++ b/src/ui.h @@ -112,7 +112,19 @@ private: static void cb_record_button(fltk::Button*, void*); public: Metronome *metronome; + fltk::Button *loop_toggle; +private: + inline void cb_loop_toggle_i(fltk::Button*, void*); + static void cb_loop_toggle(fltk::Button*, void*); +public: fltk::Group *pattern_buttons; + fltk::Button *quant1_button; + fltk::Button *quant0_button; + fltk::Button *tool_button; +private: + inline void cb_tool_button_i(fltk::Button*, void*); + static void cb_tool_button(fltk::Button*, void*); +public: fltk::Button *qbutton4; private: inline void cb_qbutton4_i(fltk::Button*, void*); @@ -148,13 +160,6 @@ private: inline void cb_qbutton0_i(fltk::Button*, void*); static void cb_qbutton0(fltk::Button*, void*); public: - fltk::Button *quant1_button; - fltk::Button *quant0_button; - fltk::Button *tool_button; -private: - inline void cb_tool_button_i(fltk::Button*, void*); - static void cb_tool_button(fltk::Button*, void*); -public: fltk::Group *song_buttons; fltk::Button *edit_button; private: @@ -181,11 +186,6 @@ private: inline void cb_join_button_i(fltk::Button*, void*); static void cb_join_button(fltk::Button*, void*); public: - fltk::Button *loop_toggle; -private: - inline void cb_loop_toggle_i(fltk::Button*, void*); - static void cb_loop_toggle(fltk::Button*, void*); -public: fltk::Button *conf_button; private: inline void cb_conf_button_i(fltk::Button*, void*); -- 2.11.4.GIT