X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainpanel.h;h=406e1a66fce4440110bb2420a58b7b0905cd9217;hb=ca9d278f9472206ad9a01190dcef9f0eb1bcc274;hp=a76d907a1af33bcb994e365dafbc8a6e8e411b14;hpb=2fe7cbcb761487bc7409b93b372da6f8ab3c581e;p=r2c2.git

diff --git a/source/engineer/trainpanel.h b/source/engineer/trainpanel.h
index a76d907..406e1a6 100644
--- a/source/engineer/trainpanel.h
+++ b/source/engineer/trainpanel.h
@@ -1,27 +1,27 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef TRAINPANEL_H_
 #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;
 
-class TrainPanel: public Msp::GLtk::Panel
+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;
@@ -30,21 +30,31 @@ private:
 	Msp::GLtk::Label *lbl_status;
 	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 speed_slider_changed(double);
-	void train_speed_changed(unsigned);
-	void train_reverse_changed(bool);
-	void loco_function_changed(unsigned, bool);
-	void train_route_changed(const Marklin::Route *);
+	void ai_event(const R2C2::TrainAI::Message &);
+	void train_function_changed(unsigned, bool);
+	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(R2C2::Track *, unsigned);
+	void go_to(R2C2::Track *, unsigned);
 };
 
 #endif