Partial reorganization of Plugin menu.

include/network.hpp

@@ -12,10 +12,10 @@ namespace network {
 
 
 enum Method {
-	METHOD_GET,
-	METHOD_POST,
-	METHOD_PUT,
-	METHOD_DELETE,
+	GET,
+	POST,
+	PUT,
+	DELETE,
 };
 
 /** Requests a JSON API URL over HTTP(S), using the data as the query (GET) or the body (POST, etc)

src/app/MenuBar.cpp

@@ -32,6 +32,9 @@ struct MenuButton : ui::Button {
 	}
 };
 
+////////////////////
+// File
+////////////////////
 
 struct NewItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
@@ -39,49 +42,42 @@ struct NewItem : ui::MenuItem {
 	}
 };
 
-
 struct OpenItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
 		APP->patch->loadDialog();
 	}
 };
 
-
 struct SaveItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
 		APP->patch->saveDialog();
 	}
 };
 
-
 struct SaveAsItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
 		APP->patch->saveAsDialog();
 	}
 };
 
-
 struct SaveTemplateItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
 		APP->patch->saveTemplateDialog();
 	}
 };
 
-
 struct RevertItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
 		APP->patch->revertDialog();
 	}
 };
 
-
 struct QuitItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
 		APP->window->close();
 	}
 };
 
-
 struct FileButton : MenuButton {
 	void onAction(const event::Action &e) override {
 		ui::Menu *menu = createMenu();
@@ -123,6 +119,9 @@ struct FileButton : MenuButton {
 	}
 };
 
+////////////////////
+// Edit
+////////////////////
 
 struct UndoItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
@@ -130,21 +129,18 @@ struct UndoItem : ui::MenuItem {
 	}
 };
 
-
 struct RedoItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
 		APP->history->redo();
 	}
 };
 
-
 struct DisconnectCablesItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
 		APP->patch->disconnectDialog();
 	}
 };
 
-
 struct EditButton : MenuButton {
 	void onAction(const event::Action &e) override {
 		ui::Menu *menu = createMenu();
@@ -169,6 +165,9 @@ struct EditButton : MenuButton {
 	}
 };
 
+////////////////////
+// View
+////////////////////
 
 struct ZoomQuantity : Quantity {
 	void setValue(float value) override {
@@ -186,7 +185,6 @@ struct ZoomQuantity : Quantity {
 	std::string getUnit() override {return "%";}
 };
 
-
 struct ZoomSlider : ui::Slider {
 	ZoomSlider() {
 		quantity = new ZoomQuantity;
@@ -196,7 +194,6 @@ struct ZoomSlider : ui::Slider {
 	}
 };
 
-
 struct CableOpacityQuantity : Quantity {
 	void setValue(float value) override {
 		settings::cableOpacity = math::clamp(value, getMinValue(), getMaxValue());
@@ -211,8 +208,6 @@ struct CableOpacityQuantity : Quantity {
 	std::string getUnit() override {return "%";}
 };
 
-
-
 struct CableOpacitySlider : ui::Slider {
 	CableOpacitySlider() {
 		quantity = new CableOpacityQuantity;
@@ -222,7 +217,6 @@ struct CableOpacitySlider : ui::Slider {
 	}
 };
 
-
 struct CableTensionQuantity : Quantity {
 	void setValue(float value) override {
 		settings::cableTension = math::clamp(value, getMinValue(), getMaxValue());
@@ -235,7 +229,6 @@ struct CableTensionQuantity : Quantity {
 	int getDisplayPrecision() override {return 2;}
 };
 
-
 struct CableTensionSlider : ui::Slider {
 	CableTensionSlider() {
 		quantity = new CableTensionQuantity;
@@ -245,28 +238,24 @@ struct CableTensionSlider : ui::Slider {
 	}
 };
 
-
 struct ParamTooltipItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
 		settings::paramTooltip ^= true;
 	}
 };
 
-
 struct LockModulesItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
 		settings::lockModules ^= true;
 	}
 };
 
-
 struct FullscreenItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
 		APP->window->setFullScreen(!APP->window->isFullScreen());
 	}
 };
 
-
 struct ViewButton : MenuButton {
 	void onAction(const event::Action &e) override {
 		ui::Menu *menu = createMenu();
@@ -304,6 +293,9 @@ struct ViewButton : MenuButton {
 	}
 };
 
+////////////////////
+// Engine
+////////////////////
 
 struct CpuMeterItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
@@ -311,14 +303,12 @@ struct CpuMeterItem : ui::MenuItem {
 	}
 };
 
-
 struct EnginePauseItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
 		APP->engine->setPaused(!APP->engine->isPaused());
 	}
 };
 
-
 struct SampleRateValueItem : ui::MenuItem {
 	float sampleRate;
 	void onAction(const event::Action &e) override {
@@ -327,7 +317,6 @@ struct SampleRateValueItem : ui::MenuItem {
 	}
 };
 
-
 struct SampleRateItem : ui::MenuItem {
 	ui::Menu *createChildMenu() override {
 		ui::Menu *menu = new ui::Menu;
@@ -357,14 +346,12 @@ struct SampleRateItem : ui::MenuItem {
 	}
 };
 
-
 struct RealTimeItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
 		settings::realTime ^= true;
 	}
 };
 
-
 struct ThreadCountValueItem : ui::MenuItem {
 	int threadCount;
 	void setThreadCount(int threadCount) {
@@ -381,7 +368,6 @@ struct ThreadCountValueItem : ui::MenuItem {
 	}
 };
 
-
 struct ThreadCountItem : ui::MenuItem {
 	ui::Menu *createChildMenu() override {
 		ui::Menu *menu = new ui::Menu;
@@ -401,7 +387,6 @@ struct ThreadCountItem : ui::MenuItem {
 	}
 };
 
-
 struct EngineButton : MenuButton {
 	void onAction(const event::Action &e) override {
 		ui::Menu *menu = createMenu();
@@ -425,22 +410,52 @@ struct EngineButton : MenuButton {
 	}
 };
 
+////////////////////
+// Plugins
+////////////////////
+
+struct PluginsButton : MenuButton {
+	ui::Menu *menu;
+
+	void onAction(const event::Action &e) override {
+		menu = createMenu();
+		menu->box.pos = getAbsoluteOffset(math::Vec(0, box.size.y));
+		menu->box.size.x = box.size.x;
+
+		refresh();
+	}
+
+	void draw(const DrawArgs &args) override {
+		MenuButton::draw(args);
+
+		if (0) {
+			// Notification circle
+			nvgBeginPath(args.vg);
+			nvgCircle(args.vg, 4, 2, 4.0);
+			nvgFillColor(args.vg, nvgRGBf(1.0, 0.0, 0.0));
+			nvgFill(args.vg);
+			nvgStrokeColor(args.vg, nvgRGBf(0.5, 0.0, 0.0));
+			nvgStroke(args.vg);
+		}
+	}
+
+	void refresh();
+};
 
 struct RegisterItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
-		std::thread t([&]() {
+		std::thread t([]() {
 			system::openBrowser("https://vcvrack.com/");
 		});
 		t.detach();
 	}
 };
 
-
 struct AccountEmailField : ui::TextField {
 	ui::TextField *passwordField;
 	void onSelectKey(const event::SelectKey &e) override {
 		if (e.action == GLFW_PRESS && e.key == GLFW_KEY_TAB) {
-			APP->event->selectedWidget = passwordField;
+			APP->event->setSelected(passwordField);
 			e.consume(this);
 		}
 
@@ -449,7 +464,6 @@ struct AccountEmailField : ui::TextField {
 	}
 };
 
-
 struct AccountPasswordField : ui::PasswordField {
 	ui::MenuItem *logInItem;
 	void onSelectKey(const event::SelectKey &e) override {
@@ -463,72 +477,81 @@ struct AccountPasswordField : ui::PasswordField {
 	}
 };
 
-
 struct LogInItem : ui::MenuItem {
 	ui::TextField *emailField;
 	ui::TextField *passwordField;
 	void onAction(const event::Action &e) override {
 		std::string email = emailField->text;
 		std::string password = passwordField->text;
-		std::thread t([&, email, password]() {
+		std::thread t([=]() {
 			plugin::logIn(email, password);
 		});
 		t.detach();
+		e.consume(NULL);
 	}
-};
 
+	void step() override {
+		if (plugin::loginStatus != "") {
+			text = plugin::loginStatus;
+			disabled = true;
+		}
+		else {
+			text = "Log in";
+			disabled = false;
+		}
+	}
+};
 
 struct ManageItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
-		std::thread t([&]() {
+		std::thread t([]() {
 			system::openBrowser("https://vcvrack.com/plugins.html");
 		});
 		t.detach();
 	}
 };
 
-
 struct SyncItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
 	}
 };
 
+#if 0
+struct SyncButton : ui::Button {
+	bool checked = false;
+	/** Updates are available */
+	bool available = false;
+	/** Plugins have been updated */
+	bool completed = false;
 
-// struct SyncButton : ui::Button {
-// 	bool checked = false;
-// 	/** Updates are available */
-// 	bool available = false;
-// 	/** Plugins have been updated */
-// 	bool completed = false;
-
-// 	void step() override {
-// 		// Check for plugin update on first step()
-// 		if (!checked) {
-// 			std::thread t([this]() {
-// 				if (plugin::sync(true))
-// 					available = true;
-// 			});
-// 			t.detach();
-// 			checked = true;
-// 		}
-// 		// Display message if we've completed updates
-// 		if (completed) {
-// 			if (osdialog_message(OSDIALOG_INFO, OSDIALOG_OK_CANCEL, "All plugins have been updated. Close Rack and re-launch it to load new updates.")) {
-// 				APP->window->close();
-// 			}
-// 			completed = false;
-// 		}
-// 	}
-// 	void onAction(const event::Action &e) override {
-// 		available = false;
-// 		std::thread t([this]() {
-// 			if (plugin::sync(false))
-// 				completed = true;
-// 		});
-// 		t.detach();
-// 	}
-// };
-
+	void step() override {
+		// Check for plugin update on first step()
+		if (!checked) {
+			std::thread t([this]() {
+				if (plugin::sync(true))
+					available = true;
+			});
+			t.detach();
+			checked = true;
+		}
+		// Display message if we've completed updates
+		if (completed) {
+			if (osdialog_message(OSDIALOG_INFO, OSDIALOG_OK_CANCEL, "All plugins have been updated. Close Rack and re-launch it to load new updates.")) {
+				APP->window->close();
+			}
+			completed = false;
+		}
+	}
+	void onAction(const event::Action &e) override {
+		available = false;
+		std::thread t([this]() {
+			if (plugin::sync(false))
+				completed = true;
+		});
+		t.detach();
+	}
+};
+#endif
 
 struct LogOutItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
