X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Ftrackbar.cpp;h=11dd1a6556dfba7e7619219b82aa3eda0c3e2fe8;hb=2fb2e58685c521ea76aab9f6d7cffe1186c9814a;hp=b05f3c85ecaa77181270f5d0a262315ed3ab6b5c;hpb=2abb7008a1e2b93b77742693becf6fe0b8567d6e;p=r2c2.git

diff --git a/source/designer/trackbar.cpp b/source/designer/trackbar.cpp
index b05f3c8..11dd1a6 100644
--- a/source/designer/trackbar.cpp
+++ b/source/designer/trackbar.cpp
@@ -1,49 +1,36 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include "designer.h"
 #include "trackbar.h"
 
 using namespace Msp;
 
 Trackbar::Trackbar(Designer &designer):
-	Toolbar("Track", 240)
+	Toolbar("Track")
 {
 	GLtk::Button *btn;
 
 	pnl_content->add(*(btn = new GLtk::Button("New")));
-	btn->set_geometry(GLtk::Geometry(0, 10, 40, 24));
 	btn->set_style("green");
 	btn->set_tooltip("Add a track piece (N)");
-	btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::new_track));
+	btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::new_object));
 
 	pnl_content->add(*(btn = new GLtk::Button("Del")));
-	btn->set_geometry(GLtk::Geometry(40, 10, 40, 24));
 	btn->set_style("red");
 	btn->set_tooltip("Delete selected tracks (X)");
-	btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::erase_tracks));
+	btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::erase_objects));
 
 	pnl_content->add(*(btn = new GLtk::Button("Prop")));
-	btn->set_geometry(GLtk::Geometry(80, 10, 40, 24));
 	btn->set_tooltip("Change properties of selected tracks (P)");
-	btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::track_properties));
+	btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::object_properties));
 
 	pnl_content->add(*(btn = new GLtk::Button("Xtnd")));
-	btn->set_geometry(GLtk::Geometry(120, 10, 40, 24));
 	btn->set_tooltip("Extend straight track out of free endpoint (Shift+N)");
 	btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::extend_track));
 
 	pnl_content->add(*(btn = new GLtk::Button("Conn")));
-	btn->set_geometry(GLtk::Geometry(160, 10, 40, 24));
 	btn->set_tooltip("Connect free endpoints of selected tracks (C)");
 	btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::connect_tracks));
 
 	pnl_content->add(*(btn = new GLtk::Button("Flat")));
-	btn->set_geometry(GLtk::Geometry(200, 10, 40, 24));
 	btn->set_tooltip("Make selected tracks flat (F)");
 	btn->signal_clicked.connect(sigc::mem_fun(&designer, &Designer::flatten_tracks));
 }