Some other minor UI tweaks

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

diff --git a/source/remote/trainpanel.h b/source/remote/trainpanel.h
index b969af406d2becef314f48b114823882801d4f3d..1cf7151a00b39cd45474899dc803d01a57e76039 100644 (file)
--- a/source/remote/trainpanel.h
+++ b/source/remote/trainpanel.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2009  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef TRAINPANEL_H_
 #define TRAINPANEL_H_
 
@@ -16,6 +9,8 @@ Distributed under the GPL
 #include "network/client.h"
 #include "network/train.h"
 
+class Remote;
+
 class TrainPanel: public Gtk::Expander
 {
 private:
@@ -26,8 +21,9 @@ private:
                RouteRecord();
        };
 
-       Marklin::Client &client;
-       Marklin::NetTrain &train;
+       Remote &remote;
+       R2C2::Client &client;
+       R2C2::NetTrain &train;
        Gtk::Scale *scl_speed;
        Gtk::Label *lbl_status;
        Gtk::CheckButton *chk_reverse;
@@ -36,12 +32,11 @@ private:
        std::map<unsigned, Gtk::CheckButton *> chk_funcs;
 
 public:
-       TrainPanel(Marklin::Client &, Marklin::NetTrain &);
+       TrainPanel(Remote &, R2C2::Client &, R2C2::NetTrain &);
 private:
        void name_changed(const std::string &);
        void status_changed(const std::string &);
-       void speed_changed(unsigned);
-       void reverse_changed(bool);
+       void control_changed(const std::string &, float);
        void function_changed(unsigned, bool);
        void route_changed(const std::string &);
        void ui_speed_changed();