Browse Source

Carla: Make sure the file extension is set when saving files

tags/v0.9.0
falkTX 13 years ago
parent
commit
f35bb24653
2 changed files with 16 additions and 12 deletions
  1. +11
    -10
      src/carla.py
  2. +5
    -2
      src/shared_carla.py

+ 11
- 10
src/carla.py View File

@@ -1799,12 +1799,11 @@ class CarlaMainW(QMainWindow, ui_carla.Ui_CarlaMainW):


@pyqtSlot() @pyqtSlot()
def slot_file_open(self): def slot_file_open(self):
file_filter = self.tr("Carla Project File (*.carxp)")
filename = QFileDialog.getOpenFileName(self, self.tr("Open Carla Project File"),
self.m_savedSettings["Main/DefaultProjectFolder"], filter=file_filter)
fileFilter = self.tr("Carla Project File (*.carxp)")
filenameTry = QFileDialog.getOpenFileName(self, self.tr("Open Carla Project File"), self.m_savedSettings["Main/DefaultProjectFolder"], filter=fileFilter)


if filename:
self.m_project_filename = filename
if filenameTry:
self.m_project_filename = filenameTry
self.slot_remove_all() self.slot_remove_all()
self.load_project() self.load_project()
self.setWindowTitle("Carla - %s" % os.path.basename(self.m_project_filename)) self.setWindowTitle("Carla - %s" % os.path.basename(self.m_project_filename))
@@ -1812,12 +1811,14 @@ class CarlaMainW(QMainWindow, ui_carla.Ui_CarlaMainW):
@pyqtSlot() @pyqtSlot()
def slot_file_save(self, saveAs=False): def slot_file_save(self, saveAs=False):
if self.m_project_filename == None or saveAs: if self.m_project_filename == None or saveAs:
file_filter = self.tr("Carla Project File (*.carxp)")
filename = QFileDialog.getSaveFileName(self, self.tr("Save Carla Project File"),
self.m_savedSettings["Main/DefaultProjectFolder"], filter=file_filter)
fileFilter = self.tr("Carla Project File (*.carxp)")
filenameTry = QFileDialog.getSaveFileName(self, self.tr("Save Carla Project File"), self.m_savedSettings["Main/DefaultProjectFolder"], filter=fileFilter)


if filename:
self.m_project_filename = filename
if filenameTry:
if not filenameTry.endswith(".carxp"):
filenameTry += ".carxp"

self.m_project_filename = filenameTry
self.save_project() self.save_project()
self.setWindowTitle("Carla - %s" % os.path.basename(self.m_project_filename)) self.setWindowTitle("Carla - %s" % os.path.basename(self.m_project_filename))




+ 5
- 2
src/shared_carla.py View File

@@ -1056,7 +1056,7 @@ class PluginEdit(QDialog, ui_carla_edit.Ui_PluginEdit):
@pyqtSlot() @pyqtSlot()
def slot_saveState(self): def slot_saveState(self):
if self.m_pluginInfo['type'] == PLUGIN_LV2: if self.m_pluginInfo['type'] == PLUGIN_LV2:
# FIXME - remove this
# TODO
QMessageBox.warning(self, self.tr("Warning"), self.tr("LV2 Presets is not implemented yet")) QMessageBox.warning(self, self.tr("Warning"), self.tr("LV2 Presets is not implemented yet"))
return self.saveStateLV2() return self.saveStateLV2()


@@ -1076,13 +1076,16 @@ class PluginEdit(QDialog, ui_carla_edit.Ui_PluginEdit):
filenameTry = QFileDialog.getSaveFileName(self, self.tr("Save Plugin State File"), filter=fileFilter) filenameTry = QFileDialog.getSaveFileName(self, self.tr("Save Plugin State File"), filter=fileFilter)


if filenameTry: if filenameTry:
if not filenameTry.endswith(".carxs"):
filenameTry += ".carxs"

self.m_currentStateFilename = filenameTry self.m_currentStateFilename = filenameTry
self.saveState() self.saveState()


@pyqtSlot() @pyqtSlot()
def slot_loadState(self): def slot_loadState(self):
if self.m_pluginInfo['type'] == PLUGIN_LV2: if self.m_pluginInfo['type'] == PLUGIN_LV2:
# FIXME - remove this
# TODO
QMessageBox.warning(self, self.tr("Warning"), self.tr("LV2 Presets is not implemented yet")) QMessageBox.warning(self, self.tr("Warning"), self.tr("LV2 Presets is not implemented yet"))
return self.loadStateLV2() return self.loadStateLV2()




Loading…
Cancel
Save