From a5d33bc914fe490ecb2df02ab3a5c1daf1782f97 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Fri, 23 Nov 2018 14:30:39 +0100 Subject: [PATCH] PICARD-1395: Moved folksonomy_tags opton from metadata to genre dialog --- picard/ui/options/genres.py | 3 +++ picard/ui/options/metadata.py | 3 --- picard/ui/ui_options_genres.py | 4 ++++ picard/ui/ui_options_metadata.py | 8 ++------ ui/options_genres.ui | 7 +++++++ ui/options_metadata.ui | 8 -------- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/picard/ui/options/genres.py b/picard/ui/options/genres.py index 0a78c7f10..7da9a7e4f 100644 --- a/picard/ui/options/genres.py +++ b/picard/ui/options/genres.py @@ -41,6 +41,7 @@ class GenresOptionsPage(OptionsPage): config.TextOption("setting", "join_tags", ""), config.BoolOption("setting", "only_my_tags", False), config.BoolOption("setting", "artists_tags", False), + config.BoolOption("setting", "folksonomy_tags", False), ] def __init__(self, parent=None): @@ -55,6 +56,7 @@ class GenresOptionsPage(OptionsPage): self.ui.ignore_tags.setText(config.setting["ignore_tags"]) self.ui.only_my_tags.setChecked(config.setting["only_my_tags"]) self.ui.artists_tags.setChecked(config.setting["artists_tags"]) + self.ui.folksonomy_tags.setChecked(config.setting["folksonomy_tags"]) def save(self): config.setting["max_tags"] = self.ui.max_tags.value() @@ -63,6 +65,7 @@ class GenresOptionsPage(OptionsPage): config.setting["ignore_tags"] = self.ui.ignore_tags.text() config.setting["only_my_tags"] = self.ui.only_my_tags.isChecked() config.setting["artists_tags"] = self.ui.artists_tags.isChecked() + config.setting["folksonomy_tags"] = self.ui.folksonomy_tags.isChecked() register_options_page(GenresOptionsPage) diff --git a/picard/ui/options/metadata.py b/picard/ui/options/metadata.py index 37512a4fe..b8f8a0fb5 100644 --- a/picard/ui/options/metadata.py +++ b/picard/ui/options/metadata.py @@ -42,7 +42,6 @@ class MetadataOptionsPage(OptionsPage): config.BoolOption("setting", "translate_artist_names", False), config.BoolOption("setting", "release_ars", True), config.BoolOption("setting", "track_ars", False), - config.BoolOption("setting", "folksonomy_tags", False), config.BoolOption("setting", "convert_punctuation", True), config.BoolOption("setting", "standardize_artists", False), config.BoolOption("setting", "standardize_instruments", True), @@ -71,7 +70,6 @@ class MetadataOptionsPage(OptionsPage): self.ui.convert_punctuation.setChecked(config.setting["convert_punctuation"]) self.ui.release_ars.setChecked(config.setting["release_ars"]) self.ui.track_ars.setChecked(config.setting["track_ars"]) - self.ui.folksonomy_tags.setChecked(config.setting["folksonomy_tags"]) self.ui.va_name.setText(config.setting["va_name"]) self.ui.nat_name.setText(config.setting["nat_name"]) self.ui.standardize_artists.setChecked(config.setting["standardize_artists"]) @@ -83,7 +81,6 @@ class MetadataOptionsPage(OptionsPage): config.setting["convert_punctuation"] = self.ui.convert_punctuation.isChecked() config.setting["release_ars"] = self.ui.release_ars.isChecked() config.setting["track_ars"] = self.ui.track_ars.isChecked() - config.setting["folksonomy_tags"] = self.ui.folksonomy_tags.isChecked() config.setting["va_name"] = self.ui.va_name.text() nat_name = self.ui.nat_name.text() if nat_name != config.setting["nat_name"]: diff --git a/picard/ui/ui_options_genres.py b/picard/ui/ui_options_genres.py index 51bfaed33..d2d856f9a 100644 --- a/picard/ui/ui_options_genres.py +++ b/picard/ui/ui_options_genres.py @@ -28,6 +28,9 @@ class Ui_GenresOptionsPage(object): self.artists_tags.setEnabled(True) self.artists_tags.setObjectName("artists_tags") self.verticalLayout.addWidget(self.artists_tags) + self.folksonomy_tags = QtWidgets.QCheckBox(self.rename_files_3) + self.folksonomy_tags.setObjectName("folksonomy_tags") + self.verticalLayout.addWidget(self.folksonomy_tags) self.hboxlayout = QtWidgets.QHBoxLayout() self.hboxlayout.setContentsMargins(0, 0, 0, 0) self.hboxlayout.setSpacing(6) @@ -103,6 +106,7 @@ class Ui_GenresOptionsPage(object): self.ignore_tags_2.setText(_("Ignore tags:")) self.only_my_tags.setText(_("Only use my tags")) self.artists_tags.setText(_("Fall back on album\'s artists tags if no tags are found for the release or release group")) + self.folksonomy_tags.setText(_("Use folksonomy tags as genre")) self.label_5.setText(_("Minimal tag usage:")) self.min_tag_usage.setSuffix(_(" %")) self.label_6.setText(_("Maximum number of tags:")) diff --git a/picard/ui/ui_options_metadata.py b/picard/ui/ui_options_metadata.py index c3abce3dc..1b98d547b 100644 --- a/picard/ui/ui_options_metadata.py +++ b/picard/ui/ui_options_metadata.py @@ -43,9 +43,6 @@ class Ui_MetadataOptionsPage(object): self.track_ars = QtWidgets.QCheckBox(self.metadata_groupbox) self.track_ars.setObjectName("track_ars") self.verticalLayout_3.addWidget(self.track_ars) - self.folksonomy_tags = QtWidgets.QCheckBox(self.metadata_groupbox) - self.folksonomy_tags.setObjectName("folksonomy_tags") - self.verticalLayout_3.addWidget(self.folksonomy_tags) self.verticalLayout.addWidget(self.metadata_groupbox) self.custom_fields_groupbox = QtWidgets.QGroupBox(MetadataOptionsPage) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum) @@ -89,8 +86,7 @@ class Ui_MetadataOptionsPage(object): MetadataOptionsPage.setTabOrder(self.standardize_artists, self.convert_punctuation) MetadataOptionsPage.setTabOrder(self.convert_punctuation, self.release_ars) MetadataOptionsPage.setTabOrder(self.release_ars, self.track_ars) - MetadataOptionsPage.setTabOrder(self.track_ars, self.folksonomy_tags) - MetadataOptionsPage.setTabOrder(self.folksonomy_tags, self.va_name) + MetadataOptionsPage.setTabOrder(self.track_ars, self.va_name) MetadataOptionsPage.setTabOrder(self.va_name, self.va_name_default) MetadataOptionsPage.setTabOrder(self.va_name_default, self.nat_name) MetadataOptionsPage.setTabOrder(self.nat_name, self.nat_name_default) @@ -104,9 +100,9 @@ class Ui_MetadataOptionsPage(object): self.convert_punctuation.setText(_("Convert Unicode punctuation characters to ASCII")) self.release_ars.setText(_("Use release relationships")) self.track_ars.setText(_("Use track relationships")) - self.folksonomy_tags.setText(_("Use folksonomy tags as genre")) self.custom_fields_groupbox.setTitle(_("Custom Fields")) self.label_6.setText(_("Various artists:")) self.label_7.setText(_("Non-album tracks:")) self.nat_name_default.setText(_("Default")) self.va_name_default.setText(_("Default")) + diff --git a/ui/options_genres.ui b/ui/options_genres.ui index e93f4878b..841bf5e61 100644 --- a/ui/options_genres.ui +++ b/ui/options_genres.ui @@ -44,6 +44,13 @@ + + + + Use folksonomy tags as genre + + + diff --git a/ui/options_metadata.ui b/ui/options_metadata.ui index 15cf61317..d78660740 100644 --- a/ui/options_metadata.ui +++ b/ui/options_metadata.ui @@ -77,13 +77,6 @@ - - - - Use folksonomy tags as genre - - - @@ -176,7 +169,6 @@ convert_punctuation release_ars track_ars - folksonomy_tags va_name va_name_default nat_name