]> git.pld-linux.org Git - packages/picard.git/commitdiff
1.3.2 (2015-01-07)
authorElan Ruusamäe <glen@delfi.ee>
Sun, 11 Sep 2016 10:32:55 +0000 (13:32 +0300)
committerElan Ruusamäe <glen@delfi.ee>
Sun, 11 Sep 2016 10:32:55 +0000 (13:32 +0300)
- Bugfix: Fixed tags from filename dialog not opening on new installations

e53fb11e61021b5dea33165842abb93b4da28af5.patch [deleted file]
picard.spec

diff --git a/e53fb11e61021b5dea33165842abb93b4da28af5.patch b/e53fb11e61021b5dea33165842abb93b4da28af5.patch
deleted file mode 100644 (file)
index 1eb0c09..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From e53fb11e61021b5dea33165842abb93b4da28af5 Mon Sep 17 00:00:00 2001
-From: Philipp Wolfer <ph.wolfer@gmail.com>
-Date: Wed, 31 Dec 2014 13:33:01 +0100
-Subject: [PATCH] Fixed tags from filename dialog no opening on fresh install.
-
-An exception was thrown when tags_from_filenames_format was not set or empty.
-
-Fixes PICARD-681
----
- picard/ui/tagsfromfilenames.py | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/picard/ui/tagsfromfilenames.py b/picard/ui/tagsfromfilenames.py
-index 7d5ee4b..34bb3d4 100644
---- a/picard/ui/tagsfromfilenames.py
-+++ b/picard/ui/tagsfromfilenames.py
-@@ -49,10 +49,14 @@ def __init__(self, files, parent=None):
-             "%artist% - %album%/%tracknumber% - %title%",
-         ]
-         format = config.persist["tags_from_filenames_format"]
--        if format and format not in items:
--            items.insert(0, format)
-+        if format not in items:
-+            selected_index = 0
-+            if format:
-+                items.insert(0, format)
-+        else:
-+            selected_index = items.index(format)
-         self.ui.format.addItems(items)
--        self.ui.format.setCurrentIndex(items.index(format))
-+        self.ui.format.setCurrentIndex(selected_index)
-         self.ui.buttonbox.addButton(StandardButton(StandardButton.OK), QtGui.QDialogButtonBox.AcceptRole)
-         self.ui.buttonbox.addButton(StandardButton(StandardButton.CANCEL), QtGui.QDialogButtonBox.RejectRole)
-         self.ui.buttonbox.accepted.connect(self.accept)
index 9ced352f56bd95533dffec0da4aaf750fa580e91..bd82d4b6dfb4459e8608c9da120a930f6db402ad 100644 (file)
@@ -1,14 +1,13 @@
 Summary:       Picard, the Next-Generation MusicBrainz Tagger
 Summary(pl.UTF-8):     Picard - znaczniki MusicBrainz nowej generacji
 Name:          picard
-Version:       1.3.1
+Version:       1.3.2
 Release:       1
 License:       GPL v2+
 Group:         Applications
 Source0:       ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/%{name}-%{version}.tar.gz
-# Source0-md5: 2c155a0c4a5589c18bac3016365d7fbd
+# Source0-md5: 0df8899ba834b2c9ac59165122256257
 Patch0:                %{name}-desktop.patch
-Patch1:                e53fb11e61021b5dea33165842abb93b4da28af5.patch
 URL:           http://musicbrainz.org/doc/PicardTagger
 BuildRequires: gettext-tools
 BuildRequires: libstdc++-devel
@@ -42,7 +41,6 @@ pod Windows jak i Linuksem. Niedługo zostanie dodana obsługa Mac OS X.
 %prep
 %setup -q -n %{name}-release-%{version}
 %patch0 -p1
-%patch1 -p1
 
 find -type f | xargs sed -i -e 's|#!.*python.*|#!%{_bindir}/python|g'
 
This page took 0.177408 seconds and 4 git commands to generate.