remember save and restore in RenameFilesDialog

This commit is contained in:
Martchus 2016-05-06 22:48:11 +02:00
parent 81b99e89c2
commit e8610cdc26
6 changed files with 86 additions and 58 deletions

View File

@ -273,6 +273,12 @@ QString &externalScript()
return v;
}
QString &editorScript()
{
static QString v;
return v;
}
void restore()
{
QSettings settings(QSettings::IniFormat, QSettings::UserScope, QApplication::organizationName(), QApplication::applicationName());
@ -418,6 +424,7 @@ void restore()
settings.beginGroup(QStringLiteral("renamedlg"));
scriptSource() = settings.value(QStringLiteral("src")).toInt();
externalScript() = settings.value(QStringLiteral("file")).toString();
editorScript() = settings.value(QStringLiteral("script")).toString();
settings.endGroup();
}
@ -498,6 +505,7 @@ void save()
settings.beginGroup(QStringLiteral("renamedlg"));
settings.setValue(QStringLiteral("src"), Settings::scriptSource());
settings.setValue(QStringLiteral("file"), Settings::externalScript());
settings.setValue(QStringLiteral("script"), Settings::editorScript());
settings.endGroup();
}

View File

@ -104,6 +104,7 @@ QString &coverArtArchiveUrl();
// rename files dialog
int &scriptSource();
QString &externalScript();
QString &editorScript();
void restore();
void save();

View File

@ -30,7 +30,8 @@ RenameFilesDialog::RenameFilesDialog(QWidget *parent) :
m_ui(new Ui::RenameFilesDialog),
m_itemsProcessed(0),
m_errorsOccured(0),
m_changingSelection(false)
m_changingSelection(false),
m_scriptModified(false)
{
setAttribute(Qt::WA_QuitOnClose, false);
m_ui->setupUi(this);
@ -42,7 +43,6 @@ RenameFilesDialog::RenameFilesDialog(QWidget *parent) :
font.setFixedPitch(true);
m_ui->javaScriptPlainTextEdit->setFont(font);
m_highlighter = new JavaScriptHighlighter(m_ui->javaScriptPlainTextEdit->document());
pasteDefaultExampleScript();
m_ui->externalScriptPage->setBackgroundRole(QPalette::Base);
// setup preview tree view
@ -71,6 +71,12 @@ RenameFilesDialog::RenameFilesDialog(QWidget *parent) :
m_ui->sourceFileStackedWidget->setCurrentIndex(Settings::scriptSource());
}
m_ui->scriptFilePathLineEdit->setText(Settings::externalScript());
if(!Settings::editorScript().isEmpty()) {
m_ui->javaScriptPlainTextEdit->setPlainText(Settings::editorScript());
m_scriptModified = true;
} else {
pasteDefaultExampleScript();
}
// connect signals and slots
connect(m_ui->generatePreviewPushButton, &QPushButton::clicked, this, &RenameFilesDialog::startGeneratingPreview);
@ -85,6 +91,7 @@ RenameFilesDialog::RenameFilesDialog(QWidget *parent) :
connect(m_ui->previewTreeView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &RenameFilesDialog::previewItemSelected);
connect(m_ui->toggleScriptSourcePushButton, &QPushButton::clicked, this, &RenameFilesDialog::toggleScriptSource);
connect(m_ui->selectScriptFilePushButton, &QPushButton::clicked, this, &RenameFilesDialog::showScriptFileSelectionDlg);
connect(m_ui->javaScriptPlainTextEdit, &QPlainTextEdit::undoAvailable, this, &RenameFilesDialog::setScriptModified);
}
RenameFilesDialog::~RenameFilesDialog()
@ -107,6 +114,11 @@ bool RenameFilesDialog::event(QEvent *event)
// save settings
Settings::scriptSource() = m_ui->sourceFileStackedWidget->currentIndex();
Settings::externalScript() = m_ui->scriptFilePathLineEdit->text();
if(m_scriptModified) {
Settings::editorScript() = m_ui->javaScriptPlainTextEdit->toPlainText();
} else {
Settings::editorScript().clear();
}
break;
default:
;
@ -373,4 +385,9 @@ void RenameFilesDialog::toggleScriptSource()
}
}
void RenameFilesDialog::setScriptModified(bool scriptModified)
{
m_scriptModified = scriptModified;
}
}

View File

@ -51,6 +51,7 @@ private slots:
void showSelectScriptFileDlg();
void abortClose();
void toggleScriptSource();
void setScriptModified(bool scriptModified);
private:
std::unique_ptr<Ui::RenameFilesDialog> m_ui;
@ -59,6 +60,7 @@ private:
int m_itemsProcessed;
int m_errorsOccured;
bool m_changingSelection;
bool m_scriptModified;
};
}

View File

