X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Ftoolbar.cpp;h=f970607fc054b97879950dda94179c5db6c1e818;hb=1c15570729bbce44f0518373ca5bf8bf41cfa3b3;hp=ec18adb259980ef19ff17805ac2bcadbf75cacf3;hpb=707a611dae600333f3a9bd6421176f242fe49907;p=r2c2.git diff --git a/source/designer/toolbar.cpp b/source/designer/toolbar.cpp index ec18adb..f970607 100644 --- a/source/designer/toolbar.cpp +++ b/source/designer/toolbar.cpp @@ -1,145 +1,46 @@ -/* $Id$ - -This file is part of the MSP Märklin suite -Copyright © 2009-2010 Mikkosoft Productions, Mikko Rasa -Distributed under the GPL -*/ - -#include -#include -#include "libmarklin/route.h" -#include "designer.h" +#include #include "toolbar.h" using namespace std; using namespace Msp; -using namespace Marklin; -Toolbar::Toolbar(Designer &d): - GLtk::Widget(d.get_ui_resources()), - GLtk::Panel(d.get_ui_resources()), - designer(d) +Toolbar::Toolbar(const string &name): + expanded(true) { - set_size(640, 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, "+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"))); - 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(265, 22, 40, 13)); - - add(*(drp_routes=new GLtk::Dropdown(res))); - 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"))); - 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"))); - 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"))); - 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))); - - 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))); - - update_routes(); + set_focusable(false); + set_layout(new GLtk::Layout); + GLtk::Row row(*layout); + layout->set_margin(GLtk::Sides(6, 10)); + layout->set_column_spacing(10); + + add(*(lbl_title = new GLtk::Label(name))); + + add(*(btn_expand = new GLtk::Button)); + btn_expand->set_style("arrow_left"); + btn_expand->set_tooltip("Collapse toolbar"); + btn_expand->signal_clicked.connect(sigc::mem_fun(this, &Toolbar::expand_clicked)); + + add(*(pnl_content = new GLtk::Panel)); + pnl_content->set_style("group"); + GLtk::Layout *content_layout = new GLtk::Layout; + // XXX This needs to get deleted somehow + new GLtk::Row(*content_layout); + pnl_content->set_layout(content_layout); + content_layout->set_margin(0); } -void Toolbar::route_selected(unsigned index, const string &) +void Toolbar::expand(bool e) { - if(index==drp_routes->get_n_items()-1) - { - Layout &layout = *designer.get_layout(); - const set &routes = designer.get_layout()->get_routes(); - Route *route = new Route(layout); - route->set_name(format("Route %d", routes.size())); - designer.edit_route(route); + expanded = e; + btn_expand->set_style(expanded ? "arrow_left" : "arrow_right"); + btn_expand->set_tooltip(expanded ? "Collapse toolbar" : "Expand toolbar"); + pnl_content->set_visible(expanded); + signal_autosize_changed.emit(); - int selected = -1; - unsigned n = 0; - for(set::const_iterator i=routes.begin(); (selected<0 && i!=routes.end()); ++i, ++n) - if(*i==route) - selected = n; - drp_routes->set_selected_index(selected); - } - else - { - const set &routes = designer.get_layout()->get_routes(); - set::const_iterator i = routes.begin(); - advance(i, index); - designer.edit_route(*i); - } -} - -void Toolbar::delete_route_clicked() -{ - Route *route = designer.get_current_route(); - designer.edit_route(0); - delete route; -} - -void Toolbar::route_added(Route &r) -{ - r.signal_name_changed.connect(sigc::hide(sigc::mem_fun(this, &Toolbar::update_routes))); - update_routes(); + signal_expanded.emit(expanded); } -void Toolbar::update_routes() +void Toolbar::expand_clicked() { - drp_routes->clear(); - 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) - { - drp_routes->append((*i)->get_name()); - if(*i==designer.get_current_route()) - selected = n; - } - drp_routes->append("(new route)"); - drp_routes->set_selected_index(selected); + expand(!expanded); }