X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainproperties.cpp;h=d26cec08b649524606f23c232bf2e98d28a10fc7;hb=f9254f57b736927a57a2fd793ee18f6c9766dd43;hp=1aebea029eb2506e070e87c650f5d0f345422f27;hpb=36beacc579d3132642ed4d98ce5a6d99842b5812;p=r2c2.git

diff --git a/source/engineer/trainproperties.cpp b/source/engineer/trainproperties.cpp
index 1aebea0..d26cec0 100644
--- a/source/engineer/trainproperties.cpp
+++ b/source/engineer/trainproperties.cpp
@@ -1,26 +1,68 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #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;
 
-TrainProperties::TrainProperties(GLtk::Resources &r, Train &t):
+TrainProperties::TrainProperties(Engineer &e, GLtk::Resources &r, Train *t):
 	Panel(r),
+	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-30, 40, 20));
 
-	add(*(ent_name=new GLtk::Entry(res, train.get_name())));
-	ent_name->set_geometry(GLtk::Geometry(5, geom.h-25, geom.w-10, 20));
+	add(*(drp_type=new GLtk::Dropdown(res)));
+	drp_type->set_geometry(GLtk::Geometry(60, geom.h-30, geom.w-70, 20));
 
-	add(*(ent_name=new GLtk::Entry(res, train.get_name())));
-	ent_name->set_geometry(GLtk::Geometry(5, geom.h-50, geom.w-10, 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-55, geom.w-20, 20));
 
 	GLtk::Button *btn;
 
 	add(*(btn=new GLtk::Button(res, "OK")));
-	btn->set_geometry(GLtk::Geometry(geom.w-45, 5, 40, 25));
+	btn->set_style("green");
+	btn->set_geometry(GLtk::Geometry(geom.w-40, 10, 30, 25));
+	btn->signal_clicked.connect(sigc::mem_fun(this, &TrainProperties::ok_clicked));
 
 	add(*(btn=new GLtk::Button(res, "Cncl")));
-	btn->set_geometry(GLtk::Geometry(geom.w-90, 5, 40, 25));
+	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)
+	{
+		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()
+{
+	signal_cancel.emit();
 }