Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 4

flacon.changes Changed

flacon.spec Changed

@@ -1,29 +1,45 @@
-# vim: set ts=4 sw=4 et:
-# kate: space-indent on; indent-width 4;
 #
-# spec file for package flacon (Version 0.5.7)
+# spec file for package flacon
 #
-# Copyright (c) 2010-2011 Kyrill Detinov
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 Name: flacon
-Version: 0.5.7
+Version: 0.6.0
 Release: 0
-License: GPLv3+
+License: GPL-3.0+
 Summary: Split Compressed Audio CD Image to Tracks
-URL: http://code.google.com/p/flacon/
+Url: http://code.google.com/p/flacon/
 Group: Productivity/Multimedia/Sound/Editors and Convertors
-Source0: %{name}-%{version}.tar.bz2
+Source0: http://flacon.googlecode.com/files/%{name}-%{version}.tgz
+BuildRequires: hicolor-icon-theme
 BuildRequires: python-base
-%if 0%{?suse_version} < 1120
-BuildRequires: libqt4-devel
-BuildRequires: python-qt4
-%else
 BuildRequires: python-qt4-devel
-%endif
 BuildRequires: update-desktop-files
+# not actually needed for build, but in order to make the build fail
+# if the runtime dependencies are not available in the repository:
+BuildRequires: faac
+BuildRequires: flac
+BuildRequires: lame
+BuildRequires: mac
+BuildRequires: mp3gain
+BuildRequires: shntool
+BuildRequires: ttaenc
+BuildRequires: vorbis-tools
+BuildRequires: vorbisgain
+BuildRequires: wavpack
+Requires: faac
 Requires: flac
 Requires: lame
 Requires: mac
@@ -34,19 +50,6 @@
 Requires: wavpack
 Recommends: mp3gain
 Recommends: vorbisgain
-# not actually needed for build, but in order to make the build fail
-# if the runtime dependencies are not available in the repository:
-BuildRequires: flac
-BuildRequires: lame
-BuildRequires: mac
-BuildRequires: python-qt4
-BuildRequires: shntool
-BuildRequires: ttaenc
-BuildRequires: vorbis-tools
-BuildRequires: wavpack
-BuildRequires: mp3gain
-BuildRequires: vorbisgain
-BuildRequires: hicolor-icon-theme
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 BuildArch: noarch
 %{py_requires}
@@ -58,32 +61,31 @@
 makes it possible to conveniently revise or specify tags both for all
 tracks at once or for each tag separately.
 
-
-
-Authors:
---------
- Alexander Sokolov <asokol@mail.ru>
-
 %prep
 %setup -q
 
 %build
-%__make clean
-%__make %{?_smp_mflags}
+make clean
+make %{?_smp_mflags}
 
 %install
-%makeinstall
+%make_install
+rm -f %{buildroot}%{_datadir}/%{name}/encoders/*_config_ui.py*
 %suse_update_desktop_file -r %{name} AudioVideo AudioVideoEditing
 
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
+%if 0%{?suse_version} >= 1140
+%post
+%icon_theme_cache_post
+
+%postun
+%icon_theme_cache_postun
+%endif
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/flacon
-%{_datadir}/flacon
+%{_bindir}/%{name}
+%{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/*/*/apps/flacon.*
+%{_datadir}/icons/hicolor/*/*/%{name}.*
 
 %changelog
-

flacon-0.5.7.tar.bz2/encoder.py Deleted

@@ -1,247 +0,0 @@
-# -*- coding: utf-8 -*-
-# Project : flacon
-# File : encoder.py
-# (c) Alexander Sokolov sokoloff.a@gmail.com
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-
-#import errno
-import exceptions
-import re
-import sys
-import time
-
-
-from PyQt4 import QtCore
-from PyQt4.QtCore import *
-
-from flaconglobal import *
-from project import *
-from converter import *
-from errors import *
-
-
-class Encoder(ConverterThread):
- #****************************************************************
- #
- #****************************************************************
- def __init__(self, disc, track):
- ConverterThread.__init__(self, disc)
- self._wavFile = QString()
- self._outFile = QString()
- self._proc = None
- self._track = track
- self._trackIndex = track.index()
- self._outFile = track.resultFilePath()
-
-
- #****************************************************************
- #
- #****************************************************************
- def track(self):
- return self._track
-
-
- #****************************************************************
- #
- #****************************************************************
- def inputDataReady(self, discIndex, trackIndex, fileName):
- if self._trackIndex != trackIndex:
- return
-
- self._wavFile = QString(fileName)
-
- if self.isReadyStart():
- self.progressChanged(Statuses.Queued, -1)
- self.emit(SIGNAL("readyStart()"))
-
-
- #****************************************************************
- #
- #****************************************************************
- def wavFile(self):
- return self._wavFile
-
-
- #****************************************************************
- #
- #****************************************************************
- def isReadyStart(self):
- return not self._wavFile.isEmpty() and self._track
-
-
- #****************************************************************
- #
- #****************************************************************
- def _run(self):
- self.progressChanged(Statuses.Encoding, 0)
-
- if self._cancel: raise Abort()
- self.prepare()
-
- if self._cancel: raise Abort()
- self.encode()
-
- if self._cancel: raise Abort()
- self.deleteWavFile()
-
- self.trackReady(self._outFile)
-
-
- #****************************************************************
- #
- #****************************************************************
- def prepare(self):
- outFile = QFile(self._track.resultFilePath())
- outDir = QFileInfo(outFile).dir()
-
- self.createDir(outDir.absolutePath())
-
- if outFile.exists() and not outFile.remove():
- raise ConvertError(self.tr("Can't delete file:\n%1\n%2").arg(outFile.fileName()).arg(outFile.errorString()))
-
-
- #****************************************************************
- #
- #****************************************************************
- def encode(self):
- args = self.getEncoderArgs()
- #print unicode(args.join(" "))
-
- self._proc = tryPopen(args, stdin=subprocess.PIPE, stderr=subprocess.PIPE, stdout=subprocess.PIPE, close_fds=True)
-
- progress = 0
-
- total = os.path.getsize(unicode(self._wavFile))
-
- ready = 0
- buff = ''
- buffSize = int(total / 200)
-
- f = open(unicode(self._wavFile), 'rb')
- while True:
-
- if self._cancel:
- self._proc.terminate()
- self._proc.wait()
- raise Abort()
-
- buff = f.read(buffSize)
- if not buff: break
-
- ready+=buffSize
- p = int(ready * 100 / total)
- if (progress != p):
- progress = p
- self.progressChanged(Statuses.Encoding, progress)
-
- try:
- self._proc.stdin.write(buff)
-
- except:
- raise ConvertError(pipeToStr(self._proc.stderr))
-
- self._proc.stdin.close()
- res = self._proc.wait()
- if res:
- raise ConvertError(pipeToStr(self._proc.stderr))
-
-
- #****************************************************************
- #
- #****************************************************************
- def getEncoderArgs(self):
- raise TypeError('Abstract method "Encoder.getEncoderArgs" called')
-
-
- #****************************************************************
- #
- #****************************************************************
- def deleteWavFile(self):
- f = QFile(self._wavFile)
- if f.exists() and not f.remove():
- raise ConvertError(self.tr("Can't delete file:\n%1\n%2").arg(f.fileName()).arg(f.errorString()))
-
-
-class Gain(ConverterThread):
- #****************************************************************
- #
- #****************************************************************
- def __init__(self, disc, trackIndexses):
- ConverterThread.__init__(self, disc)
- self._files = QStringList()
- self._trackIndexses = trackIndexses[:]
-
-
- #****************************************************************
- #
- #****************************************************************
- def inputDataReady(self, diskIndex, trackIndex, fileName):
- self._trackIndex = trackIndex
- self._files << QString(fileName)
- self.progressChanged(Statuses.WaitGain, -1)
-
- if self.isReadyStart():
- self.emit(SIGNAL("readyStart()"))
-
-
- #****************************************************************
- #
- #****************************************************************

flacon-0.5.7.tar.bz2/images/wait.png Deleted

flacon-0.5.7.tar.bz2/Makefile -> flacon-0.6.0.tgz/Makefile Changed

