X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainproperties.cpp;h=d26cec08b649524606f23c232bf2e98d28a10fc7;hb=444c7efb2fadb10e98197a62b791829d821370c0;hp=36f932523ff627517732a0455573c164ed8691dd;hpb=447d621e93e71b710fed0920b473350122426b97;p=r2c2.git diff --git a/source/engineer/trainproperties.cpp b/source/engineer/trainproperties.cpp index 36f9325..d26cec0 100644 --- a/source/engineer/trainproperties.cpp +++ b/source/engineer/trainproperties.cpp @@ -1,3 +1,10 @@ +/* $Id$ + +This file is part of the MSP Märklin suite +Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa +Distributed under the GPL +*/ + #include #include #include @@ -21,7 +28,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 &locos=engineer.get_catalogue().get_locomotives(); + const map &locos = engineer.get_catalogue().get_locomotives(); for(map::const_iterator i=locos.begin(); i!=locos.end(); ++i) drp_type->append(format("%d %s", i->second->get_article_number(), i->second->get_name())); @@ -45,10 +52,10 @@ void TrainProperties::ok_clicked() { if(!train) { - const map &locos=engineer.get_catalogue().get_locomotives(); - map::const_iterator i=locos.begin(); + const map &locos = engineer.get_catalogue().get_locomotives(); + map::const_iterator i = locos.begin(); advance(i, drp_type->get_selected_index()); - train=engineer.add_train(*i->second, lexical_cast(ent_addr->get_text())); + train = engineer.add_train(*i->second, lexical_cast(ent_addr->get_text())); } train->set_name(ent_name->get_text()); @@ -57,4 +64,5 @@ void TrainProperties::ok_clicked() void TrainProperties::cancel_clicked() { + signal_cancel.emit(); }