X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=8ab0465c2347a89d3bf21352001199f2939084ba;hb=1ff06c5bc46a677fa389ef86c6b26664368f1653;hp=279d83b6df952654c38b0abcc2467b4e61656d65;hpb=6ba6af3637c299ab00828c49de9151429488cc17;p=r2c2.git

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index 279d83b..8ab0465 100644
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -1,6 +1,6 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
@@ -26,8 +26,8 @@ Distributed under the GPL
 #include <msp/strings/utils.h>
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
-#include "libmarklin/route.h"
-#include "libmarklin/tracktype.h"
+#include "libr2c2/route.h"
+#include "libr2c2/tracktype.h"
 #include "3d/path.h"
 #include "designer.h"
 #include "input.h"
@@ -38,14 +38,14 @@ Distributed under the GPL
 #include "toolbar.h"
 
 using namespace std;
-using namespace Marklin;
+using namespace R2C2;
 using namespace Msp;
 
 Application::RegApp<Designer> Designer::reg;
 
 Designer::Designer(int argc, char **argv):
 	window(1280, 960),
-	ui_res("marklin.res"),
+	ui_res("r2c2.res"),
 	root(ui_res, window),
 	base_object(0),
 	cur_route(0),
@@ -129,12 +129,12 @@ Designer::Designer(int argc, char **argv):
 	toolbar->set_position(0, window.get_height()-toolbar->get_geometry().h);
 	toolbar->set_focusable(false);
 
-	GLtk::Panel *statusbar = new GLtk::Panel(ui_res);
+	GLtk::Panel *statusbar = new GLtk::Panel;
 	root.add(*statusbar);
 	statusbar->set_size(window.get_width(), 20);
 	statusbar->set_focusable(false);
 
-	lbl_status = new GLtk::Label(ui_res);
+	lbl_status = new GLtk::Label;
 	statusbar->add(*lbl_status);
 	lbl_status->set_geometry(GLtk::Geometry(20, 2, 300, 16));
 
@@ -271,6 +271,9 @@ void Designer::tick()
 	float dt = (t-last_tick)/Msp::Time::sec;
 	last_tick = t;
 
+	if(mode==MANIPULATE_DONE)
+		mode = SELECT;
+
 	window.tick();
 	root.tick();
 	camera_ctl.tick(dt);
@@ -558,7 +561,7 @@ void Designer::manipulation_status(const string &status)
 
 void Designer::manipulation_done(bool)
 {
-	mode = SELECT;
+	mode = MANIPULATE_DONE;
 	selection_changed();
 }