@@ -536,7 +559,6 @@ struct LogOutItem : ui::MenuItem {
 	}
 };
 
-
 struct DownloadQuantity : Quantity {
 	float getValue() override {
 		return plugin::downloadProgress;
@@ -555,72 +577,55 @@ struct DownloadQuantity : Quantity {
 	std::string getUnit() override {return "%";}
 };
 
+void PluginsButton::refresh() {
+	menu->clearChildren();
 
-struct PluginsButton : MenuButton {
-	void onAction(const event::Action &e) override {
-		ui::Menu *menu = createMenu();
-		menu->box.pos = getAbsoluteOffset(math::Vec(0, box.size.y));
-		menu->box.size.x = box.size.x;
+	if (plugin::isDownloading) {
+		ui::ProgressBar *downloadProgressBar = new ui::ProgressBar;
+		downloadProgressBar->quantity = new DownloadQuantity;
+		menu->addChild(downloadProgressBar);
+	}
+	else if (plugin::isLoggedIn()) {
+		ManageItem *manageItem = new ManageItem;
+		manageItem->text = "Manage plugins";
+		menu->addChild(manageItem);
 
-		// TODO Design dialog box for plugin syncing
-		if (plugin::isDownloading) {
-			ui::ProgressBar *downloadProgressBar = new ui::ProgressBar;
-			downloadProgressBar->quantity = new DownloadQuantity;
-			menu->addChild(downloadProgressBar);
-		}
-		else if (plugin::isLoggedIn()) {
-			ManageItem *manageItem = new ManageItem;
-			manageItem->text = "Manage plugins";
-			menu->addChild(manageItem);
-
-			SyncItem *syncItem = new SyncItem;
-			syncItem->text = "Sync plugins";
-			syncItem->disabled = true;
-			menu->addChild(syncItem);
-
-			LogOutItem *logOutItem = new LogOutItem;
-			logOutItem->text = "Log out";
-			menu->addChild(logOutItem);
-		}
-		else {
-			RegisterItem *registerItem = new RegisterItem;
-			registerItem->text = "Register VCV account";
-			menu->addChild(registerItem);
-
-			AccountEmailField *emailField = new AccountEmailField;
-			emailField->placeholder = "Email";
-			emailField->box.size.x = 200.0;
-			menu->addChild(emailField);
-
-			AccountPasswordField *passwordField = new AccountPasswordField;
-			passwordField->placeholder = "Password";
-			passwordField->box.size.x = 200.0;
-			emailField->passwordField = passwordField;
-			menu->addChild(passwordField);
-
-			LogInItem *logInItem = new LogInItem;
-			logInItem->text = "Log in";
-			logInItem->emailField = emailField;
-			logInItem->passwordField = passwordField;
-			passwordField->logInItem = logInItem;
-			menu->addChild(logInItem);
-		}
+		SyncItem *syncItem = new SyncItem;
+		syncItem->text = "Sync plugins";
+		syncItem->disabled = true;
+		menu->addChild(syncItem);
+
+		LogOutItem *logOutItem = new LogOutItem;
+		logOutItem->text = "Log out";
+		menu->addChild(logOutItem);
 	}
+	else {
+		RegisterItem *registerItem = new RegisterItem;
+		registerItem->text = "Register VCV account";
+		menu->addChild(registerItem);
 
-	void draw(const DrawArgs &args) override {
-		MenuButton::draw(args);
-		// if (1) {
-		// 	// Notification circle
-		// 	nvgBeginPath(args.vg);
-		// 	nvgCircle(args.vg, box.size.x - 3, 3, 4.0);
-		// 	nvgFillColor(args.vg, nvgRGBf(1.0, 0.0, 0.0));
-		// 	nvgFill(args.vg);
-		// 	nvgStrokeColor(args.vg, nvgRGBf(0.5, 0.0, 0.0));
-		// 	nvgStroke(args.vg);
-		// }
+		AccountEmailField *emailField = new AccountEmailField;
+		emailField->placeholder = "Email";
+		emailField->box.size.x = 250.0;
+		menu->addChild(emailField);
+
+		AccountPasswordField *passwordField = new AccountPasswordField;
+		passwordField->placeholder = "Password";
+		passwordField->box.size.x = 250.0;
+		emailField->passwordField = passwordField;
+		menu->addChild(passwordField);
+
+		LogInItem *logInItem = new LogInItem;
+		logInItem->emailField = emailField;
+		logInItem->passwordField = passwordField;
+		passwordField->logInItem = logInItem;
+		menu->addChild(logInItem);
 	}
-};
+}
 
+////////////////////
+// Help
+////////////////////
 
 struct ManualItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
@@ -629,7 +634,6 @@ struct ManualItem : ui::MenuItem {
 	}
 };
 
-
 struct WebsiteItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
 		std::thread t(system::openBrowser, "https://vcvrack.com/");
@@ -637,14 +641,12 @@ struct WebsiteItem : ui::MenuItem {
 	}
 };
 
-
 struct CheckVersionItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
 		settings::checkVersion ^= true;
 	}
 };
 
