Rename Toolbar to MenuBar.

include/app/Toolbar.hpp → include/app/MenuBar.hpp

@@ -7,12 +7,8 @@ namespace rack {
 namespace app {
 
 
-struct Toolbar : widget::OpaqueWidget {
-	// TODO Move these to future Rack app state
-	float cableOpacity = 0.5;
-	float cableTension = 0.5;
-
-	Toolbar();
+struct MenuBar : widget::OpaqueWidget {
+	MenuBar();
 	void draw(const DrawArgs &args) override;
 };
 

include/app/Scene.hpp

@@ -3,7 +3,7 @@
 #include "widget/OpaqueWidget.hpp"
 #include "app/RackScrollWidget.hpp"
 #include "app/RackWidget.hpp"
-#include "app/Toolbar.hpp"
+#include "app/MenuBar.hpp"
 
 
 namespace rack {
@@ -14,7 +14,7 @@ struct Scene : widget::OpaqueWidget {
 	// Convenience variables for accessing important widgets
 	RackScrollWidget *rackScroll;
 	RackWidget *rack;
-	Toolbar *toolbar;
+	MenuBar *menuBar;
 	widget::Widget *moduleBrowser;
 
 	// Version checking

include/rack.hpp

@@ -65,7 +65,7 @@
 #include "app/SvgScrew.hpp"
 #include "app/SvgSlider.hpp"
 #include "app/SvgSwitch.hpp"
-#include "app/Toolbar.hpp"
+#include "app/MenuBar.hpp"
 #include "app/CableWidget.hpp"
 
 #include "engine/Engine.hpp"

src/app/Toolbar.cpp → src/app/MenuBar.cpp

@@ -1,4 +1,4 @@
-#include "app/Toolbar.hpp"
+#include "app/MenuBar.hpp"
 #include "window.hpp"
 #include "engine/Engine.hpp"
 #include "asset.hpp"
@@ -680,7 +680,7 @@ struct HelpButton : MenuButton {
 };
 
 
-Toolbar::Toolbar() {
+MenuBar::MenuBar() {
 	const float margin = 5;
 	box.size.y = BND_WIDGET_HEIGHT + 2*margin;
 
@@ -714,7 +714,7 @@ Toolbar::Toolbar() {
 	layout->addChild(helpButton);
 }
 
-void Toolbar::draw(const DrawArgs &args) {
+void MenuBar::draw(const DrawArgs &args) {
 	bndMenuBackground(args.vg, 0.0, 0.0, box.size.x, box.size.y, BND_CORNER_ALL);
 	bndBevel(args.vg, 0.0, 0.0, box.size.x, box.size.y);
 

src/app/Scene.cpp

@@ -21,9 +21,9 @@ Scene::Scene() {
 
 	rack = rackScroll->rackWidget;
 
-	toolbar = new Toolbar;
-	addChild(toolbar);
-	rackScroll->box.pos.y = toolbar->box.size.y;
+	menuBar = new MenuBar;
+	addChild(menuBar);
+	rackScroll->box.pos.y = menuBar->box.size.y;
 
 	moduleBrowser = moduleBrowserCreate();
 	moduleBrowser->hide();
@@ -35,7 +35,7 @@ Scene::~Scene() {
 
 void Scene::step() {
 	// Resize owned descendants
-	toolbar->box.size.x = box.size.x;
+	menuBar->box.size.x = box.size.x;
 	rackScroll->box.size = box.size.minus(rackScroll->box.pos);
 
 	// Autosave every 15 seconds