X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainpanel.h;h=c8825af0120a5d8a98865c41fff7292ea1ba7259;hb=90790c9a28793d31b9ea38eea2f55652a0e9297b;hp=d8b1ab0bae0b4f63ccdb62a4b6083deb714c2870;hpb=010d8321e982d1684fcbff5bf6fc2bdec7cb7bae;p=r2c2.git diff --git a/source/engineer/trainpanel.h b/source/engineer/trainpanel.h index d8b1ab0..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-2008 Mikkosoft Productions, Mikko Rasa +Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ #ifndef TRAINPANEL_H_ #define TRAINPANEL_H_ +#include #include #include #include #include +#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 tgl_funcs; @@ -34,9 +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); };