@ -2334,8 +2334,8 @@ another position would prevent rewriting the entire file</source>
</message>
<message>
<location filename="../gui/renamefilesdialog.ui" line="697"/>
<location filename="../gui/renamefilesdialog.cpp" line="208"/>
<location filename="../gui/renamefilesdialog.cpp" line="233"/>
<location filename="../gui/renamefilesdialog.cpp" line="220"/>
<location filename="../gui/renamefilesdialog.cpp" line="245"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
@ -2355,8 +2355,8 @@ another position would prevent rewriting the entire file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="152"/>
<location filename="../gui/renamefilesdialog.cpp" line="187"/>
<location filename="../gui/renamefilesdialog.cpp" line="164"/>
<location filename="../gui/renamefilesdialog.cpp" line="199"/>
<source>Abort</source>
<translation type="unfinished"></translation>
</message>
@ -2402,28 +2402,28 @@ another position would prevent rewriting the entire file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="150"/>
<location filename="../gui/renamefilesdialog.cpp" line="162"/>
<source>Generating preview ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="159"/>
<location filename="../gui/renamefilesdialog.cpp" line="171"/>
<source>The script is not valid.
Error in line %1: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="175"/>
<location filename="../gui/renamefilesdialog.cpp" line="187"/>
<source>The selected directory doesn&apos;t exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="185"/>
<location filename="../gui/renamefilesdialog.cpp" line="197"/>
<source>Applying changings ...</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<location filename="../gui/renamefilesdialog.cpp" line="198"/>
<location filename="../gui/renamefilesdialog.cpp" line="210"/>
<source>%1 files/directories processed</source>
<translation type="unfinished">
<numerusform></numerusform>
@ -2431,13 +2431,13 @@ Error in line %1: %3</source>
</translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="212"/>
<location filename="../gui/renamefilesdialog.cpp" line="224"/>
<source>Preview has been generated.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<location filename="../gui/renamefilesdialog.cpp" line="226"/>
<location filename="../gui/renamefilesdialog.cpp" line="244"/>
<location filename="../gui/renamefilesdialog.cpp" line="238"/>
<location filename="../gui/renamefilesdialog.cpp" line="256"/>
<source>%1 error(s) occured.</source>
<translation type="unfinished">
<numerusform></numerusform>
@ -2445,8 +2445,8 @@ Error in line %1: %3</source>
</translation>
</message>
<message numerus="yes">
<location filename="../gui/renamefilesdialog.cpp" line="213"/>
<location filename="../gui/renamefilesdialog.cpp" line="237"/>
<location filename="../gui/renamefilesdialog.cpp" line="225"/>
<location filename="../gui/renamefilesdialog.cpp" line="249"/>
<source>%1 files/directories have been processed.</source>
<translation type="unfinished">
<numerusform></numerusform>
@ -2454,12 +2454,12 @@ Error in line %1: %3</source>
</translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="217"/>
<location filename="../gui/renamefilesdialog.cpp" line="229"/>
<source>No files and directories have been found.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<location filename="../gui/renamefilesdialog.cpp" line="201"/>
<location filename="../gui/renamefilesdialog.cpp" line="213"/>
<source>%1 error(s) occured</source>
<translation type="unfinished">
<numerusform></numerusform>
@ -2467,62 +2467,62 @@ Error in line %1: %3</source>
</translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="137"/>
<location filename="../gui/renamefilesdialog.cpp" line="149"/>
<source>There is no external script file is selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="144"/>
<location filename="../gui/renamefilesdialog.cpp" line="156"/>
<source>Unable to open external script file.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="162"/>
<location filename="../gui/renamefilesdialog.cpp" line="174"/>
<source>An error occured when parsing the script: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="170"/>
<location filename="../gui/renamefilesdialog.cpp" line="182"/>
<source>The script is empty.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="222"/>
<location filename="../gui/renamefilesdialog.cpp" line="234"/>
<source>Generation of preview has been aborted prematurely.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="236"/>
<location filename="../gui/renamefilesdialog.cpp" line="248"/>
<source>Changins applied.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="240"/>
<location filename="../gui/renamefilesdialog.cpp" line="252"/>
<source>Applying has been aborted prematurely.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="308"/>
<location filename="../gui/renamefilesdialog.cpp" line="320"/>
<source>Unable to open script file.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="314"/>
<location filename="../gui/renamefilesdialog.cpp" line="326"/>
<source>Select script</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="335"/>
<location filename="../gui/renamefilesdialog.cpp" line="347"/>
<source>Clipboard contains no text.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="348"/>
<location filename="../gui/renamefilesdialog.cpp" line="360"/>
<source>Expand all</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="349"/>
<location filename="../gui/renamefilesdialog.cpp" line="361"/>
<source>Collapse all</source>
<translation type="unfinished"></translation>
</message>

View File

