Martchus
/
tageditor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adapt to tagparser v8

This commit is contained in:
Martchus 2018-07-10 16:35:50 +02:00
parent b6ed69db8a
commit c9d43c7931
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -216,7 +216,7 @@ if(WIDGETS_GUI OR QUICK_GUI)
endif()
# find tagparser
find_package(tagparser 7.0.0 REQUIRED)
find_package(tagparser 8.0.0 REQUIRED)
use_tag_parser()
list(APPEND TEST_LIBRARIES ${TAG_PARSER_SHARED_LIB})

4
application/settings.cpp
View File

@ -81,7 +81,7 @@ void restore()
v.editor.autoCompletition.formatNames = settings.value(QStringLiteral("formatnames"), false).toBool();
v.editor.autoCompletition.fixUmlauts = settings.value(QStringLiteral("fixumlauts"), false).toBool();
settings.endGroup();
BackupHelper::backupDirectory() = settings.value(QStringLiteral("tempdir")).toString().toStdString();
v.editor.backupDirectory = settings.value(QStringLiteral("tempdir")).toString().toStdString();
v.editor.hideCoverButtons = settings.value(QStringLiteral("hidecoverbtn"), false).toBool();
settings.endGroup();
@ -223,7 +223,7 @@ void save()
settings.setValue(QStringLiteral("formatnames"), v.editor.autoCompletition.formatNames);
settings.setValue(QStringLiteral("fixumlauts"), v.editor.autoCompletition.fixUmlauts);
settings.endGroup();
settings.setValue(QStringLiteral("tempdir"), QString::fromStdString(BackupHelper::backupDirectory()));
settings.setValue(QStringLiteral("tempdir"), QString::fromStdString(v.editor.backupDirectory));
settings.setValue(QStringLiteral("hidecoverbtn"), v.editor.hideCoverButtons);
settings.endGroup();

1
application/settings.h
View File

@ -35,6 +35,7 @@ struct AutoCompletition {
struct Editor {
Editor();
std::string backupDirectory;
AdoptFields adoptFields = AdoptFields::Never;
bool saveAndShowNextOnEnter = false;
bool askBeforeDeleting = true;

2
cli/mainfeatures.cpp
View File

@ -482,7 +482,7 @@ void setTagInfo(const SetTagInfoArgs &args)
// set backup path
if (args.backupDirArg.isPresent()) {
BackupHelper::backupDirectory() = args.backupDirArg.values().front();
fileInfo.setBackupDirectory(args.backupDirArg.values().front());
}
// iterate through all specified files

4
gui/settingsdialog.cpp
View File

@ -142,7 +142,7 @@ EditorTempOptionPage::~EditorTempOptionPage()
bool EditorTempOptionPage::apply()
{
if (hasBeenShown()) {
BackupHelper::backupDirectory() = ui()->directoryWidget->lineEdit()->text().toStdString();
values().editor.backupDirectory = ui()->directoryWidget->lineEdit()->text().toStdString();
}
return true;
}
@ -150,7 +150,7 @@ bool EditorTempOptionPage::apply()
void EditorTempOptionPage::reset()
{
if (hasBeenShown()) {
ui()->directoryWidget->lineEdit()->setText(QString::fromStdString(BackupHelper::backupDirectory()));
ui()->directoryWidget->lineEdit()->setText(QString::fromStdString(values().editor.backupDirectory));
}
}