LADI
/
epichord
1
Fork 0
Code

Added conf icon.

This commit is contained in:
EvanR 2009-01-05 20:58:44 -06:00
parent b37057e2cf
commit c7789bd567
7 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUGS
View File

@ -2,7 +2,7 @@ occasional bug on switching layers - check sequencer/backend details
pop up window toggles need to be reset if window closes - simple fix
import midi doesnt handle misfit events - see 'extratracks' in loadsmf
scroll bar size does not indicate scroll range
zoom needs to be adjusted
end of frame sequencing bug - unknown cause
out of order dispatch bug - sequencer needs to sort dispatched events

2
gfx/Makefile.am
View File

@ -1,2 +1,2 @@
gfxdir = $(datarootdir)/@PACKAGE@/gfx
gfx_DATA = README hand.gif loop.gif color.gif conf.gif file.gif help.gif q4.gif q8.gif q16.gif q32.gif q64.gif q128.gif q0.gif
gfx_DATA = README hand.gif loop.gif color.gif conf.gif scope.gif file.gif help.gif q4.gif q8.gif q16.gif q32.gif q64.gif q128.gif q0.gif

BIN
gfx/conf.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 299 B

After

Width:  |  Height:  |  Size: 122 B

BIN
gfx/scope.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 192 B

15
src/ui.cpp
View File

@ -225,7 +225,7 @@ 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_config_button_i(fltk::Button* o, void*) {
inline void UI::cb_conf_toggle_i(fltk::Button* o, void*) {
if(o->state()){
ui->config_window->show();
}
@ -233,8 +233,8 @@ inline void UI::cb_config_button_i(fltk::Button* o, void*) {
ui->config_window->hide();
}
;}
void UI::cb_config_button(fltk::Button* o, void* v) {
((UI*)(o->parent()->parent()->user_data()))->cb_config_button_i(o,v);
void UI::cb_conf_toggle(fltk::Button* o, void* v) {
((UI*)(o->parent()->parent()->user_data()))->cb_conf_toggle_i(o,v);
}
inline void UI::cb_scope_button_i(fltk::Button* o, void*) {
@ -729,8 +729,8 @@ UI::UI() {
o->tooltip("toggle looping");
o->type(fltk::Button::TOGGLE);
}
{fltk::Button* o = config_button = new fltk::Button(520, 5, 25, 25, "conf");
o->callback((fltk::Callback*)cb_config_button);
{fltk::Button* o = conf_toggle = new fltk::Button(520, 5, 25, 25);
o->callback((fltk::Callback*)cb_conf_toggle);
o->tooltip("configuration");
o->type(fltk::Button::TOGGLE);
}
@ -1132,11 +1132,12 @@ track.");
o->resizable(o);
}
loop_toggle->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/loop.gif"));
color_toggle->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/color.gif"));
scope_button->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/conf.gif"));
conf_toggle->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/conf.gif"));
scope_button->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/scope.gif"));
file_button->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/file.gif"));
help_button->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/help.gif"));
color_toggle->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/color.gif"));
qbutton4->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/q4.gif"));
qbutton8->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/q8.gif"));
qbutton16->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/q16.gif"));

14
src/ui.fl
View File

@ -153,7 +153,7 @@ ui->piano_roll->scrollTo(dummy,target);}
xywh {580 0 15 340}
}
{fltk::ThumbWheel} pattern_hscroll {
callback {ui->piano_roll->scrollTo((int)o->value(),ui->piano_roll->scrolly);} selected
callback {ui->piano_roll->scrollTo((int)o->value(),ui->piano_roll->scrolly);}
xywh {0 340 580 15} step 10
}
}
@ -251,7 +251,7 @@ ui->event_edit->redraw();}
}
}
}
{fltk::Group} {} {
{fltk::Group} {} {open
xywh {0 445 640 35} box UP_BOX
} {
{fltk::Button} play_button {
@ -365,14 +365,13 @@ o->state(1);}
xywh {490 5 25 25}
extra_code {o->type(fltk::Button::TOGGLE);}
}
{fltk::Button} config_button {
label conf
{fltk::Button} conf_toggle {
callback {if(o->state()){
ui->config_window->show();
}
else{
ui->config_window->hide();
}}
}} selected
tooltip configuration
xywh {520 5 25 25}
extra_code {o->type(fltk::Button::TOGGLE);}
@ -921,11 +920,12 @@ else{
}
}
code {loop_toggle->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/loop.gif"));
color_toggle->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/color.gif"));
scope_button->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/conf.gif"));
conf_toggle->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/conf.gif"));
scope_button->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/scope.gif"));
file_button->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/file.gif"));
help_button->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/help.gif"));
color_toggle->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/color.gif"));
qbutton4->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/q4.gif"));
qbutton8->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/q8.gif"));
qbutton16->image(fltk::SharedImage::get(ROOT_DATA_DIR"gfx/q16.gif"));

6
src/ui.h
View File

@ -169,10 +169,10 @@ private:
inline void cb_loop_toggle_i(fltk::Button*, void*);
static void cb_loop_toggle(fltk::Button*, void*);
public:
fltk::Button *config_button;
fltk::Button *conf_toggle;
private:
inline void cb_config_button_i(fltk::Button*, void*);
static void cb_config_button(fltk::Button*, void*);
inline void cb_conf_toggle_i(fltk::Button*, void*);
static void cb_conf_toggle(fltk::Button*, void*);
public:
fltk::Button *scope_button;
private: