Get rid of Train::try_reserve and listen to signal_block_reserved instead

[r2c2.git] / source / engineer / trainpanel.h

diff --git a/source/engineer/trainpanel.h b/source/engineer/trainpanel.h
index 2597d040c3c76f2e05afad4a214c7b8df2bd1f8b..a76d907a1af33bcb994e365dafbc8a6e8e411b14 100644 (file)
--- 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-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -12,6 +12,7 @@ Distributed under the GPL
 #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;
@@ -25,6 +26,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;
@@ -33,10 +35,14 @@ public:
        TrainPanel(Engineer &, const Msp::GLtk::Resources &, Marklin::Train &);
 private:
        void speed_slider_changed(double);
-       void loco_speed_changed(unsigned);
+       void train_speed_changed(unsigned);
+       void train_reverse_changed(bool);
        void loco_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);
 };