diff --git a/resources/ui/carla.ui b/resources/ui/carla.ui index 56fa75916..68c7c8b0e 100644 --- a/resources/ui/carla.ui +++ b/resources/ui/carla.ui @@ -14,8 +14,8 @@ Carla - - + + @@ -140,109 +140,136 @@ - - - - 0 + + + + Qt::Horizontal - - - Plugins - - - - 1 - - - 2 - - - - - - 1 + + + 0 + + + + Plugins + + + + 1 + + + 2 + + + + + + 1 + + + 0 + + + + + + + + Qt::Vertical - - 0 + + + 20 + 333 + - - - + + + + + + + Patchbay + + + + 0 + + + 2 + + + + + Qt::ScrollBarAlwaysOn + + + Qt::ScrollBarAlwaysOn + + + + + + + + - - - Qt::Vertical + + + + 0 + 0 + - + - 20 - 333 + 210 + 0 - - - - - - - Patchbay - - - - 0 - - - 2 - - - - - Qt::ScrollBarAlwaysOn + + QTabWidget::East - - Qt::ScrollBarAlwaysOn + + 0 + + + Disk + + + + 0 + + + 0 + + + + + + - - - - - - - - - 210 - 0 - - - - - 210 - 16777215 - - - - QTabWidget::East - - - 0 - - - - Disk - - - - 0 - - - 0 - - - - Qt::ScrollBarAlwaysOn + + + + 210 + 162 + + + + + 210 + 162 + + + + QFrame::StyledPanel + + + QFrame::Raised @@ -250,28 +277,6 @@ - - - - - 210 - 162 - - - - - 210 - 162 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - diff --git a/source/backend/CarlaNative.h b/source/backend/CarlaNative.h index e7b564080..24318cb75 100644 --- a/source/backend/CarlaNative.h +++ b/source/backend/CarlaNative.h @@ -218,7 +218,7 @@ void carla_register_native_plugin_audiofile(); #ifdef WANT_MIDIFILE // MidiFile -void carla_register_native_plugin_midiFile(); +void carla_register_native_plugin_midifile(); #endif #ifdef WANT_OPENGL diff --git a/source/backend/native/midi-file.cpp b/source/backend/native/midi-file.cpp index 6786ff295..12bf053f4 100644 --- a/source/backend/native/midi-file.cpp +++ b/source/backend/native/midi-file.cpp @@ -216,7 +216,7 @@ private: // ----------------------------------------------------------------------- -static const PluginDescriptor midiFileDesc = { +static const PluginDescriptor midifileDesc = { /* category */ PLUGIN_CATEGORY_UTILITY, /* hints */ static_cast(PLUGIN_IS_RTSAFE|PLUGIN_HAS_GUI), /* audioIns */ 0, @@ -226,7 +226,7 @@ static const PluginDescriptor midiFileDesc = { /* paramIns */ 0, /* paramOuts */ 0, /* name */ "MIDI File", - /* label */ "midiFile", + /* label */ "midifile", /* maker */ "falkTX", /* copyright */ "GNU GPL v2+", PluginDescriptorFILL(MidiFilePlugin) @@ -234,9 +234,9 @@ static const PluginDescriptor midiFileDesc = { // ----------------------------------------------------------------------- -void carla_register_native_plugin_midiFile() +void carla_register_native_plugin_midifile() { - carla_register_native_plugin(&midiFileDesc); + carla_register_native_plugin(&midifileDesc); } // ----------------------------------------------------------------------- diff --git a/source/backend/plugin/NativePlugin.cpp b/source/backend/plugin/NativePlugin.cpp index 11bd4c8da..4d1a712b9 100644 --- a/source/backend/plugin/NativePlugin.cpp +++ b/source/backend/plugin/NativePlugin.cpp @@ -43,7 +43,7 @@ void carla_register_all_plugins() #ifdef WANT_MIDIFILE // MidiFile - carla_register_native_plugin_midiFile(); + carla_register_native_plugin_midifile(); #endif #ifdef WANT_OPENGL diff --git a/source/carla.py b/source/carla.py index c2a7cc4bd..b8d1131e3 100755 --- a/source/carla.py +++ b/source/carla.py @@ -579,8 +579,8 @@ class CarlaMainW(QMainWindow): self.ui.act_plugin_remove_all.setEnabled(False) # FIXME: Qt4 needs this so it properly create & resize the canvas - self.ui.tabWidget.setCurrentIndex(1) - self.ui.tabWidget.setCurrentIndex(0) + self.ui.tabMain.setCurrentIndex(1) + self.ui.tabMain.setCurrentIndex(0) # ------------------------------------------------------------- # Set-up Canvas @@ -740,7 +740,7 @@ class CarlaMainW(QMainWindow): elif extension in ("mid", "midi"): self.fLastLoadedPluginId = -2 - if Carla.host.add_plugin(BINARY_NATIVE, PLUGIN_INTERNAL, None, basename, "midifile", None): + if Carla.host.add_plugin(BINARY_NATIVE, PLUGIN_INTERNAL, None, basename, "midiFile", None): while (self.fLastLoadedPluginId == -2): sleep(0.2) idx = self.fLastLoadedPluginId self.fLastLoadedPluginId = -1 @@ -1423,6 +1423,7 @@ class CarlaMainW(QMainWindow): def saveSettings(self): settings = QSettings() settings.setValue("Geometry", self.saveGeometry()) + settings.setValue("SplitterState", self.ui.splitter.saveState()) settings.setValue("ShowToolbar", self.ui.toolBar.isVisible()) #settings.setValue("ShowTransport", self.ui.frame_transport.isVisible()) settings.setValue("HorizontalScrollBarValue", self.ui.graphicsView.horizontalScrollBar().value()) @@ -1443,6 +1444,11 @@ class CarlaMainW(QMainWindow): #self.ui.frame_transport.setVisible(showTransport) self.ui.frame_transport.setVisible(False) + if settings.contains("SplitterState"): + self.ui.splitter.restoreState(settings.value("SplitterState", "")) + else: + self.ui.splitter.setSizes([99999, 210]) + self.fSavedSettings = { "Main/DefaultProjectFolder": settings.value("Main/DefaultProjectFolder", HOME, type=str), "Main/RefreshInterval": settings.value("Main/RefreshInterval", 50, type=int), @@ -1484,7 +1490,7 @@ class CarlaMainW(QMainWindow): os.environ["SFZ_PATH"] = splitter.join(Carla.SFZ_PATH) def resizeEvent(self, event): - if self.ui.tabWidget.currentIndex() == 0: + if self.ui.tabMain.currentIndex() == 0: # Force update of 2nd tab width = self.ui.tab_plugins.width()-4 height = self.ui.tab_plugins.height()-4