X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainpanel.h;h=b4bd386896af3aa07c3a467fb7dfe155442e9b8e;hb=d27edb207810f0b4e44be8c3632d421faa5fed80;hp=aae71f98431f0f49d50d06e6f6e64d158c3d4233;hpb=7587f018794f53974409a2aad76a0a421cea2d24;p=r2c2.git diff --git a/source/engineer/trainpanel.h b/source/engineer/trainpanel.h index aae71f9..b4bd386 100644 --- a/source/engineer/trainpanel.h +++ b/source/engineer/trainpanel.h @@ -1,13 +1,14 @@ /* $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 #include #include #include @@ -17,7 +18,7 @@ Distributed under the GPL class Engineer; -class TrainPanel: public Msp::GLtk::Panel +class TrainPanel: public Msp::GLtk::Panel, public sigc::trackable { private: Engineer &engineer; @@ -30,20 +31,25 @@ private: Msp::GLtk::Label *lbl_status; Msp::GLtk::Toggle *tgl_forward; std::map tgl_funcs; + sigc::connection pick_conn; public: TrainPanel(Engineer &, const Msp::GLtk::Resources &, Marklin::Train &); 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 goto_clicked(); void forward_toggled(bool); void func_toggled(bool, unsigned); + void place(Marklin::Track *, unsigned); + void go_to(Marklin::Track *, unsigned); }; #endif