X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Ftoolbar.cpp;h=c6d859b925a1a0850a1c34e9f89d749d7ecf4396;hb=1ff06c5bc46a677fa389ef86c6b26664368f1653;hp=ec18adb259980ef19ff17805ac2bcadbf75cacf3;hpb=707a611dae600333f3a9bd6421176f242fe49907;p=r2c2.git diff --git a/source/designer/toolbar.cpp b/source/designer/toolbar.cpp index ec18adb..c6d859b 100644 --- a/source/designer/toolbar.cpp +++ b/source/designer/toolbar.cpp @@ -1,23 +1,21 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ #include #include -#include "libmarklin/route.h" +#include "libr2c2/route.h" #include "designer.h" #include "toolbar.h" using namespace std; using namespace Msp; -using namespace Marklin; +using namespace R2C2; Toolbar::Toolbar(Designer &d): - GLtk::Widget(d.get_ui_resources()), - GLtk::Panel(d.get_ui_resources()), designer(d) { set_size(640, 40); @@ -25,64 +23,64 @@ Toolbar::Toolbar(Designer &d): GLtk::Button *btn; GLtk::Label *lbl; - add(*(btn=new GLtk::Button(res, "Load"))); + add(*(btn=new GLtk::Button("Load"))); btn->set_geometry(GLtk::Geometry(5, 10, 40, 24)); btn->set_tooltip("Load layout (not implemented)"); - add(*(btn=new GLtk::Button(res, "Save"))); + add(*(btn=new GLtk::Button("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"))); + add(*(btn=new GLtk::Button("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, "+Trk"))); + add(*(btn=new GLtk::Button("+Trk"))); 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, "Trnt"))); + add(*(btn=new GLtk::Button("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"))); + add(*(btn=new GLtk::Button("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:"))); + add(*(lbl=new GLtk::Label("Routes:"))); lbl->set_geometry(GLtk::Geometry(265, 22, 40, 13)); - add(*(drp_routes=new GLtk::Dropdown(res))); + add(*(drp_routes=new GLtk::Dropdown)); drp_routes->set_geometry(GLtk::Geometry(265, 5, 250, 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, "Del"))); + add(*(btn=new GLtk::Button("Del"))); btn->set_geometry(GLtk::Geometry(515, 10, 40, 24)); btn->set_tooltip("Delete the current route"); btn->signal_clicked.connect(sigc::mem_fun(this, &Toolbar::delete_route_clicked)); - add(*(btn=new GLtk::Button(res, "Name"))); + add(*(btn=new GLtk::Button("Name"))); btn->set_geometry(GLtk::Geometry(555, 10, 40, 24)); btn->set_tooltip("Rename the current route"); btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::rename_route)); - add(*(btn=new GLtk::Button(res, "Add"))); + add(*(btn=new GLtk::Button("Add"))); btn->set_geometry(GLtk::Geometry(595, 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::mem_fun(this, &Toolbar::route_added)); - designer.get_layout()->signal_route_removed.connect(sigc::hide(sigc::mem_fun(this, &Toolbar::update_routes))); + designer.get_layout().signal_route_added.connect(sigc::mem_fun(this, &Toolbar::route_added)); + designer.get_layout().signal_route_removed.connect(sigc::hide(sigc::mem_fun(this, &Toolbar::update_routes))); - const set &routes = designer.get_layout()->get_routes(); + const set &routes = designer.get_layout().get_routes(); for(set::const_iterator i=routes.begin(); i!=routes.end(); ++i) (*i)->signal_name_changed.connect(sigc::hide(sigc::mem_fun(this, &Toolbar::update_routes))); @@ -93,8 +91,8 @@ void Toolbar::route_selected(unsigned index, const string &) { if(index==drp_routes->get_n_items()-1) { - Layout &layout = *designer.get_layout(); - const set &routes = designer.get_layout()->get_routes(); + Layout &layout = designer.get_layout(); + const set &routes = layout.get_routes(); Route *route = new Route(layout); route->set_name(format("Route %d", routes.size())); designer.edit_route(route); @@ -108,7 +106,7 @@ void Toolbar::route_selected(unsigned index, const string &) } else { - const set &routes = designer.get_layout()->get_routes(); + const set &routes = designer.get_layout().get_routes(); set::const_iterator i = routes.begin(); advance(i, index); designer.edit_route(*i); @@ -131,7 +129,7 @@ void Toolbar::route_added(Route &r) void Toolbar::update_routes() { drp_routes->clear(); - const set &routes = designer.get_layout()->get_routes(); + const set &routes = designer.get_layout().get_routes(); int selected = -1; unsigned n = 0; for(set::const_iterator i=routes.begin(); i!=routes.end(); ++i, ++n)