Fix a problem with TrackIter::block_iter at end of line

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

diff --git a/source/designer/routebar.cpp b/source/designer/routebar.cpp
index 0a2b9799d2d41171aea67fe7ce7f77cfb253c50c..66a55d77c838dbd29a8c2847c8eb48322aa9fb1d 100644 (file)
--- a/source/designer/routebar.cpp
+++ b/source/designer/routebar.cpp
@@ -1,11 +1,4 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "libr2c2/route.h"
 #include "designer.h"
 #include "routebar.h"
@@ -28,6 +21,7 @@ Routebar::Routebar(Designer &d):
 
        pnl_content->add(*(btn = new GLtk::Button("Del")));
        btn->set_geometry(GLtk::Geometry(250, 10, 40, 24));
+       btn->set_style("red");
        btn->set_tooltip("Delete the current route");
        btn->signal_clicked.connect(sigc::mem_fun(this, &Routebar::delete_route_clicked));
 
@@ -38,7 +32,7 @@ Routebar::Routebar(Designer &d):
 
        pnl_content->add(*(btn = new GLtk::Button("Add")));
        btn->set_geometry(GLtk::Geometry(330, 10, 40, 24));
-       btn->set_tooltip("Add selected tracks to current route");
+       btn->set_tooltip("Add selected tracks to current route (A)");
        btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::add_selection_to_route));
 
        designer.get_layout().signal_route_added.connect(sigc::mem_fun(this, &Routebar::route_added));
@@ -55,9 +49,9 @@ void Routebar::route_selected(unsigned index, const string &)
 {
        if(index==drp_routes->get_n_items()-1)
        {
-               Layout &layout = designer.get_layout();
-               const set<Route *> &routes = layout.get_routes();
-               Route *route = new Route(layout);
+               Layout &rlayout = designer.get_layout();
+               const set<Route *> &routes = rlayout.get_routes();
+               Route *route = new Route(rlayout);
                route->set_name(format("Route %d", routes.size()));
                designer.edit_route(route);