Some other minor UI tweaks

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

diff --git a/source/remote/remote.h b/source/remote/remote.h
index 4599a139af32989b2c0c4212168c8d15694cac29..875f25bbbdbf803d962bdece37ee1e568f148727 100644 (file)
--- a/source/remote/remote.h
+++ b/source/remote/remote.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 REMOTE_H_
 #define REMOTE_H_
 
@@ -14,24 +7,29 @@ Distributed under the GPL
 #include <msp/core/application.h>
 #include "network/client.h"
 
-class Remote: public Msp::Application
+class MainPanel;
+class TrainPanel;
+
+class Remote: public Msp::RegisteredApplication<Remote>
 {
 private:
        Msp::IO::EventDispatcher event_disp;
-       Marklin::Catalogue catalogue;
-       Marklin::Client client;
+       R2C2::Catalogue catalogue;
+       R2C2::Client client;
        Gtk::Main gtk;
        Gtk::Window window;
-       Gtk::Box *train_box;
-
-       static Msp::Application::RegApp<Remote> reg;
+       Gtk::Box *panel_box;
+       MainPanel *main_panel;
+       std::vector<TrainPanel *> train_panels;
 
 public:
        Remote(int argc, char **argv);
+
+       const R2C2::Catalogue &get_catalogue() const { return catalogue; }
 private:
        void tick();
 
-       void train_added(Marklin::NetTrain &);
+       void train_added(R2C2::NetTrain &);
 };
 
 #endif