X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainproperties.h;h=24458331bb4e1267b757092333efc4e848556651;hb=7d567753bb7e7a6952bab98a2896fd01c7dfd319;hp=c75015b08f4b27f8c5b009af0af17aa572352713;hpb=378f04522aa762729c0d5651fb60ad7e4d8ba9f3;p=r2c2.git

diff --git a/source/engineer/trainproperties.h b/source/engineer/trainproperties.h
index c75015b..2445833 100644
--- a/source/engineer/trainproperties.h
+++ b/source/engineer/trainproperties.h
@@ -1,6 +1,6 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
@@ -10,7 +10,7 @@ Distributed under the GPL
 
 #include <msp/gltk/dropdown.h>
 #include <msp/gltk/entry.h>
-#include <libmarklin/train.h>
+#include <libr2c2/train.h>
 #include "dialog.h"
 
 class Engineer;
@@ -19,21 +19,24 @@ class TrainProperties: public Dialog
 {
 private:
 	Engineer &engineer;
-	Marklin::Train *train;
+	R2C2::Train *train;
 	Msp::GLtk::Entry *ent_addr;
+	Msp::GLtk::Dropdown *drp_protocol;
 	Msp::GLtk::Dropdown *drp_type;
 	Msp::GLtk::Entry *ent_name;
 	Msp::GLtk::Dropdown *drp_priority;
 	Msp::GLtk::List *lst_vehicles;
 	Msp::GLtk::Dropdown *drp_new_vehicle;
-	std::vector<const Marklin::VehicleType *> add_vehicles;
+	std::vector<const R2C2::VehicleType *> add_vehicles;
+	std::set<unsigned> rem_vehicles;
 
 public:
-	TrainProperties(Engineer &, const Msp::GLtk::Resources &, Marklin::Train *);
+	TrainProperties(Engineer &, R2C2::Train *);
 private:
 	virtual void on_ok_clicked();
 	void new_vehicle_selected(unsigned, const std::string &);
-	const Marklin::VehicleType &get_vehicle_type(unsigned, bool);
+	void remove_vehicle_clicked();
+	const R2C2::VehicleType &get_vehicle_type(unsigned, bool);
 };
 
 #endif