X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainpanel.h;h=c8825af0120a5d8a98865c41fff7292ea1ba7259;hb=651698847d5293cfb15b6fb23a394701388c0151;hp=817ba18b238d84a998bd4a6ade21166e15a13e62;hpb=e375f8bf215058398795be1010ffec89d0150114;p=r2c2.git

diff --git a/source/engineer/trainpanel.h b/source/engineer/trainpanel.h
index 817ba18..c8825af 100644
--- a/source/engineer/trainpanel.h
+++ b/source/engineer/trainpanel.h
@@ -1,22 +1,24 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
 #ifndef TRAINPANEL_H_
 #define TRAINPANEL_H_
 
+#include <sigc++/trackable.h>
 #include <msp/gltk/hslider.h>
 #include <msp/gltk/label.h>
 #include <msp/gltk/panel.h>
 #include <msp/gltk/toggle.h>
+#include "libmarklin/route.h"
 #include "libmarklin/train.h"
 
 class Engineer;
 
-class TrainPanel: public Msp::GLtk::Panel
+class TrainPanel: public Msp::GLtk::Panel, public sigc::trackable
 {
 private:
 	Engineer &engineer;
@@ -25,6 +27,7 @@ private:
 	Msp::GLtk::Label *lbl_name;
 	Msp::GLtk::HSlider *sld_speed;
 	Msp::GLtk::Label *lbl_speed;
+	Msp::GLtk::Label *lbl_route;
 	Msp::GLtk::Label *lbl_status;
 	Msp::GLtk::Toggle *tgl_forward;
 	std::map<unsigned, Msp::GLtk::Toggle *> tgl_funcs;
@@ -34,10 +37,13 @@ public:
 private:
 	void speed_slider_changed(double);
 	void train_speed_changed(unsigned);
-	void loco_function_changed(unsigned, bool);
+	void train_reverse_changed(bool);
+	void train_function_changed(unsigned, bool);
+	void train_route_changed(const Marklin::Route *);
 	void train_status_changed(const std::string &);
 	void place_clicked();
 	void edit_clicked();
+	void route_clicked();
 	void forward_toggled(bool);
 	void func_toggled(bool, unsigned);
 };