hiro/openAV-Luppp
1
0
Fork 0
mirror of https://github.com/vale981/openAV-Luppp synced 2025-03-05 17:11:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

-Updated window size and header image

Browse source
This commit is contained in:
Harry van Haaren 2013-07-25 17:20:54 +01:00
parent b9b3aab0a1
commit 0b64f78e0c
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gtrack.cxx
View file

@ -4,6 +4,8 @@
extern Gui* gui; extern Gui* gui;
extern void luppp_tooltip(std::string s);
void gtrack_button_callback(Fl_Widget *w, void *data) void gtrack_button_callback(Fl_Widget *w, void *data)
{ {
int track = 0; int track = 0;

15
src/gui.cxx
View file

@ -20,7 +20,7 @@ using namespace std;
extern Gui* gui; extern Gui* gui;
static void luppp_tooltip(std::string s) void luppp_tooltip(std::string s)
{ {
gui->setTooltip(s); gui->setTooltip(s);
} }
@ -34,7 +34,7 @@ void Gui::setTooltip( std::string s )
void close_cb(Fl_Widget*o, void*) { void close_cb(Fl_Widget*o, void*) {
if ((Fl::event() == FL_KEYDOWN || Fl::event() == FL_SHORTCUT) if ((Fl::event() == FL_KEYDOWN || Fl::event() == FL_SHORTCUT)
&& Fl::event_key() == FL_Escape) && Fl::event_key() == FL_Escape)
return; // ignore ESC return; // ignore ESC
else o->hide(); else o->hide();
} }
@ -46,20 +46,17 @@ static void gui_static_read_rb(void* inst)
} }
Gui::Gui() : Gui::Gui() :
window(1272,750) window(1110,750)
{ {
window.color(FL_BLACK); window.color(FL_BLACK);
window.label("Luppp 5"); window.label("Luppp");
//window.callback( close_cb, 0 ); //window.callback( close_cb, 0 );
Avtk::Image* headerImage = new Avtk::Image(0,0,1110,36,"header.png");
Avtk::Image* headerImage = new Avtk::Image(0,0,1272,36,"header.png");
headerImage->setPixbuf( header.pixel_data, 4 ); headerImage->setPixbuf( header.pixel_data, 4 );
//tooltipLabel = new Fl_Box(100, 20, 200, 20, "tooltips go here"); //tooltipLabel = new Fl_Box(100, 20, 200, 20, "tooltips go here");
//window.resizable( headerImage );
int i = 0; int i = 0;
for (; i < NTRACKS; i++ ) for (; i < NTRACKS; i++ )
{ {
@ -70,8 +67,6 @@ Gui::Gui() :
master = new GMasterTrack(8 + i * 118, 40, 150, 700, "Master"); master = new GMasterTrack(8 + i * 118, 40, 150, 700, "Master");
unit = new GUnitTrack(9 + i * 118 + 158, 40, 150, 700, "Units");
window.end(); window.end();
} }

1
src/gui.hxx
View file

@ -31,7 +31,6 @@ class Gui
Fl_Box* box; Fl_Box* box;
GMasterTrack* master; GMasterTrack* master;
GUnitTrack* unit;
vector<GTrack*> tracks; vector<GTrack*> tracks;