X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainproperties.cpp;h=36f932523ff627517732a0455573c164ed8691dd;hb=447d621e93e71b710fed0920b473350122426b97;hp=9b46ce41af96c6551d0bf59f29aa69278adf08c7;hpb=52cbe8d99669f843f8f75c51128e2748584dd03a;p=r2c2.git

diff --git a/source/engineer/trainproperties.cpp b/source/engineer/trainproperties.cpp
index 9b46ce4..36f9325 100644
--- a/source/engineer/trainproperties.cpp
+++ b/source/engineer/trainproperties.cpp
@@ -1,8 +1,10 @@
 #include <msp/gltk/button.h>
+#include <msp/strings/formatter.h>
 #include <msp/strings/lexicalcast.h>
 #include "engineer.h"
 #include "trainproperties.h"
 
+using namespace std;
 using namespace Msp;
 using namespace Marklin;
 
@@ -11,13 +13,20 @@ TrainProperties::TrainProperties(Engineer &e, GLtk::Resources &r, Train *t):
 	engineer(e),
 	train(t)
 {
-	set_size(200, 75);
+	set_size(200, 95);
 
 	add(*(ent_addr=new GLtk::Entry(res)));
-	ent_addr->set_geometry(GLtk::Geometry(10, geom.h-25, 40, 20));
+	ent_addr->set_geometry(GLtk::Geometry(10, geom.h-30, 40, 20));
+
+	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();
+	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()));
 
 	add(*(ent_name=new GLtk::Entry(res, "Train")));
-	ent_name->set_geometry(GLtk::Geometry(10, geom.h-50, geom.w-20, 20));
+	ent_name->set_geometry(GLtk::Geometry(10, geom.h-55, geom.w-20, 20));
 
 	GLtk::Button *btn;
 
@@ -29,17 +38,23 @@ TrainProperties::TrainProperties(Engineer &e, GLtk::Resources &r, Train *t):
 	add(*(btn=new GLtk::Button(res, "Cncl")));
 	btn->set_style("red");
 	btn->set_geometry(GLtk::Geometry(geom.w-80, 10, 30, 25));
+	btn->signal_clicked.connect(sigc::mem_fun(this, &TrainProperties::cancel_clicked));
 }
 
 void TrainProperties::ok_clicked()
 {
-	if(train)
-	{
-	}
-	else
+	if(!train)
 	{
-		train=engineer.add_train(lexical_cast<unsigned>(ent_addr->get_text()));
-		train->set_name(ent_name->get_text());
+		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->set_name(ent_name->get_text());
 	signal_ok.emit();
 }
+
+void TrainProperties::cancel_clicked()
+{
+}