X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainproperties.cpp;h=1a918ad19f6c1bacda3fea692b8f4a4a5ad10804;hb=bc955b09faf8365a72d07bb5ee1253c9b958c897;hp=adb48d3385edc039d8c319bfb3b7e94518911133;hpb=9462461b00b65c0018114802cfba8f290d6b2d42;p=r2c2.git

diff --git a/source/engineer/trainproperties.cpp b/source/engineer/trainproperties.cpp
index adb48d3..1a918ad 100644
--- a/source/engineer/trainproperties.cpp
+++ b/source/engineer/trainproperties.cpp
@@ -1,21 +1,45 @@
+#include <msp/gltk/button.h>
+#include <msp/strings/lexicalcast.h>
+#include "engineer.h"
 #include "trainproperties.h"
 
 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, 50);
+	set_size(200, 95);
 
-	add(*(ent_name=new GLtk::Entry(res, train.get_name())));
-	ent_name->set_geometry(
+	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")));
+	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(geom.width-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(geom.width-45, 5, 40, 25);
+	btn->set_style("red");
+	btn->set_geometry(GLtk::Geometry(geom.w-80, 10, 30, 25));
+}
+
+void TrainProperties::ok_clicked()
+{
+	if(train)
+	{
+	}
+	else
+	{
+		train=engineer.add_train(lexical_cast<unsigned>(ent_addr->get_text()));
+		train->set_name(ent_name->get_text());
+	}
+	signal_ok.emit();
 }