X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainpanel.h;h=ba65fb886f351afeed2b03790e4e8527318a224c;hb=34f8bf04e4bdffefeceea59b186386b51c542b9d;hp=9b2a54414618264e2e693ce26912a205da6cb4bf;hpb=77f8c0e033b9b5e7085de5d22a62128a996a5b2a;p=r2c2.git

diff --git a/source/engineer/trainpanel.h b/source/engineer/trainpanel.h
index 9b2a544..ba65fb8 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-2010  Mikkosoft Productions, Mikko Rasa
+This file is part of R²C²
+Copyright © 2006-2011  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -9,12 +9,14 @@ Distributed under the GPL
 #define TRAINPANEL_H_
 
 #include <sigc++/trackable.h>
+#include <msp/gltk/button.h>
 #include <msp/gltk/hslider.h>
 #include <msp/gltk/label.h>
 #include <msp/gltk/panel.h>
 #include <msp/gltk/toggle.h>
-#include "libmarklin/route.h"
-#include "libmarklin/train.h"
+#include "libr2c2/route.h"
+#include "libr2c2/train.h"
+#include "libr2c2/trainstatus.h"
 
 class Engineer;
 
@@ -22,7 +24,11 @@ class TrainPanel: public Msp::GLtk::Panel, public sigc::trackable
 {
 private:
 	Engineer &engineer;
-	Marklin::Train &train;
+	R2C2::Train &train;
+	R2C2::TrainStatus status;
+	Msp::GLtk::Panel *pnl_basic;
+	Msp::GLtk::Panel *pnl_extra;
+	Msp::GLtk::Button *btn_expand;
 	Msp::GLtk::Label *lbl_addr;
 	Msp::GLtk::Label *lbl_name;
 	Msp::GLtk::HSlider *sld_speed;
@@ -32,24 +38,30 @@ private:
 	Msp::GLtk::Toggle *tgl_forward;
 	std::map<unsigned, Msp::GLtk::Toggle *> tgl_funcs;
 	sigc::connection pick_conn;
+	bool expanded;
 
 public:
-	TrainPanel(Engineer &, const Msp::GLtk::Resources &, Marklin::Train &);
+	TrainPanel(Engineer &, R2C2::Train &);
+	void expand(bool = true);
+
 private:
-	void train_control_changed(const std::string &, float);
+	void ai_event(const R2C2::TrainAI::Message &);
 	void train_function_changed(unsigned, bool);
-	void train_route_changed(const Marklin::Route *);
+	void train_route_changed(const R2C2::Route *);
 	void train_status_changed(const std::string &);
 	void place_clicked();
+	void take_clicked();
 	void edit_clicked();
 	void route_clicked();
 	void goto_clicked();
 	void timetable_clicked();
+	void view_clicked();
+	void expand_clicked();
 	void speed_slider_changed(double);
 	void forward_toggled(bool);
 	void func_toggled(bool, unsigned);
-	void place(Marklin::Track *, unsigned);
-	void go_to(Marklin::Track *, unsigned);
+	void place(R2C2::Track *, unsigned);
+	void go_to(R2C2::Track *, unsigned);
 };
 
 #endif