-
 struct UserFolderItem : ui::MenuItem {
 	void onAction(const event::Action &e) override {
 		std::thread t(system::openFolder, asset::user(""));
@@ -652,7 +654,6 @@ struct UserFolderItem : ui::MenuItem {
 	}
 };
 
-
 struct HelpButton : MenuButton {
 	void onAction(const event::Action &e) override {
 		ui::Menu *menu = createMenu();
@@ -679,6 +680,9 @@ struct HelpButton : MenuButton {
 	}
 };
 
+////////////////////
+// MenuBar
+////////////////////
 
 MenuBar::MenuBar() {
 	const float margin = 5;

src/app/ModuleWidget.cpp

@@ -253,7 +253,7 @@ void ModuleWidget::draw(const DrawArgs &args) {
 	nvgScissor(args.vg, RECT_ARGS(args.clipBox));
 
 	if (module && module->bypass) {
-		nvgGlobalAlpha(args.vg, 0.25);
+		nvgGlobalAlpha(args.vg, 0.33);
 	}
 
 	Widget::draw(args);

src/app/Scene.cpp

@@ -170,7 +170,7 @@ void Scene::onPathDrop(const event::PathDrop &e) {
 void Scene::runCheckVersion() {
 	std::string versionUrl = app::API_URL;
 	versionUrl += "/version";
-	json_t *versionResJ = network::requestJson(network::METHOD_GET, versionUrl, NULL);
+	json_t *versionResJ = network::requestJson(network::GET, versionUrl, NULL);
 
 	if (versionResJ) {
 		json_t *versionJ = json_object_get(versionResJ, "version");

src/network.cpp

@@ -24,7 +24,7 @@ json_t *requestJson(Method method, std::string url, json_t *dataJ) {
 
 	// Process data
 	if (dataJ) {
-		if (method == METHOD_GET) {
+		if (method == GET) {
 			// Append ?key=value&... to url
 			url += "?";
 			bool isFirst = true;
@@ -54,16 +54,16 @@ json_t *requestJson(Method method, std::string url, json_t *dataJ) {
 
 	// Set HTTP method
 	switch (method) {
-		case METHOD_GET:
+		case GET:
 			// This is CURL's default
 			break;
-		case METHOD_POST:
+		case POST:
 			curl_easy_setopt(curl, CURLOPT_POST, true);
 			break;
-		case METHOD_PUT:
+		case PUT:
 			curl_easy_setopt(curl, CURLOPT_PUT, true);
 			break;
-		case METHOD_DELETE:
+		case DELETE:
 			curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
 			break;
 	}

src/plugin.cpp

@@ -212,7 +212,7 @@ static bool syncPlugin(std::string slug, json_t *manifestJ, bool dryRun) {
 
 	if (dryRun) {
 		// Check if available
-		json_t *availableResJ = network::requestJson(network::METHOD_GET, downloadUrl, NULL);
+		json_t *availableResJ = network::requestJson(network::GET, downloadUrl, NULL);
 		if (!availableResJ) {
 			WARN("Could not check whether download is available");
 			return false;
@@ -393,9 +393,9 @@ void logIn(const std::string &email, const std::string &password) {
 	json_t *reqJ = json_object();
 	json_object_set(reqJ, "email", json_string(email.c_str()));
 	json_object_set(reqJ, "password", json_string(password.c_str()));
-	std::string tokenUrl = app::API_URL;
-	tokenUrl += "/token";
-	json_t *resJ = network::requestJson(network::METHOD_POST, tokenUrl, reqJ);
+	std::string url = app::API_URL;
+	url += "/token";
+	json_t *resJ = network::requestJson(network::POST, url, reqJ);
 	json_decref(reqJ);
 
 	if (resJ) {
@@ -440,7 +440,7 @@ bool sync(bool dryRun) {
 	json_object_set(pluginsReqJ, "token", json_string(settings::token.c_str()));
 	std::string pluginsUrl = app::API_URL;
 	pluginsUrl += "/plugins";
-	json_t *pluginsResJ = network::requestJson(network::METHOD_GET, pluginsUrl, pluginsReqJ);
+	json_t *pluginsResJ = network::requestJson(network::GET, pluginsUrl, pluginsReqJ);
 	json_decref(pluginsReqJ);
 	if (!pluginsResJ) {
 		WARN("Request for user's plugins failed");
@@ -459,7 +459,7 @@ bool sync(bool dryRun) {
 	// Get community manifests
 	std::string manifestsUrl = app::API_URL;
 	manifestsUrl += "/community/manifests";
-	json_t *manifestsResJ = network::requestJson(network::METHOD_GET, manifestsUrl, NULL);
+	json_t *manifestsResJ = network::requestJson(network::GET, manifestsUrl, NULL);
 	if (!manifestsResJ) {
 		WARN("Request for community manifests failed");
 		return false;