X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;fp=source%2Fdesigner%2Fdesigner.cpp;h=a59b3a12dd127839616a13190ceb51b7ee345b4f;hb=b6af6301c76d3664d969a72d8d889020093ac848;hp=88bdf8b75253f958e4493489f978cb3c5eda67b7;hpb=fbab529c533b8a758fb9ce505eb8970cd037510c;p=r2c2.git

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index 88bdf8b..a59b3a1 100644
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -28,6 +28,7 @@
 #include "manipulator.h"
 #include "measure.h"
 #include "movetool.h"
+#include "objectproperties.h"
 #include "objectselecttool.h"
 #include "rotatetool.h"
 #include "routebar.h"
@@ -35,7 +36,6 @@
 #include "slopetool.h"
 #include "svgexporter.h"
 #include "trackbar.h"
-#include "trackproperties.h"
 #include "zonebar.h"
 #include "zoneproperties.h"
 
@@ -210,17 +210,17 @@ void Designer::erase_objects()
 	}
 }
 
-void Designer::track_properties()
+void Designer::object_properties()
 {
 	use_select_tool();
 	if(selection.empty())
 		return;
 
-	TrackProperties *track_prop = new TrackProperties(selection);
-	root.add(*track_prop);
-	root_layout->set_gravity(*track_prop, 0, 0);
+	ObjectProperties *dlg = new ObjectProperties(selection);
+	root.add(*dlg);
+	root_layout->set_gravity(*dlg, 0, 0);
 
-	track_prop->signal_response.connect(sigc::mem_fun(this, &Designer::track_properties_response));
+	dlg->signal_response.connect(sigc::mem_fun(this, &Designer::object_properties_response));
 }
 
 void Designer::extend_track()
@@ -427,7 +427,7 @@ void Designer::key_press(unsigned key)
 	else if(key==Msp::Input::KEY_V)
 		svg_export();
 	else if(key==Msp::Input::KEY_P)
-		track_properties();
+		object_properties();
 }
 
 template<typename T>
@@ -536,7 +536,7 @@ void Designer::tool_status(const string &status)
 	lbl_status->set_text(status);
 }
 
-void Designer::track_properties_response(int)
+void Designer::object_properties_response(int)
 {
 	const set<Track *> &tracks = selection.get_objects<Track>();
 	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)