@@ -1,7 +1,7 @@
 
 SOURCES = $(shell ls *.py | grep -v "_ui.py")
 ENCODERS = $(shell ls encoders/*.py)
-FORMS = $(shell ls *.ui)
+FORMS = $(shell ls *.ui encoders/*.ui)
 TS_FILES = $(shell ls translations/*.ts)
 
 VERSION := $(shell awk -F"'" '/FLACON_VERSION=/ {print($$2)}' flacon.py)
@@ -40,7 +40,7 @@
 	$(PYUIC) $< | \
 	 sed -e "s/$\.setProperty(.*, $$False$)/\1QtCore.QVariant(\2))/" | \
 	 sed -e "s/$\.setProperty(.*, $$True$)/\1QtCore.QVariant(\2))/" | \
-	 sed -e "s/$\.setProperty(.*, $$[0-9][0-9]*$)/\1QtCore.QVariant(\2))/" > $@ 
+	 sed -e "s/$\.setProperty(.*, $$[0-9][0-9]*$)/\1QtCore.QVariant(\2))/" > $@
 
 
 translates: $(TSPRO_FILE)
@@ -98,15 +98,16 @@
 	rm -rf "$(TMP_DIR)/"*
 	install -d "$(TMP_DIR)"
 
-	install -m 644 $(SOURCES) $(FORMS) ./Makefile "$(TMP_DIR)/"
+	install -m 644 $(SOURCES) *.ui ./Makefile "$(TMP_DIR)/"
 	install -m 755 flacon.py "$(TMP_DIR)/flacon.py"
+	echo $(FORMS)
 
 	install -d "$(TMP_DIR)/encoders"
-	install -m 644 $(ENCODERS) "$(TMP_DIR)/encoders/"
+	install -m 644 $(ENCODERS) encoders/*.ui "$(TMP_DIR)/encoders/"
 
 	install -d "$(TMP_DIR)/translations/"
 	install -m 644 $(TS_FILES) "$(TMP_DIR)/translations/"
-	install -m 755 translations/translate.sh "$(TMP_DIR)/translations/"
+	install -m 755 translations/*.sh "$(TMP_DIR)/translations/"
 
 	install -d "$(TMP_DIR)/misc"
 	install -m 644 ./misc/* "$(TMP_DIR)/misc/"

flacon-0.5.7.tar.bz2/aboutDialog.py -> flacon-0.6.0.tgz/aboutDialog.py Changed

@@ -15,7 +15,6 @@
 
 
 
-
 #import preferences
 from PyQt4 import QtCore, QtGui
 from PyQt4.QtCore import *
@@ -54,30 +53,56 @@
 helpers = [
 ('Artem Aleksuk',
 'mailto:h31mail@yandex.ru',
- 'WavePack support patch.'
+ self.tr('WavPack support patch.')
 ),
 
 ('Charles Barcza',
 'mailto:kbarcza@blackpanther.hu',
- 'Application icon, Packaging.'
+ self.tr('Application icon, Packaging.')
 ),
 
 ('Kyrill Detinov',
 'mailto:lazy.kent@opensuse.org',
- 'Packaging, testing.'
+ self.tr('Packaging, testing.')
 ),
 
 ('Pavel Fric',
 'http://fripohled.blogspot.com',
- 'Czech translation.'
+ self.tr('Czech translation.')
 ),
- 
+
 ('Tomasz "Ludvick" Niedzielski',
 'mailto:ludvick0@gmail.com',
- 'Polish translation.'
- )
+ self.tr('Polish translation.')
+ ),
+
+ ('Alain-Olivier Breysse',
+ 'mailto:yahoe.001@gmail.com',
+ self.tr('French Canadian translation. Improvements in the UI.')
+ ),
+
+
+ ('Triton Circonflexe',
+ 'mailto:triton@kumal.info',
+ self.tr('French translation.')
+ ),
+
+ ]
+
+ programs = [
+ ('shntool', 'http://etree.org/shnutils/shntool/', ''),
+ ('flac and metaflac', 'http://flac.sourceforge.net/', ''),
+ ('mac', ['http://etree.org/shnutils/shntool/support/formats/ape/unix/', 'http://www.monkeysaudio.com'], ''),
+ ('oggenc', 'http://www.xiph.org/', ''),
+ ('LAME', 'http://lame.sourceforge.net/', ''),
+ ('WavPack', 'http://www.wavpack.com/', ''),
+ ('VorbisGain', 'http://sjeng.org/vorbisgain.html', ''),
+ ('MP3Gain', 'http://mp3gain.sourceforge.net/', ''),
+ ('ttaenc', 'http://tta.sourceforge.net/', ''),
+ ('FAAC', 'http://www.audiocoding.com/', ''),
 ]
 
+
 copyright = "&copy; Alexander Sokolov, 2009-2011"
 license = "<a href=http://www.fsf.org/licensing/licenses/gpl.html>GNU General Public License Version 3</a>"
 siteUrl = "http://code.google.com/p/flacon"
@@ -111,22 +136,28 @@
 self.authorsEdit.viewport().setAutoFillBackground(False)
 self.authorsEdit.setText(css + self._getListString(authors))
 
-
 self.thanksEdit.viewport().setAutoFillBackground(False)
 self.thanksEdit.setHtml(css + self._getListString(helpers))
- 
+
+ self.programsEdit.viewport().setAutoFillBackground(False)
+ self.programsEdit.setHtml(css + self.tr('Flacon uses external programs. Many thanks to their authors!') + '' + self._getListString(programs))
+
 
 #****************************************************************
 #
 #****************************************************************
- def _getListString(self, list):
+ def _getListString(self, items):
 result = ''
- for (name, url, role) in list:
+ for (name, urls, role) in sorted(items, key=lambda item: item[0]):
 result += "%s" % name
 
- if url:
- text = QString(url).remove('mailto:')
- result +=" &nbsp;&nbsp;&nbsp;&nbsp;<a href='%s'>%s</a>" % (url, text)
+ if urls:
+ if not isinstance(urls, list):
+ urls = [urls]
+
+ for url in urls:
+ text = QString(url).remove('mailto:')
+ result +=" &nbsp;&nbsp;&nbsp;&nbsp;<a href='%s'>%s</a>" % (url, text)
 
 if role:
 result +=" &nbsp;&nbsp;&nbsp;&nbsp;%s" % role

flacon-0.5.7.tar.bz2/aboutDialog.ui -> flacon-0.6.0.tgz/aboutDialog.ui Changed

@@ -93,7 +93,7 @@
 </widget>
 <widget class="QWidget" name="authorsTab">
 <attribute name="title">
- <string>Authors</string>
+ <string>Author</string>
 </attribute>
 <layout class="QVBoxLayout" name="verticalLayout_3">
 <property name="topMargin">
@@ -131,6 +131,26 @@
 </item>
 </layout>
 </widget>
+ <widget class="QWidget" name="programsTab">
+ <attribute name="title">
+ <string>External programs</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_5">
+ <property name="topMargin">
+ <number>16</number>
+ </property>
+ <item>
+ <widget class="QTextBrowser" name="programsEdit">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="openExternalLinks">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
 </widget>
 </item>
 <item>

flacon-0.5.7.tar.bz2/aboutDialog_ui.py -> flacon-0.6.0.tgz/aboutDialog_ui.py Changed

@@ -2,21 +2,16 @@
 
 # Form implementation generated from reading ui file 'aboutDialog.ui'
 #
-# Created: Sun May  8 14:50:28 2011
-#      by: PyQt4 UI code generator 4.8.3
+# Created: Thu Dec  1 21:58:54 2011
+#      by: PyQt4 UI code generator 4.7.4
 #
 # WARNING! All changes made in this file will be lost!
 
 from PyQt4 import QtCore, QtGui
 
-try:
-    _fromUtf8 = QtCore.QString.fromUtf8
-except AttributeError:
-    _fromUtf8 = lambda s: s
-
 class Ui_aboutDialog(object):
     def setupUi(self, aboutDialog):
-        aboutDialog.setObjectName(_fromUtf8("aboutDialog"))
+        aboutDialog.setObjectName("aboutDialog")
         aboutDialog.resize(509, 307)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
         sizePolicy.setHorizontalStretch(0)
@@ -24,79 +19,91 @@
         sizePolicy.setHeightForWidth(aboutDialog.sizePolicy().hasHeightForWidth())
         aboutDialog.setSizePolicy(sizePolicy)
         self.verticalLayout = QtGui.QVBoxLayout(aboutDialog)
-        self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
+        self.verticalLayout.setObjectName("verticalLayout")
         self.horizontalLayout = QtGui.QHBoxLayout()
         self.horizontalLayout.setSpacing(24)
-        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
+        self.horizontalLayout.setObjectName("horizontalLayout")
         self.logoLabel = QtGui.QLabel(aboutDialog)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Maximum, QtGui.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.logoLabel.sizePolicy().hasHeightForWidth())
         self.logoLabel.setSizePolicy(sizePolicy)
-        self.logoLabel.setText(_fromUtf8("IMG"))
-        self.logoLabel.setObjectName(_fromUtf8("logoLabel"))
+        self.logoLabel.setText("IMG")
+        self.logoLabel.setObjectName("logoLabel")
         self.horizontalLayout.addWidget(self.logoLabel)
         self.titleLabel = QtGui.QLabel(aboutDialog)
-        self.titleLabel.setText(_fromUtf8("Flacon ver 1.0"))
-        self.titleLabel.setObjectName(_fromUtf8("titleLabel"))
+        self.titleLabel.setText("Flacon ver 1.0")
+        self.titleLabel.setObjectName("titleLabel")
         self.horizontalLayout.addWidget(self.titleLabel)
         self.verticalLayout.addLayout(self.horizontalLayout)
         self.tabWidget = QtGui.QTabWidget(aboutDialog)
-        self.tabWidget.setObjectName(_fromUtf8("tabWidget"))
+        self.tabWidget.setObjectName("tabWidget")
         self.aboutTab = QtGui.QWidget()
-        self.aboutTab.setObjectName(_fromUtf8("aboutTab"))
+        self.aboutTab.setObjectName("aboutTab")
         self.verticalLayout_2 = QtGui.QVBoxLayout(self.aboutTab)
         self.verticalLayout_2.setContentsMargins(-1, 16, -1, -1)
-        self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2"))
+        self.verticalLayout_2.setObjectName("verticalLayout_2")
         self.aboutLabel = QtGui.QLabel(self.aboutTab)
-        self.aboutLabel.setText(_fromUtf8("TextLabel"))
+        self.aboutLabel.setText("TextLabel")
         self.aboutLabel.setWordWrap(True)
         self.aboutLabel.setOpenExternalLinks(True)
         self.aboutLabel.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction)
-        self.aboutLabel.setObjectName(_fromUtf8("aboutLabel"))
+        self.aboutLabel.setObjectName("aboutLabel")
         self.verticalLayout_2.addWidget(self.aboutLabel)
         spacerItem = QtGui.QSpacerItem(20, 168, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
         self.verticalLayout_2.addItem(spacerItem)
-        self.tabWidget.addTab(self.aboutTab, _fromUtf8(""))
+        self.tabWidget.addTab(self.aboutTab, "")
         self.authorsTab = QtGui.QWidget()
-        self.authorsTab.setObjectName(_fromUtf8("authorsTab"))
+        self.authorsTab.setObjectName("authorsTab")
         self.verticalLayout_3 = QtGui.QVBoxLayout(self.authorsTab)
         self.verticalLayout_3.setContentsMargins(-1, 16, -1, -1)
-        self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3"))
+        self.verticalLayout_3.setObjectName("verticalLayout_3")
         self.authorsEdit = QtGui.QTextBrowser(self.authorsTab)
         self.authorsEdit.setFrameShape(QtGui.QFrame.NoFrame)
         self.authorsEdit.setOpenExternalLinks(True)
-        self.authorsEdit.setObjectName(_fromUtf8("authorsEdit"))
+        self.authorsEdit.setObjectName("authorsEdit")
         self.verticalLayout_3.addWidget(self.authorsEdit)
-        self.tabWidget.addTab(self.authorsTab, _fromUtf8(""))
+        self.tabWidget.addTab(self.authorsTab, "")
         self.thanksTab = QtGui.QWidget()
-        self.thanksTab.setObjectName(_fromUtf8("thanksTab"))
+        self.thanksTab.setObjectName("thanksTab")
         self.verticalLayout_4 = QtGui.QVBoxLayout(self.thanksTab)
         self.verticalLayout_4.setContentsMargins(-1, 16, -1, -1)
-        self.verticalLayout_4.setObjectName(_fromUtf8("verticalLayout_4"))
+        self.verticalLayout_4.setObjectName("verticalLayout_4")
         self.thanksEdit = QtGui.QTextBrowser(self.thanksTab)
         self.thanksEdit.setFrameShape(QtGui.QFrame.NoFrame)
         self.thanksEdit.setOpenExternalLinks(True)
-        self.thanksEdit.setObjectName(_fromUtf8("thanksEdit"))
+        self.thanksEdit.setObjectName("thanksEdit")
         self.verticalLayout_4.addWidget(self.thanksEdit)
-        self.tabWidget.addTab(self.thanksTab, _fromUtf8(""))
+        self.tabWidget.addTab(self.thanksTab, "")
+        self.programsTab = QtGui.QWidget()
+        self.programsTab.setObjectName("programsTab")
+        self.verticalLayout_5 = QtGui.QVBoxLayout(self.programsTab)
+        self.verticalLayout_5.setContentsMargins(-1, 16, -1, -1)
+        self.verticalLayout_5.setObjectName("verticalLayout_5")
+        self.programsEdit = QtGui.QTextBrowser(self.programsTab)
+        self.programsEdit.setFrameShape(QtGui.QFrame.NoFrame)
+        self.programsEdit.setOpenExternalLinks(True)
+        self.programsEdit.setObjectName("programsEdit")
+        self.verticalLayout_5.addWidget(self.programsEdit)
+        self.tabWidget.addTab(self.programsTab, "")
         self.verticalLayout.addWidget(self.tabWidget)
         self.buttonBox = QtGui.QDialogButtonBox(aboutDialog)
         self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
         self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName(_fromUtf8("buttonBox"))
+        self.buttonBox.setObjectName("buttonBox")
         self.verticalLayout.addWidget(self.buttonBox)
 
         self.retranslateUi(aboutDialog)
         self.tabWidget.setCurrentIndex(0)
-        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), aboutDialog.accept)
-        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), aboutDialog.reject)
+        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("accepted()"), aboutDialog.accept)
+        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), aboutDialog.reject)
         QtCore.QMetaObject.connectSlotsByName(aboutDialog)
 
     def retranslateUi(self, aboutDialog):
         aboutDialog.setWindowTitle(QtGui.QApplication.translate("aboutDialog", "About Flacon", None, QtGui.QApplication.UnicodeUTF8))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.aboutTab), QtGui.QApplication.translate("aboutDialog", "About", None, QtGui.QApplication.UnicodeUTF8))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.authorsTab), QtGui.QApplication.translate("aboutDialog", "Authors", None, QtGui.QApplication.UnicodeUTF8))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.authorsTab), QtGui.QApplication.translate("aboutDialog", "Author", None, QtGui.QApplication.UnicodeUTF8))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.thanksTab), QtGui.QApplication.translate("aboutDialog", "Thanks", None, QtGui.QApplication.UnicodeUTF8))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.programsTab), QtGui.QApplication.translate("aboutDialog", "External programs", None, QtGui.QApplication.UnicodeUTF8))

flacon-0.5.7.tar.bz2/audiofiles.py -> flacon-0.6.0.tgz/audiofiles.py Changed

flacon-0.5.7.tar.bz2/configureDialog.py -> flacon-0.6.0.tgz/configureDialog.py Changed

@@ -16,6 +16,8 @@
 
 
 from settings import *
+import encoder
+import encoderConfigPage
 
 from PyQt4 import QtCore, QtGui
 from PyQt4.QtCore import *
@@ -27,28 +29,77 @@
 from configureDialog_ui import *
 from flaconglobal import *
 
+class ProgramEdit(QLineEdit):
+ #****************************************************************
+ #
+ #****************************************************************
+ def __init__(self, program, parent):
+ QLineEdit.__init__(self, parent)
+ self._programName = program
+ encoderConfigPage.EncoderConfigPage.loadLineEdit("Programs/"+program, self)
 
 
-class ConfigureDialog(QtGui.QDialog):
- generalPageIndex = 0
- flacPageIndex = 1
- wvPageIndex = 2
- oggPageIndex = 3
- mp3PageIndex = 4
- programsPageIndex = 5
+ #****************************************************************
+ #
+ #****************************************************************
+ def programName(self):
+ return self._programName
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ def find(self):
+ if self.text().isEmpty():
+ self.setText(settings.findProgram(self._programName))
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ def write(self):
+ encoderConfigPage.EncoderConfigPage.writeLineEdit("Programs/" + self._programName, self)
+
+
+
+class ProgramButton(QToolButton):
+ #****************************************************************
+ #
+ #****************************************************************
+ def __init__(self, edit, parent):
+ QToolButton.__init__(self, parent)
+ self._edit = edit
+ self.setIcon(pyqticonloader.icon(['document-open-folder', 'document-open', 'folder_open']))
+ self.connect(self, SIGNAL('clicked()'), self.openProgFile)
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ def openProgFile(self):
+ program = self._edit.programName()
+ flt = self.tr("%1 program").arg(program) + QString(" (%1);;").arg(program) + \
+ self.tr("All files") + " (*.*)"
+
+ fileName = QFileDialog.getOpenFileName(self, self.tr("Select program file"), "/usr/bin/", flt)
+ if (fileName):
+ self._edit.setText(fileName)
 
 
+
+
+class ConfigureDialog(QtGui.QDialog):
 _dialog = None
 
 #****************************************************************
 #
 #****************************************************************
- @staticmethod
- def createAndShow(parent, pageIndex = 0):
+ @classmethod
+ def createAndShow(cls, parent, formatId = ""):
 if not ConfigureDialog._dialog:
 ConfigureDialog._dialog = ConfigureDialog(parent)
 
- ConfigureDialog._dialog.show(pageIndex)
+ ConfigureDialog._dialog.show(formatId)
 ConfigureDialog._dialog.raise_()
 ConfigureDialog._dialog.activateWindow()
 
@@ -56,14 +107,15 @@
 #****************************************************************
 #
 #****************************************************************
- @staticmethod
- def pageIndex(audioFormat):
- if audioFormat == QVariant(outputAudioFormats.FLAC): return ConfigureDialog.flacPageIndex
- if audioFormat == QVariant(outputAudioFormats.WV): return ConfigureDialog.wvPageIndex
- if audioFormat == QVariant(outputAudioFormats.OGG): return ConfigureDialog.oggPageIndex
- if audioFormat == QVariant(outputAudioFormats.MP3): return ConfigureDialog.mp3PageIndex
+ def show(self, formatId = ""):
+ page = self.form.pages.findChild(QWidget, formatId)
+ pageIndex = self.form.pages.indexOf(page)
 
- return -1
+ if pageIndex<0:
+ pageIndex = self.form.pages.currentIndex()
+
+ self.form.pagesList.setCurrentRow(pageIndex)
+ QDialog.show(self)
 
 
 #****************************************************************
@@ -86,33 +138,25 @@
 (height, ok) = settings.value("ConfigureDialog/Height", QVariant(self.size().height())).toInt()
 self.resize(width, height)
 
- self._programsEdits = []
- self._programsBtns = []
-
 #***********************************************************
+ self.form.generalPage.setWindowTitle(self.tr("General configuration"))
+ self.form.programsPage.setWindowTitle(self.tr("Full path of the external applications"))
+
 self.connect(self.form.pages, SIGNAL('currentChanged(int)'), self.setPage)
 
 self.pagesListInit()
-
- self.generalInit()
- self.flacInit()
- self.wvInit()
- self.oggInit()
- self.mp3Init()
 self.programsInit()
+ self.form.pages.setCurrentIndex(0)
 
 #***********************************************************
- self.generalLoad()
- self.flacLoad()
- self.wvLoad()
- self.oggLoad()
- self.mp3Load()
- self.programsLoad()
+ encoderConfigPage.EncoderConfigPage.loadSpinBox('Encoder/ThreadCount', self.form.threadsCountSpin)
+ encoderConfigPage.EncoderConfigPage.loadLineEdit('Encoder/TmpDir', self.form.tmpDirEdit)
 
 self.connect(self.form.tmpDirButton, SIGNAL('clicked()'), self.tmpDirShowDialog)
 self.form.tmpDirButton.setIcon(pyqticonloader.icon(['document-open-folder', 'document-open', 'folder_open']))
 
 
+
 #****************************************************************
 #
 #****************************************************************
@@ -121,12 +165,14 @@
 settings.setValue("ConfigureDialog/Height", QVariant(self.size().height()))
 
 if res:
- self.generalWrite()
- self.flacWrite()
- self.wvWrite()
- self.oggWrite()
- self.mp3Write()
- self.programsWrite()
+ encoderConfigPage.EncoderConfigPage.writeSpinBox('Encoder/ThreadCount', self.form.threadsCountSpin)
+ encoderConfigPage.EncoderConfigPage.writeLineEdit('Encoder/TmpDir', self.form.tmpDirEdit)
+
+ for page in self.form.pages.findChildren(encoderConfigPage.EncoderConfigPage):
+ page.write()
+
+ for progEdit in self.form.pages.findChildren(ProgramEdit):
+ progEdit.write()
 
 QDialog.done(self, res)
 self.setParent(None)
@@ -136,18 +182,8 @@
 #****************************************************************
 #
 #****************************************************************
- def show(self, pageIndex=-1):
- if pageIndex<0:
- pageIndex = self.form.pages.currentIndex()
-
- self.form.pagesList.setCurrentRow(pageIndex)
- QDialog.show(self)
-
-
- #****************************************************************
- #
- #****************************************************************
 def setPage(self, pageIndex):
+ self.form.pageTitle.setText(self.form.pages.currentWidget().windowTitle())
 self.form.pagesList.setCurrentRow(pageIndex)

flacon-0.5.7.tar.bz2/configureDialog.ui -> flacon-0.6.0.tgz/configureDialog.ui Changed

@@ -17,7 +17,7 @@
 </sizepolicy>
 </property>
 <property name="windowTitle">
- <string>Configure</string>
+ <string>Preferences</string>
 </property>
 <layout class="QVBoxLayout" name="verticalLayout_2">
 <item>
@@ -56,8 +56,8 @@
 </property>
 <property name="iconSize">
 <size>
- <width>32</width>
- <height>33</height>
+ <width>24</width>
+ <height>24</height>
 </size>
 </property>
 <property name="movement">
@@ -81,1028 +81,187 @@
 <property name="currentRow">
 <number>-1</number>
 </property>
- <item>
- <property name="text">
- <string>General</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Flac</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>WavPack</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Ogg</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Mp3</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Programs</string>
- </property>
- </item>
 </widget>
 </item>
 <item>
- <widget class="QStackedWidget" name="pages">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>11</height>
- </size>
- </property>
- <property name="currentIndex">
- <number>4</number>
- </property>
- <widget class="QWidget" name="generalPage">
- <layout class="QVBoxLayout" name="verticalLayout_6">
- <item>
- <widget class="QLabel" name="label_5">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>34</height>
- </size>
- </property>
- <property name="font">
- 
- <weight>75</weight>
- <bold>true</bold>
- 
- </property>
- <property name="text">
- <string>General configuration</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QGridLayout" name="formLayout_6">
- <item row="0" column="0">
- <widget class="QLabel" name="threadsCountLabel">
- <property name="text">
- <string>Thread count:</string>
- </property>
- <property name="buddy">
- <cstring>threadsCountSpin</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="threadsCountSpin">
- <property name="toolTip">
- <string>The number of threads in the conversion process.</string>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>64</number>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="tmpDirLabel">
- <property name="text">
- <string>Temporary dir:</string>
- </property>
- <property name="buddy">
- <cstring>tmpDirEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_5">
- <item>
- <widget class="QLineEdit" name="tmpDirEdit"/>
- </item>
- <item>
- <widget class="QToolButton" name="tmpDirButton">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QLabel" name="pageTitle">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>34</height>
+ </size>
+ </property>
+ <property name="font">
+ 
+ <weight>75</weight>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="text">
+ <string>General configuration</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QStackedWidget" name="pages">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>11</height>
+ </size>
+ </property>
+ <property name="currentIndex">
+ <number>1</number>
+ </property>
+ <widget class="QWidget" name="generalPage">
+ <layout class="QVBoxLayout" name="verticalLayout_6">
+ <item>
+ <layout class="QGridLayout" name="formLayout_6">
+ <item row="0" column="0">
+ <widget class="QLabel" name="threadsCountLabel">
 <property name="text">
- <string notr="true">...</string>
+ <string>Thread count:</string>
+ </property>
+ <property name="buddy">
+ <cstring>threadsCountSpin</cstring>
 </property>
 </widget>
 </item>
- </layout>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="verticalSpacer_5">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>

flacon-0.5.7.tar.bz2/configureDialog_ui.py -> flacon-0.6.0.tgz/configureDialog_ui.py Changed

@@ -2,21 +2,16 @@
 
 # Form implementation generated from reading ui file 'configureDialog.ui'
 #
-# Created: Sun May  8 14:50:29 2011
-#      by: PyQt4 UI code generator 4.8.3
+# Created: Thu Dec  1 21:58:54 2011
+#      by: PyQt4 UI code generator 4.7.4
 #
 # WARNING! All changes made in this file will be lost!
 
 from PyQt4 import QtCore, QtGui
 
-try:
-    _fromUtf8 = QtCore.QString.fromUtf8
-except AttributeError:
-    _fromUtf8 = lambda s: s
-
 class Ui_configureDialog(object):
     def setupUi(self, configureDialog):
-        configureDialog.setObjectName(_fromUtf8("configureDialog"))
+        configureDialog.setObjectName("configureDialog")
         configureDialog.resize(646, 425)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -24,9 +19,9 @@
         sizePolicy.setHeightForWidth(configureDialog.sizePolicy().hasHeightForWidth())
         configureDialog.setSizePolicy(sizePolicy)
         self.verticalLayout_2 = QtGui.QVBoxLayout(configureDialog)
-        self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2"))
+        self.verticalLayout_2.setObjectName("verticalLayout_2")
         self.horizontalLayout = QtGui.QHBoxLayout()
-        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
+        self.horizontalLayout.setObjectName("horizontalLayout")
         self.pagesList = QtGui.QListWidget(configureDialog)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Maximum, QtGui.QSizePolicy.Expanding)
         sizePolicy.setHorizontalStretch(0)
@@ -41,22 +36,26 @@
         self.pagesList.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
         self.pagesList.setAutoScroll(False)
         self.pagesList.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers)
-        self.pagesList.setProperty(_fromUtf8("showDropIndicator"), QtCore.QVariant(False))
-        self.pagesList.setIconSize(QtCore.QSize(32, 33))
+        self.pagesList.setProperty("showDropIndicator", QtCore.QVariant(False))
+        self.pagesList.setIconSize(QtCore.QSize(24, 24))
         self.pagesList.setMovement(QtGui.QListView.Static)
         self.pagesList.setFlow(QtGui.QListView.TopToBottom)
-        self.pagesList.setProperty(_fromUtf8("isWrapping"), QtCore.QVariant(False))
+        self.pagesList.setProperty("isWrapping", QtCore.QVariant(False))
         self.pagesList.setSpacing(0)
         self.pagesList.setViewMode(QtGui.QListView.IconMode)
         self.pagesList.setSelectionRectVisible(True)
-        self.pagesList.setObjectName(_fromUtf8("pagesList"))
-        QtGui.QListWidgetItem(self.pagesList)
-        QtGui.QListWidgetItem(self.pagesList)
-        QtGui.QListWidgetItem(self.pagesList)
-        QtGui.QListWidgetItem(self.pagesList)
-        QtGui.QListWidgetItem(self.pagesList)
-        QtGui.QListWidgetItem(self.pagesList)
+        self.pagesList.setObjectName("pagesList")
         self.horizontalLayout.addWidget(self.pagesList)
+        self.verticalLayout = QtGui.QVBoxLayout()
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.pageTitle = QtGui.QLabel(configureDialog)
+        self.pageTitle.setMinimumSize(QtCore.QSize(0, 34))
+        font = QtGui.QFont()
+        font.setWeight(75)
+        font.setBold(True)
+        self.pageTitle.setFont(font)
+        self.pageTitle.setObjectName("pageTitle")
+        self.verticalLayout.addWidget(self.pageTitle)
         self.pages = QtGui.QStackedWidget(configureDialog)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(1)
@@ -64,543 +63,99 @@
         sizePolicy.setHeightForWidth(self.pages.sizePolicy().hasHeightForWidth())
         self.pages.setSizePolicy(sizePolicy)
         self.pages.setMinimumSize(QtCore.QSize(0, 11))
-        self.pages.setObjectName(_fromUtf8("pages"))
+        self.pages.setObjectName("pages")
         self.generalPage = QtGui.QWidget()
-        self.generalPage.setObjectName(_fromUtf8("generalPage"))
+        self.generalPage.setObjectName("generalPage")
         self.verticalLayout_6 = QtGui.QVBoxLayout(self.generalPage)
-        self.verticalLayout_6.setObjectName(_fromUtf8("verticalLayout_6"))
-        self.label_5 = QtGui.QLabel(self.generalPage)
-        self.label_5.setMinimumSize(QtCore.QSize(0, 34))
-        font = QtGui.QFont()
-        font.setWeight(75)
-        font.setBold(True)
-        self.label_5.setFont(font)
-        self.label_5.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
-        self.label_5.setObjectName(_fromUtf8("label_5"))
-        self.verticalLayout_6.addWidget(self.label_5)
+        self.verticalLayout_6.setObjectName("verticalLayout_6")
         self.formLayout_6 = QtGui.QGridLayout()
-        self.formLayout_6.setObjectName(_fromUtf8("formLayout_6"))
+        self.formLayout_6.setObjectName("formLayout_6")
         self.threadsCountLabel = QtGui.QLabel(self.generalPage)
-        self.threadsCountLabel.setObjectName(_fromUtf8("threadsCountLabel"))
+        self.threadsCountLabel.setObjectName("threadsCountLabel")
         self.formLayout_6.addWidget(self.threadsCountLabel, 0, 0, 1, 1)
         self.threadsCountSpin = QtGui.QSpinBox(self.generalPage)
         self.threadsCountSpin.setMinimum(1)
         self.threadsCountSpin.setMaximum(64)
-        self.threadsCountSpin.setObjectName(_fromUtf8("threadsCountSpin"))
+        self.threadsCountSpin.setObjectName("threadsCountSpin")
         self.formLayout_6.addWidget(self.threadsCountSpin, 0, 1, 1, 1)
         self.tmpDirLabel = QtGui.QLabel(self.generalPage)
-        self.tmpDirLabel.setObjectName(_fromUtf8("tmpDirLabel"))
+        self.tmpDirLabel.setObjectName("tmpDirLabel")
         self.formLayout_6.addWidget(self.tmpDirLabel, 1, 0, 1, 1)
         self.horizontalLayout_5 = QtGui.QHBoxLayout()
-        self.horizontalLayout_5.setObjectName(_fromUtf8("horizontalLayout_5"))
+        self.horizontalLayout_5.setObjectName("horizontalLayout_5")
         self.tmpDirEdit = QtGui.QLineEdit(self.generalPage)
-        self.tmpDirEdit.setObjectName(_fromUtf8("tmpDirEdit"))
+        self.tmpDirEdit.setObjectName("tmpDirEdit")
         self.horizontalLayout_5.addWidget(self.tmpDirEdit)
         self.tmpDirButton = QtGui.QToolButton(self.generalPage)
-        self.tmpDirButton.setText(_fromUtf8("..."))
-        self.tmpDirButton.setObjectName(_fromUtf8("tmpDirButton"))
+        self.tmpDirButton.setText("...")
+        self.tmpDirButton.setObjectName("tmpDirButton")
         self.horizontalLayout_5.addWidget(self.tmpDirButton)
         self.formLayout_6.addLayout(self.horizontalLayout_5, 1, 1, 1, 1)
         self.verticalLayout_6.addLayout(self.formLayout_6)
         spacerItem = QtGui.QSpacerItem(20, 233, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
         self.verticalLayout_6.addItem(spacerItem)
         self.pages.addWidget(self.generalPage)
-        self.flacPage = QtGui.QWidget()
-        self.flacPage.setObjectName(_fromUtf8("flacPage"))
-        self.verticalLayout = QtGui.QVBoxLayout(self.flacPage)
-        self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
-        self.label = QtGui.QLabel(self.flacPage)
-        self.label.setMinimumSize(QtCore.QSize(0, 34))
-        font = QtGui.QFont()
-        font.setWeight(75)
-        font.setBold(True)
-        self.label.setFont(font)
-        self.label.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
-        self.label.setObjectName(_fromUtf8("label"))
-        self.verticalLayout.addWidget(self.label)
-        self.formLayout = QtGui.QGridLayout()
-        self.formLayout.setObjectName(_fromUtf8("formLayout"))
-        self.flacCompressionLabel = QtGui.QLabel(self.flacPage)
-        self.flacCompressionLabel.setObjectName(_fromUtf8("flacCompressionLabel"))
-        self.formLayout.addWidget(self.flacCompressionLabel, 0, 0, 1, 1)
-        self.horizontalLayout_2 = QtGui.QHBoxLayout()
-        self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2"))
-        self.flacCompressionSlider = QtGui.QSlider(self.flacPage)
-        self.flacCompressionSlider.setMaximum(8)
-        self.flacCompressionSlider.setPageStep(1)
-        self.flacCompressionSlider.setProperty(_fromUtf8("value"), QtCore.QVariant(0))
-        self.flacCompressionSlider.setOrientation(QtCore.Qt.Horizontal)
-        self.flacCompressionSlider.setTickPosition(QtGui.QSlider.TicksAbove)
-        self.flacCompressionSlider.setObjectName(_fromUtf8("flacCompressionSlider"))
-        self.horizontalLayout_2.addWidget(self.flacCompressionSlider)
-        self.flacCompressionSpin = QtGui.QSpinBox(self.flacPage)
-        self.flacCompressionSpin.setMaximum(8)
-        self.flacCompressionSpin.setObjectName(_fromUtf8("flacCompressionSpin"))
-        self.horizontalLayout_2.addWidget(self.flacCompressionSpin)
-        self.formLayout.addLayout(self.horizontalLayout_2, 0, 1, 1, 1)
-        self.verticalLayout.addLayout(self.formLayout)
-        self.flacGainGroup = QtGui.QGroupBox(self.flacPage)
-        self.flacGainGroup.setObjectName(_fromUtf8("flacGainGroup"))
-        self.verticalLayout_8 = QtGui.QVBoxLayout(self.flacGainGroup)
-        self.verticalLayout_8.setObjectName(_fromUtf8("verticalLayout_8"))
-        self.formLayout_7 = QtGui.QGridLayout()
-        self.formLayout_7.setObjectName(_fromUtf8("formLayout_7"))
-        self.flacGainLabel = QtGui.QLabel(self.flacGainGroup)
-        self.flacGainLabel.setObjectName(_fromUtf8("flacGainLabel"))
-        self.formLayout_7.addWidget(self.flacGainLabel, 0, 0, 1, 1)
-        self.flacGainCbx = QtGui.QComboBox(self.flacGainGroup)
-        self.flacGainCbx.setObjectName(_fromUtf8("flacGainCbx"))
-        self.flacGainCbx.addItem(_fromUtf8(""))
-        self.formLayout_7.addWidget(self.flacGainCbx, 0, 1, 1, 1)
-        spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.formLayout_7.addItem(spacerItem1, 0, 2, 1, 1)
-        self.verticalLayout_8.addLayout(self.formLayout_7)
-        self.verticalLayout.addWidget(self.flacGainGroup)
-        spacerItem2 = QtGui.QSpacerItem(20, 231, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.verticalLayout.addItem(spacerItem2)
-        self.pages.addWidget(self.flacPage)
-        self.wvPage = QtGui.QWidget()
-        self.wvPage.setObjectName(_fromUtf8("wvPage"))
-        self.verticalLayout_11 = QtGui.QVBoxLayout(self.wvPage)
-        self.verticalLayout_11.setObjectName(_fromUtf8("verticalLayout_11"))
-        self.wvTitleLabel = QtGui.QLabel(self.wvPage)
-        self.wvTitleLabel.setMinimumSize(QtCore.QSize(0, 34))
-        font = QtGui.QFont()
-        font.setWeight(75)
-        font.setBold(True)
-        self.wvTitleLabel.setFont(font)
-        self.wvTitleLabel.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
-        self.wvTitleLabel.setObjectName(_fromUtf8("wvTitleLabel"))
-        self.verticalLayout_11.addWidget(self.wvTitleLabel)
-        self.formLayout_9 = QtGui.QGridLayout()
-        self.formLayout_9.setObjectName(_fromUtf8("formLayout_9"))
-        self.wvCompressionLabel = QtGui.QLabel(self.wvPage)

flacon-0.5.7.tar.bz2/converter.py -> flacon-0.6.0.tgz/converter.py Changed

@@ -14,6 +14,7 @@
 # GNU General Public License for more details.
 
 
+
 #import errno
 import exceptions
 import re
@@ -31,7 +32,6 @@
 from disc import *
 from errors import *
 
-
 class Converter(QObject):
 #****************************************************************
 #
@@ -62,10 +62,16 @@
 gainType = settings.value(format.id + "/ReplayGain").toString()
 
 encoderClass = format.encoderClass
- albumGainClass = format.albumGainClass if gainType == ReplayGainTypes.Album else None
- trackGainClass = format.trackGainClass if gainType == ReplayGainTypes.Track else None
+ albumGainClass = None
+ trackGainClass = None
+
+ if gainType == ReplayGainTypes.Album:
+ albumGainClass = encoderClass.albumGainClass()
 
- self._check([Splitter, encoderClass, trackGainClass, albumGainClass])
+ if gainType == ReplayGainTypes.Track:
+ trackGainClass = encoderClass.trackGainClass()
+
+ self._check(project, [Splitter, encoderClass, trackGainClass, albumGainClass])
 
 for disc in self._project:
 if disc.canConvert():
@@ -129,13 +135,17 @@
 #****************************************************************
 #
 #****************************************************************
- def _check(self, classes):
- missing = QStringList()
+ def _check(self, project, classes):
+ errs = QStringList()
 for c in classes:
- if c: c.check(missing)
+ try:
+ if c: c.check(project)
+
+ except FlaconException, e:
+ errs << QString("<li style='margin-top: 4px;'>%1</li>").arg(e.message)
 
- if missing.count() > 0:
- msg = self.tr("Conversion is not possible.\nThe following programs are not found:\n - %1").arg(missing.join('\n - '))
+ if errs.count() > 0:
+ msg = QString("<html>%1<ul>%2</ul></html>").arg(self.tr('Conversion is not possible:'), errs.join('\n'))
 raise Exception(unicode(msg))
 
 
@@ -334,12 +344,12 @@
 #****************************************************************
 def tr(self, text, disambiguation = ''):
 res = QtGui.qApp.translate(self.__class__.__name__, text, disambiguation)
- 
+
 if res == text:
 res = QtGui.qApp.translate("ConverterThread", text, disambiguation)
- 
+
 return res
- 
+
 
 #****************************************************************
 #
@@ -423,6 +433,7 @@
 args << '-t' << self._filePrefix +'%n'
 args << '-d' << self._workDir
 args << self._disc.audioFileName()
+ #print "%s" % args.join(' ')
 
 proc = tryPopen(args , stdin=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
 
@@ -431,7 +442,7 @@
 self.parseOut(proc)
 res = proc.wait()
 if res:
- raise ConvertError(pipeToStr(proc.stderr))
+ raise ConvertError(self._errors.join("\n"))
 
 
 #****************************************************************
@@ -474,10 +485,11 @@
 #***************************************************
 if (c == "\n"):
 # Errorrs
- if (buff[8:16] == ': error:'):
+ if buff.find(': error:') > -1:
 self._errors << codec.toUnicode(buff[17:])
 
 buff = ''
+
 #***************************************************
 elif (c == '%'):
 percent = int((buff[-4:-1]))
@@ -521,8 +533,7 @@
 dir = modulesDir() + "/encoders"
 sys.path.append(dir)
 
-
-files = glob.glob(dir + '/*.py')
+files = glob.glob(dir + '/*_encoder.py')
 for f in files:
 module = os.path.basename(f)[:-3]
 __import__(module)

flacon-0.5.7.tar.bz2/disc.py -> flacon-0.6.0.tgz/disc.py Changed

flacon-0.6.0.tgz/encoders/aac_config.py Added

@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+# Project : flacon
+# File : flac_encoder.py
+# (c) Alexander Sokolov sokoloff.a@gmail.com
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+from PyQt4.QtCore import *
+import flaconglobal
+
+from encoderConfigPage import EncoderConfigPage
+from aac_config_ui import Ui_aacConfigPage as UI
+
+class AacConfig(EncoderConfigPage, UI):
+
+   #****************************************************************
+   #
+   #****************************************************************
+    @classmethod
+    def defaults(cls):
+        return {
+            'Aac/UseQuality':       True,
+            'Aac/Quality':          100,
+            'Aac/Bitrate':          256,
+        }
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def __init__(self, parent):
+        EncoderConfigPage.__init__(self, parent)
+        self.setupUi(self)
+
+        self.setLossyToolTip(self.aacQualitySpin)
+        self.aacQualitySlider.setToolTip(self.aacQualitySpin.toolTip())
+        self.fillBitrateComboBox(self.aacBitrateCbx,  [64, 80, 128, 160, 192, 224, 256, 288, 320])
+
+        self.loadCheckBox('Aac/UseQuality', self.aacUseQualityCheck)
+        self.loadSpinBox( 'Aac/Quality',    self.aacQualitySpin)
+        self.loadComboBox('Aac/Bitrate',    self.aacBitrateCbx)
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def write(self):
+        self.writeCheckBox('Aac/UseQuality',self.aacUseQualityCheck)
+        self.writeSpinBox( 'Aac/Quality',   self.aacQualitySpin)
+        self.writeComboBox('Aac/Bitrate',   self.aacBitrateCbx)
+        pass

flacon-0.6.0.tgz/encoders/aac_config.ui Added

@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>aacConfigPage</class>
+ <widget class="QWidget" name="aacConfigPage">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>519</width>
+ <height>380</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>AAC encoding configuration</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QCheckBox" name="aacUseQualityCheck">
+ <property name="text">
+ <string>Use quality setting (recommended)</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <widget class="QSlider" name="aacQualitySlider">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimum">
+ <number>10</number>
+ </property>
+ <property name="maximum">
+ <number>500</number>
+ </property>
+ <property name="singleStep">
+ <number>1</number>
+ </property>
+ <property name="pageStep">
+ <number>25</number>
+ </property>
+ <property name="value">
+ <number>100</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="tickPosition">
+ <enum>QSlider::TicksAbove</enum>
+ </property>
+ <property name="tickInterval">
+ <number>50</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="aacQualitySpin">
+ <property name="minimum">
+ <number>10</number>
+ </property>
+ <property name="maximum">
+ <number>500</number>
+ </property>
+ <property name="value">
+ <number>100</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="aacBitrateGroup">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="title">
+ <string>Use bitrate</string>
+ </property>
+ <property name="checkable">
+ <bool>false</bool>
+ </property>
+ <layout class="QGridLayout" name="formLayout_3">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Bitrate:</string>
+ </property>
+ <property name="buddy">
+ <cstring>aacBitrateCbx</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="aacBitrateCbx">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Sets target bitrate (in kb/s).</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer_5">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>122</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <tabstops>
+ <tabstop>aacUseQualityCheck</tabstop>
+ <tabstop>aacQualitySlider</tabstop>
+ <tabstop>aacQualitySpin</tabstop>
+ <tabstop>aacBitrateCbx</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>aacUseQualityCheck</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>aacBitrateGroup</receiver>
+ <slot>setDisabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>373</x>
+ <y>24</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>236</x>
+ <y>123</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>aacUseQualityCheck</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>aacQualitySlider</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>373</x>
+ <y>24</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>372</x>
+ <y>32</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>aacUseQualityCheck</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>label_3</receiver>
+ <slot>setDisabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>260</x>
+ <y>24</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>54</x>
+ <y>116</y>
+ </hint>
+ </hints>
+ </connection>

flacon-0.6.0.tgz/encoders/aac_config_ui.py Added

@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'encoders/aac_config.ui'
+#
+# Created: Thu Dec  1 21:58:54 2011
+#      by: PyQt4 UI code generator 4.7.4
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt4 import QtCore, QtGui
+
+class Ui_aacConfigPage(object):
+    def setupUi(self, aacConfigPage):
+        aacConfigPage.setObjectName("aacConfigPage")
+        aacConfigPage.resize(519, 380)
+        self.verticalLayout = QtGui.QVBoxLayout(aacConfigPage)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.aacUseQualityCheck = QtGui.QCheckBox(aacConfigPage)
+        self.aacUseQualityCheck.setChecked(True)
+        self.aacUseQualityCheck.setObjectName("aacUseQualityCheck")
+        self.verticalLayout.addWidget(self.aacUseQualityCheck)
+        self.horizontalLayout_6 = QtGui.QHBoxLayout()
+        self.horizontalLayout_6.setObjectName("horizontalLayout_6")
+        self.aacQualitySlider = QtGui.QSlider(aacConfigPage)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.aacQualitySlider.sizePolicy().hasHeightForWidth())
+        self.aacQualitySlider.setSizePolicy(sizePolicy)
+        self.aacQualitySlider.setMinimum(10)
+        self.aacQualitySlider.setMaximum(500)
+        self.aacQualitySlider.setSingleStep(1)
+        self.aacQualitySlider.setPageStep(25)
+        self.aacQualitySlider.setProperty("value", QtCore.QVariant(100))
+        self.aacQualitySlider.setOrientation(QtCore.Qt.Horizontal)
+        self.aacQualitySlider.setTickPosition(QtGui.QSlider.TicksAbove)
+        self.aacQualitySlider.setTickInterval(50)
+        self.aacQualitySlider.setObjectName("aacQualitySlider")
+        self.horizontalLayout_6.addWidget(self.aacQualitySlider)
+        self.aacQualitySpin = QtGui.QSpinBox(aacConfigPage)
+        self.aacQualitySpin.setMinimum(10)
+        self.aacQualitySpin.setMaximum(500)
+        self.aacQualitySpin.setProperty("value", QtCore.QVariant(100))
+        self.aacQualitySpin.setObjectName("aacQualitySpin")
+        self.horizontalLayout_6.addWidget(self.aacQualitySpin)
+        self.verticalLayout.addLayout(self.horizontalLayout_6)
+        self.aacBitrateGroup = QtGui.QGroupBox(aacConfigPage)
+        self.aacBitrateGroup.setEnabled(False)
+        self.aacBitrateGroup.setCheckable(False)
+        self.aacBitrateGroup.setObjectName("aacBitrateGroup")
+        self.formLayout_3 = QtGui.QGridLayout(self.aacBitrateGroup)
+        self.formLayout_3.setObjectName("formLayout_3")
+        self.label_3 = QtGui.QLabel(self.aacBitrateGroup)
+        self.label_3.setEnabled(False)
+        self.label_3.setObjectName("label_3")
+        self.formLayout_3.addWidget(self.label_3, 0, 0, 1, 1)
+        self.aacBitrateCbx = QtGui.QComboBox(self.aacBitrateGroup)
+        self.aacBitrateCbx.setEnabled(False)
+        self.aacBitrateCbx.setObjectName("aacBitrateCbx")
+        self.formLayout_3.addWidget(self.aacBitrateCbx, 0, 1, 1, 1)
+        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.formLayout_3.addItem(spacerItem, 0, 2, 1, 1)
+        self.verticalLayout.addWidget(self.aacBitrateGroup)
+        spacerItem1 = QtGui.QSpacerItem(20, 122, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.verticalLayout.addItem(spacerItem1)
+        self.label_3.setBuddy(self.aacBitrateCbx)
+
+        self.retranslateUi(aacConfigPage)
+        QtCore.QObject.connect(self.aacUseQualityCheck, QtCore.SIGNAL("toggled(bool)"), self.aacBitrateGroup.setDisabled)
+        QtCore.QObject.connect(self.aacUseQualityCheck, QtCore.SIGNAL("toggled(bool)"), self.aacQualitySlider.setEnabled)
+        QtCore.QObject.connect(self.aacUseQualityCheck, QtCore.SIGNAL("toggled(bool)"), self.label_3.setDisabled)
+        QtCore.QObject.connect(self.aacUseQualityCheck, QtCore.SIGNAL("toggled(bool)"), self.aacBitrateCbx.setDisabled)
+        QtCore.QObject.connect(self.aacQualitySlider, QtCore.SIGNAL("valueChanged(int)"), self.aacQualitySpin.setValue)
+        QtCore.QObject.connect(self.aacQualitySpin, QtCore.SIGNAL("valueChanged(int)"), self.aacQualitySlider.setValue)
+        QtCore.QObject.connect(self.aacUseQualityCheck, QtCore.SIGNAL("toggled(bool)"), self.aacQualitySpin.setEnabled)
+        QtCore.QMetaObject.connectSlotsByName(aacConfigPage)
+        aacConfigPage.setTabOrder(self.aacUseQualityCheck, self.aacQualitySlider)
+        aacConfigPage.setTabOrder(self.aacQualitySlider, self.aacQualitySpin)
+        aacConfigPage.setTabOrder(self.aacQualitySpin, self.aacBitrateCbx)
+
+    def retranslateUi(self, aacConfigPage):
+        aacConfigPage.setWindowTitle(QtGui.QApplication.translate("aacConfigPage", "AAC encoding configuration", None, QtGui.QApplication.UnicodeUTF8))
+        self.aacUseQualityCheck.setText(QtGui.QApplication.translate("aacConfigPage", "Use quality setting (recommended)", None, QtGui.QApplication.UnicodeUTF8))
+        self.aacBitrateGroup.setTitle(QtGui.QApplication.translate("aacConfigPage", "Use bitrate", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_3.setText(QtGui.QApplication.translate("aacConfigPage", "Bitrate:", None, QtGui.QApplication.UnicodeUTF8))
+        self.aacBitrateCbx.setToolTip(QtGui.QApplication.translate("aacConfigPage", "Sets target bitrate (in kb/s).", None, QtGui.QApplication.UnicodeUTF8))
+

flacon-0.6.0.tgz/encoders/aac_encoder.py Added

@@ -0,0 +1,122 @@
+# -*- coding: utf-8 -*-
+# Project : flacon
+# File : ogg_encoder.py
+# (c) Alexander Sokolov sokoloff.a@gmail.com
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+
+
+import encoder
+import errors
+from settings import *
+from flaconglobal import *
+from PyQt4 import QtCore
+import sys, re
+
+import aac_config
+
+class AacEncoder(encoder.Encoder):
+ id = 'AAC'
+ extension = 'm4a'
+ name = 'AAC'
+
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def trackGainClass(cls):
+ return None
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def configPageClass(cls):
+ return aac_config.AacConfig
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def programs(cls):
+ return ['faac']
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ def getEncoderArgs(self):
+ args = QStringList()
+ args << settings.value("Programs/faac").toString()
+ args << "-w" # Wrap AAC data in an MP4 container.
+
+ # Quality settings .........................................
+ if settings.value("Aac/UseQuality").toBool():
+ args << "-q" << settings.value("Aac/Quality").toString()
+ else:
+ args << "-b" << settings.value("Aac/Bitrate").toString()
+
+ # Tags .....................................................
+ # --artist artist
+ # Set artist to artist
+ if (self._track.artist()): args << "--artist" << self._track.artist()
+
+ # --writer writer
+ # Set writer to writer
+
+ # --title title
+ # Set title to title
+ if (self._track.title()): args << "--title" << self._track.title()
+
+ # --genre genre
+ # Set genre to genre
+ if (self._track.genre()): args << "--genre" << self._track.genre()
+
+ # --album album
+ # Set album to album
+ if (self._track.album()): args << "--album" << self._track.album()
+
+ # --compilation
+ # Set compilation
+
+ # --track track
+ # Set track to track in the format “number/total”
+ args << "--track" << QString("%1/%2").arg(self._track.trackNum()).arg(self._track.trackSet().count())
+
+ # --disc disc
+ # Set disc to disc in the format “number/total”
+
+ # --year year
+ # Set year to year
+ if (self._track.year()): args << "--year" << str(self._track.year())
+
+ # --cover-art file
+ # Set cover art to image in file; supported formats are GIF, JPEG, and PNG.
+
+ # --comment comment
+ # Set comment to comment
+ if (self._track.comment()): args << "--comment" << self._track.comment()
+
+
+ # Files ....................................................
+ args << "-o" << self._outFile
+ args << "-"
+ return args
+
+
+
+#****************************************************************
+# Register encoder & gain classes
+#****************************************************************
+encoder.registerEncoder(AacEncoder)

flacon-0.6.0.tgz/encoders/encoder.py Added

@@ -0,0 +1,326 @@
+# -*- coding: utf-8 -*-
+# Project : flacon
+# File : encoder.py
+# (c) Alexander Sokolov sokoloff.a@gmail.com
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+
+#import errno
+import exceptions
+import re
+import sys
+import time
+
+
+from PyQt4 import QtCore
+from PyQt4.QtCore import *
+from PyQt4 import QtGui
+
+from flaconglobal import *
+from project import *
+from converter import *
+from errors import *
+
+
+class Encoder(ConverterThread):
+   #****************************************************************
+   #
+   #****************************************************************
+    @classmethod
+    def check(cls, project):
+        Encoder.checkPrograms(cls.programs())
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    @staticmethod
+    def checkPrograms(progs):
+        for p in progs:
+            if not settings.checkProgram('Programs/' + p):
+                raise errors.ProgramNotFoundError(p)
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    @classmethod
+    def trackGainClass(cls):
+        return None
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    @classmethod
+    def albumGainClass(cls):
+        return cls.trackGainClass()
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    @classmethod
+    def configPageClass(cls):
+        return None
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    @classmethod
+    def programs(cls):
+        raise AbstractError(cls)
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def __init__(self, disc, track):
+        ConverterThread.__init__(self, disc)
+        self._wavFile = QString()
+        self._outFile = QString()
+        self._proc = None
+        self._track = track
+        self._trackIndex = track.index()
+        self._outFile = track.resultFilePath()
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def track(self):
+        return self._track
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def inputDataReady(self, discIndex, trackIndex, fileName):
+        if self._trackIndex != trackIndex:
+            return
+
+        self._wavFile = QString(fileName)
+
+        if self.isReadyStart():
+            self.progressChanged(Statuses.Queued, -1)
+            self.emit(SIGNAL("readyStart()"))
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def wavFile(self):
+        return self._wavFile
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def isReadyStart(self):
+        return not self._wavFile.isEmpty() and self._track
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def _run(self):
+        self.progressChanged(Statuses.Encoding, 0)
+
+        if self._cancel: raise Abort()
+        self.prepare()
+
+        if self._cancel: raise Abort()
+        self.encode()
+
+        if self._cancel: raise Abort()
+        self.deleteWavFile()
+
+        self.trackReady(self._outFile)
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def prepare(self):
+        outFile = QFile(self._track.resultFilePath())
+        outDir = QFileInfo(outFile).dir()
+
+        self.createDir(outDir.absolutePath())
+
+        if outFile.exists() and not outFile.remove():
+            raise ConvertError(self.tr("Can't delete file:\n%1\n%2").arg(outFile.fileName()).arg(outFile.errorString()))
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def encode(self):
+        args = self.getEncoderArgs()
+        #print unicode(args.join(" "))
+
+        self._proc = tryPopen(args, stdin=subprocess.PIPE, stderr=subprocess.PIPE, stdout=subprocess.PIPE, close_fds=True)
+
+        progress = 0
+
+        total = os.path.getsize(unicode(self._wavFile))
+
+        ready = 0
+        buff = ''
+        buffSize = int(total / 200)
+
+        f = open(unicode(self._wavFile), 'rb')
+        while True:
+
+            if self._cancel:
+                self._proc.terminate()
+                self._proc.wait()
+                raise Abort()
+
+            buff = f.read(buffSize)
+            if not buff: break
+
+            ready+=buffSize
+            p = int(ready * 100 / total)
+            if (progress != p):
+                progress = p
+                self.progressChanged(Statuses.Encoding, progress)
+
+            try:
+                self._proc.stdin.write(buff)

flacon-0.6.0.tgz/encoders/encoderConfigPage.py Added

@@ -0,0 +1,219 @@
+# -*- coding: utf-8 -*-
+# Project : flacon
+# File : encoder.py
+# (c) Alexander Sokolov sokoloff.a@gmail.com
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+
+#import errno
+import exceptions
+import re
+import sys
+import time
+
+
+from PyQt4 import QtCore, QtGui
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+
+import encoder
+from settings import *
+import flaconglobal
+
+class EncoderConfigPage(QtGui.QWidget):
+ #****************************************************************
+ #
+ #****************************************************************
+ def __init__(self, parent):
+ QtGui.QWidget.__init__(self, parent)
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ def write(self):
+ raise TypeError('Abstract method "EncoderConfigPage.write" called')
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ @staticmethod
+ def defaults():
+ raise TypeError('Abstract method "EncoderConfigPage.defaults" called')
+
+
+
+#*******************************************************************
+# Helper funcs
+#*******************************************************************
+
+ #****************************************************************
+ #
+ #****************************************************************
+ def fillReplayGainComboBox(self, comboBox):
+ comboBox.clear()
+ comboBox.addItem(QtGui.qApp.translate('EncoderConfigPage', 'Disabled'), QVariant(flaconglobal.ReplayGainTypes.Disable))
+ comboBox.addItem(QtGui.qApp.translate('EncoderConfigPage', 'Per Track'), QVariant(flaconglobal.ReplayGainTypes.Track))
+ comboBox.addItem(QtGui.qApp.translate('EncoderConfigPage', 'Per Album'), QVariant(flaconglobal.ReplayGainTypes.Album))
+ comboBox.setToolTip(QtGui.qApp.translate('EncoderConfigPage',
+ "ReplayGain is a standard to normalize the perceived loudness of computer audio formats. \n\n" +
+ "The analysis can be performed on individual tracks, so that all tracks will be of equal volume on playback. \n"+
+ "Using the album-gain analysis will preserve the volume differences within an album."
+ ))
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ def fillBitrateComboBox(self, comboBox, bitrates):
+ for bitrate in bitrates:
+ if (bitrate):
+ comboBox.addItem(
+ QtGui.qApp.translate('EncoderConfigPage', '%1 kbps').arg(bitrate),
+ QVariant(bitrate)
+ )
+ else:
+ comboBox.addItem(
+ QtGui.qApp.translate('EncoderConfigPage', 'Default'),
+ QVariant('')
+ )
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def loadComboBox(cls, key, comboBox):
+ n = comboBox.findData(settings.value(key))
+
+ if n < 0:
+ print settings.defaultValue(key).toString()
+ n = comboBox.findData(settings.defaultValue(key))
+ print n
+ comboBox.setCurrentIndex(n)
+
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def writeComboBox(cls, key, comboBox):
+ data = comboBox.itemData(comboBox.currentIndex())
+ settings.setValue(key, data)
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def loadSpinBox(cls, key, spinBox):
+ if isinstance(spinBox, QDoubleSpinBox):
+ (value, ok) = settings.value(key).toDouble()
+ if ok: spinBox.setValue(value)
+
+ if isinstance(spinBox, QSpinBox):
+ (value, ok) = settings.value(key).toInt()
+ if ok: spinBox.setValue(value)
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def writeSpinBox(cls, key, spinBox):
+ settings.setValue(key, spinBox.value())
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ def losslessCompressionToolTip(self, min, max):
+ return QtGui.qApp.translate('EncoderConfigPage',
+ "Sets compression level, between %1 (fastest) and %2 (highest compression).\n" +
+ "This only affects the file size. All settings are lossless."
+ ).arg(min).arg(max)
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ def lossyCompressionToolTip(self, min, max):
+ return QtGui.qApp.translate('EncoderConfigPage',
+ "Sets encoding quality, between %1 (lowest) and %2 (highest)."
+ ).arg(min).arg(max)
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ def setLossyToolTip(self, widget):
+ widget.setToolTip(self.lossyCompressionToolTip(widget.minimum(), widget.maximum()))
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ def setLosslessToolTip(self, widget):
+ widget.setToolTip(self.losslessCompressionToolTip(widget.minimum(), widget.maximum()))
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def loadSlider(cls, key, slider):
+ (value, ok) = settings.value(key).toInt()
+ if ok:
+ slider.setValue(value)
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def writeSlider(cls, key, slider):
+ settings.setValue(key, slider.value())
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def loadLineEdit(cls, key, edit):
+ edit.setText(settings.value(key).toString())
+
+
+ #****************************************************************
+ #
+ #****************************************************************

flacon-0.6.0.tgz/encoders/flac_config.py Added

@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+# Project : flacon
+# File : flac_encoder.py
+# (c) Alexander Sokolov sokoloff.a@gmail.com
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+import encoderConfigPage
+import flaconglobal
+
+from encoderConfigPage import EncoderConfigPage
+from flac_config_ui import Ui_flacConfigPage as UI
+
+
+class FlacConfig(EncoderConfigPage, UI):
+
+   #****************************************************************
+   #
+   #****************************************************************
+    @staticmethod
+    def defaults():
+        return {
+            'Flac/Compression':     5,
+            'Flac/ReplayGain':      flaconglobal.ReplayGainTypes.Disable,
+        }
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def __init__(self, parent):
+        EncoderConfigPage.__init__(self, parent)
+        self.setupUi(self)
+
+        self.setLosslessToolTip(self.flacCompressionSlider)
+        self.flacCompressionSpin.setToolTip(self.flacCompressionSlider.toolTip())
+        self.fillReplayGainComboBox(self.flacGainCbx)
+
+
+        self.loadSlider('Flac/Compression',  self.flacCompressionSlider)
+        self.loadComboBox('Flac/ReplayGain', self.flacGainCbx)
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def write(self):
+        self.writeSlider('Flac/Compression',  self.flacCompressionSlider)
+        self.writeComboBox('Flac/ReplayGain', self.flacGainCbx)
+

flacon-0.6.0.tgz/encoders/flac_config.ui Added

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>flacConfigPage</class>
+ <widget class="QWidget" name="flacConfigPage">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>519</width>
+ <height>380</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Flac encoding configuration</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QGridLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="flacCompressionLabel">
+ <property name="text">
+ <string>Compression:</string>
+ </property>
+ <property name="buddy">
+ <cstring>flacCompressionSlider</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QSlider" name="flacCompressionSlider">
+ <property name="maximum">
+ <number>8</number>
+ </property>
+ <property name="pageStep">
+ <number>1</number>
+ </property>
+ <property name="value">
+ <number>0</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="tickPosition">
+ <enum>QSlider::TicksAbove</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="flacCompressionSpin">
+ <property name="maximum">
+ <number>8</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="flacGainGroup">
+ <property name="title">
+ <string>ReplayGain</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_8">
+ <item>
+ <layout class="QGridLayout" name="formLayout_7">
+ <item row="0" column="0">
+ <widget class="QLabel" name="flacGainLabel">
+ <property name="text">
+ <string>Calculate gain:</string>
+ </property>
+ <property name="buddy">
+ <cstring>flacGainCbx</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="flacGainCbx">
+ <item>
+ <property name="text">
+ <string>Disabled</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>231</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>flacCompressionSlider</sender>
+ <signal>valueChanged(int)</signal>
+ <receiver>flacCompressionSpin</receiver>
+ <slot>setValue(int)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>402</x>
+ <y>55</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>477</x>
+ <y>58</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>flacCompressionSpin</sender>
+ <signal>valueChanged(int)</signal>
+ <receiver>flacCompressionSlider</receiver>
+ <slot>setValue(int)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>481</x>
+ <y>46</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>435</x>
+ <y>46</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>

flacon-0.6.0.tgz/encoders/flac_config_ui.py Added

@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'encoders/flac_config.ui'
+#
+# Created: Thu Dec  1 21:58:55 2011
+#      by: PyQt4 UI code generator 4.7.4
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt4 import QtCore, QtGui
+
+class Ui_flacConfigPage(object):
+    def setupUi(self, flacConfigPage):
+        flacConfigPage.setObjectName("flacConfigPage")
+        flacConfigPage.resize(519, 380)
+        self.verticalLayout = QtGui.QVBoxLayout(flacConfigPage)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.formLayout = QtGui.QGridLayout()
+        self.formLayout.setObjectName("formLayout")
+        self.flacCompressionLabel = QtGui.QLabel(flacConfigPage)
+        self.flacCompressionLabel.setObjectName("flacCompressionLabel")
+        self.formLayout.addWidget(self.flacCompressionLabel, 0, 0, 1, 1)
+        self.horizontalLayout_2 = QtGui.QHBoxLayout()
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+        self.flacCompressionSlider = QtGui.QSlider(flacConfigPage)
+        self.flacCompressionSlider.setMaximum(8)
+        self.flacCompressionSlider.setPageStep(1)
+        self.flacCompressionSlider.setProperty("value", QtCore.QVariant(0))
+        self.flacCompressionSlider.setOrientation(QtCore.Qt.Horizontal)
+        self.flacCompressionSlider.setTickPosition(QtGui.QSlider.TicksAbove)
+        self.flacCompressionSlider.setObjectName("flacCompressionSlider")
+        self.horizontalLayout_2.addWidget(self.flacCompressionSlider)
+        self.flacCompressionSpin = QtGui.QSpinBox(flacConfigPage)
+        self.flacCompressionSpin.setMaximum(8)
+        self.flacCompressionSpin.setObjectName("flacCompressionSpin")
+        self.horizontalLayout_2.addWidget(self.flacCompressionSpin)
+        self.formLayout.addLayout(self.horizontalLayout_2, 0, 1, 1, 1)
+        self.verticalLayout.addLayout(self.formLayout)
+        self.flacGainGroup = QtGui.QGroupBox(flacConfigPage)
+        self.flacGainGroup.setObjectName("flacGainGroup")
+        self.verticalLayout_8 = QtGui.QVBoxLayout(self.flacGainGroup)
+        self.verticalLayout_8.setObjectName("verticalLayout_8")
+        self.formLayout_7 = QtGui.QGridLayout()
+        self.formLayout_7.setObjectName("formLayout_7")
+        self.flacGainLabel = QtGui.QLabel(self.flacGainGroup)
+        self.flacGainLabel.setObjectName("flacGainLabel")
+        self.formLayout_7.addWidget(self.flacGainLabel, 0, 0, 1, 1)
+        self.flacGainCbx = QtGui.QComboBox(self.flacGainGroup)
+        self.flacGainCbx.setObjectName("flacGainCbx")
+        self.flacGainCbx.addItem("")
+        self.formLayout_7.addWidget(self.flacGainCbx, 0, 1, 1, 1)
+        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.formLayout_7.addItem(spacerItem, 0, 2, 1, 1)
+        self.verticalLayout_8.addLayout(self.formLayout_7)
+        self.verticalLayout.addWidget(self.flacGainGroup)
+        spacerItem1 = QtGui.QSpacerItem(20, 231, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.verticalLayout.addItem(spacerItem1)
+        self.flacCompressionLabel.setBuddy(self.flacCompressionSlider)
+        self.flacGainLabel.setBuddy(self.flacGainCbx)
+
+        self.retranslateUi(flacConfigPage)
+        QtCore.QObject.connect(self.flacCompressionSlider, QtCore.SIGNAL("valueChanged(int)"), self.flacCompressionSpin.setValue)
+        QtCore.QObject.connect(self.flacCompressionSpin, QtCore.SIGNAL("valueChanged(int)"), self.flacCompressionSlider.setValue)
+        QtCore.QMetaObject.connectSlotsByName(flacConfigPage)
+
+    def retranslateUi(self, flacConfigPage):
+        flacConfigPage.setWindowTitle(QtGui.QApplication.translate("flacConfigPage", "Flac encoding configuration", None, QtGui.QApplication.UnicodeUTF8))
+        self.flacCompressionLabel.setText(QtGui.QApplication.translate("flacConfigPage", "Compression:", None, QtGui.QApplication.UnicodeUTF8))
+        self.flacGainGroup.setTitle(QtGui.QApplication.translate("flacConfigPage", "ReplayGain", None, QtGui.QApplication.UnicodeUTF8))
+        self.flacGainLabel.setText(QtGui.QApplication.translate("flacConfigPage", "Calculate gain:", None, QtGui.QApplication.UnicodeUTF8))
+        self.flacGainCbx.setItemText(0, QtGui.QApplication.translate("flacConfigPage", "Disabled", None, QtGui.QApplication.UnicodeUTF8))
+

flacon-0.5.7.tar.bz2/encoders/flac_encoder.py -> flacon-0.6.0.tgz/encoders/flac_encoder.py Changed

@@ -18,12 +18,12 @@
 from PyQt4 import QtCore
 
 from flaconglobal import *
-#from errors import *
+import flac_config
 
 class FlacEncoder(encoder.Encoder):
 id = 'FLAC'
 extension = 'flac'
- name = 'FLAC'
+ name = 'Flac'
 
 
 #****************************************************************
@@ -33,6 +33,7 @@
 args = QStringList()
 args << settings.value("Programs/flac").toString()
 args << "--force" # Force overwriting of output files.
+ args << "--silent" # Suppress progress indicator
 
 # Settings .................................................
 args << QString("--compression-level-%1").arg(settings.value("Flac/Compression").toString())
@@ -48,7 +49,7 @@
 args << "--tag" << QString("TRACKNUMBER=%1").arg(self._track.trackNum())
 args << "--tag" << QString("TOTALTRACKS=%1").arg(self._track.trackSet().count())
 args << "--tag" << QString("TRACKTOTAL=%1").arg(self._track.trackSet().count())
- 
+
 args << "-"
 args << "-o" << self._outFile,
 
@@ -58,11 +59,25 @@
 #****************************************************************
 #
 #****************************************************************
- @staticmethod
- def check(out):
- if not settings.checkProgram('Programs/flac'):
- out << 'flac'
+ @classmethod
+ def trackGainClass(cls):
+ return FlacGain
+
 
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def configPageClass(cls):
+ return flac_config.FlacConfig
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def programs(cls):
+ return ['flac']
 
 
 class FlacGain(encoder.Gain):
@@ -89,14 +104,24 @@
 #****************************************************************
 #
 #****************************************************************
- @staticmethod
- def check(out):
- if not settings.checkProgram('Programs/metaflac'):
- out << 'metaflac'
+ @classmethod
+ def check(cls, project):
+ encoder.Encoder.checkPrograms(cls.programs())
+
+ for disk in project:
+ if disk.audioFile().sampleRate() > 48000:
+ raise errors.ConvertError(QtGui.qApp.translate('FlacGain', "you can't use 'ReplayGain' for files with sample rates above 48kHz. Metaflac doesn't support such files."))
+
 
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def programs(cls):
+ return ['metaflac']
 
 
 #****************************************************************
 # Register encoder & gain classes
 #****************************************************************
-encoder.registerEncoder(FlacEncoder, FlacGain, FlacGain)
+encoder.registerEncoder(FlacEncoder)

flacon-0.6.0.tgz/encoders/mp3_config.py Added

@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+# Project : flacon
+# File : flac_encoder.py
+# (c) Alexander Sokolov sokoloff.a@gmail.com
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+from PyQt4.QtCore import *
+import flaconglobal
+
+from encoderConfigPage import EncoderConfigPage
+from mp3_config_ui import Ui_mp3ConfigPage as UI
+
+
+class Mp3Config(EncoderConfigPage, UI):
+
+ #****************************************************************
+ #
+ #****************************************************************
+ @staticmethod
+ def defaults():
+ return {
+ 'Mp3/Preset': 'vbrStandardFast',
+ 'Mp3/Bitrate': '320',
+ 'Mp3/Quality': 4,
+ 'Mp3/ReplayGain': flaconglobal.ReplayGainTypes.Disable,
+ }
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ def __init__(self, parent):
+ EncoderConfigPage.__init__(self, parent)
+ self.setupUi(self)
+
+
+ presets = self.mp3PresetCbx
+
+ presets.addItem(self.tr('VBR medium'), QVariant('vbrMedium'))
+ presets.addItem(self.tr('VBR standard'), QVariant('vbrStandard'))
+ presets.addItem(self.tr('VBR standard fast'), QVariant('vbrStandardFast'))
+ presets.addItem(self.tr('VBR extreme'), QVariant('vbrExtreme'))
+ presets.addItem(self.tr('VBR extreme fast'), QVariant('vbrExtremeFast'))
+ presets.addItem(self.tr('VBR quality'), QVariant('vbrQuality'))
+ presets.addItem(self.tr('CBR insane'), QVariant('cbrInsane'))
+ presets.addItem(self.tr('CBR kbps'), QVariant('cbrKbps'))
+ presets.addItem(self.tr('ABR kbps'), QVariant('abrKbps'))
+
+
+ bitrates = self.mp3BitrateCbx
+ self.fillBitrateComboBox(self.mp3BitrateCbx, [32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320])
+
+ css = '''<style type="text/css">
+ qbody { font-size: 9px; }
+ dt { font-weight: bold; }
+ dd { margin-left: 8px; margin-bottom: 8px; }
+ </style>'''
+ self.mp3PresetCbx.setToolTip(css + self.mp3PresetCbx.toolTip());
+
+ self.setLossyToolTip(self.mp3QualitySlider)
+ self.mp3QualitySpin.setToolTip(self.mp3QualitySlider.toolTip())
+ self.mp3QualityLabel.setToolTip(self.mp3QualitySlider.toolTip())
+
+ self.connect(self.mp3PresetCbx, SIGNAL('currentIndexChanged(int)'), self.mp3PresetCbxCanged)
+ self.mp3PresetCbxCanged(self.mp3PresetCbx.currentIndex())
+
+ self.fillReplayGainComboBox(self.mp3GainCbx)
+
+ self.loadComboBox('Mp3/Preset', self.mp3PresetCbx)
+ self.loadComboBox('Mp3/Bitrate', self.mp3BitrateCbx)
+ self.loadSpinBox('Mp3/Quality', self.mp3QualitySpin)
+ self.mp3QualitySlider.setValue(self.mp3QualitySpin.value())
+ self.loadComboBox('Mp3/ReplayGain', self.mp3GainCbx)
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ def write(self):
+ self.writeComboBox('Mp3/Preset', self.mp3PresetCbx)
+ self.writeComboBox('Mp3/Bitrate', self.mp3BitrateCbx)
+ self.writeSpinBox('Mp3/Quality', self.mp3QualitySpin)
+ self.writeComboBox('Mp3/ReplayGain',self.mp3GainCbx)
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ def mp3PresetCbxCanged(self, index):
+ preset = self.mp3PresetCbx.itemData(index).toString()
+
+ enable = (preset == 'abrKbps' or preset=='cbrKbps')
+ self.mp3BitrateBox.setEnabled(enable)
+
+ enable = (preset == 'vbrQuality')
+ self.mp3QualityBox.setEnabled(enable)
+

flacon-0.6.0.tgz/encoders/mp3_config.ui Added

@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>mp3ConfigPage</class>
+ <widget class="QWidget" name="mp3ConfigPage">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>519</width>
+ <height>380</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>MP3 encoding configuration</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QLabel" name="mp3PresetLabel">
+ <property name="text">
+ <string>Preset:</string>
+ </property>
+ <property name="buddy">
+ <cstring>mp3PresetCbx</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="mp3PresetCbx">
+ <property name="toolTip">
+ <string extracomment="ererere">&lt;dt&gt;VBR medium&lt;/dt&gt;
+&lt;dd&gt;By using a medium Variable BitRate, this preset should provide near transparency to most people and most music.&lt;/dd&gt;
+
+&lt;dt&gt;VBR standard, VBR standard fast&lt;/dt&gt;
+&lt;dd&gt;By using a standard Variable BitRate, this preset should generally be transparent to most people on most music and is already quite high in quality.&lt;/dd&gt;
+
+&lt;dt&gt;VBR extreme, VBR extreme fast&lt;/dt&gt;
+&lt;dd&gt;By using the highest possible Variable BitRate, this preset provides slightly higher quality than the standard mode if you have extremely good hearing or high-end audio equipment .&lt;/dd&gt;
+
+&lt;dt&gt;VBR quality&lt;/dt&gt;
+&lt;dd&gt;This Variable BitRate option lets you specify the output quality.&lt;/dd&gt;
+
+&lt;dt&gt;fast option&lt;/dt&gt;
+&lt;dd&gt;Enables the new fast VBR for a particular profile. This is recommended.&lt;/dd&gt;
+
+&lt;dt&gt;CBR insane&lt;/dt&gt;
+&lt;dd&gt;If you must have the absolute highest quality with no regard to file size, you'll achieve it by using this Constant BitRate.&lt;/dd&gt;
+
+&lt;dt&gt;CBR kbps&lt;/dt&gt;
+&lt;dd&gt;Using this Constant BitRate preset will usually give you good quality at a specified bitrate.&lt;/dd&gt;
+
+&lt;dt&gt;ABR kbps&lt;/dt&gt;
+&lt;dd&gt;Using this Average BitRate preset will usually give you higher quality than the Constant BitRate option for a specified bitrate.&lt;/dd&gt;
+</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="mp3BitrateBox">
+ <property name="title">
+ <string>Use bitrate</string>
+ </property>
+ <layout class="QGridLayout" name="formLayout_4">
+ <item row="0" column="0">
+ <widget class="QLabel" name="mp3BitrateLabel">
+ <property name="text">
+ <string>Bitrate:</string>
+ </property>
+ <property name="buddy">
+ <cstring>mp3BitrateCbx</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="mp3BitrateCbx">
+ <property name="toolTip">
+ <string>Sets target bitrate (in kb/s).</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer_8">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="mp3QualityBox">
+ <property name="title">
+ <string>Use quality</string>
+ </property>
+ <layout class="QGridLayout" name="formLayout_5">
+ <item row="0" column="0">
+ <widget class="QLabel" name="mp3QualityLabel">
+ <property name="text">
+ <string>Quality:</string>
+ </property>
+ <property name="buddy">
+ <cstring>mp3QualitySlider</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_28">
+ <item>
+ <widget class="QSlider" name="mp3QualitySlider">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>9</number>
+ </property>
+ <property name="singleStep">
+ <number>1</number>
+ </property>
+ <property name="pageStep">
+ <number>1</number>
+ </property>
+ <property name="value">
+ <number>5</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="tickPosition">
+ <enum>QSlider::TicksAbove</enum>
+ </property>
+ <property name="tickInterval">
+ <number>1</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="mp3QualitySpin">
+ <property name="maximum">
+ <number>9</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="oggGainGroup_2">
+ <property name="title">
+ <string>ReplayGain</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <layout class="QGridLayout" name="formLayout_8">
+ <item row="0" column="0">
+ <widget class="QLabel" name="mp3GainLabel">
+ <property name="text">
+ <string>Calculate gain:</string>
+ </property>
+ <property name="buddy">
+ <cstring>mp3GainCbx</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="mp3GainCbx"/>
+ </item>
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer_7">

flacon-0.6.0.tgz/encoders/mp3_config_ui.py Added

@@ -0,0 +1,139 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'encoders/mp3_config.ui'
+#
+# Created: Thu Dec 1 21:58:55 2011
+# by: PyQt4 UI code generator 4.7.4
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt4 import QtCore, QtGui
+
+class Ui_mp3ConfigPage(object):
+ def setupUi(self, mp3ConfigPage):
+ mp3ConfigPage.setObjectName("mp3ConfigPage")
+ mp3ConfigPage.resize(519, 380)
+ self.verticalLayout = QtGui.QVBoxLayout(mp3ConfigPage)
+ self.verticalLayout.setObjectName("verticalLayout")
+ self.horizontalLayout_3 = QtGui.QHBoxLayout()
+ self.horizontalLayout_3.setObjectName("horizontalLayout_3")
+ self.mp3PresetLabel = QtGui.QLabel(mp3ConfigPage)
+ self.mp3PresetLabel.setObjectName("mp3PresetLabel")
+ self.horizontalLayout_3.addWidget(self.mp3PresetLabel)
+ self.mp3PresetCbx = QtGui.QComboBox(mp3ConfigPage)
+ self.mp3PresetCbx.setObjectName("mp3PresetCbx")
+ self.horizontalLayout_3.addWidget(self.mp3PresetCbx)
+ spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ self.horizontalLayout_3.addItem(spacerItem)
+ self.verticalLayout.addLayout(self.horizontalLayout_3)
+ self.mp3BitrateBox = QtGui.QGroupBox(mp3ConfigPage)
+ self.mp3BitrateBox.setObjectName("mp3BitrateBox")
+ self.formLayout_4 = QtGui.QGridLayout(self.mp3BitrateBox)
+ self.formLayout_4.setObjectName("formLayout_4")
+ self.mp3BitrateLabel = QtGui.QLabel(self.mp3BitrateBox)
+ self.mp3BitrateLabel.setObjectName("mp3BitrateLabel")
+ self.formLayout_4.addWidget(self.mp3BitrateLabel, 0, 0, 1, 1)
+ self.mp3BitrateCbx = QtGui.QComboBox(self.mp3BitrateBox)
+ self.mp3BitrateCbx.setObjectName("mp3BitrateCbx")
+ self.formLayout_4.addWidget(self.mp3BitrateCbx, 0, 1, 1, 1)
+ spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ self.formLayout_4.addItem(spacerItem1, 0, 2, 1, 1)
+ self.verticalLayout.addWidget(self.mp3BitrateBox)
+ self.mp3QualityBox = QtGui.QGroupBox(mp3ConfigPage)
+ self.mp3QualityBox.setObjectName("mp3QualityBox")
+ self.formLayout_5 = QtGui.QGridLayout(self.mp3QualityBox)
+ self.formLayout_5.setObjectName("formLayout_5")
+ self.mp3QualityLabel = QtGui.QLabel(self.mp3QualityBox)
+ self.mp3QualityLabel.setObjectName("mp3QualityLabel")
+ self.formLayout_5.addWidget(self.mp3QualityLabel, 0, 0, 1, 1)
+ self.horizontalLayout_28 = QtGui.QHBoxLayout()
+ self.horizontalLayout_28.setObjectName("horizontalLayout_28")
+ self.mp3QualitySlider = QtGui.QSlider(self.mp3QualityBox)
+ sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(self.mp3QualitySlider.sizePolicy().hasHeightForWidth())
+ self.mp3QualitySlider.setSizePolicy(sizePolicy)
+ self.mp3QualitySlider.setMinimum(0)
+ self.mp3QualitySlider.setMaximum(9)
+ self.mp3QualitySlider.setSingleStep(1)
+ self.mp3QualitySlider.setPageStep(1)
+ self.mp3QualitySlider.setProperty("value", QtCore.QVariant(5))
+ self.mp3QualitySlider.setOrientation(QtCore.Qt.Horizontal)
+ self.mp3QualitySlider.setTickPosition(QtGui.QSlider.TicksAbove)
+ self.mp3QualitySlider.setTickInterval(1)
+ self.mp3QualitySlider.setObjectName("mp3QualitySlider")
+ self.horizontalLayout_28.addWidget(self.mp3QualitySlider)
+ self.mp3QualitySpin = QtGui.QSpinBox(self.mp3QualityBox)
+ self.mp3QualitySpin.setMaximum(9)
+ self.mp3QualitySpin.setObjectName("mp3QualitySpin")
+ self.horizontalLayout_28.addWidget(self.mp3QualitySpin)
+ self.formLayout_5.addLayout(self.horizontalLayout_28, 0, 1, 1, 1)
+ self.verticalLayout.addWidget(self.mp3QualityBox)
+ self.oggGainGroup_2 = QtGui.QGroupBox(mp3ConfigPage)
+ self.oggGainGroup_2.setObjectName("oggGainGroup_2")
+ self.verticalLayout_4 = QtGui.QVBoxLayout(self.oggGainGroup_2)
+ self.verticalLayout_4.setObjectName("verticalLayout_4")
+ self.formLayout_8 = QtGui.QGridLayout()
+ self.formLayout_8.setObjectName("formLayout_8")
+ self.mp3GainLabel = QtGui.QLabel(self.oggGainGroup_2)
+ self.mp3GainLabel.setObjectName("mp3GainLabel")
+ self.formLayout_8.addWidget(self.mp3GainLabel, 0, 0, 1, 1)
+ self.mp3GainCbx = QtGui.QComboBox(self.oggGainGroup_2)
+ self.mp3GainCbx.setObjectName("mp3GainCbx")
+ self.formLayout_8.addWidget(self.mp3GainCbx, 0, 1, 1, 1)
+ spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ self.formLayout_8.addItem(spacerItem2, 0, 2, 1, 1)
+ self.verticalLayout_4.addLayout(self.formLayout_8)
+ self.verticalLayout.addWidget(self.oggGainGroup_2)
+ spacerItem3 = QtGui.QSpacerItem(20, 136, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+ self.verticalLayout.addItem(spacerItem3)
+ self.mp3PresetLabel.setBuddy(self.mp3PresetCbx)
+ self.mp3BitrateLabel.setBuddy(self.mp3BitrateCbx)
+ self.mp3QualityLabel.setBuddy(self.mp3QualitySlider)
+ self.mp3GainLabel.setBuddy(self.mp3GainCbx)
+
+ self.retranslateUi(mp3ConfigPage)
+ QtCore.QObject.connect(self.mp3QualitySlider, QtCore.SIGNAL("valueChanged(int)"), self.mp3QualitySpin.setValue)
+ QtCore.QObject.connect(self.mp3QualitySpin, QtCore.SIGNAL("valueChanged(int)"), self.mp3QualitySlider.setValue)
+ QtCore.QMetaObject.connectSlotsByName(mp3ConfigPage)
+ mp3ConfigPage.setTabOrder(self.mp3PresetCbx, self.mp3BitrateCbx)
+ mp3ConfigPage.setTabOrder(self.mp3BitrateCbx, self.mp3QualitySlider)
+ mp3ConfigPage.setTabOrder(self.mp3QualitySlider, self.mp3QualitySpin)
+ mp3ConfigPage.setTabOrder(self.mp3QualitySpin, self.mp3GainCbx)
+
+ def retranslateUi(self, mp3ConfigPage):
+ mp3ConfigPage.setWindowTitle(QtGui.QApplication.translate("mp3ConfigPage", "MP3 encoding configuration", None, QtGui.QApplication.UnicodeUTF8))
+ self.mp3PresetLabel.setText(QtGui.QApplication.translate("mp3ConfigPage", "Preset:", None, QtGui.QApplication.UnicodeUTF8))
+ self.mp3PresetCbx.setToolTip(QtGui.QApplication.translate("mp3ConfigPage", "<dt>VBR medium</dt>\n"
+"<dd>By using a medium Variable BitRate, this preset should provide near transparency to most people and most music.</dd>\n"
+"\n"
+"<dt>VBR standard, VBR standard fast</dt>\n"
+"<dd>By using a standard Variable BitRate, this preset should generally be transparent to most people on most music and is already quite high in quality.</dd>\n"
+"\n"
+"<dt>VBR extreme, VBR extreme fast</dt>\n"
+"<dd>By using the highest possible Variable BitRate, this preset provides slightly higher quality than the standard mode if you have extremely good hearing or high-end audio equipment .</dd>\n"
+"\n"
+"<dt>VBR quality</dt>\n"
+"<dd>This Variable BitRate option lets you specify the output quality.</dd>\n"
+"\n"
+"<dt>fast option</dt>\n"
+"<dd>Enables the new fast VBR for a particular profile. This is recommended.</dd>\n"
+"\n"
+"<dt>CBR insane</dt>\n"
+"<dd>If you must have the absolute highest quality with no regard to file size, you\'ll achieve it by using this Constant BitRate.</dd>\n"
+"\n"
+"<dt>CBR kbps</dt>\n"
+"<dd>Using this Constant BitRate preset will usually give you good quality at a specified bitrate.</dd>\n"
+"\n"
+"<dt>ABR kbps</dt>\n"
+"<dd>Using this Average BitRate preset will usually give you higher quality than the Constant BitRate option for a specified bitrate.</dd>\n"
+"", None, QtGui.QApplication.UnicodeUTF8))
+ self.mp3BitrateBox.setTitle(QtGui.QApplication.translate("mp3ConfigPage", "Use bitrate", None, QtGui.QApplication.UnicodeUTF8))
+ self.mp3BitrateLabel.setText(QtGui.QApplication.translate("mp3ConfigPage", "Bitrate:", None, QtGui.QApplication.UnicodeUTF8))
+ self.mp3BitrateCbx.setToolTip(QtGui.QApplication.translate("mp3ConfigPage", "Sets target bitrate (in kb/s).", None, QtGui.QApplication.UnicodeUTF8))
+ self.mp3QualityBox.setTitle(QtGui.QApplication.translate("mp3ConfigPage", "Use quality", None, QtGui.QApplication.UnicodeUTF8))
+ self.mp3QualityLabel.setText(QtGui.QApplication.translate("mp3ConfigPage", "Quality:", None, QtGui.QApplication.UnicodeUTF8))
+ self.oggGainGroup_2.setTitle(QtGui.QApplication.translate("mp3ConfigPage", "ReplayGain", None, QtGui.QApplication.UnicodeUTF8))
+ self.mp3GainLabel.setText(QtGui.QApplication.translate("mp3ConfigPage", "Calculate gain:", None, QtGui.QApplication.UnicodeUTF8))
+

flacon-0.5.7.tar.bz2/encoders/mp3_encoder.py -> flacon-0.6.0.tgz/encoders/mp3_encoder.py Changed

@@ -21,13 +21,37 @@
 from flaconglobal import *
 from PyQt4 import QtCore
 import sys, re
-
+import mp3_config
 
 class Mp3Encoder(encoder.Encoder):
 id = 'MP3'
 extension = 'mp3'
 name = 'MP3'
 
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def trackGainClass(cls):
+ return Mp3Gain
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def configPageClass(cls):
+ return mp3_config.Mp3Config
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def programs(cls):
+ return ['lame']
+
+
 
 #****************************************************************
 #
@@ -40,19 +64,19 @@
 # Settings .................................................
 preset = settings.value("Mp3/Preset").toString()
 
- if preset == 'avrMedium':
+ if preset == 'vbrMedium':
 args << "--preset" << "medium"
 
- elif preset == 'avrStandard':
+ elif preset == 'vbrStandard':
 args << "--preset" << "standard"
 
- elif preset == 'avrStandardFast':
+ elif preset == 'vbrStandardFast':
 args << "--preset" << "fast" << "standard"
 
- elif preset == 'avrExtreme':
+ elif preset == 'vbrExtreme':
 args << "--preset" << "extreme"
 
- elif preset == 'avrExtremeFast':
+ elif preset == 'vbrExtremeFast':
 args << "--preset" << "fast" << "extreme"
 
 elif preset == 'cbrInsane':
@@ -69,7 +93,7 @@
 args << "-V" << QString("%1").arg(9 - quality)
 
 
- # Replay Gain ...............................................
+ # ReplayGain ...............................................
 if settings.value("Mp3/ReplayGain") != ReplayGainTypes.Track:
 args << "--noreplaygain"
 
@@ -92,18 +116,18 @@
 return args
 
 
+
+
+class Mp3Gain(encoder.Gain):
 #****************************************************************
 #
 #****************************************************************
- @staticmethod
- def check(out):
- if not settings.checkProgram('Programs/lame'):
- out << 'lame'
-
+ @classmethod
+ def programs(cls):
+ return ['mp3gain']
 
 
 
-class Mp3Gain(encoder.Gain):
 #****************************************************************
 #
 #****************************************************************
@@ -164,18 +188,8 @@
 
 
 
- #****************************************************************
- #
- #****************************************************************
- @staticmethod
- def check(out):
- if not settings.checkProgram('Programs/mp3gain'):
- out << 'mp3gain'
-
-
-
 #****************************************************************
 # Register encoder & gain classes
 #****************************************************************
-encoder.registerEncoder(Mp3Encoder, Mp3Gain, Mp3Gain)
+encoder.registerEncoder(Mp3Encoder)

flacon-0.6.0.tgz/encoders/ogg_config.py Added

@@ -0,0 +1,97 @@
+# -*- coding: utf-8 -*-
+# Project : flacon
+# File : flac_encoder.py
+# (c) Alexander Sokolov sokoloff.a@gmail.com
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+from PyQt4.QtCore import *
+import flaconglobal
+
+from encoderConfigPage import EncoderConfigPage
+from ogg_config_ui import Ui_oggConfigPage as UI
+
+class OggConfig(EncoderConfigPage, UI):
+
+   #****************************************************************
+   #
+   #****************************************************************
+    @staticmethod
+    def defaults():
+        return {
+            'Ogg/UseQuality':       True,
+            'Ogg/Quality':          7,
+            'Ogg/MinBitrate':       '',
+            'Ogg/NormBitrate':      '',
+            'Ogg/MaxBitrate':       '',
+            'Ogg/ReplayGain':       flaconglobal.ReplayGainTypes.Disable,
+        }
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def __init__(self, parent):
+        EncoderConfigPage.__init__(self, parent)
+        self.setupUi(self)
+
+        self.setLossyToolTip(self.oggQualitySpin)
+        self.oggQualitySlider.setToolTip(self.oggQualitySpin.toolTip())
+        self.oggQualityLabel.setToolTip(self.oggQualitySpin.toolTip())
+
+        self.connect(self.oggQualitySlider, SIGNAL('valueChanged(int)'),  self.oggQualitySliderChanged)
+        self.connect(self.oggQualitySpin, SIGNAL('valueChanged(double)'), self.oggQualitySpinChanged)
+        self.fillReplayGainComboBox(self.oggGainCbx)
+
+        self.loadCheckBox('Ogg/UseQuality',  self.oggUseQualityCheck)
+        self.loadSpinBox( 'Ogg/Quality',     self.oggQualitySpin)
+        self.loadComboBox('Ogg/MinBitrate',  self.oggMinBitrateCbx)
+        self.loadComboBox('Ogg/NormBitrate', self.oggNormBitrateCbx)
+        self.loadComboBox('Ogg/MaxBitrate',  self.oggMaxBitrateCbx)
+        self.loadComboBox('Ogg/ReplayGain',  self.oggGainCbx)
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def write(self):
+        self.writeCheckBox('Ogg/UseQuality',  self.oggUseQualityCheck)
+        self.writeSpinBox( 'Ogg/Quality',     self.oggQualitySpin)
+        self.writeComboBox('Ogg/MinBitrate',  self.oggMinBitrateCbx)
+        self.writeComboBox('Ogg/NormBitrate', self.oggNormBitrateCbx)
+        self.writeComboBox('Ogg/MaxBitrate',  self.oggMaxBitrateCbx)
+        self.writeComboBox('Ogg/ReplayGain',  self.oggGainCbx)
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def oggQualitySliderChanged(self, value):
+        val = value / 10.0
+        self.oggQualitySpin.setValue(val)
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def oggQualitySpinChanged(self, value):
+        self.oggQualitySlider.setValue(value * 10)
+        #       -1  0   1   2   3    4    5    6    7    8    9    10   fake
+        kbps = [45, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 500, 500]
+        x1 = int(value)
+        y1=kbps[x1+1];
+        y2=kbps[x1+2]
+        bitrate = round((y2-y1+0.0) * (value - x1) + y1)
+        self.oggQualityLabel.setText(QString("(~%1 kbps)").arg(bitrate))
+
+        self.fillBitrateComboBox(self.oggMinBitrateCbx,  ['', 64, 80, 96, 128, 160, 196, 256, 350])
+        self.fillBitrateComboBox(self.oggNormBitrateCbx, ['', 64, 80, 96, 128, 160, 196, 256, 350])
+        self.fillBitrateComboBox(self.oggMaxBitrateCbx,  ['', 64, 80, 96, 128, 160, 196, 256, 350])

flacon-0.6.0.tgz/encoders/ogg_config.ui Added

@@ -0,0 +1,423 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>oggConfigPage</class>
+ <widget class="QWidget" name="oggConfigPage">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>519</width>
+ <height>380</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Ogg encoding configuration</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QCheckBox" name="oggUseQualityCheck">
+ <property name="text">
+ <string>Use quality setting (recommended)</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <widget class="QSlider" name="oggQualitySlider">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimum">
+ <number>-10</number>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="singleStep">
+ <number>5</number>
+ </property>
+ <property name="pageStep">
+ <number>10</number>
+ </property>
+ <property name="value">
+ <number>0</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="tickPosition">
+ <enum>QSlider::TicksAbove</enum>
+ </property>
+ <property name="tickInterval">
+ <number>10</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDoubleSpinBox" name="oggQualitySpin">
+ <property name="decimals">
+ <number>1</number>
+ </property>
+ <property name="minimum">
+ <double>-1.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>10.000000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>0.100000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="oggQualityLabel">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="text">
+ <string notr="true">(~160kbps)</string>
+ </property>
+ <property name="buddy">
+ <cstring>oggQualitySlider</cstring>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="oggBitrateGroup">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="title">
+ <string>Use bitrate</string>
+ </property>
+ <property name="checkable">
+ <bool>false</bool>
+ </property>
+ <layout class="QGridLayout" name="formLayout_3">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Minimal bitrate:</string>
+ </property>
+ <property name="buddy">
+ <cstring>oggMinBitrateCbx</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="oggMinBitrateCbx">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Sets minimum bitrate (in kb/s).</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Nominal bitrate:</string>
+ </property>
+ <property name="buddy">
+ <cstring>oggNormBitrateCbx</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="oggNormBitrateCbx">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Sets target bitrate (in kb/s).</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Maximum bitrate:</string>
+ </property>
+ <property name="buddy">
+ <cstring>oggMaxBitrateCbx</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QComboBox" name="oggMaxBitrateCbx">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Sets maximum bitrate (in kb/s).</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <spacer name="horizontalSpacer_5">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="oggGainGroup">
+ <property name="title">

flacon-0.6.0.tgz/encoders/ogg_config_ui.py Added

@@ -0,0 +1,142 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'encoders/ogg_config.ui'
+#
+# Created: Thu Dec  1 21:58:55 2011
+#      by: PyQt4 UI code generator 4.7.4
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt4 import QtCore, QtGui
+
+class Ui_oggConfigPage(object):
+    def setupUi(self, oggConfigPage):
+        oggConfigPage.setObjectName("oggConfigPage")
+        oggConfigPage.resize(519, 380)
+        self.verticalLayout = QtGui.QVBoxLayout(oggConfigPage)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.oggUseQualityCheck = QtGui.QCheckBox(oggConfigPage)
+        self.oggUseQualityCheck.setChecked(True)
+        self.oggUseQualityCheck.setObjectName("oggUseQualityCheck")
+        self.verticalLayout.addWidget(self.oggUseQualityCheck)
+        self.horizontalLayout_6 = QtGui.QHBoxLayout()
+        self.horizontalLayout_6.setObjectName("horizontalLayout_6")
+        self.oggQualitySlider = QtGui.QSlider(oggConfigPage)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.oggQualitySlider.sizePolicy().hasHeightForWidth())
+        self.oggQualitySlider.setSizePolicy(sizePolicy)
+        self.oggQualitySlider.setMinimum(-10)
+        self.oggQualitySlider.setMaximum(100)
+        self.oggQualitySlider.setSingleStep(5)
+        self.oggQualitySlider.setPageStep(10)
+        self.oggQualitySlider.setProperty("value", QtCore.QVariant(0))
+        self.oggQualitySlider.setOrientation(QtCore.Qt.Horizontal)
+        self.oggQualitySlider.setTickPosition(QtGui.QSlider.TicksAbove)
+        self.oggQualitySlider.setTickInterval(10)
+        self.oggQualitySlider.setObjectName("oggQualitySlider")
+        self.horizontalLayout_6.addWidget(self.oggQualitySlider)
+        self.oggQualitySpin = QtGui.QDoubleSpinBox(oggConfigPage)
+        self.oggQualitySpin.setDecimals(1)
+        self.oggQualitySpin.setMinimum(-1.0)
+        self.oggQualitySpin.setMaximum(10.0)
+        self.oggQualitySpin.setSingleStep(0.1)
+        self.oggQualitySpin.setObjectName("oggQualitySpin")
+        self.horizontalLayout_6.addWidget(self.oggQualitySpin)
+        self.oggQualityLabel = QtGui.QLabel(oggConfigPage)
+        self.oggQualityLabel.setMinimumSize(QtCore.QSize(70, 0))
+        self.oggQualityLabel.setToolTip("")
+        self.oggQualityLabel.setText("(~160kbps)")
+        self.oggQualityLabel.setObjectName("oggQualityLabel")
+        self.horizontalLayout_6.addWidget(self.oggQualityLabel)
+        self.verticalLayout.addLayout(self.horizontalLayout_6)
+        self.oggBitrateGroup = QtGui.QGroupBox(oggConfigPage)
+        self.oggBitrateGroup.setEnabled(False)
+        self.oggBitrateGroup.setCheckable(False)
+        self.oggBitrateGroup.setObjectName("oggBitrateGroup")
+        self.formLayout_3 = QtGui.QGridLayout(self.oggBitrateGroup)
+        self.formLayout_3.setObjectName("formLayout_3")
+        self.label_2 = QtGui.QLabel(self.oggBitrateGroup)
+        self.label_2.setEnabled(False)
+        self.label_2.setObjectName("label_2")
+        self.formLayout_3.addWidget(self.label_2, 0, 0, 1, 1)
+        self.oggMinBitrateCbx = QtGui.QComboBox(self.oggBitrateGroup)
+        self.oggMinBitrateCbx.setEnabled(False)
+        self.oggMinBitrateCbx.setObjectName("oggMinBitrateCbx")
+        self.formLayout_3.addWidget(self.oggMinBitrateCbx, 0, 1, 1, 1)
+        self.label_3 = QtGui.QLabel(self.oggBitrateGroup)
+        self.label_3.setEnabled(False)
+        self.label_3.setObjectName("label_3")
+        self.formLayout_3.addWidget(self.label_3, 1, 0, 1, 1)
+        self.oggNormBitrateCbx = QtGui.QComboBox(self.oggBitrateGroup)
+        self.oggNormBitrateCbx.setEnabled(False)
+        self.oggNormBitrateCbx.setObjectName("oggNormBitrateCbx")
+        self.formLayout_3.addWidget(self.oggNormBitrateCbx, 1, 1, 1, 1)
+        self.label_4 = QtGui.QLabel(self.oggBitrateGroup)
+        self.label_4.setEnabled(False)
+        self.label_4.setObjectName("label_4")
+        self.formLayout_3.addWidget(self.label_4, 2, 0, 1, 1)
+        self.oggMaxBitrateCbx = QtGui.QComboBox(self.oggBitrateGroup)
+        self.oggMaxBitrateCbx.setEnabled(False)
+        self.oggMaxBitrateCbx.setObjectName("oggMaxBitrateCbx")
+        self.formLayout_3.addWidget(self.oggMaxBitrateCbx, 2, 1, 1, 1)
+        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.formLayout_3.addItem(spacerItem, 1, 2, 1, 1)
+        self.verticalLayout.addWidget(self.oggBitrateGroup)
+        self.oggGainGroup = QtGui.QGroupBox(oggConfigPage)
+        self.oggGainGroup.setObjectName("oggGainGroup")
+        self.verticalLayout_3 = QtGui.QVBoxLayout(self.oggGainGroup)
+        self.verticalLayout_3.setObjectName("verticalLayout_3")
+        self.formLayout_2 = QtGui.QGridLayout()
+        self.formLayout_2.setObjectName("formLayout_2")
+        self.oggGainLabel = QtGui.QLabel(self.oggGainGroup)
+        self.oggGainLabel.setObjectName("oggGainLabel")
+        self.formLayout_2.addWidget(self.oggGainLabel, 0, 0, 1, 1)
+        self.oggGainCbx = QtGui.QComboBox(self.oggGainGroup)
+        self.oggGainCbx.setObjectName("oggGainCbx")
+        self.formLayout_2.addWidget(self.oggGainCbx, 0, 1, 1, 1)
+        spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.formLayout_2.addItem(spacerItem1, 0, 2, 1, 1)
+        self.verticalLayout_3.addLayout(self.formLayout_2)
+        self.verticalLayout.addWidget(self.oggGainGroup)
+        spacerItem2 = QtGui.QSpacerItem(20, 122, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.verticalLayout.addItem(spacerItem2)
+        self.oggQualityLabel.setBuddy(self.oggQualitySlider)
+        self.label_2.setBuddy(self.oggMinBitrateCbx)
+        self.label_3.setBuddy(self.oggNormBitrateCbx)
+        self.label_4.setBuddy(self.oggMaxBitrateCbx)
+        self.oggGainLabel.setBuddy(self.oggGainCbx)
+
+        self.retranslateUi(oggConfigPage)
+        QtCore.QObject.connect(self.oggUseQualityCheck, QtCore.SIGNAL("toggled(bool)"), self.oggBitrateGroup.setDisabled)
+        QtCore.QObject.connect(self.oggUseQualityCheck, QtCore.SIGNAL("toggled(bool)"), self.oggQualitySlider.setEnabled)
+        QtCore.QObject.connect(self.oggUseQualityCheck, QtCore.SIGNAL("toggled(bool)"), self.oggQualitySpin.setEnabled)
+        QtCore.QObject.connect(self.oggUseQualityCheck, QtCore.SIGNAL("toggled(bool)"), self.oggQualityLabel.setEnabled)
+        QtCore.QObject.connect(self.oggUseQualityCheck, QtCore.SIGNAL("toggled(bool)"), self.label_2.setDisabled)
+        QtCore.QObject.connect(self.oggUseQualityCheck, QtCore.SIGNAL("toggled(bool)"), self.label_3.setDisabled)
+        QtCore.QObject.connect(self.oggUseQualityCheck, QtCore.SIGNAL("toggled(bool)"), self.label_4.setDisabled)
+        QtCore.QObject.connect(self.oggUseQualityCheck, QtCore.SIGNAL("toggled(bool)"), self.oggMinBitrateCbx.setDisabled)
+        QtCore.QObject.connect(self.oggUseQualityCheck, QtCore.SIGNAL("toggled(bool)"), self.oggNormBitrateCbx.setDisabled)
+        QtCore.QObject.connect(self.oggUseQualityCheck, QtCore.SIGNAL("toggled(bool)"), self.oggMaxBitrateCbx.setDisabled)
+        QtCore.QMetaObject.connectSlotsByName(oggConfigPage)
+        oggConfigPage.setTabOrder(self.oggUseQualityCheck, self.oggQualitySlider)
+        oggConfigPage.setTabOrder(self.oggQualitySlider, self.oggQualitySpin)
+        oggConfigPage.setTabOrder(self.oggQualitySpin, self.oggMinBitrateCbx)
+        oggConfigPage.setTabOrder(self.oggMinBitrateCbx, self.oggNormBitrateCbx)
+        oggConfigPage.setTabOrder(self.oggNormBitrateCbx, self.oggMaxBitrateCbx)
+        oggConfigPage.setTabOrder(self.oggMaxBitrateCbx, self.oggGainCbx)
+
+    def retranslateUi(self, oggConfigPage):
+        oggConfigPage.setWindowTitle(QtGui.QApplication.translate("oggConfigPage", "Ogg encoding configuration", None, QtGui.QApplication.UnicodeUTF8))
+        self.oggUseQualityCheck.setText(QtGui.QApplication.translate("oggConfigPage", "Use quality setting (recommended)", None, QtGui.QApplication.UnicodeUTF8))
+        self.oggBitrateGroup.setTitle(QtGui.QApplication.translate("oggConfigPage", "Use bitrate", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_2.setText(QtGui.QApplication.translate("oggConfigPage", "Minimal bitrate:", None, QtGui.QApplication.UnicodeUTF8))
+        self.oggMinBitrateCbx.setToolTip(QtGui.QApplication.translate("oggConfigPage", "Sets minimum bitrate (in kb/s).", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_3.setText(QtGui.QApplication.translate("oggConfigPage", "Nominal bitrate:", None, QtGui.QApplication.UnicodeUTF8))
+        self.oggNormBitrateCbx.setToolTip(QtGui.QApplication.translate("oggConfigPage", "Sets target bitrate (in kb/s).", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_4.setText(QtGui.QApplication.translate("oggConfigPage", "Maximum bitrate:", None, QtGui.QApplication.UnicodeUTF8))
+        self.oggMaxBitrateCbx.setToolTip(QtGui.QApplication.translate("oggConfigPage", "Sets maximum bitrate (in kb/s).", None, QtGui.QApplication.UnicodeUTF8))
+        self.oggGainGroup.setTitle(QtGui.QApplication.translate("oggConfigPage", "ReplayGain", None, QtGui.QApplication.UnicodeUTF8))
+        self.oggGainLabel.setText(QtGui.QApplication.translate("oggConfigPage", "Calculate gain:", None, QtGui.QApplication.UnicodeUTF8))
+

flacon-0.5.7.tar.bz2/encoders/ogg_encoder.py -> flacon-0.6.0.tgz/encoders/ogg_encoder.py Changed

@@ -22,12 +22,36 @@
 from PyQt4 import QtCore
 import sys, re
 
+import ogg_config
 
 class OggEncoder(encoder.Encoder):
 id = 'OGG'
 extension = 'ogg'
 name = 'OGG'
 
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def trackGainClass(cls):
+ return OggGain
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def configPageClass(cls):
+ return ogg_config.OggConfig
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def programs(cls):
+ return ['oggenc']
+
 
 #****************************************************************
 #
@@ -71,17 +95,18 @@
 return args
 
 
+
+class OggGain(encoder.Gain):
+
+
 #****************************************************************
 #
 #****************************************************************
- @staticmethod
- def check(out):
- if not settings.checkProgram('Programs/oggenc'):
- out << 'oggenc'
-
+ @classmethod
+ def programs(cls):
+ return ['vorbisgain']
 
 
-class OggGain(encoder.Gain):
 #****************************************************************
 #
 #****************************************************************
@@ -131,17 +156,8 @@
 buff = ''
 
 
- #****************************************************************
- #
- #****************************************************************
- @staticmethod
- def check(out):
- if not settings.checkProgram('Programs/vorbisgain'):
- out << 'vorbisgain'
-
-
 
 #****************************************************************
 # Register encoder & gain classes
 #****************************************************************
-encoder.registerEncoder(OggEncoder, OggGain, OggGain)
+encoder.registerEncoder(OggEncoder)

flacon-0.5.7.tar.bz2/encoders/wav_encoder.py -> flacon-0.6.0.tgz/encoders/wav_encoder.py Changed

flacon-0.6.0.tgz/encoders/wv_config.py Added

@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+# Project : flacon
+# File : flac_encoder.py
+# (c) Alexander Sokolov sokoloff.a@gmail.com
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+from PyQt4.QtCore import *
+import flaconglobal
+
+from encoderConfigPage import EncoderConfigPage
+from wv_config_ui import Ui_wvConfigPage as UI
+
+class WvConfig(EncoderConfigPage, UI):
+
+   #****************************************************************
+   #
+   #****************************************************************
+    @staticmethod
+    def defaults():
+        return {
+            'WV/Compression':       1,
+            'WV/ReplayGain':        flaconglobal.ReplayGainTypes.Disable,
+        }
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def __init__(self, parent):
+        EncoderConfigPage.__init__(self, parent)
+        self.setupUi(self)
+
+        self.setLosslessToolTip(self.wvCompressionSlider)
+        self.wvCompressionSpin.setToolTip(self.wvCompressionSlider.toolTip())
+        self.fillReplayGainComboBox(self.wvGainCbx)
+
+        self.loadSlider(  'WV/Compression', self.wvCompressionSlider)
+        self.loadComboBox('WV/ReplayGain',  self.wvGainCbx)
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def write(self):
+        self.writeSlider(  'WV/Compression', self.wvCompressionSlider)
+        self.writeComboBox('WV/ReplayGain',  self.wvGainCbx)
+

flacon-0.6.0.tgz/encoders/wv_config.ui Added

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>wvConfigPage</class>
+ <widget class="QWidget" name="wvConfigPage">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>519</width>
+ <height>380</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>WavPack encoding configuration</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QGridLayout" name="formLayout_9">
+ <item row="0" column="0">
+ <widget class="QLabel" name="wvCompressionLabel">
+ <property name="text">
+ <string>Compression:</string>
+ </property>
+ <property name="buddy">
+ <cstring>wvCompressionSlider</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <item>
+ <widget class="QSlider" name="wvCompressionSlider">
+ <property name="maximum">
+ <number>2</number>
+ </property>
+ <property name="pageStep">
+ <number>1</number>
+ </property>
+ <property name="value">
+ <number>0</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="tickPosition">
+ <enum>QSlider::TicksAbove</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="wvCompressionSpin">
+ <property name="maximum">
+ <number>2</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="wvGainGroup">
+ <property name="title">
+ <string>ReplayGain</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_10">
+ <item>
+ <layout class="QGridLayout" name="formLayout_10">
+ <item row="0" column="0">
+ <widget class="QLabel" name="wvGainLabel">
+ <property name="text">
+ <string>Calculate gain:</string>
+ </property>
+ <property name="buddy">
+ <cstring>wvGainCbx</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="wvGainCbx">
+ <item>
+ <property name="text">
+ <string>Disabled</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_6">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>266</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>wvCompressionSlider</sender>
+ <signal>valueChanged(int)</signal>
+ <receiver>wvCompressionSpin</receiver>
+ <slot>setValue(int)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>411</x>
+ <y>17</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>465</x>
+ <y>17</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>wvCompressionSpin</sender>
+ <signal>valueChanged(int)</signal>
+ <receiver>wvCompressionSlider</receiver>
+ <slot>setValue(int)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>474</x>
+ <y>26</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>427</x>
+ <y>26</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>

flacon-0.6.0.tgz/encoders/wv_config_ui.py Added

@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'encoders/wv_config.ui'
+#
+# Created: Thu Dec  1 21:58:56 2011
+#      by: PyQt4 UI code generator 4.7.4
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt4 import QtCore, QtGui
+
+class Ui_wvConfigPage(object):
+    def setupUi(self, wvConfigPage):
+        wvConfigPage.setObjectName("wvConfigPage")
+        wvConfigPage.resize(519, 380)
+        self.verticalLayout = QtGui.QVBoxLayout(wvConfigPage)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.formLayout_9 = QtGui.QGridLayout()
+        self.formLayout_9.setObjectName("formLayout_9")
+        self.wvCompressionLabel = QtGui.QLabel(wvConfigPage)
+        self.wvCompressionLabel.setObjectName("wvCompressionLabel")
+        self.formLayout_9.addWidget(self.wvCompressionLabel, 0, 0, 1, 1)
+        self.horizontalLayout_7 = QtGui.QHBoxLayout()
+        self.horizontalLayout_7.setObjectName("horizontalLayout_7")
+        self.wvCompressionSlider = QtGui.QSlider(wvConfigPage)
+        self.wvCompressionSlider.setMaximum(2)
+        self.wvCompressionSlider.setPageStep(1)
+        self.wvCompressionSlider.setProperty("value", QtCore.QVariant(0))
+        self.wvCompressionSlider.setOrientation(QtCore.Qt.Horizontal)
+        self.wvCompressionSlider.setTickPosition(QtGui.QSlider.TicksAbove)
+        self.wvCompressionSlider.setObjectName("wvCompressionSlider")
+        self.horizontalLayout_7.addWidget(self.wvCompressionSlider)
+        self.wvCompressionSpin = QtGui.QSpinBox(wvConfigPage)
+        self.wvCompressionSpin.setMaximum(2)
+        self.wvCompressionSpin.setObjectName("wvCompressionSpin")
+        self.horizontalLayout_7.addWidget(self.wvCompressionSpin)
+        self.formLayout_9.addLayout(self.horizontalLayout_7, 0, 1, 1, 1)
+        self.verticalLayout.addLayout(self.formLayout_9)
+        self.wvGainGroup = QtGui.QGroupBox(wvConfigPage)
+        self.wvGainGroup.setObjectName("wvGainGroup")
+        self.verticalLayout_10 = QtGui.QVBoxLayout(self.wvGainGroup)
+        self.verticalLayout_10.setObjectName("verticalLayout_10")
+        self.formLayout_10 = QtGui.QGridLayout()
+        self.formLayout_10.setObjectName("formLayout_10")
+        self.wvGainLabel = QtGui.QLabel(self.wvGainGroup)
+        self.wvGainLabel.setObjectName("wvGainLabel")
+        self.formLayout_10.addWidget(self.wvGainLabel, 0, 0, 1, 1)
+        self.wvGainCbx = QtGui.QComboBox(self.wvGainGroup)
+        self.wvGainCbx.setObjectName("wvGainCbx")
+        self.wvGainCbx.addItem("")
+        self.formLayout_10.addWidget(self.wvGainCbx, 0, 1, 1, 1)
+        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.formLayout_10.addItem(spacerItem, 0, 2, 1, 1)
+        self.verticalLayout_10.addLayout(self.formLayout_10)
+        self.verticalLayout.addWidget(self.wvGainGroup)
+        spacerItem1 = QtGui.QSpacerItem(20, 266, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.verticalLayout.addItem(spacerItem1)
+        self.wvCompressionLabel.setBuddy(self.wvCompressionSlider)
+        self.wvGainLabel.setBuddy(self.wvGainCbx)
+
+        self.retranslateUi(wvConfigPage)
+        QtCore.QObject.connect(self.wvCompressionSlider, QtCore.SIGNAL("valueChanged(int)"), self.wvCompressionSpin.setValue)
+        QtCore.QObject.connect(self.wvCompressionSpin, QtCore.SIGNAL("valueChanged(int)"), self.wvCompressionSlider.setValue)
+        QtCore.QMetaObject.connectSlotsByName(wvConfigPage)
+
+    def retranslateUi(self, wvConfigPage):
+        wvConfigPage.setWindowTitle(QtGui.QApplication.translate("wvConfigPage", "WavPack encoding configuration", None, QtGui.QApplication.UnicodeUTF8))
+        self.wvCompressionLabel.setText(QtGui.QApplication.translate("wvConfigPage", "Compression:", None, QtGui.QApplication.UnicodeUTF8))
+        self.wvGainGroup.setTitle(QtGui.QApplication.translate("wvConfigPage", "ReplayGain", None, QtGui.QApplication.UnicodeUTF8))
+        self.wvGainLabel.setText(QtGui.QApplication.translate("wvConfigPage", "Calculate gain:", None, QtGui.QApplication.UnicodeUTF8))
+        self.wvGainCbx.setItemText(0, QtGui.QApplication.translate("wvConfigPage", "Disabled", None, QtGui.QApplication.UnicodeUTF8))
+

flacon-0.5.7.tar.bz2/encoders/wv_encoder.py -> flacon-0.6.0.tgz/encoders/wv_encoder.py Changed

@@ -14,14 +14,13 @@
 # GNU General Public License for more details.
 
 
-
 import encoder
 import errors
 from settings import *
 from flaconglobal import *
 from PyQt4 import QtCore
 import sys, re
-
+import wv_config
 
 
 class WVEncoder(encoder.Encoder):
@@ -33,9 +32,34 @@
 #****************************************************************
 #
 #****************************************************************
+ @classmethod
+ def trackGainClass(cls):
+ return WvGain
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def configPageClass(cls):
+ return wv_config.WvConfig
+
+
+ #****************************************************************
+ #
+ #****************************************************************
+ @classmethod
+ def programs(cls):
+ return ['wavpack']
+
+
+ #****************************************************************
+ #
+ #****************************************************************
 def getEncoderArgs(self):
 args = QStringList()
 args << settings.value("Programs/wavpack").toString()
+ args << "-q" # Suppress progress indicator
 
 # Settings .................................................
 (compression, ok) = settings.value("WV/Compression").toInt()
@@ -59,17 +83,16 @@
 return args
 
 
+
+class WvGain(encoder.Gain):
 #****************************************************************
 #
 #****************************************************************
- @staticmethod
- def check(out):
- if not settings.checkProgram('Programs/wavpack'):
- out << 'wavpack'
+ @classmethod
+ def programs(cls):
+ return ['wvgain']
 
 
-
-class WVGain(encoder.Gain):
 #****************************************************************
 #
 #****************************************************************
@@ -83,17 +106,8 @@
 return args
 
 
- #****************************************************************
- #
- #****************************************************************
- @staticmethod
- def check(out):
- if not settings.checkProgram('Programs/wvgain'):
- out << 'wvgain'
-
-
 
 #****************************************************************
 # Register encoder & gain classes
 #****************************************************************
-encoder.registerEncoder(WVEncoder, WVGain, WVGain)
+encoder.registerEncoder(WVEncoder)

flacon-0.5.7.tar.bz2/errors.py -> flacon-0.6.0.tgz/errors.py Changed

@@ -104,7 +104,7 @@
 #
 #****************************************************************
 def __init__(self, fileName):
- msg = self.tr("File %1 could not be opened. File isn't regular file.").arg(fileName)
+ msg = self.tr("File %1 could not be opened. File is not a valid audio or CUE file.").arg(fileName)
 FileError.__init__(self, msg)
 
 
@@ -164,6 +164,16 @@
 #
 #****************************************************************
 def __init__(self, string):
- msg = self.tr("Can't download disc info. %1.").arg(string)
+ msg = self.tr("Cannot download album information. %1.").arg(string)
 FlaconException.__init__(self, msg)
 
+
+class AbstractError(NotImplementedError):
+ #****************************************************************
+ #
+ #****************************************************************
+ def __init__(self, cls):
+ import sys
+ msg = 'Abstract method "' + cls.__name__ + '.' + sys._getframe(1).f_code.co_name + '" called'
+ NotImplementedError.__init__(self, msg)
+

flacon-0.5.7.tar.bz2/flacon.py -> flacon-0.6.0.tgz/flacon.py Changed

@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 
 
-FLACON_VERSION='0.5.7'
+FLACON_VERSION='0.6.0'
 
 import sys
 import os
@@ -329,7 +329,7 @@
 if len(allFlt) > 1:
 flt.insert(0, self.tr("All supported formats", "OpenFile dialog filter line") + " (" + allFlt.join(" ") + ")")
 
- flt << self.tr("All files", 'OpenFile dialog filter line like "All files"') + " (*.*)"
+ flt << self.tr("All files", 'OpenFile dialog filter line like "All files"') + " (*)"
 
 return flt.join(";;")
 
@@ -667,7 +667,7 @@
 if err:
 res = QMessageBox.warning(self,
 self.windowTitle(),
- self.tr("Some discs will not be converted, they contain errors.\nDo you want to continue?"),
+ self.tr("Some albums will not be converted, they contain errors.\nDo you want to continue?"),
 QMessageBox.Ok | QMessageBox.Cancel
 )
 
@@ -726,8 +726,7 @@
 self.actionDownloadTrackInfo.setEnabled(tracksSelected)
 self.actionScan.setEnabled(not self._scannedNow)
 self.actionConfigure.setEnabled(True)
- outFormat = settings.value("OutFiles/Format")
- self.actionConfigureEncoder.setEnabled(ConfigureDialog.pageIndex(outFormat) > -1)
+ self.actionConfigureEncoder.setEnabled(outputAudioFormats.current().configPageClass != None)
 
 
 #****************************************************************
@@ -749,10 +748,9 @@
 #
 #****************************************************************
 def configureEncoder(self):
- format = self.outFormatCombo.itemData(self.outFormatCombo.currentIndex())
- pageIndex = ConfigureDialog.pageIndex(format)
- if pageIndex > -1:
- ConfigureDialog.createAndShow(self, pageIndex)
+ fmt = outputAudioFormats.current()
+ if fmt.configPageClass != None:
+ ConfigureDialog.createAndShow(self, fmt.id)
 
 
 #****************************************************************
@@ -808,8 +806,12 @@
 def main(argv):
 app = QtGui.QApplication(argv)
 
- translator = QTranslator(app)
+ qtTranslator = QTranslator(app)
+ directory = QtCore.QLibraryInfo.location(QtCore.QLibraryInfo.TranslationsPath)
+ qtTranslator.load("qt_" + localeName(), directory)
+ app.installTranslator(qtTranslator)
 
+ translator = QTranslator(app)
 qmFile = QString("%1/translations/flacon_%2.qm").arg(modulesDir()).arg(localeName())
 translator.load(qmFile)
 app.installTranslator(translator)

flacon-0.5.7.tar.bz2/flaconglobal.py -> flacon-0.6.0.tgz/flaconglobal.py Changed

@@ -22,16 +22,18 @@
 from PyQt4 import QtCore, QtGui
 from PyQt4.QtCore import *
 import errors
-
+from settings import *
 
 
 #****************************************************************
 # Supported input format
 #****************************************************************
 class InputAudioFormat:
-    def __init__(self, ext, name):
+    def __init__(self, ext, name, programs):
         self.ext = ext
         self.name = name
+        self.programs = programs
+        settings.addPrograms(programs)
 
 
 #****************************************************************
@@ -45,11 +47,11 @@
     TTA   = 'TTA'
 
     formats = {
-        APE:  InputAudioFormat('ape',  'APE'),
-        FLAC: InputAudioFormat('flac', 'FLAC'),
-        WV:   InputAudioFormat('wv',   'WavPack'),
-        TTA:  InputAudioFormat('tta',  'TTA'),
-        WAV:  InputAudioFormat('wav',  'WAV'),
+        APE:  InputAudioFormat('ape',  'APE',     ['mac']),
+        FLAC: InputAudioFormat('flac', 'FLAC',    ['flac']),
+        WV:   InputAudioFormat('wv',   'WavPack', ['wvunpack']),
+        TTA:  InputAudioFormat('tta',  'TTA',     ['ttaenc']),
+        WAV:  InputAudioFormat('wav',  'WAV',     []),
 
     }
 
@@ -67,6 +69,8 @@
         self.id = QString()
 
 
+
+
 #****************************************************************
 # All supported output formats
 #****************************************************************
@@ -82,34 +86,61 @@
    #****************************************************************
    #
    #****************************************************************
-    def add(self, encoderClass, trackGainClass = None, albumGainClass = None):
+    def add(self, encoderClass):
         format = OutputAudioFormat()
         format.id = encoderClass.id
         format.ext = encoderClass.extension
         format.name = encoderClass.name
+
         format.encoderClass = encoderClass
-        format.trackGainClass = trackGainClass
-        format.albumGainClass = albumGainClass
+        settings.addPrograms(encoderClass.programs())
+
+        format.trackGainClass = encoderClass.trackGainClass()
+        if format.trackGainClass:
+            settings.addPrograms(format.trackGainClass.programs())
+
+        format.albumGainClass = encoderClass.albumGainClass()
+        if format.albumGainClass:
+            settings.addPrograms(format.albumGainClass.programs())
 
-        self.formats[QString(encoderClass.id)] = format
+        format.configPageClass = encoderClass.configPageClass()
+        if format.configPageClass:
+            settings.addDefaults(format.configPageClass.defaults())
+
+        self.formats[encoderClass.id] = format
         self.__dict__[encoderClass.id] = encoderClass.id
 
 
    #****************************************************************
    #
    #****************************************************************
-    def ext(self, format):
-        try:
-            return self.formats[QString(format)].ext
-        except KeyError:
-            return ''
+    def __getitem__(self, index):
+        return self.formats[str(index)]
 
 
    #****************************************************************
    #
    #****************************************************************
-    def __getitem__(self, index):
-        return self.formats[index]
+    def keys(self):
+        return self.formats.keys()
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def items(self):
+        return self.formats.items()
+
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def current(self):
+        key = str(settings.value("OutFiles/Format").toString())
+        try:
+            return self.formats[key]
+        except KeyError:
+            return self.formats['FLAC']
 
 
 outputAudioFormats = OutputAudioFormats()

flacon-0.6.0.tgz/images/wait.mng Added

flacon-0.5.7.tar.bz2/inet.py -> flacon-0.6.0.tgz/inet.py Changed

flacon-0.5.7.tar.bz2/mainWindow.ui -> flacon-0.6.0.tgz/mainWindow.ui Changed

flacon-0.5.7.tar.bz2/mainWindow_ui.py -> flacon-0.6.0.tgz/mainWindow_ui.py Changed

@@ -2,80 +2,74 @@
 
 # Form implementation generated from reading ui file 'mainWindow.ui'
 #
-# Created: Sun May  8 14:50:31 2011
-#      by: PyQt4 UI code generator 4.8.3
+# Created: Thu Dec  1 21:58:56 2011
+#      by: PyQt4 UI code generator 4.7.4
 #
 # WARNING! All changes made in this file will be lost!
 
 from PyQt4 import QtCore, QtGui
 
-try:
-    _fromUtf8 = QtCore.QString.fromUtf8
-except AttributeError:
-    _fromUtf8 = lambda s: s
-
 class Ui_mainWindow(object):
     def setupUi(self, mainWindow):
-        mainWindow.setObjectName(_fromUtf8("mainWindow"))
+        mainWindow.setObjectName("mainWindow")
         mainWindow.resize(800, 600)
         self.centralwidget = QtGui.QWidget(mainWindow)
-        self.centralwidget.setObjectName(_fromUtf8("centralwidget"))
+        self.centralwidget.setObjectName("centralwidget")
         self.verticalLayout_2 = QtGui.QVBoxLayout(self.centralwidget)
-        self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2"))
+        self.verticalLayout_2.setObjectName("verticalLayout_2")
         self.splitter = QtGui.QSplitter(self.centralwidget)
         self.splitter.setOrientation(QtCore.Qt.Horizontal)
-        self.splitter.setObjectName(_fromUtf8("splitter"))
+        self.splitter.setObjectName("splitter")
         self.layoutWidget = QtGui.QWidget(self.splitter)
-        self.layoutWidget.setObjectName(_fromUtf8("layoutWidget"))
+        self.layoutWidget.setObjectName("layoutWidget")
         self.verticalLayout = QtGui.QVBoxLayout(self.layoutWidget)
-        self.verticalLayout.setMargin(0)
-        self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
+        self.verticalLayout.setObjectName("verticalLayout")
         self.outFilesBox = QtGui.QGroupBox(self.layoutWidget)
-        self.outFilesBox.setObjectName(_fromUtf8("outFilesBox"))
+        self.outFilesBox.setObjectName("outFilesBox")
         self.formLayout_2 = QtGui.QGridLayout(self.outFilesBox)
-        self.formLayout_2.setObjectName(_fromUtf8("formLayout_2"))
+        self.formLayout_2.setObjectName("formLayout_2")
         self.outDirLabel = QtGui.QLabel(self.outFilesBox)
-        self.outDirLabel.setObjectName(_fromUtf8("outDirLabel"))
+        self.outDirLabel.setObjectName("outDirLabel")
         self.formLayout_2.addWidget(self.outDirLabel, 0, 0, 1, 1)
         self.horizontalLayout_3 = QtGui.QHBoxLayout()
-        self.horizontalLayout_3.setObjectName(_fromUtf8("horizontalLayout_3"))
+        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
         self.outDirEdit = QtGui.QLineEdit(self.outFilesBox)
-        self.outDirEdit.setObjectName(_fromUtf8("outDirEdit"))
+        self.outDirEdit.setObjectName("outDirEdit")
         self.horizontalLayout_3.addWidget(self.outDirEdit)
         self.outDirButton = QtGui.QToolButton(self.outFilesBox)
-        self.outDirButton.setText(_fromUtf8("..."))
-        self.outDirButton.setObjectName(_fromUtf8("outDirButton"))
+        self.outDirButton.setText("...")
+        self.outDirButton.setObjectName("outDirButton")
         self.horizontalLayout_3.addWidget(self.outDirButton)
         self.formLayout_2.addLayout(self.horizontalLayout_3, 0, 1, 1, 1)
         self.outPatternEditLabel = QtGui.QLabel(self.outFilesBox)
-        self.outPatternEditLabel.setObjectName(_fromUtf8("outPatternEditLabel"))
+        self.outPatternEditLabel.setObjectName("outPatternEditLabel")
         self.formLayout_2.addWidget(self.outPatternEditLabel, 1, 0, 1, 1)
         self.horizontalLayout_6 = QtGui.QHBoxLayout()
-        self.horizontalLayout_6.setObjectName(_fromUtf8("horizontalLayout_6"))
+        self.horizontalLayout_6.setObjectName("horizontalLayout_6")
         self.outPatternEdit = QtGui.QLineEdit(self.outFilesBox)
-        self.outPatternEdit.setObjectName(_fromUtf8("outPatternEdit"))
+        self.outPatternEdit.setObjectName("outPatternEdit")
         self.horizontalLayout_6.addWidget(self.outPatternEdit)
         self.outPatternButton = QtGui.QToolButton(self.outFilesBox)
-        self.outPatternButton.setText(_fromUtf8(""))
-        self.outPatternButton.setObjectName(_fromUtf8("outPatternButton"))
+        self.outPatternButton.setText("")
+        self.outPatternButton.setObjectName("outPatternButton")
         self.horizontalLayout_6.addWidget(self.outPatternButton)
         self.formLayout_2.addLayout(self.horizontalLayout_6, 1, 1, 1, 1)
         self.outFormatLabel = QtGui.QLabel(self.outFilesBox)
-        self.outFormatLabel.setObjectName(_fromUtf8("outFormatLabel"))
+        self.outFormatLabel.setObjectName("outFormatLabel")
         self.formLayout_2.addWidget(self.outFormatLabel, 2, 0, 1, 1)
         self.horizontalLayout_5 = QtGui.QHBoxLayout()
-        self.horizontalLayout_5.setObjectName(_fromUtf8("horizontalLayout_5"))
+        self.horizontalLayout_5.setObjectName("horizontalLayout_5")
         self.outFormatCombo = QtGui.QComboBox(self.outFilesBox)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.outFormatCombo.sizePolicy().hasHeightForWidth())
         self.outFormatCombo.setSizePolicy(sizePolicy)
-        self.outFormatCombo.setObjectName(_fromUtf8("outFormatCombo"))
+        self.outFormatCombo.setObjectName("outFormatCombo")
         self.horizontalLayout_5.addWidget(self.outFormatCombo)
         self.configureEncoderBtn = QtGui.QToolButton(self.outFilesBox)
-        self.configureEncoderBtn.setText(_fromUtf8("*"))
-        self.configureEncoderBtn.setObjectName(_fromUtf8("configureEncoderBtn"))
+        self.configureEncoderBtn.setText("*")
+        self.configureEncoderBtn.setObjectName("configureEncoderBtn")
         self.horizontalLayout_5.addWidget(self.configureEncoderBtn)
         self.formLayout_2.addLayout(self.horizontalLayout_5, 2, 1, 1, 1)
         self.verticalLayout.addWidget(self.outFilesBox)
@@ -85,55 +79,55 @@
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.tagsBox.sizePolicy().hasHeightForWidth())
         self.tagsBox.setSizePolicy(sizePolicy)
-        self.tagsBox.setObjectName(_fromUtf8("tagsBox"))
+        self.tagsBox.setObjectName("tagsBox")
         self.formLayout = QtGui.QGridLayout(self.tagsBox)
-        self.formLayout.setObjectName(_fromUtf8("formLayout"))
+        self.formLayout.setObjectName("formLayout")
         self.tagGenreEditLabel_2 = QtGui.QLabel(self.tagsBox)
-        self.tagGenreEditLabel_2.setObjectName(_fromUtf8("tagGenreEditLabel_2"))
+        self.tagGenreEditLabel_2.setObjectName("tagGenreEditLabel_2")
         self.formLayout.addWidget(self.tagGenreEditLabel_2, 0, 0, 1, 1)
         self.tagGenreEdit = MultiValuesLineEdit(self.tagsBox)
-        self.tagGenreEdit.setObjectName(_fromUtf8("tagGenreEdit"))
+        self.tagGenreEdit.setObjectName("tagGenreEdit")
         self.formLayout.addWidget(self.tagGenreEdit, 0, 1, 1, 1)
         self.tagYearEditLabel = QtGui.QLabel(self.tagsBox)
-        self.tagYearEditLabel.setObjectName(_fromUtf8("tagYearEditLabel"))
+        self.tagYearEditLabel.setObjectName("tagYearEditLabel")
         self.formLayout.addWidget(self.tagYearEditLabel, 1, 0, 1, 1)
         self.tagYearEdit = YearSpinBox(self.tagsBox)
         self.tagYearEdit.setMinimum(1900)
         self.tagYearEdit.setMaximum(3000)
-        self.tagYearEdit.setObjectName(_fromUtf8("tagYearEdit"))
+        self.tagYearEdit.setObjectName("tagYearEdit")
         self.formLayout.addWidget(self.tagYearEdit, 1, 1, 1, 1)
         self.tagArtistEditLabel = QtGui.QLabel(self.tagsBox)
-        self.tagArtistEditLabel.setObjectName(_fromUtf8("tagArtistEditLabel"))
+        self.tagArtistEditLabel.setObjectName("tagArtistEditLabel")
         self.formLayout.addWidget(self.tagArtistEditLabel, 2, 0, 1, 1)
         self.tagArtistEdit = MultiValuesLineEdit(self.tagsBox)
-        self.tagArtistEdit.setObjectName(_fromUtf8("tagArtistEdit"))
+        self.tagArtistEdit.setObjectName("tagArtistEdit")
         self.formLayout.addWidget(self.tagArtistEdit, 2, 1, 1, 1)
         self.tagAlbumEditLabel = QtGui.QLabel(self.tagsBox)
-        self.tagAlbumEditLabel.setObjectName(_fromUtf8("tagAlbumEditLabel"))
+        self.tagAlbumEditLabel.setObjectName("tagAlbumEditLabel")
         self.formLayout.addWidget(self.tagAlbumEditLabel, 3, 0, 1, 1)
         self.tagAlbumEdit = MultiValuesLineEdit(self.tagsBox)
-        self.tagAlbumEdit.setObjectName(_fromUtf8("tagAlbumEdit"))
+        self.tagAlbumEdit.setObjectName("tagAlbumEdit")
         self.formLayout.addWidget(self.tagAlbumEdit, 3, 1, 1, 1)
         self.tagStartNumEditLabel = QtGui.QLabel(self.tagsBox)
-        self.tagStartNumEditLabel.setToolTip(_fromUtf8(""))
-        self.tagStartNumEditLabel.setObjectName(_fromUtf8("tagStartNumEditLabel"))
+        self.tagStartNumEditLabel.setToolTip("")
+        self.tagStartNumEditLabel.setObjectName("tagStartNumEditLabel")
         self.formLayout.addWidget(self.tagStartNumEditLabel, 4, 0, 1, 1)
         self.tagStartNumEdit = MultiValuesSpinBox(self.tagsBox)
         self.tagStartNumEdit.setMinimum(1)
-        self.tagStartNumEdit.setObjectName(_fromUtf8("tagStartNumEdit"))
+        self.tagStartNumEdit.setObjectName("tagStartNumEdit")
         self.formLayout.addWidget(self.tagStartNumEdit, 4, 1, 1, 1)
         self.tagDiscIdEditLabel = QtGui.QLabel(self.tagsBox)
-        self.tagDiscIdEditLabel.setObjectName(_fromUtf8("tagDiscIdEditLabel"))
+        self.tagDiscIdEditLabel.setObjectName("tagDiscIdEditLabel")
         self.formLayout.addWidget(self.tagDiscIdEditLabel, 5, 0, 1, 1)
         self.tagDiscIdEdit = MultiValuesLineEdit(self.tagsBox)
         self.tagDiscIdEdit.setReadOnly(True)
-        self.tagDiscIdEdit.setObjectName(_fromUtf8("tagDiscIdEdit"))
+        self.tagDiscIdEdit.setObjectName("tagDiscIdEdit")
         self.formLayout.addWidget(self.tagDiscIdEdit, 5, 1, 1, 1)
         self.codepageComboLabel = QtGui.QLabel(self.tagsBox)
-        self.codepageComboLabel.setObjectName(_fromUtf8("codepageComboLabel"))
+        self.codepageComboLabel.setObjectName("codepageComboLabel")
         self.formLayout.addWidget(self.codepageComboLabel, 6, 0, 1, 1)
         self.codepageCombo = CodePageComboBox(self.tagsBox)
-        self.codepageCombo.setObjectName(_fromUtf8("codepageCombo"))
+        self.codepageCombo.setObjectName("codepageCombo")
         self.formLayout.addWidget(self.codepageCombo, 6, 1, 1, 1)
         self.verticalLayout.addWidget(self.tagsBox)
         spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
@@ -149,51 +143,51 @@
         self.trackView.setIconSize(QtCore.QSize(22, 22))
         self.trackView.setRootIsDecorated(True)
         self.trackView.setItemsExpandable(True)
-        self.trackView.setObjectName(_fromUtf8("trackView"))
+        self.trackView.setObjectName("trackView")
         self.verticalLayout_2.addWidget(self.splitter)
         mainWindow.setCentralWidget(self.centralwidget)
         self.menubar = QtGui.QMenuBar(mainWindow)
         self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 21))
-        self.menubar.setObjectName(_fromUtf8("menubar"))
+        self.menubar.setObjectName("menubar")
         self.menuFile = QtGui.QMenu(self.menubar)
-        self.menuFile.setObjectName(_fromUtf8("menuFile"))
+        self.menuFile.setObjectName("menuFile")
         self.menu_Settings = QtGui.QMenu(self.menubar)
-        self.menu_Settings.setObjectName(_fromUtf8("menu_Settings"))
+        self.menu_Settings.setObjectName("menu_Settings")
         self.menu_Help = QtGui.QMenu(self.menubar)
-        self.menu_Help.setObjectName(_fromUtf8("menu_Help"))
+        self.menu_Help.setObjectName("menu_Help")

flacon-0.5.7.tar.bz2/misc/flacon.desktop -> flacon-0.6.0.tgz/misc/flacon.desktop Changed

flacon-0.5.7.tar.bz2/settings.py -> flacon-0.6.0.tgz/settings.py Changed

@@ -17,7 +17,6 @@
 from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import *
 import subprocess
-import flaconglobal
 
 
 class Settings(QSettings):
@@ -27,18 +26,7 @@
     def __init__(self, organization, application):
         QSettings.__init__(self, organization, application)
 
-        self._programs = (
-            'shntool',
-            'flac',
-            'mac',
-            'oggenc',
-            'lame',
-            'wavpack',
-            'metaflac',
-            'vorbisgain',
-            'mp3gain',
-            'ttaenc'
-        )
+        self._programs = []
 
         defaults = {
             'Tags/Codepage':        'UTF-8',
@@ -52,28 +40,6 @@
             'OutFiles/Directory':   '~/music',
             'OutFiles/Format':      'FLAC',
 
-            # FLAC *****************************************************
-            'Flac/Compression':     5,
-            'Flac/ReplayGain':      flaconglobal.ReplayGainTypes.Disable,
-
-            # OGG ******************************************************
-            'Ogg/UseQuality':       True,
-            'Ogg/Quality':          7,
-            'Ogg/MinBitrate':       '',
-            'Ogg/NormBitrate':      '',
-            'Ogg/MaxBitrate':       '',
-            'Ogg/ReplayGain':       flaconglobal.ReplayGainTypes.Disable,
-
-            # MP3 ******************************************************
-            'Mp3/Preset':           'avrStandard',
-            'Mp3/Bitrate':          '320',
-            'Mp3/Quality':          4,
-            'Mp3/ReplayGain':       flaconglobal.ReplayGainTypes.Disable,
-
-            # WavPack **************************************************
-            'WV/Compression':       1,
-            'WV/ReplayGain':        flaconglobal.ReplayGainTypes.Disable,
-
             # Internet *************************************************
             'Inet/CDDBHost':        'freedb.freedb.org',
         }
@@ -82,7 +48,7 @@
         for key, val in defaults.iteritems():
             self._defaults[QString(key)] = QVariant(val)
 
-        self.findPrograms()
+        self.addPrograms(['shntool'])
 
 
    #****************************************************************
@@ -95,6 +61,20 @@
    #****************************************************************
    #
    #****************************************************************
+    def addPrograms(self, programs):
+        for program in programs:
+            program = str(program)
+            if program in self._programs:
+                return
+
+            self._programs.append(program)
+            if (self.value('Programs/'+program).toString().isEmpty()):
+                self.setValue('Programs/'+program, self.findProgram(program))
+
+
+   #****************************************************************
+   #
+   #****************************************************************
     def value(self, key, defaultValue = None):
         key = QString(key)
         if defaultValue == None:
@@ -107,6 +87,18 @@
 
 
    #****************************************************************
+   #
+   #****************************************************************
+    def defaultValue(self, key):
+        key = QString(key)
+
+        try:
+            return self._defaults[key]
+        except KeyError:
+            return QVariant()
+
+
+   #****************************************************************
    # Sets the value of setting key to value.
    #****************************************************************
     def setValue(self, key, value):
@@ -117,11 +109,9 @@
    #****************************************************************
    #
    #****************************************************************
-    def findPrograms(self):
-        for program in self._programs:
-            if (self.value('Programs/'+program).toString().isEmpty()):
-                path = subprocess.Popen(["which", program], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0]
-                self.setValue('Programs/'+program, QString(path).trimmed())
+    def findProgram(self, program):
+        path = subprocess.Popen(["which", program], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0]
+        return QString(path).trimmed()
 
 
    #****************************************************************
@@ -145,4 +135,14 @@
 
         return res
 
+
+   #****************************************************************
+   #
+   #****************************************************************
+    def addDefaults(self, defaults):
+        for (key, val) in defaults.items():
+            self._defaults[QString(key)] = QVariant(val)
+
+
+
 settings = Settings('flacon', 'flacon')

flacon-0.5.7.tar.bz2/track.py -> flacon-0.6.0.tgz/track.py Changed

@@ -37,7 +37,7 @@
         self._status  = Statuses.NotRunning
         self._resultFileNameCache = None
         self._resultFilePathCache = None
-        
+
         self.connect(settings, SIGNAL("changed()"), self._settingsChanged)
         self._settingsChanged()
 
@@ -215,7 +215,7 @@
    #****************************************************************
     def setTrackNum(self, value):
         self._resultFileNameCache = None
-        self._resultFilePathCache = None        
+        self._resultFilePathCache = None
         self._trackNum = value
         self.emitDataChanged()
 
@@ -268,7 +268,7 @@
     def resultFileName(self):
         if (self._resultFileNameCache):
             return self._resultFileNameCache
-            
+
         pattern = self._pattern
 
         if (not pattern):
@@ -296,7 +296,7 @@
                 else:
                     res += c
 
-        ext = outputAudioFormats.ext(self._outFormat)
+        ext = outputAudioFormats.current().ext
         self._resultFileNameCache = QString("%1.%2").arg(res).arg(ext)
         return self._resultFileNameCache
 
@@ -307,7 +307,7 @@
     def resultFilePath(self):
         if not self._resultFilePathCache:
             self._resultFilePathCache = self._resultFilePath()
-            
+
         return self._resultFilePathCache
 
 
@@ -344,7 +344,7 @@
             res = QFileInfo(af + "/" + res.filePath())
 
         return res.absoluteFilePath()
-        
+
 
    #****************************************************************
    #

flacon-0.5.7.tar.bz2/trackview.py -> flacon-0.6.0.tgz/trackview.py Changed

@@ -60,7 +60,6 @@
         self._trackBtnPix = QPixmap(imgDir + "trackBtn.png")
         self._audioBtnPix = QPixmap(imgDir + "audioBtn.png")
         self._warnPix = pyqticonloader.icon(['dialog-warning', 'messagebox_warning'], self.MARK_HEIGHT).pixmap(self.MARK_HEIGHT, self.MARK_HEIGHT)
-        self._waitPix = QPixmap(imgDir + "wait.png")
         self._okPix = pyqticonloader.icon(['dialog-ok', 'button_ok'], self.LINE_MARK_HEIGHT).pixmap(self.LINE_MARK_HEIGHT, self.LINE_MARK_HEIGHT)
         self._errorPix = pyqticonloader.icon(['dialog-cancel', 'button_cancel'], self.LINE_MARK_HEIGHT).pixmap(self.LINE_MARK_HEIGHT, self.LINE_MARK_HEIGHT)
 
@@ -225,7 +224,7 @@
         painter.drawLine(self.MARGIN, y, windowRect.right(), y)
 
         # Draw warning mark ...............................
-        markRect = QRect(textRect.right() - self.MARK_HEIGHT - 4, textRect.top(), self.MARK_HEIGHT, self.MARK_HEIGHT)
+        markRect = QRect(imgRect.right() - self.MARK_HEIGHT, imgRect.bottom() - self.MARK_HEIGHT, self.MARK_HEIGHT, self.MARK_HEIGHT);
         cache['MARK_RECT'] = QRect(markRect)
         self._drawMark(index, markRect, painter)
 
@@ -273,11 +272,9 @@
 
         mRect = QRect(-self.MARK_HEIGHT/2, -self.MARK_HEIGHT/2, self.MARK_HEIGHT, self.MARK_HEIGHT)
 
-        (angle, dowloaded) = index.data(TrackViewModel.StatusPercentRole).toInt()
-
-        if dowloaded:
-            painter.rotate(angle)
-            painter.drawPixmap(mRect, self._waitPix)
+        downPix = QPixmap(index.data(TrackViewModel.DownloadPxmapRole))
+        if not downPix.isNull():
+            painter.drawPixmap(mRect, downPix)
 
         elif not index.internalPointer().canConvert():
             painter.drawPixmap(mRect, self._warnPix)
@@ -613,6 +610,7 @@
 class TrackViewModel(QAbstractItemModel):
     StatusPercentRole = Qt.UserRole
     StatusRole = StatusPercentRole + 1
+    DownloadPxmapRole = StatusRole + 1
 
    #****************************************************************
    #
@@ -622,9 +620,9 @@
         self._project = None
         self._view = view
 
-        self._downloadTimerId = -1
-        self._dowloadsStates={}
-
+        self._downloadsStates={}
+        self._downloadMovie = QMovie(modulesDir() + "/images/wait.mng")
+        self.connect(self._downloadMovie, SIGNAL("updated(QRect)"), self._movieUpdated)
 
 
    #****************************************************************
@@ -826,10 +824,19 @@
         # StatusPercent ::::::::::::::::::::::::::::::::::::
         elif (role == self.StatusPercentRole):
             try:
-                return QVariant(self._dowloadsStates[index.row()])
+                return QVariant(self._downloadsStates[index.row()])
+            except KeyError:
+                return QVariant()
+                
+        # Download pixmap ::::::::::::::::::::::::::::::::::
+        elif role == self.DownloadPxmapRole:
+            try:
+                self._downloadsStates[index.row()]
+                return QVariant(self._downloadMovie.currentPixmap())
             except KeyError:
                 return QVariant()
 
+
         return QVariant()
 
 
@@ -886,17 +893,22 @@
    #
    #****************************************************************
     def _downloadStarted(self, discNum):
-        self._dowloadsStates[discNum] = 0
-        self._downloadTimerId = self.startTimer(300)
+        self._downloadsStates[discNum] = True
+        if self._downloadMovie.state() != QMovie.Running:
+            self._downloadMovie.start()
 
 
    #****************************************************************
    #
    #****************************************************************
     def _downloadFinished(self, discNum):
-        del self._dowloadsStates[discNum]
-        if not len(self._dowloadsStates):
-            self.killTimer(self._downloadTimerId)
+        try:
+            del self._downloadsStates[discNum]
+        except KeyError:
+            pass
+
+        if not len(self._downloadsStates):
+            self._downloadMovie.stop()
 
         index = self.index(discNum, 0, QModelIndex())
         self.emit(SIGNAL("dataChanged(QModelIndex,QModelIndex)"), index, index)
@@ -905,11 +917,9 @@
    #****************************************************************
    #
    #****************************************************************
-    def timerEvent(self, event):
-        if event.timerId() == self._downloadTimerId:
-            for n in self._dowloadsStates:
-                index = self.index(n, 0, QModelIndex())
-                self.emit(SIGNAL("dataChanged(QModelIndex,QModelIndex)"), index, index)
-                self._dowloadsStates[n] += 30
-        else:
-            QAbstractItemModel.timerEvent(self, event)
+    def _movieUpdated(self):
+        for n in self._downloadsStates:
+            index = self.index(n, 0, QModelIndex())
+            self.emit(SIGNAL("dataChanged(QModelIndex,QModelIndex)"), index, index)
+            self._downloadsStates[n] += 45
+

flacon-0.5.7.tar.bz2/translations/flacon_cs_CZ.qm -> flacon-0.6.0.tgz/translations/flacon_cs_CZ.qm Changed

flacon-0.5.7.tar.bz2/translations/flacon_cs_CZ.ts -> flacon-0.6.0.tgz/translations/flacon_cs_CZ.ts Changed

@@ -3,30 +3,70 @@
 <context>
 <name>AboutDialog</name>
 <message>
- <location filename="../aboutDialog.py" line="39"/>
+ <location filename="../aboutDialog.py" line="38"/>
 <source>About Flacon</source>
 <translation>O programu Flacon</translation>
 </message>
 <message>
- <location filename="../aboutDialog.py" line="40"/>
+ <location filename="../aboutDialog.py" line="39"/>
 <source>Extracts individual tracks from one big audio file containing the entire album.</source>
 <translation>Vytáhne jednotlivé skladby z jednoho velkého zvukového souboru, který obsahuje celé album.</translation>
 </message>
 <message>
- <location filename="../aboutDialog.py" line="41"/>
+ <location filename="../aboutDialog.py" line="40"/>
 <source>Version: %1</source>
 <translation>Verze: %1</translation>
 </message>
 <message>
- <location filename="../aboutDialog.py" line="42"/>
+ <location filename="../aboutDialog.py" line="41"/>
 <source>Web site:</source>
 <translation>Internetové stránky:</translation>
 </message>
 <message>
- <location filename="../aboutDialog.py" line="43"/>
+ <location filename="../aboutDialog.py" line="42"/>
 <source>License:</source>
 <translation>Povolení:</translation>
 </message>
+ <message>
+ <location filename="../aboutDialog.py" line="54"/>
+ <source>WavPack support patch.</source>
+ <translation>Záplata s podporou pro WavPack.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="59"/>
+ <source>Application icon, Packaging.</source>
+ <translation>Ikona programu, balení.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="64"/>
+ <source>Packaging, testing.</source>
+ <translation>Balení, zkouška.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="69"/>
+ <source>Czech translation.</source>
+ <translation>Český překlad.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="74"/>
+ <source>Polish translation.</source>
+ <translation>Polský překlad.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="79"/>
+ <source>French Canadian translation. Improvements in the UI.</source>
+ <translation>Francouzský překlad (kanadská francouzština). Vylepšení uživatelského rozhraní.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="85"/>
+ <source>French translation.</source>
+ <translation>Francouzský překlad.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="143"/>
+ <source>Flacon uses external programs. Many thanks to their authors!</source>
+ <translation>Flacon používá vnější programy. Hodně díků jejich autorům!</translation>
+ </message>
 </context>
 <context>
 <name>CodePageComboBox</name>
@@ -46,183 +86,273 @@
 <translation>Unicode (UTF-16BE)</translation>
 </message>
 <message>
- <location filename="../controls.py" line="191"/>
+ <location filename="../controls.py" line="189"/>
 <source>Cyrillic (Win-1251)</source>
 <translation>Cyrilice (Win-1251)</translation>
 </message>
 <message>
- <location filename="../controls.py" line="192"/>
+ <location filename="../controls.py" line="190"/>
 <source>Cyrillic (CP-866)</source>
 <translation>Cyrilice (CP-866)</translation>
 </message>
+ <message>
+ <location filename="../controls.py" line="194"/>
+ <source>Latin-1 (ISO-8859-1)</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="195"/>
+ <source>Latin-2 (ISO-8859-2)</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="196"/>
+ <source>Latin-3 (ISO-8859-3)</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="197"/>
+ <source>Latin-4 (ISO-8859-4)</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="198"/>
+ <source>Latin-5 (ISO-8859-5)</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="199"/>
+ <source>Latin-6 (ISO-8859-6)</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="200"/>
+ <source>Latin-7 (ISO-8859-7)</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="201"/>
+ <source>Latin-8 (ISO-8859-8)</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="202"/>
+ <source>Latin-9 (ISO-8859-9)</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="203"/>
+ <source>Latin-10 (ISO-8859-10)</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="205"/>
+ <source>Latin-13 (ISO-8859-13)</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="206"/>
+ <source>Latin-14 (ISO-8859-14)</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="207"/>
+ <source>Latin-15 (ISO-8859-15)</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="208"/>
+ <source>Latin-16 (ISO-8859-16)</source>
+ <translation></translation>
+ </message>
 </context>
 <context>
 <name>ConfigureDialog</name>
 <message>
 <location filename="../configureDialog.py" line="430"/>
 <source>Default</source>
- <translation>Výchozí</translation>
+ <translation type="obsolete">Výchozí</translation>
 </message>
 <message>
 <location filename="../configureDialog.py" line="431"/>
 <source>64 kbps</source>
- <translation>64 kbps</translation>
+ <translation type="obsolete">64 kbps</translation>
 </message>
 <message>
 <location filename="../configureDialog.py" line="432"/>
 <source>80 kbps</source>
- <translation>80 kbps</translation>
+ <translation type="obsolete">80 kbps</translation>
 </message>
 <message>
 <location filename="../configureDialog.py" line="433"/>
 <source>96 kbps</source>
- <translation>96 kbps</translation>
+ <translation type="obsolete">96 kbps</translation>
 </message>
 <message>
 <location filename="../configureDialog.py" line="434"/>
 <source>128 kbps</source>
- <translation>128 kbps</translation>
+ <translation type="obsolete">128 kbps</translation>
 </message>
 <message>
 <location filename="../configureDialog.py" line="435"/>
 <source>160 kbps</source>
- <translation>160 kbps</translation>
+ <translation type="obsolete">160 kbps</translation>
 </message>

flacon-0.6.0.tgz/translations/flacon_fr_CA.qm Added

flacon-0.6.0.tgz/translations/flacon_fr_CA.ts Added

@@ -0,0 +1,1283 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="fr_FR">
+<context>
+ <name>AboutDialog</name>
+ <message>
+ <location filename="../aboutDialog.py" line="38"/>
+ <source>About Flacon</source>
+ <translation>À propos de Flacon</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="39"/>
+ <source>Extracts individual tracks from one big audio file containing the entire album.</source>
+ <translation>Extrait individuellement les pistes d&apos;un gros fichier audio contenant l&apos;album entier.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="40"/>
+ <source>Version: %1</source>
+ <translation>Version : %1</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="41"/>
+ <source>Web site:</source>
+ <translation>Site web :</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="42"/>
+ <source>License:</source>
+ <translation>Licence :</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="54"/>
+ <source>WavPack support patch.</source>
+ <translation>Correctif de prise en charge WavPack.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="59"/>
+ <source>Application icon, Packaging.</source>
+ <translation>Icônes et mise en forme.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="64"/>
+ <source>Packaging, testing.</source>
+ <translation>Mise en forme et tests.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="69"/>
+ <source>Czech translation.</source>
+ <translation>Traduction tchèque.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="74"/>
+ <source>Polish translation.</source>
+ <translation>Traduction polonaise.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="79"/>
+ <source>French Canadian translation. Improvements in the UI.</source>
+ <translation>Traduction canadienne-française et amélioration de l&apos;interface.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="85"/>
+ <source>French translation.</source>
+ <translation>Traduction française.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="143"/>
+ <source>Flacon uses external programs. Many thanks to their authors!</source>
+ <translation>Flacon utilise des programmes externes. De grands remerciements à leurs auteurs!</translation>
+ </message>
+</context>
+<context>
+ <name>CodePageComboBox</name>
+ <message>
+ <location filename="../controls.py" line="183"/>
+ <source>Unicode (UTF-8)</source>
+ <translation>Unicode (UTF-8)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="184"/>
+ <source>Unicode (UTF-16LE)</source>
+ <translation>Unicode (UTF-16LE)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="185"/>
+ <source>Unicode (UTF-16BE)</source>
+ <translation>Unicode (UTF-16BE)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="189"/>
+ <source>Cyrillic (Win-1251)</source>
+ <translation>Cyrillique (Win-1251)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="190"/>
+ <source>Cyrillic (CP-866)</source>
+ <translation>Cyrillique (CP-866)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="194"/>
+ <source>Latin-1 (ISO-8859-1)</source>
+ <translation>Latin-1 (ISO-8859-1)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="195"/>
+ <source>Latin-2 (ISO-8859-2)</source>
+ <translation>Latin-2 (ISO-8859-2)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="196"/>
+ <source>Latin-3 (ISO-8859-3)</source>
+ <translation>Latin-3 (ISO-8859-3)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="197"/>
+ <source>Latin-4 (ISO-8859-4)</source>
+ <translation>Latin-4 (ISO-8859-4)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="198"/>
+ <source>Latin-5 (ISO-8859-5)</source>
+ <translation>Latin-5 (ISO-8859-5)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="199"/>
+ <source>Latin-6 (ISO-8859-6)</source>
+ <translation>Latin-6 (ISO-8859-6)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="200"/>
+ <source>Latin-7 (ISO-8859-7)</source>
+ <translation>Latin-7 (ISO-8859-7)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="201"/>
+ <source>Latin-8 (ISO-8859-8)</source>
+ <translation>Latin-8 (ISO-8859-8)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="202"/>
+ <source>Latin-9 (ISO-8859-9)</source>
+ <translation>Latin-9 (ISO-8859-9)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="203"/>
+ <source>Latin-10 (ISO-8859-10)</source>
+ <translation>Latin-10 (ISO-8859-10)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="205"/>
+ <source>Latin-13 (ISO-8859-13)</source>
+ <translation>Latin-13 (ISO-8859-13)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="206"/>
+ <source>Latin-14 (ISO-8859-14)</source>
+ <translation>Latin-14 (ISO-8859-14)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="207"/>
+ <source>Latin-15 (ISO-8859-15)</source>
+ <translation>Latin-15 (ISO-8859-15)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="208"/>
+ <source>Latin-16 (ISO-8859-16)</source>
+ <translation>Latin-16 (ISO-8859-16)</translation>
+ </message>
+</context>
+<context>
+ <name>ConfigureDialog</name>
+ <message>
+ <location filename="../configureDialog.py" line="263"/>
+ <source>Select temporary directory</source>
+ <translation>Sélectionner le répertoire temporaire</translation>
+ </message>
+ <message>
+ <location filename="../configureDialog.py" line="142"/>
+ <source>General configuration</source>
+ <translation>Configuration générale</translation>
+ </message>
+ <message>
+ <location filename="../configureDialog.py" line="143"/>
+ <source>Full path of the external applications</source>
+ <translation>Chemin complet vers les applications externes</translation>
+ </message>
+ <message>
+ <location filename="../configureDialog.py" line="197"/>
+ <source>General</source>
+ <translation>Général</translation>
+ </message>
+ <message>
+ <location filename="../configureDialog.py" line="216"/>
+ <source>Programs</source>
+ <translation>Programmes</translation>
+ </message>
+</context>
+<context>
+ <name>Converter</name>

flacon-0.6.0.tgz/translations/flacon_fr_FR.qm Added

flacon-0.6.0.tgz/translations/flacon_fr_FR.ts Added

@@ -0,0 +1,1283 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="fr_FR">
+<context>
+ <name>AboutDialog</name>
+ <message>
+ <location filename="../aboutDialog.py" line="38"/>
+ <source>About Flacon</source>
+ <translation>À propos de Flacon</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="39"/>
+ <source>Extracts individual tracks from one big audio file containing the entire album.</source>
+ <translation>Extrait individuellement les pistes d&apos;un gros fichier audio contenant l&apos;album entier.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="40"/>
+ <source>Version: %1</source>
+ <translation>Version : %1</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="41"/>
+ <source>Web site:</source>
+ <translation>Site web :</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="42"/>
+ <source>License:</source>
+ <translation>Licence :</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="54"/>
+ <source>WavPack support patch.</source>
+ <translation>Correctif de prise en charge WavPack.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="59"/>
+ <source>Application icon, Packaging.</source>
+ <translation>Icones et mise en forme.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="64"/>
+ <source>Packaging, testing.</source>
+ <translation>Mise en forme et tests.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="69"/>
+ <source>Czech translation.</source>
+ <translation>Traduction tchèque.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="74"/>
+ <source>Polish translation.</source>
+ <translation>Traduction polonaise.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="79"/>
+ <source>French Canadian translation. Improvements in the UI.</source>
+ <translation>Traduction canadienne-française et amélioration de l&apos;interface.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="85"/>
+ <source>French translation.</source>
+ <translation>Traduction française.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="143"/>
+ <source>Flacon uses external programs. Many thanks to their authors!</source>
+ <translation>Flacon utilise des programmes externes. De grands remerciements à leurs auteurs!</translation>
+ </message>
+</context>
+<context>
+ <name>CodePageComboBox</name>
+ <message>
+ <location filename="../controls.py" line="183"/>
+ <source>Unicode (UTF-8)</source>
+ <translation>Unicode (UTF-8)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="184"/>
+ <source>Unicode (UTF-16LE)</source>
+ <translation>Unicode (UTF-16LE)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="185"/>
+ <source>Unicode (UTF-16BE)</source>
+ <translation>Unicode (UTF-16BE)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="189"/>
+ <source>Cyrillic (Win-1251)</source>
+ <translation>Cyrillique (Win-1251)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="190"/>
+ <source>Cyrillic (CP-866)</source>
+ <translation>Cyrillique (CP-866)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="194"/>
+ <source>Latin-1 (ISO-8859-1)</source>
+ <translation>Latin-1 (ISO-8859-1)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="195"/>
+ <source>Latin-2 (ISO-8859-2)</source>
+ <translation>Latin-2 (ISO-8859-2)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="196"/>
+ <source>Latin-3 (ISO-8859-3)</source>
+ <translation>Latin-3 (ISO-8859-3)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="197"/>
+ <source>Latin-4 (ISO-8859-4)</source>
+ <translation>Latin-4 (ISO-8859-4)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="198"/>
+ <source>Latin-5 (ISO-8859-5)</source>
+ <translation>Latin-5 (ISO-8859-5)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="199"/>
+ <source>Latin-6 (ISO-8859-6)</source>
+ <translation>Latin-6 (ISO-8859-6)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="200"/>
+ <source>Latin-7 (ISO-8859-7)</source>
+ <translation>Latin-7 (ISO-8859-7)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="201"/>
+ <source>Latin-8 (ISO-8859-8)</source>
+ <translation>Latin-8 (ISO-8859-8)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="202"/>
+ <source>Latin-9 (ISO-8859-9)</source>
+ <translation>Latin-9 (ISO-8859-9)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="203"/>
+ <source>Latin-10 (ISO-8859-10)</source>
+ <translation>Latin-10 (ISO-8859-10)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="205"/>
+ <source>Latin-13 (ISO-8859-13)</source>
+ <translation>Latin-13 (ISO-8859-13)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="206"/>
+ <source>Latin-14 (ISO-8859-14)</source>
+ <translation>Latin-14 (ISO-8859-14)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="207"/>
+ <source>Latin-15 (ISO-8859-15)</source>
+ <translation>Latin-15 (ISO-8859-15)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="208"/>
+ <source>Latin-16 (ISO-8859-16)</source>
+ <translation>Latin-16 (ISO-8859-16)</translation>
+ </message>
+</context>
+<context>
+ <name>ConfigureDialog</name>
+ <message>
+ <location filename="../configureDialog.py" line="263"/>
+ <source>Select temporary directory</source>
+ <translation>Sélectionner le répertoire temporaire</translation>
+ </message>
+ <message>
+ <location filename="../configureDialog.py" line="142"/>
+ <source>General configuration</source>
+ <translation>Configuration générale</translation>
+ </message>
+ <message>
+ <location filename="../configureDialog.py" line="143"/>
+ <source>Full path of the external applications</source>
+ <translation>Chemin complet vers les applications externes</translation>
+ </message>
+ <message>
+ <location filename="../configureDialog.py" line="197"/>
+ <source>General</source>
+ <translation>Général</translation>
+ </message>
+ <message>
+ <location filename="../configureDialog.py" line="216"/>
+ <source>Programs</source>
+ <translation>Programmes</translation>
+ </message>
+</context>
+<context>
+ <name>Converter</name>

flacon-0.5.7.tar.bz2/translations/flacon_pl_PL.qm -> flacon-0.6.0.tgz/translations/flacon_pl_PL.qm Changed

flacon-0.5.7.tar.bz2/translations/flacon_pl_PL.ts -> flacon-0.6.0.tgz/translations/flacon_pl_PL.ts Changed

@@ -3,30 +3,70 @@
 <context>
 <name>AboutDialog</name>
 <message>
- <location filename="../aboutDialog.py" line="39"/>
+ <location filename="../aboutDialog.py" line="38"/>
 <source>About Flacon</source>
 <translation>O programie Flacon</translation>
 </message>
 <message>
- <location filename="../aboutDialog.py" line="40"/>
+ <location filename="../aboutDialog.py" line="39"/>
 <source>Extracts individual tracks from one big audio file containing the entire album.</source>
 <translation>Wyodrębnia pojedyncze utwory z jednego dużego pliku audio, zawierającego cały album.</translation>
 </message>
 <message>
- <location filename="../aboutDialog.py" line="41"/>
+ <location filename="../aboutDialog.py" line="40"/>
 <source>Version: %1</source>
 <translation>Wersja: %1</translation>
 </message>
 <message>
- <location filename="../aboutDialog.py" line="42"/>
+ <location filename="../aboutDialog.py" line="41"/>
 <source>Web site:</source>
 <translation>Strona WWW:</translation>
 </message>
 <message>
- <location filename="../aboutDialog.py" line="43"/>
+ <location filename="../aboutDialog.py" line="42"/>
 <source>License:</source>
 <translation>Licencja:</translation>
 </message>
+ <message>
+ <location filename="../aboutDialog.py" line="54"/>
+ <source>WavPack support patch.</source>
+ <translation>Poprawki obsługi WavPack.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="59"/>
+ <source>Application icon, Packaging.</source>
+ <translation>Ikona programu, testowanie.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="64"/>
+ <source>Packaging, testing.</source>
+ <translation>Paczkowanie, testowanie.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="69"/>
+ <source>Czech translation.</source>
+ <translation>Tłumaczenie na język czeski.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="74"/>
+ <source>Polish translation.</source>
+ <translation>Tłumaczenie na język polski.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="79"/>
+ <source>French Canadian translation. Improvements in the UI.</source>
+ <translation>Tłumaczenie na język francuski (Kanada). Usprawnienia UI programu.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="85"/>
+ <source>French translation.</source>
+ <translation>Tłumaczenie na język francuski.</translation>
+ </message>
+ <message>
+ <location filename="../aboutDialog.py" line="143"/>
+ <source>Flacon uses external programs. Many thanks to their authors!</source>
+ <translation>Flacon używa programów zewnętrznych. Podziękowania dla ich Autorów!</translation>
+ </message>
 </context>
 <context>
 <name>CodePageComboBox</name>
@@ -46,183 +86,273 @@
 <translation>Unicode (UTF-16BE)</translation>
 </message>
 <message>
- <location filename="../controls.py" line="191"/>
+ <location filename="../controls.py" line="189"/>
 <source>Cyrillic (Win-1251)</source>
 <translation>Cyrilica (Win-1251)</translation>
 </message>
 <message>
- <location filename="../controls.py" line="192"/>
+ <location filename="../controls.py" line="190"/>
 <source>Cyrillic (CP-866)</source>
 <translation>Cyrilica (CP-866)</translation>
 </message>
+ <message>
+ <location filename="../controls.py" line="194"/>
+ <source>Latin-1 (ISO-8859-1)</source>
+ <translation>Latin-1 (ISO-8859-1)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="195"/>
+ <source>Latin-2 (ISO-8859-2)</source>
+ <translation>Latin-2 (ISO-8859-2)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="196"/>
+ <source>Latin-3 (ISO-8859-3)</source>
+ <translation>Latin-3 (ISO-8859-3)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="197"/>
+ <source>Latin-4 (ISO-8859-4)</source>
+ <translation>Latin-4 (ISO-8859-4)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="198"/>
+ <source>Latin-5 (ISO-8859-5)</source>
+ <translation>Latin-5 (ISO-8859-5)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="199"/>
+ <source>Latin-6 (ISO-8859-6)</source>
+ <translation>Latin-6 (ISO-8859-6)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="200"/>
+ <source>Latin-7 (ISO-8859-7)</source>
+ <translation>Latin-7 (ISO-8859-7)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="201"/>
+ <source>Latin-8 (ISO-8859-8)</source>
+ <translation>Latin-8 (ISO-8859-8)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="202"/>
+ <source>Latin-9 (ISO-8859-9)</source>
+ <translation>Latin-9 (ISO-8859-9)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="203"/>
+ <source>Latin-10 (ISO-8859-10)</source>
+ <translation>Latin-10 (ISO-8859-10)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="205"/>
+ <source>Latin-13 (ISO-8859-13)</source>
+ <translation>Latin-13 (ISO-8859-13)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="206"/>
+ <source>Latin-14 (ISO-8859-14)</source>
+ <translation>Latin-14 (ISO-8859-14)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="207"/>
+ <source>Latin-15 (ISO-8859-15)</source>
+ <translation>Latin-15 (ISO-8859-15)</translation>
+ </message>
+ <message>
+ <location filename="../controls.py" line="208"/>
+ <source>Latin-16 (ISO-8859-16)</source>
+ <translation>Latin-16 (ISO-8859-16)</translation>
+ </message>
 </context>
 <context>
 <name>ConfigureDialog</name>
 <message>
 <location filename="../configureDialog.py" line="432"/>
 <source>Default</source>
- <translation>Domyślnie</translation>
+ <translation type="obsolete">Domyślnie</translation>
 </message>
 <message>
 <location filename="../configureDialog.py" line="433"/>
 <source>64 kbps</source>
- <translation>64 kbps</translation>
+ <translation type="obsolete">64 kbps</translation>
 </message>
 <message>
 <location filename="../configureDialog.py" line="434"/>
 <source>80 kbps</source>
- <translation>80 kbps</translation>
+ <translation type="obsolete">80 kbps</translation>
 </message>
 <message>
 <location filename="../configureDialog.py" line="435"/>
 <source>96 kbps</source>
- <translation>96 kbps</translation>
+ <translation type="obsolete">96 kbps</translation>
 </message>
 <message>
 <location filename="../configureDialog.py" line="436"/>
 <source>128 kbps</source>
- <translation>128 kbps</translation>
+ <translation type="obsolete">128 kbps</translation>
 </message>
 <message>
 <location filename="../configureDialog.py" line="437"/>
 <source>160 kbps</source>
- <translation>160 kbps</translation>
+ <translation type="obsolete">160 kbps</translation>
 </message>

flacon-0.5.7.tar.bz2/translations/flacon_ru_RU.qm -> flacon-0.6.0.tgz/translations/flacon_ru_RU.qm Changed

flacon-0.5.7.tar.bz2/translations/flacon_ru_RU.ts -> flacon-0.6.0.tgz/translations/flacon_ru_RU.ts Changed

@@ -1,250 +1,217 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="ru_RU">
+<!DOCTYPE TS>
+<TS version="2.0" language="ru_RU">
 <context>
 <name>AboutDialog</name>
 <message>
- <location filename="../aboutDialog.py" line="39"/>
+ <location filename="../aboutDialog.py" line="38"/>
 <source>About Flacon</source>
 <translation>О программе Flacon</translation>
 </message>
 <message>
- <location filename="../aboutDialog.py" line="40"/>
+ <location filename="../aboutDialog.py" line="39"/>
 <source>Extracts individual tracks from one big audio file containing the entire album.</source>
 <translation>Извлекает отдельные треки из большого аудио файла, содержащего весь альбом целиком.</translation>
 </message>
 <message>
- <location filename="../aboutDialog.py" line="41"/>
+ <location filename="../aboutDialog.py" line="40"/>
 <source>Version: %1</source>
 <translation>Версия: %1</translation>
 </message>
 <message>
- <location filename="../aboutDialog.py" line="42"/>
+ <location filename="../aboutDialog.py" line="41"/>
 <source>Web site:</source>
 <translation>Сайт:</translation>
 </message>
 <message>
- <location filename="../aboutDialog.py" line="43"/>
+ <location filename="../aboutDialog.py" line="42"/>
 <source>License:</source>
 <translation>Лицензия:</translation>
 </message>
-</context>
-<context>
- <name>CodePageComboBox</name>
- <message>
- <location filename="../controls.py" line="183"/>
- <source>Unicode (UTF-8)</source>
- <translation>Юникод (UTF-8)</translation>
- </message>
 <message>
- <location filename="../controls.py" line="184"/>
- <source>Unicode (UTF-16LE)</source>
- <translation>Юникод (UTF-16LE)</translation>
+ <location filename="../aboutDialog.py" line="54"/>
+ <source>WavPack support patch.</source>
+ <translation>Патч для поддержки WavPack.</translation>
 </message>
 <message>
- <location filename="../controls.py" line="185"/>
- <source>Unicode (UTF-16BE)</source>
- <translation>Юникод (UTF-16BE)</translation>
+ <location filename="../aboutDialog.py" line="59"/>
+ <source>Application icon, Packaging.</source>
+ <translation>Иконка для программы, пакетирование.</translation>
 </message>
 <message>
- <location filename="../controls.py" line="191"/>
- <source>Cyrillic (Win-1251)</source>
- <translation>Кириллица (Win-1251)</translation>
+ <location filename="../aboutDialog.py" line="64"/>
+ <source>Packaging, testing.</source>
+ <translation>Пакетирование, тестирование.</translation>
 </message>
 <message>
- <location filename="../controls.py" line="192"/>
- <source>Cyrillic (CP-866)</source>
- <translation>Кириллица (CP-866)</translation>
+ <location filename="../aboutDialog.py" line="69"/>
+ <source>Czech translation.</source>
+ <translation>Чешский перевод.</translation>
 </message>
-</context>
-<context>
- <name>ConfigureDialog</name>
 <message>
- <location filename="../configureDialog.py" line="432"/>
- <source>Default</source>
- <translation>По умолчанию</translation>
+ <location filename="../aboutDialog.py" line="74"/>
+ <source>Polish translation.</source>
+ <translation>Польский перевод.</translation>
 </message>
 <message>
- <location filename="../configureDialog.py" line="433"/>
- <source>64 kbps</source>
- <translation>64 kbps</translation>
+ <location filename="../aboutDialog.py" line="79"/>
+ <source>French Canadian translation. Improvements in the UI.</source>
+ <translation>Французский перевод для Канады. Улучшения в интерфейсе.</translation>
 </message>
 <message>
- <location filename="../configureDialog.py" line="434"/>
- <source>80 kbps</source>
- <translation>80 kbps</translation>
+ <location filename="../aboutDialog.py" line="85"/>
+ <source>French translation.</source>
+ <translation>Французский перевод.</translation>
 </message>
 <message>
- <location filename="../configureDialog.py" line="435"/>
- <source>96 kbps</source>
- <translation>96 kbps</translation>
- </message>
- <message>
- <location filename="../configureDialog.py" line="436"/>
- <source>128 kbps</source>
- <translation>128 kbps</translation>
- </message>
- <message>
- <location filename="../configureDialog.py" line="437"/>
- <source>160 kbps</source>
- <translation>160 kbps</translation>
- </message>
- <message>
- <location filename="../configureDialog.py" line="438"/>
- <source>196 kbps</source>
- <translation>196 kbps</translation>
- </message>
- <message>
- <location filename="../configureDialog.py" line="439"/>
- <source>256 kbps</source>
- <translation>256 kbps</translation>
- </message>
- <message>
- <location filename="../configureDialog.py" line="440"/>
- <source>350 kbps</source>
- <translation>350 kbps</translation>
+ <location filename="../aboutDialog.py" line="143"/>
+ <source>Flacon uses external programs. Many thanks to their authors!</source>
+ <translation>Flacon использует внешние программы. Огромное спасибо их авторам!</translation>
 </message>
+</context>
+<context>
+ <name>CodePageComboBox</name>
 <message>
- <location filename="../configureDialog.py" line="296"/>
- <source>AVR medium</source>
- <translation>AVR medium</translation>
+ <location filename="../controls.py" line="183"/>
+ <source>Unicode (UTF-8)</source>
+ <translation>Юникод (UTF-8)</translation>
 </message>
 <message>
- <location filename="../configureDialog.py" line="297"/>
- <source>AVR standard</source>
- <translation>AVR standard</translation>
+ <location filename="../controls.py" line="184"/>
+ <source>Unicode (UTF-16LE)</source>
+ <translation>Юникод (UTF-16LE)</translation>
 </message>
 <message>
- <location filename="../configureDialog.py" line="298"/>
- <source>AVR standard fast</source>
- <translation>AVR standard fast</translation>
+ <location filename="../controls.py" line="185"/>
+ <source>Unicode (UTF-16BE)</source>
+ <translation>Юникод (UTF-16BE)</translation>
 </message>
 <message>
- <location filename="../configureDialog.py" line="299"/>
- <source>AVR extreme</source>
- <translation>AVR extreme</translation>
+ <location filename="../controls.py" line="189"/>
+ <source>Cyrillic (Win-1251)</source>
+ <translation>Кириллица (Win-1251)</translation>
 </message>
 <message>
- <location filename="../configureDialog.py" line="300"/>
- <source>AVR extreme fast</source>
- <translation>AVR extreme fast</translation>
+ <location filename="../controls.py" line="190"/>
+ <source>Cyrillic (CP-866)</source>
+ <translation>Кириллица (CP-866)</translation>
 </message>
 <message>
- <location filename="../configureDialog.py" line="301"/>
- <source>CBR insane</source>
- <translation>CBR insane</translation>
+ <location filename="../controls.py" line="194"/>
+ <source>Latin-1 (ISO-8859-1)</source>
+ <translation></translation>
 </message>
 <message>
- <location filename="../configureDialog.py" line="302"/>
- <source>CBR kbps</source>
- <translation>CBR kbps</translation>
+ <location filename="../controls.py" line="195"/>
+ <source>Latin-2 (ISO-8859-2)</source>
+ <translation></translation>
 </message>
 <message>
- <location filename="../configureDialog.py" line="303"/>
- <source>ABR kbps</source>
- <translation>ABR kbps</translation>

flacon-0.5.7.tar.bz2/translations/translate.sh -> flacon-0.6.0.tgz/translations/translate.sh Changed

flacon-0.6.0.tgz/translations/update_ts.sh Added