| @@ -822,7 +822,8 @@ const char* CarlaEngine::renamePlugin(const uint id, const char* const newName) | |||||
| if (const char* const name = getUniquePluginName(newName)) | if (const char* const name = getUniquePluginName(newName)) | ||||
| { | { | ||||
| plugin->setName(name); | plugin->setName(name); | ||||
| return name; | |||||
| delete[] name; | |||||
| return plugin->getName(); | |||||
| } | } | ||||
| setLastError("Unable to get new unique plugin name"); | setLastError("Unable to get new unique plugin name"); | ||||
| @@ -1940,6 +1940,7 @@ def canvasCallback(action, value1, value2, valueStr): | |||||
| elif action == patchcanvas.ACTION_PLUGIN_RENAME: | elif action == patchcanvas.ACTION_PLUGIN_RENAME: | ||||
| pluginId = value1 | pluginId = value1 | ||||
| clientId = value2 | |||||
| newName = valueStr | newName = valueStr | ||||
| if host.rename_plugin(pluginId, newName): | if host.rename_plugin(pluginId, newName): | ||||
| @@ -1947,6 +1948,10 @@ def canvasCallback(action, value1, value2, valueStr): | |||||
| pwidget = gCarla.gui.getPluginSlotWidget(pluginId) | pwidget = gCarla.gui.getPluginSlotWidget(pluginId) | ||||
| if pwidget is not None: | if pwidget is not None: | ||||
| pwidget.setName(newName) | pwidget.setName(newName) | ||||
| patchcanvas.renameGroup(clientId, newName) | |||||
| gCarla.gui.ui.miniCanvasPreview.update() | |||||
| else: | else: | ||||
| CustomMessageBox(gCarla.gui, QMessageBox.Warning, gCarla.gui.tr("Error"), gCarla.gui.tr("Operation failed"), | CustomMessageBox(gCarla.gui, QMessageBox.Warning, gCarla.gui.tr("Error"), gCarla.gui.tr("Operation failed"), | ||||
| host.get_last_error(), QMessageBox.Ok, QMessageBox.Ok) | host.get_last_error(), QMessageBox.Ok, QMessageBox.Ok) | ||||
| @@ -621,6 +621,7 @@ class AbstractPluginSlot(QFrame, PluginEditParentMeta): | |||||
| self.fEditDialog.setPluginId(idx) | self.fEditDialog.setPluginId(idx) | ||||
| def setName(self, name): | def setName(self, name): | ||||
| self.fPluginInfo['name'] = name | |||||
| self.fEditDialog.setName(name) | self.fEditDialog.setName(name) | ||||
| if self.label_name is not None: | if self.label_name is not None: | ||||
| @@ -2612,7 +2612,7 @@ class CanvasBox(QGraphicsItem): | |||||
| newNameTry = QInputDialog.getText(self.parentWidget(), "Rename Plugin", "New name:", QLineEdit.Normal, oldName) | newNameTry = QInputDialog.getText(self.parentWidget(), "Rename Plugin", "New name:", QLineEdit.Normal, oldName) | ||||
| if newNameTry[1] and newNameTry[0] and oldName != newNameTry[0]: | if newNameTry[1] and newNameTry[0] and oldName != newNameTry[0]: | ||||
| canvas.callback(ACTION_PLUGIN_RENAME, self.m_plugin_id, 0, newNameTry[0]) | |||||
| canvas.callback(ACTION_PLUGIN_RENAME, self.m_plugin_id, self.m_group_id, newNameTry[0]) | |||||
| elif act_selected == act_p_remove: | elif act_selected == act_p_remove: | ||||
| canvas.callback(ACTION_PLUGIN_REMOVE, self.m_plugin_id, 0, "") | canvas.callback(ACTION_PLUGIN_REMOVE, self.m_plugin_id, 0, "") | ||||