Split the single large toolbar into a few smaller collapsible ones

[r2c2.git] / source / designer / designer.cpp

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index d3932338a9edbbc23681f2afd164b7b0e45530ca..34398f3177dfd3700ecf9cd8547722341412602c 100644 (file)
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -1,6 +1,6 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
@@ -26,26 +26,29 @@ Distributed under the GPL
 #include <msp/strings/utils.h>
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
-#include "libmarklin/route.h"
-#include "libmarklin/tracktype.h"
+#include "libr2c2/route.h"
+#include "libr2c2/tracktype.h"
 #include "3d/path.h"
 #include "designer.h"
 #include "input.h"
+#include "layoutbar.h"
 #include "manipulator.h"
 #include "measure.h"
+#include "routebar.h"
 #include "selection.h"
 #include "svgexporter.h"
-#include "toolbar.h"
+#include "trackbar.h"
+#include "trackproperties.h"
 
 using namespace std;
-using namespace Marklin;
+using namespace R2C2;
 using namespace Msp;
 
 Application::RegApp<Designer> Designer::reg;
 
 Designer::Designer(int argc, char **argv):
        window(1280, 960),
-       ui_res("marklin.res"),
+       ui_res("r2c2.res"),
        root(ui_res, window),
        base_object(0),
        cur_route(0),
@@ -124,17 +127,24 @@ Designer::Designer(int argc, char **argv):
        root.signal_pointer_motion.connect(sigc::mem_fun(this, &Designer::pointer_motion));
        root.signal_tooltip.connect(sigc::mem_fun(this, &Designer::tooltip));
 
-       toolbar = new Toolbar(*this);
-       root.add(*toolbar);
-       toolbar->set_position(0, window.get_height()-toolbar->get_geometry().h);
-       toolbar->set_focusable(false);
+       toolbars.push_back(new Layoutbar(*this));
+       toolbars.push_back(new Trackbar(*this));
+       toolbars.push_back(new Routebar(*this));
+       for(vector<Toolbar *>::iterator i=toolbars.begin(); i!=toolbars.end(); ++i)
+       {
+               root.add(**i);
+               if(i!=toolbars.begin())
+                       (*i)->expand(false);
+               (*i)->signal_expanded.connect(sigc::hide(sigc::mem_fun(this, &Designer::arrange_toolbars)));
+       }
+       arrange_toolbars();
 
-       GLtk::Panel *statusbar = new GLtk::Panel(ui_res);
+       GLtk::Panel *statusbar = new GLtk::Panel;
        root.add(*statusbar);
        statusbar->set_size(window.get_width(), 20);
        statusbar->set_focusable(false);
 
-       lbl_status = new GLtk::Label(ui_res);
+       lbl_status = new GLtk::Label;
        statusbar->add(*lbl_status);
        lbl_status->set_geometry(GLtk::Geometry(20, 2, 300, 16));
 
@@ -182,39 +192,18 @@ void Designer::new_track()
        mode = CATALOGUE;
 }
 
-void Designer::set_turnout_id()
+void Designer::track_properties()
 {
-       Track *track = selection.get_track();
-       if(selection.size()==1 && track->get_type().is_turnout())
-       {
-               InputDialog *input = new InputDialog(*this, "Turnout ID", lexical_cast(track->get_turnout_id()));
-               input->signal_accept.connect(sigc::mem_fun(this, &Designer::turnout_id_accept));
-       }
-}
+       if(selection.empty())
+               return;
 
-void Designer::set_sensor_id()
-{
-       const set<Track *> &tracks = selection.get_tracks();
-       bool ok = false;
-       int id = -1;
-       for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-       {
-               if(!(*i)->get_type().is_turnout())
-                       ok = true;
-               if(static_cast<int>((*i)->get_sensor_id())!=id)
-               {
-                       if(id==-1)
-                               id = (*i)->get_sensor_id();
-                       else
-                               id = -2;
-               }
-       }
+       TrackProperties *track_prop = new TrackProperties(selection);
+       root.add(*track_prop);
+       const GLtk::Geometry &root_geom = root.get_geometry();
+       const GLtk::Geometry &dlg_geom = track_prop->get_geometry();
+       track_prop->set_position((root_geom.w-dlg_geom.w)/2, (root_geom.h-dlg_geom.h)/2);
 
-       if(ok)
-       {
-               InputDialog *input = new InputDialog(*this, "Sensor ID", (id>=0 ? lexical_cast(id) : string()));
-               input->signal_accept.connect(sigc::mem_fun(this, &Designer::sensor_id_accept));
-       }
+       track_prop->signal_response.connect(sigc::mem_fun(this, &Designer::track_properties_response));
 }
 
 void Designer::rename_route()
@@ -374,16 +363,14 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t)
                manipulator.even_slope(true);
        else if(key==Msp::Input::KEY_E)
                manipulator.even_slope();
-       else if(key==Msp::Input::KEY_T)
-               set_turnout_id();
-       else if(key==Msp::Input::KEY_S)
-               set_sensor_id();
        else if(key==Msp::Input::KEY_A)
                add_selection_to_route();
        else if(key==Msp::Input::KEY_C)
                manipulator.connect();
        else if(key==Msp::Input::KEY_V)
                svg_export();
+       else if(key==Msp::Input::KEY_P)
+               track_properties();
 }
 
 void Designer::button_press(int x, int y, unsigned btn, unsigned mod)
@@ -581,25 +568,22 @@ void Designer::measure_done()
        selection_changed();
 }
 
-void Designer::turnout_id_accept(const string &text)
+void Designer::arrange_toolbars()
 {
-       Track *track = selection.get_track();
-       unsigned id = (text.empty() ? 0 : lexical_cast<unsigned>(text));
-       track->set_turnout_id(id);
-
-       update_track_icon(layout_3d->get_track(*track));
+       unsigned x = 0;
+       for(vector<Toolbar *>::iterator i=toolbars.begin(); i!=toolbars.end(); ++i)
+       {
+               const GLtk::Geometry &geom = (*i)->get_geometry();
+               (*i)->set_position(x, window.get_height()-geom.h);
+               x += geom.w;
+       }
 }
 
-void Designer::sensor_id_accept(const string &text)
+void Designer::track_properties_response(int)
 {
        const set<Track *> &tracks = selection.get_tracks();
-       unsigned id = (text.empty() ? 0 : lexical_cast<unsigned>(text));
        for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-       {
-               (*i)->set_sensor_id(id);
-
                update_track_icon(layout_3d->get_track(**i));
-       }
 }
 
 void Designer::route_name_accept(const string &text)