Convert designer to use mspgltk for UI

[r2c2.git] / source / libmarklin / layout.h

diff --git a/source/libmarklin/layout.h b/source/libmarklin/layout.h
index ae03cef6f30a2ca970656f7a6a9662255595ef9d..2a1817f5e021616ba5929f293629c2d78baded51 100644 (file)
--- a/source/libmarklin/layout.h
+++ b/source/libmarklin/layout.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -20,38 +20,44 @@ class Catalogue;
 class Layout
 {
 public:
-       class Loader: public Msp::DataFile::Loader
+       class Loader: public Msp::DataFile::BasicLoader<Layout>
        {
        public:
                Loader(Layout &);
-               Layout &get_object() { return layout; }
        private:
-               Layout &layout;
-
+               virtual void finish();
+               void route(const std::string &);
                void track(unsigned);
        };
 
+public:
+       sigc::signal<void, Track &> signal_track_added;
+       sigc::signal<void, Track &> signal_track_removed;
+       sigc::signal<void, Route &> signal_route_added;
+       sigc::signal<void, Route &> signal_route_removed;
+
 private:
-       Catalogue   &catalogue;
-       std::string filename;
+       const Catalogue &catalogue;
        std::string base;
        std::set<Track *> tracks;
-       //RouteSeq    routes;
+       std::set<Route *> routes;
 
 public:
-       sigc::signal<void, Track &> signal_track_added;
-       sigc::signal<void, Track &> signal_track_removed;
-
-       Layout(Catalogue &);
+       Layout(const Catalogue &);
        ~Layout();
 
+       const Catalogue &get_catalogue() const { return catalogue; }
        const std::string &get_base() const { return base; }
        const std::set<Track *> &get_tracks() const { return tracks; }
-       void  add_track(Track &);
-       void  remove_track(Track &);
-       void  check_links();
-       void  load(const std::string &);
-       int   save(const std::string &);
+       void add_track(Track &);
+       void remove_track(Track &);
+       void add_route(Route &);
+       const std::set<Route *> &get_routes() const { return routes; }
+       void remove_route(Route &);
+       void save(const std::string &);
+private:
+       void check_links();
+       void check_routes();
 };
 
 } // namespace Marklin