X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Ftoolbar.cpp;h=ee990ddb6d56bdd8569c2c2fcc9970fe1bd8baaa;hb=ff20abc71ef697eb241e1aea9f7d61adeccfefd6;hp=09c025a7f05dfe37ba209b5d430203d7a477990e;hpb=a73b245826e8c1bc1f1394e9aa21618f8f31a6c5;p=r2c2.git

diff --git a/source/designer/toolbar.cpp b/source/designer/toolbar.cpp
index 09c025a..ee990dd 100644
--- a/source/designer/toolbar.cpp
+++ b/source/designer/toolbar.cpp
@@ -1,12 +1,13 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2009  Mikkosoft Productions, Mikko Rasa
+Copyright © 2009-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
 #include <msp/gltk/button.h>
 #include <msp/strings/formatter.h>
+#include "libmarklin/route.h"
 #include "designer.h"
 #include "toolbar.h"
 
@@ -19,39 +20,53 @@ Toolbar::Toolbar(Designer &d):
 	GLtk::Panel(d.get_ui_resources()),
 	designer(d)
 {
-	set_size(370, 40);
+	set_size(410, 40);
 
 	GLtk::Button *btn;
 	GLtk::Label *lbl;
 
 	add(*(btn=new GLtk::Button(res, "Load")));
 	btn->set_geometry(GLtk::Geometry(5, 10, 40, 24));
+	btn->set_tooltip("Load layout (not implemented)");
 
 	add(*(btn=new GLtk::Button(res, "Save")));
 	btn->set_geometry(GLtk::Geometry(45, 10, 40, 24));
+	btn->set_tooltip("Save current layout");
 	btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::save));
 
 	add(*(btn=new GLtk::Button(res, "Quit")));
 	btn->set_geometry(GLtk::Geometry(85, 10, 40, 24));
 	btn->set_style("red");
+	btn->set_tooltip("Exit Designer");
 	btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::quit));
 
-	add(*(btn=new GLtk::Button(res, "Trnt")));
+	add(*(btn=new GLtk::Button(res, "NewT")));
 	btn->set_geometry(GLtk::Geometry(135, 10, 40, 24));
+	btn->set_tooltip("Add a track piece");
+	btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::new_track));
 
-	add(*(btn=new GLtk::Button(res, "Sens")));
+	add(*(btn=new GLtk::Button(res, "Trnt")));
 	btn->set_geometry(GLtk::Geometry(175, 10, 40, 24));
+	btn->set_tooltip("Set turnout ID of selected track");
+	btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::set_turnout_id));
+
+	add(*(btn=new GLtk::Button(res, "Sens")));
+	btn->set_geometry(GLtk::Geometry(215, 10, 40, 24));
+	btn->set_tooltip("Set sensor ID of selected tracks");
+	btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::set_sensor_id));
 
 	add(*(lbl=new GLtk::Label(res, "Routes:")));
-	lbl->set_geometry(GLtk::Geometry(225, 22, 40, 13));
+	lbl->set_geometry(GLtk::Geometry(265, 22, 40, 13));
 
 	add(*(drp_routes=new GLtk::Dropdown(res)));
-	drp_routes->set_geometry(GLtk::Geometry(225, 5, 100, 17));
+	drp_routes->set_geometry(GLtk::Geometry(265, 5, 100, 17));
+	drp_routes->set_tooltip("Select route to edit");
 	drp_routes->append("(new route)");
 	drp_routes->signal_item_selected.connect(sigc::mem_fun(this, &Toolbar::route_selected));
 
 	add(*(btn=new GLtk::Button(res, "AddT")));
-	btn->set_geometry(GLtk::Geometry(325, 10, 40, 24));
+	btn->set_geometry(GLtk::Geometry(365, 10, 40, 24));
+	btn->set_tooltip("Add selected tracks to current route");
 	btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::add_selection_to_route));
 
 	designer.get_layout()->signal_route_added.connect(sigc::hide(sigc::mem_fun(this, &Toolbar::update_routes)));
@@ -63,37 +78,37 @@ void Toolbar::route_selected(unsigned index, const string &)
 {
 	if(index==drp_routes->get_n_items()-1)
 	{
-		Route *route = new Route(format("Route %d", designer.get_layout()->get_routes().size()+1));
-		designer.get_layout()->add_route(*route);
+		Layout &layout = *designer.get_layout();
+		Route *route = new Route(layout, format("Route %d", layout.get_routes().size()+1));
 		designer.edit_route(*route);
 
-		const set<Route *> &routes = designer.get_layout()->get_routes();
+		const map<string, Route *> &routes = designer.get_layout()->get_routes();
 		int selected = -1;
 		unsigned n = 0;
-		for(set<Route *>::const_iterator i=routes.begin(); (selected<0 && i!=routes.end()); ++i, ++n)
-			if(*i==route)
+		for(map<string, Route *>::const_iterator i=routes.begin(); (selected<0 && i!=routes.end()); ++i, ++n)
+			if(i->second==route)
 				selected = n;
 		drp_routes->set_selected_index(selected);
 	}
 	else
 	{
-		const set<Route *> &routes = designer.get_layout()->get_routes();
-		set<Route *>::const_iterator i = routes.begin();
+		const map<string, Route *> &routes = designer.get_layout()->get_routes();
+		map<string, Route *>::const_iterator i = routes.begin();
 		advance(i, index);
-		designer.edit_route(**i);
+		designer.edit_route(*i->second);
 	}
 }
 
 void Toolbar::update_routes()
 {
 	drp_routes->clear();
-	const set<Route *> &routes = designer.get_layout()->get_routes();
+	const map<string, Route *> &routes = designer.get_layout()->get_routes();
 	int selected = -1;
 	unsigned n = 0;
-	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i, ++n)
+	for(map<string, Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i, ++n)
 	{
-		drp_routes->append((*i)->get_name());
-		if(*i==designer.get_current_route())
+		drp_routes->append(i->second->get_name());
+		if(i->second==designer.get_current_route())
 			selected = n;
 	}
 	drp_routes->append("(new route)");