@ -2299,7 +2299,7 @@ another position would prevent rewriting the entire file</source>
<translation></translation>
</message>
<message numerus="yes">
<location filename="../gui/renamefilesdialog.cpp" line="198"/>
<location filename="../gui/renamefilesdialog.cpp" line="210"/>
<source>%1 files/directories processed</source>
<translation>
<numerusform>%1 file/directory processed</numerusform>
@ -2307,23 +2307,23 @@ another position would prevent rewriting the entire file</source>
</translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="212"/>
<location filename="../gui/renamefilesdialog.cpp" line="224"/>
<source>Preview has been generated.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="217"/>
<location filename="../gui/renamefilesdialog.cpp" line="229"/>
<source>No files and directories have been found.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="222"/>
<location filename="../gui/renamefilesdialog.cpp" line="234"/>
<source>Generation of preview has been aborted prematurely.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<location filename="../gui/renamefilesdialog.cpp" line="226"/>
<location filename="../gui/renamefilesdialog.cpp" line="244"/>
<location filename="../gui/renamefilesdialog.cpp" line="238"/>
<location filename="../gui/renamefilesdialog.cpp" line="256"/>
<source>%1 error(s) occured.</source>
<translation>
<numerusform>%1 error occured.</numerusform>
@ -2331,8 +2331,8 @@ another position would prevent rewriting the entire file</source>
</translation>
</message>
<message numerus="yes">
<location filename="../gui/renamefilesdialog.cpp" line="213"/>
<location filename="../gui/renamefilesdialog.cpp" line="237"/>
<location filename="../gui/renamefilesdialog.cpp" line="225"/>
<location filename="../gui/renamefilesdialog.cpp" line="249"/>
<source>%1 files/directories have been processed.</source>
<translation>
<numerusform>%1 file/directory has been processed.</numerusform>
@ -2355,54 +2355,54 @@ another position would prevent rewriting the entire file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="137"/>
<location filename="../gui/renamefilesdialog.cpp" line="149"/>
<source>There is no external script file is selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="144"/>
<location filename="../gui/renamefilesdialog.cpp" line="156"/>
<source>Unable to open external script file.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="150"/>
<location filename="../gui/renamefilesdialog.cpp" line="162"/>
<source>Generating preview ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="152"/>
<location filename="../gui/renamefilesdialog.cpp" line="187"/>
<location filename="../gui/renamefilesdialog.cpp" line="164"/>
<location filename="../gui/renamefilesdialog.cpp" line="199"/>
<source>Abort</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="159"/>
<location filename="../gui/renamefilesdialog.cpp" line="171"/>
<source>The script is not valid.
Error in line %1: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="162"/>
<location filename="../gui/renamefilesdialog.cpp" line="174"/>
<source>An error occured when parsing the script: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="170"/>
<location filename="../gui/renamefilesdialog.cpp" line="182"/>
<source>The script is empty.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="175"/>
<location filename="../gui/renamefilesdialog.cpp" line="187"/>
<source>The selected directory doesn&apos;t exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="185"/>
<location filename="../gui/renamefilesdialog.cpp" line="197"/>
<source>Applying changings ...</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<location filename="../gui/renamefilesdialog.cpp" line="201"/>
<location filename="../gui/renamefilesdialog.cpp" line="213"/>
<source>%1 error(s) occured</source>
<translation>
<numerusform>%1 error occured</numerusform>
@ -2410,37 +2410,37 @@ Error in line %1: %3</source>
</translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="236"/>
<location filename="../gui/renamefilesdialog.cpp" line="248"/>
<source>Changins applied.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="240"/>
<location filename="../gui/renamefilesdialog.cpp" line="252"/>
<source>Applying has been aborted prematurely.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="308"/>
<location filename="../gui/renamefilesdialog.cpp" line="320"/>
<source>Unable to open script file.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="314"/>
<location filename="../gui/renamefilesdialog.cpp" line="326"/>
<source>Select script</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="335"/>
<location filename="../gui/renamefilesdialog.cpp" line="347"/>
<source>Clipboard contains no text.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="348"/>
<location filename="../gui/renamefilesdialog.cpp" line="360"/>
<source>Expand all</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/renamefilesdialog.cpp" line="349"/>
<location filename="../gui/renamefilesdialog.cpp" line="361"/>
<source>Collapse all</source>
<translation type="unfinished"></translation>
</message>
@ -2501,8 +2501,8 @@ Error in line %1: %3</source>
</message>
<message>
<location filename="../gui/renamefilesdialog.ui" line="697"/>
<location filename="../gui/renamefilesdialog.cpp" line="208"/>
<location filename="../gui/renamefilesdialog.cpp" line="233"/>
<location filename="../gui/renamefilesdialog.cpp" line="220"/>
<location filename="../gui/renamefilesdialog.cpp" line="245"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>