X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainpanel.h;h=12aa8fc835a8e1c5d9d355459e23be5aea0ae8ee;hb=dc3b2bce73df40ea885a1960a825e5cd3a33c045;hp=7b929856b840e6ff04e6eede5d338986f91f0332;hpb=e60fdcb9617f539b4d578d06ec46eb955c5e0624;p=r2c2.git diff --git a/source/engineer/trainpanel.h b/source/engineer/trainpanel.h index 7b92985..12aa8fc 100644 --- a/source/engineer/trainpanel.h +++ b/source/engineer/trainpanel.h @@ -1,7 +1,7 @@ /* $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 */ @@ -31,21 +31,24 @@ 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 train_reverse_changed(bool); - void loco_function_changed(unsigned, bool); + void train_control_changed(const std::string &, float); + 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