mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Timeline: Don't allow import attempt when no project is loaded.

pull/116/head
Jonathan Moore Liles 2013-04-30 22:44:16 -07:00
parent 875ef17575
commit 97677c561e
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
timeline/src/TLE.fl
View File

@ -261,7 +261,7 @@ Loggable::progress_callback( &TLE::progress_cb, this );} {}
label {Non Timeline} label {Non Timeline}
callback {if ( Fl::event_key() != FL_Escape ) callback {if ( Fl::event_key() != FL_Escape )
timeline->command_quit();} open timeline->command_quit();} open
xywh {200 266 1025 770} type Double resizable xywh {202 266 1025 770} type Double resizable
code0 {o->xclass( APP_NAME );} code0 {o->xclass( APP_NAME );}
class TLE_Window size_range {900 300 0 0} visible class TLE_Window size_range {900 300 0 0} visible
} { } {
@ -390,12 +390,19 @@ Project::compact();}
} { } {
MenuItem {} { MenuItem {} {
label {Import Ardour Session} label {Import Ardour Session}
callback {if ( timeline->ntracks() ) callback {if ( !Project::open() )
{
fl_alert( "You must create a new project before importing" );
return;
}
if ( timeline->ntracks() )
{ {
fl_alert( "You can only import into an empty session!" ); fl_alert( "You can only import into an empty session!" );
return; return;
} }
pid_t pid; pid_t pid;
if ( ! (pid = fork()) ) if ( ! (pid = fork()) )
{ {
@ -415,7 +422,7 @@ while ( 0 == waitpid( pid, &status, WNOHANG ) )
Project::open(path); Project::open(path);
free(path);} free(path);} selected
xywh {20 20 40 25} xywh {20 20 40 25}
} }
} }
@ -823,7 +830,7 @@ ab.run();}
} }
} }
Fl_Box {} { Fl_Box {} {
label {<Timeline>} selected label {<Timeline>}
xywh {0 75 1025 692} box FLAT_BOX color 47 labeltype NO_LABEL labelsize 100 resizable xywh {0 75 1025 692} box FLAT_BOX color 47 labeltype NO_LABEL labelsize 100 resizable
code0 {timeline = o;} code0 {timeline = o;}
class Timeline class Timeline