Skip to content

Commit c7026f8

Browse files
committed
GUI - separate buffer/audio saved dir prefs
previously when you tried to save the audio file, it used the last dir for the text buffers - now these are distinct.
1 parent 9d5f18a commit c7026f8

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Diff for: app/gui/mainwindow.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -1708,11 +1708,11 @@ QString MainWindow::currentTabLabel()
17081708
bool MainWindow::loadFile()
17091709
{
17101710
QString selfilter = QString("%1 (*.rb *.txt)").arg(tr("Buffer files"));
1711-
QString lastDir = gui_settings->value("lastDir", QDir::homePath() + "/Desktop").toString();
1712-
QString fileName = QFileDialog::getOpenFileName(this, tr("Load Sonic Pi Buffer"), lastDir, QString("%1 (*.rb *.txt);;%2 (*.txt);;%3 (*.rb);;%4 (*.*)").arg(tr("Buffer files")).arg(tr("Text files")).arg(tr("Ruby files")).arg(tr("All files")), &selfilter);
1711+
QString lastBufferDir = gui_settings->value("lastBufferDir", QDir::homePath() + "/Desktop").toString();
1712+
QString fileName = QFileDialog::getOpenFileName(this, tr("Load Sonic Pi Buffer"), lastBufferDir, QString("%1 (*.rb *.txt);;%2 (*.txt);;%3 (*.rb);;%4 (*.*)").arg(tr("Buffer files")).arg(tr("Text files")).arg(tr("Ruby files")).arg(tr("All files")), &selfilter);
17131713
if (!fileName.isEmpty())
17141714
{
1715-
gui_settings->setValue("lastDir", QDir(fileName).absolutePath());
1715+
gui_settings->setValue("lastBufferDir", QDir(fileName).absolutePath());
17161716
SonicPiScintilla* p = getCurrentWorkspace();
17171717
loadFile(fileName, p);
17181718
return true;
@@ -1726,12 +1726,12 @@ bool MainWindow::loadFile()
17261726
bool MainWindow::saveAs()
17271727
{
17281728
QString selfilter = QString("%1 (*.rb *.txt)").arg(tr("Buffer files"));
1729-
QString lastDir = gui_settings->value("lastDir", QDir::homePath() + "/Desktop").toString();
1730-
QString fileName = QFileDialog::getSaveFileName(this, tr("Save Current Buffer"), lastDir, QString("%1 (*.rb *.txt);;%2 (*.txt);;%3 (*.rb);;%4 (*.*)").arg(tr("Buffer files")).arg(tr("Text files")).arg(tr("Ruby files")).arg(tr("All files")), &selfilter);
1729+
QString lastBufferDir = gui_settings->value("lastBufferDir", QDir::homePath() + "/Desktop").toString();
1730+
QString fileName = QFileDialog::getSaveFileName(this, tr("Save Current Buffer"), lastBufferDir, QString("%1 (*.rb *.txt);;%2 (*.txt);;%3 (*.rb);;%4 (*.*)").arg(tr("Buffer files")).arg(tr("Text files")).arg(tr("Ruby files")).arg(tr("All files")), &selfilter);
17311731

17321732
if (!fileName.isEmpty())
17331733
{
1734-
gui_settings->setValue("lastDir", QDir(fileName).absolutePath());
1734+
gui_settings->setValue("lastBufferDir", QDir(fileName).absolutePath());
17351735
if (!fileName.contains(QRegularExpression("\\.[a-z]+$")))
17361736
{
17371737
fileName = fileName + ".txt";
@@ -4210,11 +4210,11 @@ void MainWindow::toggleRecording()
42104210
Message msg("/stop-recording");
42114211
msg.pushInt32(guiID);
42124212
sendOSC(msg);
4213-
QString lastDir = gui_settings->value("lastDir", QDir::homePath() + "/Desktop").toString();
4214-
QString fileName = QFileDialog::getSaveFileName(this, tr("Save Recording"), lastDir, tr("Wavefile (*.wav)"));
4213+
QString lastAudioDir = gui_settings->value("lastAudioDir", QDir::homePath() + "/Desktop").toString();
4214+
QString fileName = QFileDialog::getSaveFileName(this, tr("Save Recording"), lastAudioDir, tr("Wavefile (*.wav)"));
42154215
if (!fileName.isEmpty())
42164216
{
4217-
gui_settings->setValue("lastDir", QDir(fileName).absolutePath());
4217+
gui_settings->setValue("lastAudioDir", QDir(fileName).absolutePath());
42184218
Message msg("/save-recording");
42194219
msg.pushInt32(guiID);
42204220
msg.pushStr(fileName.toStdString());

0 commit comments

Comments
 (0)