X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.h;h=712dc1638bfa9f72c7965b80556655b0565350a1;hb=c0e076401ee76fd9a5a96ff919a8e7b4d058c51b;hp=0769473a786e45e639c544c0b7478bf7d9205c94;hpb=dabab2f3bfb5c8548b9c36f3fe40065563653990;p=r2c2.git

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index 0769473..712dc16 100644
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -7,10 +7,9 @@
 #include <msp/gl/light.h>
 #include <msp/gl/lighting.h>
 #include <msp/gl/pipeline.h>
-#include <msp/gltk/resources.h>
-#include <msp/gltk/root.h>
+#include <msp/input/keyboard.h>
+#include <msp/input/mouse.h>
 #include "libr2c2/catalogue.h"
-#include "libr2c2/driver.h"
 #include "libr2c2/train.h"
 #include "3d/layout.h"
 #include "3d/overlay.h"
@@ -19,9 +18,7 @@
 #include "3d/view.h"
 #include "network/server.h"
 #include "options.h"
-
-class MainWindow;
-class TrainView;
+#include "userinterface.h"
 
 class Engineer: public Msp::RegisteredApplication<Engineer>
 {
@@ -31,10 +28,6 @@ private:
 	Msp::Graphics::SimpleGLWindow window;
 	Msp::Input::Keyboard keyboard;
 	Msp::Input::Mouse mouse;
-	Msp::GLtk::Resources ui_res;
-	Msp::GLtk::Root *root;
-	Msp::GLtk::Arrangement *root_arrangement;
-	bool import_active;
 
 	R2C2::Catalogue catalogue;
 	R2C2::Layout layout;
@@ -45,11 +38,9 @@ private:
 	std::map<R2C2::Train *, Msp::GL::Color> train_colors;
 
 	R2C2::View3D main_view;
+	UserInterface ui;
 
-	MainWindow *main_wnd;
 	std::list<R2C2::Train *> new_trains;
-	std::list<TrainView *> train_views;
-	Msp::Time::TimeStamp status_timeout;
 	R2C2::Vector pointer;
 	std::list<R2C2::TrackChain3D *> emergencies;
 	Msp::Time::TimeStamp emergency_blink_timeout;
@@ -59,15 +50,11 @@ public:
 	Engineer(int argc, char **argv);
 	~Engineer();
 
-	const Msp::GLtk::Resources &get_ui_resources() const { return ui_res; }
-	Msp::GLtk::Root &get_root() const { return *root; }
 	const R2C2::Catalogue &get_catalogue() const { return catalogue; }
 	R2C2::Layout &get_layout() { return layout; }
 	R2C2::Layout3D &get_layout_3d() { return layout_3d; }
 	R2C2::View3D &get_main_view() { return main_view; }
-	void set_status(const std::string &);
-	void add_train_view(TrainView &);
-	void remove_train_view(TrainView &);
+	UserInterface &get_user_interface() { return ui; }
 	int main();
 	void quit() { exit(0); }
 private:
@@ -78,8 +65,6 @@ private:
 	R2C2::Object *pick_object(const R2C2::Vector &);
 	void emergency(R2C2::Block *, const std::string &);
 	void halt_event(bool);
-	void locomotive_detected(const R2C2::Driver::DetectedLocomotive &);
-	void import_finished(int);
 	void train_added(R2C2::Train &);
 	void process_new_train(R2C2::Train &);
 	virtual void sighandler(int);