Complete rewrite of the engineer UI

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

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index 72fdd29c877fcd778f0a829c9fec6f51fd4a049e..7997242e17cf0c82409e08d80b376d2e86c68566 100644 (file)
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -17,8 +17,7 @@
 #include "network/server.h"
 #include "options.h"
 
-class MainPanel;
-class TrainPanel;
+class MainWindow;
 class TrainView;
 
 class Engineer: public Msp::RegisteredApplication<Engineer>
@@ -49,9 +48,8 @@ private:
        Msp::GL::Pipeline pipeline;
        Msp::GL::Mesh arrow_mesh;
 
-       MainPanel *main_panel;
+       MainWindow *main_wnd;
        std::list<R2C2::Train *> new_trains;
-       std::list<TrainPanel *> train_panels;
        std::list<TrainView *> train_views;
        Msp::Time::TimeStamp status_timeout;
        bool picking;
@@ -72,7 +70,6 @@ public:
        R2C2::Layout3D &get_layout_3d() { return layout_3d; }
        const Msp::GL::Lighting &get_lighting() const { return lighting; }
        void set_status(const std::string &);
-       void rearrange_panels();
        void add_train_view(TrainView &);
        void remove_train_view(TrainView &);
        void pick(bool);
@@ -87,7 +84,7 @@ private:
        void reset_block_color(const R2C2::Block &);
        void sensor_event(unsigned, bool);
        void block_reserved(const R2C2::Block &, const R2C2::Train *);
-       R2C2::Track *pick_track(const R2C2::Vector &);
+       R2C2::Object *pick_object(const R2C2::Vector &);
        void train_added(R2C2::Train &);
        void process_new_train(R2C2::Train &);
        virtual void sighandler(int);