X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fremote%2Fremote.h;h=14e9ef6543c278cdb4aa7ba16ae56f2acf80f933;hb=251270c97a5e5eb8630bc1662a406255dedae90e;hp=6d6be3377aa1f1cc71ffb2b4407c88335f0ee03e;hpb=9ddcd066e37e4c72685817c042c30897786ece05;p=r2c2.git diff --git a/source/remote/remote.h b/source/remote/remote.h index 6d6be33..14e9ef6 100644 --- a/source/remote/remote.h +++ b/source/remote/remote.h @@ -1,7 +1,7 @@ /* $Id$ -This file is part of the MSP Märklin suite -Copyright © 2009-2010 Mikkosoft Productions, Mikko Rasa +This file is part of R²C² +Copyright © 2009-2011 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -14,17 +14,19 @@ Distributed under the GPL #include #include "network/client.h" +class MainPanel; class TrainPanel; class Remote: public Msp::Application { 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; + Gtk::Box *panel_box; + MainPanel *main_panel; std::vector train_panels; static Msp::Application::RegApp reg; @@ -32,11 +34,11 @@ private: public: Remote(int argc, char **argv); - const Marklin::Catalogue &get_catalogue() const { return catalogue; } + const R2C2::Catalogue &get_catalogue() const { return catalogue; } private: void tick(); - void train_added(Marklin::NetTrain &); + void train_added(R2C2::NetTrain &); }; #endif