X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainproperties.cpp;h=9686dee485527574cd2b1f78b3c111f3b46a1f09;hb=1ff06c5bc46a677fa389ef86c6b26664368f1653;hp=bb8860b96ff12ffc8253344a88a168e484a1da35;hpb=f4ffb776aa0d4f51c058d27fb0f51449c05302c3;p=r2c2.git

diff --git a/source/engineer/trainproperties.cpp b/source/engineer/trainproperties.cpp
index bb8860b..9686dee 100644
--- a/source/engineer/trainproperties.cpp
+++ b/source/engineer/trainproperties.cpp
@@ -1,6 +1,6 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
@@ -8,32 +8,42 @@ Distributed under the GPL
 #include <msp/gltk/label.h>
 #include <msp/strings/formatter.h>
 #include <msp/strings/lexicalcast.h>
-#include "libmarklin/vehicle.h"
-#include "libmarklin/vehicletype.h"
+#include "libr2c2/driver.h"
+#include "libr2c2/vehicle.h"
+#include "libr2c2/vehicletype.h"
 #include "engineer.h"
 #include "trainproperties.h"
 
 using namespace std;
 using namespace Msp;
-using namespace Marklin;
+using namespace R2C2;
 
-TrainProperties::TrainProperties(Engineer &e, const GLtk::Resources &r, Train *t):
-	Widget(r),
-	Dialog(r),
+TrainProperties::TrainProperties(Engineer &e, Train *t):
 	engineer(e),
 	train(t)
 {
 	set_size(250, 305);
 
 	GLtk::Label *label;
-	add(*(label = new GLtk::Label(res, "Train properties")));
+	add(*(label = new GLtk::Label("Train properties")));
 	label->set_geometry(GLtk::Geometry(10, geom.h-25, geom.w-20, 20));
 
-	add(*(ent_addr = new GLtk::Entry(res)));
+	add(*(ent_addr = new GLtk::Entry));
 	ent_addr->set_geometry(GLtk::Geometry(10, geom.h-50, 40, 20));
 
-	add(*(drp_type = new GLtk::Dropdown(res)));
-	drp_type->set_geometry(GLtk::Geometry(60, geom.h-50, geom.w-70, 20));
+	add(*(drp_protocol = new GLtk::Dropdown));
+	drp_protocol->set_geometry(GLtk::Geometry(60, geom.h-50, 60, 20));
+	for(unsigned i=0;; ++i)
+	{
+		if(const char *proto = engineer.get_layout().get_driver().enumerate_protocols(i))
+			drp_protocol->append(proto);
+		else
+			break;
+	}
+	drp_protocol->set_selected_index(0);
+
+	add(*(drp_type = new GLtk::Dropdown));
+	drp_type->set_geometry(GLtk::Geometry(130, geom.h-50, geom.w-140, 20));
 
 	const Catalogue::VehicleMap &vehs = engineer.get_catalogue().get_vehicles();
 	unsigned n = 0;
@@ -49,10 +59,10 @@ TrainProperties::TrainProperties(Engineer &e, const GLtk::Resources &r, Train *t
 		++n;
 	}
 
-	add(*(ent_name = new GLtk::Entry(res)));
+	add(*(ent_name = new GLtk::Entry));
 	ent_name->set_geometry(GLtk::Geometry(10, geom.h-75, geom.w-20, 20));
 
-	add(*(drp_priority = new GLtk::Dropdown(res)));
+	add(*(drp_priority = new GLtk::Dropdown));
 	drp_priority->set_geometry(GLtk::Geometry(10, geom.h-100, geom.w-20, 20));
 	drp_priority->append("Standard freight");
 	drp_priority->append("Express freight");
@@ -60,16 +70,16 @@ TrainProperties::TrainProperties(Engineer &e, const GLtk::Resources &r, Train *t
 	drp_priority->append("Standard passenger");
 	drp_priority->append("Express passenger");
 
-	add(*(lst_vehicles = new GLtk::List(res)));
+	add(*(lst_vehicles = new GLtk::List));
 	lst_vehicles->set_geometry(GLtk::Geometry(10, 100, geom.w-20, geom.h-205));
 
 	GLtk::Button *btn;
 
-	add(*(btn = new GLtk::Button(res, "Rem")));
+	add(*(btn = new GLtk::Button("Rem")));
 	btn->set_geometry(GLtk::Geometry(10, 70, 40, 25));
 	btn->signal_clicked.connect(sigc::mem_fun(this, &TrainProperties::remove_vehicle_clicked));
 
-	add(*(drp_new_vehicle = new GLtk::Dropdown(res)));
+	add(*(drp_new_vehicle = new GLtk::Dropdown));
 	drp_new_vehicle->set_geometry(GLtk::Geometry(10, 45, geom.w-20, 20));
 	drp_new_vehicle->append("(new vehicle)");
 	drp_new_vehicle->set_selected_index(0);
@@ -108,7 +118,7 @@ void TrainProperties::on_ok_clicked()
 	{
 		const VehicleType &type = get_vehicle_type(drp_type->get_selected_index(), true);
 		unsigned addr = lexical_cast<unsigned>(ent_addr->get_text());
-		train = new Train(engineer.get_layout(), type, addr);
+		train = new Train(engineer.get_layout(), type, addr, drp_protocol->get_selected());
 	}
 
 	train->set_name(ent_name->get_text());
@@ -141,7 +151,7 @@ void TrainProperties::remove_vehicle_clicked()
 
 	lst_vehicles->remove(selected);
 
-	unsigned n_vehicles = train->get_n_vehicles()-rem_vehicles.size();
+	unsigned n_vehicles = (train ? train->get_n_vehicles()-rem_vehicles.size() : 0);
 	if(static_cast<unsigned>(selected)>=n_vehicles)
 		add_vehicles.erase(add_vehicles.begin()+(selected-n_vehicles));
 	else