X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainproperties.cpp;h=67a957959fca96c04a8b8ab9338d7f62933b5e24;hb=39566dc89cdadf4f6e701a14b5d9049f22b591fb;hp=9eaf8d37255c55c3cd81fa0532cf14850136ed54;hpb=3e9c210ddc036cd015228504cc0803c909e27f84;p=r2c2.git

diff --git a/source/engineer/trainproperties.cpp b/source/engineer/trainproperties.cpp
index 9eaf8d3..67a9579 100644
--- a/source/engineer/trainproperties.cpp
+++ b/source/engineer/trainproperties.cpp
@@ -16,6 +16,7 @@ using namespace Msp;
 using namespace Marklin;
 
 TrainProperties::TrainProperties(Engineer &e, GLtk::Resources &r, Train *t):
+	Widget(r),
 	Panel(r),
 	engineer(e),
 	train(t)
@@ -28,7 +29,7 @@ TrainProperties::TrainProperties(Engineer &e, GLtk::Resources &r, Train *t):
 	add(*(drp_type=new GLtk::Dropdown(res)));
 	drp_type->set_geometry(GLtk::Geometry(60, geom.h-30, geom.w-70, 20));
 
-	const map<unsigned, LocoType *> &locos=engineer.get_catalogue().get_locomotives();
+	const map<unsigned, LocoType *> &locos = engineer.get_catalogue().get_locomotives();
 	for(map<unsigned, LocoType *>::const_iterator i=locos.begin(); i!=locos.end(); ++i)
 		drp_type->append(format("%d %s", i->second->get_article_number(), i->second->get_name()));
 
@@ -52,10 +53,10 @@ void TrainProperties::ok_clicked()
 {
 	if(!train)
 	{
-		const map<unsigned, LocoType *> &locos=engineer.get_catalogue().get_locomotives();
-		map<unsigned, LocoType *>::const_iterator i=locos.begin();
+		const map<unsigned, LocoType *> &locos = engineer.get_catalogue().get_locomotives();
+		map<unsigned, LocoType *>::const_iterator i = locos.begin();
 		advance(i, drp_type->get_selected_index());
-		train=engineer.add_train(*i->second, lexical_cast<unsigned>(ent_addr->get_text()));
+		train = engineer.add_train(*i->second, lexical_cast<unsigned>(ent_addr->get_text()));
 	}
 
 	train->set_name(ent_name->get_text());
@@ -64,4 +65,5 @@ void TrainProperties::ok_clicked()
 
 void TrainProperties::cancel_clicked()
 {
+	signal_cancel.emit();
 }