From: <jer...@us...> - 2008-06-12 15:43:46
|
Revision: 6549 http://playerstage.svn.sourceforge.net/playerstage/?rev=6549&view=rev Author: jeremy_asher Date: 2008-06-12 15:43:55 -0700 (Thu, 12 Jun 2008) Log Message: ----------- Won't ask to save when nothing is loaded Modified Paths: -------------- code/stage/trunk/libstage/worldgui.cc Modified: code/stage/trunk/libstage/worldgui.cc =================================================================== --- code/stage/trunk/libstage/worldgui.cc 2008-06-12 22:27:04 UTC (rev 6548) +++ code/stage/trunk/libstage/worldgui.cc 2008-06-12 22:43:55 UTC (rev 6549) @@ -259,9 +259,6 @@ void StgWorldGui::UnLoad() { - //canvas->UnLoad(); -// delete canvas; -// canvas = new StgCanvas( this,0,30,640,480 ); StgWorld::UnLoad(); // canvas->camera.setPose( 0, 0 ); } @@ -356,26 +353,35 @@ bool StgWorldGui::CloseWindowQuery() { int choice; - choice = fl_choice("Do you want to save?", - "&Cancel", // ->0: defaults to ESC - "&Yes", // ->1 - "&No" // ->2 - ); - - switch (choice) { - case 1: // Yes - bool saved = SaveAsDialog(); - if ( saved ) { - return 1; - } - else { - return 0; - } - case 2: // No - return 1; + + if ( wf ) { + // worldfile loaded, ask to save + choice = fl_choice("Do you want to save?", + "&Cancel", // ->0: defaults to ESC + "&Yes", // ->1 + "&No" // ->2 + ); + + switch (choice) { + case 1: // Yes + bool saved = SaveAsDialog(); + if ( saved ) { + return true; + } + else { + return false; + } + case 2: // No + return true; + } + + // Cancel + return false; } - - return 0; + else { + // nothing is loaded, just quit + return true; + } } void StgWorldGui::WindowCallback( Fl_Widget* wid, StgWorldGui* world ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jer...@us...> - 2008-06-12 16:05:44
|
Revision: 6550 http://playerstage.svn.sourceforge.net/playerstage/?rev=6550&view=rev Author: jeremy_asher Date: 2008-06-12 16:05:53 -0700 (Thu, 12 Jun 2008) Log Message: ----------- Fixed FLTK warning when closing about dialog Modified Paths: -------------- code/stage/trunk/libstage/worldgui.cc Modified: code/stage/trunk/libstage/worldgui.cc =================================================================== --- code/stage/trunk/libstage/worldgui.cc 2008-06-12 22:43:55 UTC (rev 6549) +++ code/stage/trunk/libstage/worldgui.cc 2008-06-12 23:05:53 UTC (rev 6550) @@ -120,8 +120,10 @@ static const char* MITEM_VIEW_TRAILS = "&View/&Trail"; static const char* MITEM_VIEW_PERSPECTIVE = "&View/Perspective camera"; - // hack - get this from somewhere sensible, like CMake's config file - const char* PACKAGE_STRING = "Stage-3.dev"; +// this should be set by CMake +#ifndef PACKAGE_STRING +#define PACKAGE_STRING "Stage-3.dev" +#endif @@ -447,10 +449,11 @@ Fl_PNG_Image png( fullpath.c_str() ); // load image into ram box.image(png); // attach image to box - Fl_Text_Display text( Spc, pngH+2*Spc, + Fl_Text_Display* textDisplay; + textDisplay = new Fl_Text_Display( Spc, pngH+2*Spc, Width-2*Spc, Height-pngH-ButtonH-4*Spc ); - text.box( FL_NO_BOX ); - text.color(win.color()); + textDisplay->box( FL_NO_BOX ); + textDisplay->color(win.color()); const char* AboutText = "\n" @@ -458,10 +461,10 @@ "http://playerstage.sourceforge.net\n" "Copyright 2000-2008 Richard Vaughan and contributors"; - Fl_Text_Buffer tBuffer; - tBuffer.append( PACKAGE_STRING ); - tBuffer.append( AboutText ); - text.buffer( tBuffer ); + Fl_Text_Buffer* tbuf = new Fl_Text_Buffer; + tbuf->text( PACKAGE_STRING ); + tbuf->append( AboutText ); + textDisplay->buffer( tbuf ); Fl_Return_Button button( (Width - ButtonW)/2, Height-Spc-ButtonH, ButtonW, ButtonH, @@ -472,7 +475,8 @@ while (win.shown()) Fl::wait(); - + delete textDisplay; + delete tbuf; } void StgWorldGui::HelpAboutCallback( Fl_Widget* wid ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jer...@us...> - 2008-06-17 10:45:04
|
Revision: 6618 http://playerstage.svn.sourceforge.net/playerstage/?rev=6618&view=rev Author: jeremy_asher Date: 2008-06-17 10:45:11 -0700 (Tue, 17 Jun 2008) Log Message: ----------- Fixed worldfile path caching for command line startup Modified Paths: -------------- code/stage/trunk/libstage/worldgui.cc Modified: code/stage/trunk/libstage/worldgui.cc =================================================================== --- code/stage/trunk/libstage/worldgui.cc 2008-06-17 07:40:18 UTC (rev 6617) +++ code/stage/trunk/libstage/worldgui.cc 2008-06-17 17:45:11 UTC (rev 6618) @@ -249,6 +249,8 @@ void StgWorldGui::Load( const char* filename ) { PRINT_DEBUG1( "%s.Load()", token ); + + fileMan.newWorld( filename ); StgWorld::Load( filename ); @@ -355,7 +357,6 @@ // } // todo: make sure loading is successful - world->fileMan.newWorld( filename ); world->Load( filename ); world->Start(); // if (stopped) } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jer...@us...> - 2008-06-18 14:56:38
|
Revision: 6644 http://playerstage.svn.sourceforge.net/playerstage/?rev=6644&view=rev Author: jeremy_asher Date: 2008-06-18 14:56:47 -0700 (Wed, 18 Jun 2008) Log Message: ----------- Fixed some menu hotkeys Modified Paths: -------------- code/stage/trunk/libstage/worldgui.cc Modified: code/stage/trunk/libstage/worldgui.cc =================================================================== --- code/stage/trunk/libstage/worldgui.cc 2008-06-18 21:49:58 UTC (rev 6643) +++ code/stage/trunk/libstage/worldgui.cc 2008-06-18 21:56:47 UTC (rev 6644) @@ -152,9 +152,9 @@ mbar->add( "&File", 0, 0, 0, FL_SUBMENU ); mbar->add( "File/&Load World...", FL_CTRL + 'l', (Fl_Callback *)LoadCallback, this, FL_MENU_DIVIDER ); - mbar->add( "File/Save World", FL_CTRL + 's', (Fl_Callback *)SaveCallback, this ); + mbar->add( "File/&Save World", FL_CTRL + 's', (Fl_Callback *)SaveCallback, this ); mbar->add( "File/Save World &As...", FL_CTRL + FL_SHIFT + 's', (Fl_Callback *)SaveAsCallback, this, FL_MENU_DIVIDER ); - mbar->add( "File/Exit", FL_CTRL+'q', (Fl_Callback *)QuitCallback, this ); + mbar->add( "File/E&xit", FL_CTRL+'q', (Fl_Callback *)QuitCallback, this ); mbar->add( "&View", 0, 0, 0, FL_SUBMENU ); mbar->add( MITEM_VIEW_DATA, 'd', (Fl_Callback*)view_toggle_cb, (void*)canvas, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <al...@us...> - 2008-07-02 16:42:16
|
Revision: 6744 http://playerstage.svn.sourceforge.net/playerstage/?rev=6744&view=rev Author: alexcb Date: 2008-07-02 16:42:25 -0700 (Wed, 02 Jul 2008) Log Message: ----------- fixed save only works on 2nd try bug Modified Paths: -------------- code/stage/trunk/libstage/worldgui.cc Modified: code/stage/trunk/libstage/worldgui.cc =================================================================== --- code/stage/trunk/libstage/worldgui.cc 2008-07-02 22:14:14 UTC (rev 6743) +++ code/stage/trunk/libstage/worldgui.cc 2008-07-02 23:42:25 UTC (rev 6744) @@ -212,8 +212,6 @@ bool StgWorldGui::Save( const char* filename ) { PRINT_DEBUG1( "%s.Save()", token ); - - StgWorld::Save( filename ); // use the window section for the rest int window_section = wf->LookupEntity( "window" ); @@ -228,6 +226,8 @@ // TODO - per model visualizations save } + StgWorld::Save( filename ); + // TODO - error checking return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <al...@us...> - 2008-07-03 15:50:21
|
Revision: 6753 http://playerstage.svn.sourceforge.net/playerstage/?rev=6753&view=rev Author: alexcb Date: 2008-07-03 15:50:29 -0700 (Thu, 03 Jul 2008) Log Message: ----------- fixed load file bug which caused file chooser to jump to parent dir Modified Paths: -------------- code/stage/trunk/libstage/worldgui.cc Modified: code/stage/trunk/libstage/worldgui.cc =================================================================== --- code/stage/trunk/libstage/worldgui.cc 2008-07-03 22:21:34 UTC (rev 6752) +++ code/stage/trunk/libstage/worldgui.cc 2008-07-03 22:50:29 UTC (rev 6753) @@ -348,12 +348,12 @@ StgWorldGui* worldGui = static_cast<StgWorldGui*>( p ); const char* filename; - const char* worldsPath; //bool success; const char* pattern = "World Files (*.world)"; - worldsPath = worldGui->fileMan->worldsRoot().c_str(); - Fl_File_Chooser fc( worldsPath, pattern, Fl_File_Chooser::CREATE, "Load World File..." ); + std::string worldsPath( worldGui->fileMan->worldsRoot() ); + worldsPath.append( "/" ); + Fl_File_Chooser fc( worldsPath.c_str(), pattern, Fl_File_Chooser::CREATE, "Load World File..." ); fc.ok_label( "Load" ); fc.show(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jer...@us...> - 2008-07-07 14:25:57
|
Revision: 6788 http://playerstage.svn.sourceforge.net/playerstage/?rev=6788&view=rev Author: jeremy_asher Date: 2008-07-07 14:26:06 -0700 (Mon, 07 Jul 2008) Log Message: ----------- Fixed title bar to update when a new worldfile is loaded Modified Paths: -------------- code/stage/trunk/libstage/worldgui.cc Modified: code/stage/trunk/libstage/worldgui.cc =================================================================== --- code/stage/trunk/libstage/worldgui.cc 2008-07-07 21:18:14 UTC (rev 6787) +++ code/stage/trunk/libstage/worldgui.cc 2008-07-07 21:26:06 UTC (rev 6788) @@ -138,12 +138,7 @@ graphics = true; paused = false; - // improve the title bar to say "Stage: <worldfile name>" - std::string title = PROJECT; - title += ": "; - if ( L ) - title += L; - label( title.c_str() ); + label( PROJECT ); interval_real = (stg_usec_t)thousand * DEFAULT_INTERVAL_REAL; @@ -224,6 +219,14 @@ // configure the canvas canvas->Load( wf, window_section ); + std::string title = PROJECT; + if ( wf->filename ) { + // improve the title bar to say "Stage: <worldfile name>" + title += ": "; + title += wf->filename; + } + label( title.c_str() ); + updateOptions(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jer...@us...> - 2008-07-07 15:12:59
|
Revision: 6791 http://playerstage.svn.sourceforge.net/playerstage/?rev=6791&view=rev Author: jeremy_asher Date: 2008-07-07 15:13:09 -0700 (Mon, 07 Jul 2008) Log Message: ----------- Fixed window resize bug Modified Paths: -------------- code/stage/trunk/libstage/worldgui.cc Modified: code/stage/trunk/libstage/worldgui.cc =================================================================== --- code/stage/trunk/libstage/worldgui.cc 2008-07-07 21:43:54 UTC (rev 6790) +++ code/stage/trunk/libstage/worldgui.cc 2008-07-07 22:13:09 UTC (rev 6791) @@ -212,9 +212,8 @@ int width = (int)wf->ReadTupleFloat(window_section, "size", 0, w() ); int height = (int)wf->ReadTupleFloat(window_section, "size", 1, h() ); - // on OS X this behaves badly - prevents the Window manager resizing - //larger than this size. size( width,height ); + size_range( 100, 100 ); // set min size to 100/100, max size to screen size // configure the canvas canvas->Load( wf, window_section ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jer...@us...> - 2008-07-08 16:35:06
|
Revision: 6824 http://playerstage.svn.sourceforge.net/playerstage/?rev=6824&view=rev Author: jeremy_asher Date: 2008-07-08 16:35:07 -0700 (Tue, 08 Jul 2008) Log Message: ----------- Adding $ property Modified Paths: -------------- code/stage/trunk/libstage/worldgui.cc Property Changed: ---------------- code/stage/trunk/libstage/worldgui.cc Modified: code/stage/trunk/libstage/worldgui.cc =================================================================== --- code/stage/trunk/libstage/worldgui.cc 2008-07-08 23:09:14 UTC (rev 6823) +++ code/stage/trunk/libstage/worldgui.cc 2008-07-08 23:35:07 UTC (rev 6824) @@ -3,7 +3,7 @@ Authors: Richard Vaughan (va...@sf...) Alex Couture-Beil (as...@sf...) Jeremy Asher (jr...@sf...) - $Id: worldgui.cc,v 1.12 2008-03-03 07:01:12 rtv Exp $ + SVN: $Id$ */ /** @defgroup worldgui World with Graphical User Interface Property changes on: code/stage/trunk/libstage/worldgui.cc ___________________________________________________________________ Name: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <al...@us...> - 2008-07-10 11:32:45
|
Revision: 6836 http://playerstage.svn.sourceforge.net/playerstage/?rev=6836&view=rev Author: alexcb Date: 2008-07-10 11:32:37 -0700 (Thu, 10 Jul 2008) Log Message: ----------- removed debuging leftovers Modified Paths: -------------- code/stage/trunk/libstage/worldgui.cc Modified: code/stage/trunk/libstage/worldgui.cc =================================================================== --- code/stage/trunk/libstage/worldgui.cc 2008-07-10 18:09:53 UTC (rev 6835) +++ code/stage/trunk/libstage/worldgui.cc 2008-07-10 18:32:37 UTC (rev 6836) @@ -338,8 +338,6 @@ if( hours > 0 ) status_stream << hours << "h"; - localratio = 1; - status_stream << std::setw( 2 ) << minutes << "m" << std::setw( 2 ) << seconds << "." << std::setprecision( 3 ) << std::setw( 3 ) << msec << "s "; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |