Packman Build Service PMBS

Changes of Revision 23

flacon.changes Changed

flacon.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package flacon
 #
-# Copyright (c) 2017 Packman Team <packman@links2linux.de>
+# Copyright (c) 2018 Packman Team <packman@links2linux.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,38 +17,35 @@
 
 
 Name:           flacon
-Version:        3.1.1
+Version:        4.0.0
 Release:        0
 Summary:        Split compressed Audio CD images to tracks
 License:        LGPL-2.1+
 Group:          Productivity/Multimedia/Sound/Editors and Convertors
-Url:            http://flacon.github.io/
+URL:            http://flacon.github.io/
 Source:         https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 BuildRequires:  cmake
 BuildRequires:  hicolor-icon-theme
+BuildRequires:  libqt5-linguist-devel
+BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(Qt5Concurrent)
+BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5Gui)
+BuildRequires:  pkgconfig(Qt5Network)
+BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(uchardet)
 Requires:       faac
 Requires:       flac
 Requires:       lame
 Requires:       mac
+Requires:       opus-tools
 Requires:       ttaenc
 Requires:       vorbis-tools
 Requires:       wavpack
 Recommends:     %{name}-lang
 Recommends:     mp3gain
 Recommends:     vorbisgain
-%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse})
-BuildRequires:  libqt5-linguist-devel
-BuildRequires:  pkgconfig(Qt5Network)
-BuildRequires:  pkgconfig(Qt5Widgets)
-Requires:       opus-tools
-%else
-BuildRequires:  pkgconfig(QtCore)
-BuildRequires:  pkgconfig(QtGui)
-BuildRequires:  pkgconfig(QtNetwork)
-Recommends:     opus-tools
-%endif
 
 %description
 Flacon extracts individual tracks from one big audio file

flacon-3.1.1.tar.gz/converter/converterthread.cpp Deleted

@@ -1,131 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * Flacon - audio File Encoder
- * https://github.com/flacon/flacon
- *
- * Copyright: 2012-2013
- *   Alexander Sokoloff <sokoloff.a@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
-
- * This library 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
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-
-#include "converterthread.h"
-#include <QFile>
-#include <QTextStream>
-
-
-/************************************************
-
- ************************************************/
-ConverterThread::ConverterThread(Disk *disk, const OutFormat *format, QObject *parent):
-    QThread(parent),
-    mDisk(disk),
-    mFormat(format)
-{
-}
-
-
-/************************************************
-
- ************************************************/
-ConverterThread::~ConverterThread()
-{
-}
-
-
-/************************************************
-
- ************************************************/
-void ConverterThread::run()
-{
-    doRun();
-}
-
-
-/************************************************
-
- ************************************************/
-void ConverterThread::error(Track *track, const QString &message)
-{
-    stop();
-    emit trackError(track, message);
-}
-
-
-/************************************************
-
- ************************************************/
-void ConverterThread::stop()
-{
-    doStop();
-    for (int i=0; i<disk()->count(); ++i)
-    {
-        Track *track = disk()->track(i);
-
-        switch (track->status())
-        {
-        case Track::Error:
-        case Track::OK:
-            break;
-
-        case Track::NotRunning:
-            emit trackProgress(track, Track::Canceled);
-            break;
-
-        default:
-            emit trackProgress(track, Track::Aborted);
-            break;
-        }
-    }
-}
-
-
-/************************************************
-
- ************************************************/
-bool ConverterThread::deleteFile(const QString &fileName)
-{
-    QFile f(fileName);
-    if (f.exists())
-        return f.remove();
-    else
-        return true;
-}
-
-
-/************************************************
-
- ************************************************/
-void ConverterThread::debugArguments(const QString &prog, const QStringList &args)
-{
-    QTextStream out(stderr);
-    out << prog << " ";
-    foreach (QString arg, args)
-    {
-        if (arg.contains(' ') || arg.contains('\t'))
-        {
-            out << "'" << arg << "' ";
-        }
-        else
-        {
-            out << arg << " ";
-        }
-
-    }
-    out << endl;
-}

flacon-3.1.1.tar.gz/converter/converterthread.h Deleted

@@ -1,73 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * Flacon - audio File Encoder
- * https://github.com/flacon/flacon
- *
- * Copyright: 2012-2013
- *   Alexander Sokoloff <sokoloff.a@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
-
- * This library 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
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-
-#ifndef CONVERTERTHREAD_H
-#define CONVERTERTHREAD_H
-
-#include "disk.h"
-#include <QThread>
-#include <QString>
-
-class OutFormat;
-
-class ConverterThread: public QThread
-{
-    Q_OBJECT
-public:
-    explicit ConverterThread(Disk *disk, const OutFormat *format, QObject *parent = 0);
-    virtual ~ConverterThread();
-
-    Disk *disk() const { return mDisk; }
-    virtual bool isReadyStart() const = 0;
-
-    virtual QString workDir() const { return ""; }
-
-signals:
-    void trackReady(Track *track, const QString &outFileName);
-    void trackProgress(Track *track, Track::Status status, int percent = -1);
-    void trackError(Track *track, const QString &message);
-    void readyStart();
-
-public slots:
-    virtual void inputDataReady(Track *track, const QString &fileName) = 0;
-    virtual void stop();
-
-protected:
-    void run();
-    virtual void doRun() = 0;
-    virtual void doStop() = 0;
-    void error(Track *track, const QString &message);
-    bool deleteFile(const QString &fileName);
-
-    void debugArguments(const QString &prog, const QStringList &args);
-    const OutFormat *format() const { return mFormat; }
-
-private:
-    Disk *mDisk;
-    const OutFormat *mFormat;
-};
-
-#endif // CONVERTERTHREAD_H

flacon-3.1.1.tar.gz/images/audioBtn.png Deleted

flacon-3.1.1.tar.gz/images/oxygen Deleted

flacon-3.1.1.tar.gz/images/oxygen/16 Deleted

flacon-3.1.1.tar.gz/images/oxygen/16/download-track-info.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/16/program-edit-btn.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/16/select-audio-file.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/16/select-cue-file.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/16/select-folder.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/16/track-cancel.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/16/track-ok.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/22 Deleted

flacon-3.1.1.tar.gz/images/oxygen/22/abort-convert.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/22/about.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/22/add-file.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/22/configure.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/22/download-track-info.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/22/remove-disk.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/22/scan.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/22/select-result-dir.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/22/start-convert.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/32 Deleted

flacon-3.1.1.tar.gz/images/oxygen/32/disk-warning.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/32/settings-encoder.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/32/settings-main.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/32/settings-programs.png Deleted

flacon-3.1.1.tar.gz/images/oxygen/icons.qrc Deleted

@@ -1,28 +0,0 @@
-<RCC>
-    <qresource prefix="/icons/16">
-        <file alias="download-track-info">16/download-track-info.png</file>
-        <file alias="program-edit-btn">16/program-edit-btn.png</file>
-        <file alias="select-audio-file">16/select-audio-file.png</file>
-        <file alias="select-cue-file">16/select-cue-file.png</file>
-        <file alias="select-folder">16/select-folder.png</file>
-        <file alias="track-cancel">16/track-cancel.png</file>
-        <file alias="track-ok">16/track-ok.png</file>
-    </qresource>
-    <qresource prefix="/icons/32">
-        <file alias="disk-warning">32/disk-warning.png</file>
-        <file alias="settings-encoder">32/settings-encoder.png</file>
-        <file alias="settings-main">32/settings-main.png</file>
-        <file alias="settings-programs">32/settings-programs.png</file>
-    </qresource>
-    <qresource prefix="/icons/22">
-        <file alias="abort-convert">22/abort-convert.png</file>
-        <file alias="about">22/about.png</file>
-        <file alias="add-file">22/add-file.png</file>
-        <file alias="configure">22/configure.png</file>
-        <file alias="download-track-info">22/download-track-info.png</file>
-        <file alias="remove-disk">22/remove-disk.png</file>
-        <file alias="scan">22/scan.png</file>
-        <file alias="select-result-dir">22/select-result-dir.png</file>
-        <file alias="start-convert">22/start-convert.png</file>
-    </qresource>
-</RCC>

flacon-3.1.1.tar.gz/images/trackBtn.png Deleted

flacon-3.1.1.tar.gz/misc/flacon-16x16.png Deleted

flacon-3.1.1.tar.gz/misc/flacon-32x32.png Deleted

flacon-3.1.1.tar.gz/misc/flacon-48x48.png Deleted

flacon-3.1.1.tar.gz/tools.cmake Deleted

@@ -1,46 +0,0 @@
-if (NOT CMAKE_BUILD_TYPE)
-    set ( CMAKE_BUILD_TYPE Release )
-endif (NOT CMAKE_BUILD_TYPE)
-
-if (CMAKE_BUILD_TYPE MATCHES [Dd]ebug)
-    add_definitions("-g")
-endif()
-
-set(STATUS_MESSAGES "")
-
-
-macro(status_message message)
-  set(STATUS_MESSAGES ${STATUS_MESSAGES} ${message})
-endmacro()
-
-
-macro(show_status)
-    message(STATUS "*****************************************************")
-
-    foreach(msg ${STATUS_MESSAGES})
-        message(STATUS "* ${msg}")
-        message(STATUS "*")
-    endforeach()
-
-    message(STATUS "*****************************************************")
-endmacro()
-
-
-macro(setByDefault VAR_NAME VAR_VALUE)
-  if (NOT DEFINED ${VAR_NAME})
-    set (${VAR_NAME} ${VAR_VALUE})
-  endif()
-  add_definitions(-D${VAR_NAME}=\"${VAR_VALUE}\")
-endmacro()
-
-
-macro(addTests TESTS_DIR)
-	option(BUILD_TESTS "Build tests." $ENV{BUILD_TESTS})
-
-	if(BUILD_TESTS)
-		add_definitions(-DBUILD_TESTS)
-		add_subdirectory(${TESTS_DIR})
-	else()
-		status_message("For building tests use -DBUILD_TESTS=Yes option.")
-	endif()
-endmacro()

flacon-3.1.1.tar.gz/.gitignore -> flacon-4.0.0.tar.gz/.gitignore Changed

flacon-3.1.1.tar.gz/.travis.yml -> flacon-4.0.0.tar.gz/.travis.yml Changed

flacon-3.1.1.tar.gz/.tx/updateSrc.sh -> flacon-4.0.0.tar.gz/.tx/updateSrc.sh Changed

flacon-3.1.1.tar.gz/CMakeLists.txt -> flacon-4.0.0.tar.gz/CMakeLists.txt Changed

@@ -4,7 +4,7 @@
  # Flacon - audio File Encoder
  # https://github.com/flacon/flacon
  #
- # Copyright: 2012-2013
+ # Copyright: 2012-2017
  #   Alexander Sokoloff <sokoloff.a@gmail.com>
  #
  # This library is free software; you can redistribute it and/or
@@ -23,13 +23,17 @@
  #
  # END_COMMON_COPYRIGHT_HEADER
 
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.0.0)
+cmake_policy(SET CMP0028 NEW)
+if (POLICY CMP0071) 
+    cmake_policy(SET CMP0071 NEW) 
+endif()
 
 project(flacon)
 
-set(MAJOR_VERSION 3)
-set(MINOR_VERSION 1)
-set(PATCH_VERSION 1)
+set(MAJOR_VERSION 4)
+set(MINOR_VERSION 0)
+set(PATCH_VERSION 0)
 set(FLACON_VERSION ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION})
 
 add_definitions(-DFLACON_MAJOR_VERSION=\"${MAJOR_VERSION}\")
@@ -37,10 +41,16 @@
 add_definitions(-DFLACON_PATCH_VERSION=\"${PATCH_VERSION}\")
 add_definitions(-DFLACON_VERSION=\"${FLACON_VERSION}\")
 
+include("cmake/status_message.cmake")
+status_message("${PROJECT_NAME} ver. ${FLACON_VERSION}")
+status_message(" ")
+
 
 set(HEADERS
+    types.h
     tagset.h
     cue.h
+    track.h
     disk.h
     project.h
     settings.h
@@ -57,14 +67,19 @@
     gui/aboutdialog/aboutdialog.h
     gui/aboutdialog/translatorsinfo.h
     gui/cuediskselectdialog/cuediskselectdialog.h
+    gui/coverdialog/coverdialog.h
+    gui/coverdialog/asynclistwidgetitem.h
 
     converter/wavheader.h
     converter/decoder.h
-    converter/converterthread.h
     converter/converter.h
     converter/splitter.h
     converter/encoder.h
     converter/gain.h
+    converter/worker.h
+    converter/diskpipline.h
+    converter/cuecreator.h
+    converter/copycover.h
 
     formats/format.h
     formats/outformat.h
@@ -80,9 +95,11 @@
 )
 
 set(SOURCES
+    types.cpp
     tagset.cpp
     cue.cpp
     main.cpp
+    track.cpp
     disk.cpp
     project.cpp
     settings.cpp
@@ -99,14 +116,19 @@
     gui/aboutdialog/aboutdialog.cpp
     gui/aboutdialog/translatorsinfo.cpp
     gui/cuediskselectdialog/cuediskselectdialog.cpp
+    gui/coverdialog/coverdialog.cpp
+    gui/coverdialog/asynclistwidgetitem.cpp
 
     converter/wavheader.cpp
     converter/decoder.cpp
-    converter/converterthread.cpp
     converter/converter.cpp
     converter/splitter.cpp
     converter/encoder.cpp
     converter/gain.cpp
+    converter/worker.cpp
+    converter/diskpipline.cpp
+    converter/cuecreator.cpp
+    converter/copycover.cpp
 
     formats/format.cpp
     formats/outformat.cpp
@@ -121,44 +143,13 @@
     formats/tta.cpp
 )
 
-set (MOCS
-    disk.h
-    project.h
-    settings.h
-    tagset.h
-    internet/dataprovider.h
-    scanner.h
-
-    gui/mainwindow.h
-    gui/controls.h
-    gui/trackview.h
-    gui/trackviewmodel.h
-    gui/trackviewdelegate.h
-    gui/configdialog/configdialog.h
-    gui/aboutdialog/aboutdialog.h
-    gui/cuediskselectdialog/cuediskselectdialog.h
-
-    converter/decoder.h
-    converter/converterthread.h
-    converter/converter.h
-    converter/splitter.h
-    converter/encoder.h
-    converter/gain.h
-
-    formats/aac.h
-    formats/flac.h
-    formats/mp3.h
-    formats/ogg.h
-    formats/wav.h
-    formats/wv.h
-    formats/opus.h
-)
 
 set (FORMS
     gui/mainwindow.ui
     gui/configdialog/configdialog.ui
     gui/aboutdialog/aboutdialog.ui
     gui/cuediskselectdialog/cuediskselectdialog.ui
+    gui/coverdialog/coverdialog.ui
 
     formats/flac_config.ui
     formats/aac_config.ui
@@ -175,7 +166,7 @@
 
 set(RESOURCES
     images/images.qrc
-    images/oxygen/icons.qrc
+    images/icons.qrc
 )
 
 # add translations ...
@@ -192,12 +183,11 @@
 )
 add_definitions(-DTRANSLATIONS_DIR=\"${TRANSLATIONS_DIR}\")
 
-include("tools.cmake")
+set (CMAKE_CXX_STANDARD 11)
+include("cmake/cxx_standard.cmake")
+include("cmake/git_version.cmake")
+include("cmake/build_type.cmake")
 
-############################################
-if(CMAKE_COMPILER_IS_GNUCXX)
-    add_definitions (-Wall -pedantic -Wno-long-long -Werror=format-security)
-endif()
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
@@ -211,56 +201,23 @@
 )
 
 #*******************************************
+include("cmake/macos.cmake")
+add_homebrew_qt_prefix_path()
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
+find_package(Qt5 REQUIRED
+    Core
+    Widgets
+    Network
+    LinguistTools
+)
 
-option(USE_QT5 "Force use the Qt5." $ENV{USE_QT5})
-option(USE_QT4 "Force use the Qt4." $ENV{USE_QT4})
-
-if((USE_QT4 AND USE_QT5) OR
-   (NOT USE_QT4 AND NOT USE_QT5))
-    find_package(Qt5Core QUIET)
-    if (Qt5Core_FOUND)
-        set(USE_QT4 OFF)
-        set(USE_QT5 ON)
-    else()
-        set(USE_QT4 ON)
-        set(USE_QT5 OFF)
-    endif()
-endif()
-
-
-if(USE_QT4)
-    set(QT_USE_QTNETWORK 1)
-    find_package(Qt4 REQUIRED)
-    include(${QT_USE_FILE})
-    qt4_wrap_cpp(MOC_SOURCES ${MOCS})
-    qt4_add_resources(QRC_SOURCES ${RESOURCES})
-    qt4_wrap_ui(UI_HEADERS ${FORMS})
-    qt4_add_translation(QM_FILES ${TS_FILES})
-
-    status_message("Using Qt4, for building with Qt5 use -DUSE_QT5=Yes option.")
-else()
-    cmake_minimum_required(VERSION 2.8.3)
-    find_package(Qt5Widgets REQUIRED QUIET)
-    include_directories(${Qt5Widgets_INCLUDE_DIRS})
-    add_definitions(${Qt5Widgets_DEFINITIONS})
-    set(QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Widgets_LIBRARIES})
-
-    find_package(Qt5Network REQUIRED QUIET)
-    include_directories(${Qt5Network_INCLUDE_DIRS})
-    add_definitions(${Qt5Network_DEFINITIONS})
-    set(QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Network_LIBRARIES})
-
-    find_package(Qt5LinguistTools REQUIRED QUIET)
 
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+qt5_add_translation(QM_FILES ${TS_FILES})
 
-    qt5_wrap_cpp(MOC_SOURCES ${MOCS})
-    qt5_add_resources(QRC_SOURCES ${RESOURCES})
-    qt5_wrap_ui(UI_HEADERS ${FORMS})
-    qt5_add_translation(QM_FILES ${TS_FILES})
-
-    status_message("Using Qt5, for building with Qt4 use -DUSE_QT4=Yes option.")
-endif()
 
 include(FindPkgConfig)
 pkg_search_module(UCHARDET REQUIRED uchardet)
@@ -272,8 +229,12 @@
 link_directories(${UCHARDET_LIBRARY_DIRS})
 
 
-add_executable(${PROJECT_NAME} ${HEADERS} ${SOURCES} ${MOC_SOURCES} ${QM_FILES} ${QRC_SOURCES} ${UI_HEADERS} ${ENGINES_CPP} ${ENGINES_H} ${TRANSLATORS_INFO_QRC})
-target_link_libraries(${PROJECT_NAME} ${LIBRARIES} ${QT_LIBRARIES})
+if ( MAC_BUNDLE )
+    add_definitions(-DMAC_BUNDLE=Yes)
+endif()
+
+add_executable(${PROJECT_NAME} ${HEADERS} ${SOURCES} ${QM_FILES} ${QRC_SOURCES} ${ENGINES_CPP} ${ENGINES_H} ${RESOURCES} ${TRANSLATORS_INFO_QRC})
+target_link_libraries(${PROJECT_NAME} ${LIBRARIES} ${QT_LIBRARIES} Qt5::Widgets Qt5::Network)
 
 
 function(CREATE_DESKTOP_FILE _IN_FILE _OUT_FILE _TRANSLATIONS_PATTERN)
@@ -309,16 +270,25 @@
 endfunction()
 
 CREATE_DESKTOP_FILE(misc/${PROJECT_NAME}.desktop ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop translations/*.desktop)
+CREATE_PLIST_FILE(misc/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist translations/*.desktop)
 
 install(FILES   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop DESTINATION "share/applications")
-install(FILES   misc/flacon-16x16.png   DESTINATION "share/icons/hicolor/16x16/apps" RENAME "flacon.png")
-install(FILES   misc/flacon-32x32.png   DESTINATION "share/icons/hicolor/32x32/apps" RENAME "flacon.png")
-install(FILES   misc/flacon-48x48.png   DESTINATION "share/icons/hicolor/48x48/apps" RENAME "flacon.png")
+install(FILES   images/mainicon/flacon-16x16.png   DESTINATION "share/icons/hicolor/16x16/apps"    RENAME "flacon.png")
+install(FILES   images/mainicon/flacon-32x32.png   DESTINATION "share/icons/hicolor/32x32/apps"    RENAME "flacon.png")
+install(FILES   images/mainicon/flacon-48x48.png   DESTINATION "share/icons/hicolor/48x48/apps"    RENAME "flacon.png")
+install(FILES   images/mainicon/flacon-64x64.png   DESTINATION "share/icons/hicolor/64x64/apps"    RENAME "flacon.png")
+install(FILES   images/mainicon/flacon-128x128.png DESTINATION "share/icons/hicolor/128x128/apps"  RENAME "flacon.png")
+install(FILES   images/mainicon/flacon-256x256.png DESTINATION "share/icons/hicolor/256x256/apps"  RENAME "flacon.png")
+install(FILES   images/mainicon/flacon-512x512.png DESTINATION "share/icons/hicolor/512x512/apps"  RENAME "flacon.png")
+install(FILES   images/mainicon/flacon.svg         DESTINATION "share/icons/hicolor/scalable/apps" RENAME "flacon.svg")
+
+
 install(FILES   ${QM_FILES}             DESTINATION ${TRANSLATIONS_DIR})
 install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
 
 
-addTests(tests)
+include("cmake/tests.cmake")
+add_tests(tests)
 
 
 # Man page **************************************
@@ -328,9 +298,8 @@
     @ONLY
 )
 
-#add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz
 add_custom_command(TARGET ${PROJECT_NAME}
-    COMMAND gzip -c ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 > ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz
+    COMMAND gzip -c -n ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 > ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz
 )
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION share/man/man1)

flacon-3.1.1.tar.gz/README.md -> flacon-4.0.0.tar.gz/README.md Changed

flacon-4.0.0.tar.gz/cmake Added

flacon-4.0.0.tar.gz/cmake/build_type.cmake Added

@@ -0,0 +1,36 @@
+ # BEGIN_COMMON_COPYRIGHT_HEADER
+ # (c)LGPL2+
+ #
+ # Flacon - audio File Encoder
+ # https://github.com/flacon/flacon
+ #
+ # Copyright: 2017
+ #   Alexander Sokoloff <sokoloff.a@gmail.com>
+ #
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU Lesser General Public
+ # License as published by the Free Software Foundation; either
+ # version 2.1 of the License, or (at your option) any later version.
+
+ # This library 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
+ # Lesser General Public License for more details.
+
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this library; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ #
+ # END_COMMON_COPYRIGHT_HEADER
+
+if (NOT CMAKE_BUILD_TYPE)
+    set ( CMAKE_BUILD_TYPE Release )
+endif (NOT CMAKE_BUILD_TYPE)
+
+set(CMAKE_CXX_FLAGS "-Wall -Wextra ${CMAKE_CXX_FLAGS}")
+set(CMAKE_CXX_FLAGS_DEBUG "-g ${CMAKE_CXX_FLAGS_DEBUG}")
+set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${CMAKE_CXX_FLAGS_RELEASE}")
+
+if (CMAKE_BUILD_TYPE STREQUAL Release)
+  status_message("For building debug version use -DCMAKE_BUILD_TYPE=Debug option.")
+endif()

flacon-4.0.0.tar.gz/cmake/cxx_standard.cmake Added

@@ -0,0 +1,33 @@
+ # BEGIN_COMMON_COPYRIGHT_HEADER
+ # (c)LGPL2+
+ #
+ # Flacon - audio File Encoder
+ # https://github.com/flacon/flacon
+ #
+ # Copyright: 2017
+ #   Alexander Sokoloff <sokoloff.a@gmail.com>
+ #
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU Lesser General Public
+ # License as published by the Free Software Foundation; either
+ # version 2.1 of the License, or (at your option) any later version.
+
+ # This library 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
+ # Lesser General Public License for more details.
+
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this library; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ #
+ # END_COMMON_COPYRIGHT_HEADER
+
+# C++ standard version for CMake less 3.1
+if (CMAKE_VERSION VERSION_LESS "3.1")
+    if (CMAKE_CXX_STANDARD EQUAL 11)
+        set (CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
+    elseif (CMAKE_CXX_STANDARD EQUAL 14)
+        set (CMAKE_CXX_FLAGS "-std=c++14 ${CMAKE_CXX_FLAGS}")
+    endif()
+endif()

flacon-4.0.0.tar.gz/cmake/git_version.cmake Added

@@ -0,0 +1,54 @@
+ # BEGIN_COMMON_COPYRIGHT_HEADER
+ # (c)LGPL2+
+ #
+ # Flacon - audio File Encoder
+ # https://github.com/flacon/flacon
+ #
+ # Copyright: 2017
+ #   Alexander Sokoloff <sokoloff.a@gmail.com>
+ #
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU Lesser General Public
+ # License as published by the Free Software Foundation; either
+ # version 2.1 of the License, or (at your option) any later version.
+
+ # This library 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
+ # Lesser General Public License for more details.
+
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this library; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ #
+ # END_COMMON_COPYRIGHT_HEADER
+
+function(git_version GIT_BRANCH GIT_COMMIT_HASH)
+
+    # Get the current working branch
+    execute_process(
+        COMMAND git rev-parse --abbrev-ref HEAD
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE branch
+        ERROR_QUIET
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    SET(${GIT_BRANCH} ${branch} PARENT_SCOPE)
+
+    # Get the latest abbreviated commit hash of the working branch
+    execute_process(
+        COMMAND git log -1 --format=%H
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE hash
+        ERROR_QUIET
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    SET(${GIT_COMMIT_HASH} ${hash} PARENT_SCOPE)
+
+endfunction()
+
+git_version(GIT_BRANCH GIT_COMMIT_HASH)
+if (NOT "${GIT_COMMIT_HASH}" STREQUAL "")
+    add_definitions(-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\")
+    add_definitions(-DGIT_BRANCH=\"${GIT_BRANCH}\")
+endif()
\ No newline at end of file

flacon-4.0.0.tar.gz/cmake/macos.cmake Added

@@ -0,0 +1,40 @@
+ # BEGIN_COMMON_COPYRIGHT_HEADER
+ # (c)LGPL2+
+ #
+ # Flacon - audio File Encoder
+ # https://github.com/flacon/flacon
+ #
+ # Copyright: 2017
+ #   Alexander Sokoloff <sokoloff.a@gmail.com>
+ #
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU Lesser General Public
+ # License as published by the Free Software Foundation; either
+ # version 2.1 of the License, or (at your option) any later version.
+
+ # This library 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
+ # Lesser General Public License for more details.
+
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this library; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ #
+ # END_COMMON_COPYRIGHT_HEADER
+
+function(CREATE_PLIST_FILE _IN_FILE _OUT_FILE _TRANSLATIONS_PATTERN)   
+    configure_file(${_IN_FILE} ${_OUT_FILE} @ONLY)
+    file(APPEND ${_OUT_FILE} "${name_tag}\n")
+    file(APPEND ${_OUT_FILE} "${comment_tag}\n")
+    file(APPEND ${_OUT_FILE} "${genericname_tag}\n")
+endfunction()
+
+
+# Homebrew has issues, fix it
+macro(add_homebrew_qt_prefix_path)
+    if (APPLE)
+        file (GLOB dirs  /usr/local/Cellar/qt/*)
+        list(APPEND CMAKE_PREFIX_PATH ${dirs})
+    endif()
+endmacro()

flacon-4.0.0.tar.gz/cmake/status_message.cmake Added

@@ -0,0 +1,41 @@
+ # BEGIN_COMMON_COPYRIGHT_HEADER
+ # (c)LGPL2+
+ #
+ # Flacon - audio File Encoder
+ # https://github.com/flacon/flacon
+ #
+ # Copyright: 2017
+ #   Alexander Sokoloff <sokoloff.a@gmail.com>
+ #
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU Lesser General Public
+ # License as published by the Free Software Foundation; either
+ # version 2.1 of the License, or (at your option) any later version.
+
+ # This library 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
+ # Lesser General Public License for more details.
+
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this library; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ #
+ # END_COMMON_COPYRIGHT_HEADER
+
+set(STATUS_MESSAGES "" CACHE INTERNAL "STATUS_MESSAGES_CACHE")
+
+macro(status_message message)
+        set(STATUS_MESSAGES ${STATUS_MESSAGES} ${message}  CACHE INTERNAL "STATUS_MESSAGES_CACHE")
+endmacro()
+
+
+macro(show_status)
+    message(STATUS "*****************************************************")
+
+    foreach(msg ${STATUS_MESSAGES})
+        message(STATUS "* ${msg}")
+    endforeach()
+
+    message(STATUS "*****************************************************")
+endmacro()

flacon-4.0.0.tar.gz/cmake/tests.cmake Added

@@ -0,0 +1,35 @@
+ # BEGIN_COMMON_COPYRIGHT_HEADER
+ # (c)LGPL2+
+ #
+ # Flacon - audio File Encoder
+ # https://github.com/flacon/flacon
+ #
+ # Copyright: 2017
+ #   Alexander Sokoloff <sokoloff.a@gmail.com>
+ #
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU Lesser General Public
+ # License as published by the Free Software Foundation; either
+ # version 2.1 of the License, or (at your option) any later version.
+
+ # This library 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
+ # Lesser General Public License for more details.
+
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this library; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ #
+ # END_COMMON_COPYRIGHT_HEADER
+
+macro(add_tests TESTS_DIR)
+  option(BUILD_TESTS "Build tests." $ENV{BUILD_TESTS})
+
+  if(BUILD_TESTS)
+    add_definitions(-DBUILD_TESTS)
+    add_subdirectory(${TESTS_DIR})
+  else()
+    status_message("For building tests use -DBUILD_TESTS=Yes option.")
+  endif()
+endmacro()

flacon-3.1.1.tar.gz/converter/converter.cpp -> flacon-4.0.0.tar.gz/converter/converter.cpp Changed

@@ -28,19 +28,20 @@
 #include <QDebug>
 
 #include "converter.h"
-#include "converterthread.h"
 #include "project.h"
 #include "settings.h"
 #include "outformat.h"
 #include "splitter.h"
 #include "encoder.h"
 #include "gain.h"
+#include "diskpipline.h"
 
 #include <iostream>
 #include <math.h>
 #include <QFileInfo>
 #include <QDir>
 
+
 /************************************************
 
  ************************************************/
@@ -53,175 +54,72 @@
 
 
 /************************************************
-
+ *
  ************************************************/
-void Converter::start()
+Converter::~Converter()
 {
-    mStartTime = QDateTime::currentDateTime();
-
-    bool ok;
-    mThreadCount = settings->value(Settings::Encoder_ThreadCount).toInt(&ok);
-    if (!ok || mThreadCount < 1)
-        mThreadCount = qMax(6, QThread::idealThreadCount());
-
-
-    OutFormat *format = OutFormat::currentFormat();
-    //Gain::GainType gainType = OutputFormat::currentGainType();
-
-
-    if (!check(format))
-    {
-        emit finished();
-        return;
-    }
-
-    for (int i=0; i<project->count(); ++i)
-    {
-        Disk *disk = project->disk(i);
-        if (disk->canConvert())
-            createDiscThreads(disk, format);
-    }
-
-
-    foreach(ConverterThread* thread, mThreads)
-    {
-        connect(thread, SIGNAL(trackError(Track*,QString)), this, SLOT(threadError(Track*,QString)));
-        connect(thread, SIGNAL(readyStart()), this, SLOT(startThread()));
-        connect(thread, SIGNAL(finished()), this, SLOT(threadFinished()));
-        connect(thread, SIGNAL(trackProgress(Track*,Track::Status,int)), this, SLOT(setTrackProgress(Track*,Track::Status,int)));
-    }
-
-    if (!createDirs())
-    {
-        qDeleteAll(mThreads);
-        mThreads.clear();
-        emit finished();
-        return;
-    }
-
-    if (mThreads.isEmpty())
-    {
-        qWarning() << "No job for converter";
-        emit finished();
-        return;
-    }
-
-    startThread();
+    if (mShowStatistic)
+        printStatistic();
 }
 
 
 /************************************************
- CREATE THREADS CHAINS
- ************************************************
-         SIGNAL(trackReady) --> SLOT(inputDataReady)
-
-              +--> Encoder ---> Track gain -->+
-   Splitter ->+            ...                +-> Album gain --> this
-              +--> Encoder ---> Track gain -->+
 
-                                optional step    optional step
  ************************************************/
-void Converter::createDiscThreads(Disk *disk, const OutFormat *format)
+void Converter::start()
 {
-    Splitter *splitter = new Splitter(disk, format);
-    mThreads << splitter;
-
-    Gain *albumGain = 0;
-    if (format->gainType() == OutFormat::GainAlbum)
+    if (project->count() == 0)
     {
-        albumGain = format->createGain(disk, 0);
-    }
-
-    if (albumGain)
-    {
-        mThreads << albumGain;
-        connect(albumGain, SIGNAL(trackReady(Track*,QString)), this, SLOT(trackReady(Track*,QString)));
+        emit finished();
+        return;
     }
 
-
-    createTrackThreads(disk->preGapTrack(), format, splitter, albumGain);
-
-    for (int i=0; i<disk->count(); ++i)
+    if (!check(settings->outFormat()))
     {
-        createTrackThreads(disk->track(i), format, splitter, albumGain);
+        emit finished();
+        return;
     }
-}
-
-
-/************************************************
 
- ************************************************/
-void Converter::createTrackThreads(Track *track, const OutFormat *format, ConverterThread *prevThread, ConverterThread *nextThread)
-{
-    Encoder *encoder = format->createEncoder(track);
-    mThreads << encoder;
-    connect(prevThread, SIGNAL(trackReady(Track*,QString)), encoder, SLOT(inputDataReady(Track*,QString)));
-    ConverterThread *last = encoder;
+    mStartTime = QDateTime::currentDateTime();
 
-    Gain *gain = 0;
-    if (format->gainType() == OutFormat::GainTrack)
-        gain = format->createGain(track->disk(), track);
+    bool ok;
+    mThreadCount = settings->value(Settings::Encoder_ThreadCount).toInt(&ok);
+    if (!ok || mThreadCount < 1)
+        mThreadCount = qMax(6, QThread::idealThreadCount());
 
-    if (gain)
+    for (int i=0; i<project->count(); ++i)
     {
-        last = gain;
-        mThreads << gain;
-        connect(encoder, SIGNAL(trackReady(Track*,QString)), gain, SLOT(inputDataReady(Track*,QString)));
-    }
+        DiskPipeline * pipeline = new DiskPipeline(project->disk(i), this);
 
+        connect(pipeline, SIGNAL(readyStart()),
+                this, SLOT(startThread()));
 
-    if (nextThread)
-        connect(last, SIGNAL(trackReady(Track*,QString)), nextThread, SLOT(inputDataReady(Track*,QString)));
-    else
-        connect(last, SIGNAL(trackReady(Track*,QString)), this, SLOT(trackReady(Track*,QString)));
-}
-
-
-/************************************************
-
- ************************************************/
-bool Converter::createDirs()
-{
-    bool res = true;
-    QSet<QString> dirs;
-    foreach(ConverterThread *thread, mThreads)
-    {
-        if (!thread->workDir().isEmpty())
-            dirs << thread->workDir();
-    }
-
-    foreach(QString dirName, dirs)
-    {
-        QDir dir(dirName);
+        connect(pipeline, SIGNAL(threadFinished()),
+                this, SLOT(startThread()));
 
-        if (! dir.mkpath("."))
-        {
-            Project::error(tr("I can't create directory \"%1\".").arg(dir.path()));
-            res = false;
-            continue;
-        }
+        mDiskPiplines << pipeline;
 
-        if (!QFileInfo(dir.path()).isWritable())
+        if (!pipeline->init())
         {
-            Project::error(tr("I can't write to directory \"%1\".").arg(dir.path()));
-            res = false;
-            continue;
+            qDeleteAll(mDiskPiplines);
+            mDiskPiplines.clear();
+            emit finished();
+            return;
         }
     }
 
-    return res;
+    startThread();
 }
 
 
-
 /************************************************
 
  ************************************************/
 bool Converter::isRunning()
 {
-    foreach (QThread *thread, mThreads)
+    foreach (DiskPipeline *pipe, mDiskPiplines)
     {
-        if (thread->isRunning())
+        if (pipe->isRunning())
             return true;
     }
 
@@ -232,7 +130,7 @@
 /************************************************
 
  ************************************************/
-bool Converter::canConvert() const
+bool Converter::canConvert()
 {
     for(int i=0; i<project->count(); ++i)
     {
@@ -261,23 +159,10 @@
     if (!isRunning())
         return;
 
-    foreach(ConverterThread *thread, mThreads)
-        thread->stop();
-}
-
-
-/************************************************
-
- ************************************************/
-void Converter::threadError(Track *track, const QString &message)
-{
-    foreach(ConverterThread *thread, mThreads)
+    foreach (DiskPipeline *pipe, mDiskPiplines)
     {
-        if (thread->disk() == track->disk())
-            thread->stop();
+        pipe->stop();
     }
-
-    Project::error(message);
 }
 
 
@@ -287,123 +172,29 @@
 void Converter::startThread()
 {
     int count = mThreadCount;
-
     int splitterCount = qMax(1.0, ceil(count / 2.0));
 
-    foreach(ConverterThread *thread, mThreads)
+    foreach (DiskPipeline *pipe, mDiskPiplines)
+        count-=pipe->runningThreadCount();
+
+    foreach (DiskPipeline *pipe, mDiskPiplines)
     {
-        if (count == 0)
+        pipe->startWorker(&splitterCount, &count);
+        if (count <= 0)
             break;
-
-        if (thread->isFinished())
-            continue;
-
-        Splitter *splitter = qobject_cast<Splitter*>(thread);
-        if (splitter)
-        {
-            if (thread->isRunning())
-            {
-                count--;
-                splitterCount--;
-            }
-            else
-            {
-                if (thread->isReadyStart() and splitterCount > 0)
-                {
-                    thread->start();
-                    count--;
-                    splitterCount--;
-                }
-            }
-        }
-
-        else
-        {
-            if (thread->isRunning())
-            {
-                count--;
-            }
-            else
-            {
-                if (thread->isReadyStart())
-                {
-                    thread->start();
-                    count--;
-                }
-            }
-        }
-
     }
-}
-
 
-/************************************************
-
- ************************************************/
-void Converter::threadFinished()
-{
-    ConverterThread *thread = qobject_cast<ConverterThread*>(sender());
-    if (!thread)
-        return;
 
-    mThreads.removeAll(thread);
-    thread->deleteLater();
-
-    startThread();
-
-    if (!isRunning())
+    foreach (DiskPipeline *pipe, mDiskPiplines)
     {
-        emit finished();
-
-        if (mShowStatistic)
-        {
-            int duration = QDateTime::currentDateTime().toTime_t() - mStartTime.toTime_t();
-            if (!duration)
-                duration = 1;
-
-            int h = duration / 3600;
-            int m = (duration - (h * 3600)) / 60;
-            int s =  duration - (h * 3600) - (m * 60);
-
-            QString str;
-
-            if (h)
-                str = QString("Encoding time %4h %3m %2s [%1 sec]").arg(duration).arg(s).arg(m).arg(h);
-            else if (m)
-                str = QString("Encoding time %3m %2s [%1 sec]").arg(duration).arg(s).arg(m);
-            else
-                str = QString("Encoding time %1 sec").arg(duration);
-
-            std::cout << str.toLocal8Bit().constData() << std::endl;
-        }
-
-        qDeleteAll(mThreads);
-        mThreads.clear();
+        if (pipe->isRunning())
+            return;
     }
-}
-
-
-/************************************************
-
- ************************************************/
-void Converter::trackReady(Track *track, const QString &outFileName)
-{
-    setTrackProgress(track, Track::OK, -1);
-}
-
+    emit finished();
 
-/************************************************
-
- ************************************************/
-void Converter::setTrackProgress(Track *track, Track::Status status, int percent)
-{
-    if (track)
-        track->setProgress(status, percent);
 }
 
 
-
-
 /************************************************
 
  ************************************************/
@@ -426,3 +217,29 @@
 
     return ok;
 }
+
+
+/************************************************
+ *
+ ************************************************/
+void Converter::printStatistic()
+{
+    int duration = QDateTime::currentDateTime().toTime_t() - mStartTime.toTime_t();
+    if (!duration)
+        duration = 1;
+
+    int h = duration / 3600;
+    int m = (duration - (h * 3600)) / 60;
+    int s =  duration - (h * 3600) - (m * 60);
+
+    QString str;
+
+    if (h)
+        str = QString("Encoding time %4h %3m %2s [%1 sec]").arg(duration).arg(s).arg(m).arg(h);
+    else if (m)
+        str = QString("Encoding time %3m %2s [%1 sec]").arg(duration).arg(s).arg(m);
+    else
+        str = QString("Encoding time %1 sec").arg(duration);
+
+    std::cout << str.toLocal8Bit().constData() << std::endl;
+}

flacon-3.1.1.tar.gz/converter/converter.h -> flacon-4.0.0.tar.gz/converter/converter.h Changed

@@ -29,21 +29,20 @@
 
 #include <QObject>
 #include <QDateTime>
-#include "disk.h"
+#include <QVector>
 
+class DiskPipeline;
 class OutFormat;
-class ConverterThread;
-class Disk;
-class Track;
 
 class Converter : public QObject
 {
     Q_OBJECT
 public:
     explicit Converter(QObject *parent = 0);
+    virtual ~Converter();
 
     bool isRunning();
-    bool canConvert() const;
+    static bool canConvert();
 
     bool showStatistic() const { return mShowStatistic; }
     void setShowStatistic(bool value);
@@ -56,22 +55,17 @@
     void stop();
 
 private slots:
-    void threadError(Track *track, const QString &message);
     void startThread();
-    void threadFinished();
-    void trackReady(Track *track, const QString &outFileName);
-    void setTrackProgress(Track *track, Track::Status status, int percent);
 
 private:
     QDateTime mStartTime;
     int mThreadCount;
-    QList<ConverterThread*> mThreads;
+    QVector<DiskPipeline*> mDiskPiplines;
+
     bool mShowStatistic;
 
     bool check(OutFormat *format) const;
-    void createDiscThreads(Disk *disk, const OutFormat *format);
-    void createTrackThreads(Track *track, const OutFormat *format, ConverterThread *prevThread, ConverterThread *nextThread);
-    bool createDirs();
+    void printStatistic();
 };
 
 #endif // CONVERTER_H

flacon-4.0.0.tar.gz/converter/copycover.cpp Added

@@ -0,0 +1,119 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "copycover.h"
+#include "disk.h"
+#include <QFile>
+#include <QDir>
+#include <QImage>
+#include <QImageReader>
+#include <QImageWriter>
+
+
+/************************************************
+ *
+ ************************************************/
+CopyCover::CopyCover(const Disk *disk, const QString &outDir, const QString &outBaseName, int newSize):
+    mDisk(disk),
+    mSize(newSize),
+    mDir(outDir),
+    mBaseName(outBaseName)
+{
+}
+
+
+/************************************************
+ *
+ ************************************************/
+bool CopyCover::run()
+{
+    if (mDisk->coverImageFile().isEmpty())
+        return true;
+
+    QFileInfo inFile(mDisk->coverImageFile());
+
+    QString outName = QDir(mDir).absoluteFilePath(QString("%1.%2").arg(mBaseName).arg(inFile.suffix()));
+
+    // Keep original size, just copy file
+    if (mSize == 0)
+        return copyImage(outName);
+
+
+    // Resize
+    return resizeImage(outName);
+}
+
+
+/************************************************
+ *
+ ************************************************/
+bool CopyCover::copyImage(const QString &outFileName)
+{
+    QFile f(mDisk->coverImageFile());
+    bool res = f.copy(outFileName);
+
+    if (!res)
+        mErrorString = QObject::tr("I can't copy cover file <b>%1</b>:<br>%2").arg(outFileName, f.errorString());
+
+    return res;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+bool CopyCover::resizeImage(const QString &outFileName)
+{
+    QImageReader reader(mDisk->coverImageFile());
+    QImage img = reader.read();
+    if (img.isNull())
+    {
+        mErrorString = QObject::tr("I can't read cover image <b>%1</b>:<br>%2",
+                                   "%1 - is a file name, %2 - an error text")
+                .arg(mDisk->coverImageFile())
+                .arg(reader.errorString());
+
+        return false;
+    }
+
+    if (img.width() < mSize && img.height() < mSize )
+        return copyImage(outFileName);
+
+    img = img.scaled(QSize(mSize, mSize), Qt::KeepAspectRatio, Qt::SmoothTransformation);
+
+    QImageWriter writer(outFileName);
+    if (!writer.write(img))
+    {
+        mErrorString = QObject::tr("I can't write cover image <b>%1</b>:<br>%2",
+                                   "%1 - is file name, %2 - an error text")
+                .arg(outFileName)
+                .arg(writer.errorString());
+
+        return false;
+    }
+
+    return true;
+}

flacon-4.0.0.tar.gz/converter/copycover.h Added

@@ -0,0 +1,52 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#ifndef COPYCOVER_H
+#define COPYCOVER_H
+
+#include <QString>
+class Disk;
+
+class CopyCover
+{
+public:
+    CopyCover(const Disk *disk, const QString &outDir, const QString &outBaseName, int newSize);
+    bool run();
+
+    QString errorString() const { return mErrorString; }
+
+private:
+    const Disk *mDisk;
+    const int mSize;
+    const QString mDir;
+    const QString mBaseName;
+    QString mErrorString;
+
+    bool copyImage(const QString &outFileName);
+    bool resizeImage(const QString &outFileName);
+};
+
+#endif // COPYCOVER_H

flacon-4.0.0.tar.gz/converter/cuecreator.cpp Added

@@ -0,0 +1,224 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "cuecreator.h"
+#include "disk.h"
+
+#include <QFileInfo>
+#include <QTextCodec>
+#include <QDir>
+
+/************************************************
+
+ ************************************************/
+CueCreator::CueCreator(const Disk *disk, PreGapType preGapType):
+    mDisk(disk),
+    mPreGapType(preGapType)
+{
+    Track *track = mDisk->track(0);
+    QString fileName = QFileInfo(track->resultFilePath()).dir().absolutePath() + QDir::separator() +
+            Disk::safeString(QString("%1-%2.cue").arg(track->artist(), track->album()));
+
+    mFile.setFileName(fileName);
+    setTextCodecName("UTF-8");
+}
+
+
+/************************************************
+
+ ************************************************/
+void CueCreator::setTextCodecName(const QString codecName)
+{
+    mTextCodec = QTextCodec::codecForName(codecName.toLatin1());
+    if (!mTextCodec)
+        mTextCodec = QTextCodec::codecForName("UTF-8");
+}
+
+
+/************************************************
+
+ ************************************************/
+void CueCreator::setTextCodecMib(int mib)
+{
+    mTextCodec = QTextCodec::codecForMib(mib);
+}
+
+
+/************************************************
+
+ ************************************************/
+void CueCreator::initGlobalTags()
+{
+    QStringList tagNames;
+    tagNames << TAG_GENRE;
+    tagNames << TAG_DATE;
+    tagNames << TAG_PERFORMER;
+    tagNames << TAG_SONGWRITER;
+    tagNames << TAG_ALBUM;
+
+    Track *firstTrack = mDisk->track(0);
+
+    foreach(QString tagName, tagNames)
+    {
+        QString value = firstTrack->tag(tagName);
+
+        for (int i=1; i<mDisk->count(); ++i)
+        {
+            if (mDisk->track(i)->tag(tagName) != value)
+                value = "";
+        }
+
+        mGlobalTags.insert(tagName, value);
+    }
+}
+
+
+/************************************************
+
+ ************************************************/
+void CueCreator::writeLine(const QString &text)
+{
+    mFile.write(mTextCodec->fromUnicode(text));
+    mFile.write("\n");
+}
+
+
+/************************************************
+
+ ************************************************/
+void CueCreator::writeDiskTag(const QString &format, const QString &tagName)
+{
+    QString value = mDisk->tag(tagName);
+
+    if (!value.isEmpty())
+        writeLine(format.arg(value));
+}
+
+
+/************************************************
+
+ ************************************************/
+void CueCreator::writeGlobalTag(const QString &format, const QString &tagName)
+{
+    QString value = mGlobalTags.value(tagName);
+
+    if (!value.isEmpty())
+        writeLine(format.arg(value));
+}
+
+
+/************************************************
+
+ ************************************************/
+void CueCreator::writeTrackTag(const Track *track, const QString &prefix, const QString &tagName)
+{
+    QString value = track->tag(tagName);
+
+    if (!value.isEmpty() && value != mGlobalTags.value(tagName))
+        writeLine(prefix.arg(value));
+}
+
+/************************************************
+
+ ************************************************/
+bool CueCreator::write()
+{
+    // If the first track starts with zero second, doesn't make sense to create pregap track.
+    bool createPreGapFile = mPreGapType == PreGapType::ExtractToFile &&
+                            mDisk->track(0)->cueIndex(1).milliseconds() > 0;
+
+    if (!mFile.open(QIODevice::WriteOnly | QIODevice::Text))
+    {
+        mErrorString = QObject::tr("I can't write cue file <b>%1</b>:<br>%2").arg(mFile.fileName(), mFile.errorString());
+        return false;
+    }
+
+    initGlobalTags();
+
+    // Common ...........................
+    writeDiskTag("CATALOG %1",          TAG_CATALOG);
+    writeDiskTag("CDTEXTFILE \"%1\"",   TAG_CDTEXTFILE);
+    writeGlobalTag("REM GENRE \"%1\"",  TAG_GENRE);
+    writeGlobalTag("REM DATE %1",       TAG_DATE);
+    writeDiskTag("REM DISCID %1",       TAG_DISCID);
+    writeLine(QString("REM COMMENT \"Flacon v%1\"").arg(FLACON_VERSION));
+    writeGlobalTag("PERFORMER \"%1\"",  TAG_PERFORMER);
+    writeGlobalTag("SONGWRITER \"%1\"", TAG_SONGWRITER);
+    writeGlobalTag("TITLE \"%1\"",      TAG_ALBUM);
+
+    if (createPreGapFile)
+        writeLine(QString("FILE \"%1\" WAVE").arg(QFileInfo(mDisk->preGapTrack()->resultFilePath()).fileName()));
+    else
+        writeLine(QString("FILE \"%1\" WAVE").arg(QFileInfo(mDisk->track(0)->resultFilePath()).fileName()));
+
+    // Tracks ...........................
+    CueIndex prevIndex("00:00:00");
+    for(int i=0; i<mDisk->count(); ++i)
+    {
+        Track *track = mDisk->track(i);
+        CueIndex index0 = track->cueIndex(0);
+        CueIndex index1 = track->cueIndex(1);
+
+        writeLine(QString("  TRACK %1 AUDIO").arg(i + 1, 2, 10, QChar('0')));
+
+        writeTrackTag(track, "    FLAGS %1",     TAG_FLAGS);
+        writeTrackTag(track, "    ISRC %1",      TAG_ISRC);
+        writeTrackTag(track, "    TITLE \"%1\"", TAG_TITLE);
+
+        if( i == 0)
+        {
+            if (createPreGapFile)
+            {
+                writeLine(QString("    INDEX 00 %1").arg("00:00:00"));
+                writeLine(QString("FILE \"%1\" WAVE").arg(QFileInfo(track->resultFileName()).fileName()));
+                writeLine(QString("    INDEX 01 %1").arg("00:00:00"));
+            }
+            else
+            {
+                writeLine(QString("    INDEX 00 %1").arg("00:00:00"));
+                writeLine(QString("    INDEX 01 %1").arg(index1.toString()));
+            }
+        }
+        else
+        {
+            if (!index0.isNull())
+                writeLine(QString("    INDEX 00 %1").arg((index0 - prevIndex).toString()));
+
+            prevIndex = index1;
+            writeLine(QString("FILE \"%1\" WAVE").arg(QFileInfo(track->resultFileName()).fileName()));
+            writeLine(QString("    INDEX 01 %1").arg("00:00:00"));
+
+        }
+
+        writeTrackTag(track, "    REM GENRE \"%1\"",  TAG_GENRE);
+        writeTrackTag(track, "    REM DATE %1",       TAG_DATE);
+        writeTrackTag(track, "    PERFORMER \"%1\"",  TAG_PERFORMER);
+        writeTrackTag(track, "    SONGWRITER \"%1\"", TAG_SONGWRITER);
+    }
+
+    mFile.close();
+    return true;
+}

flacon-4.0.0.tar.gz/converter/cuecreator.h Added

@@ -0,0 +1,67 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#ifndef CUECREATOR_H
+#define CUECREATOR_H
+
+#include "types.h"
+#include <QFile>
+#include <QString>
+#include <QHash>
+
+
+class Disk;
+class Track;
+
+class CueCreator
+{
+public:
+    explicit CueCreator(const Disk *disk, PreGapType preGapType);
+    bool write();
+
+    QString errorString() const { return mErrorString; }
+
+    QTextCodec *textCodec() const { return mTextCodec; }
+    void setTextCodecName(const QString codecName);
+    void setTextCodecMib(int mib);
+
+private:
+    const Disk *mDisk;
+    const PreGapType mPreGapType;
+    QFile mFile;
+    QString mErrorString;
+    QTextCodec *mTextCodec;
+    QHash<QString, QString>mGlobalTags;
+
+    void initGlobalTags();
+    void writeLine(const QString &text);
+    void writeDiskTag(const QString &format, const QString &tagName);
+    void writeGlobalTag(const QString &format, const QString &tagName);
+    void writeTrackTag(const Track *track, const QString &prefix, const QString &tagName);
+
+};
+
+#endif // CUECREATOR_H

flacon-3.1.1.tar.gz/converter/decoder.cpp -> flacon-4.0.0.tar.gz/converter/decoder.cpp Changed

@@ -188,6 +188,26 @@
     {
         mProcess->terminate();
         mProcess->waitForFinished();
+        mProcess->close();
+    }
+}
+
+
+
+/************************************************
+ *
+ ************************************************/
+void mustWrite(const char *buf, qint64 maxSize, QIODevice *outDevice)
+{
+    qint64 done = 0;
+    while (done < maxSize)
+    {
+        outDevice->waitForBytesWritten(10000);
+        qint64 n = outDevice->write(buf + done, maxSize - done);
+        if (n < 0)
+            throw QString("Can't write %1 bytes. %2").arg(maxSize - done).arg(outDevice->errorString());
+
+        done += n;
     }
 }
 
@@ -224,16 +244,10 @@
         // Skip bytes from current to start of track ......
         qint64 len = bs - mPos;
         if (len < 0)
-        {
-            mErrorString = "[Decoder] Incorrect start time.";
-            return false;
-        }
+            throw "Incorrect start time.";
 
         if (!mustSkip(input, len))
-        {
-            mErrorString = "[Decoder] Can't skip to start of track.";
-            return false;
-        }
+            throw "Can't skip to start of track.";
 
         pos += len;
         // Skip bytes from current to start of track ......
@@ -241,33 +255,29 @@
         // Read bytes from start to end of track ..........
         len = be - bs;
         if (len < 0)
-        {
-            mErrorString = "[Decoder] Incorrect start or end time.";
-            return false;
-        }
-
+            throw "Incorrect start or end time.";
 
         pos += len;
         qint64 remains = len;
         int percent = 0;
 
         char buf[MAX_BUF_SIZE];
-        while (remains > 0)// input->bytesAvailable() || input->waitForReadyRead(1000))
+        while (remains > 0)
         {
-            input->bytesAvailable() || input->waitForReadyRead(1000);
+            input->bytesAvailable() || input->waitForReadyRead(10000);
 
-            int n = qMin(qint64(MAX_BUF_SIZE), remains);
+            qint64 n = qMin(qint64(MAX_BUF_SIZE), remains);
             n = input->read(buf, n);
-            remains -= n;
+            if (n<0)
+                throw QString("Can't read %1 bytes").arg(remains);
 
-            if (outDevice->write(buf, n) != n)
-            {
-                mErrorString = "[Decoder] " + outDevice->errorString();
-                return false;
-            }
+            remains -= n;
 
+            // Write to OutDevice .........................
+            mustWrite(buf, n, outDevice);
 
 
+            // Calc progrress .............................
             if (remains == 0)
             {
                 emit progress(100);
@@ -288,6 +298,12 @@
         return true;
     }
 
+    catch (QString &err)
+    {
+        mErrorString = "[Decoder] " + QString(err);
+        return false;
+    }
+
     catch (char const *err)
     {
         mErrorString = "[Decoder] " + QString(err);

flacon-3.1.1.tar.gz/converter/decoder.h -> flacon-4.0.0.tar.gz/converter/decoder.h Changed

flacon-4.0.0.tar.gz/converter/diskpipline.cpp Added

@@ -0,0 +1,608 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "diskpipline.h"
+#include "splitter.h"
+#include "encoder.h"
+#include "gain.h"
+#include "cuecreator.h"
+#include "copycover.h"
+#include "project.h"
+#include "settings.h"
+#include "outformat.h"
+
+
+#include <QThread>
+#include <QDebug>
+#include <QDir>
+#include <QFileInfo>
+#include <QCoreApplication>
+
+
+/************************************************
+ *
+ ************************************************/
+class WorkerThread: public QThread
+{
+public:
+    explicit WorkerThread(Worker *worker, QObject *parent = nullptr):
+        QThread(parent),
+        mWorker(worker)
+    {
+        worker->moveToThread(this);
+    }
+
+    virtual ~WorkerThread()
+    {
+        quit();
+        if (!wait(3000))
+        {
+            qWarning() << "Can't quit from thread" << mWorker;
+            terminate();
+            if (!wait(3000))
+                qWarning() << "Can't terminate from thread" << mWorker;
+        }
+        mWorker->deleteLater();
+    }
+
+    void run()
+    {
+        mWorker->run();
+    }
+
+
+private:
+    Worker *mWorker;
+};
+
+
+/************************************************
+ *
+ ************************************************/
+class DiskPipeline::Data
+{
+public:
+    Data():
+        pipeline(nullptr),
+        disk(nullptr),
+        needStartSplitter(true),
+        interrupted(false),
+        preGapType(PreGapType::Skip)
+    {
+    }
+
+    DiskPipeline *pipeline;
+    const Disk *disk;
+    QList<const Track*> tracks;
+    bool needStartSplitter;
+    QHash<const Track*, Track::Status> trackStatuses;
+    QList<WorkerRequest> encoderRequests;
+    QList<WorkerRequest> gainRequests;
+    bool interrupted;
+    QString workDir;
+    PreGapType preGapType;
+
+
+    void interrupt(Track::Status status);
+    void startSplitterThread();
+    void startEncoderThread(const WorkerRequest &req);
+    void startTrackGainThread(const WorkerRequest &req);
+    void startAlbumGainThread(QList<WorkerRequest> &reqs);
+    bool createDir(const QString &dirName) const;
+    bool createCue() const;
+    bool copyCoverImage() const;
+};
+
+
+
+/************************************************
+ *
+ ************************************************/
+bool DiskPipeline::Data::createDir(const QString &dirName) const
+{
+    QDir dir(dirName);
+
+    if (! dir.mkpath("."))
+    {
+        Project::error(QObject::tr("I can't create directory \"%1\".").arg(dir.path()));
+        return false;
+    }
+
+    if (!QFileInfo(dir.path()).isWritable())
+    {
+        Project::error(QObject::tr("I can't write to directory \"%1\".").arg(dir.path()));
+        return false;
+    }
+
+    return true;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+DiskPipeline::DiskPipeline(const Disk *disk, QObject *parent) :
+    QObject(parent),
+    mData(new Data()),
+    mTmpDir(nullptr)
+{
+    mData->pipeline = this;
+    mData->disk = disk;
+    mData->preGapType =  settings->createCue() ? settings->preGapType() : PreGapType::Skip;
+
+
+
+}
+
+
+/************************************************
+
+ ************************************************/
+DiskPipeline::~DiskPipeline()
+{
+    delete mData;
+    delete mTmpDir;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+bool DiskPipeline::init()
+{
+    if (!settings->tmpDir().isEmpty())
+    {
+        if (!mData->createDir(settings->tmpDir()))
+            return false;
+        mTmpDir = new QTemporaryDir(QString("%1/flacon.").arg(settings->tmpDir()));
+        mTmpDir->setAutoRemove(true);
+        mData->workDir = mTmpDir->path();
+    }
+    else
+        mData->workDir = QFileInfo(mData->disk->track(0)->resultFilePath()).dir().absolutePath();
+
+    Splitter splitter(mData->disk, mData->workDir, mData->preGapType);
+    mData->tracks = splitter.tracks();
+
+    foreach (const Track *track, mData->tracks)
+    {
+        mData->trackStatuses.insert(track, Track::NotRunning);
+    }
+
+    if (!mData->createDir(mData->workDir))
+        return false;
+
+    foreach (const Track *track, mData->tracks)
+    {
+        QString dir = QFileInfo(track->resultFilePath()).absoluteDir().path();
+        if (!mData->createDir(dir))
+            return false;
+    }
+
+    return true;
+}
+
+
+/************************************************
+ CREATE WORKER CHAINS
+ ************************************************
+              +--> Encoder ---> Track gain -->+
+   Splitter ->+            ...                +-> Album gain --> this
+              +--> Encoder ---> Track gain -->+
+
+                                optional step    optional step
+
+ ************************************************/
+void DiskPipeline::startWorker(int *splitterCount, int *count)
+{
+    if (mData->interrupted)
+        return;
+
+    if (*count <= 0)
+        return;
+
+    if (*splitterCount > 0 && mData->needStartSplitter)
+    {
+        mData->startSplitterThread();
+        --(*splitterCount);
+        --(*count);
+        return;
+    }
+
+    if (settings->outFormat()->gainType() == GainType::Track)
+    {
+        while (*count > 0 && !mData->gainRequests.isEmpty())
+        {
+            mData->startTrackGainThread(mData->gainRequests.takeFirst());
+            --(*count);
+        }
+    }
+    else if (settings->outFormat()->gainType() == GainType::Album)
+    {
+        if (*count > 0 && mData->gainRequests.count() == mData->tracks.count())
+        {
+            mData->startAlbumGainThread(mData->gainRequests);
+            mData->gainRequests.clear();
+            --(*count);
+        }
+    }
+
+    while (*count > 0 && !mData->encoderRequests.isEmpty())
+    {
+        mData->startEncoderThread(mData->encoderRequests.takeFirst());
+        --(*count);
+    }
+}
+
+
+/************************************************
+ *
+ ************************************************/
+bool DiskPipeline::Data::createCue() const
+{
+    if (!settings->createCue())
+        return true;
+
+    CueCreator cue(disk, preGapType);
+    if (!cue.write())
+    {
+        pipeline->trackError(tracks.first(), cue.errorString());
+        return false;
+    }
+
+    return true;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+bool DiskPipeline::Data::copyCoverImage() const
+{
+    CoverMode mode = settings->coverMode();
+
+    if (mode == CoverMode::Disable)
+        return true;
+
+    int size = 0;
+    if (mode == CoverMode::Scale)
+        size = settings->coverImageSize();
+
+    QString dir = QFileInfo(disk->track(0)->resultFilePath()).dir().absolutePath();
+
+    CopyCover copyCover(disk, dir, "cover", size);
+    bool res = copyCover.run();
+
+    if (!res)
+        Project::error(copyCover.errorString());
+
+    return res;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void DiskPipeline::Data::startSplitterThread()
+{
+    Splitter *worker = new Splitter(disk, workDir, preGapType);
+
+    WorkerThread *thread = new WorkerThread(worker, pipeline);
+
+    connect(pipeline, SIGNAL(threadQuit()),
+            thread,   SLOT(terminate()));
+
+    connect(worker,   SIGNAL(trackProgress(const Track*,Track::Status,int)),
+            pipeline, SLOT(trackProgress(const Track*,Track::Status,int)));
+
+    connect(worker,   SIGNAL(error(const Track*,QString)),
+            pipeline, SLOT(trackError(const Track*,QString)));
+
+    connect(worker,   SIGNAL(trackReady(const Track*,QString)),
+            pipeline, SLOT(addEncoderRequest(const Track*,QString)));
+
+    connect(thread,   SIGNAL(finished()),
+            pipeline, SIGNAL(threadFinished()));
+
+    pipeline->mThreads << thread;
+    thread->start();
+
+    needStartSplitter = false;
+    trackStatuses.insert(disk->track(0), Track::Splitting);
+
+    createCue();
+    copyCoverImage();
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void DiskPipeline::Data::startEncoderThread(const WorkerRequest &req)
+{
+    Encoder *worker = new Encoder(req, settings->outFormat());
+    WorkerThread *thread = new WorkerThread(worker, pipeline);
+
+    connect(pipeline, SIGNAL(threadQuit()),
+            thread,   SLOT(terminate()));
+
+    connect(worker,   SIGNAL(trackProgress(const Track*,Track::Status,int)),
+            pipeline, SLOT(trackProgress(const Track*,Track::Status,int)));
+
+    connect(worker, SIGNAL(error(const Track*,QString)),
+            pipeline, SLOT(trackError(const Track*,QString)));
+
+    if (settings->outFormat()->gainType() == GainType::Disable)
+    {
+        connect(worker, SIGNAL(trackReady(const Track*,QString)),
+                pipeline, SLOT(trackDone(const Track*,QString)));
+    }
+    else
+    {
+        connect(worker, SIGNAL(trackReady(const Track*,QString)),
+                pipeline, SLOT(addGainRequest(const Track*,QString)));
+    }
+
+    connect(thread,   SIGNAL(finished()),
+            pipeline, SIGNAL(threadFinished()));
+
+    pipeline->mThreads << thread;
+    thread->start();
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void DiskPipeline::Data::startTrackGainThread(const WorkerRequest &req)
+{
+    Gain *worker = new Gain(req, settings->outFormat());
+    WorkerThread *thread = new WorkerThread(worker, pipeline);
+
+    connect(pipeline, SIGNAL(threadQuit()),
+            thread,   SLOT(terminate()));
+
+    connect(worker,   SIGNAL(trackProgress(const Track*,Track::Status,int)),
+            pipeline, SLOT(trackProgress(const Track*,Track::Status,int)));
+
+    connect(worker,   SIGNAL(error(const Track*,QString)),
+            pipeline, SLOT(trackError(const Track*,QString)));
+
+    connect(worker,   SIGNAL(trackReady(const Track*,QString)),
+            pipeline, SLOT(trackDone(const Track*,QString)));
+
+    connect(thread,   SIGNAL(finished()),
+            pipeline, SIGNAL(threadFinished()));
+
+    pipeline->mThreads << thread;
+    thread->start();
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void DiskPipeline::Data::startAlbumGainThread(QList<WorkerRequest> &reqs)
+{
+    Gain *worker = new Gain(reqs, settings->outFormat());
+    WorkerThread *thread = new WorkerThread(worker, pipeline);
+
+    connect(pipeline, SIGNAL(threadQuit()),
+            thread,   SLOT(terminate()));
+
+    connect(worker,   SIGNAL(trackProgress(const Track*,Track::Status,int)),
+            pipeline, SLOT(trackProgress(const Track*,Track::Status,int)));
+
+    connect(worker,   SIGNAL(error(const Track*,QString)),
+            pipeline, SLOT(trackError(const Track*,QString)));
+
+    connect(worker,   SIGNAL(trackReady(const Track*,QString)),
+            pipeline, SLOT(trackDone(const Track*,QString)));
+
+    connect(thread,   SIGNAL(finished()),
+            pipeline, SIGNAL(threadFinished()));
+
+    pipeline->mThreads << thread;
+    thread->start();
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void DiskPipeline::addEncoderRequest(const Track *track, const QString &inputFile)
+{
+    trackProgress(track, Track::Queued, 0);
+    QFileInfo trackFile(track->resultFilePath());
+    QString outFile = trackFile.dir().filePath(
+                QFileInfo(inputFile).baseName() +
+                ".encoded." +
+                trackFile.suffix());
+
+    mData->encoderRequests << WorkerRequest(track, inputFile, outFile);
+    emit readyStart();
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void DiskPipeline::addGainRequest(const Track *track, const QString &fileName)
+{
+    if (settings->outFormat()->gainType() == GainType::Album)
+        trackProgress(track, Track::WaitGain, 0);
+    else
+        trackProgress(track, Track::Queued, 0);
+
+    mData->gainRequests << WorkerRequest(track, fileName, fileName);
+    emit readyStart();
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void DiskPipeline::trackDone(const Track *track, const QString &outFileName)
+{
+    // Track is ready, rename the file to the final name.
+    QFile::remove(track->resultFilePath());
+    QFile(outFileName).rename(track->resultFilePath());
+
+
+    mData->trackStatuses.insert(track, Track::OK);
+    const_cast<Track*>(track)->setProgress(Track::OK);
+
+    emit threadFinished();
+
+    if (!isRunning())
+        emit finished();
+}
+
+
+/************************************************
+
+ ************************************************/
+void DiskPipeline::Data::interrupt(Track::Status status)
+{
+    interrupted = true;
+    encoderRequests.clear();
+
+    QHash<const Track*, Track::Status>::iterator it;
+    for (it = trackStatuses.begin(); it != trackStatuses.end(); ++it)
+    {
+        switch (it.value())
+        {
+        case Track::Splitting:
+        case Track::Encoding:
+        case Track::Queued:
+        case Track::WaitGain:
+        case Track::CalcGain:
+        case Track::WriteGain:
+        case Track::NotRunning:
+            it.value() = status;
+            const_cast<Track*>(it.key())->setProgress(status);
+            break;
+
+
+        case Track::Canceled:
+        case Track::Error:
+        case Track::Aborted:
+        case Track::OK:
+            break;
+        }
+    }
+}
+
+
+/************************************************
+
+ ************************************************/
+void DiskPipeline::stop()
+{
+    mData->interrupt(Track::Aborted);
+    emit threadQuit();
+    emit threadFinished();
+
+    emit finished();
+}
+
+
+/************************************************
+
+ ************************************************/
+void DiskPipeline::trackError(const Track *track, const QString &message)
+{
+    mData->trackStatuses.insert(track, Track::Error);
+    const_cast<Track*>(track)->setProgress(Track::Error);
+    mData->interrupt(Track::Aborted);
+    emit threadQuit();
+    emit threadFinished();
+
+    emit finished();
+    Project::error(message);
+}
+
+
+/************************************************
+
+ ************************************************/
+bool DiskPipeline::isRunning() const
+{
+    QHash<const Track*, Track::Status>::const_iterator it;
+    for (it = mData->trackStatuses.begin(); it != mData->trackStatuses.end(); ++it)
+    {
+        switch (it.value())
+        {
+        case Track::Splitting:
+        case Track::Encoding:
+        case Track::Queued:
+        case Track::WaitGain:
+        case Track::CalcGain:
+        case Track::WriteGain:
+            return true;
+
+        case Track::NotRunning:
+        case Track::Canceled:
+        case Track::Error:
+        case Track::Aborted:
+        case Track::OK:
+            break;
+        }
+    }
+
+    return false;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+int DiskPipeline::runningThreadCount() const
+{
+    int res = 0;
+    foreach (WorkerThread *thread, mThreads)
+    {
+        if (thread->isRunning())
+            ++res;
+    }
+    return res;
+}
+
+
+/************************************************
+
+ ************************************************/
+void DiskPipeline::trackProgress(const Track *track, Track::Status status, int percent)
+{
+    if (mData->interrupted)
+        return;
+
+    if (!track)
+        return;
+
+    mData->trackStatuses.insert(track, status);
+    const_cast<Track*>(track)->setProgress(status, percent);
+}

flacon-4.0.0.tar.gz/converter/diskpipline.h Added

@@ -0,0 +1,72 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#ifndef DISKPIPLINE_H
+#define DISKPIPLINE_H
+
+#include <QObject>
+#include <QTemporaryDir>
+#include "track.h"
+
+class Disk;
+class Project;
+class WorkerThread;
+
+class DiskPipeline : public QObject
+{
+    Q_OBJECT
+public:
+    explicit DiskPipeline(const Disk *disk, QObject *parent = 0);
+    virtual ~DiskPipeline();
+
+    bool init();
+    void startWorker(int *splitterCount, int *count);
+    void stop();
+    bool isRunning() const;
+    int runningThreadCount() const;
+
+signals:
+    void readyStart();
+    void threadFinished();
+    void finished();
+    void threadQuit();
+
+private slots:
+    void trackProgress(const Track *track, Track::Status status, int percent);
+    void trackError(const Track *track, const QString &message);
+
+    void addEncoderRequest(const Track *track, const QString &inputFile);
+    void addGainRequest(const Track *track, const QString &fileName);
+    void trackDone(const Track *track, const QString &outFileName);
+
+private:
+    class Data;
+    Data *mData;
+    QTemporaryDir *mTmpDir;
+    QVector<WorkerThread*> mThreads;
+};
+
+#endif // DISKPIPLINE_H

flacon-3.1.1.tar.gz/converter/encoder.cpp -> flacon-4.0.0.tar.gz/converter/encoder.cpp Changed

@@ -29,136 +29,96 @@
 
 #include <QFileInfo>
 #include <QDir>
-#include <QProcess>
+#include <QDebug>
 
-/************************************************
 
+/************************************************
+ *
  ************************************************/
-Encoder::Encoder(const OutFormat *format, Track *track, QObject *parent):
-    ConverterThread(track->disk(), format, parent),
-    mTrack(track),
-    mProcess(0),
+Encoder::Encoder(const WorkerRequest request, const OutFormat *format, QObject *parent):
+    Worker(parent),
+    mRequest(request),
+    mFormat(format),
     mTotal(0),
     mReady(0),
     mProgress(0)
 {
-    mWorkDir = QFileInfo(track->resultFilePath()).dir().absolutePath();
-    mOutFile = track->resultFilePath();
-    mReadyStart = false;
 
-    mDebug = QProcessEnvironment::systemEnvironment().contains("FLACON_DEBUG_ENCODER");
 }
 
 
 /************************************************
 
  ************************************************/
-Encoder::~Encoder()
+void Encoder::run()
 {
-}
-
-
-/************************************************
+    bool debug  = QProcessEnvironment::systemEnvironment().contains("FLACON_DEBUG_ENCODER");
 
- ************************************************/
-void Encoder::inputDataReady(Track *track, const QString &fileName)
-{
-    if (track != this->track())
+    // Input file already WAV, so for WAV output format we just rename file.
+    if (mFormat->id() == "WAV")
+    {
+        runWav();
         return;
+    }
 
-    mReadyStart = true;
-    mInputFile = fileName;
+    QProcess process;
+    QStringList args = mFormat->encoderArgs(mRequest.track(), QDir::toNativeSeparators(mRequest.outFile()));
+    QString prog = args.takeFirst();
 
-    emit trackProgress(track, Track::Queued);
-    emit readyStart();
-}
+    if (debug)
+        debugArguments(prog, args);
 
+    connect(&process, SIGNAL(bytesWritten(qint64)),
+            this, SLOT(processBytesWritten(qint64)));
 
-/************************************************
+    process.start(QDir::toNativeSeparators(prog), args);
+    process.waitForStarted();
 
- ************************************************/
-void Encoder::doStop()
-{
-    if (mProcess)
+    readInputFile(&process);
+    process.closeWriteChannel();
+
+    process.waitForFinished(-1);
+    if (process.exitCode() != 0)
     {
-        mProcess->closeReadChannel(QProcess::StandardError);
-        mProcess->closeReadChannel(QProcess::StandardOutput);
-        mProcess->closeWriteChannel();
-        mProcess->terminate();
+        QTextStream(stderr) << "Encoder command: ";
+        debugArguments(prog, args);
+        QString msg = tr("Encoder error:\n") +
+                QString::fromLocal8Bit(process.readAllStandardError());
+        error(mRequest.track(), msg);
     }
-}
 
+    deleteFile(mRequest.inputFile());
 
-/************************************************
-
- ************************************************/
-void Encoder::run()
-{
-    ConverterThread::run();
-    emit trackReady(mTrack, mOutFile);
+    emit trackReady(mRequest.track(), mRequest.outFile());
 }
 
 
-
 /************************************************
 
  ************************************************/
-void Encoder::doRun()
+void Encoder::processBytesWritten(qint64 bytes)
 {
+    mReady += bytes;
+    int p = ((mReady * 100.0) / mTotal);
+    if (p != mProgress)
     {
-        QFile f(outFile());
-
-        if (f.exists() && !f.remove())
-        {
-            error(track(), tr("I can't delete file:\n%1\n%2").arg(f.fileName()).arg(f.errorString()));
-            return;
-        }
-    }
-
-
-    QStringList args = format()->encoderArgs(track(), QDir::toNativeSeparators(outFile()));
-    QString prog = args.takeFirst();
-
-    if (mDebug)
-        debugArguments(prog, args);
-
-    mProcess = new QProcess();
-    connect(mProcess, SIGNAL(bytesWritten(qint64)), this, SLOT(processBytesWritten(qint64)));
-
-    mProcess->start(QDir::toNativeSeparators(prog), args);
-    mProcess->waitForStarted();
-
-    readInputFile();
-    mProcess->closeWriteChannel();
-
-    mProcess->waitForFinished(-1);
-    if (mProcess->exitCode() != 0)
-    {
-        debugArguments(prog, args);
-        QString msg = tr("Encoder error:\n") +
-                QString::fromLocal8Bit(mProcess->readAllStandardError());
-        error(track(), msg);
+        mProgress = p;
+        emit trackProgress(mRequest.track(), Track::Encoding, mProgress);
     }
-
-    QProcess *proc = mProcess;
-    mProcess = 0;
-    delete proc;
-
-    deleteFile(inputFile());
 }
 
+
 /************************************************
 
  ************************************************/
-void Encoder::readInputFile()
+void Encoder::readInputFile(QProcess *process)
 {
-    QFile file(mInputFile);
-    if (!file.open(QFile::ReadOnly)) // | QFile::Unbuffered))
+    QFile file(mRequest.inputFile());
+    if (!file.open(QFile::ReadOnly))
     {
-        error(track(), tr("I can't read %1 file", "Encoder error. %1 is a file name.").arg(mInputFile));
+        error(mRequest.track(), tr("I can't read %1 file", "Encoder error. %1 is a file name.").arg(mRequest.inputFile()));
     }
 
-    mReady = 0;
     mProgress = -1;
     mTotal = file.size();
 
@@ -168,20 +128,28 @@
     while (!file.atEnd())
     {
         buf = file.read(bufSize);
-        mProcess->write(buf);
+        process->write(buf);
     }
 }
 
+
 /************************************************
 
  ************************************************/
-void Encoder::processBytesWritten(qint64 bytes)
+void Encoder::runWav()
 {
-    mReady += bytes;
-    int p = ((mReady * 100.0) / mTotal);
-    if (p != mProgress)
+    QFile srcFile(mRequest.inputFile());
+    bool res =  srcFile.rename(mRequest.outFile());
+
+    if (!res)
     {
-        mProgress = p;
-        emit trackProgress(track(), Track::Encoding, mProgress);
+        error(mRequest.track(),
+              tr("I can't rename file:\n%1 to %2\n%3").arg(
+                  mRequest.inputFile(),
+                  mRequest.outFile(),
+                  srcFile.errorString()));
     }
+
+    emit trackProgress(mRequest.track(), Track::Encoding, 100);
+    emit trackReady(mRequest.track(), mRequest.outFile());
 }

flacon-3.1.1.tar.gz/converter/encoder.h -> flacon-4.0.0.tar.gz/converter/encoder.h Changed

@@ -27,51 +27,41 @@
 
 #define ENCODER_H
 
-#include "converterthread.h"
+#include <QProcess>
+
+#include "worker.h"
 
-class OutFormat;
 class QProcess;
+class OutFormat;
 
-class Encoder: public ConverterThread
+class Encoder: public Worker
 {
     Q_OBJECT
 public:
-    explicit Encoder(const OutFormat *format, Track *track, QObject *parent = 0);
-    virtual ~Encoder();
+    Encoder(const WorkerRequest request, const OutFormat *format, QObject *parent = 0);
 
-    QString workDir() const { return mWorkDir; }
-    Track *track() const  { return mTrack; }
-    QString inputFile() const { return mInputFile; }
     QString outFile() const { return mOutFile; }
 
-    bool isReadyStart() const { return mReadyStart; }
-
 public slots:
-    void inputDataReady(Track *track, const QString &fileName);
+    void run() override;
+
+signals:
 
-protected:
-    void run();
-    void doRun();
-    void doStop();
 
 private slots:
     void processBytesWritten(qint64 bytes);
 
+
 private:
-    Track *mTrack;
-    QString mWorkDir;
-    QString mInputFile;
+    const WorkerRequest mRequest;
+    const OutFormat *mFormat;
     QString mOutFile;
-    bool mReadyStart;
-    QProcess *mProcess;
-
     int mTotal;
     int mReady;
     int mProgress;
-    bool mDebug;
 
-    void readInputFile();
-    void readInputFile2(FILE *proc);
+    void readInputFile(QProcess *process);
+    void runWav();
 };
 
 #endif // ENCODER_H

flacon-3.1.1.tar.gz/converter/gain.cpp -> flacon-4.0.0.tar.gz/converter/gain.cpp Changed

@@ -29,114 +29,69 @@
 
 #include <QProcess>
 #include <QDir>
+#include <QTextStream>
+#include <QDebug>
 
 /************************************************
-
- ************************************************/
-Gain::Gain(const OutFormat *format, Disk *disk, Track *track, QObject *parent):
-    ConverterThread(disk, format, parent),
-    mProcess(0)
-{
-    if (track)
-    {
-        mTracks << track;
-    }
-    else
-    {
-        for(int i=0; i<disk->count(); ++i)
-            mTracks << disk->track(i);
-    }
-
-    mDebug = QProcessEnvironment::systemEnvironment().contains("FLACON_DEBUG_GAIN");
-}
-
-
-/************************************************
-
+ *
  ************************************************/
-Gain::~Gain()
+Gain::Gain(const WorkerRequest request, const OutFormat *format, QObject *parent):
+    Worker(parent),
+    mFormat(format)
 {
+    mRequests << request;
 }
 
 
 /************************************************
-
+ *
  ************************************************/
-bool Gain::isReadyStart() const
+Gain::Gain(const QList<WorkerRequest> &requests, const OutFormat *format, QObject *parent):
+    Worker(parent),
+    mFormat(format)
 {
-    return mInputFiles.count() == mTracks.count();
+    mRequests << requests;
 }
 
 
 /************************************************
-
+ *
  ************************************************/
-void Gain::inputDataReady(Track *track, const QString &fileName)
+void Gain::run()
 {
-    if (!mTracks.contains(track))
-        return;
-
-    mInputFiles.insert(track, fileName);
-    emit trackProgress(track, Track::WaitGain, -1);
+    bool debug = QProcessEnvironment::systemEnvironment().contains("FLACON_DEBUG_GAIN");
 
-    if (isReadyStart())
-        emit readyStart();
-}
+    foreach (WorkerRequest req, mRequests)
+        emit trackProgress(req.track(), Track::CalcGain, 0);
 
 
-/************************************************
-
- ************************************************/
-void Gain::doRun()
-{
-    foreach(Track *track, mTracks)
-        emit trackProgress(track, Track::CalcGain);
-
     QStringList files;
-    QHashIterator<Track*, QString> i(mInputFiles);
-    while (i.hasNext()) {
-        i.next();
-        files << QDir::toNativeSeparators(i.value());
-    }
+    foreach (WorkerRequest req, mRequests)
+        files << QDir::toNativeSeparators(req.inputFile());
 
-    QStringList args = format()->gainArgs(files);
+    QStringList args = mFormat->gainArgs(files);
     QString prog = args.takeFirst();
 
-    if (mDebug)
+    if (debug)
         debugArguments(prog, args);
 
-    mProcess = new QProcess();
+    QProcess process;
 
-    mProcess->start(prog, args);
-    mProcess->waitForFinished(-1);
+    process.start(prog, args);
+    process.waitForFinished(-1);
 
-    if (mProcess->exitCode() != 0)
+    if (process.exitCode() != 0)
     {
+        QTextStream(stderr) << "Gain command: ";
         debugArguments(prog, args);
         QString msg = tr("Gain error:\n") +
-                QString::fromLocal8Bit(mProcess->readAllStandardError());
-        error(mTracks.first(), msg);
+                QString::fromLocal8Bit(process.readAllStandardError());
+        error(mRequests.first().track(), msg);
     }
 
-    QProcess *proc = mProcess;
-    mProcess = 0;
-    delete proc;
-
-    foreach(Track *track, mTracks)
-        emit trackReady(track, mInputFiles.value(track));
-}
-
-
-/************************************************
-
- ************************************************/
-void Gain::doStop()
-{
-    if (mProcess)
+    foreach (WorkerRequest req, mRequests)
     {
-        mProcess->closeReadChannel(QProcess::StandardError);
-        mProcess->closeReadChannel(QProcess::StandardOutput);
-        mProcess->closeWriteChannel();
-        mProcess->terminate();
+        emit trackProgress(req.track(), Track::WriteGain, 100);
+        emit trackReady(req.track(), req.inputFile());
     }
 }

flacon-3.1.1.tar.gz/converter/gain.h -> flacon-4.0.0.tar.gz/converter/gain.h Changed

@@ -27,37 +27,26 @@
 #ifndef GAIN_H
 #define GAIN_H
 
-#include "converterthread.h"
+#include "worker.h"
 #include <QList>
 
 class Disk;
 class Track;
 class OutFormat;
-class QProcess;
 
-class Gain: public ConverterThread
+class Gain: public Worker
 {
     Q_OBJECT
 public:
-    explicit Gain(const OutFormat *format, Disk *disk, Track *track, QObject *parent = 0);
-    virtual ~Gain();
+    explicit Gain(const WorkerRequest request, const OutFormat *format, QObject *parent = 0);
+    explicit Gain(const QList<WorkerRequest> &requests, const OutFormat *format, QObject *parent = 0);
 
-    bool isReadyStart() const;
-
-    QList<Track*> tracks() const { return mTracks; }
-
-public slots:
-    void inputDataReady(Track *track, const QString &fileName);
-
-protected:
-    void doRun();
-    void doStop();
+    void run() override;
 
 private:
-    QList<Track*> mTracks;
-    QHash<Track*, QString> mInputFiles;
-    QProcess *mProcess;
-    bool mDebug;
+    QList<WorkerRequest> mRequests;
+    const OutFormat *mFormat;
 };
 
+
 #endif // GAIN_H

flacon-3.1.1.tar.gz/converter/splitter.cpp -> flacon-4.0.0.tar.gz/converter/splitter.cpp Changed

@@ -25,398 +25,145 @@
 
 
 #include "splitter.h"
-#include "settings.h"
-#include "project.h"
 #include "disk.h"
-#include "inputaudiofile.h"
 #include "decoder.h"
 
-#include <iostream>
-#include <QFileInfo>
 #include <QDir>
-#include <QCoreApplication>
-#include <QProcess>
-#include <QRegExp>
-#include <QTextCodec>
 #include <QUuid>
 #include <QDebug>
 
-//#define DEBUG_CUE_ON
-
-#ifdef DEBUG_CUE_ON
-#define DEBUG_CUE qDebug()
-#else
-#define DEBUG_CUE QT_NO_QDEBUG_MACRO()
-#endif
-
-class CueCreator
-{
-public:
-    explicit CueCreator(Disk *disk);
-    bool write();
-
-    QString errorString() const { return mErrorString; }
-
-    QTextCodec *textCodec() const { return mTextCodec; }
-    void setTextCodecName(const QString codecName);
-    void setTextCodecMib(int mib);
-
-    bool hasPreGapFile() const { return mHasPreGapFile; }
-    void setHasPregapFile(bool value) { mHasPreGapFile = value; }
-
-private:
-    Disk *mDisk;
-    QFile mFile;
-    bool mHasPreGapFile;
-    QString mErrorString;
-    QTextCodec *mTextCodec;
-    QHash<QString, QString>mGlobalTags;
-
-    void initGlobalTags();
-    void writeLine(const QString &text);
-    void writeDiskTag(const QString &format, const QString &tagName);
-    void writeGlobalTag(const QString &format, const QString &tagName);
-    void writeTrackTag(const Track *track, const QString &prefix, const QString &tagName);
-
-};
-
-/************************************************
-
- ************************************************/
-Splitter::Splitter(Disk *disk, const OutFormat *format, QObject *parent):
-    ConverterThread(disk, format, parent),
-    mProcess(0),
-    mTrack(NULL)
-{    
-    QString tmpDir = settings->value(Settings::Encoder_TmpDir).toString();
-
-    if (tmpDir.isEmpty())
-        mWorkDir = QFileInfo(disk->track(0)->resultFilePath()).dir().absolutePath();
-    else
-        mWorkDir = QDir(QString("%1/flacon.%2").arg(tmpDir).arg(QCoreApplication::applicationPid())).absolutePath();
-}
-
-
-/************************************************
-
- ************************************************/
-bool Splitter::isReadyStart() const
-{
-    return true;
-}
-
 
 /************************************************
-
- ************************************************/
-void Splitter::inputDataReady(Track *track, const QString &fileName)
-{
-}
-
-
-/************************************************
-
+ *
  ************************************************/
-void Splitter::doStop()
+Splitter::Splitter(const Disk *disk, const QString &workDir, PreGapType preGapType, QObject *parent):
+    Worker(parent),
+    mDisk(disk),
+    mWorkDir(workDir),
+    mPreGapType(preGapType),
+    mCurrentTrack(NULL)
 {
-    if (mProcess)
-    {
-        mProcess->closeReadChannel(QProcess::StandardError);
-        mProcess->closeReadChannel(QProcess::StandardOutput);
-        mProcess->closeWriteChannel();
-        mProcess->terminate();
-    }
+    // If the first track starts with zero second, doesn't make sense to create pregap track.
+    mExtractPregapTrack = (mPreGapType == PreGapType::ExtractToFile && mDisk->track(0)->cueIndex(1).milliseconds() > 0);
 }
 
-struct SplitterRequest {
-    CueTime start;
-    CueTime end;
-    QString outFileName;
-    Track *track;
-};
 
 /************************************************
- Split audio file to temporary dir
+ *
  ************************************************/
-void Splitter::doRun()
+void Splitter::run()
 {
-    mTrack = disk()->track(0);
+    mCurrentTrack = 0;
     Decoder decoder;
-    connect(&decoder, SIGNAL(progress(int)),
-            this, SLOT(decoderProgress(int)));
 
-    if (!decoder.open(disk()->audioFileName()))
+    if (!decoder.open(mDisk->audioFileName()))
     {
-        error(mTrack,
+        error(mDisk->track(0),
               tr("I can't read <b>%1</b>:<br>%2",
                  "Splitter error. %1 is a file name, %2 is a system error text.")
-              .arg(disk()->audioFileName())
+              .arg(mDisk->audioFileName())
               .arg(decoder.errorString()));
         return;
     }
 
-    bool separatePregap = format()->createCue() &&
-                          disk()->track(0)->cueIndex(1).milliseconds() > 0 &&
-                          OutFormat::currentFormat()->preGapType() == OutFormat::PreGapExtractToFile;
-
-
-    bool embededPregap  = format()->createCue() &&
-                          disk()->track(0)->cueIndex(1).milliseconds() > 0 &&
-                          OutFormat::currentFormat()->preGapType() == OutFormat::PreGapAddToFirstTrack;
-
-    QList<SplitterRequest> requests;
-
 
     // Extract pregap to separate file ....................
-    if (separatePregap)
+    // If the first track starts with zero second, doesn't make sense to create pregap track.
+    if (mExtractPregapTrack)
     {
-        SplitterRequest req;
-        req.track = disk()->preGapTrack();
-        req.outFileName = QDir::toNativeSeparators(QString("%1/flacon_%2_%3.wav").arg(mWorkDir).arg("00").arg(QUuid::createUuid().toString().mid(1, 36)));
-        req.start = disk()->track(0)->cueIndex(0);
-        req.end   = disk()->track(0)->cueIndex(1);
-        requests << req;
-    }
-    // Extract pregap to separate file ....................
+        mCurrentTrack = mDisk->preGapTrack();
+        CueIndex start = mDisk->track(0)->cueIndex(0);
+        CueIndex end   = mDisk->track(0)->cueIndex(1);
+        QString outFileName = tmpFileName(mWorkDir, 0);
 
-    for (int i=0; i<disk()->count(); ++i)
-    {
-        SplitterRequest req;
-        req.track = disk()->track(i);
-        req.outFileName = QDir::toNativeSeparators(QString("%1/flacon_%2_%3.wav").arg(mWorkDir).arg(i, 2, 10, QChar('0')).arg(QUuid::createUuid().toString().mid(1, 36)));
-
-        if (i==0 && embededPregap)
-            req.start = CueTime("00:00:00");
-        else
-            req.start = disk()->track(i)->cueIndex(1);
-
-        if (i<disk()->count()-1)
-            req.end = disk()->track(i+1)->cueIndex(01);
-
-        requests << req;
-    }
-
-    foreach (SplitterRequest req, requests)
-    {
-        mTrack = req.track;
-        bool ret = decoder.extract(req.start, req.end, req.outFileName);
-        if (!ret)
+        try
+        {
+            decoder.extract(start, end, outFileName);
+        }
+        catch (QString &err)
         {
-            qWarning() << "Splitter error for track " << req.track->index() << ": " <<  decoder.errorString();
-            deleteFile(req.outFileName);
-            error(mTrack, decoder.errorString());
+            qWarning() << "Splitter error for pregap track : " <<  decoder.errorString();
+            deleteFile(outFileName);
+            error(mCurrentTrack, decoder.errorString());
             return;
         }
 
-        emit trackReady(req.track, req.outFileName);
+        emit trackReady(mCurrentTrack, outFileName);
     }
+    // Extract pregap to separate file ....................
 
 
-    if (OutFormat::currentFormat()->createCue())
-    {
-        CueCreator cue(disk());
-        cue.setHasPregapFile(separatePregap);
-        if (!cue.write())
-            error(disk()->track(0), cue.errorString());
-    }
-}
-
-/************************************************
- *
- ***********************************************/
-void Splitter::decoderProgress(int percent)
-{
-    emit trackProgress(mTrack, Track::Splitting, percent);
-}
-
-
-/************************************************
-
- ************************************************/
-CueCreator::CueCreator(Disk *disk):
-    mDisk(disk),
-    mHasPreGapFile(false)
-{
-    Track *track = mDisk->track(0);
-    QString fileName = QFileInfo(track->resultFilePath()).dir().absolutePath() + QDir::separator() +
-                       Disk::safeString(QString("%1-%2.cue").arg(track->artist(), track->album()));
-
-    mFile.setFileName(fileName);
-    setTextCodecName("UTF-8");
-}
-
-
-/************************************************
-
- ************************************************/
-void CueCreator::setTextCodecName(const QString codecName)
-{
-    mTextCodec = QTextCodec::codecForName(codecName.toLatin1());
-    if (!mTextCodec)
-        mTextCodec = QTextCodec::codecForName("UTF-8");
-}
-
-
-/************************************************
 
- ************************************************/
-void CueCreator::setTextCodecMib(int mib)
-{
-    mTextCodec = QTextCodec::codecForMib(mib);
-}
+    // We havn't pregap in the GUI and pregap is short so we suppress progress for pregap track
+    connect(&decoder, SIGNAL(progress(int)),
+            this, SLOT(decoderProgress(int)));
 
+    for (int i=0; i<mDisk->count(); ++i)
+    {
+        mCurrentTrack = mDisk->track(i);
+        QString outFileName = tmpFileName(mWorkDir, i + 1);
 
-/************************************************
+        CueIndex start, end;
+        if (i==0 && mPreGapType == PreGapType::AddToFirstTrack)
+            start = CueTime("00:00:00");
+        else
+            start = mDisk->track(i)->cueIndex(1);
 
- ************************************************/
-void CueCreator::initGlobalTags()
-{
-    QStringList tagNames;
-    tagNames << TAG_GENRE;
-    tagNames << TAG_DATE;
-    tagNames << TAG_PERFORMER;
-    tagNames << TAG_SONGWRITER;
-    tagNames << TAG_ALBUM;
+        if (i<mDisk->count()-1)
+            end = mDisk->track(i+1)->cueIndex(01);
 
-    Track *firstTrack = mDisk->track(0);
+        bool ret = decoder.extract(start, end, outFileName);
 
-    foreach(QString tagName, tagNames)
-    {
-        QString value = firstTrack->tag(tagName);
 
-        for (int i=1; i<mDisk->count(); ++i)
+        if (!ret)
         {
-            if (mDisk->track(i)->tag(tagName) != value)
-                value = "";
+            qWarning() << "Splitter error for track " << mCurrentTrack->trackNum() << ": " <<  decoder.errorString();
+            deleteFile(outFileName);
+            error(mCurrentTrack, decoder.errorString());
+            return;
         }
 
-        mGlobalTags.insert(tagName, value);
+        emit trackReady(mCurrentTrack, outFileName);
     }
 }
 
 
 /************************************************
-
+ *
  ************************************************/
-void CueCreator::writeLine(const QString &text)
+const QList<const Track *> Splitter::tracks() const
 {
-    mFile.write(mTextCodec->fromUnicode(text));
-    mFile.write("\n");
-}
-
+    QList<const Track *> res;
+    if (mExtractPregapTrack)
+        res << mDisk->preGapTrack();
 
-/************************************************
+    for (int i=0; i<mDisk->count(); ++i)
+        res << mDisk->track(i);
 
- ************************************************/
-void CueCreator::writeDiskTag(const QString &format, const QString &tagName)
-{
-    QString value = mDisk->tag(tagName);
-
-    if (!value.isEmpty())
-        writeLine(format.arg(value));
+    return res;
 }
 
 
 /************************************************
-
+ *
  ************************************************/
-void CueCreator::writeGlobalTag(const QString &format, const QString &tagName)
+void Splitter::decoderProgress(int percent)
 {
-    QString value = mGlobalTags.value(tagName);
-
-    if (!value.isEmpty())
-        writeLine(format.arg(value));
+    emit trackProgress(mCurrentTrack, Track::Splitting, percent);
 }
 
 
 /************************************************
-
+ *
  ************************************************/
-void CueCreator::writeTrackTag(const Track *track, const QString &prefix, const QString &tagName)
+QString Splitter::tmpFileName(const QString &dir, int trackNum)
 {
-    QString value = track->tag(tagName);
-
-    if (!value.isEmpty() && value != mGlobalTags.value(tagName))
-        writeLine(prefix.arg(value));
+    return QDir::toNativeSeparators(QString("%1/flacon_%2_[%3].wav")
+                                    .arg(dir)
+                                    .arg(trackNum, 2, 10, QChar('0'))
+                                    .arg(QUuid::createUuid().toString().mid(1, 36)));
 }
 
-/************************************************
-
- ************************************************/
-bool CueCreator::write()
-{
-    if (!mFile.open(QIODevice::WriteOnly | QIODevice::Text))
-    {
-        mErrorString = QObject::tr("I can't write cue file <b>%1</b>:<br>%2").arg(mFile.fileName(), mFile.errorString());
-        return false;
-    }
-
-    initGlobalTags();
-
-    // Common ...........................
-    writeDiskTag("CATALOG %1",          TAG_CATALOG);
-    writeDiskTag("CDTEXTFILE \"%1\"",   TAG_CDTEXTFILE);
-    writeGlobalTag("REM GENRE \"%1\"",  TAG_GENRE);
-    writeGlobalTag("REM DATE %1",       TAG_DATE);
-    writeDiskTag("REM DISCID %1",       TAG_DISCID);
 
-    if (settings->value(Settings::PerTrackCue_FlaconTags).toBool())
-        writeLine(QString("REM COMMENT \"Flacon v%1\"").arg(FLACON_VERSION));
 
-    writeGlobalTag("PERFORMER \"%1\"",  TAG_PERFORMER);
-    writeGlobalTag("SONGWRITER \"%1\"", TAG_SONGWRITER);
-    writeGlobalTag("TITLE \"%1\"",      TAG_ALBUM);
 
-    if (mHasPreGapFile)
-        writeLine(QString("FILE \"%1\" WAVE").arg(QFileInfo(mDisk->preGapTrack()->resultFilePath()).fileName()));
-    else
-        writeLine(QString("FILE \"%1\" WAVE").arg(QFileInfo(mDisk->track(0)->resultFilePath()).fileName()));
-
-    // Tracks ...........................
-    CueIndex prevIndex("00:00:00");
-    for(int i=0; i<mDisk->count(); ++i)
-    {
-        Track *track = mDisk->track(i);
-        CueIndex index0 = track->cueIndex(0);
-        CueIndex index1 = track->cueIndex(1);
-
-        writeLine(QString("  TRACK %1 AUDIO").arg(i + 1, 2, 10, QChar('0')));
-
-        writeTrackTag(track, "    FLAGS %1",     TAG_FLAGS);
-        writeTrackTag(track, "    ISRC %1",      TAG_ISRC);
-        writeTrackTag(track, "    TITLE \"%1\"", TAG_TITLE);
-
-        if( i == 0)
-        {
-            if (mHasPreGapFile)
-            {
-                writeLine(QString("    INDEX 00 %1").arg("00:00:00"));
-                writeLine(QString("FILE \"%1\" WAVE").arg(QFileInfo(track->resultFileName()).fileName()));
-                writeLine(QString("    INDEX 01 %1").arg("00:00:00"));
-            }
-            else
-            {
-                writeLine(QString("    INDEX 00 %1").arg("00:00:00"));
-                writeLine(QString("    INDEX 01 %1").arg(index1.toString()));
-            }
-        }
-        else
-        {
-            if (!index0.isNull())
-                writeLine(QString("    INDEX 00 %1").arg((index0 - prevIndex).toString()));
-
-            prevIndex = index1;
-            writeLine(QString("FILE \"%1\" WAVE").arg(QFileInfo(track->resultFileName()).fileName()));
-            writeLine(QString("    INDEX 01 %1").arg("00:00:00"));
-
-        }
-
-        writeTrackTag(track, "    REM GENRE \"%1\"",  TAG_GENRE);
-        writeTrackTag(track, "    REM DATE %1",       TAG_DATE);
-        writeTrackTag(track, "    PERFORMER \"%1\"",  TAG_PERFORMER);
-        writeTrackTag(track, "    SONGWRITER \"%1\"", TAG_SONGWRITER);
-    }
-
-    mFile.close();
-    return true;
-}

flacon-3.1.1.tar.gz/converter/splitter.h -> flacon-4.0.0.tar.gz/converter/splitter.h Changed

@@ -27,36 +27,40 @@
 #ifndef SPLITTER_H
 #define SPLITTER_H
 
-#include "outformat.h"
-#include "converterthread.h"
+#include "worker.h"
+#include "types.h"
 
 class Disk;
 class Track;
-class QProcess;
+class Project;
 
-class Splitter: public ConverterThread
+
+class Splitter: public Worker
 {
     Q_OBJECT
 public:
-    Splitter(Disk *disk, const OutFormat *format, QObject *parent = 0);
-
-    bool isReadyStart() const;
-    QString workDir() const { return mWorkDir; }
+    Splitter(const Disk *disk, const QString &workDir, PreGapType preGapType, QObject *parent = NULL);
 
 public slots:
-    void inputDataReady(Track *track, const QString &fileName);
+    void run() override;
 
-protected:
-    void doRun();
-    void doStop();
+public:
+    QString workDir() const { return mWorkDir; }
+    const QList<const Track*> tracks() const;
 
 private slots:
     void decoderProgress(int percent);
 
 private:
-    QString mWorkDir;
-    QProcess *mProcess;
-    Track *mTrack;
+    const Disk *mDisk;
+    const QString mWorkDir;
+    const PreGapType mPreGapType;
+    const Track *mCurrentTrack;
+    bool mExtractPregapTrack;
+    QString tmpFileName(const QString &dir, int trackNum);
+
 };
 
+
+
 #endif // SPLITTER_H

flacon-3.1.1.tar.gz/converter/wavheader.cpp -> flacon-4.0.0.tar.gz/converter/wavheader.cpp Changed

@@ -52,18 +52,18 @@
 {
     char *d = data;
     qint64 left = size;
-    while (device->bytesAvailable() || device->waitForReadyRead(msecs))
+    while (left > 0)
     {
+        device->bytesAvailable() || device->waitForReadyRead(msecs);
         qint64 n = device->read(d, left);
+        if (n<0)
+            return false;
 
-        if (n==left)
-            return true;
-
-        d+=n;
-        left-=n;
+        d += n;
+        left -= n;
     }
 
-    return false;
+    return true;
 }
 
 
@@ -77,15 +77,17 @@
 
     char buf[BUF_SIZE];
     qint64 left = size;
-    while (device->bytesAvailable() || device->waitForReadyRead(msecs))
+    while (left > 0)
     {
-        left -= device->read(buf, qMin(left, qint64(BUF_SIZE)));
+        device->bytesAvailable() || device->waitForReadyRead(msecs);
+        qint64 n = device->read(buf, qMin(qint64(BUF_SIZE), left));
+        if (n<0)
+            return false;
 
-        if (!left)
-            return true;
+        left -= n;
     }
 
-    return false;
+    return true;
 }
 
 
@@ -323,7 +325,7 @@
             this->mBitsPerSample = readUInt16(stream);
 
             if (chunkSize > 16)
-                stream->seek(stream->pos() + chunkSize - 16);
+                mustSkip(stream, chunkSize - 16);
 
         }

flacon-4.0.0.tar.gz/converter/worker.cpp Added

@@ -0,0 +1,109 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "worker.h"
+
+#include <QDebug>
+#include <QFile>
+#include <QDir>
+#include "project.h"
+
+
+/************************************************
+
+ ************************************************/
+Worker::Worker(QObject *parent) : QObject(parent)
+{
+
+}
+
+
+/************************************************
+
+ ************************************************/
+Worker::~Worker()
+{
+
+}
+
+
+/************************************************
+
+ ************************************************/
+bool Worker::createDir(const QString &dirName) const
+{
+    QDir dir(dirName);
+
+    if (! dir.mkpath("."))
+    {
+        Project::error(tr("I can't create directory \"%1\".").arg(dir.path()));
+        return false;
+    }
+
+    if (!QFileInfo(dir.path()).isWritable())
+    {
+        Project::error(tr("I can't write to directory \"%1\".").arg(dir.path()));
+        return false;
+    }
+
+    return true;
+}
+
+
+/************************************************
+
+ ************************************************/
+bool Worker::deleteFile(const QString &fileName) const
+{
+    QFile f(fileName);
+    if (f.exists())
+        return f.remove();
+    else
+        return true;
+}
+
+
+/************************************************
+
+ ************************************************/
+void Worker::debugArguments(const QString &prog, const QStringList &args)
+{
+    QTextStream out(stderr);
+    out << prog << " ";
+    foreach (QString arg, args)
+    {
+        if (arg.contains(' ') || arg.contains('\t'))
+        {
+            out << "'" << arg << "' ";
+        }
+        else
+        {
+            out << arg << " ";
+        }
+
+    }
+    out << endl;
+}

flacon-4.0.0.tar.gz/converter/worker.h Added

@@ -0,0 +1,82 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#ifndef WORKER_H
+#define WORKER_H
+
+#include <QObject>
+#include "track.h"
+
+class OutFormat;
+class Disk;
+
+
+
+class WorkerRequest {
+public:
+    WorkerRequest(const Track *track, const QString &inputFile, const QString &outFile):
+        mTrack(track),
+        mInputFile(inputFile),
+        mOutFile(outFile)
+    {
+    }
+
+    const Track* track() const { return mTrack; }
+    QString inputFile() const { return mInputFile; }
+    QString outFile() const { return mOutFile; }
+
+private:
+    const Track *mTrack;
+    QString mInputFile;
+    QString mOutFile;
+};
+
+
+class Worker : public QObject
+{
+    Q_OBJECT
+public:
+    explicit Worker(QObject *parent = 0);
+    virtual ~Worker();
+
+public slots:
+    virtual void run() = 0;
+
+signals:
+    void trackReady(const Track *track, const QString &outFileName);
+    void trackProgress(const Track *track, Track::Status status, int percent);
+    void error(const Track *track, const QString &message);
+    void progress(const Track *track, int percent);
+
+protected:
+    bool createDir(const QString &dirName) const;
+    bool deleteFile(const QString &fileName) const;
+
+    void debugArguments(const QString &prog, const QStringList &args);
+};
+
+
+#endif // WORKER_H

flacon-3.1.1.tar.gz/cue.cpp -> flacon-4.0.0.tar.gz/cue.cpp Changed

flacon-3.1.1.tar.gz/disk.cpp -> flacon-4.0.0.tar.gz/disk.cpp Changed

@@ -25,7 +25,7 @@
 
 
 #include "disk.h"
-#include "settings.h"
+#include "track.h"
 #include "project.h"
 #include "inputaudiofile.h"
 #include "formats/format.h"
@@ -36,319 +36,11 @@
 #include <QFileInfo>
 #include <QStringList>
 #include <QDir>
+#include <QQueue>
+#include <QtAlgorithms>
 #include <QDebug>
 
-
-/************************************************
-
- ************************************************/
-Track::Track(Disk *disk, int index):
-    QObject(disk),
-    mDisk(disk),
-    mIndex(index),
-    mCueIndexes(100),
-    mStatus(NotRunning),
-    mProgress(0)
-{
-    qRegisterMetaType<Track::Status>("Track::Status");
-}
-
-
-/************************************************
-
- ************************************************/
-Track::~Track()
-{
-}
-
-
-/************************************************
- *
- ************************************************/
-uint Track::duration() const
-{
-    uint start = cueIndex(1).milliseconds();
-    uint end = 0;
-    if (index() < mDisk->count() - 1)
-    {
-        end = mDisk->track(index()+1)->cueIndex(1).milliseconds();
-    }
-    else if (mDisk->audioFile())
-    {
-        end = mDisk->audioFile()->duration();
-    }
-
-    if (start > end)
-        return 0;
-
-    return end - start;
-}
-
-
-/************************************************
-
- ************************************************/
-QString Track::tag(const QString &tagName) const
-{
-    return mDisk->getTag(mIndex, tagName);
-}
-
-
-/************************************************
-
- ************************************************/
-void Track::setTag(const QString &tagName, const QString &value)
-{
-    mDisk->setTag(mIndex, tagName, value);
-}
-
-
-/************************************************
-
- ************************************************/
-void Track::setProgress(Track::Status status, int percent)
-{
-    bool status2status [] = {
-        // NoRun   Cancel Error  Abort   OK   Process |_____________
-            0,     1,     1,     1,     1,     1,    // # NoRun    |
-            1,     0,     0,     0,     0,     0,    // # Cancel   |
-            1,     0,     0,     0,     0,     0,    // # Error    | Current
-            1,     0,     1,     0,     0,     0,    // # Aborted  | statuses
-            1,     0,     1,     0,     0,     0,    // # OK       |
-            1,     0,     1,     1,     1,     1,    // # Process  |
-
-    };
-    int len = 6;
-    int processStatus = 5;
-    // Process is some is Splitting, Encoding, Queued  etc.
-
-    if (status2status[qMin(processStatus, int(mStatus)) * len +
-                      qMin(processStatus, int(status))])
-    {
-        mStatus = status;
-        mProgress = percent;
-        project->emitTrackProgress(this);
-    }
-}
-
-
-/************************************************
-
- ************************************************/
-QString Track::resultFileName() const
-{
-    QString pattern = settings->value(Settings::OutFiles_Pattern).toString();
-    if (pattern.isEmpty())
-        pattern = QString("%a/%y - %A/%n - %t");
-
-    return calcFileName(pattern,
-                        disk()->count(),
-                        trackNum(),
-                        this->album(),
-                        this->title(),
-                        this->artist(),
-                        this->genre(),
-                        this->date(),
-                        OutFormat::currentFormat()->ext());
-}
-
-
-/************************************************
-  %N  Number of tracks       %n  Track number
-  %a  Artist                 %A  Album title
-  %y  Year                   %g  Genre
-  %t  Track title
- ************************************************/
-QString Track::calcFileName(const QString &pattern,
-                            int trackCount,
-                            int trackNum,
-                            const QString &album,
-                            const QString &title,
-                            const QString &artist,
-                            const QString &genre,
-                            const QString &date,
-                            const QString &fileExt)
-{
-    QHash<QChar, QString> tokens;
-    tokens.insert(QChar('N'),   QString("%1").arg(trackCount, 2, 10, QChar('0')));
-    tokens.insert(QChar('n'),   QString("%1").arg(trackNum, 2, 10, QChar('0')));
-    tokens.insert(QChar('A'),   Disk::safeString(album));
-    tokens.insert(QChar('t'),   Disk::safeString(title));
-    tokens.insert(QChar('a'),   Disk::safeString(artist));
-    tokens.insert(QChar('g'),   Disk::safeString(genre));
-    tokens.insert(QChar('y'),   Disk::safeString(date));
-
-    QString res = expandPattern(pattern, &tokens, false);
-    return res + "." + fileExt;
-}
-
-
-/************************************************
-
- ************************************************/
-QString Track::expandPattern(const QString &pattern, const QHash<QChar, QString> *tokens, bool optional)
-{
-    QString res;
-    bool perc = false;
-    bool hasVars = false;
-    bool isValid = true;
-
-
-    for(int i=0; i<pattern.length(); ++i)
-    {
-        QChar c = pattern.at(i);
-
-
-        // Sub pattern .................................
-        if (c == '{')
-        {
-            int level = 0;
-            int start = i + 1;
-            //int j = i;
-            QString s = "{";
-
-            for (int j=i; j<pattern.length(); ++j)
-            {
-                c = pattern.at(j);
-                if (c == '{')
-                    level++;
-                else if (c == '}')
-                    level--;
-
-                if (level == 0)
-                {
-                    s = expandPattern(pattern.mid(start, j - start), tokens, true);
-                    i = j;
-                    break;
-                }
-            }
-            res += s;
-        }
-        // Sub pattern .................................
-
-        else
-        {
-            if (perc)
-            {
-                perc = false;
-                if (tokens->contains(c))
-                {
-                    QString s = tokens->value(c);
-                    hasVars = true;
-                    isValid = !s.isEmpty();
-                    res += s;
-                }
-                else
-                {
-                    if (c == '%')
-                        res += "%";
-                    else
-                        res += QString("%") + c;
-                }
-            }
-            else
-            {
-                if (c == '%')
-                    perc = true;
-                else
-                    res += c;
-            }
-        }
-    }
-
-    if (perc)
-        res += "%";
-
-    if (optional)
-    {
-        if  (hasVars)
-        {
-            if (!isValid)
-                return "";
-        }
-        else
-        {
-            return "{" + res + "}";
-        }
-    }
-
-    return res;
-}
-
-
-
-/************************************************
-
- ************************************************/
-QString Track::resultFilePath() const
-{
-    QString fileName = resultFileName();
-    if (fileName.isEmpty())
-        return "";
-
-    QString dir = calcResultFilePath();
-    if (dir.endsWith("/") || fileName.startsWith("/"))
-        return calcResultFilePath() + fileName;
-    else
-        return calcResultFilePath() + "/" + fileName;
-}
-
-
-/************************************************
-
- ************************************************/
-QString Track::calcResultFilePath() const
-{
-    QString settingsDir = settings->value(Settings::OutFiles_Directory).toString();
-
-    if (settingsDir == "~")
-        return QDir::homePath();
-
-    if (settingsDir == ".")
-        settingsDir = "";
-
-    if (settingsDir.startsWith("~/"))
-        return settingsDir.replace(0, 1, QDir::homePath());
-
-    QFileInfo fi(settingsDir);
-
-    if (fi.isAbsolute())
-        return fi.absoluteFilePath();
-
-    if (!disk()->audioFileName().isEmpty())
-        return QFileInfo(disk()->audioFileName()).dir().absolutePath() + QDir::separator() + settingsDir;
-
-    return QFileInfo(QDir::homePath() + QDir::separator() + settingsDir).absoluteFilePath();
-}
-
-
-/************************************************
-
- ************************************************/
-int Track::trackNum() const
-{
-    return mDisk->startTrackNum() + mIndex;
-}
-
-
-/************************************************
-
- ************************************************/
-CueIndex Track::cueIndex(int indexNum) const
-{
-    return mCueIndexes.at(indexNum);
-}
-
-
-/************************************************
-
- ************************************************/
-void Track::setCueIndex(int indexNum, const CueIndex &value)
-{
-    mCueIndexes[indexNum] = value;
-}
-
-
+#define COVER_PREVIEW_SIZE 500
 
 /************************************************
 
@@ -430,6 +122,9 @@
  ************************************************/
 void Disk::downloadInfo()
 {
+    if (discId().isEmpty())
+        return;
+
     DataProvider *provider = new FreeDbProvider(this);
     connect(provider, SIGNAL(finished()), this, SLOT(downloadFinished()));
     mDownloads << provider;
@@ -503,6 +198,9 @@
         mTags = mTagSets.first();
         project->emitLayoutChanged();
     }
+
+    mCoverImagePreview = QImage();
+    mCoverImageFile = searchCoverImage(QFileInfo(mCueFile).dir().absolutePath());
 }
 
 
@@ -531,6 +229,7 @@
     foreach (const AudioFormat *format, AudioFormat::inputFormats())
         audioExt += (audioExt.isEmpty() ? "\\." : "|\\.") + format->ext();
 
+
     foreach (const QString &pattern, patterns)
     {
         QRegExp re(QString("%1(%2)+").arg(pattern).arg(audioExt), Qt::CaseInsensitive, QRegExp::RegExp2);      
@@ -569,6 +268,8 @@
         return;
     }
 
+    unsigned int bestWeight = 99999;
+    CueTagSet bestDisk("");
 
     foreach (const CueReader &cue, cueReaders)
     {
@@ -576,11 +277,18 @@
         {
             if (!matchedAudioFiles(cue.disk(i), QFileInfoList() << audio).isEmpty())
             {
-                loadFromCue(cue.disk(i), i);
-                return;
+                unsigned int weight = levenshteinDistance(QFileInfo(cue.fileName()).baseName(), audio.baseName());
+                if (weight < bestWeight)
+                {
+                    bestWeight = weight;
+                    bestDisk = cue.disk(i);
+                }
             }
         }
     }
+
+    if (!bestDisk.uri().isEmpty())
+        loadFromCue(bestDisk);
 }
 
 
@@ -803,6 +511,143 @@
 /************************************************
 
  ************************************************/
+void Disk::setCoverImageFile(const QString &fileName)
+{
+    mCoverImageFile = fileName;
+    mCoverImagePreview = QImage();
+}
+
+
+/************************************************
+
+ ************************************************/
+QImage Disk::coverImagePreview() const
+{
+    if (!mCoverImageFile.isEmpty() && mCoverImagePreview.isNull())
+    {
+        mCoverImagePreview = coverImage();
+        if (!mCoverImagePreview.isNull())
+        {
+            mCoverImagePreview.scaled(COVER_PREVIEW_SIZE, COVER_PREVIEW_SIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        }
+    }
+
+    return mCoverImagePreview;
+}
+
+
+/************************************************
+
+ ************************************************/
+QImage Disk::coverImage() const
+{
+    if (mCoverImageFile.isEmpty())
+        return QImage();
+
+    return QImage(mCoverImageFile);
+}
+
+
+/************************************************
+
+ ************************************************/
+bool compareCoverImages(const QFileInfo &f1, const QFileInfo &f2)
+{
+    static QStringList order(QStringList()
+            << "COVER"
+            << "FRONT"
+            << "FOLDER");
+
+    int n1 = order.indexOf(f1.baseName().toUpper());
+    if (n1 < 0)
+        n1 = 9999;
+
+    int n2 = order.indexOf(f2.baseName().toUpper());
+    if (n2 < 0)
+        n2 = 9999;
+
+    if (n1 != n2)
+        return n1 < n2;
+
+    // If we have 2 files with same name but in different directories,
+    // we choose the nearest (with the shorter path).
+    int l1 = f1.absoluteFilePath().length();
+    int l2 = f2.absoluteFilePath().length();
+    if (l1 != l2)
+        return l1<l2;
+
+    return f1.absoluteFilePath() < f2.absoluteFilePath();
+}
+
+
+/************************************************
+
+ ************************************************/
+QStringList Disk::searchCoverImages(const QString &startDir)
+{
+    QFileInfoList files;
+
+    QStringList exts;
+    exts << "*.jpg";
+    exts << "*.jpeg";
+    exts << "*.png";
+    exts << "*.bmp";
+    exts << "*.tiff";
+
+
+    QQueue<QString> query;
+    query << startDir;
+
+    QSet<QString> processed;
+    while (!query.isEmpty())
+    {
+        QDir dir(query.dequeue());
+
+        QFileInfoList dirs = dir.entryInfoList(QDir::Dirs | QDir::Readable | QDir::NoDotAndDotDot);
+        foreach(QFileInfo d, dirs)
+        {
+            if (d.isSymLink())
+                d = QFileInfo(d.symLinkTarget());
+
+            if (!processed.contains(d.absoluteFilePath()))
+            {
+                processed << d.absoluteFilePath();
+                query << d.absoluteFilePath();
+            }
+        }
+
+        files << dir.entryInfoList(exts, QDir::Files | QDir::Readable);
+    }
+
+    qStableSort(files.begin(), files.end(), compareCoverImages);
+
+    QStringList res;
+    foreach (QFileInfo f, files)
+        res << f.absoluteFilePath();
+
+    return res;
+}
+
+
+/************************************************
+
+ ************************************************/
+QString Disk::searchCoverImage(const QString &startDir)
+{
+    QStringList l = searchCoverImages(startDir);
+    foreach (QString file, l)
+    {
+        QImage img(file);
+        if (!img.isNull())
+            return file;
+    }
+    return "";
+}
+
+
+/************************************************
+
+ ************************************************/
 QString Disk::getTag(int track, const QString &tagName)
 {
     if (mTags)
@@ -890,6 +735,8 @@
  ************************************************/
 void PreGapTrack::setTag(const QString &tagName, const QString &value)
 {
+    Q_UNUSED(tagName);
+    Q_UNUSED(value);
 }

flacon-3.1.1.tar.gz/disk.h -> flacon-4.0.0.tar.gz/disk.h Changed

@@ -27,7 +27,7 @@
 #ifndef DISK_H
 #define DISK_H
 
-#include "tagset.h"
+#include "track.h"
 #include "cue.h"
 
 #include <QObject>
@@ -36,11 +36,11 @@
 #include <QAction>
 #include <QHash>
 #include <QChar>
+#include <QImage>
 
 class CueReader;
 class QFile;
 class Disk;
-class Track;
 class InputAudioFile;
 class DataProvider;
 
@@ -97,6 +97,15 @@
     int distance(const TagSet &other);
     int distance(const TagSet *other);
 
+    QString coverImageFile() const { return mCoverImageFile; }
+    void setCoverImageFile(const QString &fileName);
+    QImage coverImagePreview() const;
+    QImage coverImage() const;
+
+    static QStringList searchCoverImages(const QString &startDir);
+    static QString searchCoverImage(const QString &startDir);
+
+
 public slots:
     void downloadInfo();
 
@@ -124,106 +133,15 @@
     Track *mPreGapTrack;
     QList<DataProvider*> mDownloads;
 
+    QString mCoverImageFile;
+    mutable QImage  mCoverImagePreview;
+
     void findAudioFile(const CueTagSet &cueTags);
     void findCueFile();
 };
 
 typedef QList<Disk*> DiskList;
 
-class Track: public QObject
-{
-    Q_OBJECT
-public:
-
-    enum Status
-    {
-        NotRunning  = 0,
-        Canceled    = 1,
-        Error       = 2,
-        Aborted     = 3,
-        OK          = 4,
-        Splitting   = 5,
-        Encoding    = 6,
-        Queued      = 7,
-        WaitGain    = 8,
-        CalcGain    = 9,
-        WriteGain   = 10
-    };
-
-    explicit Track(Disk *disk, int index);
-    ~Track();
-
-    QString artist() const            { return tag("PERFORMER"); }
-    void setArtist(const QString &value)  { setTag("PERFORMER", value); }
-
-    QString album() const             { return tag("ALBUM"); }
-    void setAlbum(const QString &value)   { setTag("ALBUM", value); }
-
-    QString comment() const           { return tag("COMMENT") ;}
-    void setComment(const QString &value)   { setTag("COMMENT", value); }
-
-    QString title() const             { return tag("TITLE") ;}
-    void setTitle(const QString &value)   { setTag("TITLE", value); }
-
-    QString genre() const             { return tag("GENRE") ;}
-    void setGenre(const QString &value)   { setTag("GENRE", value); }
-
-    QString date() const              { return tag("DATE") ;}
-    void setDate(const QString &value)    { setTag("DATE", value); }
-
-
-    QString resultFileName() const;
-    QString resultFilePath() const;
-
-    Disk *disk() const { return mDisk; }
-    int index() const { return mIndex; }
-
-    int trackNum() const;
-    uint duration() const;
-
-    CueIndex cueIndex(int indexNum) const;
-    void setCueIndex(int indexNum, const CueIndex &value);
-
-    virtual QString tag(const QString &tagName) const;
-    virtual void setTag(const QString &tagName, const QString &value);
-
-    int progress() const { return mProgress; }
-    Status status() const { return mStatus; }
-    void setProgress(Status status, int percent = -1);
-
-    static QString calcFileName(const QString &pattern,
-                                int trackCount,
-                                int trackNum,
-                                const QString &album,
-                                const QString &title,
-                                const QString &artist,
-                                const QString &genre,
-                                const QString &date,
-                                const QString &fileExt);
-
-private:
-    Disk *mDisk;
-    int mIndex;
-    QVector<CueIndex> mCueIndexes;
-    Status mStatus;
-    int mProgress;
-
-    QString calcResultFilePath() const;
-    static QString expandPattern(const QString &pattern, const QHash<QChar,QString> *tokens, bool optional);
-};
-
-Q_DECLARE_METATYPE(Track::Status)
-
-
-class PreGapTrack: public Track
-{
-public:
-    explicit PreGapTrack(Disk *disk);
-
-    virtual QString tag(const QString &tagName) const;
-    virtual void setTag(const QString &tagName, const QString &value);
-};
-
 
 class DiskAction: public QAction
 {

flacon-3.1.1.tar.gz/formats/aac.cpp -> flacon-4.0.0.tar.gz/formats/aac.cpp Changed

flacon-3.1.1.tar.gz/formats/aac.h -> flacon-4.0.0.tar.gz/formats/aac.h Changed

@@ -36,14 +36,14 @@
 public:
     OutFormat_Aac();
 
-    virtual QString encoderProgramName() const { return "faac"; }
-    virtual QString gainProgramName() const { return ""; }
+    virtual QString encoderProgramName() const override { return "faac"; }
+    virtual QString gainProgramName() const override { return ""; }
 
-    virtual QStringList encoderArgs(Track *track, const QString &outFile) const;
-    virtual QStringList gainArgs(const QStringList &files) const;
+    virtual QStringList encoderArgs(const Track *track, const QString &outFile) const override;
+    virtual QStringList gainArgs(const QStringList &files) const override;
 
-    QHash<QString, QVariant> defaultParameters() const;
-    EncoderConfigPage *configPage(QWidget *parent = 0) const;
+    QHash<QString, QVariant> defaultParameters() const override;
+    EncoderConfigPage *configPage(QWidget *parent = 0) const override;
 };
 
 
@@ -53,8 +53,8 @@
 public:
     explicit ConfigPage_Acc(QWidget *parent = 0);
 
-    virtual void load();
-    virtual void write();
+    virtual void load() override;
+    virtual void write() override;
 
 };

flacon-3.1.1.tar.gz/formats/ape.h -> flacon-4.0.0.tar.gz/formats/ape.h Changed

@@ -32,19 +32,19 @@
 class Format_Ape: public AudioFormat
 {
 public:
-    virtual QString name() const { return "APE"; }
-    virtual QString ext() const { return "ape"; }
-    virtual bool isInputFormat() const { return true; }
+    virtual QString name() const override { return "APE"; }
+    virtual QString ext() const override { return "ape"; }
+    virtual bool isInputFormat() const override { return true; }
 
-    virtual QByteArray magic() const { return "MAC "; }
-    virtual uint const magicOffset() const { return 0; }
+    virtual QByteArray magic() const override { return "MAC "; }
+    virtual uint magicOffset() const override { return 0; }
 
 
-    virtual QString decoderProgramName() const { return "mac"; }
-    virtual QStringList decoderArgs(const QString &fileName) const;
-    virtual QString filterDecoderStderr(const QString &stdErr) const;
+    virtual QString decoderProgramName() const override { return "mac"; }
+    virtual QStringList decoderArgs(const QString &fileName) const override;
+    virtual QString filterDecoderStderr(const QString &stdErr) const override;
 
-    virtual bool isOutputFormat() const { return false; }
+    virtual bool isOutputFormat() const override { return false; }
 
 
 };

flacon-3.1.1.tar.gz/formats/flac.cpp -> flacon-4.0.0.tar.gz/formats/flac.cpp Changed

flacon-3.1.1.tar.gz/formats/flac.h -> flacon-4.0.0.tar.gz/formats/flac.h Changed

@@ -36,30 +36,30 @@
 {
 public:
     OutFormat_Flac();
-    bool check(QStringList *errors) const;
+    bool check(QStringList *errors) const override;
 
-    virtual QString encoderProgramName() const { return "flac"; }
-    virtual QString gainProgramName() const { return "metaflac"; }
+    virtual QString encoderProgramName() const override { return "flac"; }
+    virtual QString gainProgramName() const override { return "metaflac"; }
 
-    virtual QStringList encoderArgs(Track *track, const QString &outFile) const;
-    virtual QStringList gainArgs(const QStringList &files) const;
+    virtual QStringList encoderArgs(const Track *track, const QString &outFile) const override;
+    virtual QStringList gainArgs(const QStringList &files) const override;
 
-    QHash<QString, QVariant> defaultParameters() const;
-    EncoderConfigPage *configPage(QWidget *parent = 0) const;
+    QHash<QString, QVariant> defaultParameters() const override;
+    EncoderConfigPage *configPage(QWidget *parent = 0) const override;
 };
 
 class Format_Flac: public AudioFormat
 {
 public:
-    virtual QString name() const { return "FLAC"; }
-    virtual QString ext() const { return "flac"; }
-    virtual bool isInputFormat() const { return true; }
+    virtual QString name() const override { return "FLAC"; }
+    virtual QString ext() const override { return "flac"; }
+    virtual bool isInputFormat() const override { return true; }
 
-    virtual QString decoderProgramName() const { return "flac"; }
-    virtual QStringList decoderArgs(const QString &fileName) const;
+    virtual QString decoderProgramName() const override { return "flac"; }
+    virtual QStringList decoderArgs(const QString &fileName) const override;
 
-    virtual QByteArray magic() const { return "fLaC"; }
-    virtual uint const magicOffset() const { return 0; }
+    virtual QByteArray magic() const override { return "fLaC"; }
+    virtual uint magicOffset() const override { return 0; }
 };
 
 
@@ -69,8 +69,8 @@
 public:
     explicit ConfigPage_Flac(QWidget *parent = 0);
 
-    virtual void load();
-    virtual void write();
+    virtual void load() override;
+    virtual void write() override;
 
 };

flacon-3.1.1.tar.gz/formats/flac_config.ui -> flacon-4.0.0.tar.gz/formats/flac_config.ui Changed

flacon-3.1.1.tar.gz/formats/format.cpp -> flacon-4.0.0.tar.gz/formats/format.cpp Changed

flacon-3.1.1.tar.gz/formats/format.h -> flacon-4.0.0.tar.gz/formats/format.h Changed

@@ -47,9 +47,9 @@
     virtual bool isInputFormat() const { return false; }
 
     virtual QString decoderProgramName() const { return ""; }
-    virtual QStringList decoderArgs(const QString &fileName) const { return QStringList(); }
+    virtual QStringList decoderArgs(const QString &fileName) const { Q_UNUSED(fileName); return QStringList(); }
     virtual QByteArray magic() const = 0;
-    virtual uint  const magicOffset() const { return 0; }
+    virtual uint magicOffset() const { return 0; }
 
 
     // Out format
@@ -70,8 +70,6 @@
 protected:
     virtual bool checkMagic(const QByteArray &data) const;
 
-private:
-    static QList<const AudioFormat*> mAllFormats;
 };
 
 
@@ -79,6 +77,6 @@
 
 #define REGISTER_FORMAT(FORMAT) \
     static FORMAT static_##FORMAT##_Instance; \
-    static bool  is_##FORMAT##_loaded = AudioFormat::registerFormat(static_##FORMAT##_Instance);
+    static bool is_##FORMAT##_loaded = AudioFormat::registerFormat(static_##FORMAT##_Instance);
 
 #endif // FORMAT_H

flacon-3.1.1.tar.gz/formats/mp3.cpp -> flacon-4.0.0.tar.gz/formats/mp3.cpp Changed

@@ -26,6 +26,7 @@
 
 #include "mp3.h"
 #include "settings.h"
+#include "disk.h"
 #include <QDebug>
 
 
@@ -37,13 +38,14 @@
     mId   = "MP3";
     mExt  = "mp3";
     mName = "MP3";
+    mSettingsGroup = "Mp3";
 }
 
 
 /************************************************
 
  ************************************************/
-QStringList OutFormat_Mp3::encoderArgs(Track *track, const QString &outFile) const
+QStringList OutFormat_Mp3::encoderArgs(const Track *track, const QString &outFile) const
 {
     QStringList args;
 
@@ -100,7 +102,7 @@
     }
 
     // ReplayGain ...............................................
-    if (settings->value("Mp3/ReplayGain") != this->gainTypeToString(this->GainTrack))
+    if (strToGainType(settings->value("Mp3/ReplayGain").toString()) != GainType::Track)
     {
         args << "--noreplaygain";
     }
@@ -150,7 +152,7 @@
     res.insert("Mp3/Preset",           "vbrStandardFast");
     res.insert("Mp3/Bitrate",          320);
     res.insert("Mp3/Quality",          4);
-    res.insert("Mp3/ReplayGain",       gainTypeToString(GainDisable));
+    res.insert("Mp3/ReplayGain",       gainTypeToString(GainType::Disable));
     return res;
 }

flacon-3.1.1.tar.gz/formats/mp3.h -> flacon-4.0.0.tar.gz/formats/mp3.h Changed

@@ -36,14 +36,14 @@
 public:
     OutFormat_Mp3();
 
-    virtual QString encoderProgramName() const { return "lame"; }
-    virtual QString gainProgramName() const { return "mp3gain"; }
+    virtual QString encoderProgramName() const override { return "lame"; }
+    virtual QString gainProgramName() const override { return "mp3gain"; }
 
-    virtual QStringList encoderArgs(Track *track, const QString &outFile) const;
-    virtual QStringList gainArgs(const QStringList &files) const;
+    virtual QStringList encoderArgs(const Track *track, const QString &outFile) const override;
+    virtual QStringList gainArgs(const QStringList &files) const override;
 
-    QHash<QString, QVariant> defaultParameters() const;
-    EncoderConfigPage *configPage(QWidget *parent = 0) const;
+    QHash<QString, QVariant> defaultParameters() const override;
+    EncoderConfigPage *configPage(QWidget *parent = 0) const override;
 };
 
 
@@ -53,8 +53,8 @@
 public:
     explicit ConfigPage_Mp3(QWidget *parent = 0);
 
-    virtual void load();
-    virtual void write();
+    virtual void load() override;
+    virtual void write() override;
 
 private slots:
     void mp3PresetCbxCanged(int index);

flacon-3.1.1.tar.gz/formats/mp3_config.ui -> flacon-4.0.0.tar.gz/formats/mp3_config.ui Changed

flacon-3.1.1.tar.gz/formats/ogg.cpp -> flacon-4.0.0.tar.gz/formats/ogg.cpp Changed

@@ -25,6 +25,7 @@
 
 
 #include "ogg.h"
+#include "disk.h"
 #include "settings.h"
 #include <QDebug>
 #include <math.h>
@@ -37,13 +38,14 @@
     mId   = "OGG";
     mExt  = "ogg";
     mName = "OGG";
+    mSettingsGroup = "Ogg";
 }
 
 
 /************************************************
 
  ************************************************/
-QStringList OutFormat_Ogg::encoderArgs(Track *track, const QString &outFile) const
+QStringList OutFormat_Ogg::encoderArgs(const Track *track, const QString &outFile) const
 {
     QStringList args;
 
@@ -97,7 +99,7 @@
 {
     QStringList args;
     args <<  args << settings->programName(gainProgramName());
-    if (strToGainType(settings->value("Ogg/ReplayGain").toString()) ==  GainAlbum)
+    if (strToGainType(settings->value("Ogg/ReplayGain").toString()) ==  GainType::Album)
         args << "--album";
 
     args << files;
@@ -117,7 +119,7 @@
     res.insert("Ogg/MinBitrate",       "");
     res.insert("Ogg/NormBitrate",      "");
     res.insert("Ogg/MaxBitrate",       "");
-    res.insert("Ogg/ReplayGain",       gainTypeToString(GainDisable));
+    res.insert("Ogg/ReplayGain",       gainTypeToString(GainType::Disable));
     return res;
 }

flacon-3.1.1.tar.gz/formats/ogg.h -> flacon-4.0.0.tar.gz/formats/ogg.h Changed

@@ -36,14 +36,14 @@
 public:
     OutFormat_Ogg();
 
-    virtual QString encoderProgramName() const { return "oggenc"; }
-    virtual QString gainProgramName() const { return "vorbisgain"; }
+    virtual QString encoderProgramName() const override { return "oggenc"; }
+    virtual QString gainProgramName() const override { return "vorbisgain"; }
 
-    virtual QStringList encoderArgs(Track *track, const QString &outFile) const;
-    virtual QStringList gainArgs(const QStringList &files) const;
+    virtual QStringList encoderArgs(const Track *track, const QString &outFile) const override;
+    virtual QStringList gainArgs(const QStringList &files) const override;
 
-    QHash<QString, QVariant> defaultParameters() const;
-    EncoderConfigPage *configPage(QWidget *parent = 0) const;
+    QHash<QString, QVariant> defaultParameters() const override;
+    EncoderConfigPage *configPage(QWidget *parent = 0) const override;
 };
 
 
@@ -53,8 +53,8 @@
 public:
     explicit ConfigPage_Ogg(QWidget *parent = 0);
 
-    virtual void load();
-    virtual void write();
+    virtual void load() override;
+    virtual void write() override;
 
 private slots:
     void oggQualitySliderChanged(int value);

flacon-3.1.1.tar.gz/formats/opus.cpp -> flacon-4.0.0.tar.gz/formats/opus.cpp Changed

flacon-3.1.1.tar.gz/formats/opus.h -> flacon-4.0.0.tar.gz/formats/opus.h Changed

@@ -36,14 +36,14 @@
 public:
     OutFormat_Opus();
 
-    virtual QString encoderProgramName() const { return "opusenc"; }
-    virtual QString gainProgramName() const { return ""; }
+    virtual QString encoderProgramName() const override { return "opusenc"; }
+    virtual QString gainProgramName() const override { return ""; }
 
-    virtual QStringList encoderArgs(Track *track, const QString &outFile) const;
-    virtual QStringList gainArgs(const QStringList &files) const;
+    virtual QStringList encoderArgs(const Track *track, const QString &outFile) const override;
+    virtual QStringList gainArgs(const QStringList &files) const override;
 
-    QHash<QString, QVariant> defaultParameters() const;
-    EncoderConfigPage *configPage(QWidget *parent = 0) const;
+    QHash<QString, QVariant> defaultParameters() const override;
+    EncoderConfigPage *configPage(QWidget *parent = 0) const override;
 };
 
 
@@ -53,8 +53,8 @@
 public:
     explicit ConfigPage_Opus(QWidget *parent = 0);
 
-    virtual void load();
-    virtual void write();
+    virtual void load() override;
+    virtual void write() override;
 };
 
 #endif // OPUS_H

flacon-3.1.1.tar.gz/formats/outformat.cpp -> flacon-4.0.0.tar.gz/formats/outformat.cpp Changed

@@ -85,22 +85,27 @@
 
 
 /************************************************
-
+ *
  ************************************************/
-OutFormat::GainType OutFormat::gainType() const
+OutFormat *OutFormat::formatForId(const QString &id)
 {
-    QString s = settings->value(id() + "/ReplayGain").toString();
-    return strToGainType(s);
+    foreach (OutFormat *format, allFormats())
+    {
+        if (format->id() == id)
+            return format;
+    }
+
+    return nullptr;
 }
 
 
 /************************************************
 
  ************************************************/
-OutFormat::PreGapType OutFormat::preGapType() const
+GainType OutFormat::gainType() const
 {
-    QString s = settings->value(Settings::PerTrackCue_Pregap).toString();
-    return strToPreGapType(s);
+    QString s = settings->value(settingsGroup() + "/ReplayGain").toString();
+    return strToGainType(s);
 }
 
 
@@ -139,91 +144,13 @@
 {
     bool res = checkProgram(encoderProgramName(), errors);
 
-    if (gainType() != GainDisable)
+    if (gainType() != GainType::Disable)
         checkProgram(gainProgramName(), errors);
 
     return res;
 }
 
 
-/************************************************
-
- ************************************************/
-QString OutFormat::gainTypeToString(OutFormat::GainType type)
-{
-    switch(type)
-    {
-    case GainDisable: return "Disable";
-    case GainTrack:   return "Track";
-    case GainAlbum:   return "Album";
-    }
-
-    return "Disable";
-}
-
-
-/************************************************
-
- ************************************************/
-OutFormat::GainType OutFormat::strToGainType(const QString &str)
-{
-    QString s = str.toUpper();
-
-    if (s == "TRACK")   return GainTrack;
-    if (s == "ALBUM")   return GainAlbum;
-
-    return GainDisable;
-}
-
-
-/************************************************
-
- ************************************************/
-QString OutFormat::preGapTypeToString(OutFormat::PreGapType type)
-{
-    switch(type)
-    {
-    case PreGapExtractToFile:   return "Extract";
-    case PreGapAddToFirstTrack: return "AddToFirst";
-    }
-
-    return "Disable";
-}
-
-
-/************************************************
-
- ************************************************/
-OutFormat::PreGapType OutFormat::strToPreGapType(const QString &str)
-{
-    QString s = str.toUpper();
-
-    if (s == "EXTRACT")     return PreGapExtractToFile;
-    if (s == "ADDTOFIRST")  return PreGapAddToFirstTrack;
-
-    return PreGapAddToFirstTrack;
-}
-
-
-/************************************************
-
- ************************************************/
-Encoder *OutFormat::createEncoder(Track *track, QObject *parent) const
-{
-    return new Encoder(this, track, parent);
-}
-
-
-/************************************************
-
- ************************************************/
-Gain *OutFormat::createGain(Disk *disk, Track *track, QObject *parent) const
-{
-    if (!gainProgramName().isEmpty())
-        return new Gain(this, disk, track, parent);
-    else
-        return 0;
-}

flacon-3.1.1.tar.gz/formats/outformat.h -> flacon-4.0.0.tar.gz/formats/outformat.h Changed

@@ -23,16 +23,15 @@
  *
  * END_COMMON_COPYRIGHT_HEADER */
 
-
 #ifndef OUTFORMAT_H
 #define OUTFORMAT_H
 
 #include <QStringList>
 #include <QHash>
-#include "disk.h"
+#include <QVariant>
+#include "track.h"
+#include "types.h"
 
-class Encoder;
-class Gain;
 class EncoderConfigPage;
 
 class OutFormat
@@ -40,27 +39,17 @@
 public:
     static QList<OutFormat*> allFormats();
     static OutFormat *currentFormat();
-
-    enum GainType {
-        GainDisable,
-        GainTrack,
-        GainAlbum
-    };
-
-    enum PreGapType {
-        PreGapExtractToFile,
-        PreGapAddToFirstTrack
-    };
+    static OutFormat * formatForId(const QString &id);
 
     QString id() const { return mId; }
     QString name() const { return mName; }
     QString ext() const {return mExt; }
+    QString settingsGroup() const { return mSettingsGroup; }
     GainType gainType() const;
-    PreGapType preGapType() const;
     bool createCue() const;
 
     virtual QString encoderProgramName() const = 0;
-    virtual QStringList encoderArgs(Track *track, const QString &outFile) const = 0;
+    virtual QStringList encoderArgs(const Track *track, const QString &outFile) const = 0;
 
 
     virtual QString gainProgramName() const = 0;
@@ -73,19 +62,12 @@
     virtual EncoderConfigPage *configPage(QWidget *parent = 0) const = 0;
     virtual bool hasConfigPage() const { return true; }
 
-    static QString gainTypeToString(GainType type);
-    static GainType strToGainType(const QString &str);
-
-    static QString preGapTypeToString(PreGapType type);
-    static PreGapType strToPreGapType(const QString &str);
-
-    virtual Encoder *createEncoder(Track *track, QObject *parent = 0) const;
-    virtual Gain *createGain(Disk *disk, Track *track, QObject *parent = 0) const;
 
 protected:
     QString mId;
     QString mName;
     QString mExt;
+    QString mSettingsGroup;
 
     bool checkProgram(const QString &program, QStringList *errors) const;
 };

flacon-3.1.1.tar.gz/formats/tta.cpp -> flacon-4.0.0.tar.gz/formats/tta.cpp Changed

flacon-3.1.1.tar.gz/formats/tta.h -> flacon-4.0.0.tar.gz/formats/tta.h Changed

@@ -32,18 +32,18 @@
 class Format_Tta: public AudioFormat
 {
 public:
-    virtual QString name() const { return "TTA"; }
-    virtual QString ext() const { return "tta"; }
-    virtual QByteArray magic() const { return "TTA1"; }
-    virtual uint const magicOffset() const { return 0; }
+    virtual QString name() const override { return "TTA"; }
+    virtual QString ext() const override { return "tta"; }
+    virtual QByteArray magic() const override { return "TTA1"; }
+    virtual uint magicOffset() const override { return 0; }
 
 
-    virtual bool isInputFormat() const { return true; }
-    virtual QString decoderProgramName() const { return "ttaenc"; }
-    virtual QStringList decoderArgs(const QString &fileName) const;
-    virtual QString filterDecoderStderr(const QString &stdErr) const;
+    virtual bool isInputFormat() const override { return true; }
+    virtual QString decoderProgramName() const override { return "ttaenc"; }
+    virtual QStringList decoderArgs(const QString &fileName) const override;
+    virtual QString filterDecoderStderr(const QString &stdErr) const override;
 
-    virtual bool isOutputFormat() const { return false; }
+    virtual bool isOutputFormat() const override { return false; }
 
 
 };

flacon-3.1.1.tar.gz/formats/wav.cpp -> flacon-4.0.0.tar.gz/formats/wav.cpp Changed

@@ -34,6 +34,7 @@
  ************************************************/
 QStringList Format_Wav::decoderArgs(const QString &fileName) const
 {
+    Q_UNUSED(fileName);
     return QStringList();
 }
 
@@ -46,14 +47,17 @@
     mId   = "WAV";
     mExt  = "wav";
     mName = "WAV";
+    mSettingsGroup = "Wav";
 }
 
 
 /************************************************
 
  ************************************************/
-QStringList OutFormat_Wav::encoderArgs(Track *track, const QString &outFile) const
+QStringList OutFormat_Wav::encoderArgs(const Track *track, const QString &outFile) const
 {
+    Q_UNUSED(track);
+    Q_UNUSED(outFile);
     return QStringList();
 }
 
@@ -63,27 +67,11 @@
  ************************************************/
 QStringList OutFormat_Wav::gainArgs(const QStringList &files) const
 {
+    Q_UNUSED(files);
     return QStringList();
 }
 
 
-/************************************************
-
- ************************************************/
-Encoder *OutFormat_Wav::createEncoder(Track *track, QObject *parent) const
-{
-    return new Encoder_Wav(this, track, parent);
-}
-
-
-/************************************************
-
- ************************************************/
-Gain *OutFormat_Wav::createGain(Disk *disk, Track *track, QObject *parent) const
-{
-    return 0;
-}
-
 
 /************************************************
 
@@ -100,51 +88,11 @@
  ************************************************/
 EncoderConfigPage *OutFormat_Wav::configPage(QWidget *parent) const
 {
-    return 0;
-}
-
-
-/************************************************
-
- ************************************************/
-Encoder_Wav::Encoder_Wav(const OutFormat *format, Track *track, QObject *parent):
-    Encoder(format, track, parent)
-{
+    Q_UNUSED(parent);
+    return nullptr;
 }
 
 
-/************************************************
-
- ************************************************/
-void Encoder_Wav::doRun()
-{
-    QFile srcFile(inputFile());
-    QFile destFile(outFile());
-
-    bool res = (!destFile.exists() || destFile.remove());
-
-    if (res)
-        res =  srcFile.rename(outFile());
-
-    if (!res)
-    {
-        error(track(),
-              tr("I can't rename file:\n%1 to %2\n%3").arg(
-                  inputFile(),
-                  outFile(),
-                  srcFile.errorString()));
-    }
-}
-
-
-/************************************************
-
- ************************************************/
-QStringList Encoder_Wav::processArgs() const
-{
-    return QStringList();
-}
-

flacon-3.1.1.tar.gz/formats/wav.h -> flacon-4.0.0.tar.gz/formats/wav.h Changed

@@ -36,46 +36,33 @@
 public:
     OutFormat_Wav();
 
-    virtual QString encoderProgramName() const { return ""; }
-    virtual QString gainProgramName() const { return ""; }
+    virtual QString encoderProgramName() const override { return ""; }
+    virtual QString gainProgramName() const override { return ""; }
 
-    virtual QStringList encoderArgs(Track *track, const QString &outFile) const;
-    virtual QStringList gainArgs(const QStringList &files) const;
+    virtual QStringList encoderArgs(const Track *track, const QString &outFile) const override;
+    virtual QStringList gainArgs(const QStringList &files) const override;
 
 
-    QHash<QString, QVariant> defaultParameters() const;
-    EncoderConfigPage *configPage(QWidget *parent = 0) const;
+    QHash<QString, QVariant> defaultParameters() const override;
+    EncoderConfigPage *configPage(QWidget *parent = 0) const override;
 
-    virtual bool hasConfigPage() const { return false; }
+    virtual bool hasConfigPage() const override { return false; }
 
-    virtual Encoder *createEncoder(Track *track, QObject *parent = 0) const;
-    virtual Gain *createGain(Disk *disk, Track *track, QObject *parent = 0) const;
 };
 
 
-class Encoder_Wav: public Encoder
-{
-    Q_OBJECT
-public:
-    explicit Encoder_Wav(const OutFormat *format, Track *track, QObject *parent = 0);
-
-protected:
-    void doRun();
-    virtual QStringList processArgs() const;
-};
-
 class Format_Wav: public AudioFormat
 {
 public:
-    virtual QString name() const { return "WAV"; }
-    virtual QString ext() const { return "wav"; }
-    virtual bool isInputFormat() const { return true; }
+    virtual QString name() const override { return "WAV"; }
+    virtual QString ext() const override { return "wav"; }
+    virtual bool isInputFormat() const override { return true; }
 
-    virtual QString decoderProgramName() const { return ""; }
-    virtual QStringList decoderArgs(const QString &fileName) const;
+    virtual QString decoderProgramName() const override { return ""; }
+    virtual QStringList decoderArgs(const QString &fileName) const override;
 
-    virtual QByteArray magic() const { return "RIFF"; }
-    virtual uint const magicOffset() const { return 0; }
+    virtual QByteArray magic() const override { return "RIFF"; }
+    virtual uint magicOffset() const override { return 0; }
 };
 
 #endif // WAV_H

flacon-3.1.1.tar.gz/formats/wv.cpp -> flacon-4.0.0.tar.gz/formats/wv.cpp Changed

flacon-3.1.1.tar.gz/formats/wv.h -> flacon-4.0.0.tar.gz/formats/wv.h Changed

@@ -37,34 +37,34 @@
 public:
     OutFormat_Wv();
 
-    virtual QString encoderProgramName() const { return "wavpack"; }
-    virtual QString gainProgramName() const { return "wvgain"; }
+    virtual QString encoderProgramName() const override { return "wavpack"; }
+    virtual QString gainProgramName() const override { return "wvgain"; }
 
-    virtual QStringList encoderArgs(Track *track, const QString &outFile) const;
-    virtual QStringList gainArgs(const QStringList &files) const;
+    virtual QStringList encoderArgs(const Track *track, const QString &outFile) const override;
+    virtual QStringList gainArgs(const QStringList &files) const override;
 
-    QHash<QString, QVariant> defaultParameters() const;
-    EncoderConfigPage *configPage(QWidget *parent = 0) const;
+    QHash<QString, QVariant> defaultParameters() const override;
+    EncoderConfigPage *configPage(QWidget *parent = 0) const override;
 
 };
 
 class Format_Wv: public AudioFormat
 {
 public:
-    virtual QString name() const { return "WavPack"; }
-    virtual QString ext() const { return "wv"; }
-    virtual QByteArray magic() const { return "wvpk"; }
-    virtual uint const magicOffset() const { return 0; }
+    virtual QString name() const override { return "WavPack"; }
+    virtual QString ext() const override { return "wv"; }
+    virtual QByteArray magic() const override { return "wvpk"; }
+    virtual uint magicOffset() const override { return 0; }
 
 
-    virtual bool isInputFormat() const { return true; }
-    virtual QString decoderProgramName() const { return "wvunpack"; }
-    virtual QStringList decoderArgs(const QString &fileName) const;
+    virtual bool isInputFormat() const override { return true; }
+    virtual QString decoderProgramName() const override { return "wvunpack"; }
+    virtual QStringList decoderArgs(const QString &fileName) const override;
 
-    virtual bool isOutputFormat() const { return false; }
+    virtual bool isOutputFormat() const override { return false; }
 
 protected:
-    virtual bool checkMagic(const QByteArray &data) const;
+    virtual bool checkMagic(const QByteArray &data) const override;
 
 };
 
@@ -74,8 +74,8 @@
 public:
     explicit ConfigPage_Wv(QWidget *parent = 0);
 
-    virtual void load();
-    virtual void write();
+    virtual void load() override;
+    virtual void write() override;
 };
 
 #endif // WV_H

flacon-3.1.1.tar.gz/gui/aboutdialog/aboutdialog.cpp -> flacon-4.0.0.tar.gz/gui/aboutdialog/aboutdialog.cpp Changed

@@ -26,9 +26,12 @@
 
 #include "aboutdialog.h"
 #include "translatorsinfo.h"
+#include "types.h"
 #include <QDate>
 #include <QList>
-
+#include <QDebug>
+#include <QPaintEvent>
+#include <QPainter>
 
 /************************************************
 
@@ -39,9 +42,8 @@
     setupUi(this);
     setWindowTitle(tr("About Flacon"));
 
-    logoLabel->setFixedSize(48, 48);
-    logoLabel->setScaledContents(true);
-    logoLabel->setPixmap(QPixmap(":logo"));
+    this->layout()->setSpacing(10);
+    titleLabel->setStyleSheet("color: #FFFFFF;");
 
     authorsEdit->viewport()->setAutoFillBackground(false);
     thanksEdit->viewport()->setAutoFillBackground(false);
@@ -82,11 +84,36 @@
 
 
 /************************************************
+ *
+ ************************************************/
+void AboutDialog::paintEvent(QPaintEvent *)
+{
+    QRect rect(0, 0, this->width(), titleLabel->pos().y() + titleLabel->height());
+    QPainter painter(this);
+    painter.fillRect(rect, QColor::fromRgb(0x404040));
+}
+
+
+/************************************************
 
  ************************************************/
 QString AboutDialog::titleText() const
 {
-    return QString("<div class=name>Flacon</div><div class=ver>%1</div>").arg(FLACON_VERSION);
+    return
+        "<table style='width:100%' border=0><tr>"
+        "<td style='padding:8px 8px;'><img src=':/48/mainicon' style='margin:8 px;'></td>"
+        "<td style='padding:8px 8px;'>" +
+#ifdef GIT_BRANCH
+        QString("<div class=name>Flacon</div> developer version."
+                "<div class=ver>%1 + git %2</b> "
+                "<a href='https://github.com/flacon/flacon/commit/%3'>%3</a></div>")
+            .arg(FLACON_VERSION)
+            .arg(GIT_BRANCH)
+            .arg(GIT_COMMIT_HASH) +
+#else
+        QString("<div class=name>Flacon</div><div class=ver>Version %1</div>").arg(FLACON_VERSION) +
+#endif
+        "</td></tr></table>";
 }
 
 
@@ -157,10 +184,6 @@
                "mailto:h31mail@yandex.ru",
                tr("WavPack support patch"));
 
-    result.add("Charles Barcza",
-               "mailto:kbarcza@blackpanther.hu",
-               tr("Application icon, Packaging"));
-
     result.add("Kyrill Detinov",
                "mailto:lazy.kent@opensuse.org",
                tr("Packaging, testing"));
@@ -173,6 +196,9 @@
                "mailto:tsokolp@gmail.com",
                tr("Flacon account on github.com"));
 
+    result.add("FlatIcon",
+               "https://www.flaticon.com",
+               "Icon for application");
     return result;
 }

flacon-3.1.1.tar.gz/gui/aboutdialog/aboutdialog.h -> flacon-4.0.0.tar.gz/gui/aboutdialog/aboutdialog.h Changed

flacon-3.1.1.tar.gz/gui/aboutdialog/aboutdialog.ui -> flacon-4.0.0.tar.gz/gui/aboutdialog/aboutdialog.ui Changed

flacon-3.1.1.tar.gz/gui/configdialog/configdialog.cpp -> flacon-4.0.0.tar.gz/gui/configdialog/configdialog.cpp Changed

@@ -26,7 +26,7 @@
 
 #include "configdialog.h"
 #include "outformat.h"
-
+#include "../types.h"
 #include "settings.h"
 #include "project.h"
 #include "../controls.h"
@@ -35,7 +35,10 @@
 #include <QSet>
 #include <QFileDialog>
 #include <QDebug>
-
+#include <QCheckBox>
+#include <QComboBox>
+#include <QLineEdit>
+#include <QSpinBox>
 
 /************************************************
 
@@ -76,14 +79,24 @@
 
     connect(pages, SIGNAL(currentChanged(int)), this, SLOT(setPage(int)));
 
-    tmpDirButton->setIcon(Project::getIcon("document-open-folder", "document-open", "folder_open", ":/icons/16/select-folder"));
+    tmpDirButton->setIcon(loadIcon("folder"));
     connect(tmpDirButton, SIGNAL(clicked()), this, SLOT(tmpDirShowDialog()));
 
-    preGapComboBox->addItem(tr("Extract to separate file"), OutFormat::preGapTypeToString(OutFormat::PreGapExtractToFile));
-    preGapComboBox->addItem(tr("Add to first track"), OutFormat::preGapTypeToString(OutFormat::PreGapAddToFirstTrack));
 
-    pagesListInit();
+    connect(coverDisableButton,  &QRadioButton::clicked,  [=](){this->setCoverMode(CoverMode::Disable);  });
+    connect(coverKeepSizeButton, &QRadioButton::clicked,  [=](){this->setCoverMode(CoverMode::OrigSize); });
+    connect(coverScaleButton,    &QRadioButton::clicked,  [=](){this->setCoverMode(CoverMode::Scale);    });
+
+    preGapComboBox->addItem(tr("Extract to separate file"), preGapTypeToString(PreGapType::ExtractToFile));
+    preGapComboBox->addItem(tr("Add to first track"),       preGapTypeToString(PreGapType::AddToFirstTrack));
+
+    tabPagesInit();
+#ifdef Q_OS_MAC
+    pages->removeTab(pages->indexOf(programsPage));
+#else
     programsInit();
+#endif
+
     pages->setCurrentIndex(0);
     load();
 
@@ -103,13 +116,8 @@
 /************************************************
 
  ************************************************/
-void ConfigDialog::pagesListInit()
+void ConfigDialog::tabPagesInit()
 {
-    QListWidgetItem *item = new QListWidgetItem(pagesList);
-    item->setText(tr("General"));
-    item->setIcon(Project::getIcon("go-home", "gohome", ":/icons/32/settings-main"));
-    pagesList->addItem(item);
-
     int n = 1;
     foreach(OutFormat *format, OutFormat::allFormats())
     {
@@ -120,39 +128,9 @@
         mEncodersPages << page;
 
         page->setObjectName(format->id());
-        pages->insertWidget(n, page);
+        pages->insertTab(n, page, format->name());
         n++;
-
-        item = new QListWidgetItem(pagesList);
-        item->setText(format->name());
-        item->setIcon(Project::getIcon("audio-x-generic", "sound", ":/icons/32/settings-encoder"));
-        pagesList->addItem(item);
     }
-
-    item = new QListWidgetItem(pagesList);
-    item->setText(tr("Programs"));
-    item->setIcon(Project::getIcon("applications-system", "gear", ":/icons/32/settings-programs"));
-    pagesList->addItem(item);
-
-
-    // Set item width ........................
-    int width = 0;
-    for(int i=0; i<pagesList->count(); ++i)
-    {
-        item = pagesList->item(i);
-        width = qMax(width, pagesList->fontMetrics().width(item->text()));
-    }
-
-    width += 42;
-
-    for(int i=0; i<pagesList->count(); ++i)
-    {
-        item = pagesList->item(i);
-        int h = pagesList->height() + pagesList->fontMetrics().height() + 8;
-        item->setSizeHint(QSize(width, h));
-    }
-
-    pagesList->setMaximumWidth(width + 2 * pagesList->frameWidth());
 }
 
 
@@ -203,7 +181,7 @@
 void ConfigDialog::setPage(int pageIndex)
 {
     pageTitle->setText(pages->currentWidget()->windowTitle());
-    pagesList->setCurrentRow(pageIndex);
+    pages->setCurrentIndex(pageIndex);
 }
 
 
@@ -236,6 +214,53 @@
 }
 
 
+
+/************************************************
+ *
+ ************************************************/
+void ConfigDialog::setCoverMode(CoverMode mode)
+{
+    switch (mode)
+    {
+    case CoverMode::Disable:
+        coverDisableButton->setChecked(true);
+        coverResizeSpinBox->setEnabled(false);
+        break;
+
+    case CoverMode::OrigSize:
+        coverKeepSizeButton->setChecked(true);
+        coverResizeSpinBox->setEnabled(false);
+        break;
+
+    case CoverMode::Scale:
+        coverScaleButton->setChecked(true);
+        coverResizeSpinBox->setEnabled(true);
+        break;
+    }
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void loadWidget(Settings::Key key, QCheckBox *widget)
+{
+    widget->setChecked(settings->value(key).toBool());
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void loadWidget(Settings::Key key, QSpinBox *widget)
+{
+    bool ok;
+    int value = settings->value(key).toInt(&ok);
+    if (ok)
+        widget->setValue(value);
+}
+
+
 /************************************************
 
  ************************************************/
@@ -247,6 +272,9 @@
     EncoderConfigPage::loadWidget("PerTrackCue/Create",    perTrackCueCheck);
     EncoderConfigPage::loadWidget("PerTrackCue/Pregap",    preGapComboBox);
 
+    setCoverMode(settings->coverMode());
+    loadWidget(Settings::Cover_ResizeSize,   coverResizeSpinBox);
+
     foreach(EncoderConfigPage *page, mEncodersPages)
         page->load();
 
@@ -256,6 +284,24 @@
 
 
 /************************************************
+ *
+ ************************************************/
+void writeWidget(Settings::Key key, QCheckBox *widget)
+{
+    settings->setValue(key, widget->isChecked());
+}
+
+
+/************************************************
+
+ ************************************************/
+void writeWidget(Settings::Key key, QSpinBox *widget)
+{
+    settings->setValue(key, widget->value());
+}
+
+
+/************************************************
 
  ************************************************/
 void ConfigDialog::write()
@@ -266,6 +312,9 @@
     EncoderConfigPage::writeWidget("PerTrackCue/Create",    perTrackCueCheck);
     EncoderConfigPage::writeWidget("PerTrackCue/Pregap",    preGapComboBox);
 
+    settings->setValue(Settings::Cover_Mode, coverModeToString(coverMode()));
+    writeWidget(Settings::Cover_ResizeSize,   coverResizeSpinBox);
+
     foreach(EncoderConfigPage *page, mEncodersPages)
         page->write();
 
@@ -278,6 +327,19 @@
 /************************************************
 
  ************************************************/
+CoverMode ConfigDialog::coverMode() const
+{
+    if (coverDisableButton->isChecked())  return CoverMode::Disable;
+    if (coverKeepSizeButton->isChecked()) return CoverMode::OrigSize;
+    if (coverScaleButton->isChecked())    return CoverMode::Scale;
+
+    return CoverMode::Disable;
+}
+
+
+/************************************************
+
+ ************************************************/
 EncoderConfigPage::EncoderConfigPage(QWidget *parent):
     QWidget(parent)
 {
@@ -365,9 +427,9 @@
 void EncoderConfigPage::fillReplayGainComboBox(QComboBox *comboBox)
 {
     comboBox->clear();
-    comboBox->addItem(tr("Disabled",  "ReplayGain type combobox"), OutFormat::gainTypeToString(OutFormat::GainDisable));
-    comboBox->addItem(tr("Per Track", "ReplayGain type combobox"), OutFormat::gainTypeToString(OutFormat::GainTrack));
-    comboBox->addItem(tr("Per Album", "ReplayGain type combobox"), OutFormat::gainTypeToString(OutFormat::GainAlbum));
+    comboBox->addItem(tr("Disabled",  "ReplayGain type combobox"), gainTypeToString(GainType::Disable));
+    comboBox->addItem(tr("Per Track", "ReplayGain type combobox"), gainTypeToString(GainType::Track));
+    comboBox->addItem(tr("Per Album", "ReplayGain type combobox"), gainTypeToString(GainType::Album));
     comboBox->setToolTip(tr("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."));
@@ -466,6 +528,7 @@
     settings->setValue(key, widget->value());
 }
 
+
 /************************************************
 
  ************************************************/

flacon-3.1.1.tar.gz/gui/configdialog/configdialog.h -> flacon-4.0.0.tar.gz/gui/configdialog/configdialog.h Changed

flacon-3.1.1.tar.gz/gui/configdialog/configdialog.ui -> flacon-4.0.0.tar.gz/gui/configdialog/configdialog.ui Changed

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>646</width>
-    <height>425</height>
+    <width>635</width>
+    <height>521</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -21,19 +21,13 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
+    <layout class="QVBoxLayout" name="verticalLayout">
      <item>
-      <widget class="QListWidget" name="pagesList">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Expanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="maximumSize">
+      <widget class="QLabel" name="pageTitle">
+       <property name="minimumSize">
         <size>
-         <width>120</width>
-         <height>16777215</height>
+         <width>0</width>
+         <height>34</height>
         </size>
        </property>
        <property name="font">
@@ -42,285 +36,282 @@
          <bold>true</bold>
         </font>
        </property>
-       <property name="horizontalScrollBarPolicy">
-        <enum>Qt::ScrollBarAlwaysOff</enum>
-       </property>
-       <property name="autoScroll">
-        <bool>false</bool>
+       <property name="text">
+        <string>General configuration</string>
        </property>
-       <property name="editTriggers">
-        <set>QAbstractItemView::NoEditTriggers</set>
-       </property>
-       <property name="showDropIndicator" stdset="0">
-        <bool>false</bool>
+      </widget>
+     </item>
+     <item>
+      <widget class="QTabWidget" name="pages">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>1</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
-       <property name="iconSize">
+       <property name="minimumSize">
         <size>
-         <width>24</width>
-         <height>24</height>
+         <width>0</width>
+         <height>11</height>
         </size>
        </property>
-       <property name="movement">
-        <enum>QListView::Static</enum>
-       </property>
-       <property name="flow">
-        <enum>QListView::TopToBottom</enum>
-       </property>
-       <property name="isWrapping" stdset="0">
-        <bool>false</bool>
-       </property>
-       <property name="spacing">
+       <property name="currentIndex">
         <number>0</number>
        </property>
-       <property name="viewMode">
-        <enum>QListView::IconMode</enum>
-       </property>
-       <property name="selectionRectVisible">
-        <bool>true</bool>
-       </property>
-       <property name="currentRow">
-        <number>-1</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <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">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </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>0</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>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 directory:</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">
-                 <property name="text">
-                  <string notr="true">...</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
+       <widget class="QWidget" name="generalPage">
+        <attribute name="title">
+         <string>General</string>
+        </attribute>
+        <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>Thread count:</string>
+             </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 directory:</string>
+             </property>
+             <property name="textFormat">
+              <enum>Qt::PlainText</enum>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <layout class="QHBoxLayout" name="horizontalLayout_5">
+             <item>
+              <widget class="QLineEdit" name="tmpDirEdit"/>
              </item>
-             <item row="2" column="0">
-              <widget class="QLabel" name="codePageLabel">
+             <item>
+              <widget class="QToolButton" name="tmpDirButton">
                <property name="text">
-                <string>Default codepage:</string>
-               </property>
-               <property name="buddy">
-                <cstring>codePageComboBox</cstring>
+                <string notr="true">...</string>
                </property>
               </widget>
              </item>
-             <item row="2" column="1">
-              <widget class="CodePageComboBox" name="codePageComboBox"/>
-             </item>
             </layout>
            </item>
-           <item>
-            <widget class="QGroupBox" name="perTrackCueGroup">
-             <property name="title">
-              <string>Per track cue sheet</string>
+           <item row="2" column="0">
+            <widget class="QLabel" name="codePageLabel">
+             <property name="text">
+              <string>Default codepage:</string>
              </property>
-             <layout class="QVBoxLayout" name="verticalLayout_3">
-              <item>
-               <widget class="QCheckBox" name="perTrackCueCheck">
+            </widget>
+           </item>
+           <item row="2" column="1">
+            <widget class="CodePageComboBox" name="codePageComboBox"/>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="perTrackCueGroup">
+           <property name="title">
+            <string>Per track cue sheet</string>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_3">
+            <item>
+             <widget class="QCheckBox" name="perTrackCueCheck">
+              <property name="text">
+               <string>Create per track cue sheet</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <layout class="QGridLayout" name="gridLayout">
+              <item row="0" column="0">
+               <widget class="QLabel" name="preGapLabel">
                 <property name="text">
-                 <string>Create per track cue sheet</string>
+                 <string>First track pregap:</string>
                 </property>
                </widget>
               </item>
-              <item>
-               <layout class="QGridLayout" name="gridLayout">
-                <item row="0" column="0">
-                 <widget class="QLabel" name="preGapLabel">
-                  <property name="text">
-                   <string>First track pregap:</string>
-                  </property>
-                  <property name="buddy">
-                   <cstring>preGapComboBox</cstring>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="1">
-                 <widget class="QComboBox" name="preGapComboBox">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                    <horstretch>1</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="sizeIncrement">
-                   <size>
-                    <width>0</width>
-                    <height>0</height>
-                   </size>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
+              <item row="0" column="1">
+               <widget class="QComboBox" name="preGapComboBox">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                  <horstretch>1</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="sizeIncrement">
+                 <size>
+                  <width>0</width>
+                  <height>0</height>
+                 </size>
+                </property>
+               </widget>
               </item>
              </layout>
-            </widget>
-           </item>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="coverGroupBox">
+           <property name="title">
+            <string>Cover image</string>
+           </property>
+           <property name="checkable">
+            <bool>false</bool>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_4">
+            <item>
+             <layout class="QGridLayout" name="gridLayout_2">
+              <item row="0" column="0" colspan="2">
+               <widget class="QRadioButton" name="coverDisableButton">
+                <property name="text">
+                 <string>Do not copy image</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0" colspan="2">
+               <widget class="QRadioButton" name="coverKeepSizeButton">
+                <property name="text">
+                 <string>Keep original image size</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="0">
+               <widget class="QRadioButton" name="coverScaleButton">
+                <property name="text">
+                 <string>Resize if image size greater than</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QSpinBox" name="coverResizeSpinBox">
+                <property name="specialValueText">
+                 <string/>
+                </property>
+                <property name="suffix">
+                 <string> px</string>
+                </property>
+                <property name="minimum">
+                 <number>50</number>
+                </property>
+                <property name="maximum">
+                 <number>100000</number>
+                </property>
+                <property name="singleStep">
+                 <number>50</number>
+                </property>
+                <property name="value">
+                 <number>1024</number>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer_5">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>233</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="programsPage">
+        <attribute name="title">
+         <string>Programs</string>
+        </attribute>
+        <layout class="QVBoxLayout" name="verticalLayout_5">
+         <item>
+          <widget class="QScrollArea" name="progsArea">
+           <property name="frameShape">
+            <enum>QFrame::NoFrame</enum>
+           </property>
+           <property name="widgetResizable">
+            <bool>true</bool>
+           </property>
+           <widget class="QWidget" name="scrollAreaWidgetContents">
+            <property name="geometry">
+             <rect>
+              <x>0</x>
+              <y>0</y>
+              <width>579</width>
+              <height>311</height>
+             </rect>
+            </property>
+            <layout class="QVBoxLayout" name="verticalLayout_12">
+             <item>
+              <layout class="QGridLayout" name="progsLayout">
+               <property name="spacing">
+                <number>0</number>
+               </property>
+              </layout>
+             </item>
+             <item>
+              <spacer name="verticalSpacer_2">
+               <property name="orientation">
+                <enum>Qt::Vertical</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>20</width>
+                 <height>40</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </widget>
+          </widget>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_4">
            <item>
-            <spacer name="verticalSpacer_5">
+            <spacer name="horizontalSpacer_2">
              <property name="orientation">
-              <enum>Qt::Vertical</enum>
+              <enum>Qt::Horizontal</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
-               <width>20</width>
-               <height>233</height>
+               <width>40</width>
+               <height>20</height>
               </size>
              </property>
             </spacer>
            </item>
-          </layout>
-         </widget>
-         <widget class="QWidget" name="programsPage">
-          <layout class="QVBoxLayout" name="verticalLayout_5">
            <item>
-            <widget class="QScrollArea" name="progsArea">
-             <property name="frameShape">
-              <enum>QFrame::NoFrame</enum>
-             </property>
-             <property name="widgetResizable">
-              <bool>true</bool>
+            <widget class="QPushButton" name="progScanButton">
+             <property name="text">
+              <string>Rescan</string>
              </property>
-             <widget class="QWidget" name="scrollAreaWidgetContents">
-              <property name="geometry">
-               <rect>
-                <x>0</x>
-                <y>0</y>
-                <width>100</width>
-                <height>30</height>
-               </rect>
-              </property>
-              <layout class="QVBoxLayout" name="verticalLayout_12">
-               <item>
-                <layout class="QGridLayout" name="progsLayout">
-                 <property name="spacing">
-                  <number>0</number>
-                 </property>
-                </layout>
-               </item>
-               <item>
-                <spacer name="verticalSpacer_2">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>20</width>
-                   <height>40</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-              </layout>
-             </widget>
             </widget>
            </item>
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_4">
-             <item>
-              <spacer name="horizontalSpacer_2">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-             <item>
-              <widget class="QPushButton" name="progScanButton">
-               <property name="text">
-                <string>Rescan</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
           </layout>
-         </widget>
-        </widget>
-       </item>
-      </layout>
+         </item>
+        </layout>
+       </widget>
+      </widget>
      </item>
     </layout>
    </item>
@@ -351,7 +342,6 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>pagesList</tabstop>
   <tabstop>progScanButton</tabstop>
   <tabstop>buttonBox</tabstop>
  </tabstops>
@@ -364,8 +354,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>262</x>
-     <y>420</y>
+     <x>271</x>
+     <y>415</y>
     </hint>
     <hint type="destinationlabel">
      <x>157</x>
@@ -380,8 +370,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>330</x>
-     <y>420</y>
+     <x>339</x>
+     <y>415</y>
     </hint>
     <hint type="destinationlabel">
      <x>286</x>
@@ -389,37 +379,5 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>pagesList</sender>
-   <signal>currentRowChanged(int)</signal>
-   <receiver>pages</receiver>
-   <slot>setCurrentIndex(int)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>43</x>
-     <y>186</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>203</x>
-     <y>180</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>perTrackCueCheck</sender>
-   <signal>clicked(bool)</signal>
-   <receiver>preGapComboBox</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>289</x>
-     <y>172</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>295</x>
-     <y>192</y>
-    </hint>
-   </hints>
-  </connection>
  </connections>
 </ui>

flacon-3.1.1.tar.gz/gui/controls.cpp -> flacon-4.0.0.tar.gz/gui/controls.cpp Changed

@@ -111,7 +111,8 @@
 /************************************************
 
  ************************************************/
-CodePageComboBox::CodePageComboBox(QWidget *parent)
+CodePageComboBox::CodePageComboBox(QWidget *parent):
+    MultiValuesComboBox(parent)
 {
     addItem(tr("Auto detect", "Codepage auto detection"),  CODEC_AUTODETECT);
     insertSeparator(9999);
@@ -344,7 +345,7 @@
 {
     mBtn = new QToolButton(this);
     mBtn->setText("...");
-    mBtn->setIcon(Project::getIcon("document-open-folder", "document-open", "folder_open", ":/icons/16/program-edit-btn"));
+    mBtn->setIcon(loadIcon("folder"));
     mBtn->setStyleSheet("QToolButton { border: none; padding: 0px; }");
     mBtn->setCursor(Qt::ArrowCursor);
 
@@ -365,7 +366,7 @@
 /************************************************
 
  ************************************************/
-void ProgramEdit::resizeEvent(QResizeEvent *event)
+void ProgramEdit::resizeEvent(QResizeEvent *)
 {
     int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
     QRect btnRect = QRect(QPoint(0,0), QSize(rect().height(), rect().height()));

flacon-4.0.0.tar.gz/gui/coverdialog Added

flacon-4.0.0.tar.gz/gui/coverdialog/asynclistwidgetitem.cpp Added

@@ -0,0 +1,161 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "asynclistwidgetitem.h"
+#include <QtConcurrent/QtConcurrent>
+#include <QListWidgetItem>
+#include <QImage>
+#include <QPainter>
+
+#include <QImageReader>
+
+/************************************************
+ *
+ ************************************************/
+QImage *loadImage(const QString &fileName, const QSize &size)
+{
+    QImage img = QImage(fileName);
+    if (img.isNull())
+        return nullptr;
+
+    QSize imgSize = img.size();
+    QImage *res = new QImage(size, QImage::Format_ARGB32);
+    res->fill(Qt::transparent);
+
+    QPainter painter(res);
+
+    img = img.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    QRectF rect = img.rect();
+    rect.moveCenter(res->rect().center());
+    painter.drawImage(rect, img);
+
+    //....................................
+    QString sizeStr =  QString("%1x%2").arg(imgSize.width()).arg(imgSize.height());
+
+    QFont font = painter.font();
+    font.setPointSize(font.pointSize() * 0.8);
+    font.setBold(true);
+    painter.setFont(font);
+
+    QPen pen = painter.pen();
+    pen.setColor(QColor(255, 255, 255, 255));
+    painter.setPen(pen);
+
+    rect = painter.fontMetrics().tightBoundingRect(sizeStr);
+    rect.adjust(-5, -4, 5, 4);
+    rect.moveBottomRight(res->rect().bottomRight());
+
+    painter.fillRect(rect.adjusted(1,1,-1,-1), QColor(0, 0, 0, 128));
+    painter.drawText(rect, Qt::AlignCenter, sizeStr);
+
+    pen.setColor(QColor(255, 255, 255, 128));
+    painter.setPen(pen);
+    painter.drawRoundedRect(rect, 2, 2);
+
+    return res;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+AsyncListWidgetItem::AsyncListWidgetItem(QListWidget *view, int type):
+    QListWidgetItem(view, type),
+    mWatcher(nullptr)
+{
+
+}
+
+
+/************************************************
+ *
+ ************************************************/
+AsyncListWidgetItem::AsyncListWidgetItem(const QString &text, QListWidget *view, int type):
+    QListWidgetItem(text, view, type),
+    mWatcher(nullptr)
+{
+
+}
+
+
+/************************************************
+ *
+ ************************************************/
+AsyncListWidgetItem::AsyncListWidgetItem(const AsyncListWidgetItem &other):
+    QListWidgetItem(other),
+    mWatcher(other.mWatcher)
+{
+
+}
+
+
+/************************************************
+ *
+ ************************************************/
+AsyncListWidgetItem::~AsyncListWidgetItem()
+{
+    if (mWatcher)
+    {
+        QObject::disconnect(mWatcher, 0, 0, 0);
+        mWatcher->deleteLater();
+    }
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void AsyncListWidgetItem::setIconAsync(const QString &fileName)
+{
+    if (mWatcher)
+    {
+        QObject::disconnect(mWatcher, 0, 0, 0);
+        mWatcher->deleteLater();
+    }
+
+    mWatcher = new QFutureWatcher<QImage*>;
+
+    mWatcher->connect(mWatcher, &QFutureWatcher<QImage*>::finished,
+                     [this](){this->imageReady();});
+
+    mWatcher->setFuture(QtConcurrent::run(
+                            loadImage,
+                            fileName,
+                            listWidget()->iconSize()));
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void AsyncListWidgetItem::imageReady()
+{
+    QImage *img = mWatcher->future().result();
+    if (img)
+        setIcon(QPixmap::fromImage(*img));
+
+    delete img;
+}

flacon-4.0.0.tar.gz/gui/coverdialog/asynclistwidgetitem.h Added

@@ -0,0 +1,52 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#ifndef ASYNCLISTWIDGETITEM_H
+#define ASYNCLISTWIDGETITEM_H
+
+#include <QListWidgetItem>
+#include <QtConcurrent/QtConcurrent>
+
+
+class AsyncListWidgetItem: public QListWidgetItem
+{
+public:
+    explicit AsyncListWidgetItem(QListWidget *view = Q_NULLPTR, int type = Type);
+    explicit AsyncListWidgetItem(const QString &text, QListWidget *view = Q_NULLPTR, int type = Type);
+    AsyncListWidgetItem(const AsyncListWidgetItem &other);
+    virtual ~AsyncListWidgetItem();
+
+    void setIconAsync(const QString &fileName);
+
+private:
+    QFutureWatcher<QImage*> *mWatcher;
+    void imageReady();
+};
+
+
+#endif // ASYNCLISTWIDGETITEM_H
+
+

flacon-4.0.0.tar.gz/gui/coverdialog/coverdialog.cpp Added

@@ -0,0 +1,159 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "coverdialog.h"
+#include "ui_coverdialog.h"
+
+#include <QListWidget>
+#include <QDebug>
+#include <QDialogButtonBox>
+#include <QPushButton>
+
+#include "disk.h"
+#include "asynclistwidgetitem.h"
+
+
+#define FileNameRole (Qt::UserRole + 1)
+
+/************************************************
+ *
+ ************************************************/
+CoverDialog *CoverDialog::createAndShow(Disk *disk, QWidget *parent)
+{
+    CoverDialog *instance = parent->findChild<CoverDialog*>();
+
+    if (!instance)
+        instance = new CoverDialog(parent);
+
+    instance->setAttribute(Qt::WA_DeleteOnClose);
+    instance->setDisk(disk);
+    instance->show();
+    instance->raise();
+    instance->activateWindow();
+
+    return instance;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+CoverDialog::CoverDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::CoverDialog),
+    mDisk(nullptr)
+{
+    ui->setupUi(this);
+    ui->buttonBox->button(QDialogButtonBox::Reset)->setText(tr("Without cover image"));
+
+    mEmptyIcon = QIcon(QPixmap::fromImage(QImage(":noCover").scaled(
+                                              ui->coverView->iconSize(),
+                                              Qt::KeepAspectRatio,
+                                              Qt::SmoothTransformation)));
+
+    connect(ui->coverView, SIGNAL(itemDoubleClicked(QListWidgetItem*)),
+            this,          SLOT(coverDoubleClicked(QListWidgetItem*)));
+
+    connect(ui->buttonBox, SIGNAL(clicked(QAbstractButton*)),
+            this,          SLOT(buttonClicked(QAbstractButton*)));
+}
+
+
+/************************************************
+ *
+ ************************************************/
+CoverDialog::~CoverDialog()
+{
+    delete ui;
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void CoverDialog::setDisk(Disk *disk)
+{
+    mDisk = disk;
+    ui->coverView->clear();
+    scan(QFileInfo(disk->cueFile()).absoluteDir().absolutePath());
+    ui->coverView->setGridSize(QSize(140, 160));
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void CoverDialog::coverDoubleClicked(QListWidgetItem *)
+{
+    buttonClicked(ui->buttonBox->button(QDialogButtonBox::Ok));
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void CoverDialog::buttonClicked(QAbstractButton *button)
+{
+    if (button == ui->buttonBox->button(QDialogButtonBox::Ok))
+    {
+        QListWidgetItem *item = ui->coverView->currentItem();
+        if (!item)
+            return;
+        mDisk->setCoverImageFile(item->data(FileNameRole).toString());
+        this->accept();
+        return;
+    }
+
+
+    if (button == ui->buttonBox->button(QDialogButtonBox::Reset))
+    {
+        mDisk->setCoverImageFile("");
+        this->accept();
+        return;
+    }
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void CoverDialog::scan(const QString &startDir)
+{
+    QString curFile = mDisk->coverImageFile();
+    foreach (QString f, mDisk->searchCoverImages(startDir))
+    {
+        QFileInfo file(f);
+        AsyncListWidgetItem *item = new AsyncListWidgetItem(ui->coverView);
+        item->setText(file.baseName());
+        item->setData(FileNameRole, file.absoluteFilePath());
+        item->setIcon(mEmptyIcon);
+        item->setIconAsync(file.absoluteFilePath());
+
+        if (file.absoluteFilePath() == curFile)
+            ui->coverView->setCurrentItem(item);
+    }
+}
+

flacon-4.0.0.tar.gz/gui/coverdialog/coverdialog.h Added

@@ -0,0 +1,71 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#ifndef COVERDIALOG_H
+#define COVERDIALOG_H
+
+#include <QDialog>
+#include <QIcon>
+
+class Disk;
+class QAbstractButton;
+class QListWidgetItem;
+
+namespace Ui
+{
+    class CoverDialog;
+}
+
+
+class CoverDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    static CoverDialog *createAndShow(Disk *disk, QWidget *parent = 0);
+    ~CoverDialog() override;
+
+    Disk *disk() const { return mDisk; }
+
+public slots:
+    void setDisk(Disk *disk);
+
+private slots:
+    void coverDoubleClicked(QListWidgetItem *item);
+    void buttonClicked(QAbstractButton *button);
+
+private:
+    explicit CoverDialog(QWidget *parent = 0);
+
+
+    void scan(const QString &startDir);
+
+    Ui::CoverDialog *ui;
+    Disk *mDisk;
+    QIcon mEmptyIcon;
+};
+
+#endif // COVERDIALOG_H

flacon-4.0.0.tar.gz/gui/coverdialog/coverdialog.ui Added

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CoverDialog</class>
+ <widget class="QDialog" name="CoverDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>804</width>
+    <height>361</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Select cover image</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QListWidget" name="coverView">
+     <property name="iconSize">
+      <size>
+       <width>120</width>
+       <height>120</height>
+      </size>
+     </property>
+     <property name="resizeMode">
+      <enum>QListView::Adjust</enum>
+     </property>
+     <property name="viewMode">
+      <enum>QListView::IconMode</enum>
+     </property>
+     <property name="uniformItemSizes">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>CoverDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>CoverDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

flacon-3.1.1.tar.gz/gui/cuediskselectdialog/cuediskselectdialog.ui -> flacon-4.0.0.tar.gz/gui/cuediskselectdialog/cuediskselectdialog.ui Changed

flacon-3.1.1.tar.gz/gui/mainwindow.cpp -> flacon-4.0.0.tar.gz/gui/mainwindow.cpp Changed

@@ -36,6 +36,7 @@
 #include "aboutdialog/aboutdialog.h"
 #include "cuediskselectdialog/cuediskselectdialog.h"
 #include "scanner.h"
+#include "gui/coverdialog/coverdialog.h"
 
 #include <QFileDialog>
 #include <QDir>
@@ -45,6 +46,9 @@
 #include <QQueue>
 #include <QKeyEvent>
 #include <QMimeData>
+#include <QStyleFactory>
+#include <QToolBar>
+#include <QToolButton>
 
 
 /************************************************
@@ -52,12 +56,20 @@
  ************************************************/
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
-    mConverter(new Converter(this)),
-    mScanner(0)
+    mScanner(nullptr)
 {
     setupUi(this);
 
-    setWindowIcon(QIcon::fromTheme("flacon"));
+    qApp->setWindowIcon(loadMainIcon());
+    toolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+    toolBar->setIconSize(QSize(24,24));
+    qApp->setAttribute(Qt::AA_DontShowIconsInMenus, true);
+
+#ifdef Q_OS_MAC
+    this->setUnifiedTitleAndToolBarOnMac(true);
+    setWindowIcon(QIcon());
+#endif
+
     setAcceptDrops(true);
     setAcceptDrops(true);
     this->setContextMenuPolicy(Qt::NoContextMenu);
@@ -69,7 +81,7 @@
     trackView->setRootIsDecorated(false);
     trackView->setItemsExpandable(false);
     trackView->hideColumn((int)TrackView::ColumnComment);
-
+    trackView->setAlternatingRowColors(false);
 
     // Tag edits ...............................................
     tagGenreEdit->setTagName(TAG_GENRE);
@@ -93,7 +105,10 @@
 
     // Buttons .................................................
     outDirButton->setDefaultAction(actionSelectResultDir);
+    outDirButton->setAutoRaise(true);
+
     configureEncoderBtn->setDefaultAction(actionConfigureEncoder);
+    configureEncoderBtn->setAutoRaise(true);
 
     outPatternButton->addPattern("%n", tr("Insert \"Track number\""));
     outPatternButton->addPattern("%N", tr("Insert \"Total number of tracks\""));
@@ -102,6 +117,7 @@
     outPatternButton->addPattern("%t", tr("Insert \"Track title\""));
     outPatternButton->addPattern("%y", tr("Insert \"Year\""));
     outPatternButton->addPattern("%g", tr("Insert \"Genre\""));
+    outPatternButton->setAutoRaise(true);
 
     QString pattern;
 
@@ -136,6 +152,7 @@
             this, SLOT(replaceOutPattern(QString)));
     outPatternEdit->setAutoCompletionCaseSensitivity(Qt::CaseSensitive);
 
+
     // Format combo ............................................
     initOutFormatCombo();
 
@@ -150,10 +167,10 @@
     connect(outFormatCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setOutFormat()));
     connect(codepageCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setCodePage()));
 
-    connect(mConverter, SIGNAL(finished()), this, SLOT(setControlsEnable()));
-
     connect(trackView, SIGNAL(selectCueFile(Disk*)), this, SLOT(setCueForDisc(Disk*)));
     connect(trackView, SIGNAL(selectAudioFile(Disk*)), this, SLOT(setAudioForDisk(Disk*)));
+    connect(trackView, SIGNAL(selectCoverImage(Disk*)),
+            this, SLOT(setCoverImage(Disk*)));
 
     connect(trackView->model(), SIGNAL(layoutChanged()), this, SLOT(refreshEdits()));
     connect(trackView->model(), SIGNAL(layoutChanged()), this, SLOT(setControlsEnable()));
@@ -178,7 +195,7 @@
 /************************************************
  *
  ************************************************/
-void MainWindow::showEvent(QShowEvent *event)
+void MainWindow::showEvent(QShowEvent *)
 {
     if (project->count())
         trackView->selectDisk(project->disk(0));
@@ -198,7 +215,8 @@
  ************************************************/
 void MainWindow::closeEvent(QCloseEvent *)
 {
-    mConverter->stop();
+    if (mConverter)
+        mConverter->stop();
     saveSettings();
 }
 
@@ -275,8 +293,6 @@
  ************************************************/
 void MainWindow::deletePattern()
 {
-    //settings->setValue(Settings::OutFiles_Pattern, outPatternEdit->currentText());
-    //settings->setValue(Settings::OutFiles_PatternHistory, outPatternEdit->history());
     QStringList history = settings->value(Settings::OutFiles_PatternHistory).toStringList();
     QString currentPattern = outPatternEdit->currentText();
     history.removeOne(currentPattern);
@@ -385,17 +401,17 @@
  ************************************************/
 void MainWindow::setControlsEnable()
 {
-    bool running = mConverter->isRunning();
+    bool running = mConverter && mConverter->isRunning();
 
     if (running)
     {
         outFilesBox->setEnabled(false);
         tagsBox->setEnabled(false);
 
-        actionAddFile->setEnabled(false);
+        actionAddDisk->setEnabled(false);
         actionRemoveDisc->setEnabled(false);
-        actionStartConvert->setEnabled(false);
-        actionAbortConvert->setEnabled(true);
+        actionStartConvert->setVisible(false);
+        actionAbortConvert->setVisible(true);
         actionDownloadTrackInfo->setEnabled(false);
         actionScan->setEnabled(false);
         actionConfigure->setEnabled(false);
@@ -403,18 +419,24 @@
     }
     else
     {
+        QList<Disk*> selectedDisks = trackView->selectedDisks();
+
         bool tracksSelected = trackView->selectedTracks().count() > 0;
         bool discsSelected  = trackView->selectedDisks().count() > 0;
-        bool canConvert = mConverter->canConvert();
+        bool canConvert = Converter::canConvert();
+        bool canDownload = false;
+        foreach (const Disk *disk, selectedDisks)
+            canDownload = canDownload || !disk->discId().isEmpty();
 
         outFilesBox->setEnabled(true);
         tagsBox->setEnabled(tracksSelected);
 
-        actionAddFile->setEnabled(true);
+        actionAddDisk->setEnabled(true);
         actionRemoveDisc->setEnabled(discsSelected);
+        actionStartConvert->setVisible(true);
+        actionAbortConvert->setVisible(false);
         actionStartConvert->setEnabled(canConvert);
-        actionAbortConvert->setEnabled(running);
-        actionDownloadTrackInfo->setEnabled(tracksSelected);
+        actionDownloadTrackInfo->setEnabled(canDownload);
         actionScan->setEnabled(!mScanner);
         actionConfigure->setEnabled(true);
         actionConfigureEncoder->setEnabled(OutFormat::currentFormat()->hasConfigPage());
@@ -543,6 +565,13 @@
     }
 
     trackView->setColumnWidth(TrackView::ColumnPercent, 200);
+    mConverter = new Converter();
+    connect(mConverter, SIGNAL(finished()),
+            this, SLOT(setControlsEnable()));
+
+    connect(mConverter, SIGNAL(finished()),
+            mConverter, SLOT(deleteLater()));
+
     mConverter->start();
     setControlsEnable();
 }
@@ -553,7 +582,8 @@
  ************************************************/
 void MainWindow::stopConvert()
 {
-    mConverter->stop();
+    if (mConverter)
+        mConverter->stop();
     setControlsEnable();
 }
 
@@ -670,6 +700,15 @@
 
 
 /************************************************
+ *
+ ************************************************/
+void MainWindow::setCoverImage(Disk *disk)
+{
+    CoverDialog::createAndShow(disk, this);
+}
+
+
+/************************************************
 
  ************************************************/
 void MainWindow::addFileOrDir(const QString &fileName)
@@ -755,6 +794,29 @@
 /************************************************
 
  ************************************************/
+bool MainWindow::event(QEvent *event)
+{
+    switch (event->type())
+    {
+#ifdef Q_OS_MAC
+    case QEvent::WindowActivate:
+        toolBar->setEnabled(true);
+        break;
+
+    case QEvent::WindowDeactivate:
+        toolBar->setEnabled(false);
+        break;
+#endif
+    default:
+        break;
+    }
+    return QMainWindow::event(event);
+}
+
+
+/************************************************
+
+ ************************************************/
 void MainWindow::showErrorMessage(const QString &message)
 {
     QMessageBox::critical(this, tr("Flacon", "Error"), message);
@@ -779,36 +841,51 @@
  ************************************************/
 void MainWindow::initActions()
 {
-    actionAddFile->setIcon(Project::getIcon("document-open", "fileopen", ":/icons/22/add-file"));
-    connect(actionAddFile, SIGNAL(triggered()), this, SLOT(openAddFileDialog()));
+    actionAddDisk->setIcon(loadIcon("add-disk"));
+    connect(actionAddDisk, SIGNAL(triggered()), this, SLOT(openAddFileDialog()));
 
-    actionRemoveDisc->setIcon(Project::getIcon("edit-delete", "remove", ":/icons/22/remove-disk"));
+    actionRemoveDisc->setIcon(loadIcon("remove-disk"));
     connect(actionRemoveDisc, SIGNAL(triggered()), this, SLOT(removeDisks()));
 
-    actionScan->setIcon(Project::getIcon("document-open-folder", "document-open", "folder_open", ":/icons/22/scan"));
+    actionScan->setIcon(loadIcon("scan"));
     connect(actionScan, SIGNAL(triggered()), this, SLOT(openScanDialog()));
 
-    actionDownloadTrackInfo->setIcon(Project::getIcon("download", "web-browser", "network", ":/icons/22/download-track-info"));
+    actionDownloadTrackInfo->setIcon(loadIcon("download-info"));
     connect(actionDownloadTrackInfo, SIGNAL(triggered()), this, SLOT(downloadInfo()));
 
 
-    actionStartConvert->setIcon(Project::getIcon("dialog-ok", "button_ok", ":/icons/22/start-convert"));
+    actionStartConvert->setIcon(loadIcon("start-convert"));
     connect(actionStartConvert, SIGNAL(triggered()), this, SLOT(startConvert()));
 
-    actionAbortConvert->setIcon(Project::getIcon("dialog-cancel", "button_cancel", ":/icons/22/abort-convert"));
+    actionAbortConvert->setIcon(loadIcon("abort-convert"));
     connect(actionAbortConvert, SIGNAL(triggered()), this, SLOT(stopConvert()));
 
-    actionSelectResultDir->setIcon(Project::getIcon("document-open-folder", "document-open", "folder_open", ":/icons/22/select-result-dir"));
+    actionSelectResultDir->setIcon(loadIcon("folder"));
     connect(actionSelectResultDir, SIGNAL(triggered()), this, SLOT(openOutDirDialog()));
 
-    actionConfigure->setIcon(Project::getIcon("configure", "preferences-system", ":/icons/22/configure"));
+    actionConfigure->setIcon(loadIcon("configure"));
     connect(actionConfigure, SIGNAL(triggered()), this, SLOT(configure()));
 
     actionConfigureEncoder->setIcon(actionConfigure->icon());
     connect(actionConfigureEncoder, SIGNAL(triggered()), this, SLOT(configureEncoder()));
 
-    actionAbout->setIcon(Project::getIcon("help-about", "info", ":/icons/22/about"));
     connect(actionAbout, SIGNAL(triggered()), this,  SLOT(openAboutDialog()));
+
+    int w = 0;
+    foreach (QAction *act, toolBar->actions())
+    {
+        QToolButton *btn = qobject_cast<QToolButton*>(toolBar->widgetForAction(act));
+        if (btn)
+            w = qMax(w, btn->sizeHint().width());
+    }
+
+    foreach (QAction *act, toolBar->actions())
+    {
+        QToolButton *btn = qobject_cast<QToolButton*>(toolBar->widgetForAction(act));
+        if (btn)
+            btn->setMinimumWidth(w);
+    }
+
 }
 
 
@@ -852,4 +929,33 @@
 }
 
 
+/************************************************
+ *
+ ************************************************/
+QIcon MainWindow::loadMainIcon()
+{
+    if (QIcon::themeName() == "hicolor")
+    {
+        QStringList failback;
+        failback << "oxygen";
+        failback << "Tango";
+        failback << "Prudence-icon";
+        failback << "Humanity";
+        failback << "elementary";
+        failback << "gnome";
+
+
+        QDir usrDir("/usr/share/icons/");
+        QDir usrLocalDir("/usr/local/share/icons/");
+        foreach (QString s, failback)
+        {
+            if (usrDir.exists(s) || usrLocalDir.exists(s))
+            {
+                QIcon::setThemeName(s);
+                break;
+            }
+        }
+    }
 
+    return QIcon::fromTheme("flacon", loadIcon("mainicon", false));
+}

flacon-3.1.1.tar.gz/gui/mainwindow.h -> flacon-4.0.0.tar.gz/gui/mainwindow.h Changed

@@ -29,6 +29,7 @@
 
 #include <QMainWindow>
 #include "ui_mainwindow.h"
+#include <QPointer>
 
 namespace Ui {
 class MainWindow;
@@ -52,10 +53,6 @@
     void startConvert();
     void stopConvert();
 
-protected:
-    void closeEvent(QCloseEvent *);
-    void dragEnterEvent(QDragEnterEvent *event);
-    void dropEvent(QDropEvent *event);
 
 private slots:
     void insertOutPattern(const QString &pattern);
@@ -75,7 +72,7 @@
     void openOutDirDialog();
     void setCueForDisc(Disk *disk);
     void setAudioForDisk(Disk *disk);
-
+    void setCoverImage(Disk *disk);
 
     void removeDisks();
 
@@ -94,11 +91,15 @@
     void openAboutDialog();
 
 protected:
-    void showEvent(QShowEvent * event);
-    void keyPressEvent(QKeyEvent *event);
+    void closeEvent(QCloseEvent *) override;
+    void dragEnterEvent(QDragEnterEvent *event) override;
+    void dropEvent(QDropEvent *event) override;
+    void showEvent(QShowEvent * event) override;
+    void keyPressEvent(QKeyEvent *event) override;
+    bool event(QEvent *event) override;
 
 private:
-    Converter *mConverter;
+    QPointer<Converter> mConverter;
     Scanner *mScanner;
     QString getOpenFileFilter(bool includeAudio, bool includeCue);
 
@@ -107,6 +108,8 @@
 
     void loadSettings();
     void saveSettings();
+
+    QIcon loadMainIcon();
 };
 
 #endif // MAINWINDOW_H

flacon-3.1.1.tar.gz/gui/mainwindow.ui -> flacon-4.0.0.tar.gz/gui/mainwindow.ui Changed

@@ -330,7 +330,7 @@
     <property name="title">
      <string>&amp;File</string>
     </property>
-    <addaction name="actionAddFile"/>
+    <addaction name="actionAddDisk"/>
     <addaction name="actionRemoveDisc"/>
     <addaction name="separator"/>
     <addaction name="actionStartConvert"/>
@@ -374,7 +374,7 @@
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
-   <addaction name="actionAddFile"/>
+   <addaction name="actionAddDisk"/>
    <addaction name="actionRemoveDisc"/>
    <addaction name="separator"/>
    <addaction name="actionScan"/>
@@ -384,9 +384,9 @@
    <addaction name="actionStartConvert"/>
    <addaction name="actionAbortConvert"/>
   </widget>
-  <action name="actionAddFile">
+  <action name="actionAddDisk">
    <property name="text">
-    <string>Add file</string>
+    <string>Add disk</string>
    </property>
    <property name="toolTip">
     <string>Add CUE or audio file</string>
@@ -437,10 +437,10 @@
   </action>
   <action name="actionRemoveDisc">
    <property name="text">
-    <string>Remove album</string>
+    <string>Remove disk</string>
    </property>
    <property name="toolTip">
-    <string>Remove album from project</string>
+    <string>Remove disk from project</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+Del</string>

flacon-3.1.1.tar.gz/gui/trackview.cpp -> flacon-4.0.0.tar.gz/gui/trackview.cpp Changed

@@ -48,8 +48,14 @@
     mDelegate = new TrackViewDelegate(this);
     setItemDelegate(mDelegate);
 
-    connect(mDelegate, SIGNAL(trackButtonClicked(QModelIndex,QRect)), this, SLOT(showTrackMenu(QModelIndex,QRect)));
-    connect(mDelegate, SIGNAL(audioButtonClicked(QModelIndex,QRect)), this, SLOT(emitSelectAudioFile(QModelIndex, QRect)));
+    connect(mDelegate, SIGNAL(trackButtonClicked(QModelIndex,QRect)),
+            this, SLOT(showTrackMenu(QModelIndex,QRect)));
+
+    connect(mDelegate, SIGNAL(audioButtonClicked(QModelIndex,QRect)),
+            this, SLOT(emitSelectAudioFile(QModelIndex, QRect)));
+
+    connect(mDelegate, SIGNAL(coverImageClicked(QModelIndex)),
+            this, SLOT(emitSelectCoverImage(QModelIndex)));
 
     mModel = new TrackViewModel(this);
     setModel(mModel);
@@ -57,6 +63,7 @@
     setSelectionModel(new TrackViewSelectionModel(mModel, this));
 
     setUniformRowHeights(false);
+    this->setAttribute(Qt::WA_MacShowFocusRect, false);
 
     // Context menu ....................................
     setContextMenuPolicy(Qt::DefaultContextMenu);
@@ -197,11 +204,11 @@
 
     QAction *act;
 
-    act = new DiskAction(Project::getIcon("document-open", "fileopen", ":/icons/16/select-cue-file"), tr("Select another cue file"), &menu, disk);
+    act = new DiskAction(tr("Select another cue file"), &menu, disk);
     connect(act, SIGNAL(triggered()), this, SLOT(emitSelectCueFile()));
     menu.addAction(act);
 
-    act = new QAction(Project::getIcon("download", "web-browser", "network", ":/icons/16/download-track-info"), tr("Get data from CDDB"), &menu);
+    act = new QAction(tr("Get data from CDDB"), &menu);
     connect(act, SIGNAL(triggered()), disk, SLOT(downloadInfo()));
     act->setEnabled(disk->canDownloadInfo());
     menu.addAction(act);
@@ -228,6 +235,7 @@
  ************************************************/
 void TrackView::emitSelectAudioFile(const QModelIndex &index, const QRect &buttonRect)
 {
+    Q_UNUSED(buttonRect);
     Disk *disk = mModel->diskByIndex(index);
     if (disk)
         emit selectAudioFile(disk);
@@ -246,6 +254,17 @@
 
 
 /************************************************
+ *
+ ************************************************/
+void TrackView::emitSelectCoverImage(const QModelIndex &index)
+{
+    Disk *disk = mModel->diskByIndex(index);
+    if (disk)
+        emit selectCoverImage(disk);
+}
+
+
+/************************************************
 
  ************************************************/
 TrackViewSelectionModel::TrackViewSelectionModel(QAbstractItemModel *model, QObject *parent):
@@ -331,15 +350,15 @@
     menu.addSeparator();
 
 
-    DiskAction *act = new DiskAction(Project::getIcon("document-open", "fileopen", ":/icons/16/select-audio-file"), tr("Select another audio file"), &menu, disk);
+    DiskAction *act = new DiskAction(tr("Select another audio file"), &menu, disk);
     connect(act, SIGNAL(triggered()), this, SLOT(emitSelectAudioFile()));
     menu.addAction(act);
 
-    act = new DiskAction(Project::getIcon("document-open", "fileopen", ":/icons/16/select-cue-file"), tr("Select another cue file"), &menu, disk);
+    act = new DiskAction(tr("Select another cue file"), &menu, disk);
     connect(act, SIGNAL(triggered()), this, SLOT(emitSelectCueFile()));
     menu.addAction(act);
 
-    act = new DiskAction(Project::getIcon("download", "web-browser", "network", ":/icons/16/download-track-info"), tr("Get data from CDDB"), &menu, disk);
+    act = new DiskAction(tr("Get data from CDDB"), &menu, disk);
     connect(act, SIGNAL(triggered()), disk, SLOT(downloadInfo()));
     act->setEnabled(disk->canDownloadInfo());
     menu.addAction(act);

flacon-3.1.1.tar.gz/gui/trackview.h -> flacon-4.0.0.tar.gz/gui/trackview.h Changed

flacon-3.1.1.tar.gz/gui/trackviewdelegate.cpp -> flacon-4.0.0.tar.gz/gui/trackviewdelegate.cpp Changed

@@ -29,6 +29,7 @@
 #include "trackviewmodel.h"
 #include "project.h"
 #include "internet/dataprovider.h"
+#include "types.h"
 
 #include <QImage>
 #include <QPixmap>
@@ -37,16 +38,18 @@
 #include <QEvent>
 #include <QMouseEvent>
 #include <QApplication>
+#include <QToolTip>
 
 #include <QDebug>
 
-#define SELECTION_MARK      8
+#define SELECTION_MARK      4
 #define MARGIN              6
 #define TOP_PADDING        16
 #define BOTTOM_PADDING      2
 #define IMG_HEIGHT         60
 #define MARK_HEIGHT        32
 #define LINE_MARK_HEIGHT   22
+#define BUTTON_SIZE        10
 
 
 struct TrackViewCacheItem
@@ -57,8 +60,11 @@
     }
 
     QRect trackBtn;
+    QRect trackLbl;
     QRect audioBtn;
+    QRect audioLbl;
     QRect markBtn;
+    QRect coverRect;
     bool isWaiting;
 };
 
@@ -82,6 +88,7 @@
     Keys clickType(const QModelIndex &index, const QPoint &point);
 
 private:
+    TrackViewCacheItem nullItemCache;
     QHash<QModelIndex, TrackViewCacheItem*> mItems;
     QModelIndex currentIndex;
     TrackViewCacheItem *currentItem;
@@ -93,7 +100,7 @@
  ************************************************/
 TrackViewCache::TrackViewCache():
     currentIndex(QModelIndex()),
-    currentItem(0)
+    currentItem(&nullItemCache)
 {
 }
 
@@ -128,11 +135,12 @@
     mCache(new TrackViewCache),
     mDiskHeightHint(0)
 {
-    mTrackBtnPix = QPixmap(":trackBtn");
-    mAudioBtnPix = QPixmap(":audioBtn");
-    mWarnPix = Project::getIcon("dialog-warning", "messagebox_warning", ":/icons/32/disk-warning").pixmap(MARK_HEIGHT, MARK_HEIGHT);
-    mOkPix = Project::getIcon("dialog-ok", "button_ok", ":/icons/16/track-ok").pixmap(LINE_MARK_HEIGHT, LINE_MARK_HEIGHT);
-    mErrorPix = Project::getIcon("dialog-cancel", "button_cancel",  ":/icons/16/track-cancel").pixmap(LINE_MARK_HEIGHT, LINE_MARK_HEIGHT);
+    mTrackBtnPix = loadIcon("cue-button").pixmap(BUTTON_SIZE, BUTTON_SIZE);
+    mAudioBtnPix = loadIcon("audio-button").pixmap(BUTTON_SIZE, BUTTON_SIZE);
+    mWarnPix     = loadIcon("warning", false).pixmap(MARK_HEIGHT, MARK_HEIGHT);
+    mOkPix       = loadIcon("track-ok").pixmap(LINE_MARK_HEIGHT, LINE_MARK_HEIGHT);
+    mErrorPix    = loadIcon("track-cancel", false).pixmap(LINE_MARK_HEIGHT, LINE_MARK_HEIGHT);
+    mNoCoverImg  = QImage(":noCover");
 
     mDownloadMovie.setFileName(":wait");
     connect(project, SIGNAL(downloadingStarted(DataProvider*)), this, SLOT(downloadingStarted(DataProvider*)));
@@ -157,7 +165,11 @@
 {
     QRect r=rect;
     r.setWidth(SELECTION_MARK);
+#ifdef Q_OS_MAC
+    painter->fillRect(r, QColor(117,182, 247));
+#else
     painter->fillRect(r, mTrackView->palette().highlight().color());
+#endif
 }
 
 
@@ -187,17 +199,11 @@
 
     if (type == TrackViewModel::TrackItem)
     {
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
-        if (index.row() % 2)
-            painter->fillRect(option.rect, mTrackView->palette().base().color());
-        else
-            painter->fillRect(option.rect, mTrackView->palette().alternateBase().color());
-#else
         if (index.row() % 2)
-            opt.features &= ~QStyleOptionViewItemV2::Alternate;
+            opt.features &= ~QStyleOptionViewItem::Alternate;
         else
-            opt.features |= QStyleOptionViewItemV2::Alternate;
-#endif
+            opt.features |= QStyleOptionViewItem::Alternate;
+
         paintTrack(painter, opt, index);
         return;
     }
@@ -227,29 +233,68 @@
  ************************************************/
 void TrackViewDelegate::paintTrack(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-    QStyledItemDelegate::paint(painter, option, index);
 
+    if (!(index.row() % 2))
+        painter->fillRect(option.rect, QColor(245, 245, 245));
+
+    QStyledItemDelegate::paint(painter, option, index);
     if (index.column() != TrackView::ColumnPercent)
         return;
 
     const QPixmap *icon = 0;
     QString txt;
     int progress = index.data(TrackViewModel::RolePercent).toInt();
+    bool showProgress = false;
 
     switch (index.data(TrackViewModel::RoleStatus).toInt())
     {
-    case Track::NotRunning: txt = "";               progress = -1;      break;
-    case Track::Canceled:   txt = "";                                   break;
-    case Track::Error:      txt = tr("Error");      icon = &mErrorPix;  break;
-    case Track::Aborted:    txt = tr("Aborted");                        break;
-    case Track::OK:         txt = tr("OK");         icon = &mOkPix;     break;
-    case Track::Splitting:  txt = tr("Extracting");                     break;
-    case Track::Encoding:   txt = tr("Encoding");                       break;
-    case Track::Queued:     txt = tr("Queued");                         break;
-    case Track::CalcGain:   txt = tr("Calculate gain");                 break;
-    case Track::WaitGain:   txt = tr("Wait gain");                      break;
-    case Track::WriteGain:  txt = tr("Write gain");                     break;
-
+    case Track::NotRunning:
+        txt = "";
+        break;
+
+    case Track::Canceled:
+        txt = "";
+        break;
+
+    case Track::Error:
+        txt = tr("Error");
+        icon = &mErrorPix;
+        break;
+
+    case Track::Aborted:
+        txt = tr("Aborted");
+        break;
+
+    case Track::OK:
+        txt = tr("OK");
+        icon = &mOkPix;
+        break;
+
+    case Track::Splitting:
+        txt = tr("Extracting");
+        showProgress = true;
+        break;
+
+    case Track::Encoding:
+        txt = tr("Encoding");
+        showProgress = true;
+        break;
+
+    case Track::Queued:
+        txt = tr("Queued");
+        break;
+
+    case Track::CalcGain:
+        txt = tr("Calculate gain");
+        break;
+
+    case Track::WaitGain:
+        txt = tr("Wait gain");
+        break;
+
+    case Track::WriteGain:
+        txt = tr("Write gain");
+        break;
     }
 
 
@@ -258,7 +303,7 @@
     QRect windowRect(0, 0, option.rect.width() - 31, option.rect.height());
     painter->setClipRect(windowRect);
 
-    if (progress > -1)
+    if (showProgress)
     {
         QStyleOptionProgressBar opt;
         opt.rect = windowRect.adjusted(4, 3, -4, -3);
@@ -308,22 +353,27 @@
     painter->translate(option.rect.topLeft());
 
     int topPadding = index.row() ? TOP_PADDING : 0;
-    QRect windowRect(MARGIN + MARGIN,
+    QRect windowRect(MARGIN,
                      MARGIN + topPadding,
                      option.rect.right() - 2 * MARGIN,
                      option.rect.height() - 2 * MARGIN - topPadding - BOTTOM_PADDING);
 
+
+    TrackViewCacheItem *cache = mCache->item(index);
+
     // Draw cover image ................................
-    if (mNoCoverImg.height() != windowRect.height())
-    {
-        mNoCoverImg = QImage(":noCover").scaledToHeight(windowRect.height(), Qt::SmoothTransformation);
-    }
+    QImage img = index.data(TrackViewModel::RoleCoverImg).value<QImage>();
+    if (img.isNull())
+        img = mNoCoverImg;
+
+    if (img.height() != windowRect.height())
+        img = img.scaledToHeight(windowRect.height(), Qt::SmoothTransformation);
 
-    QRect imgRect(windowRect.topLeft(), mNoCoverImg.size());
+    QRect imgRect(windowRect.topLeft(), img.size());
     painter->fillRect(imgRect, mTrackView->palette().base().color());
     painter->fillRect(imgRect, Qt::white);
-    painter->drawImage(imgRect, mNoCoverImg);
-
+    painter->drawImage(imgRect, img);
+    cache->coverRect = imgRect;
 
     // Rectangle for text drawing ......................
     QRect textRect(windowRect);
@@ -372,7 +422,7 @@
     aBtnRect.moveLeft(l);
     painter->drawPixmap(aBtnRect, mAudioBtnPix);
 
-    TrackViewCacheItem *cache = mCache->item(index);
+
     QRect tClickRect = tBtnRect.united(tLabelRect).adjusted(0, -3, 4, 1);
     cache->trackBtn = tClickRect;
     //painter->drawRect(tClickRect);
@@ -381,23 +431,33 @@
     cache->audioBtn = aClickRect;
     //painter->drawRect(aClickRect);
 
+    cache->trackLbl = QRect(tFileRect.topLeft(), tBtnRect.bottomLeft());
+    cache->audioLbl = QRect(aFileRect.topLeft(), aBtnRect.bottomLeft());
+
+
     // Draw bottom line ................................
     painter->setPen(mTrackView->palette().dark().color());
     int y = option.rect.height() - BOTTOM_PADDING - 2;
     painter->drawLine(MARGIN * 2, y, windowRect.right(), y);
 
-    // Draw warning mark ...............................
+    // Draw download and warning mark ...............................
     QRect markRect(imgRect.right() - MARK_HEIGHT, imgRect.bottom() - MARK_HEIGHT, MARK_HEIGHT, MARK_HEIGHT);
-    if (!index.data(TrackViewModel::RoleCanConvert).toBool())
-        painter->drawPixmap(markRect, mWarnPix);
-
     cache->isWaiting = index.data(TrackViewModel::RoleIsDownloads).toBool();
+
     if (cache->isWaiting)
     {
         painter->drawPixmap(markRect, mDownloadMovie.currentPixmap());
+        cache->markBtn = markRect;
+    }
+    else if (!index.data(TrackViewModel::RoleCanConvert).toBool())
+    {
+        painter->drawPixmap(markRect, mWarnPix);
+        cache->markBtn = markRect;
+    }
+    else
+    {
+        cache->markBtn = QRect();
     }
-
-    cache->markBtn = markRect;
 
     painter->restore();    
 }
@@ -517,6 +577,14 @@
             return true;
         }
 
+        if (cache->coverRect.contains(m))
+        {
+            if (event->type() == QEvent::MouseButtonRelease)
+                emit coverImageClicked(index);
+
+            return true;
+        }
+
         return false;
     }
 
@@ -527,6 +595,51 @@
 /************************************************
 
  ************************************************/
+bool TrackViewDelegate::helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &index)
+{
+    if (index.parent().isValid())
+        return QStyledItemDelegate::helpEvent(event, view, option, index);
+
+    TrackViewCacheItem *cache = mCache->item(index);
+    if (cache == nullptr)
+        return true;
+
+    QPoint m = event->pos() - option.rect.topLeft();
+
+    if (cache->trackLbl.contains(m))
+    {
+        QToolTip::showText(
+                    event->globalPos(),
+                    view->model()->data(index, TrackViewModel::RoleCueFilePath).toString(),
+                    view);
+        return true;
+    }
+
+
+    if (cache->audioLbl.contains(m))
+    {
+        QToolTip::showText(
+                    event->globalPos(),
+                    view->model()->data(index, TrackViewModel::RoleAudioFilePath).toString(),
+                    view);
+        return true;
+    }
+
+    if (cache->markBtn.contains(m))
+    {
+        QToolTip::showText(
+                    event->globalPos(),
+                    view->model()->data(index, TrackViewModel::RoleDiskWarning).toString(),
+                    view);
+        return true;
+    }
+    return false;
+}
+
+
+/************************************************
+
+ ************************************************/
 void TrackViewDelegate::movieUpdated()
 {
     TrackViewModel *model = qobject_cast<TrackViewModel*>(mTrackView->model());
@@ -552,7 +665,7 @@
 /************************************************
 
  ************************************************/
-void TrackViewDelegate::downloadingStarted(DataProvider *provider)
+void TrackViewDelegate::downloadingStarted(DataProvider *)
 {
     mDownloadMovie.start();
 }

flacon-3.1.1.tar.gz/gui/trackviewdelegate.h -> flacon-4.0.0.tar.gz/gui/trackviewdelegate.h Changed

flacon-3.1.1.tar.gz/gui/trackviewmodel.cpp -> flacon-4.0.0.tar.gz/gui/trackviewmodel.cpp Changed

@@ -163,8 +163,8 @@
     const int diskNum = project->indexOf(disk);
     if (diskNum > -1 && diskNum < rowCount(QModelIndex()))
         return index(diskNum, col, QModelIndex());
-    else
-        return QModelIndex();
+
+    return QModelIndex();
 }
 
 
@@ -385,16 +385,6 @@
         return QVariant();
     }
 
-    // ToolTip ::::::::::::::::::::::::::::::::::::::::::
-    if (role == Qt::ToolTipRole)
-    {
-        QString s;
-        if (!disk->canConvert(&s))
-            return QVariant(tr("The conversion is not possible.\n%1").arg(s));
-        else
-            return QVariant();
-
-    }
 
     switch (role)
     {
@@ -403,6 +393,19 @@
     case RoleAudioFileName: return disk->audioFileName();
     case RoleCanConvert:    return disk->canConvert();
     case RoleIsDownloads:   return disk->isDownloads();
+    case RoleCoverFile:     return disk->coverImageFile();
+    case RoleCoverImg:      return disk->coverImagePreview();
+    case RoleCueFilePath:   return disk->cueFile();
+    case RoleAudioFilePath: return disk->audioFileName();
+    case RoleDiskWarning:
+                        {
+                            QString s;
+                            if (!disk->canConvert(&s))
+                                return QVariant(tr("The conversion is not possible.\n%1").arg(s));
+                            else
+                                return QVariant();
+                        }
+
     default:                return QVariant();
     }
 
@@ -440,6 +443,7 @@
  ************************************************/
 int TrackViewModel::columnCount(const QModelIndex &parent) const
 {
+    Q_UNUSED(parent);
     return TrackView::ColumnCount;
 }

flacon-3.1.1.tar.gz/gui/trackviewmodel.h -> flacon-4.0.0.tar.gz/gui/trackviewmodel.h Changed

flacon-4.0.0.tar.gz/images/AUTHORS.md Added

@@ -0,0 +1,26 @@
+Glyph icons
+===========
+http://glyph.smarticons.co/
+License (CC BY-SA 4.0). 
+
+
+OPENICONIC
+==========
+https://useiconic.com/open/, https://github.com/iconic/open-iconic
+The MIT License (MIT)
+
+
+Ikons
+=====
+http://ikons.piotrkwiatkowski.co.uk/
+License:
+You are free to use these icons for personal and commercial work without obligation of payment or attribution. While attribution is optional, it is always appreciated. The icons may be altered, cropped or otherwise modified or manipulated for your needs.
+        
+Making modifications or alterations to any of the icons does not free you to then sell, license or distribute them to anyone else. The redistribution of any of the icons files as a standalone package is strictly prohibited. You may not redistribute or sell these icon set on any other website or source.
+        
+The IKONS are property of Piotr Kwiatkowski and are protected by copyright laws and international treaty provisions. Intellectual property rights are not transferred with the download of the icons. All brand icons are trademark of their respective owners.
+
+Piotr Kwiatkowski shall not be liable to any kind of damage arising from the use of IKONS.
+        
+If you use IKONS in your Dribbble shot, please add a "ikons" tag.
+

flacon-4.0.0.tar.gz/images/icons Added

flacon-4.0.0.tar.gz/images/icons.qrc Added

@@ -0,0 +1,235 @@
+
+<RCC>
+    <qresource prefix="16">
+        <file alias="add-disk">icons/16/add-disk.png</file>
+        <file alias="remove-disk">icons/16/remove-disk.png</file>
+        <file alias="scan">icons/16/scan.png</file>
+        <file alias="download-info">icons/16/download-info.png</file>
+        <file alias="abort-convert">icons/16/abort-convert.png</file>
+        <file alias="start-convert">icons/16/start-convert.png</file>
+        <file alias="folder">icons/16/folder.png</file>
+        <file alias="configure">icons/16/configure.png</file>
+        <file alias="track-ok">icons/16/track-ok.png</file>
+        <file alias="audio-button">icons/16/audio-button.png</file>
+        <file alias="cue-button">icons/16/cue-button.png</file>
+
+        <file alias="add-disk_disable">icons/16/add-disk_disable.png</file>
+        <file alias="remove-disk_disable">icons/16/remove-disk_disable.png</file>
+        <file alias="scan_disable">icons/16/scan_disable.png</file>
+        <file alias="download-info_disable">icons/16/download-info_disable.png</file>
+        <file alias="abort-convert_disable">icons/16/abort-convert_disable.png</file>
+        <file alias="start-convert_disable">icons/16/start-convert_disable.png</file>
+        <file alias="folder_disable">icons/16/folder_disable.png</file>
+        <file alias="configure_disable">icons/16/configure_disable.png</file>
+        <file alias="track-ok_disable">icons/16/track-ok_disable.png</file>
+        <file alias="audio-button_disable">icons/16/audio-button_disable.png</file>
+        <file alias="cue-button_disable">icons/16/cue-button_disable.png</file>
+
+        <file alias="track-cancel">icons/16/track-cancel.png</file>
+        <file alias="warning">icons/16/warning.png</file>
+    </qresource>
+
+    <qresource prefix="22">
+        <file alias="add-disk">icons/22/add-disk.png</file>
+        <file alias="remove-disk">icons/22/remove-disk.png</file>
+        <file alias="scan">icons/22/scan.png</file>
+        <file alias="download-info">icons/22/download-info.png</file>
+        <file alias="abort-convert">icons/22/abort-convert.png</file>
+        <file alias="start-convert">icons/22/start-convert.png</file>
+        <file alias="folder">icons/22/folder.png</file>
+        <file alias="configure">icons/22/configure.png</file>
+        <file alias="track-ok">icons/22/track-ok.png</file>
+        <file alias="audio-button">icons/22/audio-button.png</file>
+        <file alias="cue-button">icons/22/cue-button.png</file>
+
+        <file alias="add-disk_disable">icons/22/add-disk_disable.png</file>
+        <file alias="remove-disk_disable">icons/22/remove-disk_disable.png</file>
+        <file alias="scan_disable">icons/22/scan_disable.png</file>
+        <file alias="download-info_disable">icons/22/download-info_disable.png</file>
+        <file alias="abort-convert_disable">icons/22/abort-convert_disable.png</file>
+        <file alias="start-convert_disable">icons/22/start-convert_disable.png</file>
+        <file alias="folder_disable">icons/22/folder_disable.png</file>
+        <file alias="configure_disable">icons/22/configure_disable.png</file>
+        <file alias="track-ok_disable">icons/22/track-ok_disable.png</file>
+        <file alias="audio-button_disable">icons/22/audio-button_disable.png</file>
+        <file alias="cue-button_disable">icons/22/cue-button_disable.png</file>
+
+        <file alias="track-cancel">icons/22/track-cancel.png</file>
+        <file alias="warning">icons/22/warning.png</file>
+    </qresource>
+
+    <qresource prefix="32">
+        <file alias="add-disk">icons/32/add-disk.png</file>
+        <file alias="remove-disk">icons/32/remove-disk.png</file>
+        <file alias="scan">icons/32/scan.png</file>
+        <file alias="download-info">icons/32/download-info.png</file>
+        <file alias="abort-convert">icons/32/abort-convert.png</file>
+        <file alias="start-convert">icons/32/start-convert.png</file>
+        <file alias="folder">icons/32/folder.png</file>
+        <file alias="configure">icons/32/configure.png</file>
+        <file alias="track-ok">icons/32/track-ok.png</file>
+        <file alias="audio-button">icons/32/audio-button.png</file>
+        <file alias="cue-button">icons/32/cue-button.png</file>
+
+        <file alias="add-disk_disable">icons/32/add-disk_disable.png</file>
+        <file alias="remove-disk_disable">icons/32/remove-disk_disable.png</file>
+        <file alias="scan_disable">icons/32/scan_disable.png</file>
+        <file alias="download-info_disable">icons/32/download-info_disable.png</file>
+        <file alias="abort-convert_disable">icons/32/abort-convert_disable.png</file>
+        <file alias="start-convert_disable">icons/32/start-convert_disable.png</file>
+        <file alias="folder_disable">icons/32/folder_disable.png</file>
+        <file alias="configure_disable">icons/32/configure_disable.png</file>
+        <file alias="track-ok_disable">icons/32/track-ok_disable.png</file>
+        <file alias="audio-button_disable">icons/32/audio-button_disable.png</file>
+        <file alias="cue-button_disable">icons/32/cue-button_disable.png</file>
+
+        <file alias="track-cancel">icons/32/track-cancel.png</file>
+        <file alias="warning">icons/32/warning.png</file>
+    </qresource>
+
+    <qresource prefix="48">
+        <file alias="add-disk">icons/48/add-disk.png</file>
+        <file alias="remove-disk">icons/48/remove-disk.png</file>
+        <file alias="scan">icons/48/scan.png</file>
+        <file alias="download-info">icons/48/download-info.png</file>
+        <file alias="abort-convert">icons/48/abort-convert.png</file>
+        <file alias="start-convert">icons/48/start-convert.png</file>
+        <file alias="folder">icons/48/folder.png</file>
+        <file alias="configure">icons/48/configure.png</file>
+        <file alias="track-ok">icons/48/track-ok.png</file>
+        <file alias="audio-button">icons/48/audio-button.png</file>
+        <file alias="cue-button">icons/48/cue-button.png</file>
+
+        <file alias="add-disk_disable">icons/48/add-disk_disable.png</file>
+        <file alias="remove-disk_disable">icons/48/remove-disk_disable.png</file>
+        <file alias="scan_disable">icons/48/scan_disable.png</file>
+        <file alias="download-info_disable">icons/48/download-info_disable.png</file>
+        <file alias="abort-convert_disable">icons/48/abort-convert_disable.png</file>
+        <file alias="start-convert_disable">icons/48/start-convert_disable.png</file>
+        <file alias="folder_disable">icons/48/folder_disable.png</file>
+        <file alias="configure_disable">icons/48/configure_disable.png</file>
+        <file alias="track-ok_disable">icons/48/track-ok_disable.png</file>
+        <file alias="audio-button_disable">icons/48/audio-button_disable.png</file>
+        <file alias="cue-button_disable">icons/48/cue-button_disable.png</file>
+
+        <file alias="track-cancel">icons/48/track-cancel.png</file>
+        <file alias="warning">icons/48/warning.png</file>
+    </qresource>
+
+    <qresource prefix="64">
+        <file alias="add-disk">icons/64/add-disk.png</file>
+        <file alias="remove-disk">icons/64/remove-disk.png</file>
+        <file alias="scan">icons/64/scan.png</file>
+        <file alias="download-info">icons/64/download-info.png</file>
+        <file alias="abort-convert">icons/64/abort-convert.png</file>
+        <file alias="start-convert">icons/64/start-convert.png</file>
+        <file alias="folder">icons/64/folder.png</file>
+        <file alias="configure">icons/64/configure.png</file>
+        <file alias="track-ok">icons/64/track-ok.png</file>
+        <file alias="audio-button">icons/64/audio-button.png</file>
+        <file alias="cue-button">icons/64/cue-button.png</file>
+
+        <file alias="add-disk_disable">icons/64/add-disk_disable.png</file>
+        <file alias="remove-disk_disable">icons/64/remove-disk_disable.png</file>
+        <file alias="scan_disable">icons/64/scan_disable.png</file>
+        <file alias="download-info_disable">icons/64/download-info_disable.png</file>
+        <file alias="abort-convert_disable">icons/64/abort-convert_disable.png</file>
+        <file alias="start-convert_disable">icons/64/start-convert_disable.png</file>
+        <file alias="folder_disable">icons/64/folder_disable.png</file>
+        <file alias="configure_disable">icons/64/configure_disable.png</file>
+        <file alias="track-ok_disable">icons/64/track-ok_disable.png</file>
+        <file alias="audio-button_disable">icons/64/audio-button_disable.png</file>
+        <file alias="cue-button_disable">icons/64/cue-button_disable.png</file>
+
+        <file alias="track-cancel">icons/64/track-cancel.png</file>
+        <file alias="warning">icons/64/warning.png</file>
+    </qresource>
+
+    <qresource prefix="128">
+        <file alias="add-disk">icons/128/add-disk.png</file>
+        <file alias="remove-disk">icons/128/remove-disk.png</file>
+        <file alias="scan">icons/128/scan.png</file>
+        <file alias="download-info">icons/128/download-info.png</file>
+        <file alias="abort-convert">icons/128/abort-convert.png</file>
+        <file alias="start-convert">icons/128/start-convert.png</file>
+        <file alias="folder">icons/128/folder.png</file>
+        <file alias="configure">icons/128/configure.png</file>
+        <file alias="track-ok">icons/128/track-ok.png</file>
+        <file alias="audio-button">icons/128/audio-button.png</file>
+        <file alias="cue-button">icons/128/cue-button.png</file>
+
+        <file alias="add-disk_disable">icons/128/add-disk_disable.png</file>
+        <file alias="remove-disk_disable">icons/128/remove-disk_disable.png</file>
+        <file alias="scan_disable">icons/128/scan_disable.png</file>
+        <file alias="download-info_disable">icons/128/download-info_disable.png</file>
+        <file alias="abort-convert_disable">icons/128/abort-convert_disable.png</file>
+        <file alias="start-convert_disable">icons/128/start-convert_disable.png</file>
+        <file alias="folder_disable">icons/128/folder_disable.png</file>
+        <file alias="configure_disable">icons/128/configure_disable.png</file>
+        <file alias="track-ok_disable">icons/128/track-ok_disable.png</file>
+        <file alias="audio-button_disable">icons/128/audio-button_disable.png</file>
+        <file alias="cue-button_disable">icons/128/cue-button_disable.png</file>
+
+        <file alias="track-cancel">icons/128/track-cancel.png</file>
+        <file alias="warning">icons/128/warning.png</file>
+    </qresource>
+
+    <qresource prefix="256">
+        <file alias="add-disk">icons/256/add-disk.png</file>
+        <file alias="remove-disk">icons/256/remove-disk.png</file>
+        <file alias="scan">icons/256/scan.png</file>
+        <file alias="download-info">icons/256/download-info.png</file>
+        <file alias="abort-convert">icons/256/abort-convert.png</file>
+        <file alias="start-convert">icons/256/start-convert.png</file>
+        <file alias="folder">icons/256/folder.png</file>
+        <file alias="configure">icons/256/configure.png</file>
+        <file alias="track-ok">icons/256/track-ok.png</file>
+        <file alias="audio-button">icons/256/audio-button.png</file>
+        <file alias="cue-button">icons/256/cue-button.png</file>
+
+        <file alias="add-disk_disable">icons/256/add-disk_disable.png</file>
+        <file alias="remove-disk_disable">icons/256/remove-disk_disable.png</file>
+        <file alias="scan_disable">icons/256/scan_disable.png</file>
+        <file alias="download-info_disable">icons/256/download-info_disable.png</file>
+        <file alias="abort-convert_disable">icons/256/abort-convert_disable.png</file>
+        <file alias="start-convert_disable">icons/256/start-convert_disable.png</file>
+        <file alias="folder_disable">icons/256/folder_disable.png</file>
+        <file alias="configure_disable">icons/256/configure_disable.png</file>
+        <file alias="track-ok_disable">icons/256/track-ok_disable.png</file>
+        <file alias="audio-button_disable">icons/256/audio-button_disable.png</file>
+        <file alias="cue-button_disable">icons/256/cue-button_disable.png</file>
+
+        <file alias="track-cancel">icons/256/track-cancel.png</file>
+        <file alias="warning">icons/256/warning.png</file>
+    </qresource>
+
+    <qresource prefix="512">
+        <file alias="add-disk">icons/512/add-disk.png</file>
+        <file alias="remove-disk">icons/512/remove-disk.png</file>
+        <file alias="scan">icons/512/scan.png</file>
+        <file alias="download-info">icons/512/download-info.png</file>
+        <file alias="abort-convert">icons/512/abort-convert.png</file>
+        <file alias="start-convert">icons/512/start-convert.png</file>
+        <file alias="folder">icons/512/folder.png</file>
+        <file alias="configure">icons/512/configure.png</file>
+        <file alias="track-ok">icons/512/track-ok.png</file>
+        <file alias="audio-button">icons/512/audio-button.png</file>
+        <file alias="cue-button">icons/512/cue-button.png</file>
+
+        <file alias="add-disk_disable">icons/512/add-disk_disable.png</file>
+        <file alias="remove-disk_disable">icons/512/remove-disk_disable.png</file>
+        <file alias="scan_disable">icons/512/scan_disable.png</file>
+        <file alias="download-info_disable">icons/512/download-info_disable.png</file>
+        <file alias="abort-convert_disable">icons/512/abort-convert_disable.png</file>
+        <file alias="start-convert_disable">icons/512/start-convert_disable.png</file>
+        <file alias="folder_disable">icons/512/folder_disable.png</file>
+        <file alias="configure_disable">icons/512/configure_disable.png</file>
+        <file alias="track-ok_disable">icons/512/track-ok_disable.png</file>
+        <file alias="audio-button_disable">icons/512/audio-button_disable.png</file>
+        <file alias="cue-button_disable">icons/512/cue-button_disable.png</file>
+
+        <file alias="track-cancel">icons/512/track-cancel.png</file>
+        <file alias="warning">icons/512/warning.png</file>
+    </qresource>
+
+</RCC>

flacon-4.0.0.tar.gz/images/icons/128 Added

flacon-4.0.0.tar.gz/images/icons/128/abort-convert.png Added

flacon-4.0.0.tar.gz/images/icons/128/abort-convert_disable.png Added

flacon-4.0.0.tar.gz/images/icons/128/add-disk.png Added

flacon-4.0.0.tar.gz/images/icons/128/add-disk_disable.png Added

flacon-4.0.0.tar.gz/images/icons/128/audio-button.png Added

flacon-4.0.0.tar.gz/images/icons/128/audio-button_disable.png Added

flacon-4.0.0.tar.gz/images/icons/128/configure.png Added

flacon-4.0.0.tar.gz/images/icons/128/configure_disable.png Added

flacon-4.0.0.tar.gz/images/icons/128/cue-button.png Added

flacon-4.0.0.tar.gz/images/icons/128/cue-button_disable.png Added

flacon-4.0.0.tar.gz/images/icons/128/download-info.png Added

flacon-4.0.0.tar.gz/images/icons/128/download-info_disable.png Added

flacon-4.0.0.tar.gz/images/icons/128/folder.png Added

flacon-4.0.0.tar.gz/images/icons/128/folder_disable.png Added

flacon-4.0.0.tar.gz/images/icons/128/remove-disk.png Added

flacon-4.0.0.tar.gz/images/icons/128/remove-disk_disable.png Added

flacon-4.0.0.tar.gz/images/icons/128/scan.png Added

flacon-4.0.0.tar.gz/images/icons/128/scan_disable.png Added

flacon-4.0.0.tar.gz/images/icons/128/start-convert.png Added

flacon-4.0.0.tar.gz/images/icons/128/start-convert_disable.png Added

flacon-4.0.0.tar.gz/images/icons/128/track-cancel.png Added

flacon-4.0.0.tar.gz/images/icons/128/track-ok.png Added

flacon-4.0.0.tar.gz/images/icons/128/track-ok_disable.png Added

flacon-4.0.0.tar.gz/images/icons/128/warning.png Added

flacon-4.0.0.tar.gz/images/icons/16 Added

flacon-4.0.0.tar.gz/images/icons/16/abort-convert.png Added

flacon-4.0.0.tar.gz/images/icons/16/abort-convert_disable.png Added

flacon-4.0.0.tar.gz/images/icons/16/add-disk.png Added

flacon-4.0.0.tar.gz/images/icons/16/add-disk_disable.png Added

flacon-4.0.0.tar.gz/images/icons/16/audio-button.png Added

flacon-4.0.0.tar.gz/images/icons/16/audio-button_disable.png Added

flacon-4.0.0.tar.gz/images/icons/16/configure.png Added

flacon-4.0.0.tar.gz/images/icons/16/configure_disable.png Added

flacon-4.0.0.tar.gz/images/icons/16/cue-button.png Added

flacon-4.0.0.tar.gz/images/icons/16/cue-button_disable.png Added

flacon-4.0.0.tar.gz/images/icons/16/download-info.png Added

flacon-4.0.0.tar.gz/images/icons/16/download-info_disable.png Added

flacon-4.0.0.tar.gz/images/icons/16/folder.png Added

flacon-4.0.0.tar.gz/images/icons/16/folder_disable.png Added

flacon-4.0.0.tar.gz/images/icons/16/remove-disk.png Added

flacon-4.0.0.tar.gz/images/icons/16/remove-disk_disable.png Added

flacon-4.0.0.tar.gz/images/icons/16/scan.png Added

flacon-4.0.0.tar.gz/images/icons/16/scan_disable.png Added

flacon-4.0.0.tar.gz/images/icons/16/start-convert.png Added

flacon-4.0.0.tar.gz/images/icons/16/start-convert_disable.png Added

flacon-4.0.0.tar.gz/images/icons/16/track-cancel.png Added

flacon-4.0.0.tar.gz/images/icons/16/track-ok.png Added

flacon-4.0.0.tar.gz/images/icons/16/track-ok_disable.png Added

flacon-4.0.0.tar.gz/images/icons/16/warning.png Added

flacon-4.0.0.tar.gz/images/icons/22 Added

flacon-4.0.0.tar.gz/images/icons/22/abort-convert.png Added

flacon-4.0.0.tar.gz/images/icons/22/abort-convert_disable.png Added

flacon-4.0.0.tar.gz/images/icons/22/add-disk.png Added

flacon-4.0.0.tar.gz/images/icons/22/add-disk_disable.png Added

flacon-4.0.0.tar.gz/images/icons/22/audio-button.png Added

flacon-4.0.0.tar.gz/images/icons/22/audio-button_disable.png Added

flacon-4.0.0.tar.gz/images/icons/22/configure.png Added

flacon-4.0.0.tar.gz/images/icons/22/configure_disable.png Added

flacon-4.0.0.tar.gz/images/icons/22/cue-button.png Added

flacon-4.0.0.tar.gz/images/icons/22/cue-button_disable.png Added

flacon-4.0.0.tar.gz/images/icons/22/download-info.png Added

flacon-4.0.0.tar.gz/images/icons/22/download-info_disable.png Added

flacon-4.0.0.tar.gz/images/icons/22/folder.png Added

flacon-4.0.0.tar.gz/images/icons/22/folder_disable.png Added

flacon-4.0.0.tar.gz/images/icons/22/remove-disk.png Added

flacon-4.0.0.tar.gz/images/icons/22/remove-disk_disable.png Added

flacon-4.0.0.tar.gz/images/icons/22/scan.png Added

flacon-4.0.0.tar.gz/images/icons/22/scan_disable.png Added

flacon-4.0.0.tar.gz/images/icons/22/start-convert.png Added

flacon-4.0.0.tar.gz/images/icons/22/start-convert_disable.png Added

flacon-4.0.0.tar.gz/images/icons/22/track-cancel.png Added

flacon-4.0.0.tar.gz/images/icons/22/track-ok.png Added

flacon-4.0.0.tar.gz/images/icons/22/track-ok_disable.png Added

flacon-4.0.0.tar.gz/images/icons/22/warning.png Added

flacon-4.0.0.tar.gz/images/icons/256 Added

flacon-4.0.0.tar.gz/images/icons/256/abort-convert.png Added

flacon-4.0.0.tar.gz/images/icons/256/abort-convert_disable.png Added

flacon-4.0.0.tar.gz/images/icons/256/add-disk.png Added

flacon-4.0.0.tar.gz/images/icons/256/add-disk_disable.png Added

flacon-4.0.0.tar.gz/images/icons/256/audio-button.png Added

flacon-4.0.0.tar.gz/images/icons/256/audio-button_disable.png Added

flacon-4.0.0.tar.gz/images/icons/256/configure.png Added

flacon-4.0.0.tar.gz/images/icons/256/configure_disable.png Added

flacon-4.0.0.tar.gz/images/icons/256/cue-button.png Added

flacon-4.0.0.tar.gz/images/icons/256/cue-button_disable.png Added

flacon-4.0.0.tar.gz/images/icons/256/download-info.png Added

flacon-4.0.0.tar.gz/images/icons/256/download-info_disable.png Added

flacon-4.0.0.tar.gz/images/icons/256/folder.png Added

flacon-4.0.0.tar.gz/images/icons/256/folder_disable.png Added

flacon-4.0.0.tar.gz/images/icons/256/remove-disk.png Added

flacon-4.0.0.tar.gz/images/icons/256/remove-disk_disable.png Added

flacon-4.0.0.tar.gz/images/icons/256/scan.png Added

flacon-4.0.0.tar.gz/images/icons/256/scan_disable.png Added

flacon-4.0.0.tar.gz/images/icons/256/start-convert.png Added

flacon-4.0.0.tar.gz/images/icons/256/start-convert_disable.png Added

flacon-4.0.0.tar.gz/images/icons/256/track-cancel.png Added

flacon-4.0.0.tar.gz/images/icons/256/track-ok.png Added

flacon-4.0.0.tar.gz/images/icons/256/track-ok_disable.png Added

flacon-4.0.0.tar.gz/images/icons/256/warning.png Added

flacon-4.0.0.tar.gz/images/icons/32 Added

flacon-4.0.0.tar.gz/images/icons/32/abort-convert.png Added

flacon-4.0.0.tar.gz/images/icons/32/abort-convert_disable.png Added

flacon-4.0.0.tar.gz/images/icons/32/add-disk.png Added

flacon-4.0.0.tar.gz/images/icons/32/add-disk_disable.png Added

flacon-4.0.0.tar.gz/images/icons/32/audio-button.png Added

flacon-4.0.0.tar.gz/images/icons/32/audio-button_disable.png Added

flacon-4.0.0.tar.gz/images/icons/32/configure.png Added

flacon-4.0.0.tar.gz/images/icons/32/configure_disable.png Added

flacon-4.0.0.tar.gz/images/icons/32/cue-button.png Added

flacon-4.0.0.tar.gz/images/icons/32/cue-button_disable.png Added

flacon-4.0.0.tar.gz/images/icons/32/download-info.png Added

flacon-4.0.0.tar.gz/images/icons/32/download-info_disable.png Added

flacon-4.0.0.tar.gz/images/icons/32/folder.png Added

flacon-4.0.0.tar.gz/images/icons/32/folder_disable.png Added

flacon-4.0.0.tar.gz/images/icons/32/remove-disk.png Added

flacon-4.0.0.tar.gz/images/icons/32/remove-disk_disable.png Added

flacon-4.0.0.tar.gz/images/icons/32/scan.png Added

flacon-4.0.0.tar.gz/images/icons/32/scan_disable.png Added

flacon-4.0.0.tar.gz/images/icons/32/start-convert.png Added

flacon-4.0.0.tar.gz/images/icons/32/start-convert_disable.png Added

flacon-4.0.0.tar.gz/images/icons/32/track-cancel.png Added

flacon-4.0.0.tar.gz/images/icons/32/track-ok.png Added

flacon-4.0.0.tar.gz/images/icons/32/track-ok_disable.png Added

flacon-4.0.0.tar.gz/images/icons/32/warning.png Added

flacon-4.0.0.tar.gz/images/icons/48 Added

flacon-4.0.0.tar.gz/images/icons/48/abort-convert.png Added

flacon-4.0.0.tar.gz/images/icons/48/abort-convert_disable.png Added

flacon-4.0.0.tar.gz/images/icons/48/add-disk.png Added

flacon-4.0.0.tar.gz/images/icons/48/add-disk_disable.png Added

flacon-4.0.0.tar.gz/images/icons/48/audio-button.png Added

flacon-4.0.0.tar.gz/images/icons/48/audio-button_disable.png Added

flacon-4.0.0.tar.gz/images/icons/48/configure.png Added

flacon-4.0.0.tar.gz/images/icons/48/configure_disable.png Added

flacon-4.0.0.tar.gz/images/icons/48/cue-button.png Added

flacon-4.0.0.tar.gz/images/icons/48/cue-button_disable.png Added

flacon-4.0.0.tar.gz/images/icons/48/download-info.png Added

flacon-4.0.0.tar.gz/images/icons/48/download-info_disable.png Added

flacon-4.0.0.tar.gz/images/icons/48/folder.png Added

flacon-4.0.0.tar.gz/images/icons/48/folder_disable.png Added

flacon-4.0.0.tar.gz/images/icons/48/remove-disk.png Added

flacon-4.0.0.tar.gz/images/icons/48/remove-disk_disable.png Added

flacon-4.0.0.tar.gz/images/icons/48/scan.png Added

flacon-4.0.0.tar.gz/images/icons/48/scan_disable.png Added

flacon-4.0.0.tar.gz/images/icons/48/start-convert.png Added

flacon-4.0.0.tar.gz/images/icons/48/start-convert_disable.png Added

flacon-4.0.0.tar.gz/images/icons/48/track-cancel.png Added

flacon-4.0.0.tar.gz/images/icons/48/track-ok.png Added

flacon-4.0.0.tar.gz/images/icons/48/track-ok_disable.png Added

flacon-4.0.0.tar.gz/images/icons/48/warning.png Added

flacon-4.0.0.tar.gz/images/icons/512 Added

flacon-4.0.0.tar.gz/images/icons/512/abort-convert.png Added

flacon-4.0.0.tar.gz/images/icons/512/abort-convert_disable.png Added

flacon-4.0.0.tar.gz/images/icons/512/add-disk.png Added

flacon-4.0.0.tar.gz/images/icons/512/add-disk_disable.png Added

flacon-4.0.0.tar.gz/images/icons/512/audio-button.png Added

flacon-4.0.0.tar.gz/images/icons/512/audio-button_disable.png Added

flacon-4.0.0.tar.gz/images/icons/512/configure.png Added

flacon-4.0.0.tar.gz/images/icons/512/configure_disable.png Added

flacon-4.0.0.tar.gz/images/icons/512/cue-button.png Added

flacon-4.0.0.tar.gz/images/icons/512/cue-button_disable.png Added

flacon-4.0.0.tar.gz/images/icons/512/download-info.png Added

flacon-4.0.0.tar.gz/images/icons/512/download-info_disable.png Added

flacon-4.0.0.tar.gz/images/icons/512/folder.png Added

flacon-4.0.0.tar.gz/images/icons/512/folder_disable.png Added

flacon-4.0.0.tar.gz/images/icons/512/remove-disk.png Added

flacon-4.0.0.tar.gz/images/icons/512/remove-disk_disable.png Added

flacon-4.0.0.tar.gz/images/icons/512/scan.png Added

flacon-4.0.0.tar.gz/images/icons/512/scan_disable.png Added

flacon-4.0.0.tar.gz/images/icons/512/start-convert.png Added

flacon-4.0.0.tar.gz/images/icons/512/start-convert_disable.png Added

flacon-4.0.0.tar.gz/images/icons/512/track-cancel.png Added

flacon-4.0.0.tar.gz/images/icons/512/track-ok.png Added

flacon-4.0.0.tar.gz/images/icons/512/track-ok_disable.png Added

flacon-4.0.0.tar.gz/images/icons/512/warning.png Added

flacon-4.0.0.tar.gz/images/icons/64 Added

flacon-4.0.0.tar.gz/images/icons/64/abort-convert.png Added

flacon-4.0.0.tar.gz/images/icons/64/abort-convert_disable.png Added

flacon-4.0.0.tar.gz/images/icons/64/add-disk.png Added

flacon-4.0.0.tar.gz/images/icons/64/add-disk_disable.png Added

flacon-4.0.0.tar.gz/images/icons/64/audio-button.png Added

flacon-4.0.0.tar.gz/images/icons/64/audio-button_disable.png Added

flacon-4.0.0.tar.gz/images/icons/64/configure.png Added

flacon-4.0.0.tar.gz/images/icons/64/configure_disable.png Added

flacon-4.0.0.tar.gz/images/icons/64/cue-button.png Added

flacon-4.0.0.tar.gz/images/icons/64/cue-button_disable.png Added

flacon-4.0.0.tar.gz/images/icons/64/download-info.png Added

flacon-4.0.0.tar.gz/images/icons/64/download-info_disable.png Added

flacon-4.0.0.tar.gz/images/icons/64/folder.png Added

flacon-4.0.0.tar.gz/images/icons/64/folder_disable.png Added

flacon-4.0.0.tar.gz/images/icons/64/remove-disk.png Added

flacon-4.0.0.tar.gz/images/icons/64/remove-disk_disable.png Added

flacon-4.0.0.tar.gz/images/icons/64/scan.png Added

flacon-4.0.0.tar.gz/images/icons/64/scan_disable.png Added

flacon-4.0.0.tar.gz/images/icons/64/start-convert.png Added

flacon-4.0.0.tar.gz/images/icons/64/start-convert_disable.png Added

flacon-4.0.0.tar.gz/images/icons/64/track-cancel.png Added

flacon-4.0.0.tar.gz/images/icons/64/track-ok.png Added

flacon-4.0.0.tar.gz/images/icons/64/track-ok_disable.png Added

flacon-4.0.0.tar.gz/images/icons/64/warning.png Added

flacon-4.0.0.tar.gz/images/icons/abort-convert.svg Added

@@ -0,0 +1,10 @@
+
+<svg viewBox="0 0 17 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" class="si-glyph si-glyph-circle-error">
+    
+    <title>1048</title>
+    
+    <defs></defs>
+    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M13.618,2.397 C10.513,-0.708 5.482,-0.713 2.383,2.386 C-0.718,5.488 -0.715,10.517 2.392,13.622 C5.497,16.727 10.529,16.731 13.627,13.632 C16.727,10.533 16.724,5.502 13.618,2.397 L13.618,2.397 Z M9.615,11.351 L7.927,9.663 L6.239,11.351 C5.55,12.04 5.032,12.64 4.21,11.819 C3.39,10.998 3.987,10.48 4.679,9.79 L6.367,8.103 L4.679,6.415 C3.989,5.726 3.39,5.208 4.21,4.386 C5.032,3.566 5.55,4.165 6.239,4.855 L7.927,6.541 L9.615,4.855 C10.305,4.166 10.82,3.565 11.642,4.386 C12.464,5.208 11.865,5.726 11.175,6.415 L9.487,8.102 L11.175,9.789 C11.864,10.48 12.464,10.998 11.642,11.819 C10.822,12.64 10.305,12.04 9.615,11.351 L9.615,11.351 Z" fill="#656565" class="si-glyph-fill"></path>
+    </g>
+</svg>
\ No newline at end of file

flacon-4.0.0.tar.gz/images/icons/add-disk.svg Added

@@ -0,0 +1,2 @@
+
+<svg viewBox="0 0 17 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" class="si-glyph si-glyph-disc-add"><title>905</title><defs></defs><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g transform="translate(1.000000, 0.000000)" fill="#656565"><g transform="translate(6.000000, 6.000000)"><rect x="4" y="6" width="5.938" height="1.969" class="si-glyph-fill"></rect><rect x="6" y="4" width="1.97" height="5.938" class="si-glyph-fill"></rect><path d="M1.988,0.022 C0.892,0.022 0.00899999996,0.908 0.00899999996,1.999 C0.00899999996,3.091 0.893,3.975 1.988,3.975 C3.079,3.975 3.967,3.091 3.967,1.999 C3.967,0.908 3.079,0.022 1.988,0.022 L1.988,0.022 Z" class="si-glyph-fill"></path></g><path d="M15.958,7.969 C15.958,3.556 12.385,0.063 7.979,0.063 C3.573,0.063 0,3.556 0,7.969 C0,12.381 3.572,15.958 7.979,15.958 C8.319,15.958 8.653,15.932 8.98,15.887 L8.98,10.952 C8.672,11.058 8.345,11.125 8.001,11.125 C6.28,11.125 4.886,9.719 4.886,7.985 C4.886,6.25 6.281,4.843 8.001,4.843 C9.72,4.843 11.116,6.249 11.116,7.985 C11.116,8.341 11.044,8.68 10.934,9 L15.867,9 C15.92,8.652 15.958,8.307 15.958,7.969 L15.958,7.969 Z M5.15,11.676 L3.632,13.194 L2.764,12.325 L4.282,10.807 L5.15,11.676 L5.15,11.676 Z M11.612,5.277 L10.743,4.408 L12.261,2.89 L13.13,3.759 L11.612,5.277 L11.612,5.277 Z" class="si-glyph-fill"></path></g></g></svg>
\ No newline at end of file

flacon-4.0.0.tar.gz/images/icons/audio-button.svg Added

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="8"
+   height="8"
+   viewBox="0 0 8 8"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="audio-button.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#656565"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1177"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="83.4386"
+     inkscape:cx="6.2681201"
+     inkscape:cy="2.3037842"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     style="fill:#656565"
+     d="M 0,5 V 7 H 2 V 5 Z M 3,5 V 7 H 5 V 5 Z M 6,5 V 7 H 8 V 5 Z"
+     id="path2"
+     inkscape:connector-curvature="0" />
+</svg>

flacon-4.0.0.tar.gz/images/icons/configure.svg Added

flacon-4.0.0.tar.gz/images/icons/cue-button.svg Added

flacon-4.0.0.tar.gz/images/icons/download-info.svg Added

flacon-4.0.0.tar.gz/images/icons/folder.svg Added

flacon-4.0.0.tar.gz/images/icons/remove-disk.svg Added

@@ -0,0 +1,2 @@
+
+<svg viewBox="0 0 17 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" class="si-glyph si-glyph-disc-error"><title>904</title><defs></defs><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g transform="translate(1.000000, 0.000000)" fill="#656565"><g transform="translate(6.000000, 6.000000)"><rect transform="translate(7.000000, 7.000000) rotate(-45.000000) translate(-7.000000, -7.000000) " x="4" y="6" width="5.938" height="1.969" class="si-glyph-fill"></rect><rect transform="translate(7.000000, 7.000000) rotate(-45.000000) translate(-7.000000, -7.000000) " x="6" y="4" width="1.97" height="5.938" class="si-glyph-fill"></rect><path d="M1.988,0.022 C0.892,0.022 0.00899999996,0.908 0.00899999996,1.999 C0.00899999996,3.091 0.893,3.975 1.988,3.975 C3.079,3.975 3.967,3.091 3.967,1.999 C3.967,0.908 3.079,0.022 1.988,0.022 L1.988,0.022 Z" class="si-glyph-fill"></path></g><path d="M15.958,7.969 C15.958,3.556 12.385,0.063 7.979,0.063 C3.573,0.063 0,3.556 0,7.969 C0,12.381 3.572,15.958 7.979,15.958 C8.319,15.958 8.653,15.932 8.98,15.887 L8.98,10.952 C8.672,11.058 8.345,11.125 8.001,11.125 C6.28,11.125 4.886,9.719 4.886,7.985 C4.886,6.25 6.281,4.843 8.001,4.843 C9.72,4.843 11.116,6.249 11.116,7.985 C11.116,8.341 11.044,8.68 10.934,9 L15.867,9 C15.92,8.652 15.958,8.307 15.958,7.969 L15.958,7.969 Z M5.15,11.676 L3.632,13.194 L2.764,12.325 L4.282,10.807 L5.15,11.676 L5.15,11.676 Z M11.612,5.277 L10.743,4.408 L12.261,2.89 L13.13,3.759 L11.612,5.277 L11.612,5.277 Z" class="si-glyph-fill"></path></g></g></svg>
\ No newline at end of file

flacon-4.0.0.tar.gz/images/icons/scan.svg Added

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
+<g id="FOLDER__x2F__OK_2_" enable-background="new    ">
+	<g id="FOLDER__x2F__OK_1_">
+		<g>
+			<path style='fill:#656565' d="M60,49h-3v-3c0-1.657-1.343-3-3-3s-3,1.343-3,3v3h-3c-1.657,0-3,1.343-3,3s1.343,3,3,3h3v3c0,1.657,1.343,3,3,3
+				s3-1.343,3-3v-3h3c1.657,0,3-1.343,3-3S61.657,49,60,49z M0,51c0,1.657,1.343,3,3,3h39.367C42.145,53.372,42,52.705,42,52
+				c0-3.314,2.686-6,6-6c0-3.314,2.686-6,6-6s6,2.686,6,6c1.544,0,2.938,0.6,4,1.557V19H0V51z M61,10H23.982L18,4H3
+				C1.343,4,0,5.343,0,7v9h64v-3C64,11.343,62.657,10,61,10z"/>
+		</g>
+	</g>
+</g>
+</svg>

flacon-4.0.0.tar.gz/images/icons/start-convert.svg Added

flacon-4.0.0.tar.gz/images/icons/track-cancel.svg Added

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
+<g id="CIRCLE__x2F__DELETE_1_" enable-background="new    ">
+	<g id="CIRCLE__x2F__DELETE">
+		<g>
+			<path style='fill:#E2574C' d="M32,0C14.327,0,0,14.327,0,32s14.327,32,32,32s32-14.327,32-32S49.673,0,32,0z M32,58C17.641,58,6,46.359,6,32
+				C6,17.64,17.641,6,32,6c14.359,0,26,11.64,26,26C58,46.359,46.359,58,32,58z M46,21c0-1.657-1.343-3-3-3
+				c-0.828,0-1.578,0.336-2.121,0.879L32,27.758l-8.879-8.879C22.579,18.336,21.828,18,21,18c-1.657,0-3,1.343-3,3
+				c0,0.828,0.336,1.578,0.879,2.121L27.757,32l-8.879,8.879C18.336,41.422,18,42.172,18,43c0,1.657,1.343,3,3,3
+				c0.828,0,1.579-0.336,2.121-0.879L32,36.243l8.879,8.879C41.422,45.664,42.172,46,43,46c1.657,0,3-1.343,3-3
+				c0-0.828-0.336-1.578-0.879-2.121L36.243,32l8.879-8.878C45.664,22.578,46,21.829,46,21z"/>
+		</g>
+	</g>
+</g>
+</svg>

flacon-4.0.0.tar.gz/images/icons/track-ok.svg Added

flacon-4.0.0.tar.gz/images/icons/warning.svg Added

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 497.472 497.472" style="enable-background:new 0 0 497.472 497.472;" xml:space="preserve">
+<g transform="matrix(1.25 0 0 -1.25 0 45)">
+	<g>
+		<g>
+			<path style="fill:#FFCC4D;" d="M24.374-357.857c-20.958,0-30.197,15.223-20.548,33.826L181.421,17.928
+				c9.648,18.603,25.463,18.603,35.123,0L394.14-324.031c9.671-18.603,0.421-33.826-20.548-33.826H24.374z"/>
+			<path style="fill:#231F20;" d="M173.605-80.922c0,14.814,10.934,23.984,25.395,23.984c14.12,0,25.407-9.512,25.407-23.984
+				V-216.75c0-14.461-11.287-23.984-25.407-23.984c-14.461,0-25.395,9.182-25.395,23.984V-80.922z M171.489-289.056
+				c0,15.167,12.345,27.511,27.511,27.511c15.167,0,27.523-12.345,27.523-27.511c0-15.178-12.356-27.523-27.523-27.523
+				C183.834-316.579,171.489-304.234,171.489-289.056"/>
+		</g>
+	</g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

flacon-4.0.0.tar.gz/images/icons2png.sh Added

@@ -0,0 +1,99 @@
+#!/bin/bash
+
+SRC_COLOR="#656565"
+
+ENABLE="#656565"
+DISABLE="#a1a1a1"
+
+RC_FILE="icons.qrc"
+
+#ENABLE="#ff00ff"
+#DISABLE="#00ff00"
+
+function conv()
+{
+	local svgFile=$1
+	#local pngFile=$2
+	local size=$2
+	local color=$3
+
+	postfix=""
+#	postfix="${size}x${size}"	
+	[ "${color}" = "${DISABLE}" ] && postfix="_disable"
+		
+	pngFile=${svgFile/.svg/${postfix}.png}
+	echo "$svgFile => $pngFile"
+
+	sed -e "s/${SRC_COLOR}/${color}/g" icons/${svgFile} > icons/_tmp.svg
+	mkdir -p icons/${size}
+	#inkscape -z -e icons/${size}/${pngFile} -w ${size} -h ${size} icons/_tmp.svg
+	rm icons/_tmp.svg
+
+	name=${svgFile/.svg/${postfix}}
+	echo "        <file alias=\"${name}\">icons/${size}/${pngFile}</file>" >> ${RC_FILE}	
+	echo ""
+}
+
+echo "" > ${RC_FILE}
+echo "<RCC>" >> ${RC_FILE}
+
+
+for size in 16 22 32 48 64 128 256 512 ; do
+	echo "    <qresource prefix=\"${size}\">" >> ${RC_FILE}	
+
+	for color in "$ENABLE" "$DISABLE"; do 
+		conv add-disk.svg $size $color
+		conv remove-disk.svg $size $color
+		conv scan.svg $size $color
+
+		conv download-info.svg $size $color
+		
+		conv abort-convert.svg $size $color
+		conv start-convert.svg $size $color
+		
+		conv folder.svg $size $color
+		conv configure.svg $size $color
+		conv track-ok.svg $size $color
+		conv audio-button.svg $size $color
+		conv cue-button.svg $size $color
+		echo "" >> ${RC_FILE}
+	done
+
+	conv track-cancel.svg $size ""
+	conv warning.svg $size ""
+
+	echo "    </qresource>" >> ${RC_FILE}
+	echo "" >> ${RC_FILE}
+done
+
+echo "</RCC>" >> ${RC_FILE}
+
+
+
+
+# RC_FILE="icons.qrc"
+
+# echo '<RCC>' > ${RC_FILE}
+
+# for SIZE in 16 22 32 48 64 128 256 512 ; do
+# 	echo "    <qresource prefix=\"${SIZE}\">" >> ${RC_FILE}
+# 	for FILE in $(ls icons/*.svg); do
+# 		NAME=$(basename $FILE .svg)	
+# 		echo "        <file alias=\"$NAME">add-disk.svg</file>
+
+# 	done
+# 	echo '    </qresource>' >> ${RC_FILE}
+# done
+
+# echo '</RCC>' >> ${RC_FILE}
+
+# for FILE in $(ls icons/*.svg); do
+# 	NAME=$(basename $FILE .svg)
+# 	echo $NAME $FILE
+	
+		
+# 		echo " $NAME-$SIZE.png"
+# 		echo "        <file alias=\"$NAMEadd-disk">add-disk.svg</file>
+# 	done 
+
+# done
\ No newline at end of file

flacon-3.1.1.tar.gz/images/images.qrc -> flacon-4.0.0.tar.gz/images/images.qrc Changed

@@ -1,9 +1,29 @@
 <RCC>
-    <qresource prefix="/">
-        <file alias="trackBtn">trackBtn.png</file>
+    <qresource prefix="">
         <file alias="noCover">nocover.png</file>
-        <file alias="audioBtn">audioBtn.png</file>
         <file alias="wait">wait.mng</file>
-        <file alias="logo">../misc/flacon-48x48.png</file>
+    </qresource>
+
+    <qresource prefix="16">
+        <file alias="mainicon">mainicon/flacon-16x16.png</file>
+    </qresource>
+    <qresource prefix="32">
+        <file alias="mainicon">mainicon/flacon-32x32.png</file>
+    </qresource>
+    <qresource prefix="48">
+        <file alias="mainicon">mainicon/flacon-48x48.png</file>
+    </qresource>
+    <qresource prefix="64">
+        <file alias="mainicon">mainicon/flacon-64x64.png</file>
+    </qresource>
+    <qresource prefix="128">
+        <file alias="mainicon">mainicon/flacon-128x128.png</file>
+    </qresource>
+    <qresource prefix="256">
+        <file alias="mainicon">mainicon/flacon-256x256.png</file>
+    </qresource>
+    <qresource prefix="512">
+        <file alias="mainicon">mainicon/flacon-512x512.png</file>
     </qresource>
 </RCC>
+

flacon-4.0.0.tar.gz/images/mainicon Added

flacon-4.0.0.tar.gz/images/mainicon/AUTHORS.md Added

@@ -0,0 +1,40 @@
+https://www.flaticon.com/free-icon/turntable_178143
+
+FREE LICENSE (WITH ATTRIBUTION)
+===============================
+
+This license allows you to use for free any of Flaticon contents for your projects as long as they are
+attributed to their author in the definitive project".
+
+How to attribute contents?
+--------------------------
+- For web usage: By placing a link with the text "designed by {Author's Name} from Flaticon" in a visible
+spot, so the author's authorship is noticeable.
+- Uses different to web: If possible, the text "designed by {Author's Name} from Flaticon" must be written
+next to Flaticon Contents, if it's not possible, the attribution must be placed in the credits or
+acknowledgements section.
+
+Where you can use Flaticon contents:
+------------------------------------
+- Website.
+- Software, applications, mobile, Multimedia
+- Printed and digital media (magazines, newspapers, books, cards, labels, CD, television, video, e-mail).
+- Advertisement and promotional items.
+- Presentation of products and public events.
+
+What you CAN DO:
+----------------
+- You have the non-exclusive, non-transferable, non-sublicensable right to use the licensed material an
+unlimited number of times in any and all media for the commercial or personal purposes listed above.
+- You may alter and create derivative works.
+- You can use Flaticon Contents during the rights period world widely.
+
+What you CAN NOT DO:
+--------------------
+- Sublicense, sell or rent any contents (or a modified version of them).
+- Distribute Flaticon Contents unless it has been expressly authorized by Flaticon.
+- Include Flaticon Contents in an online or offline database or file.
+- Offering Flaticon Contents designs (or modified Flaticon Contents versions) for download.
+
+The complete content of licenses can be consulted on the Terms of Use, that will prevail over the content
+of this document.
\ No newline at end of file

flacon-4.0.0.tar.gz/images/mainicon/_svg2png.sh Added

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+SVG_FILE=flacon.svg
+
+#inkscape -z -e flacon-16x16.png   -w  16 -h  16 ${SVG_FILE}
+#inkscape -z -e flacon-32x32.png   -w  32 -h  32 ${SVG_FILE}
+#inkscape -z -e flacon-48x48.png   -w  48 -h  48 ${SVG_FILE}
+#inkscape -z -e flacon-64x64.png   -w  64 -h  64 ${SVG_FILE}
+#inkscape -z -e flacon-128x128.png -w 128 -h 128 ${SVG_FILE}
+#inkscape -z -e flacon-256x256.png -w 256 -h 256 ${SVG_FILE}
+#inkscape -z -e flacon-512x512.png -w 512 -h 512 ${SVG_FILE}
+
+
+inkscape -z -e flacon.iconset/icon_512x512.png -w 512 -h 512 ${SVG_FILE}
+inkscape -z -e flacon.iconset/icon_256x256.png -w 256 -h 256 ${SVG_FILE}
+inkscape -z -e flacon.iconset/icon_128x128.png -w 128 -h 128 ${SVG_FILE}
+inkscape -z -e flacon.iconset/icon_32x32.png   -w  32 -h  32 ${SVG_FILE}
+inkscape -z -e flacon.iconset/icon_16x16.png   -w  16 -h  16 ${SVG_FILE}
+
+inkscape -z -e flacon.iconset/icon_512x512@2x.png -w 1024 -h 1024 ${SVG_FILE}
+inkscape -z -e flacon.iconset/icon_256x256@2x.png -w  512 -h  512 ${SVG_FILE}
+inkscape -z -e flacon.iconset/icon_128x128@2x.png -w  256 -h  256 ${SVG_FILE}
+inkscape -z -e flacon.iconset/icon_32x32@2x.png   -w   64 -h   64 ${SVG_FILE}
+inkscape -z -e flacon.iconset/icon_16x16@2x.png   -w   32 -h   32 ${SVG_FILE}
+

flacon-4.0.0.tar.gz/images/mainicon/flacon-128x128.png Added

flacon-4.0.0.tar.gz/images/mainicon/flacon-16x16.png Added

flacon-4.0.0.tar.gz/images/mainicon/flacon-256x256.png Added

flacon-4.0.0.tar.gz/images/mainicon/flacon-32x32.png Added

flacon-4.0.0.tar.gz/images/mainicon/flacon-48x48.png Added

flacon-4.0.0.tar.gz/images/mainicon/flacon-512x512.png Added

flacon-4.0.0.tar.gz/images/mainicon/flacon-64x64.png Added

flacon-4.0.0.tar.gz/images/mainicon/flacon.iconset Added

flacon-4.0.0.tar.gz/images/mainicon/flacon.iconset/icon_128x128.png Added

flacon-4.0.0.tar.gz/images/mainicon/flacon.iconset/icon_128x128@2x.png Added

flacon-4.0.0.tar.gz/images/mainicon/flacon.iconset/icon_16x16.png Added

flacon-4.0.0.tar.gz/images/mainicon/flacon.iconset/icon_16x16@2x.png Added

flacon-4.0.0.tar.gz/images/mainicon/flacon.iconset/icon_256x256.png Added

flacon-4.0.0.tar.gz/images/mainicon/flacon.iconset/icon_256x256@2x.png Added

flacon-4.0.0.tar.gz/images/mainicon/flacon.iconset/icon_32x32.png Added

flacon-4.0.0.tar.gz/images/mainicon/flacon.iconset/icon_32x32@2x.png Added

flacon-4.0.0.tar.gz/images/mainicon/flacon.iconset/icon_512x512.png Added

flacon-4.0.0.tar.gz/images/mainicon/flacon.iconset/icon_512x512@2x.png Added

flacon-4.0.0.tar.gz/images/mainicon/flacon.svg Added

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<circle id="background_79_" style="fill:#E27C3E;" cx="256" cy="256" r="256"/>
+<path style="fill:#F2F2F2;" d="M403.435,385.934c0,9.426-7.641,17.066-17.066,17.066H125.501c-9.426,0-17.066-7.641-17.066-17.066
+	V126.066c0-9.426,7.641-17.066,17.066-17.066h260.867c9.426,0,17.066,7.641,17.066,17.066L403.435,385.934L403.435,385.934z"/>
+<path style="fill:#7C9BAD;" d="M254.452,359.255c-59.224,0-107.407-48.184-107.407-107.408c0-59.227,48.184-107.41,107.407-107.41
+	c59.225,0,107.41,48.184,107.41,107.41C361.862,311.071,313.677,359.255,254.452,359.255z"/>
+<circle style="fill:#233540;" cx="254.453" cy="251.847" r="91.255"/>
+<path style="fill:#355061;" d="M234.329,241.979l-16.068-73.913c11.098-4.8,23.331-7.477,36.194-7.477
+	c12.59,0,24.581,2.553,35.493,7.16l-15.203,69.937L234.329,241.979z"/>
+<path style="fill:#355061;" d="M321.935,313.275l-56.982-51.562l5.368-6.385l66.651,35.504
+	C333.075,299.061,327.995,306.622,321.935,313.275z"/>
+<path style="fill:#355061;" d="M234.329,261.713l-16.068,73.915c11.098,4.799,23.331,7.474,36.194,7.474
+	c12.59,0,24.581-2.55,35.493-7.16l-15.203-69.935L234.329,261.713z"/>
+<path style="fill:#355061;" d="M254.452,294.647c-23.601,0-42.801-19.2-42.801-42.8c0-23.602,19.2-42.802,42.801-42.802
+	c23.604,0,42.803,19.2,42.803,42.802C297.255,275.446,278.056,294.647,254.452,294.647z"/>
+<path style="fill:#E27C3E;" d="M254.452,289.526c-20.777,0-37.68-16.903-37.68-37.68c0-20.778,16.902-37.682,37.68-37.682
+	c20.779,0,37.684,16.903,37.684,37.682C292.136,272.623,275.232,289.526,254.452,289.526z"/>
+<path style="fill:#233540;" d="M254.454,270.172c-10.105,0-18.326-8.222-18.326-18.325c0-10.105,8.221-18.326,18.326-18.326
+	c10.103,0,18.324,8.221,18.324,18.326C272.778,261.95,264.557,270.172,254.454,270.172z"/>
+<path style="fill:#FFFFFF;" d="M254.454,256.305c-2.459,0-4.459-2-4.459-4.458c0-2.458,2-4.46,4.459-4.46
+	c2.457,0,4.457,2.002,4.457,4.46C258.911,254.305,256.911,256.305,254.454,256.305z"/>
+<polygon style="fill:#7C9BAD;" points="190.592,323.935 190.649,323.872 188.107,321.594 185.625,319.252 185.566,319.315 
+	169.023,304.488 163.149,331.045 169.454,336.842 174.48,341.462 180.765,347.24 206.745,339.167 "/>
+<path style="fill:none;stroke:#7C9BAD;stroke-width:1.7067;stroke-miterlimit:10;" d="M369.548,388.377
+	c-6.617,0-12.001-5.384-12.001-12.002c0-6.616,5.384-12,12.001-12s12,5.384,12,12C381.548,382.993,376.165,388.377,369.548,388.377z
+	"/>
+<path style="fill:#EFC84A;" d="M369.548,384.963c-4.736,0-8.588-3.852-8.588-8.588c0-4.733,3.852-8.587,8.588-8.587
+	c4.734,0,8.588,3.854,8.588,8.587C378.136,381.111,374.282,384.963,369.548,384.963z"/>
+<path style="fill:none;stroke:#7C9BAD;stroke-width:1.7067;stroke-miterlimit:10;" d="M333.708,388.377
+	c-6.618,0-12.002-5.384-12.002-12.002c0-6.616,5.384-12,12.002-12c6.617,0,12,5.384,12,12
+	C345.708,382.993,340.325,388.377,333.708,388.377z"/>
+<path style="fill:#E27C3E;" d="M333.708,384.963c-4.736,0-8.588-3.852-8.588-8.588c0-4.733,3.852-8.587,8.588-8.587
+	c4.734,0,8.587,3.854,8.587,8.587C342.295,381.111,338.442,384.963,333.708,384.963z"/>
+<path style="fill:none;stroke:#7C9BAD;stroke-width:1.7067;stroke-miterlimit:10;" d="M297.868,388.377
+	c-6.618,0-12.002-5.384-12.002-12.002c0-6.616,5.384-12,12.002-12c6.617,0,12,5.384,12,12
+	C309.868,382.993,304.485,388.377,297.868,388.377z"/>
+<path style="fill:#334D5C;" d="M297.868,384.963c-4.736,0-8.588-3.852-8.588-8.588c0-4.733,3.852-8.587,8.588-8.587
+	c4.733,0,8.587,3.854,8.587,8.587C306.455,381.111,302.602,384.963,297.868,384.963z"/>
+<circle style="fill:#7C9BAD;" cx="367.841" cy="151.951" r="22.133"/>
+<circle style="fill:#EFC84A;stroke:#F2F2F2;stroke-width:5.12;stroke-miterlimit:10;" cx="367.841" cy="151.951" r="12.001"/>
+<g>
+	<path style="fill:#EFC84A;" d="M365.282,151.951c-2.286,18.965-4.572,37.93-6.858,56.895c0.145-1.197,1.286-2.159-0.298-0.611
+		c-1.401,1.369-2.804,2.739-4.205,4.108c-4.445,4.341-8.89,8.683-13.334,13.024c-6.897,6.736-13.794,13.473-20.691,20.209
+		c-2.365,2.311,1.258,5.928,3.621,3.621c6.896-6.737,13.793-13.474,20.69-20.21c4.444-4.342,8.89-8.683,13.334-13.024
+		c1.747-1.707,5.658-4.258,5.98-6.918c2.293-19.031,4.588-38.062,6.881-57.094C370.796,148.678,365.672,148.716,365.282,151.951
+		L365.282,151.951z"/>
+</g>
+<g>
+	<path style="fill:#EFC84A;" d="M327.013,242.745c1.876,2.099,1.694,5.352-0.405,7.229l-1.272,1.137
+		c-2.099,1.877-5.352,1.695-7.229-0.405c-1.876-2.1-1.694-5.353,0.406-7.229l1.271-1.136
+		C321.884,240.464,325.137,240.646,327.013,242.745z"/>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

flacon-3.1.1.tar.gz/inputaudiofile.cpp -> flacon-4.0.0.tar.gz/inputaudiofile.cpp Changed

@@ -36,37 +36,6 @@
 #include <QFileInfo>
 #include <QDir>
 
-//void initInputAudioFormat(QList<InputAudioFormat> *formats)
-//{
-//    *formats << InputAudioFormat("APE",     "ape",  "mac");
-//    *formats << InputAudioFormat("FLAC",    "flac", "flac");
-//    *formats << InputAudioFormat("WavPack", "wv",   "wvunpack");
-//    *formats << InputAudioFormat("TTA",     "tta",  "ttaenc");
-//    *formats << InputAudioFormat("WAV",     "wav",  "");
-//}
-
-///************************************************
-
-// ************************************************/
-//InputAudioFormat::InputAudioFormat(const QString &name, const QString &ext, const QString &program):
-//    mName(name),
-//    mExt(ext),
-//    mProgram(program)
-//{
-//}
-
-
-///************************************************
-
-// ************************************************/
-//QList<InputAudioFormat> InputAudioFormat::allFormats()
-//{
-//    QList<InputAudioFormat> formats;
-//    if (formats.count() == 0)
-//        initInputAudioFormat(&formats);
-
-//    return formats;
-//}
 
 
 /************************************************

flacon-3.1.1.tar.gz/main.cpp -> flacon-4.0.0.tar.gz/main.cpp Changed

@@ -24,11 +24,13 @@
  * END_COMMON_COPYRIGHT_HEADER */
 
 
+#include <QCommandLineParser>
 #include <QApplication>
 #include "mainwindow.h"
 #include "settings.h"
 #include "converter/converter.h"
 #include "project.h"
+#include "scanner.h"
 
 #include <QString>
 #include <QLocale>
@@ -37,6 +39,9 @@
 #include <QMessageBox>
 #include <QTextStream>
 #include <QDebug>
+#include <QFileInfo>
+#include <QDir>
+
 
 /************************************************
  *
@@ -45,7 +50,6 @@
 {
     QTextStream out(stdout);
     out << "Usage: flacon [options] [file]" << endl;
-    out << endl;
     out << "Flacon extracts individual tracks from one big audio file" << endl;
     out << endl;
 
@@ -77,8 +81,13 @@
 void printVersion()
 {
     QTextStream out(stdout);
+
+#ifndef GIT_BRANCH
     out << "flacon " << FLACON_VERSION << endl;
-    out << "Copyright (c) 2013 Alexander Sokolov" << endl;
+#else
+    out << "flacon " << FLACON_VERSION << " + git " << GIT_BRANCH << " "  << GIT_COMMIT_HASH << endl;
+#endif
+    out << "Copyright (c) 2013-" << QDate::currentDate().year() << " Alexander Sokolov" << endl;
     out << "   https://github.com/flacon/flacon" << endl;
     out << endl;
     out << "License LGPLv2.1+: GNU GNU Lesser General Public License version 2.1" << endl;
@@ -95,7 +104,8 @@
 {
     QString msg(message);
     msg.remove(QRegExp("<[^>]*>"));
-    qWarning() << msg;
+    msg.replace("\\n", "\n");
+    QTextStream(stderr) << msg.toLocal8Bit() << endl;
 }
 
 
@@ -114,15 +124,21 @@
  ************************************************/
 void translate(QApplication *app)
 {
+#ifdef MAC_BUNDLE
+    QString appDir = QFileInfo(qApp->applicationDirPath()).dir().absolutePath() + "/Resources/";
+    QString sysDir = appDir;
+#else
+    QString appDir = TRANSLATIONS_DIR;
+    QString sysDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+#endif
     QString locale = QLocale::system().name();
 
     QTranslator *qtTranslator = new QTranslator(app);
-    qtTranslator->load("qt_" + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+    qtTranslator->load("qt_" + locale, sysDir);
     app->installTranslator(qtTranslator);
-
     QTranslator *appTranslator = new QTranslator(app);
     appTranslator->load(QString("flacon_%2.qm").arg(locale)) ||
-            appTranslator->load(QString("%1/flacon_%2.qm").arg(TRANSLATIONS_DIR, locale));
+            appTranslator->load(QString("%1/flacon_%2.qm").arg(appDir, locale));
     app->installTranslator(appTranslator);
 }
 
@@ -130,71 +146,112 @@
 /************************************************
  *
  ************************************************/
-int main(int argc, char *argv[])
+int runConsole(int argc, char *argv[], const QStringList &files)
 {
-    QApplication app(argc, argv);
-    translate(&app);
+    QCoreApplication app(argc, argv);
+    Project::installErrorHandler(consoleErroHandler);
 
-
-    bool start = false;
-    QStringList files;
-    QStringList args = app.arguments();
-    for (int i=1; i < args.count(); ++i)
+    foreach(QString file, files)
     {
-        QString arg = args.at(i);
-
-        if (arg == "--help" || arg == "-h")
+        QFileInfo fi = QFileInfo(file);
+        if (fi.isDir())
         {
-            printHelp();
-            return 0;
+            Scanner scanner;
+            scanner.start(fi.absoluteFilePath());
         }
-
-        if (arg == "--version")
+        else if (fi.size() > 102400)
         {
-            printVersion();
-            return 0;
+            project->addAudioFile(file, false);
         }
-
-        if (arg == "--start" || arg == "-s")
+        else
         {
-            start = true;
-            continue;
+            project->addCueFile(file, false);
         }
+    }
 
-        if (arg == "--config" || arg == "-c")
-        {
-            i++;
-            if (i<args.count())
-                Settings::setFileName(args.at(i));
 
-            continue;
-        }
+    if (project->count() == 0)
+        return 10;
 
-        files << arg;
+    Converter converter;
+    app.connect(&converter, SIGNAL(finished()),
+                &app, SLOT(quit()));
 
-    }
+
+    converter.start();
+    if (!converter.isRunning())
+        return 11;
+
+    return app.exec();
+}
+
+
+/************************************************
+ *
+ ************************************************/
+int runGui(int argc, char *argv[], const QStringList &files)
+{
+    QApplication app(argc, argv);
+    translate(&app);
 
     MainWindow window;
 
     foreach(QString file, files)
         window.addFileOrDir(file);
 
-    if (start)
+    Project::installErrorHandler(guiErrorHandler);
+
+    window.show();
+    return app.exec();
+}
+
+
+/************************************************
+ *
+ ************************************************/
+int main(int argc, char *argv[])
+{
+
+    QCommandLineParser parser;
+
+    parser.addPositionalArgument("file", "CUE or Audio file.");
+
+    parser.addOption(QCommandLineOption(QStringList() << "h" << "help"   , "Show help about options."));
+    parser.addOption(QCommandLineOption(                        "version", "Show version information."));
+    parser.addOption(QCommandLineOption(QStringList() << "s" << "start"  , "Start to convert immediately."));
+    parser.addOption(QCommandLineOption(QStringList() << "c" << "config" , "Specify an alternative configuration file.", "config file"));
+
+    QStringList args;
+    for (int i=0; i<argc; ++i)
+        args << QString::fromLocal8Bit(argv[i]);
+
+    if (!parser.parse(args))
     {
-        Project::installErrorHandler(consoleErroHandler);
-        Converter converter;
-        QEventLoop loop;
-        loop.connect(&converter, SIGNAL(finished()), &loop, SLOT(quit()));
+        QTextStream(stderr) << parser.errorText() << endl << endl;
+        printHelp();
+        return 1;
+    }
 
-        converter.start();
-        loop.exec();
+    if (parser.isSet("help"))
+    {
+        printHelp();
         return 0;
     }
-    else
+
+    if (parser.isSet("version"))
+    {
+        printVersion();
+        return 0;
+    }
+
+    if (!parser.value("config").isEmpty())
     {
-        Project::installErrorHandler(guiErrorHandler);
+        Settings::setFileName(parser.value("config"));
     }
 
-    window.show();
-    return app.exec();
+
+    if (parser.isSet("start"))
+        return runConsole(argc, argv, parser.positionalArguments());
+    else
+        return runGui(argc, argv, parser.positionalArguments());
 }

flacon-4.0.0.tar.gz/misc/Info.plist.in Added

flacon-3.1.1.tar.gz/project.cpp -> flacon-4.0.0.tar.gz/project.cpp Changed

@@ -25,7 +25,7 @@
 
 
 #include "project.h"
-#include "disk.h"
+//#include "disk.h"
 #include "settings.h"
 #include "cue.h"
 #include "inputaudiofile.h"
@@ -37,55 +37,6 @@
 
 static void (*errorHandler)(const QString &msg);
 
-/************************************************
-
- ************************************************/
-QIcon Project::getIcon(const QString &iconName1, const QString &iconName2, const QString &iconName3, const QString &iconName4)
-{
-    if (QIcon::themeName() == "hicolor")
-    {
-        QStringList failback;
-        failback << "oxygen";
-        failback << "Tango";
-        failback << "Prudence-icon";
-        failback << "Humanity";
-        failback << "elementary";
-        failback << "gnome";
-
-
-        QDir usrDir("/usr/share/icons/");
-        QDir usrLocalDir("/usr/local/share/icons/");
-        foreach (QString s, failback)
-        {
-            if (usrDir.exists(s) || usrLocalDir.exists(s))
-            {
-                QIcon::setThemeName(s);
-                break;
-            }
-        }
-    }
-
-    QStringList icons;
-    icons << iconName1;
-    icons << iconName2;
-    icons << iconName3;
-    icons << iconName4;
-
-    QIcon res;
-    foreach(const QString &icon, icons)
-    {
-        if (icon.startsWith(':'))
-            res = QIcon(icon);
-        else
-            res = QIcon::fromTheme(icon);
-
-        if (!res.isNull())
-            return res;
-    }
-
-    return res;
-}
-
 
 /************************************************
 
@@ -146,7 +97,7 @@
 int Project::insertDisk(Disk *disk, int index)
 {
     if (index < 0)
-        index = mDisks.count() -1;
+        index = mDisks.count();
 
     mDisks.insert(index, disk);
 
@@ -234,7 +185,7 @@
             return 0;
     }
 
-    InputAudioFile audio(canonicalFileName);
+    InputAudioFile audio(QFileInfo(fileName).absoluteFilePath());
     if (!audio.isValid())
     {
         if (showErrors)
@@ -293,7 +244,7 @@
 /************************************************
 
  ************************************************/
-void Project::emitDiskChanged(Disk *disk)
+void Project::emitDiskChanged(Disk *disk) const
 {
     emit diskChanged(disk);
 }
@@ -302,7 +253,7 @@
 /************************************************
 
  ************************************************/
-void Project::emitTrackChanged(int disk, int track)
+void Project::emitTrackChanged(int disk, int track) const
 {
     emit trackChanged(disk, track);
 }
@@ -311,7 +262,7 @@
 /************************************************
 
  ************************************************/
-void Project::emitTrackProgress(const Track *track)
+void Project::emitTrackProgress(const Track *track) const
 {
     emit trackProgress(track);
 }
@@ -320,7 +271,25 @@
 /************************************************
 
  ************************************************/
-void Project::emitLayoutChanged()
+void Project::emitLayoutChanged() const
 {
     emit layoutChanged();
 }
+
+
+/************************************************
+ *
+ ************************************************/
+void Project::emitDownloadingStarted(DataProvider *provider) const
+{
+    emit downloadingStarted(provider);
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void Project::emitDownloadingFinished(DataProvider *provider) const
+{
+    emit downloadingFinished(provider);
+}

flacon-3.1.1.tar.gz/project.h -> flacon-4.0.0.tar.gz/project.h Changed

@@ -51,14 +51,13 @@
     int insertDisk(Disk *disk, int index=-1);
     void removeDisk(const QList<Disk*> *disks);
 
-    void emitDiskChanged(Disk *disk);
-    void emitTrackChanged(int disk, int track);
-    void emitTrackProgress(const Track *track);
-    void emitLayoutChanged();
-    void emitDownloadingStarted(DataProvider *provider) { emit downloadingStarted(provider); }
-    void emitDownloadingFinished(DataProvider *provider) { emit downloadingFinished(provider);}
+    void emitDiskChanged(Disk *disk) const;
+    void emitTrackChanged(int disk, int track) const;
+    void emitTrackProgress(const Track *track) const;
+    void emitLayoutChanged() const;
+    void emitDownloadingStarted(DataProvider *provider) const;
+    void emitDownloadingFinished(DataProvider *provider) const;
 
-    static QIcon getIcon(const QString &iconName1, const QString &iconName2="", const QString &iconName3="", const QString &iconName4="");
 
     bool diskExists(const QString &cueUri);
 
@@ -71,14 +70,14 @@
     DiskList addCueFile(const QString &fileName, bool showErrors);
 
 signals:
-    void diskChanged(Disk *disk);
-    void trackChanged(int disk, int track);
-    void trackProgress(const Track *track);
-    void layoutChanged();
+    void diskChanged(Disk *disk) const;
+    void trackChanged(int disk, int track) const;
+    void trackProgress(const Track *track) const;
+    void layoutChanged() const;
     void beforeRemoveDisk(Disk *disk);
     void afterRemoveDisk();
-    void downloadingStarted(DataProvider *provider);
-    void downloadingFinished(DataProvider *provider);
+    void downloadingStarted(DataProvider *provider) const;
+    void downloadingFinished(DataProvider *provider) const;
 
 private:
     explicit Project(QObject *parent = 0);

flacon-3.1.1.tar.gz/settings.cpp -> flacon-4.0.0.tar.gz/settings.cpp Changed

@@ -24,6 +24,7 @@
  * END_COMMON_COPYRIGHT_HEADER */
 
 
+#include "types.h"
 #include "formats/format.h"
 #include "settings.h"
 #include "inputaudiofile.h"
@@ -31,13 +32,9 @@
 #include <QDir>
 #include <QDebug>
 #include <QProcessEnvironment>
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
-    #include <QDesktopServices>
-#else
-    #include <QStandardPaths>
-#endif
-
-
+#include <QDir>
+#include <QStandardPaths>
+#include <QCoreApplication>
 
 #ifdef Q_OS_WIN
     #define PATH_ENV_SEPARATOR ';'
@@ -119,12 +116,8 @@
     // Out Files ********************************
     setDefaultValue(OutFiles_Pattern,       "%a/{%y - }%A/%n - %t");
 
-
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
-    QString outDir = QDesktopServices::storageLocation(QDesktopServices::MusicLocation);
-#else
     QString outDir = QStandardPaths::standardLocations(QStandardPaths::MusicLocation).first();
-#endif
+
     outDir.replace(QDir::homePath(), "~");
     setDefaultValue(OutFiles_Directory,     outDir);
     setDefaultValue(OutFiles_Format,        "FLAC");
@@ -137,8 +130,11 @@
 
     // PerTrackCue **************************
     setDefaultValue(PerTrackCue_Create,     false);
-    setDefaultValue(PerTrackCue_Pregap,     OutFormat::preGapTypeToString(OutFormat::PreGapExtractToFile));
-    setDefaultValue(PerTrackCue_FlaconTags, true);
+    setDefaultValue(PerTrackCue_Pregap,     preGapTypeToString(PreGapType::ExtractToFile));
+
+    // Cover image **************************
+    setDefaultValue(Cover_Mode,             coverModeToString(CoverMode::Scale));
+    setDefaultValue(Cover_ResizeSize,       500);
 
     // ConfigureDialog **********************
     setDefaultValue(ConfigureDialog_Width,  645);
@@ -208,16 +204,21 @@
     // PerTrackCue **************************
     case PerTrackCue_Create:    return "PerTrackCue/Create";
     case PerTrackCue_Pregap:    return "PerTrackCue/Pregap";
-    case PerTrackCue_FlaconTags:return "PerTrackCue/InsertCreatorTag";
 
     // ConfigureDialog **********************
     case ConfigureDialog_Width:     return "ConfigureDialog/Width";
     case ConfigureDialog_Height:    return "ConfigureDialog/Height";
+
+
+    // Cover image **************************
+    case Cover_Mode:                return "Cover/Mode";
+    case Cover_ResizeSize:          return "Cover/Size";
     }
 
     return "";
 }
 
+
 /************************************************
 
  ************************************************/
@@ -265,7 +266,11 @@
  ************************************************/
 QString Settings::programName(const QString &program) const
 {
+#ifdef MAC_BUNDLE
+    return QDir(qApp->applicationDirPath()).absoluteFilePath(program);
+#else
     return value("Programs/" + program).toString();
+#endif
 }
 
 
@@ -286,6 +291,163 @@
 
 
 /************************************************
+ *
+ ************************************************/
+OutFormat *Settings::outFormat() const
+{
+    OutFormat *format = OutFormat::formatForId(value(OutFiles_Format).toString());
+    if (format)
+        return format;
+
+    return OutFormat::allFormats().first();
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void Settings::setOutFormat(const OutFormat *format)
+{
+    setOutFormat(format->id());
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void Settings::setOutFormat(const QString &formatId)
+{
+    setValue(OutFiles_Format, formatId);
+}
+
+
+/************************************************
+ *
+ ************************************************/
+QString Settings::tmpDir() const
+{
+    return value(Encoder_TmpDir).toString();
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void Settings::setTmpDir(const QString &value)
+{
+    setValue(Encoder_TmpDir, value);
+}
+
+
+/************************************************
+
+ ************************************************/
+bool Settings::createCue() const
+{
+    return value(PerTrackCue_Create).toBool();
+}
+
+
+/************************************************
+
+ ************************************************/
+void Settings::setCreateCue(bool value)
+{
+    setValue(PerTrackCue_Create, value);
+}
+
+
+/************************************************
+
+ ************************************************/
+PreGapType Settings::preGapType() const
+{
+    return strToPreGapType(value(Settings::PerTrackCue_Pregap).toString());
+}
+
+
+/************************************************
+
+ ************************************************/
+void Settings::setPregapType(PreGapType value)
+{
+    setValue(Settings::PerTrackCue_Pregap, preGapTypeToString(value));
+}
+
+
+/************************************************
+ *
+ ************************************************/
+QString Settings::outFilePattern() const
+{
+    return value(OutFiles_Pattern).toString();
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void Settings::setOutFilePattern(const QString &value)
+{
+    setValue(OutFiles_Pattern, value);
+}
+
+
+/************************************************
+
+ ************************************************/
+QString Settings::outFileDir() const
+{
+    return value(OutFiles_Directory).toString();
+}
+
+
+/************************************************
+
+ ************************************************/
+void Settings::setOutFileDir(const QString &value)
+{
+    setValue(OutFiles_Directory, value);
+}
+
+
+/************************************************
+
+ ************************************************/
+QString Settings::defaultCodepage() const
+{
+    return value(Tags_DefaultCodepage).toString();
+}
+
+
+/************************************************
+
+ ************************************************/
+void Settings::setDefaultCodepage(const QString &value)
+{
+    setValue(Tags_DefaultCodepage, value);
+}
+
+
+/************************************************
+ *
+ ************************************************/
+CoverMode Settings::coverMode() const
+{
+    return strToCoverMode(value(Cover_Mode).toString());
+}
+
+
+/************************************************
+ *
+ ************************************************/
+int Settings::coverImageSize() const
+{
+    return value(Cover_ResizeSize).toInt();
+}
+
+
+/************************************************
 
  ************************************************/
 void Settings::setValue(Settings::Key key, const QVariant &value)

flacon-3.1.1.tar.gz/settings.h -> flacon-4.0.0.tar.gz/settings.h Changed

@@ -29,11 +29,15 @@
 
 #include <QSettings>
 #include <QSet>
+#include "types.h"
+
+class OutFormat;
 
 class Settings : public QSettings
 {
     Q_OBJECT
 public:
+
     enum Key{
         Tags_DefaultCodepage,
 
@@ -60,11 +64,14 @@
         // PerTrackCue **************************
         PerTrackCue_Create,
         PerTrackCue_Pregap,
-        PerTrackCue_FlaconTags,
 
         // ConfigureDialog **********************
         ConfigureDialog_Width,
-        ConfigureDialog_Height
+        ConfigureDialog_Height,
+
+        // Cover image **************************
+        Cover_Mode,
+        Cover_ResizeSize
     };
 
     static Settings *instance();
@@ -82,6 +89,31 @@
     QSet<QString> programs() const { return mPrograms; }
     QString findProgram(const QString &program) const;
 
+    OutFormat *outFormat() const;
+    void setOutFormat(const OutFormat *format);
+    void setOutFormat(const QString &formatId);
+
+    QString tmpDir() const;
+    void setTmpDir(const QString &value);
+
+    bool createCue() const;
+    void setCreateCue(bool value);
+
+    PreGapType preGapType() const;
+    void setPregapType(PreGapType value);
+
+    QString outFilePattern() const;
+    void setOutFilePattern(const QString &value);
+
+    QString outFileDir() const;
+    void setOutFileDir(const QString &value);
+
+    QString defaultCodepage() const;
+    void setDefaultCodepage(const QString &value);
+
+    CoverMode coverMode() const;
+    int coverImageSize() const;
+
 signals:
     void changed();
 
@@ -95,6 +127,7 @@
     void setDefaultValue(const QString &key, const QVariant &defaultValue);
     void setDefaultValue(Key key, const QVariant &defaultValue);
     QString keyToString(Key key) const;
+
     QSet<QString> mPrograms;
     static QString mFileName;
 };

flacon-3.1.1.tar.gz/tagset.cpp -> flacon-4.0.0.tar.gz/tagset.cpp Changed

@@ -110,57 +110,6 @@
 /************************************************
 
  ************************************************/
-#if (QT_VERSION < QT_VERSION_CHECK(4, 8, 0))
-
-template<class T>
-unsigned int levenshteinDistance(const T &s1, const T & s2)
-{
-    const size_t len1 = s1.size(), len2 = s2.size();
-    QVector<unsigned int> col(len2+1), prevCol(len2+1);
-    QVector<unsigned int> &c = col;
-    QVector<unsigned int> &p = prevCol;
-
-    for (int i = 0; i < p.size(); i++)
-        p[i] = i;
-
-    for (unsigned int i = 0; i < len1; i++)
-    {
-        c[0] = i+1;
-        for (unsigned int j = 0; j < len2; j++)
-            c[j+1] = qMin( qMin( 1 + c[j], 1 + p[1 + j]),
-                            p[j] + (s1[i]==s2[j] ? 0 : 1) );
-
-        p = col;
-        c = prevCol;
-    }
-    return p[len2];
-}
-#else
-template<class T>
-unsigned int levenshteinDistance(const T &s1, const T & s2)
-{
-    const size_t len1 = s1.size(), len2 = s2.size();
-    QVector<unsigned int> col(len2+1), prevCol(len2+1);
-
-    for (int i = 0; i < prevCol.size(); i++)
-        prevCol[i] = i;
-
-    for (unsigned int i = 0; i < len1; i++)
-    {
-        col[0] = i+1;
-        for (unsigned int j = 0; j < len2; j++)
-            col[j+1] = qMin( qMin( 1 + col[j], 1 + prevCol[1 + j]),
-                            prevCol[j] + (s1[i]==s2[j] ? 0 : 1) );
-        col.swap(prevCol);
-    }
-    return prevCol[len2];
-}
-#endif
-
-
-/************************************************
-
- ************************************************/
 TagSetData::TagSetData():
     mTrackCount(0),
     mTextCodec(0)

flacon-3.1.1.tar.gz/tests/CMakeLists.txt -> flacon-4.0.0.tar.gz/tests/CMakeLists.txt Changed

@@ -25,8 +25,8 @@
 
 
 project(flacon_test)
-cmake_minimum_required( VERSION 2.6 )
-
+cmake_minimum_required( VERSION 3.0.0 )
+cmake_policy(SET CMP0028 NEW)
 
 set(TEST_HEADERS
     tools.h
@@ -42,11 +42,12 @@
     test_format.cpp
     test_inputaudiofile.cpp
     test_convert.cpp
+    test_searchcoverimage.cpp
+    test_findcuefile.cpp
+    test_findaudiofile.cpp
+    test_outformatencoderargs.cpp
 )
 
-set(TEST_MOCS
-    testflacon.h
-)
 
 foreach(FILE ${SOURCES})
     if(NOT FILE STREQUAL "main.cpp")
@@ -60,10 +61,6 @@
 endforeach()
 
 
-foreach(FILE ${MOCS})
-    set(TEST_MOCS ${TEST_MOCS} "../${FILE}")
-endforeach()
-
 
 add_definitions(-DTEST_DATA_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\")
 
@@ -80,23 +77,13 @@
 
 add_definitions(-Wall)
 
-if(USE_QT4)
-    set(QT_USE_QTTEST true)
-    find_package(Qt4 REQUIRED)
-    include(${QT_USE_FILE})
-    qt4_wrap_cpp(TEST_MOC_SOURCES ${TEST_MOCS})
-else()
-    cmake_minimum_required(VERSION 2.8.3)
-    find_package(Qt5Test REQUIRED)
-    include_directories(${Qt5Test_INCLUDE_DIRS})
-    add_definitions(${Qt5Test_DEFINITIONS})
-    set(QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Test_LIBRARIES})
-    qt5_wrap_cpp(TEST_MOC_SOURCES ${TEST_MOCS})
-endif()
-
-add_executable(${PROJECT_NAME} ${TEST_HEADERS} ${TEST_SOURCES} ${TEST_MOC_SOURCES})
-target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES}  ${LIBRARIES})
-
-#add_dependencies(${PROJECT_NAME} razorqt)
-#install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+find_package(Qt5 REQUIRED
+    Core
+    Test
+    Widgets
+    Network
+)
+
 
+add_executable(${PROJECT_NAME} ${TEST_HEADERS} ${TEST_SOURCES})
+target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES}  ${LIBRARIES} Qt5::Core Qt5::Test Qt5::Widgets Qt5::Network)

flacon-3.1.1.tar.gz/tests/data/testConvert/01.cuecreator.cue -> flacon-4.0.0.tar.gz/tests/data/testConvert/01.cuecreator.cue Changed

flacon-3.1.1.tar.gz/tests/data/testConvert/01.expected.cue -> flacon-4.0.0.tar.gz/tests/data/testConvert/01.expected.cue Changed

flacon-3.1.1.tar.gz/tests/data/testConvert/02.cuecreator.cue -> flacon-4.0.0.tar.gz/tests/data/testConvert/02.cuecreator.cue Changed

flacon-3.1.1.tar.gz/tests/data/testConvert/02.expected.cue -> flacon-4.0.0.tar.gz/tests/data/testConvert/02.expected.cue Changed

flacon-3.1.1.tar.gz/tests/data/testConvert/03.cuecreator.cue -> flacon-4.0.0.tar.gz/tests/data/testConvert/03.cuecreator.cue Changed

flacon-3.1.1.tar.gz/tests/data/testConvert/03.expected.cue -> flacon-4.0.0.tar.gz/tests/data/testConvert/03.expected.cue Changed

flacon-3.1.1.tar.gz/tests/data/testConvert/04.cuecreator.cue -> flacon-4.0.0.tar.gz/tests/data/testConvert/04.cuecreator.cue Changed

flacon-3.1.1.tar.gz/tests/data/testConvert/04.expected.cue -> flacon-4.0.0.tar.gz/tests/data/testConvert/04.expected.cue Changed

flacon-3.1.1.tar.gz/tests/data/testConvert/05.expected.cue -> flacon-4.0.0.tar.gz/tests/data/testConvert/05.expected.cue Changed

flacon-3.1.1.tar.gz/tests/inittestcase.cpp -> flacon-4.0.0.tar.gz/tests/inittestcase.cpp Changed

@@ -33,6 +33,12 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QDebug>
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+#include <QFuture>
+#include <QtConcurrentRun>
+#else
+#include <QtConcurrent/QtConcurrent>
+#endif
 
 #ifdef Q_OS_WIN
     #define PATH_ENV_SEPARATOR ';'
@@ -89,10 +95,10 @@
     mAudio_cd_tta  = mTmpDir + "CD.tta";
 
     createWavFile(  mAudio_cd_wav,  900, StdWavHeader::Quality_Stereo_CD);
-    encodeAudioFile(mAudio_cd_wav, mAudio_cd_ape);
-    encodeAudioFile(mAudio_cd_wav, mAudio_cd_flac);
-    encodeAudioFile(mAudio_cd_wav, mAudio_cd_wv);
-    encodeAudioFile(mAudio_cd_wav, mAudio_cd_tta);
+    auto wait_cd_ape  = QtConcurrent::run(encodeAudioFile, mAudio_cd_wav, mAudio_cd_ape);
+    auto wait_cd_flac = QtConcurrent::run(encodeAudioFile, mAudio_cd_wav, mAudio_cd_flac);
+    auto wait_cd_wv   = QtConcurrent::run(encodeAudioFile, mAudio_cd_wav, mAudio_cd_wv);
+    auto wait_cd_tta  = QtConcurrent::run(encodeAudioFile, mAudio_cd_wav, mAudio_cd_tta);
 
 
     mAudio_24x96_wav  = mTmpDir + "24x96.wav";
@@ -102,10 +108,21 @@
     mAudio_24x96_tta  = mTmpDir + "24x96.tta";
 
     createWavFile(  mAudio_24x96_wav,  900, StdWavHeader::Quality_Stereo_24_96);
-    encodeAudioFile(mAudio_24x96_wav, mAudio_24x96_ape);
-    encodeAudioFile(mAudio_24x96_wav, mAudio_24x96_flac);
-    encodeAudioFile(mAudio_24x96_wav, mAudio_24x96_wv);
-    encodeAudioFile(mAudio_24x96_wav, mAudio_24x96_tta);
+    auto wait_24x96_ape  = QtConcurrent::run(encodeAudioFile, mAudio_24x96_wav, mAudio_24x96_ape);
+    auto wait_24x96_flac = QtConcurrent::run(encodeAudioFile, mAudio_24x96_wav, mAudio_24x96_flac);
+    auto wait_24x96_wv   = QtConcurrent::run(encodeAudioFile, mAudio_24x96_wav, mAudio_24x96_wv);
+    auto wait_24x96_tta  = QtConcurrent::run(encodeAudioFile, mAudio_24x96_wav, mAudio_24x96_tta);
+
+
+    wait_cd_ape.waitForFinished();
+    wait_cd_flac.waitForFinished();
+    wait_cd_wv.waitForFinished();
+    wait_cd_tta.waitForFinished();
+
+    wait_24x96_ape.waitForFinished();
+    wait_24x96_flac.waitForFinished();
+    wait_24x96_wv.waitForFinished();
+    wait_24x96_tta.waitForFinished();
 
 }

flacon-3.1.1.tar.gz/tests/test_convert.cpp -> flacon-4.0.0.tar.gz/tests/test_convert.cpp Changed

@@ -24,6 +24,7 @@
  * END_COMMON_COPYRIGHT_HEADER */
 
 #include "testflacon.h"
+#include "types.h"
 #include "../settings.h"
 #include "outformat.h"
 #include "../converter/wavheader.h"
@@ -37,336 +38,479 @@
 
 
 
+struct TestConvertRequest {
+    QString cueFile;
+    QString audioFile;
+    QString expectedCue;
+    QStringList resultFiles;
+    QStringList tags;
 
-class ConverterTester
-{
-public:
-    ConverterTester(const QString &cueFile,
-                    const QString &audioFile,
-                    const QString &expectedCue,
-                    const QString &resultFiles);
-
-
-    void run(const QString &name);
-
-    Disk *disk() { return mDisk; }
+    void clear() {
+        cueFile.clear();
+        audioFile.clear();
+        expectedCue.clear();
+        resultFiles.clear();
+        tags.clear();
 
-private:
-    Disk *mDisk;
-    QStringList mResultFiles;
-    QString mExpectedCue;
-    ConverterTester(const ConverterTester &other) {}
+    }
 };
-
-
-
+Q_DECLARE_METATYPE(TestConvertRequest)
+Q_DECLARE_METATYPE(QList<TestConvertRequest>)
 
 /************************************************
-
+ *
  ************************************************/
-ConverterTester::ConverterTester(const QString &cueFile, const QString &audioFile, const QString &expectedCue, const QString &resultFiles)
+void consoleErroHandler(const QString &message)
 {
-    mResultFiles = resultFiles.split(';', QString::SkipEmptyParts);
-    mExpectedCue = expectedCue;
-    project->clear();
-    mDisk = loadFromCue(cueFile);
-    InputAudioFile audio(audioFile);
-    mDisk->setAudioFile(audio);
-    project->addDisk(mDisk);
+    QString msg(message);
+    msg.remove(QRegExp("<[^>]*>"));
+    qWarning() << "Converter error:" << msg;
 }
 
 /************************************************
-
+ *
  ************************************************/
-void ConverterTester::run(const QString &name)
+void TestFlacon::testConvert()
 {
-    Converter conv;
-    conv.setShowStatistic(false);
-    QEventLoop loop;
-    loop.connect(&conv, SIGNAL(finished()), &loop, SLOT(quit()));
-    conv.start();
-
-    if (!conv.isRunning())
-    {
-        QString msg;
-        mDisk->canConvert(&msg);
-        QFAIL(QString("Can't start converter: \"%1\"").arg(msg).toLocal8Bit());
-    }
+    QFETCH(bool, createCue);
+    QFETCH(int, preGapType);
+    QFETCH(QString, tmpDir);
+    QFETCH(QList<TestConvertRequest>, requests);
 
-    loop.exec();
+    settings->setOutFormat("WAV");
+    settings->setCreateCue(createCue);
+    settings->setPregapType(PreGapType(preGapType));
+    settings->setTmpDir(tmpDir.isEmpty() ? "" : (dir() + "/" + tmpDir));
+    settings->setOutFileDir(dir());
+    settings->setOutFilePattern("%a/%n - %t");
 
-    QDir outDir = QFileInfo(mDisk->track(0)->resultFilePath()).dir();
-    QStringList files = outDir.entryList(QDir::NoDotAndDotDot | QDir::System | QDir::Hidden | QDir::Files);
+    Project::installErrorHandler(consoleErroHandler);
     project->clear();
-    if (!mExpectedCue.isEmpty())
-        QFile::copy(mExpectedCue, outDir.absoluteFilePath("expected.cue"));
-
-    QStringList missing;
-    foreach(QString f, mResultFiles)
+    foreach (TestConvertRequest req, requests)
     {
-        QString file = f.section(':', 0, 0).trimmed();
-        QString hash = f.section(':', 1).trimmed();
+        QString srcAudioFile  = req.audioFile.section(':', 0, 0);
+        QString destAudioFile = req.audioFile.section(':', 1);
 
-        if (files.removeAll(file) == 0)
-            missing << file;
-
-        if (!hash.isEmpty())
+        if (!destAudioFile.isEmpty())
         {
-            compareAudioHash(outDir.absoluteFilePath(file), hash);
+            destAudioFile = dir() + "/" + destAudioFile;
+            QFileInfo(destAudioFile).dir().mkpath(".");
+            QFile::copy(srcAudioFile, destAudioFile);
         }
-    }
+        else
+        {
+            destAudioFile = srcAudioFile;
+        }
+
+        Disk *disk = loadFromCue(req.cueFile);
+        InputAudioFile audio(destAudioFile);
+        disk->setAudioFile(audio);
+        project->addDisk(disk);
 
+        foreach (QString line, req.tags)
+        {
+            line = line.trimmed();
+            if (line.isEmpty())
+                continue;
 
-    QString msg = "";
-    if (!missing.isEmpty())
-        msg += QString("\nFiles not exists:\n  *%1").arg(missing.join("\n  *"));
+            int n = line.section(' ', 0, 0).toInt() - 1;
+            Track *track = disk->track(n);
 
-    if (!files.isEmpty())
-        msg += QString("\nFiles exists:\n  *%1").arg(files.join("\n  *"));
+            foreach (QString s, line.section(' ', 1).split(','))
+            {
+                track->setTag(s.section(':', 0, 0).trimmed(), s.section(':', 1).trimmed());
+            }
+        }
+    }
 
+    Converter conv;
+    conv.setShowStatistic(false);
+    QEventLoop loop;
+    loop.connect(&conv, SIGNAL(finished()), &loop, SLOT(quit()));
+    conv.start();
 
-    if (!mExpectedCue.isEmpty())
+
+    if (!conv.isRunning())
     {
-        //QString resCueFile;
-        files = outDir.entryList(QStringList() << "*.cue", QDir::Files);
-        if (files.isEmpty())
+        for (int i=0; i<project->count(); i++)
         {
-            msg += "\nResult CUE file not found.";
-        }
-        else
-        {
-            QString err;
-            if (!TestFlacon::compareCue(outDir.absoluteFilePath(files.first()), mExpectedCue, &err))
-                msg += "\n" + err;
+            QString msg;
+            if (! project->disk(i)->canConvert(&msg))
+            {
+                QFAIL(QString("Can't start converter: \"%1\"").arg(msg).toLocal8Bit());
+            }
         }
     }
 
-    if (!msg.isEmpty())
-        QFAIL(name.toLocal8Bit() + "\n" + msg.toLocal8Bit());
+    loop.exec();
 
-}
+    // Checks __________________________________________________
+    for (int i=0; i<project->count(); i++)
+    {
+        TestConvertRequest req = requests.at(i);
+        QDir outDir = QFileInfo(project->disk(i)->track(0)->resultFilePath()).dir();
+        QStringList files = outDir.entryList(QDir::NoDotAndDotDot | QDir::System | QDir::Hidden | QDir::Files);
 
+        QFile::copy(req.cueFile, outDir.absoluteFilePath("source_%1.cue").arg(i, 2, 10, QChar('0')));
 
-/************************************************
- *
- ************************************************/
-void TestFlacon::testConvert()
-{
+        if (! req.expectedCue.isEmpty())
+            QFile::copy(req.expectedCue, outDir.absoluteFilePath("expected_%1.cue").arg(i, 2, 10, QChar('0')));
 
-    QFETCH(QString, cueFile);
-    QFETCH(QString, audioFile);
-    QFETCH(QString, expectedCue);
-    QFETCH(QString, tags);
-    QFETCH(QString, resultFiles);
-    QFETCH(bool, createCue);
-    QFETCH(int, preGapType);
+        QStringList missing;
+        foreach(QString f, req.resultFiles)
+        {
+            QString file = f.section(':', 0, 0).trimmed();
+            QString hash = f.section(':', 1).trimmed();
 
-    settings->setValue(Settings::OutFiles_Directory, dir());
-    settings->setValue(Settings::OutFiles_Pattern, "%a/%n - %t");
-    settings->setValue(Settings::OutFiles_Format,  "WAV");
-    settings->setValue(Settings::PerTrackCue_FlaconTags, false);
-    settings->setValue(Settings::PerTrackCue_Create,  createCue);
-    settings->setValue(Settings::PerTrackCue_Pregap,  OutFormat::preGapTypeToString(OutFormat::PreGapType(preGapType)));
-    settings->setValue(Settings::OutFiles_Directory, dir());
-    settings->setValue(Settings::Encoder_TmpDir,      "");
-
-    QString srcAudioFile  = audioFile.section(':', 0, 0);
-    QString destAudioFile = audioFile.section(':', 1);
-    if (!destAudioFile.isEmpty())
-    {
-        destAudioFile = dir() + "/" + destAudioFile;
-        QFileInfo(destAudioFile).dir().mkpath(".");
-        QFile::copy(srcAudioFile, destAudioFile);
-    }
-    else
-    {
-        destAudioFile = srcAudioFile;
-    }
+            if (files.removeAll(file) == 0)
+                missing << file;
 
-    ConverterTester conv(
-                    cueFile,
-                    destAudioFile,
-                    expectedCue,
-                    resultFiles
-                    );
+            if (!hash.isEmpty() && QFileInfo(outDir.absoluteFilePath(file)).exists())
+            {
+               if (compareAudioHash(outDir.absoluteFilePath(file), hash))
+                    QFile::remove(outDir.absoluteFilePath(file));
+            }
+
+
+        }
 
-    foreach (QString line, tags.split(';'))
-    {
-        line = line.trimmed();
-        if (line.isEmpty())
-            continue;
 
-        int n = line.section(' ', 0, 0).toInt() - 1;
-        Track *track = conv.disk()->track(n);
+        QString msg = "";
+        if (!missing.isEmpty())
+            msg += QString("\nFiles not exists in %1:\n  *%2")
+                    .arg(outDir.absolutePath())
+                    .arg(missing.join("\n  *"));
 
-        foreach (QString s, line.section(' ', 1).split(','))
+        if (!files.isEmpty())
+            msg += QString("\nFiles exists in %1:\n  *%2")
+                    .arg(outDir.absolutePath())
+                    .arg(files.join("\n  *"));
+
+        if (!req.expectedCue.isEmpty())
         {
-            track->setTag(s.section(':', 0, 0).trimmed(), s.section(':', 1).trimmed());
+            files = outDir.entryList(QStringList() << "*.cue", QDir::Files);
+            if (files.isEmpty())
+            {
+                msg += "\nResult CUE file not found.";
+            }
+            else
+            {
+                QString err;
+                if (!TestFlacon::compareCue(outDir.absoluteFilePath(files.first()), req.expectedCue, &err))
+                    msg += "\n" + err;
+            }
         }
-    }
-
-    conv.run(QTest::currentDataTag());
 
+        if (!msg.isEmpty())
+            QFAIL(QString("%1\n%2").arg(QTest::currentDataTag()).arg(msg).toLocal8Bit().data());
+    }
+    project->clear();
 }
 
 
+
 /************************************************
  *
  ************************************************/
 void TestFlacon::testConvert_data()
 {
-    QTest::addColumn<QString>("cueFile");
-    QTest::addColumn<QString>("audioFile");
-    QTest::addColumn<QString>("expectedCue");
-    QTest::addColumn<QString>("resultFiles");
-    QTest::addColumn<QString>("tags");
     QTest::addColumn<bool>("createCue");
     QTest::addColumn<int>("preGapType");
+    QTest::addColumn<QString>("tmpDir");
+    QTest::addColumn<QList<TestConvertRequest> >("requests");
 
-    QString inDir = mDataDir + "/testConvert/";
+    TestConvertRequest req;
+    QList<TestConvertRequest> requests;
 
 
-
-    QTest::newRow("01.1 With pregap and HTOA, w.o cue")
-            << inDir + "01.cuecreator.cue"
-            << mAudio_24x96_wav
-            << ""
-            << "01 - Song01.wav : a86e2d59bf1e272b5ab7e9a16009455d;"
-               "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140;"
-               "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3;"
-               "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f;"
-            << ""
+    QString inDir = mDataDir + "/testConvert/";
+    QString name;
+
+    //=====================================================
+    name ="01.1 With pregap and HTOA, without cue";
+    requests.clear();
+
+    req.clear();
+    req.cueFile     = inDir + "01.cuecreator.cue";
+    req.audioFile   = mAudio_24x96_wav;
+    req.expectedCue = "";
+    req.resultFiles << "01 - Song01.wav : a86e2d59bf1e272b5ab7e9a16009455d"
+                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
+                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
+                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f";
+    requests << req;
+
+    QTest::newRow(name.toUtf8())
             << false
-            << int(OutFormat::PreGapExtractToFile);
-
-
-
-    QTest::newRow("01.2 With pregap and HTOA, with cue")
-            << inDir + "01.cuecreator.cue"
-            << mAudio_24x96_wav
-            << inDir + "01.expected.cue"
-            << "01 - Song01.wav : a86e2d59bf1e272b5ab7e9a16009455d;"
-               "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140;"
-               "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3;"
-               "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f;"
-               "00 - (HTOA).wav : afb9e4434b212bacdd62e585461af757;"
-               "Artist-Album.cue;"
+            << int(PreGapType::ExtractToFile)
             << ""
+            << requests;
+    //=====================================================
+
+
+    //=====================================================
+    name = "01.2 With pregap and HTOA, with cue";
+    requests.clear();
+
+    req.clear();
+    req.cueFile     = inDir + "01.cuecreator.cue";
+    req.audioFile   = mAudio_24x96_wav;
+    req.expectedCue = "";
+    req.resultFiles << "01 - Song01.wav : a86e2d59bf1e272b5ab7e9a16009455d"
+                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
+                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
+                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f"
+                    << "00 - (HTOA).wav : afb9e4434b212bacdd62e585461af757"
+                    << "Artist_01-Album.cue";
+    requests << req;
+
+    QTest::newRow(name.toUtf8())
             << true
-            << int(OutFormat::PreGapExtractToFile);
-
-
-    QTest::newRow("02.1 W.o pregap, w.o HTOA")
-            << inDir + "02.cuecreator.cue"
-            << mAudio_24x96_wav
-            << inDir + "02.expected.cue"
-            << "01 - Song01.wav : 07bb5c5fbf7b9429c05e9b650d9df467;"
-               "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140;"
-               "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3;"
-               "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f;"
-               "Artist-Album.cue;"
+            << int(PreGapType::ExtractToFile)
             << ""
+            << requests;
+    //=====================================================
+
+
+    //=====================================================
+    name = "02.1 Without pregap, without HTOA";
+    requests.clear();
+
+    req.clear();
+    req.cueFile     = inDir + "02.cuecreator.cue";
+    req.audioFile   = mAudio_24x96_wav;
+    req.expectedCue = "";
+    req.resultFiles << "01 - Song01.wav : 07bb5c5fbf7b9429c05e9b650d9df467"
+                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
+                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
+                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f"
+                    << "Artist_02-Album.cue";
+    requests << req;
+
+    QTest::newRow(name.toUtf8())
             << true
-            << int(OutFormat::PreGapAddToFirstTrack);
-
-
-    QTest::newRow("02.2 W.o pregap, w.o HTOA")
-            << inDir + "02.cuecreator.cue"
-            << mAudio_24x96_wav
-            << inDir + "02.expected.cue"
-            << "01 - Song01.wav : 07bb5c5fbf7b9429c05e9b650d9df467;"
-               "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140;"
-               "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3;"
-               "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f;"
-               "Artist-Album.cue;"
+            << int(PreGapType::AddToFirstTrack)
             << ""
+            << requests;
+    //=====================================================
+
+
+    //=====================================================
+    name = "02.2 Without pregap, without HTOA";
+    requests.clear();
+
+    req.clear();
+    req.cueFile     = inDir + "02.cuecreator.cue";
+    req.audioFile   = mAudio_24x96_wav;
+    req.expectedCue = "";
+    req.resultFiles << "01 - Song01.wav : 07bb5c5fbf7b9429c05e9b650d9df467"
+                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
+                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
+                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f"
+                    << "Artist_02-Album.cue";
+    requests << req;
+
+    QTest::newRow(name.toUtf8())
             << true
-            << int(OutFormat::PreGapExtractToFile);
-
-
-
-    QTest::newRow("03.1 With pregap, w.o HTOA")
-            << inDir + "03.cuecreator.cue"
-            << mAudio_24x96_wav
-            << inDir + "03.expected.cue"
-            << "01 - Song01.wav : 07bb5c5fbf7b9429c05e9b650d9df467;"
-               "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140;"
-               "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3;"
-               "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f;"
-               "Artist-Album.cue;"
+            << int(PreGapType::ExtractToFile)
             << ""
+            << requests;
+    //=====================================================
+
+
+    //=====================================================
+    name = "03.1 With pregap, without HTOA";
+    requests.clear();
+
+    req.clear();
+    req.cueFile     = inDir + "03.cuecreator.cue";
+    req.audioFile   = mAudio_24x96_wav;
+    req.expectedCue = "";
+    req.resultFiles << "01 - Song01.wav : 07bb5c5fbf7b9429c05e9b650d9df467"
+                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
+                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
+                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f"
+                    << "Artist_03-Album.cue";
+    requests << req;
+
+    QTest::newRow(name.toUtf8())
             << true
-            << int(OutFormat::PreGapAddToFirstTrack);
-
-
-    QTest::newRow("04.1 All tags")
-            << inDir + "04.cuecreator.cue"
-            << mAudio_24x96_wav
-            << inDir + "04.expected.cue"
-            << "01 - Song01.wav : 07bb5c5fbf7b9429c05e9b650d9df467;"
-               "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140;"
-               "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3;"
-               "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f;"
-               "Artist-Album.cue;"
+            << int(PreGapType::AddToFirstTrack)
             << ""
+            << requests;
+    //=====================================================
+
+
+    //=====================================================
+    name = "04.1 All tags";
+    requests.clear();
+
+    req.clear();
+    req.cueFile     = inDir + "04.cuecreator.cue";
+    req.audioFile   = mAudio_24x96_wav;
+    req.expectedCue = "";
+    req.resultFiles << "01 - Song01.wav : 07bb5c5fbf7b9429c05e9b650d9df467"
+                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
+                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
+                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f"
+                    << "Artist_04-Album.cue";
+    requests << req;
+
+    QTest::newRow(name.toUtf8())
             << true
-            << int(OutFormat::PreGapAddToFirstTrack);
-
-
-    QTest::newRow("05.1 Cue w.o tags + tags form the separate file")
-            << inDir + "05.cuecreator.cue"
-            << mAudio_24x96_wav
-            << inDir + "05.expected.cue"
-            << "01 - Song Title 01.wav : 07bb5c5fbf7b9429c05e9b650d9df467;"
-               "02 - Song Title 02.wav : 1a199e8e2badff1e643a9f1697ac4140;"
-               "03 - Song Title 03.wav : 71db07cb54faee8545cbed90fe0be6a3;"
-               "04 - Song Title 04.wav : 2e5df99b43b96c208ab26983140dd19f;"
-               "Artist-Album.cue;"
-            << "01 PERFORMER: Artist, ALBUM: Album, GENRE: Genre, DATE: 2013, TITLE: Song Title 01;"
-               "02 PERFORMER: Artist, ALBUM: Album, GENRE: Genre, DATE: 2013, TITLE: Song Title 02;"
-               "03 PERFORMER: Artist, ALBUM: Album, GENRE: Genre, DATE: 2013, TITLE: Song Title 03;"
-               "04 PERFORMER: Artist, ALBUM: Album, GENRE: Genre, DATE: 2013, TITLE: Song Title 04;"
+            << int(PreGapType::AddToFirstTrack)
+            << ""
+            << requests;
+    //=====================================================
+
+
+    //=====================================================
+    name = "05.1 Cue without tags + tags form the separate file";
+    requests.clear();
+
+    req.clear();
+    req.cueFile     = inDir + "05.cuecreator.cue";
+    req.audioFile   = mAudio_24x96_wav;
+    req.expectedCue = "";
+    req.resultFiles << "01 - Song Title 01.wav : 07bb5c5fbf7b9429c05e9b650d9df467"
+                    << "02 - Song Title 02.wav : 1a199e8e2badff1e643a9f1697ac4140"
+                    << "03 - Song Title 03.wav : 71db07cb54faee8545cbed90fe0be6a3"
+                    << "04 - Song Title 04.wav : 2e5df99b43b96c208ab26983140dd19f"
+                    << "Artist_05-Album.cue";
+    req.tags        << "01 PERFORMER: Artist_05, ALBUM: Album, GENRE: Genre, DATE: 2013, TITLE: Song Title 01"
+                    << "02 PERFORMER: Artist_05, ALBUM: Album, GENRE: Genre, DATE: 2013, TITLE: Song Title 02"
+                    << "03 PERFORMER: Artist_05, ALBUM: Album, GENRE: Genre, DATE: 2013, TITLE: Song Title 03"
+                    << "04 PERFORMER: Artist_05, ALBUM: Album, GENRE: Genre, DATE: 2013, TITLE: Song Title 04";
+    requests << req;
+
+    QTest::newRow(name.toUtf8())
             << true
-            << int(OutFormat::PreGapAddToFirstTrack);
+            << int(PreGapType::AddToFirstTrack)
+            << ""
+            << requests;
+    //=====================================================
 
 
-    QTest::newRow("06.1 Garbage in the CUE")
-            << inDir + "06.garbageInTags.cue"
-            << mAudio_24x96_wav
-            << ""
-            << "01 - Song01.wav : a86e2d59bf1e272b5ab7e9a16009455d;"
-               "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140;"
-               "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3;"
-               "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f;"
-            << ""
-            << false
-            << int(OutFormat::PreGapExtractToFile);
 
+    //=====================================================
+    name = "06.1 Garbage in the CUE";
+    requests.clear();
 
-    QTest::newRow("07.1 with symbols and space")
-            << inDir + "07.path(with.symbols and space )/07.path(with.symbols and space ).cue"
-            << mAudio_24x96_wav +
-               ":Test_07.path(with.symbols and space )/Audio file (with.symbols and space ).wav"
-            << ""
-            << "01 - Song01.wav : a86e2d59bf1e272b5ab7e9a16009455d;"
-               "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140;"
-               "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3;"
-               "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f;"
+    req.clear();
+    req.cueFile     = inDir + "06.garbageInTags.cue";
+    req.audioFile   = mAudio_24x96_wav;
+    req.expectedCue = "";
+    req.resultFiles << "01 - Song01.wav : a86e2d59bf1e272b5ab7e9a16009455d"
+                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
+                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
+                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f";
+
+    requests << req;
+    QTest::newRow(name.toUtf8())
+            << false
+            << int(PreGapType::ExtractToFile)
             << ""
+            << requests;
+    //=====================================================
+
+
+    //=====================================================
+    name = "07.1 with symbols and space";
+    requests.clear();
+
+    req.clear();
+    req.cueFile     = inDir + "07.path(with.symbols and space )/07.path(with.symbols and space ).cue";
+    req.audioFile   = mAudio_24x96_wav +
+                      ":Test_07.path(with.symbols and space )/Audio file (with.symbols and space ).wav";
+    req.expectedCue = "";
+    req.resultFiles << "01 - Song01.wav : a86e2d59bf1e272b5ab7e9a16009455d"
+                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
+                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
+                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f";
+
+    requests << req;
+    QTest::newRow(name.toUtf8())
             << false
-            << int(OutFormat::PreGapExtractToFile);
+            << int(PreGapType::ExtractToFile)
+            << ""
+            << requests;
+    //=====================================================
 
 
-    QTest::newRow("08.1 Test_8/Музыка")
-            << inDir + "01.cuecreator.cue"
-            << mAudio_24x96_wav
-            << ""
-            << "01 - Song01.wav : a86e2d59bf1e272b5ab7e9a16009455d;"
-               "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140;"
-               "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3;"
-               "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f;"
+    //=====================================================
+    name = "08.1 Test_8/Музыка";
+    requests.clear();
+
+    req.clear();
+    req.cueFile     = inDir + "01.cuecreator.cue";
+    req.audioFile   = mAudio_24x96_wav;
+    req.expectedCue = "";
+    req.resultFiles << "01 - Song01.wav : a86e2d59bf1e272b5ab7e9a16009455d"
+                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
+                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
+                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f";
+
+    requests << req;
+    QTest::newRow(name.toUtf8())
+            << false
+            << int(PreGapType::ExtractToFile)
             << ""
+            << requests;
+    //=====================================================
+
+
+    //=====================================================
+    name = "09.1 Multi";
+        requests.clear();
+
+    req.clear();
+    req.cueFile     = inDir + "01.cuecreator.cue";
+    req.audioFile   = mAudio_24x96_wav;
+    req.expectedCue = "";
+    req.resultFiles << "01 - Song01.wav : a86e2d59bf1e272b5ab7e9a16009455d"
+                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
+                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
+                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f";
+    requests << req;
+
+
+    req.clear();
+    req.cueFile     = inDir + "02.cuecreator.cue";
+    req.audioFile   = mAudio_24x96_flac;
+    req.expectedCue = inDir + "02.expected.cue";
+    req.resultFiles << "01 - Song01.wav : 07bb5c5fbf7b9429c05e9b650d9df467"
+                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
+                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
+                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f";
+    requests << req;
+
+
+    QTest::newRow(name.toUtf8())
             << false
-            << int(OutFormat::PreGapExtractToFile);
+            << int(PreGapType::AddToFirstTrack)
+            << ""
+            << requests;
+    //=====================================================
+
 
+    //=====================================================
+    name ="10.1 Temporary dir";
+    requests.clear();
+
+    req.clear();
+    req.cueFile     = inDir + "01.cuecreator.cue";
+    req.audioFile   = mAudio_24x96_wav;
+    req.expectedCue = "";
+    req.resultFiles << "01 - Song01.wav : a86e2d59bf1e272b5ab7e9a16009455d"
+                    << "02 - Song02.wav : 1a199e8e2badff1e643a9f1697ac4140"
+                    << "03 - Song03.wav : 71db07cb54faee8545cbed90fe0be6a3"
+                    << "04 - Song04.wav : 2e5df99b43b96c208ab26983140dd19f";
+    requests << req;
+
+    QTest::newRow(name.toUtf8())
+            << false
+            << int(PreGapType::ExtractToFile)
+            << "/tmp/tmp/really_tmp"
+            << requests;
+    //=====================================================
 }

flacon-4.0.0.tar.gz/tests/test_findaudiofile.cpp Added

@@ -0,0 +1,251 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "testflacon.h"
+#include "tools.h"
+#include "cue.h"
+#include "disk.h"
+
+#include <QTest>
+#include <QString>
+#include <QDebug>
+
+
+/************************************************
+
+ ************************************************/
+void TestFlacon::testFindAudioFile()
+{
+    QFETCH(QString, fileTag);
+    QFETCH(QString, cueFileName);
+    QFETCH(QString, audioFiles);
+    QFETCH(QString, expected);
+
+
+    QStringList fileTags = fileTag.split(",", QString::SkipEmptyParts);
+
+    QString cueFile = dir() + "/" + cueFileName;
+    {
+        QStringList cue;
+        cue << "REM DATE 2013";
+        cue << "REM DISCID 123456789";
+        cue << "REM COMMENT \"ExactAudioCopy v0.99pb4\"";
+        cue << "PERFORMER \"Artist\"";
+        for (int i=0; i<fileTags.count(); ++i)
+        {
+            cue << "FILE \"" + fileTags[i].trimmed() +"\" WAVE";
+            cue << "  TRACK 01 AUDIO";
+            cue << "    TITLE \"Song01\"";
+            cue << "    INDEX 01 00:00:00";
+        }
+        writeTextFile(cueFile, cue);
+    }
+
+    foreach (QString f, audioFiles.split(","))
+    {
+        QFile(mAudio_cd_wav).link(dir() + "/" + f.trimmed());
+    }
+
+
+    QStringList expectedLists = expected.split(",", QString::SkipEmptyParts);
+    CueReader cue(cueFile);
+    if (!cue.isValid())
+        FAIL("Cue isn't valid:" + cue.errorString().toLocal8Bit());
+
+    for (int i=0; i<cue.diskCount(); ++i)
+    {
+        Disk disk;
+        disk.loadFromCue(cue.disk(i));
+        QString expected = expectedLists.at(i).trimmed();
+        if (expected == "''")
+            expected = "";
+        else
+            expected = dir() + "/" + expected;
+
+        QString real = disk.audioFileName();
+        QCOMPARE(real, expected);
+
+    }
+}
+
+
+/************************************************
+
+ ************************************************/
+void TestFlacon::testFindAudioFile_data()
+{
+    QTest::addColumn<QString>("fileTag");
+    QTest::addColumn<QString>("cueFileName");
+    QTest::addColumn<QString>("audioFiles");
+    QTest::addColumn<QString>("expected");
+
+    QTest::newRow("01")
+            << "Album.wav"
+            << "Album.cue"
+            << "Album.ape"
+            << "Album.ape";
+
+
+    QTest::newRow("02")
+            << "Album.wav"
+            << "Garbage.cue"
+            << "Album.ape, Garbage.ape"
+            << "Album.ape";
+
+
+    QTest::newRow("03")
+            << "Garbage.wav"
+            << "Disk.cue"
+            << "Disk.ape"
+            << "Disk.ape";
+
+    QTest::newRow("04 Multi disk => CueFile_1.ape")
+            << "FileTag1.wav, FileTag2.wav"
+            << "CueFile.cue"
+            << "CueFile.ape," "CueFile_1.ape," "CueFile_2.ape"
+            << "CueFile_1.ape," "CueFile_2.ape";
+
+    QTest::newRow("05")
+            << "Garbage1.wav, Garbage2.wav"
+            << "Album.cue"
+            << "Album.ape, Album_Side1.ape, Album_Side2.ape"
+            << "Album_Side1.ape, Album_Side2.ape";
+
+    QTest::newRow("06")
+            << "Garbage1.wav, Garbage2.wav"
+            << "Album.cue"
+            << "Album.ape, Album Side1.ape, Album Side2.ape"
+            << "Album Side1.ape, Album Side2.ape";
+
+    QTest::newRow("07")
+            << "Garbage1.wav, Garbage2.wav"
+            << "Album.cue"
+            << "Album.ape, Album_Disk1.ape, Album_Disk2.ape"
+            << "Album_Disk1.ape, Album_Disk2.ape";
+
+    QTest::newRow("08 Multi disk => CUE+Disk1")
+            << "Garbage1.wav, Garbage2.wav"
+            << "Album.cue"
+            << "Album.ape, Album Disk1.ape, Album Disk2.ape"
+            << "Album Disk1.ape, Album Disk2.ape";
+
+    QTest::newRow("09 Multi disk => CUE+[Disk 1]")
+            << "Garbage1.wav, Garbage2.wav"
+            << "Album.cue"
+            << "Album.ape, Album [Disk 1].ape, Album [Disk 2].ape"
+            << "Album [Disk 1].ape, Album [Disk 2].ape";
+
+    QTest::newRow("10 Multi disk => CUE+[Disk #1]")
+            << "Garbage1.wav, Garbage2.wav"
+            << "Album.cue"
+            << "Album.ape, Album [Disk #1].ape, Album [Disk #2].ape"
+            << "Album [Disk #1].ape, Album [Disk #2].ape";
+
+    QTest::newRow("11 Multi disk => CUE+[Disk №1]")
+            << "Garbage1.wav, Garbage2.wav"
+            << "Album.cue"
+            << "Album.ape, Album [Disk №1].ape, Album [Disk №2].ape"
+            << "Album [Disk №1].ape, Album [Disk №2].ape";
+
+    QTest::newRow("12 Multi disk => CUE+Disk 001")
+            << "Garbage1.wav,"
+               "Garbage2.wav"
+            << "Album.cue"
+            << "Album.ape,"
+               "Album Disk 001.ape,"
+               "Album Disk 002.ape"
+            << "Album Disk 001.ape,"
+               "Album Disk 002.ape";
+
+    QTest::newRow("13")
+            << "FileTag1.wav,"
+               "FileTag2.wav"
+            << "CueFile.cue"
+            << "FileTag1.wav,"
+               "FileTag2.wav,"
+               "CueFile.ape,"
+               "CueFile Disk1.ape,"
+               "CueFile Disk2.ape"
+            << "FileTag1.wav,"
+               "FileTag2.wav";
+
+    QTest::newRow("14 Not confuse 1 and 11")
+            << "FileTag1.wav,"  "FileTag2.wav"
+            << "CueFile.cue"
+            << "CueFile_11.flac,"  "CueFile_2.flac"
+            << "''," "CueFile_2.flac";
+
+    QTest::newRow("15 Multi disk => Side 1")
+            << "Garbage1.wav,"
+               "Garbage2.wav"
+            << "Album.cue"
+            << "Album.ape,"
+               "Side 1.flac,"
+               "Side 2.flac"
+            << "Side 1.flac,"
+               "Side 2.flac";
+
+    QTest::newRow("16 Multi disk => Disk 0001")
+            << "Garbage1.wav,"
+               "Garbage2.wav"
+            << "Album.cue"
+            << "Album.ape,"
+               "Disk 0001.ape,"
+               "Disk 0002.ape"
+            << "Disk 0001.ape,"
+               "Disk 0002.ape";
+
+    QTest::newRow("17 Multi dot")
+            << "FileTag.wav"
+            << "CueFile.cue"
+            << "CueFile.ape.flac"
+            << "CueFile.ape.flac";
+
+    QTest::newRow("18 AditionalText")
+            << "FileTag.wav"
+            << "CueFile.cue"
+            << "CueFile_AditionalText.flac"
+            << "CueFile_AditionalText.flac";
+
+    QTest::newRow("19 Bush - (1996) Razorblade Suitcase (Issue #31)")
+            << "Bush - (1996) Razorblade Suitcase.flac"
+            << "Bush - (1996) Razorblade Suitcase.cue"
+            << "3 Doors Down - (2000) The Better Life.flac,"
+               "Bush - (1996) Razorblade Suitcase.flac"
+            << "Bush - (1996) Razorblade Suitcase.flac";
+
+    QTest::newRow("20 FileTag(1) and FileTag(2)")
+            << "FileTag(1).wav,"
+               "FileTag(2).wav"
+            << "CueFile.cue"
+            << "FileTag(1).wav,"
+               "FileTag(2).wav,"
+               "CueFile.ape,"
+               "CueFile Disk1.ape,"
+               "CueFile Disk2.ape"
+            << "FileTag(1).wav,"
+               "FileTag(2).wav";
+}

flacon-4.0.0.tar.gz/tests/test_findcuefile.cpp Added

@@ -0,0 +1,219 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "testflacon.h"
+#include "tools.h"
+#include "inputaudiofile.h"
+#include "disk.h"
+
+#include <QTest>
+#include <QString>
+#include <QDebug>
+
+
+struct TestCueFile_ {
+    QString name;
+    QString fileTag;
+    QString fileTag2;
+};
+Q_DECLARE_METATYPE(TestCueFile_)
+
+
+struct TestFindCueFileData {
+    QList<TestCueFile_> cueFiles;
+    QStringList audioFiles;
+    QString chekAudioFile;
+    QString expected;
+};
+Q_DECLARE_METATYPE(TestFindCueFileData)
+
+
+
+/************************************************
+
+ ************************************************/
+void TestFlacon::testFindCueFile()
+{
+    QFETCH(TestFindCueFileData, test);
+
+    foreach (QString f, test.audioFiles)
+    {
+        QFile(mAudio_cd_wav).link(dir() + "/" + f.trimmed());
+    }
+
+    foreach (TestCueFile_ cueFile, test.cueFiles)
+    {
+        QStringList cue;
+        cue << "REM DATE 2013";
+        cue << "REM DISCID 123456789";
+        cue << "REM COMMENT \"ExactAudioCopy v0.99pb4\"";
+        cue << "PERFORMER \"Artist\"";
+        cue <<  cueFile.fileTag.trimmed();
+        cue << "  TRACK 01 AUDIO";
+        cue << "    TITLE \"Song01\"";
+        cue << "    INDEX 01 00:00:00";
+
+        if (!cueFile.fileTag2.isEmpty())
+        {
+            cue << cueFile.fileTag2.trimmed();
+            cue << "  TRACK 01 AUDIO";
+            cue << "    TITLE \"Song01\"";
+            cue << "    INDEX 01 00:00:00";
+        }
+        writeTextFile(dir() + "/" + cueFile.name, cue);
+    }
+
+    InputAudioFile audio(dir() + "/" + test.chekAudioFile);
+
+    Disk disk;
+    disk.setAudioFile(audio);
+    QString real = disk.cueFile();
+    QString expected = dir() + "/" + test.expected;
+    QCOMPARE(real, expected);
+}
+
+
+/************************************************
+
+ ************************************************/
+void TestFlacon::testFindCueFile_data()
+{
+
+    QTest::addColumn<TestFindCueFileData>("test");
+    TestFindCueFileData test;
+
+    // -------------------------------------
+    test = TestFindCueFileData();
+    test.cueFiles.append(TestCueFile_());
+    test.cueFiles.last().name = "1.cue";
+    test.cueFiles.last().fileTag= "FILE \"1.wav\" WAVE";
+
+    test.audioFiles << "1.wav";
+
+    test.chekAudioFile = "1.wav";
+    test.expected = "1.cue";
+    QTest::newRow("01 1.cue 1.wav") << test;
+
+    // -------------------------------------
+    test = TestFindCueFileData();
+    test.cueFiles.append(TestCueFile_());
+    test.cueFiles.last().name = "1.cue";
+    test.cueFiles.last().fileTag= "FILE \"1.wav\" WAVE";
+
+    test.cueFiles.append(TestCueFile_());
+    test.cueFiles.last().name = "2.cue";
+    test.cueFiles.last().fileTag= "FILE \"2.wav\" WAVE";
+
+    test.audioFiles << "1.wav";
+    test.audioFiles << "2.wav";
+
+    test.chekAudioFile = "1.wav";
+    test.expected = "1.cue";
+    QTest::newRow("02 1.cue 2.cue *1.wav* 2.wav") << test;
+
+
+    // -------------------------------------
+    test = TestFindCueFileData();
+    test.cueFiles.append(TestCueFile_());
+    test.cueFiles.last().name = "1.cue";
+    test.cueFiles.last().fileTag= "FILE \"1.wav\" WAVE";
+
+    test.cueFiles.append(TestCueFile_());
+    test.cueFiles.last().name = "2.cue";
+    test.cueFiles.last().fileTag= "FILE \"2.wav\" WAVE";
+
+    test.audioFiles << "1.wav";
+    test.audioFiles << "2.wav";
+
+    test.chekAudioFile = "2.wav";
+    test.expected = "2.cue";
+    QTest::newRow("03 1.cue 2.cue 1.wav *2.wav*") << test;
+
+
+    // -------------------------------------
+    test = TestFindCueFileData();
+    test.cueFiles.append(TestCueFile_());
+    test.cueFiles.last().name = "multi.cue";
+    test.cueFiles.last().fileTag = "FILE \"1.wav\" WAVE";
+    test.cueFiles.last().fileTag2= "FILE \"2.wav\" WAVE";
+
+    test.audioFiles << "multi_1.wav";
+    test.audioFiles << "multi_2.wav";
+
+    test.chekAudioFile = "multi_1.wav";
+    test.expected = "multi.cue";
+    QTest::newRow("04 multi.cue multi_1.wav multi_2.wav") << test;
+
+
+    // -------------------------------------
+    test = TestFindCueFileData();
+    test.cueFiles.append(TestCueFile_());
+    test.cueFiles.last().name = "multi.cue";
+    test.cueFiles.last().fileTag = "FILE \"1.wav\" WAVE";
+    test.cueFiles.last().fileTag2= "FILE \"2.wav\" WAVE";
+
+    test.audioFiles << "multi_1.wav";
+    test.audioFiles << "multi_2.wav";
+
+    test.chekAudioFile = "multi_2.wav";
+    test.expected = "multi.cue";
+    QTest::newRow("05 multi.cue multi_1.wav multi_2.wav") << test;
+
+
+    // -------------------------------------
+    test = TestFindCueFileData();
+    test.cueFiles.append(TestCueFile_());
+    test.cueFiles.last().name = "ISO-8859-2.cue";
+    test.cueFiles.last().fileTag= "FILE \"short.flac\" WAVE";
+
+    test.cueFiles.append(TestCueFile_());
+    test.cueFiles.last().name = "short.cue";
+    test.cueFiles.last().fileTag= "FILE \"short.wav\" WAVE";
+
+    test.audioFiles << "short.wav";
+    test.audioFiles << "short.flac";
+
+    test.chekAudioFile = "short.flac";
+    test.expected = "short.cue";
+    QTest::newRow("06 short.cue and ISO-8859-2.cue") << test;
+
+
+    test = TestFindCueFileData();
+    test.cueFiles.append(TestCueFile_());
+    test.cueFiles.last().name = "foo.cue";
+    test.cueFiles.last().fileTag= "FILE \"1.wav\" WAVE";
+
+    test.cueFiles.append(TestCueFile_());
+    test.cueFiles.last().name = "bar.cue";
+    test.cueFiles.last().fileTag= "FILE \"2.wav\" WAVE";
+
+    test.audioFiles << "1.wav";
+    test.audioFiles << "2.wav";
+
+    test.chekAudioFile = "2.wav";
+    test.expected = "bar.cue";
+    QTest::newRow("07 by File tag") << test;
+}

flacon-4.0.0.tar.gz/tests/test_outformatencoderargs.cpp Added

@@ -0,0 +1,409 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "testflacon.h"
+#include "tools.h"
+#include "outformat.h"
+#include "disk.h"
+
+#include <QTest>
+#include <QString>
+#include <QDebug>
+
+
+/************************************************
+
+ ************************************************/
+void TestFlacon::testOutFormatEncoderArgs()
+{
+    QFETCH(QString, formatId);
+    QFETCH(SettingsValues, config);
+    QFETCH(QString, expected);
+
+    applySettings(config);
+
+    foreach (OutFormat *format, OutFormat::allFormats())
+    {
+        if (format->id() != formatId)
+            continue;
+
+        Disk *disk = standardDisk();
+        QStringList args = format->encoderArgs(disk->track(0), "OutFile.wav");
+
+        QString result = args.join(" ");
+        if (result != expected)
+        {
+            QString msg = QString("Compared values are not the same\n   Format   %1\n   Actual:   %2\n   Expected: %3").arg(
+                        formatId,
+                        result,
+                        expected);
+            QFAIL(msg.toLocal8Bit());
+        }
+        return;
+    }
+
+    FAIL(QString("Unknown format \"%1\"").arg(formatId).toLocal8Bit());
+}
+
+
+/************************************************
+
+ ************************************************/
+void TestFlacon::testOutFormatEncoderArgs_data()
+{
+    QTest::addColumn<QString>("formatId");
+    QTest::addColumn<SettingsValues>("config");
+    QTest::addColumn<QString>("expected");
+
+    SettingsValues cfg;
+
+    //*******************************************
+    // FLAC
+    //*******************************************
+    cfg.clear();
+    cfg.insert("Programs/flac",     "/opt/flac");
+    cfg.insert("Flac/Compression",  5);
+    cfg.insert("Flac/ReplayGain",   "Disable");
+
+    QTest::newRow("Flac_1")
+            << "FLAC"
+            << cfg
+            << "/opt/flac --force --silent "
+               "--compression-level-5 "
+               "--tag artist=Artist --tag album=Album --tag genre=Genre --tag date=2013 --tag title=Song01 --tag comment=ExactAudioCopy v0.99pb4 "
+               "--tag discId=123456789 --tag TRACKNUMBER=1 --tag TOTALTRACKS=4 --tag TRACKTOTAL=4 - -o OutFile.wav";
+
+    //*******************************************
+    cfg.clear();
+    cfg.insert("Programs/flac",     "/opt/flac");
+    cfg.insert("Flac/Compression",  1);
+    cfg.insert("Flac/ReplayGain",   "Disable");
+
+    QTest::newRow("Flac_2")
+            << "FLAC"
+            << cfg
+            << "/opt/flac --force --silent "
+               "--compression-level-1 "
+               "--tag artist=Artist --tag album=Album --tag genre=Genre --tag date=2013 --tag title=Song01 --tag comment=ExactAudioCopy v0.99pb4 "
+               "--tag discId=123456789 --tag TRACKNUMBER=1 --tag TOTALTRACKS=4 --tag TRACKTOTAL=4 - -o OutFile.wav";
+
+
+    //*******************************************
+    // AAC
+    //*******************************************
+    cfg.clear();
+    cfg.insert("Programs/faac",  "/opt/faac");
+    cfg.insert("Aac/UseQuality", true);
+    cfg.insert("Aac/Quality",    500);
+
+    QTest::newRow("AAC_1")
+            << "AAC"
+            << cfg
+            << "/opt/faac -w "
+               "-q 500 "
+               "--artist Artist --title Song01 --genre Genre --album Album --track 1/4 --year 2013 --comment ExactAudioCopy v0.99pb4 -o OutFile.wav -";
+
+
+    //*******************************************
+    cfg.clear();
+    cfg.insert("Programs/faac",  "/opt/faac");
+    cfg.insert("Aac/UseQuality", true);
+    cfg.insert("Aac/Quality",    10);
+
+    QTest::newRow("AAC_2")
+            << "AAC"
+            << cfg
+            << "/opt/faac -w "
+               "-q 10 "
+               "--artist Artist --title Song01 --genre Genre --album Album --track 1/4 --year 2013 --comment ExactAudioCopy v0.99pb4 -o OutFile.wav -";
+
+    //*******************************************
+    cfg.clear();
+    cfg.insert("Programs/faac",  "/opt/faac");
+    cfg.insert("Aac/UseQuality", false);
+    cfg.insert("Aac/Quality",    500);
+    cfg.insert("Aac/Bitrate",    64);
+
+    QTest::newRow("AAC_3")
+            << "AAC"
+            << cfg
+            << "/opt/faac -w "
+               "-b 64 "
+               "--artist Artist --title Song01 --genre Genre --album Album --track 1/4 --year 2013 --comment ExactAudioCopy v0.99pb4 -o OutFile.wav -";
+
+
+    //*******************************************
+    // MP3
+    //*******************************************
+    cfg.clear();
+    cfg.insert("Programs/lame",  "/opt/lame");
+    cfg.insert("Mp3/Preset",     "vbrMedium");
+    cfg.insert("Aac/Quality",    500);
+
+    QTest::newRow("MP3_vbrMedium")
+            << "MP3"
+            << cfg
+            << "/opt/lame --silent "
+               "--preset medium "
+               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+
+
+    //*******************************************
+    cfg.insert("Mp3/Preset",     "vbrStandard");
+
+    QTest::newRow("MP3_vbrStandard")
+            << "MP3"
+            << cfg
+            << "/opt/lame "
+               "--silent "
+               "--preset standard "
+               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+
+
+
+    //*******************************************
+    cfg.insert("Mp3/Preset",     "vbrStandardFast");
+
+    QTest::newRow("MP3_vbrStandardFast")
+            << "MP3"
+            << cfg
+            << "/opt/lame --silent "
+               "--preset fast standard "
+               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+
+
+    //*******************************************
+    cfg.insert("Mp3/Preset",     "vbrExtreme");
+
+    QTest::newRow("MP3_vbrExtreme")
+            << "MP3"
+            << cfg
+            << "/opt/lame --silent "
+               "--preset extreme "
+               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+
+    //*******************************************
+    cfg.insert("Mp3/Preset",     "vbrExtremeFast");
+
+    QTest::newRow("MP3_vbrExtremeFast")
+            << "MP3"
+            << cfg
+            << "/opt/lame --silent "
+               "--preset fast extreme "
+               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+
+
+    //*******************************************
+    cfg.insert("Mp3/Preset",     "cbrInsane");
+
+    QTest::newRow("MP3_cbrInsane")
+            << "MP3"
+            << cfg
+            << "/opt/lame --silent "
+               "--preset insane "
+               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+
+    //*******************************************
+    cfg.insert("Mp3/Preset",     "cbrKbps");
+    cfg.insert("Mp3/Bitrate",    64);
+
+    QTest::newRow("MP3_cbrKbps64")
+            << "MP3"
+            << cfg
+            << "/opt/lame --silent "
+               "--preset cbr 64 "
+               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+
+    //*******************************************
+    cfg.insert("Mp3/Preset",     "cbrKbps");
+    cfg.insert("Mp3/Bitrate",    128);
+
+    QTest::newRow("MP3_cbrKbps128")
+            << "MP3"
+            << cfg
+            << "/opt/lame --silent "
+               "--preset cbr 128 "
+               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+
+
+    //*******************************************
+    cfg.insert("Mp3/Preset",     "abrKbps");
+    cfg.insert("Mp3/Bitrate",    64);
+
+    QTest::newRow("MP3_abrKbps64")
+            << "MP3"
+            << cfg
+            << "/opt/lame --silent "
+               "--preset 64 "
+               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+
+    //*******************************************
+    cfg.insert("Mp3/Preset",     "abrKbps");
+    cfg.insert("Mp3/Bitrate",    128);
+
+    QTest::newRow("MP3_abrKbps128")
+            << "MP3"
+            << cfg
+            << "/opt/lame --silent "
+               "--preset 128 "
+               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+
+
+    //*******************************************
+    cfg.insert("Mp3/Preset",     "vbrQuality");
+    cfg.insert("Mp3/Quality",    0);
+
+    QTest::newRow("MP3_vbrQuality0")
+            << "MP3"
+            << cfg
+            << "/opt/lame --silent "
+               "-V 9 "
+               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+
+    //*******************************************
+    cfg.insert("Mp3/Preset",     "vbrQuality");
+    cfg.insert("Mp3/Quality",    4);
+
+    QTest::newRow("MP3_vbrQuality4")
+            << "MP3"
+            << cfg
+            << "/opt/lame --silent "
+               "-V 5 "
+               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+
+    //*******************************************
+    cfg.insert("Mp3/Preset",     "vbrQuality");
+    cfg.insert("Mp3/Quality",    9);
+
+    QTest::newRow("MP3_vbrQuality9")
+            << "MP3"
+            << cfg
+            << "/opt/lame --silent "
+               "-V 0 "
+               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
+
+
+
+    //*******************************************
+    // Ogg
+    //*******************************************
+    cfg.clear();
+    cfg.insert("Programs/oggenc",   "/opt/oggenc");
+    cfg.insert("Ogg/UseQuality",    true);
+    cfg.insert("Ogg/Quality",       5);
+    cfg.insert("Ogg/MinBitrate",    "");
+    cfg.insert("Ogg/NormBitrate",   "");
+    cfg.insert("Ogg/MaxBitrate",    "");
+
+    QTest::newRow("Ogg Quality 5")
+            << "OGG"
+            << cfg
+            << "/opt/oggenc --quiet "
+               "-q 5 "
+               "--artist Artist --album Album --genre Genre --date 2013 --title Song01 --comment COMMENT=ExactAudioCopy v0.99pb4 "
+               "--comment DISCID=123456789 --tracknum 1 --comment TOTALTRACKS=4 --comment TRACKTOTAL=4 -o OutFile.wav -";
+
+
+    //*******************************************
+    cfg.insert("Ogg/Quality",       10);
+
+    QTest::newRow("Ogg Quality 10")
+            << "OGG"
+            << cfg
+            << "/opt/oggenc --quiet "
+               "-q 10 "
+               "--artist Artist --album Album --genre Genre --date 2013 --title Song01 --comment COMMENT=ExactAudioCopy v0.99pb4 "
+               "--comment DISCID=123456789 --tracknum 1 --comment TOTALTRACKS=4 --comment TRACKTOTAL=4 -o OutFile.wav -";
+
+
+    //*******************************************
+    cfg.insert("Programs/oggenc",   "/opt/oggenc");
+    cfg.insert("Ogg/UseQuality",    false);
+    cfg.insert("Ogg/MinBitrate",    "");
+    cfg.insert("Ogg/NormBitrate",   "");
+    cfg.insert("Ogg/MaxBitrate",    "");
+
+    QTest::newRow("Ogg Bitrate 0 0 0")
+            << "OGG"
+            << cfg
+            << "/opt/oggenc --quiet "
+               "--artist Artist --album Album --genre Genre --date 2013 --title Song01 --comment COMMENT=ExactAudioCopy v0.99pb4 "
+               "--comment DISCID=123456789 --tracknum 1 --comment TOTALTRACKS=4 --comment TRACKTOTAL=4 -o OutFile.wav -";
+
+    //*******************************************
+    cfg.insert("Programs/oggenc",   "/opt/oggenc");
+    cfg.insert("Ogg/UseQuality",    false);
+    cfg.insert("Ogg/MinBitrate",    64);
+    cfg.insert("Ogg/NormBitrate",   128);
+    cfg.insert("Ogg/MaxBitrate",    350);
+
+    QTest::newRow("Ogg Bitrate 64 128 350")
+            << "OGG"
+            << cfg
+            << "/opt/oggenc --quiet "
+               "-b 128 -m 64 -M 350 "
+               "--artist Artist --album Album --genre Genre --date 2013 --title Song01 --comment COMMENT=ExactAudioCopy v0.99pb4 "
+               "--comment DISCID=123456789 --tracknum 1 --comment TOTALTRACKS=4 --comment TRACKTOTAL=4 -o OutFile.wav -";
+
+
+
+    //*******************************************
+    // WavPack
+    //*******************************************
+    cfg.clear();
+    cfg.insert("Programs/wavpack",  "/opt/wavpack");
+    cfg.insert("WV/Compression",   0);
+
+    QTest::newRow("WavPack Quality 0")
+            << "WV"
+            << cfg
+            << "/opt/wavpack -q "
+               "-f "
+               "-w Artist=Artist -w Album=Album -w Genre=Genre -w Year=2013 -w Title=Song01 -w DiscId=123456789 -w Comment=ExactAudioCopy v0.99pb4 -w Track=1/4 - -o OutFile.wav";
+
+
+    //*******************************************
+    cfg.insert("WV/Compression",   1);
+
+    QTest::newRow("WavPack Quality 1")
+            << "WV"
+            << cfg
+            << "/opt/wavpack -q "
+               "-h "
+               "-w Artist=Artist -w Album=Album -w Genre=Genre -w Year=2013 -w Title=Song01 -w DiscId=123456789 -w Comment=ExactAudioCopy v0.99pb4 -w Track=1/4 - -o OutFile.wav";
+
+
+    //*******************************************
+    cfg.insert("WV/Compression",   2);
+
+    QTest::newRow("WavPack Quality 2")
+            << "WV"
+            << cfg
+            << "/opt/wavpack -q "
+               "-hh "
+               "-w Artist=Artist -w Album=Album -w Genre=Genre -w Year=2013 -w Title=Song01 -w DiscId=123456789 -w Comment=ExactAudioCopy v0.99pb4 -w Track=1/4 - -o OutFile.wav";
+
+}

flacon-4.0.0.tar.gz/tests/test_searchcoverimage.cpp Added

@@ -0,0 +1,157 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+#include "testflacon.h"
+#include "tools.h"
+#include <QTest>
+#include <QStringList>
+#include <QFileInfo>
+#include <QFile>
+#include <QDir>
+#include <QImage>
+#include "../disk.h"
+
+
+struct TestSearchCoverImage_Case
+{
+    QStringList imgFiles;
+    QString     expected;
+
+    void clear()
+    {
+        imgFiles.clear();
+        expected.clear();
+    }
+};
+Q_DECLARE_METATYPE(TestSearchCoverImage_Case)
+
+
+
+/************************************************
+ *
+ ************************************************/
+void TestFlacon::testSearchCoverImage()
+{
+    QFETCH(TestSearchCoverImage_Case, test);
+
+    foreach (QString f, test.imgFiles)
+    {
+        QFileInfo( dir() + "/" + f).dir().mkpath(".");
+        QImage img(QSize(1,1), QImage::Format_RGB32);
+        img.save(dir() + "/" + f);
+    }
+
+    QString result   = Disk::searchCoverImage(dir());
+    QString expected;
+    if (!test.expected.isEmpty())
+        expected = QFileInfo( dir() + "/" + test.expected).absoluteFilePath();
+
+    QCOMPARE(result, expected);
+}
+
+
+
+/************************************************
+ *
+ ************************************************/
+void TestFlacon::testSearchCoverImage_data()
+{
+    QTest::addColumn<TestSearchCoverImage_Case>("test");
+    TestSearchCoverImage_Case req;
+
+    // .....................................
+    req.clear();
+    req.expected = "";
+
+    QTest::newRow("01") << req;
+
+
+
+    // .....................................
+    req.clear();
+    req.imgFiles
+                << "cover.jpg";
+    req.expected = "cover.jpg";
+
+    QTest::newRow("02") << req;
+
+
+    // .....................................
+    req.clear();
+    req.imgFiles
+                << "Cover.jpg";
+    req.expected = "Cover.jpg";
+
+    QTest::newRow("03") << req;
+
+
+    // .....................................
+    req.clear();
+    req.imgFiles
+                << "Covers/Cover.jpg";
+    req.expected = "Covers/Cover.jpg";
+
+    QTest::newRow("03") << req;
+
+
+
+    // .....................................
+    req.clear();
+    req.imgFiles
+                << "AAA.jpg"
+                << "Cover.jpg";
+    req.expected = "Cover.jpg";
+
+    QTest::newRow("04") << req;
+
+
+
+    // .....................................
+    req.clear();
+    req.imgFiles
+                << "CoVeR.Jpg"
+                << "Folder.png";
+    req.expected = "CoVeR.Jpg";
+
+    QTest::newRow("04") << req;
+
+
+
+    // .....................................
+    req.clear();
+    req.imgFiles
+        << "Covers/folder.jpg"
+        << "Covers/Back.jpg"
+        << "Covers/Front_inside.jpg"
+        << "Covers/Matrix.jpg"
+        << "Covers/CD.jpg"
+        << "Covers/Front.jpg"
+        << "Front.JPG";
+    req.expected = "Front.JPG";
+
+    QTest::newRow("05") << req;
+
+}
+

flacon-3.1.1.tar.gz/tests/test_wavheader.cpp -> flacon-4.0.0.tar.gz/tests/test_wavheader.cpp Changed

flacon-3.1.1.tar.gz/tests/testflacon.cpp -> flacon-4.0.0.tar.gz/tests/testflacon.cpp Changed

@@ -46,19 +46,9 @@
 #define protected public;
 
 
-
-#ifdef Q_OS_WIN
-    #define USE_DEV_RANDOM 0
-#elif defined(Q_OS_OS2)
-    #define USE_DEV_RANDOM 0
-#else
-    #define USE_DEV_RANDOM 1
-#endif
-
 int TestFlacon::mTestNum = -1;
 
 
-
 /************************************************
 
  ************************************************/
@@ -71,7 +61,6 @@
 }
 
 
-
 /************************************************
 
  ************************************************/
@@ -403,11 +392,6 @@
 }
 
 
-
-
-
-
-
 /************************************************
 
  ************************************************/
@@ -417,9 +401,11 @@
     QFETCH(QString, pattern);
     QFETCH(QString, expected);
 
-    settings->setValue(Settings::OutFiles_Pattern, pattern);
-    settings->setValue(Settings::OutFiles_Format, "WAV");
 
+    settings->setOutFilePattern(pattern);
+    settings->setOutFormat("WAV");
+
+    project->clear();
 
     QString cueFile = dir() + "/input.cue";
     writeTextFile(cueFile, cue);
@@ -676,9 +662,9 @@
     QFETCH(QString, expected);
     QFETCH(QString, audioFile);
 
-    settings->setValue(Settings::OutFiles_Directory, outDir);
-    settings->setValue(Settings::OutFiles_Pattern, pattern);
-    settings->setValue(Settings::OutFiles_Format, "WAV");
+    settings->setOutFileDir(outDir);
+    settings->setOutFilePattern(pattern);
+    settings->setOutFormat("WAV");
 
     Disk *disk = loadFromCue(mDataDir + "simple.cue");
 
@@ -863,380 +849,8 @@
 }
 
 
-/************************************************
-
- ************************************************/
-void TestFlacon::testOutFormatEncoderArgs()
-{
-    QFETCH(QString, formatId);
-    QFETCH(SettingsValues, config);
-    QFETCH(QString, expected);
-
-    applySettings(config);
-
-    foreach (OutFormat *format, OutFormat::allFormats())
-    {
-        if (format->id() != formatId)
-            continue;
-
-        Disk *disk = standardDisk();
-        QStringList args = format->encoderArgs(disk->track(0), "OutFile.wav");
-
-        QString result = args.join(" ");
-        if (result != expected)
-        {
-            QString msg = QString("Compared values are not the same\n   Format   %1\n   Actual:   %2\n   Expected: %3").arg(
-                        formatId,
-                        result,
-                        expected);
-            QFAIL(msg.toLocal8Bit());
-        }
-        return;
-    }
-
-    FAIL(QString("Unknown format \"%1\"").arg(formatId).toLocal8Bit());
-}
-
-
-/************************************************
-
- ************************************************/
-void TestFlacon::testOutFormatEncoderArgs_data()
-{
-    QTest::addColumn<QString>("formatId");
-    QTest::addColumn<SettingsValues>("config");
-    QTest::addColumn<QString>("expected");
-
-    SettingsValues cfg;
-
-    //*******************************************
-    // FLAC
-    //*******************************************
-    cfg.clear();
-    cfg.insert("Programs/flac",     "/opt/flac");
-    cfg.insert("Flac/Compression",  5);
-    cfg.insert("Flac/ReplayGain",   "Disable");
-
-    QTest::newRow("Flac_1")
-            << "FLAC"
-            << cfg
-            << "/opt/flac --force --silent "
-               "--compression-level-5 "
-               "--tag artist=Artist --tag album=Album --tag genre=Genre --tag date=2013 --tag title=Song01 --tag comment=ExactAudioCopy v0.99pb4 "
-               "--tag discId=123456789 --tag TRACKNUMBER=1 --tag TOTALTRACKS=4 --tag TRACKTOTAL=4 - -o OutFile.wav";
-
-    //*******************************************
-    cfg.clear();
-    cfg.insert("Programs/flac",     "/opt/flac");
-    cfg.insert("Flac/Compression",  1);
-    cfg.insert("Flac/ReplayGain",   "Disable");
-
-    QTest::newRow("Flac_2")
-            << "FLAC"
-            << cfg
-            << "/opt/flac --force --silent "
-               "--compression-level-1 "
-               "--tag artist=Artist --tag album=Album --tag genre=Genre --tag date=2013 --tag title=Song01 --tag comment=ExactAudioCopy v0.99pb4 "
-               "--tag discId=123456789 --tag TRACKNUMBER=1 --tag TOTALTRACKS=4 --tag TRACKTOTAL=4 - -o OutFile.wav";
-
-
-    //*******************************************
-    // AAC
-    //*******************************************
-    cfg.clear();
-    cfg.insert("Programs/faac",  "/opt/faac");
-    cfg.insert("Aac/UseQuality", true);
-    cfg.insert("Aac/Quality",    500);
-
-    QTest::newRow("AAC_1")
-            << "AAC"
-            << cfg
-            << "/opt/faac -w "
-               "-q 500 "
-               "--artist Artist --title Song01 --genre Genre --album Album --track 1/4 --year 2013 --comment ExactAudioCopy v0.99pb4 -o OutFile.wav -";
-
-
-    //*******************************************
-    cfg.clear();
-    cfg.insert("Programs/faac",  "/opt/faac");
-    cfg.insert("Aac/UseQuality", true);
-    cfg.insert("Aac/Quality",    10);
-
-    QTest::newRow("AAC_2")
-            << "AAC"
-            << cfg
-            << "/opt/faac -w "
-               "-q 10 "
-               "--artist Artist --title Song01 --genre Genre --album Album --track 1/4 --year 2013 --comment ExactAudioCopy v0.99pb4 -o OutFile.wav -";
-
-    //*******************************************
-    cfg.clear();
-    cfg.insert("Programs/faac",  "/opt/faac");
-    cfg.insert("Aac/UseQuality", false);
-    cfg.insert("Aac/Quality",    500);
-    cfg.insert("Aac/Bitrate",    64);
-
-    QTest::newRow("AAC_3")
-            << "AAC"
-            << cfg
-            << "/opt/faac -w "
-               "-b 64 "
-               "--artist Artist --title Song01 --genre Genre --album Album --track 1/4 --year 2013 --comment ExactAudioCopy v0.99pb4 -o OutFile.wav -";
-
-
-    //*******************************************
-    // MP3
-    //*******************************************
-    cfg.clear();
-    cfg.insert("Programs/lame",  "/opt/lame");
-    cfg.insert("Mp3/Preset",     "vbrMedium");
-    cfg.insert("Aac/Quality",    500);
-
-    QTest::newRow("MP3_vbrMedium")
-            << "MP3"
-            << cfg
-            << "/opt/lame --silent "
-               "--preset medium "
-               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
-
-
-    //*******************************************
-    cfg.insert("Mp3/Preset",     "vbrStandard");
-
-    QTest::newRow("MP3_vbrStandard")
-            << "MP3"
-            << cfg
-            << "/opt/lame "
-               "--silent "
-               "--preset standard "
-               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
-
-
-
-    //*******************************************
-    cfg.insert("Mp3/Preset",     "vbrStandardFast");
-
-    QTest::newRow("MP3_vbrStandardFast")
-            << "MP3"
-            << cfg
-            << "/opt/lame --silent "
-               "--preset fast standard "
-               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
-
-
-    //*******************************************
-    cfg.insert("Mp3/Preset",     "vbrExtreme");
-
-    QTest::newRow("MP3_vbrExtreme")
-            << "MP3"
-            << cfg
-            << "/opt/lame --silent "
-               "--preset extreme "
-               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
-
-    //*******************************************
-    cfg.insert("Mp3/Preset",     "vbrExtremeFast");
-
-    QTest::newRow("MP3_vbrExtremeFast")
-            << "MP3"
-            << cfg
-            << "/opt/lame --silent "
-               "--preset fast extreme "
-               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
-
-
-    //*******************************************
-    cfg.insert("Mp3/Preset",     "cbrInsane");
-
-    QTest::newRow("MP3_cbrInsane")
-            << "MP3"
-            << cfg
-            << "/opt/lame --silent "
-               "--preset insane "
-               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
-
-    //*******************************************
-    cfg.insert("Mp3/Preset",     "cbrKbps");
-    cfg.insert("Mp3/Bitrate",    64);
-
-    QTest::newRow("MP3_cbrKbps64")
-            << "MP3"
-            << cfg
-            << "/opt/lame --silent "
-               "--preset cbr 64 "
-               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
-
-    //*******************************************
-    cfg.insert("Mp3/Preset",     "cbrKbps");
-    cfg.insert("Mp3/Bitrate",    128);
-
-    QTest::newRow("MP3_cbrKbps128")
-            << "MP3"
-            << cfg
-            << "/opt/lame --silent "
-               "--preset cbr 128 "
-               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
-
-
-    //*******************************************
-    cfg.insert("Mp3/Preset",     "abrKbps");
-    cfg.insert("Mp3/Bitrate",    64);
-
-    QTest::newRow("MP3_abrKbps64")
-            << "MP3"
-            << cfg
-            << "/opt/lame --silent "
-               "--preset 64 "
-               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
-
-    //*******************************************
-    cfg.insert("Mp3/Preset",     "abrKbps");
-    cfg.insert("Mp3/Bitrate",    128);
-
-    QTest::newRow("MP3_abrKbps128")
-            << "MP3"
-            << cfg
-            << "/opt/lame --silent "
-               "--preset 128 "
-               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
-
-
-    //*******************************************
-    cfg.insert("Mp3/Preset",     "vbrQuality");
-    cfg.insert("Mp3/Quality",    0);
-
-    QTest::newRow("MP3_vbrQuality0")
-            << "MP3"
-            << cfg
-            << "/opt/lame --silent "
-               "-V 9 "
-               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
-
-    //*******************************************
-    cfg.insert("Mp3/Preset",     "vbrQuality");
-    cfg.insert("Mp3/Quality",    4);
-
-    QTest::newRow("MP3_vbrQuality4")
-            << "MP3"
-            << cfg
-            << "/opt/lame --silent "
-               "-V 5 "
-               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
-
-    //*******************************************
-    cfg.insert("Mp3/Preset",     "vbrQuality");
-    cfg.insert("Mp3/Quality",    9);
-
-    QTest::newRow("MP3_vbrQuality9")
-            << "MP3"
-            << cfg
-            << "/opt/lame --silent "
-               "-V 0 "
-               "--noreplaygain --add-id3v2 --ta Artist --tl Album --tg Genre --ty 2013 --tt Song01 --tc ExactAudioCopy v0.99pb4 --tn 1/4 - OutFile.wav";
-
-
-
-    //*******************************************
-    // Ogg
-    //*******************************************
-    cfg.clear();
-    cfg.insert("Programs/oggenc",   "/opt/oggenc");
-    cfg.insert("Ogg/UseQuality",    true);
-    cfg.insert("Ogg/Quality",       5);
-    cfg.insert("Ogg/MinBitrate",    "");
-    cfg.insert("Ogg/NormBitrate",   "");
-    cfg.insert("Ogg/MaxBitrate",    "");
-
-    QTest::newRow("Ogg Quality 5")
-            << "OGG"
-            << cfg
-            << "/opt/oggenc --quiet "
-               "-q 5 "
-               "--artist Artist --album Album --genre Genre --date 2013 --title Song01 --comment COMMENT=ExactAudioCopy v0.99pb4 "
-               "--comment DISCID=123456789 --tracknum 1 --comment TOTALTRACKS=4 --comment TRACKTOTAL=4 -o OutFile.wav -";
-
-
-    //*******************************************
-    cfg.insert("Ogg/Quality",       10);
-
-    QTest::newRow("Ogg Quality 10")
-            << "OGG"
-            << cfg
-            << "/opt/oggenc --quiet "
-               "-q 10 "
-               "--artist Artist --album Album --genre Genre --date 2013 --title Song01 --comment COMMENT=ExactAudioCopy v0.99pb4 "
-               "--comment DISCID=123456789 --tracknum 1 --comment TOTALTRACKS=4 --comment TRACKTOTAL=4 -o OutFile.wav -";
 
 
-    //*******************************************
-    cfg.insert("Programs/oggenc",   "/opt/oggenc");
-    cfg.insert("Ogg/UseQuality",    false);
-    cfg.insert("Ogg/MinBitrate",    "");
-    cfg.insert("Ogg/NormBitrate",   "");
-    cfg.insert("Ogg/MaxBitrate",    "");
-
-    QTest::newRow("Ogg Bitrate 0 0 0")
-            << "OGG"
-            << cfg
-            << "/opt/oggenc --quiet "
-               "--artist Artist --album Album --genre Genre --date 2013 --title Song01 --comment COMMENT=ExactAudioCopy v0.99pb4 "
-               "--comment DISCID=123456789 --tracknum 1 --comment TOTALTRACKS=4 --comment TRACKTOTAL=4 -o OutFile.wav -";
-
-    //*******************************************
-    cfg.insert("Programs/oggenc",   "/opt/oggenc");
-    cfg.insert("Ogg/UseQuality",    false);
-    cfg.insert("Ogg/MinBitrate",    64);
-    cfg.insert("Ogg/NormBitrate",   128);
-    cfg.insert("Ogg/MaxBitrate",    350);
-
-    QTest::newRow("Ogg Bitrate 64 128 350")
-            << "OGG"
-            << cfg
-            << "/opt/oggenc --quiet "
-               "-b 128 -m 64 -M 350 "
-               "--artist Artist --album Album --genre Genre --date 2013 --title Song01 --comment COMMENT=ExactAudioCopy v0.99pb4 "
-               "--comment DISCID=123456789 --tracknum 1 --comment TOTALTRACKS=4 --comment TRACKTOTAL=4 -o OutFile.wav -";
-
-
-
-    //*******************************************
-    // WavPack
-    //*******************************************
-    cfg.clear();
-    cfg.insert("Programs/wavpack",  "/opt/wavpack");
-    cfg.insert("WV/Compression",   0);
-
-    QTest::newRow("WavPack Quality 0")
-            << "WV"
-            << cfg
-            << "/opt/wavpack -q "
-               "-f "
-               "-w Artist=Artist -w Album=Album -w Genre=Genre -w Year=2013 -w Title=Song01 -w DiscId=123456789 -w Comment=ExactAudioCopy v0.99pb4 -w Track=1/4 - -o OutFile.wav";
-
-
-    //*******************************************
-    cfg.insert("WV/Compression",   1);
-
-    QTest::newRow("WavPack Quality 1")
-            << "WV"
-            << cfg
-            << "/opt/wavpack -q "
-               "-h "
-               "-w Artist=Artist -w Album=Album -w Genre=Genre -w Year=2013 -w Title=Song01 -w DiscId=123456789 -w Comment=ExactAudioCopy v0.99pb4 -w Track=1/4 - -o OutFile.wav";
-
-
-    //*******************************************
-    cfg.insert("WV/Compression",   2);
-
-    QTest::newRow("WavPack Quality 2")
-            << "WV"
-            << cfg
-            << "/opt/wavpack -q "
-               "-hh "
-               "-w Artist=Artist -w Album=Album -w Genre=Genre -w Year=2013 -w Title=Song01 -w DiscId=123456789 -w Comment=ExactAudioCopy v0.99pb4 -w Track=1/4 - -o OutFile.wav";
-
-}
-
 
 /************************************************
 
@@ -1449,384 +1063,5 @@
     QTest::newRow("HI 40:20:240 - 10:30:300")  << "29:49.940";
 }
 
-/************************************************
-
- ************************************************/
-void TestFlacon::testFindAudioFile()
-{
-    QFETCH(QString, fileTag);
-    QFETCH(QString, cueFileName);
-    QFETCH(QString, audioFiles);
-    QFETCH(QString, expected);
-
-    static int dirNum = 0;
-    dirNum++;
-    QString dir = QString("%1testFindAudioFile/%2/").arg(mTmpDir).arg(dirNum, 4, 20, QChar('0'));
-    QDir(dir).mkpath(".");
-    clearDir(dir);
-
-
-
-    QStringList fileTags = fileTag.split(",", QString::SkipEmptyParts);
-
-    QString cueFile = dir + cueFileName;
-    {
-        QStringList cue;
-        cue << "REM DATE 2013";
-        cue << "REM DISCID 123456789";
-        cue << "REM COMMENT \"ExactAudioCopy v0.99pb4\"";
-        cue << "PERFORMER \"Artist\"";
-        for (int i=0; i<fileTags.count(); ++i)
-        {
-            cue << "FILE \"" + fileTags[i].trimmed() +"\" WAVE";
-            cue << "  TRACK 01 AUDIO";
-            cue << "    TITLE \"Song01\"";
-            cue << "    INDEX 01 00:00:00";
-        }
-        writeTextFile(cueFile, cue);
-    }
-
-    foreach (QString f, audioFiles.split(","))
-    {
-        QFile(mAudio_cd_wav).link(dir + f.trimmed());
-    }
-
-
-    QStringList expectedLists = expected.split(",", QString::SkipEmptyParts);
-    CueReader cue(cueFile);
-    if (!cue.isValid())
-        FAIL("Cue isn't valid:" + cue.errorString().toLocal8Bit());
-
-    for (int i=0; i<cue.diskCount(); ++i)
-    {
-        Disk disk;
-        disk.loadFromCue(cue.disk(i));
-        QString expected = expectedLists.at(i).trimmed();
-        if (expected == "''")
-            expected = "";
-        else
-            expected = dir + expected;
-
-        QString real = disk.audioFileName();
-        QCOMPARE(real, expected);
-
-    }
-}
-
-
-/************************************************
-
- ************************************************/
-void TestFlacon::testFindAudioFile_data()
-{
-    QTest::addColumn<QString>("fileTag");
-    QTest::addColumn<QString>("cueFileName");
-    QTest::addColumn<QString>("audioFiles");
-    QTest::addColumn<QString>("expected");
-
-    QTest::newRow("1")
-            << "Album.wav"
-            << "Album.cue"
-            << "Album.ape"
-            << "Album.ape";
-
-
-    QTest::newRow("2")
-            << "Album.wav"
-            << "Garbage.cue"
-            << "Album.ape, Garbage.ape"
-            << "Album.ape";
-
-
-    QTest::newRow("3")
-            << "Garbage.wav"
-            << "Disk.cue"
-            << "Disk.ape"
-            << "Disk.ape";
-
-    QTest::newRow("Multi disk => CueFile_1.ape")
-            << "FileTag1.wav, FileTag2.wav"
-            << "CueFile.cue"
-            << "CueFile.ape," "CueFile_1.ape," "CueFile_2.ape"
-            << "CueFile_1.ape," "CueFile_2.ape";
-
-    QTest::newRow("4")
-            << "Garbage1.wav, Garbage2.wav"
-            << "Album.cue"
-            << "Album.ape, Album_Side1.ape, Album_Side2.ape"
-            << "Album_Side1.ape, Album_Side2.ape";
-
-    QTest::newRow("5")
-            << "Garbage1.wav, Garbage2.wav"
-            << "Album.cue"
-            << "Album.ape, Album Side1.ape, Album Side2.ape"
-            << "Album Side1.ape, Album Side2.ape";
-
-    QTest::newRow("6")
-            << "Garbage1.wav, Garbage2.wav"
-            << "Album.cue"
-            << "Album.ape, Album_Disk1.ape, Album_Disk2.ape"
-            << "Album_Disk1.ape, Album_Disk2.ape";
-
-    QTest::newRow("Multi disk => CUE+Disk1")
-            << "Garbage1.wav, Garbage2.wav"
-            << "Album.cue"
-            << "Album.ape, Album Disk1.ape, Album Disk2.ape"
-            << "Album Disk1.ape, Album Disk2.ape";
-
-    QTest::newRow("Multi disk => CUE+[Disk 1]")
-            << "Garbage1.wav, Garbage2.wav"
-            << "Album.cue"
-            << "Album.ape, Album [Disk 1].ape, Album [Disk 2].ape"
-            << "Album [Disk 1].ape, Album [Disk 2].ape";
-
-    QTest::newRow("Multi disk => CUE+[Disk #1]")
-            << "Garbage1.wav, Garbage2.wav"
-            << "Album.cue"
-            << "Album.ape, Album [Disk #1].ape, Album [Disk #2].ape"
-            << "Album [Disk #1].ape, Album [Disk #2].ape";
-
-    QTest::newRow("Multi disk => CUE+[Disk №1]")
-            << "Garbage1.wav, Garbage2.wav"
-            << "Album.cue"
-            << "Album.ape, Album [Disk №1].ape, Album [Disk №2].ape"
-            << "Album [Disk №1].ape, Album [Disk №2].ape";
-
-
-    QTest::newRow("Multi disk => CUE+Disk 001")
-            << "Garbage1.wav,"
-               "Garbage2.wav"
-            << "Album.cue"
-            << "Album.ape,"
-               "Album Disk 001.ape,"
-               "Album Disk 002.ape"
-            << "Album Disk 001.ape,"
-               "Album Disk 002.ape";
-
-    QTest::newRow("")
-            << "FileTag1.wav,"
-               "FileTag2.wav"
-            << "CueFile.cue"
-            << "FileTag1.wav,"
-               "FileTag2.wav,"
-               "CueFile.ape,"
-               "CueFile Disk1.ape,"
-               "CueFile Disk2.ape"
-            << "FileTag1.wav,"
-               "FileTag2.wav";
-
-    QTest::newRow("Not confuse 1 and 11")
-            << "FileTag1.wav,"  "FileTag2.wav"
-            << "CueFile.cue"
-            << "CueFile_11.flac,"  "CueFile_2.flac"
-            << "''," "CueFile_2.flac";
-
-    QTest::newRow("Multi disk => Side 1")
-            << "Garbage1.wav,"
-               "Garbage2.wav"
-            << "Album.cue"
-            << "Album.ape,"
-               "Side 1.flac,"
-               "Side 2.flac"
-            << "Side 1.flac,"
-               "Side 2.flac";
-
-    QTest::newRow("Multi disk => Disk 0001")
-            << "Garbage1.wav,"
-               "Garbage2.wav"
-            << "Album.cue"
-            << "Album.ape,"
-               "Disk 0001.ape,"
-               "Disk 0002.ape"
-            << "Disk 0001.ape,"
-               "Disk 0002.ape";
-
-    QTest::newRow("Multi dot")
-            << "FileTag.wav"
-            << "CueFile.cue"
-            << "CueFile.ape.flac"
-            << "CueFile.ape.flac";
-
-    QTest::newRow("Multi dot")
-            << "FileTag.wav"
-            << "CueFile.cue"
-            << "CueFile_AditionalText.flac"
-            << "CueFile_AditionalText.flac";
-
-    // Issue #31
-    QTest::newRow("Bush - (1996) Razorblade Suitcase")
-            << "Bush - (1996) Razorblade Suitcase.flac"
-            << "Bush - (1996) Razorblade Suitcase.cue"
-            << "3 Doors Down - (2000) The Better Life.flac,"
-               "Bush - (1996) Razorblade Suitcase.flac"
-            << "Bush - (1996) Razorblade Suitcase.flac";
-
-    QTest::newRow("FileTag(1) and FileTag(2)")
-            << "FileTag(1).wav,"
-               "FileTag(2).wav"
-            << "CueFile.cue"
-            << "FileTag(1).wav,"
-               "FileTag(2).wav,"
-               "CueFile.ape,"
-               "CueFile Disk1.ape,"
-               "CueFile Disk2.ape"
-            << "FileTag(1).wav,"
-               "FileTag(2).wav";
-}
-
-struct TestCueFile_ {
-    QString name;
-    QString fileTag;
-    QString fileTag2;
-};
-Q_DECLARE_METATYPE(TestCueFile_)
-
-
-struct TestFindCueFileData {
-    QList<TestCueFile_> cueFiles;
-    QStringList audioFiles;
-    QString chekAudioFile;
-    QString expected;
-};
-Q_DECLARE_METATYPE(TestFindCueFileData)
-
-
-/************************************************
-
- ************************************************/
-void TestFlacon::testFindCueFile()
-{
-    QFETCH(TestFindCueFileData, test);
-
-    static int dirNum = 0;
-    dirNum++;
-    QString dir = QString("%1testFindAudioFile/%2/").arg(mTmpDir).arg(dirNum, 4, 20, QChar('0'));
-    QDir(dir).mkpath(".");
-    clearDir(dir);
-
-
-    foreach (QString f, test.audioFiles)
-    {
-        QFile(mAudio_cd_wav).link(dir + f.trimmed());
-    }
-
-    foreach (TestCueFile_ cueFile, test.cueFiles)
-    {
-        QStringList cue;
-        cue << "REM DATE 2013";
-        cue << "REM DISCID 123456789";
-        cue << "REM COMMENT \"ExactAudioCopy v0.99pb4\"";
-        cue << "PERFORMER \"Artist\"";
-        cue << "FILE \"" + cueFile.fileTag.trimmed() +"\" WAVE";
-        cue << "  TRACK 01 AUDIO";
-        cue << "    TITLE \"Song01\"";
-        cue << "    INDEX 01 00:00:00";
-
-        if (!cueFile.fileTag2.isEmpty())
-        {
-            cue << "FILE \"" + cueFile.fileTag2.trimmed() +"\" WAVE";
-            cue << "  TRACK 01 AUDIO";
-            cue << "    TITLE \"Song01\"";
-            cue << "    INDEX 01 00:00:00";
-        }
-        writeTextFile(dir + cueFile.name, cue);
-    }
-
-    InputAudioFile audio(dir + test.chekAudioFile);
-    Disk disk;
-    disk.setAudioFile(audio);
-    QString real = disk.cueFile();
-    QString expected = dir + test.expected;
-    QCOMPARE(real, expected);
-}
-
-
-/************************************************
-
- ************************************************/
-void TestFlacon::testFindCueFile_data()
-{
-
-    QTest::addColumn<TestFindCueFileData>("test");
-    TestFindCueFileData test;
-
-    // -------------------------------------
-    test = TestFindCueFileData();
-    test.cueFiles.append(TestCueFile_());
-    test.cueFiles.last().name = "1.cue";
-    test.cueFiles.last().fileTag= "FILE \"1.wav\" WAVE";
-
-    test.audioFiles << "1.wav";
-
-    test.chekAudioFile = "1.wav";
-    test.expected = "1.cue";
-    QTest::newRow("1.cue 1.wav") << test;
-
-    // -------------------------------------
-    test = TestFindCueFileData();
-    test.cueFiles.append(TestCueFile_());
-    test.cueFiles.last().name = "1.cue";
-    test.cueFiles.last().fileTag= "FILE \"1.wav\" WAVE";
-
-    test.cueFiles.append(TestCueFile_());
-    test.cueFiles.last().name = "2.cue";
-    test.cueFiles.last().fileTag= "FILE \"2.wav\" WAVE";
-
-    test.audioFiles << "1.wav";
-    test.audioFiles << "2.wav";
-
-    test.chekAudioFile = "1.wav";
-    test.expected = "1.cue";
-    QTest::newRow("1.cue 2.cue *1.wav* 2.wav") << test;
-
-
-    // -------------------------------------
-    test = TestFindCueFileData();
-    test.cueFiles.append(TestCueFile_());
-    test.cueFiles.last().name = "1.cue";
-    test.cueFiles.last().fileTag= "FILE \"1.wav\" WAVE";
-
-    test.cueFiles.append(TestCueFile_());
-    test.cueFiles.last().name = "2.cue";
-    test.cueFiles.last().fileTag= "FILE \"2.wav\" WAVE";
-
-    test.audioFiles << "1.wav";
-    test.audioFiles << "2.wav";
-
-    test.chekAudioFile = "2.wav";
-    test.expected = "2.cue";
-    QTest::newRow("1.cue 2.cue 1.wav *2.wav*") << test;
-
-
-    // -------------------------------------
-    test = TestFindCueFileData();
-    test.cueFiles.append(TestCueFile_());
-    test.cueFiles.last().name = "multi.cue";
-    test.cueFiles.last().fileTag = "FILE \"1.wav\" WAVE";
-    test.cueFiles.last().fileTag2= "FILE \"2.wav\" WAVE";
-
-    test.audioFiles << "multi_1.wav";
-    test.audioFiles << "multi_2.wav";
-
-    test.chekAudioFile = "multi_1.wav";
-    test.expected = "multi.cue";
-    QTest::newRow("multi.cue multi_1.wav multi_2.wav") << test;
-
-
-    // -------------------------------------
-    test = TestFindCueFileData();
-    test.cueFiles.append(TestCueFile_());
-    test.cueFiles.last().name = "multi.cue";
-    test.cueFiles.last().fileTag = "FILE \"1.wav\" WAVE";
-    test.cueFiles.last().fileTag2= "FILE \"2.wav\" WAVE";
-
-    test.audioFiles << "multi_1.wav";
-    test.audioFiles << "multi_2.wav";
-
-    test.chekAudioFile = "multi_2.wav";
-    test.expected = "multi.cue";
-    QTest::newRow("multi.cue multi_1.wav multi_2.wav") << test;
-}
-
 
-QTEST_MAIN(TestFlacon)
+QTEST_GUILESS_MAIN(TestFlacon)

flacon-3.1.1.tar.gz/tests/testflacon.h -> flacon-4.0.0.tar.gz/tests/testflacon.h Changed

flacon-3.1.1.tar.gz/tests/tools.cpp -> flacon-4.0.0.tar.gz/tests/tools.cpp Changed

@@ -128,53 +128,11 @@
 /************************************************
  *
  ************************************************/
-QStringList shnSplit(const QString &cueFile, const QString &audioFile)
-{
-    QString dir = QFileInfo(cueFile).absoluteDir().absolutePath();
-    foreach (QFileInfo file, QDir(dir).entryInfoList(QStringList() << "*-shntool.wav"))
-    {
-        QFile::remove(file.absoluteFilePath());
-    }
-
-    QStringList args;
-    args << "split";
-    args << "-w";
-    args << "-q";
-    args << "-O" << "always";
-    args << "-n" << "%03d";
-    args << "-t" << "%n-shntool";
-    args << "-d" << dir;
-    args << "-f" << QDir::toNativeSeparators(cueFile);
-    args << QDir::toNativeSeparators(audioFile);
-    //qDebug() << args;
-
-    QProcess proc;
-
-    if (proc.execute("shntool", args) != 0)
-    {
-
-        FAIL("snhtool was crashed: " + proc.readAllStandardError());
-    }
-
-    QStringList res;
-    foreach (QFileInfo file, QDir(dir).entryInfoList(QStringList() << "*-shntool.wav"))
-    {
-        if (!file.absoluteFilePath().endsWith("000-shntool.wav"))
-            res << file.absoluteFilePath();
-    }
-
-    return res;
-}
-
-
-/************************************************
- *
- ************************************************/
-void compareAudioHash(const QString &file1, const QString &expected)
+bool compareAudioHash(const QString &file1, const QString &expected)
 {
     if (calcAudioHash(file1) != expected)
     {
-        QFAIL(QString("Compared hases are not the same for:\n"
+        FAIL(QString("Compared hases are not the same for:\n"
                      "    [%1] %2\n"
                      "    [%3] %4\n")
 
@@ -185,8 +143,9 @@
                     .arg("expected")
 
                     .toLocal8Bit());
+        return false;
     }
-    //QCOMPARE(calcAudioHash(file1), calcAudioHash(file2));
+    return true;
 }

flacon-3.1.1.tar.gz/tests/tools.h -> flacon-4.0.0.tar.gz/tests/tools.h Changed

flacon-4.0.0.tar.gz/track.cpp Added

@@ -0,0 +1,328 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "track.h"
+
+#include "disk.h"
+#include "inputaudiofile.h"
+#include "project.h"
+#include "settings.h"
+#include "outformat.h"
+
+#include <QDir>
+#include <QDebug>
+
+/************************************************
+
+ ************************************************/
+Track::Track(Disk *disk, int index):
+    QObject(disk),
+    mDisk(disk),
+    mIndex(index),
+    mCueIndexes(100),
+    mStatus(NotRunning),
+    mProgress(0)
+{
+    qRegisterMetaType<Track::Status>("Track::Status");
+}
+
+
+/************************************************
+
+ ************************************************/
+Track::~Track()
+{
+}
+
+
+/************************************************
+ *
+ ************************************************/
+uint Track::duration() const
+{
+    uint start = cueIndex(1).milliseconds();
+    uint end = 0;
+    if (index() < mDisk->count() - 1)
+    {
+        end = mDisk->track(index()+1)->cueIndex(1).milliseconds();
+    }
+    else if (mDisk->audioFile())
+    {
+        end = mDisk->audioFile()->duration();
+    }
+
+    if (start > end)
+        return 0;
+
+    return end - start;
+}
+
+
+/************************************************
+
+ ************************************************/
+QString Track::tag(const QString &tagName) const
+{
+    return mDisk->getTag(mIndex, tagName);
+}
+
+
+/************************************************
+
+ ************************************************/
+void Track::setTag(const QString &tagName, const QString &value)
+{
+    mDisk->setTag(mIndex, tagName, value);
+}
+
+
+/************************************************
+
+ ************************************************/
+void Track::setProgress(Track::Status status, int percent)
+{
+    mStatus = status;
+    mProgress = percent;
+    project->emitTrackProgress(this);
+}
+
+
+/************************************************
+
+ ************************************************/
+QString Track::resultFileName() const
+{
+    QString pattern = settings->outFilePattern();
+    if (pattern.isEmpty())
+        pattern = QString("%a/%y - %A/%n - %t");
+
+    return calcFileName(pattern,
+                        disk()->count(),
+                        trackNum(),
+                        this->album(),
+                        this->title(),
+                        this->artist(),
+                        this->genre(),
+                        this->date(),
+                        settings->outFormat()->ext());
+}
+
+
+/************************************************
+  %N  Number of tracks       %n  Track number
+  %a  Artist                 %A  Album title
+  %y  Year                   %g  Genre
+  %t  Track title
+ ************************************************/
+QString Track::calcFileName(const QString &pattern,
+                            int trackCount,
+                            int trackNum,
+                            const QString &album,
+                            const QString &title,
+                            const QString &artist,
+                            const QString &genre,
+                            const QString &date,
+                            const QString &fileExt)
+{
+    QHash<QChar, QString> tokens;
+    tokens.insert(QChar('N'),   QString("%1").arg(trackCount, 2, 10, QChar('0')));
+    tokens.insert(QChar('n'),   QString("%1").arg(trackNum, 2, 10, QChar('0')));
+    tokens.insert(QChar('A'),   Disk::safeString(album));
+    tokens.insert(QChar('t'),   Disk::safeString(title));
+    tokens.insert(QChar('a'),   Disk::safeString(artist));
+    tokens.insert(QChar('g'),   Disk::safeString(genre));
+    tokens.insert(QChar('y'),   Disk::safeString(date));
+
+    QString res = expandPattern(pattern, &tokens, false);
+    return res + "." + fileExt;
+}
+
+
+/************************************************
+
+ ************************************************/
+QString Track::expandPattern(const QString &pattern, const QHash<QChar, QString> *tokens, bool optional)
+{
+    QString res;
+    bool perc = false;
+    bool hasVars = false;
+    bool isValid = true;
+
+
+    for(int i=0; i<pattern.length(); ++i)
+    {
+        QChar c = pattern.at(i);
+
+
+        // Sub pattern .................................
+        if (c == '{')
+        {
+            int level = 0;
+            int start = i + 1;
+            //int j = i;
+            QString s = "{";
+
+            for (int j=i; j<pattern.length(); ++j)
+            {
+                c = pattern.at(j);
+                if (c == '{')
+                    level++;
+                else if (c == '}')
+                    level--;
+
+                if (level == 0)
+                {
+                    s = expandPattern(pattern.mid(start, j - start), tokens, true);
+                    i = j;
+                    break;
+                }
+            }
+            res += s;
+        }
+        // Sub pattern .................................
+
+        else
+        {
+            if (perc)
+            {
+                perc = false;
+                if (tokens->contains(c))
+                {
+                    QString s = tokens->value(c);
+                    hasVars = true;
+                    isValid = !s.isEmpty();
+                    res += s;
+                }
+                else
+                {
+                    if (c == '%')
+                        res += "%";
+                    else
+                        res += QString("%") + c;
+                }
+            }
+            else
+            {
+                if (c == '%')
+                    perc = true;
+                else
+                    res += c;
+            }
+        }
+    }
+
+    if (perc)
+        res += "%";
+
+    if (optional)
+    {
+        if  (hasVars)
+        {
+            if (!isValid)
+                return "";
+        }
+        else
+        {
+            return "{" + res + "}";
+        }
+    }
+
+    return res;
+}
+
+
+
+/************************************************
+
+ ************************************************/
+QString Track::resultFilePath() const
+{
+    QString fileName = resultFileName();
+    if (fileName.isEmpty())
+        return "";
+
+    QString dir = calcResultFilePath();
+    if (dir.endsWith("/") || fileName.startsWith("/"))
+        return calcResultFilePath() + fileName;
+    else
+        return calcResultFilePath() + "/" + fileName;
+}
+
+
+/************************************************
+
+ ************************************************/
+QString Track::calcResultFilePath() const
+{
+    QString dir = settings->outFileDir();
+
+    if (dir == "~")
+        return QDir::homePath();
+
+    if (dir == ".")
+        dir = "";
+
+    if (dir.startsWith("~/"))
+        return dir.replace(0, 1, QDir::homePath());
+
+    QFileInfo fi(dir);
+
+    if (fi.isAbsolute())
+        return fi.absoluteFilePath();
+
+    if (!disk()->audioFileName().isEmpty())
+        return QFileInfo(disk()->audioFileName()).dir().absolutePath() + QDir::separator() + dir;
+
+    return QFileInfo(QDir::homePath() + QDir::separator() + dir).absoluteFilePath();
+}
+
+
+/************************************************
+
+ ************************************************/
+int Track::trackNum() const
+{
+    return mDisk->startTrackNum() + mIndex;
+}
+
+
+/************************************************
+
+ ************************************************/
+CueIndex Track::cueIndex(int indexNum) const
+{
+    return mCueIndexes.at(indexNum);
+}
+
+
+/************************************************
+
+ ************************************************/
+void Track::setCueIndex(int indexNum, const CueIndex &value)
+{
+    mCueIndexes[indexNum] = value;
+}
+

flacon-4.0.0.tar.gz/track.h Added

@@ -0,0 +1,129 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#ifndef TRACK_H
+#define TRACK_H
+
+#include <QObject>
+#include "cue.h"
+
+class Disk;
+
+class Track: public QObject
+{
+    Q_OBJECT
+public:
+
+    enum Status
+    {
+        NotRunning  = 0,
+        Canceled    = 1,
+        Error       = 2,
+        Aborted     = 3,
+        OK          = 4,
+        Splitting   = 5,
+        Encoding    = 6,
+        Queued      = 7,
+        WaitGain    = 8,
+        CalcGain    = 9,
+        WriteGain   = 10
+    };
+
+    explicit Track(Disk *disk, int index);
+    ~Track();
+
+    QString artist() const            { return tag("PERFORMER"); }
+    void setArtist(const QString &value)  { setTag("PERFORMER", value); }
+
+    QString album() const             { return tag("ALBUM"); }
+    void setAlbum(const QString &value)   { setTag("ALBUM", value); }
+
+    QString comment() const           { return tag("COMMENT") ;}
+    void setComment(const QString &value)   { setTag("COMMENT", value); }
+
+    QString title() const             { return tag("TITLE") ;}
+    void setTitle(const QString &value)   { setTag("TITLE", value); }
+
+    QString genre() const             { return tag("GENRE") ;}
+    void setGenre(const QString &value)   { setTag("GENRE", value); }
+
+    QString date() const              { return tag("DATE") ;}
+    void setDate(const QString &value)    { setTag("DATE", value); }
+
+
+    QString resultFileName() const;
+    QString resultFilePath() const;
+
+    Disk *disk() const { return mDisk; }
+    int index() const { return mIndex; }
+
+    int trackNum() const;
+    uint duration() const;
+
+    CueIndex cueIndex(int indexNum) const;
+    void setCueIndex(int indexNum, const CueIndex &value);
+
+    virtual QString tag(const QString &tagName) const;
+    virtual void setTag(const QString &tagName, const QString &value);
+
+    int progress() const { return mProgress; }
+    Status status() const { return mStatus; }
+    void setProgress(Status status, int percent = -1);
+
+    static QString calcFileName(const QString &pattern,
+                                int trackCount,
+                                int trackNum,
+                                const QString &album,
+                                const QString &title,
+                                const QString &artist,
+                                const QString &genre,
+                                const QString &date,
+                                const QString &fileExt);
+
+private:
+    Disk *mDisk;
+    int mIndex;
+    QVector<CueIndex> mCueIndexes;
+    Status mStatus;
+    int mProgress;
+
+    QString calcResultFilePath() const;
+    static QString expandPattern(const QString &pattern, const QHash<QChar,QString> *tokens, bool optional);
+};
+
+Q_DECLARE_METATYPE(Track::Status)
+
+
+class PreGapTrack: public Track
+{
+public:
+    explicit PreGapTrack(Disk *disk);
+
+    virtual QString tag(const QString &tagName) const;
+    virtual void setTag(const QString &tagName, const QString &value);
+};
+
+#endif // TRACK_H

flacon-3.1.1.tar.gz/translations/flacon_cs.ts -> flacon-4.0.0.tar.gz/translations/flacon_cs.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>Záplata s podporou pro WavPack</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Ikona programu, balení</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Balení, zkouška</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>Počet vláken při převodu.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Adresář s dočasnými soubory:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Výchozí kódová stránka:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Předmezera před první skladbou:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation>Vytvořit list CUE u skladby</translation>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Adresář s dočasnými soubory:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Výchozí kódová stránka:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Nastavení kódování FLAC</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Zhuštění:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>Zakázáno</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,57 +335,6 @@
         <translation>Přednastavení:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation>&lt;dt&gt;Proměnlivý datový tok (VBR) Střední&lt;/dt&gt;
-&lt;dd&gt;Při použití středního proměnlivého datového toku by toto přednastavení mělo většině lidí u většiny hudby poskytnout téměř průzračnost.&lt;/dd&gt;
-
-&lt;dt&gt;Proměnlivý datový tok (VBR), obvyklý, Proměnlivý datový tok (VBR), obvyklý, rychle&lt;/dt&gt;
-&lt;dd&gt;Při použití obvyklého proměnlivého datového toku by toto přednastavení mělo obecně pro většinu lidí u většiny hudby být průzračné a jakost záznamu je již docela vysoká.&lt;/dd&gt;
-
-&lt;dt&gt;Proměnlivý datový tok (VBR), dokonalý, Proměnlivý datový tok (VBR), dokonalý, rychle&lt;/dt&gt;
-&lt;dd&gt;Pokud máte hodně dobrý sluch nebo  velice dobré zařízení, toto přednastavení vám poskytne lehce vyšší jakost, než jakou obdržíte při režimu běžné kvality.&lt;/dd&gt;
-
-&lt;dt&gt;Proměnlivý datový tok (VBR), jakost&lt;/dt&gt;
-&lt;dd&gt;Tato volba pro proměnlivý datový tok (VBR) vám umožní zadat jakost výstupu.&lt;/dd&gt;
-
-&lt;dt&gt;Rychlá volba&lt;/dt&gt;
-&lt;dd&gt;Povolí nový rychlý proměnlivý datový tok (VBR) pro zvláštní profil. Toto se doporučuje.&lt;/dd&gt;
-
-&lt;dt&gt;Stálý datový tok (CBR), zázračný&lt;/dt&gt;
-&lt;dd&gt;Pokud musíte mít naprosto nejvyšší kvalitu bez ohledu na velikost souboru, dosáhnete toho použitím tohoto stálého datového toku.&lt;/dd&gt;
-
-&lt;dt&gt;Kb/s stálého datového toku (CBR )&lt;/dt&gt;
-&lt;dd&gt;Použití tohoto přednastavení pro stálý datový tok vám obvykle dá dobrou kvalitu při zadaném datovém toku.&lt;/dd&gt;
-
-&lt;dt&gt;Kb/s průměrného datového toku (ABR )&lt;/dt&gt;
-&lt;dd&gt;Použití tohoto přednastavení pro průměrný datový tok vám obvykle dá vyšší kvalitu, než jakou vám dá volba pro stálý datový tok pro zadaný datový tok.&lt;/dd&gt;
-</translation>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Použít datový tok</translation>
     </message>
@@ -433,6 +398,57 @@
         <source>ABR kbps</source>
         <translation>Kb/s průměrného datového toku (ABR)</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation>&lt;dt&gt;Proměnlivý datový tok (VBR) Střední&lt;/dt&gt;
+&lt;dd&gt;Při použití středního proměnlivého datového toku by toto přednastavení mělo většině lidí u většiny hudby poskytnout téměř průzračnost.&lt;/dd&gt;
+
+&lt;dt&gt;Proměnlivý datový tok (VBR), obvyklý, Proměnlivý datový tok (VBR), obvyklý, rychle&lt;/dt&gt;
+&lt;dd&gt;Při použití obvyklého proměnlivého datového toku by toto přednastavení mělo obecně pro většinu lidí u většiny hudby být průzračné a jakost záznamu je již docela vysoká.&lt;/dd&gt;
+
+&lt;dt&gt;Proměnlivý datový tok (VBR), dokonalý, Proměnlivý datový tok (VBR), dokonalý, rychle&lt;/dt&gt;
+&lt;dd&gt;Pokud máte hodně dobrý sluch nebo  velice dobré zařízení, toto přednastavení vám poskytne lehce vyšší jakost, než jakou obdržíte při režimu běžné kvality.&lt;/dd&gt;
+
+&lt;dt&gt;Proměnlivý datový tok (VBR), jakost&lt;/dt&gt;
+&lt;dd&gt;Tato volba pro proměnlivý datový tok (VBR) vám umožní zadat jakost výstupu.&lt;/dd&gt;
+
+&lt;dt&gt;Rychlá volba&lt;/dt&gt;
+&lt;dd&gt;Povolí nový rychlý proměnlivý datový tok (VBR) pro zvláštní profil. Toto se doporučuje.&lt;/dd&gt;
+
+&lt;dt&gt;Stálý datový tok (CBR), zázračný&lt;/dt&gt;
+&lt;dd&gt;Pokud musíte mít naprosto nejvyšší kvalitu bez ohledu na velikost souboru, dosáhnete toho použitím tohoto stálého datového toku.&lt;/dd&gt;
+
+&lt;dt&gt;Kb/s stálého datového toku (CBR )&lt;/dt&gt;
+&lt;dd&gt;Použití tohoto přednastavení pro stálý datový tok vám obvykle dá dobrou kvalitu při zadaném datovém toku.&lt;/dd&gt;
+
+&lt;dt&gt;Kb/s průměrného datového toku (ABR )&lt;/dt&gt;
+&lt;dd&gt;Použití tohoto přednastavení pro průměrný datový tok vám obvykle dá vyšší kvalitu, než jakou vám dá volba pro stálý datový tok pro zadaný datový tok.&lt;/dd&gt;
+</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -555,16 +571,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>Nelze vytvořit adresář &quot;%1&quot;.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>Převod není možný:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>Nelze zapisovat do adresáře &quot;%1&quot;.</translation>
+        <source>Select cover image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>Převod není možný:</translation>
+        <source>Without cover image</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -579,8 +598,8 @@
         <translation>%1 [disk %2]</translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
-        <translation>Soubor CUE obsahuje údaje o více discích. Který disk chcete použít?</translation>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -601,14 +620,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>Nelze smazat soubor:
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Chyba kodéru:</translation>
@@ -618,6 +629,12 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation>Nelze přečíst soubor %1</translation>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -666,17 +683,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>Nelze přejmenovat soubor:⏎
-%1 na %2⏎
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -756,10 +762,6 @@
         <translation>&amp;Nápověda</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Přidat soubor</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>Přidat soubor CUE nebo zvukový soubor</translation>
     </message>
@@ -808,14 +810,6 @@
         <translation>&amp;O programu Flacon</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Odstranit album</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Odstranit album z projektu</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Delete</translation>
     </message>
@@ -979,6 +973,18 @@
         <source>Delete current pattern from history</source>
         <translation>Smazat nynější vzor z historie</translation>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -1008,15 +1014,15 @@
         <translation>Vyberte soubor s programem</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
-        <translation>Program %1</translation>
-    </message>
-    <message>
         <source>All files</source>
         <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation>Všechny soubory</translation>
     </message>
+    <message>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1071,12 +1077,35 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation>Zvukový soubor &lt;b&gt;&quot;%1&quot;&lt;/b&gt; neexistuje</translation>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>Počet skladeb je vyšší než očekáváno.</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1203,4 +1232,15 @@
 %1</translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_cs_CZ.ts -> flacon-4.0.0.tar.gz/translations/flacon_cs_CZ.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs_CZ" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs_CZ" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>Záplata s podporou pro WavPack</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Ikona programu, balení</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Balení, zkouška</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>Počet vláken při převodu.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Adresář s dočasnými soubory:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Výchozí kódová stránka:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Předmezera před první skladbou:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation>Vytvořit list CUE u skladby</translation>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Adresář s dočasnými soubory:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Výchozí kódová stránka:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Nastavení kódování FLAC</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Zhuštění:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>Zakázáno</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,57 +335,6 @@
         <translation>Přednastavení:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation>&lt;dt&gt;Proměnlivý datový tok (VBR) Střední&lt;/dt&gt;
-&lt;dd&gt;Při použití středního proměnlivého datového toku by toto přednastavení mělo většině lidí u většiny hudby poskytnout téměř průzračnost.&lt;/dd&gt;
-
-&lt;dt&gt;Proměnlivý datový tok (VBR), obvyklý, Proměnlivý datový tok (VBR), obvyklý, rychle&lt;/dt&gt;
-&lt;dd&gt;Při použití obvyklého proměnlivého datového toku by toto přednastavení mělo obecně pro většinu lidí u většiny hudby být průzračné a jakost záznamu je již docela vysoká.&lt;/dd&gt;
-
-&lt;dt&gt;Proměnlivý datový tok (VBR), dokonalý, Proměnlivý datový tok (VBR), dokonalý, rychle&lt;/dt&gt;
-&lt;dd&gt;Pokud máte hodně dobrý sluch nebo  velice dobré zařízení, toto přednastavení vám poskytne lehce vyšší jakost, než jakou obdržíte při režimu běžné kvality.&lt;/dd&gt;
-
-&lt;dt&gt;Proměnlivý datový tok (VBR), jakost&lt;/dt&gt;
-&lt;dd&gt;Tato volba pro proměnlivý datový tok (VBR) vám umožní zadat jakost výstupu.&lt;/dd&gt;
-
-&lt;dt&gt;Rychlá volba&lt;/dt&gt;
-&lt;dd&gt;Povolí nový rychlý proměnlivý datový tok (VBR) pro zvláštní profil. Toto se doporučuje.&lt;/dd&gt;
-
-&lt;dt&gt;Stálý datový tok (CBR), zázračný&lt;/dt&gt;
-&lt;dd&gt;Pokud musíte mít naprosto nejvyšší kvalitu bez ohledu na velikost souboru, dosáhnete toho použitím tohoto stálého datového toku.&lt;/dd&gt;
-
-&lt;dt&gt;Kb/s stálého datového toku (CBR )&lt;/dt&gt;
-&lt;dd&gt;Použití tohoto přednastavení pro stálý datový tok vám obvykle dá dobrou kvalitu při zadaném datovém toku.&lt;/dd&gt;
-
-&lt;dt&gt;Kb/s průměrného datového toku (ABR )&lt;/dt&gt;
-&lt;dd&gt;Použití tohoto přednastavení pro průměrný datový tok vám obvykle dá vyšší kvalitu, než jakou vám dá volba pro stálý datový tok pro zadaný datový tok.&lt;/dd&gt;
-</translation>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Použít datový tok</translation>
     </message>
@@ -433,6 +398,34 @@
         <source>ABR kbps</source>
         <translation>Kb/s průměrného datového toku (ABR)</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -555,16 +548,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>Nelze vytvořit adresář &quot;%1&quot;.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>Převod není možný:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>Nelze zapisovat do adresáře &quot;%1&quot;.</translation>
+        <source>Select cover image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>Převod není možný:</translation>
+        <source>Without cover image</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -579,8 +575,8 @@
         <translation>%1 [disk %2]</translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
-        <translation>Soubor CUE obsahuje údaje o více discích. Který disk chcete použít?</translation>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -601,14 +597,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>Nelze smazat soubor:
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Chyba kodéru:</translation>
@@ -618,6 +606,12 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation>Nelze přečíst soubor %1</translation>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -666,17 +660,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>Nelze přejmenovat soubor:⏎
-%1 na %2⏎
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -756,10 +739,6 @@
         <translation>&amp;Nápověda</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Přidat soubor</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>Přidat soubor CUE nebo zvukový soubor</translation>
     </message>
@@ -808,14 +787,6 @@
         <translation>&amp;O programu Flacon</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Odstranit album</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Odstranit album z projektu</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Delete</translation>
     </message>
@@ -979,6 +950,18 @@
         <source>Delete current pattern from history</source>
         <translation>Smazat nynější vzor z historie</translation>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -1008,15 +991,15 @@
         <translation>Vyberte soubor s programem</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
-        <translation>Program %1</translation>
-    </message>
-    <message>
         <source>All files</source>
         <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation>Všechny soubory</translation>
     </message>
+    <message>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1071,12 +1054,35 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation>Zvukový soubor &lt;b&gt;&quot;%1&quot;&lt;/b&gt; neexistuje</translation>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>Počet skladeb je vyšší než očekáváno.</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1203,4 +1209,15 @@
 %1</translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_de.ts -> flacon-4.0.0.tar.gz/translations/flacon_de.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>Patch für WavPack-Unterstützung</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Anwendungssymbol, Paketierung</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Paketierung, Testen</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>Die Anzahl der Threads im Konvertierungsprozess.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Temporäres Verzeichnis:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Standard-Zeichensatztabelle:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Vorlücke des ersten Stücks:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation>Cue-Datei pro Stück erstellen</translation>
     </message>
+    <message>
+        <source> px</source>
+        <translation> px</translation>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Temporäres Verzeichnis:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Standard-Zeichensatztabelle:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation>Bild nicht kopieren</translation>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation>Originalbildgröße beibehalten</translation>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation>Größe ändern, wenn Bildgröße größer als</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>FLAC-Kodierungskonfiguration</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Komprimierung:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>Deaktiviert</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,34 +335,6 @@
         <translation>Voreinstellung:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Bitrate anwenden</translation>
     </message>
@@ -410,6 +398,57 @@
         <source>ABR kbps</source>
         <translation>ABR kbps</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation>&lt;dt&gt;VBR Mittel&lt;/dt&gt;
+&lt;dd&gt;Durch die Verwendung einer mittleren variablen Bitrate sollte diese Voreinstellung für die meisten Menschen und die meisten Musikstücke nahezu glasklar sein.&lt;/dd&gt;
+
+&lt;dt&gt;VBR Standard, VBR Standard schnell&lt;/dt&gt;
+&lt;dd&gt;Durch die Verwendung einer Standard-variablen Bitrate sollte diese Voreinstellung für die meisten Menschen bei den meisten Musikstücken im Allgemeinen glasklar sein und ist bereits recht hochwertig.&lt;/dd&gt;
+
+&lt;dt&gt;VBR extrem, VBR extrem schnell&lt;/dt&gt;
+&lt;dd&gt;Durch die Verwendung der höchstmöglichen variablen Bitrate bietet diese Voreinstellung eine etwas höhere Qualität als der Standardmodus, wenn Sie über ein extrem gutes Hörvermögen oder auch ein hochwertiges Audiosystem verfügen.&lt;/dd&gt;
+
+&lt;dt&gt;VBR Qualität&lt;/dt&gt;
+&lt;dd&gt;Diese Option Variable Bitrate ermöglicht es Ihnen, die Ausgabequalität festzulegen.&lt;/dd&gt;
+
+&lt;dt&gt;schnelle Option&lt;/dt&gt;
+&lt;dd&gt;Ermöglicht den neuen schnellen VBR für ein bestimmtes Profil. Dies wird empfohlen.&lt;/dd&gt;
+
+&lt;dt&gt;CBR verrückt&lt;/dt&gt;
+&lt;dd&gt;Wenn Sie die absolut höchste Qualität ohne Rücksicht auf die Dateigröße haben möchten, erreichen Sie das mit dieser konstanten Bitrate.&lt;/dd&gt;
+
+&lt;dt&gt;CBR kbit/s&lt;/dt&gt;
+&lt;dd&gt;Wenn Sie diese Voreinstellung für konstante Bitrate verwenden, erhalten Sie in der Regel gute Qualität bei einer bestimmten Bitrate.&lt;/dd&gt;
+
+&lt;dt&gt;ABR kbit/s&lt;/dt&gt;
+&lt;dd&gt;Wenn Sie diese Voreinstellung für die Durchschnittsbitrate verwenden, erhalten Sie in der Regel eine höhere Qualität als die Option Konstante Bitrate für eine bestimmte Bitrate.&lt;/dd&gt;
+</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -486,7 +525,11 @@
 
 &lt;dt&gt;CBR&lt;/dt&gt;
 &lt;dd&gt;Use constrained variable bitrate encoding. Outputs to a specific bitrate. This mode is analogous to CBR in AAC/MP3 encoders and managed mode in vorbis coders. This delivers less consistent quality than VBR mode but consistent bitrate.&lt;/dd&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;dt&gt;VBR&lt;/dt&gt;
+&lt;dd&gt;Variable Bitratenkodierung verwenden (empfohlen). Im VBR-Modus kann die Bitrate je nach Inhalt frei nach oben und unten gehen, um die Qualitätskonstanz zu gewährleisten.&lt;/dd&gt;
+
+&lt;dt&gt;CBR&lt;/dt&gt;
+&lt;dd&gt;Benutzen Sie die Bitratenkodierung mit eingeschränkten Variablen. Gibt eine bestimmte Bitrate aus. Dieser Modus ist analog zu CBR bei AAC/MP3-Kodierern und verwalteter Modus bei Vorbis-Kodierern. Dies liefert weniger konstante Qualität als der VBR-Modus, dafür aber eine konstante Bitrate.&lt;/dd&gt;</translation>
     </message>
     <message>
         <source>Sets the target bitrate in kb/s (6-256 per channel).
@@ -529,32 +572,35 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>Ich kann das Verzeichnis &quot;%1&quot; nicht erstellen.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>Konvertierung ist nicht möglich:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>Ich kann nicht in das Verzeichnis &quot;%1&quot; schreiben.</translation>
+        <source>Select cover image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>Konvertierung ist nicht möglich:</translation>
+        <source>Without cover image</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CueDiskSelectDialog</name>
     <message>
         <source>Select disk</source>
-        <translation>Festplatte auswählen</translation>
+        <translation>Disk auswählen</translation>
     </message>
     <message>
         <source>%1 [ disk %2 ]</source>
         <comment>Cue disk select dialog, string like 'The Wall [disk 1]'</comment>
-        <translation>%1 [ Festplatte %2 ]</translation>
+        <translation>%1 [ Disk %2 ]</translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
-        <translation>Das Cue Sheet enthält Informationen über mehrere Disks. Welche Disk soll verwendet werden?</translation>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -575,14 +621,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>I can&apos;t delete file:
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Kodiererfehler:
@@ -593,6 +631,14 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation>Ich kann die Datei %1 nicht lesen</translation>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation>Datei kann nicht umbenannt werden:
+%1 zu %2
+%3</translation>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -641,17 +687,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>Ich kann die Datei nicht umbenennen:
-%1 zu %2
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -732,10 +767,6 @@
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Datei hinzufügen</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>CUE- oder Audiodatei hinzufügen</translation>
     </message>
@@ -784,14 +815,6 @@
         <translation>&amp;Über Flacon</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Album entfernen</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Album vom Projekt entfernen</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Strg+Entf</translation>
     </message>
@@ -909,7 +932,23 @@
 &lt;br&gt;&lt;br&gt;
 If you surround sections of text that contain a token with braces, these sections will be hidden if the token is empty.</source>
         <comment>Main form tooltip for &quot;Pattern&quot; edit</comment>
-        <translation type="unfinished"/>
+        <translation>&lt;style type=&quot;text/css&quot;&gt;
+.term {font-weight: bold;}
+.def  { white-space: nowrap; }
+&lt;/style&gt;
+Tokens starten mit %. Sie können folgende Tokens verwenden:
+&lt;table&gt;
+&lt;tr&gt;&lt;td class=&quot;term&quot;&gt;%n&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Stücknummer  &lt;/td&gt;
+        &lt;td class=&quot;term&quot;&gt;%N&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Gesamtzahl der Stücke&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;&lt;td class=&quot;term&quot;&gt;%a&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Interpret&lt;/td&gt;
+        &lt;td class=&quot;term&quot;&gt;%A&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Albumtitel&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;&lt;td class=&quot;term&quot;&gt;%t&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Stücktitel&lt;/td&gt;
+        &lt;td class=&quot;term&quot;&gt;%y&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Jahr&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;&lt;td class=&quot;term&quot;&gt;%g&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Genre&lt;/td&gt;
+        &lt;td class=&quot;term&quot;&gt;&lt;/td&gt; &lt;td class=&quot;def&quot;&gt;&lt;/td&gt;&lt;/tr&gt;
+&lt;/table&gt;
+&lt;br&gt;&lt;br&gt;
+Wenn Sie Textabschnitte umschließen, die ein Token mit Klammern enthalten, werden diese Abschnitte ausgeblendet, wenn das Token leer ist.</translation>
     </message>
     <message>
         <source>You can browse to the destination directory. You can also input it manually.
@@ -928,7 +967,7 @@
     <message>
         <source>Select cue file</source>
         <comment>OpenFile dialog title</comment>
-        <translation>Cue Sheet auswählen</translation>
+        <translation>CUE Sheet auswählen</translation>
     </message>
     <message>
         <source>Add cue or audio file</source>
@@ -939,6 +978,18 @@
         <source>Delete current pattern from history</source>
         <translation>Aktuelles Muster aus Chronik löschen</translation>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -968,15 +1019,15 @@
         <translation>Programmdatei auswählen</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
-        <translation>%1 Programm</translation>
-    </message>
-    <message>
         <source>All files</source>
         <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation>Alle Dateien</translation>
     </message>
+    <message>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
+        <translation>%1 Programm</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -990,7 +1041,7 @@
     </message>
     <message>
         <source> [disk %1]</source>
-        <translation> [Festplatte %1]</translation>
+        <translation> [Disk %1]</translation>
     </message>
     <message>
         <source>Flacon</source>
@@ -1031,12 +1082,35 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation>Audiodatei &lt;b&gt;&quot;%1&quot;&lt;/b&gt; ist nicht vorhanden</translation>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation>Verzeichnis &quot;%1&quot; kann nicht erstellt werden.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation>In Verzeichnis &quot;%1&quot; kann nicht gespeichert werden.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>Der Anzahl der Stücke ist höher als erwartet.</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation>&lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2 kann nicht gelesen werden</translation>
     </message>
 </context>
 <context>
@@ -1163,4 +1237,15 @@
 %1</translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation>Verzeichnis &quot;%1&quot; kann nicht erstellt werden.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation>In Verzeichnis &quot;%1&quot; kann nicht gespeichert werden.</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_es.ts -> flacon-4.0.0.tar.gz/translations/flacon_es.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>Parche de soporte de Wavpack</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Icono de aplicación, Empaquetado</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Empaquetado,  pruebas</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>El número de subprocesos en el proceso de conversión.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Directorio temporal:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Página de código predeterminada:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Pista pregap:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation>Crear una hoja CUE por pista</translation>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Directorio temporal:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Página de código predeterminada:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Configuración de la codificación Flac</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Compresión:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>Deshabilitado</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,57 +335,6 @@
         <translation>Preajuste:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation>&lt;dt&gt;VBR medio&lt;/dt&gt;
-&lt;dd&gt;Usando un Tasa de Bits Variable media, este preajuste debe ser casi transparente para la mayoría de gente y la mayoría de música.&lt;/dd&gt;
-
-&lt;dt&gt;VBR estándar, VBR estándar rápido&lt;/dt&gt;
-&lt;dd&gt;Usando un Tasa de Bits Variable estándar, este preajuste debería se transparente para la mayoría de la música y es ya un nivel alto de calidad.&lt;/dd&gt;
-
-&lt;dt&gt;VBR extremo, VBR extremo rápido&lt;/dt&gt;
-&lt;dd&gt;Usando el Tasa de Bits Variable más alta, este preajuste ofrece algo más de calidad si usted tiene muy buen oído o un equipo de audio de gama alta.&lt;/dd&gt;
-
-&lt;dt&gt;Calidad VBR&lt;/dt&gt;
-&lt;dd&gt;Este valor le permite establecer la calidad de salida.&lt;/dd&gt;
-
-&lt;dt&gt;opción rápida&lt;/dt&gt;
-&lt;dd&gt;Establece el nuevo VBR rápido para un fichero en particular. Recomendado.&lt;/dd&gt;
-
-&lt;dt&gt;CBR máximo&lt;/dt&gt;
-&lt;dd&gt;Si necesita la calidad más alta sin importar el tamaño del archivo, la conseguirá usando esta Tasa de Bits Constante.&lt;/dd&gt;
-
-&lt;dt&gt;CBR kbps&lt;/dt&gt;
-&lt;dd&gt;Usando esta Tasa de Bits Constante, el preajuste le dará una buena calidad al bitrate especificado.&lt;/dd&gt;
-
-&lt;dt&gt;ABR kbps&lt;/dt&gt;
-&lt;dd&gt;Usando esta Tasa de Bits Promedio, este preajuste le dará una calidad más alta que la Tasa de Bits Constante para una Tasa de Bits específica.&lt;/dd&gt;
-</translation>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Usar Tasa de Bits</translation>
     </message>
@@ -433,6 +398,34 @@
         <source>ABR kbps</source>
         <translation>ABR kbps</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -556,16 +549,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>No puedo crear el directorio &quot;%1&quot;.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>No es posible la conversión:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>No puedo escribir en el directorio &quot;%1&quot;.</translation>
+        <source>Select cover image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>No es posible la conversión:</translation>
+        <source>Without cover image</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -580,8 +576,8 @@
         <translation>%1 [ disco %2 ]</translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
-        <translation>El archivo CUE contiene información de multiples discos. ¿Cuál quieres usar?</translation>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -602,14 +598,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>No puedo borrar el archivo:
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Error de Codificador:
@@ -620,6 +608,12 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation>No puedo leer el archivo %1</translation>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -668,17 +662,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>No puedo renombrar el archivo:
-%1 a %2
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -759,10 +742,6 @@
         <translation>Ay&amp;uda</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Agregar archivo</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>Agregar CUE o archivo de audio</translation>
     </message>
@@ -811,14 +790,6 @@
         <translation>&amp;Acerca de Flacon</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Quitar álbum</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Quitar el álbum del proyecto</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Supr</translation>
     </message>
@@ -982,6 +953,18 @@
         <source>Delete current pattern from history</source>
         <translation>Eliminar el patrón actual del historial</translation>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -1011,15 +994,15 @@
         <translation>Seleccione archivo de programa</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
-        <translation>Programa %1</translation>
-    </message>
-    <message>
         <source>All files</source>
         <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation>Todos los archivos</translation>
     </message>
+    <message>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1074,12 +1057,35 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation>El archivo de audio &lt;b&gt;&quot;%1&quot;&lt;/b&gt; no existe</translation>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>El número de pistas es mayor del esperado.</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1206,4 +1212,15 @@
 %1</translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_es_MX.ts -> flacon-4.0.0.tar.gz/translations/flacon_es_MX.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_MX" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_MX" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>Parche de soporte WavPack</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Icono de aplicación, empaquetando</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Empaquetando, probando</translation>
     </message>
@@ -76,7 +72,7 @@
     </message>
     <message>
         <source>Flacon is translated into many languages thanks to the work of the Flacon translation teams on &lt;a href=&apos;%1&apos;&gt;Transifex&lt;/a&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Flacon es traducido a muchos idiomas gracias al trabajo de los equipos de traducción de Flacon en &lt;a href=&apos;%1&apos;&gt;Transifex&lt;/a&gt;.</translation>
     </message>
 </context>
 <context>
@@ -214,14 +210,6 @@
         <translation>El número de subprocesos en el proceso de conversión.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Directorio temporal:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Código de página predeterminado:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Primera pista pregap:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation>Crear hoja cue por pista</translation>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Directorio temporal:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Código de página predeterminado:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Configuración de codificación Flac</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Compresión:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>Deshabilitado</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,57 +335,6 @@
         <translation>Prestablecido:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation>&lt;dt&gt;VBR medio&lt;/dt&gt;
-&lt;dd&gt;Utilizando Tasa de Bits Variable promedio, esta configuración ofrece la transparencia suficiente para la mayoría de las personas y la mayoría de la música.&lt;/dd&gt;
-
-&lt;dt&gt;VBR estándar, VBR estándar rápido&lt;/dt&gt;
-&lt;dd&gt;Utilizando Tasa de Bits Variable estándar, esta configuración debería ser en general transparente para la mayoría de las personas y la mayoría de la música y es también bastante alta en calidad.&lt;/dd&gt;
-
-&lt;dt&gt;VBR extremo, VBR extremo rápido&lt;/dt&gt;
-&lt;dd&gt;Utilizando la Tasa de Bits más alta posible, esta configuración ofrece casi tan alta calidad como el modo estándar si se tiene un oído extremadamente bueno o un equipo de audio de alta gama.&lt;/dd&gt;
-
-&lt;dt&gt;calidad VBR&lt;/dt&gt;
-&lt;dd&gt;Esta opción para Tasa de Bits variable le permite especificar la calidad de salida.&lt;/dd&gt;
-
-&lt;dt&gt;opción rápida&lt;/dt&gt;
-&lt;dd&gt;Habilita el nuevo VBR rápido para un perfil en particular. Esta es la opción recomendada.&lt;/dd&gt;
-
-&lt;dt&gt;CBR insano&lt;/dt&gt;
-&lt;dd&gt;Si quiere obtener la más alta calidad sin importar el tamaño del archivo, puede lograrlo utilizando este modo de Tasa de Bits Constante.&lt;/dd&gt;
-
-&lt;dt&gt;CBR kbps&lt;/dt&gt;
-&lt;dd&gt;Utilizar esta configuración de Tasa de Bits Constante le dará buena calidad a una tasa de bits específica.&lt;/dd&gt;
-
-&lt;dt&gt;ABR kbps&lt;/dt&gt;
-&lt;dd&gt;Utilizar esta configuración de Tasa de Bits Promedio le dará por regla general una calidad superior a la opción de Tasa de Bits Constante para una tasa de bits específica.&lt;/dd&gt;
-</translation>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Usar bitrate</translation>
     </message>
@@ -433,6 +398,34 @@
         <source>ABR kbps</source>
         <translation>ABR kbps</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -556,23 +549,26 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>No pude crear el directorio &quot;%1&quot;;</translation>
+        <source>Conversion is not possible:</source>
+        <translation>La conversión no es posible:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>No pude escribir al directorio &quot;%1&quot;.</translation>
+        <source>Select cover image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>La conversión no es posible:</translation>
+        <source>Without cover image</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CueDiskSelectDialog</name>
     <message>
         <source>Select disk</source>
-        <translation>Seleccionar disco</translation>
+        <translation>Seleccione disco</translation>
     </message>
     <message>
         <source>%1 [ disk %2 ]</source>
@@ -580,8 +576,8 @@
         <translation>%1 [disco %2]</translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
-        <translation>El archivo cue contiene información de multiples discos. ¿Cuál disco quiere usar?</translation>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -602,14 +598,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>No pude borrar el archivo:
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Error de codificador:
@@ -618,7 +606,15 @@
     <message>
         <source>I can&apos;t read %1 file</source>
         <comment>Encoder error. %1 is a file name.</comment>
-        <translation>No se puede leer el archivo %1</translation>
+        <translation>No puedo leer el archivo %1</translation>
+    </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation>No puedo renombrar el archivo
+%1 a %2
+%3</translation>
     </message>
 </context>
 <context>
@@ -668,17 +664,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>No pude renombrar el archivo:
-%1 a %2
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -759,10 +744,6 @@
         <translation>A&amp;yuda</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Agregar archivo</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>Agregar archivo CUE o de audio</translation>
     </message>
@@ -811,14 +792,6 @@
         <translation>A&amp;cerca de Flacon</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Remover álbum</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Remover álbum de proyecto</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Supr</translation>
     </message>
@@ -958,7 +931,7 @@
 
 If the path is left empty or starts with &quot;.&quot; (dot), the result files will be placed in the same directory as the source.</source>
         <comment>Main form tooltip for &quot;Directory&quot; edit</comment>
-        <translation>Puede navegar al directorio destino. Puede además escribirla manualmente.
+        <translation>Puede navegar al directorio destino. Puede además escribirlo manualmente.
 
 Si la ruta queda vacía o inicia con &quot;.&quot; (punto), el archivo resultante será colocado en el mismo directorio que el archivo fuente.</translation>
     </message>
@@ -979,6 +952,18 @@
     </message>
     <message>
         <source>Delete current pattern from history</source>
+        <translation>Borrado el patrón actual del historial</translation>
+    </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1010,15 +995,15 @@
         <translation>Seleccionar un archivo de programa</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
-        <translation>Programa %1</translation>
-    </message>
-    <message>
         <source>All files</source>
         <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation>Todos los archivos</translation>
     </message>
+    <message>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
+        <translation>Programa %1</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1049,7 +1034,7 @@
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; is not a valid cue file. Disk %2 has no tags.</source>
-        <translation>&lt;b&gt;%1&lt;/b&gt; no es un archivo válido. Disco %2 no tiene etiquetas.</translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; no es un archivo cue válido. Disco %2 no tiene etiquetas.</translation>
     </message>
     <message>
         <source>The audio file name is not set</source>
@@ -1073,12 +1058,35 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation>El archivo de audio &lt;b&gt;&quot;%1&quot;&lt;/b&gt; no existe</translation>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation>No puedo crear el directorio &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation>No puedo escribir en el directorio &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>El número de tracks es mayor al esperado.</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation>No puedo leer &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
     </message>
 </context>
 <context>
@@ -1205,4 +1213,15 @@
 %1</translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation>No puedo crear el directorio &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation>No puedo escribir el en directorio &quot;%1&quot;.</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_et.ts -> flacon-4.0.0.tar.gz/translations/flacon_et.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="et" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="et" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation type="unfinished"/>
     </message>
@@ -214,14 +210,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation type="unfinished"/>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation type="unfinished"/>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>Keelatud</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,34 +335,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation type="unfinished"/>
     </message>
@@ -410,6 +398,34 @@
         <source>ABR kbps</source>
         <translation>ABR kbps</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -524,15 +540,18 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <source>Conversion is not possible:</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <source>Select cover image</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
+        <source>Without cover image</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -548,7 +567,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -570,12 +589,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Kodeerija viga:
@@ -586,6 +599,12 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -630,15 +649,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -718,10 +728,6 @@
         <translation>&amp;Abi</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Lisa fail</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation type="unfinished"/>
     </message>
@@ -770,14 +776,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Eemalda album</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Del</translation>
     </message>
@@ -922,6 +920,18 @@
         <source>Delete current pattern from history</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -951,13 +961,13 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
+        <source>All files</source>
+        <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1014,11 +1024,34 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1145,4 +1178,15 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_fr.desktop -> flacon-4.0.0.tar.gz/translations/flacon_fr.desktop Changed

flacon-3.1.1.tar.gz/translations/flacon_fr.ts -> flacon-4.0.0.tar.gz/translations/flacon_fr.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -27,43 +27,39 @@
     </message>
     <message>
         <source>Homepage: %1</source>
-        <translation>Page d&apos;accueil : %1</translation>
+        <translation>Page d’accueil : %1</translation>
     </message>
     <message>
         <source>License: %1</source>
-        <translation>Licence : %1</translation>
+        <translation>Licence : %1</translation>
     </message>
     <message>
         <source>Special thanks to:</source>
-        <translation>Un grand merci à :</translation>
+        <translation>Un grand merci à :</translation>
     </message>
     <message>
         <source>Flacon uses external programs. Many thanks to their authors!</source>
-        <translation>Flacon utilise des programmes externes. Merci mille fois à leurs auteurs !</translation>
+        <translation>Flacon utilise des programmes externes. Nous tenons à remercier leurs auteurs !</translation>
     </message>
     <message>
         <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>
+        <translation>Extrait individuellement les pistes d’un fichier audio volumineux contenant l’album entier.</translation>
     </message>
     <message>
         <source>Copyright: %1-%2 %3</source>
-        <translation>Tous droits réservés : %1-%2 %3</translation>
+        <translation>Tous droits réservés : %1-%2 %3</translation>
     </message>
     <message>
         <source>WavPack support patch</source>
         <translation>Correctif de prise en charge WavPack</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Icône et mise en forme</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Mise en forme et tests</translation>
     </message>
     <message>
         <source>Improvements in the UI</source>
-        <translation>Améliorations de l&apos;IU</translation>
+        <translation>Améliorations de l’IU</translation>
     </message>
     <message>
         <source>Flacon account on github.com</source>
@@ -72,7 +68,7 @@
     <message>
         <source>Bug tracker %1</source>
         <comment>About dialog, About tab</comment>
-        <translation>Gestionnaire de bogues : %1</translation>
+        <translation>Gestionnaire de bogues : %1</translation>
     </message>
     <message>
         <source>Flacon is translated into many languages thanks to the work of the Flacon translation teams on &lt;a href=&apos;%1&apos;&gt;Transifex&lt;/a&gt;.</source>
@@ -207,27 +203,19 @@
     </message>
     <message>
         <source>Thread count:</source>
-        <translation>Nombre de fils :</translation>
+        <translation>Nombre de fils :</translation>
     </message>
     <message>
         <source>The number of threads in the conversion process.</source>
-        <translation>Nombre de fils d&apos;exécution dans le processus de conversion.</translation>
-    </message>
-    <message>
-        <source>Temporary directory:</source>
-        <translation>Répertoire temporaire :</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Page de code par défaut :</translation>
+        <translation>Nombre de fils d’exécution dans le processus de conversion.</translation>
     </message>
     <message>
         <source>First track pregap:</source>
-        <translation>Présilence de la première piste : </translation>
+        <translation>Présilence de la première piste : </translation>
     </message>
     <message>
         <source>Rescan</source>
-        <translation>Rebalayer</translation>
+        <translation>Réanalyser</translation>
     </message>
     <message>
         <source>Full path of the external applications</source>
@@ -251,7 +239,7 @@
     </message>
     <message>
         <source>Select temporary directory</source>
-        <translation>Choisir le répertoire temporaire</translation>
+        <translation>Sélectionner un répertoire temporaire</translation>
     </message>
     <message>
         <source>Per track cue sheet</source>
@@ -261,12 +249,40 @@
         <source>Create per track cue sheet</source>
         <translation>Créer un fichier cue par piste</translation>
     </message>
+    <message>
+        <source> px</source>
+        <translation> px</translation>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Répertoire temporaire :</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Page de code par défaut :</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation>Image de couverture</translation>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation>Ne pas copier l’image</translation>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation>Garder la taille originale de l’image</translation>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation>Redimensionner si la taille de l’image est supérieure à</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
     <message>
         <source>AAC encoding configuration</source>
-        <translation>Configuration de l&apos;encodage AAC</translation>
+        <translation>Configuration de l’encodage AAC</translation>
     </message>
     <message>
         <source>Use quality setting (recommended)</source>
@@ -278,7 +294,7 @@
     </message>
     <message>
         <source>Bitrate:</source>
-        <translation>Débit binaire :</translation>
+        <translation>Débit binaire :</translation>
     </message>
     <message>
         <source>Sets target bitrate (in kb/s).</source>
@@ -288,12 +304,8 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Configuration de l&apos;encodage Flac</translation>
-    </message>
-    <message>
         <source>Compression:</source>
-        <translation>Compression :</translation>
+        <translation>Compression :</translation>
     </message>
     <message>
         <source>ReplayGain</source>
@@ -301,72 +313,26 @@
     </message>
     <message>
         <source>Calculate gain:</source>
-        <translation>Calculer le gain :</translation>
+        <translation>Calculer le gain :</translation>
     </message>
     <message>
         <source>Disabled</source>
         <translation>Désactivé</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation>Configuration de l’encodage FLAC</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
     <message>
         <source>MP3 encoding configuration</source>
-        <translation>Configuration de l&apos;encodage MP3</translation>
+        <translation>Configuration de l’encodage MP3</translation>
     </message>
     <message>
         <source>Preset:</source>
-        <translation>Préréglage :</translation>
-    </message>
-    <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation>&lt;dt&gt;DBV moyen&lt;/dt&gt;
-&lt;dd&gt;En utilisant un Débit Binaire Variable moyen, cette présélection devrait fournir une quasi-transparence à la plupart des personnes pour la plupart des musiques.&lt;/dd&gt;
-
-&lt;dt&gt;DBV standard, DBV standard rapide&lt;/dt&gt;
-&lt;dd&gt;En utilisant un Débit Binaire Variable standard, ces présélections devraient être transparentes pour la plupart des personnes et la plupart des musiques. Elles donnent déjà des résultats de haute qualité.&lt;/dd&gt;
-
-&lt;dt&gt;DBV extrême, DBV extrême rapide&lt;/dt&gt;
-&lt;dd&gt;En utilisant le plus haut Débit Binaire Variable possible, ces présélections fournissent une qualité légèrement supérieure au mode standard si vous avez une très bonne oreille et un équipement audio haut de gamme .&lt;/dd&gt;
-
-&lt;dt&gt;DBV qualité&lt;/dt&gt;
-&lt;dd&gt;Cette option à Débit Binaire Variable vous permet de choisir la qualité du niveau de sortie.&lt;/dd&gt;
-
-&lt;dt&gt;option rapide&lt;/dt&gt;
-&lt;dd&gt;Active la nouvelle option DBV rapide pour un profil donné. Cela est recommandé.&lt;/dd&gt;
-
-&lt;dt&gt;DBC insensé&lt;/dt&gt;
-&lt;dd&gt;Si vous devez obtenir la plus haute qualité sans vous soucier de la taille du fichier, vous l&apos;obtiendrez en utilisant ce Débit Binaire Constant.&lt;/dd&gt;
-
-&lt;dt&gt;DBC kbit/s&lt;/dt&gt;
-&lt;dd&gt;Cette présélection à Débit Binaire Constant vous donnera généralement une bonne qualité pour un débit donné.&lt;/dd&gt;
-
-&lt;dt&gt;DBM kbit/s&lt;/dt&gt;
-&lt;dd&gt;Cette présélection à Débit Binaire Moyen vous donnera généralement une meilleure qualité pour un débit donné qu&apos;en utilisant l&apos;option à Débit Binaire Constant.&lt;/dd&gt;</translation>
+        <translation>Préréglage :</translation>
     </message>
     <message>
         <source>Use bitrate</source>
@@ -374,7 +340,7 @@
     </message>
     <message>
         <source>Bitrate:</source>
-        <translation>Débit binaire :</translation>
+        <translation>Débit binaire :</translation>
     </message>
     <message>
         <source>Sets target bitrate (in kb/s).</source>
@@ -386,7 +352,7 @@
     </message>
     <message>
         <source>Quality:</source>
-        <translation>Qualité :</translation>
+        <translation>Qualité :</translation>
     </message>
     <message>
         <source>ReplayGain</source>
@@ -394,7 +360,7 @@
     </message>
     <message>
         <source>Calculate gain:</source>
-        <translation>Calculer le gain :</translation>
+        <translation>Calculer le gain :</translation>
     </message>
     <message>
         <source>VBR medium</source>
@@ -432,12 +398,62 @@
         <source>ABR kbps</source>
         <translation>DBM kbit/s</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation>&lt;dt&gt;DBV moyen&lt;/dt&gt;
+&lt;dd&gt;En utilisant un Débit Binaire Variable moyen, cette présélection devrait fournir une quasi transparence à la plupart des personnes pour la plupart des musiques.&lt;/dd&gt;
+
+&lt;dt&gt;DBV standard, DBV standard rapide&lt;/dt&gt;
+&lt;dd&gt;En utilisant un Débit Binaire Variable standard, ces présélections devraient être transparentes pour la plupart des personnes et la plupart des musiques, et donnent déjà des résultats de haute qualité.&lt;/dd&gt;
+
+&lt;dt&gt;DBV extrême, DBV extrême rapide&lt;/dt&gt;
+&lt;dd&gt;En utilisant le plus haut Débit Binaire Variable possible, ces préselections fournissent une qualité légèrement supérieure au mode standard si vous avec une très bonne ouïe et un équipement audio haut de gamme.&lt;/dd&gt;
+
+&lt;dt&gt;DBV qualité&lt;/dt&gt;
+&lt;dd&gt;Cette option à Débit Binaire Variable vous permet de choisir le niveau final de qualité.&lt;/dd&gt;
+
+&lt;dt&gt;option rapide&lt;/dt&gt;
+&lt;dd&gt;Active la nouvelle option DBV rapide pour un profil donné. Ceci est recommandé.&lt;/dd&gt;
+
+&lt;dt&gt;DBC insensé&lt;/dt&gt;
+&lt;dd&gt;Si vous devez obtenir la plus haute qualité sans vous soucier de la taille du fichier, vous l’obtiendrez en utilisant ce Débit Binaire Constant.&lt;/dd&gt;
+
+&lt;dt&gt;DBC kbit/s&lt;/dt&gt;
+&lt;dd&gt;Cette préselection à Débit Binaire Constant vous donnera généralement une bonne qualité pour un débit donné.&lt;/dd&gt;
+
+&lt;dt&gt;&gt;DBM kbit&lt;/dt&gt;
+&lt;dd&gt;Cette présélection à Débit Binaire Moyen vous donnera généralement une meilleure qualité pour un débit donné qu’en utilisant l’option à Débit Binaire Constant.&lt;/dd&gt;</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
     <message>
         <source>Ogg encoding configuration</source>
-        <translation>Configuration de l&apos;encodage Ogg</translation>
+        <translation>Configuration de l’encodage Ogg</translation>
     </message>
     <message>
         <source>Use quality setting (recommended)</source>
@@ -449,7 +465,7 @@
     </message>
     <message>
         <source>Minimal bitrate:</source>
-        <translation>Débit binaire minimum :</translation>
+        <translation>Débit binaire minimum :</translation>
     </message>
     <message>
         <source>Sets minimum bitrate (in kb/s).</source>
@@ -457,7 +473,7 @@
     </message>
     <message>
         <source>Nominal bitrate:</source>
-        <translation>Débit binaire nominal :</translation>
+        <translation>Débit binaire nominal :</translation>
     </message>
     <message>
         <source>Sets target bitrate (in kb/s).</source>
@@ -477,22 +493,22 @@
     </message>
     <message>
         <source>Calculate gain:</source>
-        <translation>Calculer le gain :</translation>
+        <translation>Calculer le gain :</translation>
     </message>
 </context>
 <context>
     <name>ConfigPage_Opus</name>
     <message>
         <source>Opus encoding configuration</source>
-        <translation>Configuration de l&apos;encodage Opus</translation>
+        <translation>Configuration de l’encodage Opus</translation>
     </message>
     <message>
         <source>Bitrate type:</source>
-        <translation>Type de débit binaire :</translation>
+        <translation>Type de débit binaire :</translation>
     </message>
     <message>
         <source>Bitrate:</source>
-        <translation>Débit binaire :</translation>
+        <translation>Débit binaire :</translation>
     </message>
     <message>
         <source>VBR - variable bitrate</source>
@@ -509,10 +525,10 @@
 &lt;dt&gt;CBR&lt;/dt&gt;
 &lt;dd&gt;Use constrained variable bitrate encoding. Outputs to a specific bitrate. This mode is analogous to CBR in AAC/MP3 encoders and managed mode in vorbis coders. This delivers less consistent quality than VBR mode but consistent bitrate.&lt;/dd&gt;</source>
         <translation>&lt;dt&gt;DBV&lt;/dt&gt;
-&lt;dd&gt;Utiliser un encodage à Débit Binaire Variable (recommandé). En mode DBV, le débit binaire peut fluctuer librement d&apos;après le contenu afin d&apos;assurer une qualité constante.&lt;/dd&gt;
+&lt;dd&gt;Utiliser un encodage à Débit Binaire Variable (recommandé). En mode DBV, le débit binaire peut fluctuer librement d’après le contenu afin d’assurer une qualité constante.&lt;/dd&gt;
 
 &lt;dt&gt;DBC&lt;/dt&gt;
-&lt;dd&gt;Utiliser un encodage à Débit Variable Contraint. Génère un débit binaire spécifique. Ce mode est semblable au mode DBC des encodeurs AAC/MP3 et au mode géré des encodeurs Vorbis. Le qualité n&apos;est pas aussi constante qu&apos;en mode DBV, mais le débit binaire l&apos;est.&lt;/dd&gt;</translation>
+&lt;dd&gt;Utiliser un encodage à Débit Variable Contraint. Génère un débit binaire spécifique. Ce mode est semblable au mode DBC des encodeurs AAC/MP3 et au mode géré des encodeurs Vorbis. La qualité n’est pas aussi constante qu’en mode DBV, mais le débit binaire l’est.&lt;/dd&gt;</translation>
     </message>
     <message>
         <source>Sets the target bitrate in kb/s (6-256 per channel).
@@ -533,11 +549,11 @@
     <name>ConfigPage_Wv</name>
     <message>
         <source>WavPack encoding configuration</source>
-        <translation>Configuration de l&apos;encodage WavPack</translation>
+        <translation>Configuration de l’encodage WavPack</translation>
     </message>
     <message>
         <source>Compression:</source>
-        <translation>Compression :</translation>
+        <translation>Compression :</translation>
     </message>
     <message>
         <source>ReplayGain</source>
@@ -545,7 +561,7 @@
     </message>
     <message>
         <source>Calculate gain:</source>
-        <translation>Calculer le gain :</translation>
+        <translation>Calculer le gain :</translation>
     </message>
     <message>
         <source>Disabled</source>
@@ -555,23 +571,26 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>Je ne peux pas créer le répertoire « %1 ».</translation>
+        <source>Conversion is not possible:</source>
+        <translation>La conversion est impossible :</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>Je ne peux pas écrire dans le répertoire « %1 ».</translation>
+        <source>Select cover image</source>
+        <translation>Sélectionner l’image de couverture</translation>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>La conversion est impossible :</translation>
+        <source>Without cover image</source>
+        <translation>Sans image de couverture</translation>
     </message>
 </context>
 <context>
     <name>CueDiskSelectDialog</name>
     <message>
         <source>Select disk</source>
-        <translation>Choisir un disque</translation>
+        <translation>Sélectionner un disque</translation>
     </message>
     <message>
         <source>%1 [ disk %2 ]</source>
@@ -579,39 +598,31 @@
         <translation>%1 [ disque %2 ]</translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
-        <translation>Le fichier cue contient des informations concernant plusieurs disques. Quel disque voulez-vous utiliser ?</translation>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
+        <translation>Le fichier CUE contient des informations concernant plusieurs disques. Quel disque voulez-vous utiliser ?</translation>
     </message>
 </context>
 <context>
     <name>Disk</name>
     <message>
         <source>Audio file not set.</source>
-        <translation>Fichier audio non défini.</translation>
+        <translation>Le fichier audio n’est pas défini.</translation>
     </message>
     <message>
         <source>Cue file not set.</source>
-        <translation>Fichier cue non défini.</translation>
+        <translation>Le fichier cue n’est pas défini.</translation>
     </message>
     <message>
         <source>Audio file shorter than expected from cue sheet.</source>
-        <translation>Le fichier audio est plus court que prévu d&apos;après le fichier cue.</translation>
+        <translation>Le fichier audio est plus court que prévu d’après le fichier cue.</translation>
     </message>
 </context>
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>Je ne peux pas supprimer le fichier :
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
-        <translation>Erreur de l&apos;encodeur :
+        <translation>Erreur d’encodeur :
 </translation>
     </message>
     <message>
@@ -619,12 +630,20 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation>Je ne peux pas lire le fichier %1</translation>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation>Je ne peux pas renommer le fichier :
+%1 en %2
+%3</translation>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
     <message>
         <source>Sets encoding quality, between %1 (lowest) and %2 (highest).</source>
-        <translation>Définit la qualité d&apos;encodage entre %1 (la plus basse) et %2 (la plus élevée).</translation>
+        <translation>Définit la qualité d’encodage entre %1 (la plus basse) et %2 (la plus élevée).</translation>
     </message>
     <message>
         <source>Sets compression level, between %1 (fastest) and %2 (highest compression).
@@ -652,10 +671,10 @@
 
 The analysis can be performed on individual tracks, so that all tracks will be of equal volume on playback. 
 Using the album-gain analysis will preserve the volume differences within an album.</source>
-        <translation>ReplayGain est une norme permettant d&apos;égaliser l&apos;intensité perçue du son des formats de fichiers audio sur ordinateur.
+        <translation>ReplayGain est une norme permettant d’égaliser l’intensité perçue du son des formats de fichiers audio sur ordinateur.
 
-L&apos;analyse peut être effectuée sur des pistes individuelles de manière à ce que toutes les pistes soient jouées à un volume sonore équivalent.
-L&apos;utilisation de l&apos;analyse par album permet de préserver les différences de volume pour un même album.</translation>
+L’analyse peut être effectuée sur des pistes individuelles de manière à ce que toutes les pistes soient jouées à un volume sonore équivalent.
+L’utilisation de l’analyse par album permet de préserver les différences de volume pour un même album.</translation>
     </message>
     <message>
         <source>%1 kbps</source>
@@ -667,22 +686,11 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>Je ne peux pas renommer le fichier :
- %1 en %2
- %3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
 </source>
-        <translation>Erreur de gain :</translation>
+        <translation>Erreur de gain :</translation>
     </message>
 </context>
 <context>
@@ -697,15 +705,15 @@
     </message>
     <message>
         <source>Directory:</source>
-        <translation>Répertoire :</translation>
+        <translation>Répertoire :</translation>
     </message>
     <message>
         <source>Pattern:</source>
-        <translation>Modèle :</translation>
+        <translation>Modèle :</translation>
     </message>
     <message>
         <source>Format:</source>
-        <translation>Format :</translation>
+        <translation>Format :</translation>
     </message>
     <message>
         <source>Output format</source>
@@ -718,7 +726,7 @@
     </message>
     <message>
         <source>Genre:</source>
-        <translation>Genre :</translation>
+        <translation>Genre :</translation>
     </message>
     <message>
         <source>Year:</source>
@@ -726,23 +734,23 @@
     </message>
     <message>
         <source>Artist:</source>
-        <translation>Artiste :</translation>
+        <translation>Artiste :</translation>
     </message>
     <message>
         <source>Album:</source>
-        <translation>Album :</translation>
+        <translation>Album :</translation>
     </message>
     <message>
         <source>Start num:</source>
-        <translation>Premier numéro :</translation>
+        <translation>Premier numéro :</translation>
     </message>
     <message>
         <source>Disc ID:</source>
-        <translation>ID de disque :</translation>
+        <translation>ID de disque :</translation>
     </message>
     <message>
         <source>Codepage:</source>
-        <translation>Page de codes :</translation>
+        <translation>Page de codes :</translation>
     </message>
     <message>
         <source>&amp;File</source>
@@ -757,10 +765,6 @@
         <translation>&amp;Aide</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Ajouter un fichier</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>Ajouter un fichier cue ou audio</translation>
     </message>
@@ -809,36 +813,28 @@
         <translation>&amp;À propos de Flacon</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Enlever l&apos;album</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Enlever l&apos;album du projet</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Suppr</translation>
     </message>
     <message>
         <source>Configure encoder</source>
-        <translation>Configurer l&apos;encodeur</translation>
+        <translation>Configurer l’encodeur</translation>
     </message>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation>…</translation>
     </message>
     <message>
         <source>Select result directory</source>
-        <translation>Choisir le répertoire de destination</translation>
+        <translation>Sélectionner le répertoire de destination</translation>
     </message>
     <message>
         <source>Get from CDDB</source>
-        <translation>Récupérer sur CDDB</translation>
+        <translation>Obtenir sur CDDB</translation>
     </message>
     <message>
         <source>Get album information from CDDB</source>
-        <translation>Obtenir les informations de l&apos;album sur CDDB</translation>
+        <translation>Obtenir les informations de l’album sur CDDB</translation>
     </message>
     <message>
         <source>Ctrl+I</source>
@@ -846,45 +842,45 @@
     </message>
     <message>
         <source>Scan</source>
-        <translation>Balayer</translation>
+        <translation>Analyser</translation>
     </message>
     <message>
         <source>Recursive album search</source>
-        <translation>Recherche récursive d&apos;albums</translation>
+        <translation>Recherche récursive d’albums</translation>
     </message>
     <message>
         <source>Insert &quot;Track number&quot;</source>
-        <translation>Insérer le « Numéro de piste »</translation>
+        <translation>Insérer le « Numéro de piste »</translation>
     </message>
     <message>
         <source>Insert &quot;Total number of tracks&quot;</source>
-        <translation>Insérer le « Nombre total de pistes »</translation>
+        <translation>Insérer le « Nombre total de pistes »</translation>
     </message>
     <message>
         <source>Insert &quot;Artist&quot;</source>
-        <translation>Insérer l&apos;« Artiste »</translation>
+        <translation>Insérer l’« Artiste »</translation>
     </message>
     <message>
         <source>Insert &quot;Album title&quot;</source>
-        <translation>Insérer le « Titre de l&apos;album »</translation>
+        <translation>Insérer le « Titre de l’album »</translation>
     </message>
     <message>
         <source>Insert &quot;Track title&quot;</source>
-        <translation>Insérer le « Titre de la piste »</translation>
+        <translation>Insérer le « Titre de la piste »</translation>
     </message>
     <message>
         <source>Insert &quot;Year&quot;</source>
-        <translation>Insérer l&apos;« Année »</translation>
+        <translation>Insérer l’« Année »</translation>
     </message>
     <message>
         <source>Insert &quot;Genre&quot;</source>
-        <translation>Insérer le « Genre »</translation>
+        <translation>Insérer le « Genre »</translation>
     </message>
     <message>
         <source>Some albums will not be converted, they contain errors.
 Do you want to continue?</source>
         <translation>Certains albums ne seront pas convertis, ils contiennent des erreurs.
-Voulez-vous continuer ?</translation>
+Voulez-vous continuer ?</translation>
     </message>
     <message>
         <source>%1 files</source>
@@ -904,11 +900,11 @@
     <message>
         <source>Select audio file</source>
         <comment>OpenFile dialog title</comment>
-        <translation>Choisir le fichier audio</translation>
+        <translation>Sélectionner le fichier audio</translation>
     </message>
     <message>
         <source>Select directory</source>
-        <translation>Choisir un répertoire</translation>
+        <translation>Sélectionner un répertoire</translation>
     </message>
     <message>
         <source>Flacon</source>
@@ -938,12 +934,12 @@
  .term {font-weight: bold;}
  .def { white-space: nowrap; }
  &lt;/style&gt;
-Les marqueurs commencent par %. Vous pouvez utiliser les marqueurs suivants :
+Les marqueurs commencent par %. Vous pouvez utiliser les marqueurs suivants :
  &lt;table&gt;
  &lt;tr&gt;&lt;td class=&quot;term&quot;&gt;%n&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Numéro de piste &lt;/td&gt;
  &lt;td class=&quot;term&quot;&gt;%N&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Nombre total de pistes&lt;/td&gt;&lt;/tr&gt;
  &lt;tr&gt;&lt;td class=&quot;term&quot;&gt;%a&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Artiste&lt;/td&gt;
- &lt;td class=&quot;term&quot;&gt;%A&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Titre de l&apos;album&lt;/td&gt;&lt;/tr&gt;
+ &lt;td class=&quot;term&quot;&gt;%A&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Titre de l’album&lt;/td&gt;&lt;/tr&gt;
  &lt;tr&gt;&lt;td class=&quot;term&quot;&gt;%t&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Titre de la piste&lt;/td&gt;
 &lt;td class=&quot;term&quot;&gt;%y&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Année&lt;/td&gt;&lt;/tr&gt;
  &lt;tr&gt;&lt;td class=&quot;term&quot;&gt;%g&lt;/td&gt; &lt;td class=&quot;def&quot;&gt; - Genre&lt;/td&gt;
@@ -959,12 +955,12 @@
         <comment>Main form tooltip for &quot;Directory&quot; edit</comment>
         <translation>Vous pouvez naviguer vers le répertoire de destination. Vous pouvez aussi le saisir manuellement.
 
-Si le chemin est laissé vide ou commence par « . » (point), les fichiers de sortie seront placés dans le même répertoire que la source.</translation>
+Si le chemin est laissé vide ou commence par « . » (point), les fichiers de sortie seront placés dans le même répertoire que la source.</translation>
     </message>
     <message>
         <source>Use &quot;%1&quot;</source>
         <comment>Predefined out file pattern, string like 'Use &quot;%a/%A/%n - %t&quot;'</comment>
-        <translation>Utiliser « %1 »</translation>
+        <translation>Utiliser « %1 »</translation>
     </message>
     <message>
         <source>Select cue file</source>
@@ -974,11 +970,23 @@
     <message>
         <source>Add cue or audio file</source>
         <comment>OpenFile dialog title</comment>
-        <translation>Ajoute un fichier cue ou audio</translation>
+        <translation>Ajouter un fichier cue ou audio</translation>
     </message>
     <message>
         <source>Delete current pattern from history</source>
-        <translation>Supprimer le modèle actuel de l&apos;historique</translation>
+        <translation>Supprimer le modèle actuel de l’historique</translation>
+    </message>
+    <message>
+        <source>Add disk</source>
+        <translation>Ajouter un disque</translation>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation>Supprimer le disque</translation>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation>Supprimer le disque du projet</translation>
     </message>
 </context>
 <context>
@@ -1006,28 +1014,28 @@
     <name>ProgramEdit</name>
     <message>
         <source>Select program file</source>
-        <translation>Choisir le fichier de programme</translation>
-    </message>
-    <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
-        <translation>Programme %1</translation>
+        <translation>Sélectionner le fichier de programme</translation>
     </message>
     <message>
         <source>All files</source>
         <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation>Tous les fichiers</translation>
     </message>
+    <message>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
+        <translation>programme %1</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>I can&apos;t find program &lt;b&gt;%1&lt;/b&gt;.</source>
-        <translation>Je ne peux pas trouver le programme &lt;b&gt;%1&lt;/b&gt;.</translation>
+        <translation>Je ne peux pas trouver le programme &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
         <source>File &lt;b&gt;%1&lt;/b&gt; is not a supported audio file. &lt;br&gt;&lt;br&gt;Verify that all required programs are installed and in your preferences.</source>
-        <translation>Le fichier &lt;b&gt;%1&lt;/b&gt; n&apos;est pas un fichier audio pris en charge. &lt;br&gt;&lt;br&gt;Vérifiez que tous les programmes requis sont installés, et vérifiez aussi vos préférences.</translation>
+        <translation>Le fichier &lt;b&gt;%1&lt;/b&gt; n’est pas un fichier audio pris en charge. &lt;br&gt;&lt;br&gt;Vérifiez que tous les programmes requis sont installés, et vérifiez aussi vos préférences.</translation>
     </message>
     <message>
         <source> [disk %1]</source>
@@ -1040,44 +1048,67 @@
     </message>
     <message>
         <source>I can&apos;t write cue file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
-        <translation>Je ne peux pas écrire le fichier cue &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2.</translation>
+        <translation>Je ne peux pas écrire le fichier cue &lt;b&gt;%1&lt;/b&gt; : &lt;br&gt;%2</translation>
     </message>
     <message>
         <source>File &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
-        <translation>Le fichier &lt;b&gt;« %1 »&lt;/b&gt; n&apos;existe pas</translation>
+        <translation>Le fichier &lt;b&gt;« %1 »&lt;/b&gt; n’existe pas</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; is not a valid cue file. Disk %2 has no tags.</source>
-        <translation>&lt;b&gt;%1&lt;/b&gt; n&apos;est pas un fichier cue valide. Le disque %2 n&apos;a pas de balise.</translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; n’est pas un fichier cue valide. Le disque %2 n’a pas de balise.</translation>
     </message>
     <message>
         <source>The audio file name is not set</source>
-        <translation>Le nom du fichier audio n&apos;est pas défini</translation>
+        <translation>Le nom du fichier audio n’est pas défini</translation>
     </message>
     <message>
         <source>you can&apos;t use &apos;ReplayGain&apos; for files with sample rates above 48kHz. Metaflac doesn&apos;t support such files.</source>
         <comment>This string should begin with a lowercase letter. This is a part of the complex sentence.</comment>
-        <translation>vous ne pouvez pas utiliser « ReplayGain » pour des fichiers dont le débit d’échantillonnage est supérieur à 48 kHz. Metaflac ne prend pas ces fichiers en charge.</translation>
+        <translation>vous ne pouvez pas utiliser « ReplayGain » pour les fichiers dont le débit d’échantillonnage est supérieur à 48 kHz. Metaflac ne prend pas ces fichiers en charge.</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; is not a valid cue file. The cue sheet has no FILE tag.</source>
-        <translation>&lt;b&gt;%1&lt;/b&gt; n&apos;est pas un fichier cue valide. Il n&apos;as pas de balise FILE.</translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; n’est pas un fichier cue valide. Il n’a pas de balise FILE.</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; is not a valid cue file. Incorrect track index at %2.</source>
         <comment>Cue parser error. %2 is file position</comment>
-        <translation>&lt;b&gt;%1&lt;/b&gt; n&apos;est pas un fichier cue valide. Index de piste erroné en %2.</translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; n’est pas un fichier cue valide. Index de piste erroné en %2.</translation>
     </message>
     <message>
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
-        <translation>Le fichier audio &lt;b&gt;« %1 »&lt;/b&gt; n&apos;existe pas</translation>
+        <translation>Le fichier audio &lt;b&gt;« %1 »&lt;/b&gt; n’existe pas</translation>
+    </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation>Je ne peux pas créer le répertoire « %1 »</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation>Je ne peux pas écrire dans le répertoire « %1 »</translation>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation>Je ne peux pas copier le fichier de la couverture &lt;b&gt;%1&lt;/b&gt; : &lt;br&gt;%2</translation>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation>Je ne peux pas lire l’image de couverture &lt;b&gt;%1&lt;/b&gt; : &lt;br&gt;%2</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation>Je ne peux pas écrire l’image de couverture &lt;b&gt;%1&lt;/b&gt; : &lt;br&gt;%2</translation>
     </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>Il y a plus de pistes que prévu.</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation>Je ne peux pas lire &lt;b&gt;%1&lt;/b&gt; : &lt;br&gt;%2</translation>
     </message>
 </context>
 <context>
@@ -1092,11 +1123,11 @@
     </message>
     <message>
         <source>Select another audio file</source>
-        <translation>Choisir un autre fichier audio</translation>
+        <translation>Sélectionner un autre fichier audio</translation>
     </message>
     <message>
         <source>Select another cue file</source>
-        <translation>Choisir un autre fichier cue</translation>
+        <translation>Sélectionner un autre fichier cue</translation>
     </message>
 </context>
 <context>
@@ -1131,7 +1162,7 @@
     </message>
     <message>
         <source>Wait gain</source>
-        <translation>Attente du gain</translation>
+        <translation>En attente du gain</translation>
     </message>
     <message>
         <source>Write gain</source>
@@ -1139,11 +1170,11 @@
     </message>
     <message>
         <source>Tracks:</source>
-        <translation>Pistes :</translation>
+        <translation>Pistes :</translation>
     </message>
     <message>
         <source>Audio:</source>
-        <translation>Audio :</translation>
+        <translation>Audio :</translation>
     </message>
 </context>
 <context>
@@ -1204,4 +1235,15 @@
 %1</translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation>Je ne peux pas créer le répertoire « %1 »</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation>Je ne peux pas écrire dans le répertoire « %1 »</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_gl.ts -> flacon-4.0.0.tar.gz/translations/flacon_gl.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="gl" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="gl" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>Parche para a compatibilidade con WavPack</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Icona do aplicativo, Empaquetamento</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Empaquetamento, provas</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>O número de fíos do proceso de conversión.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Directorio temporal:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Xogo de caracteres predeterminado:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Salto inicial para a primeira pista:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Directorio temporal:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Xogo de caracteres predeterminado:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Configuración da codificación FLAC</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Compresión:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>Desactivado</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,57 +335,6 @@
         <translation>Predefinición:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation>&lt;dt&gt;VBR media&lt;/dt&gt;
-&lt;dd&gt;Ao usar unha taxa de bits variábel de media, esta predefinición proporciona unha aproximación á transparencia para a maioría das persoas e músicas.&lt;/dd&gt;
-
-&lt;dt&gt;VBR estándar e VBR estándar rápido&lt;/dt&gt;
-&lt;dd&gt;Ao usar unha taxa de bits variábel estándar, esta predefinición debería ser  normalmente transparente para a maior parte das persoas coa maior parte das músicas e é igualmente alta en calidade.&lt;/dd&gt;
-
-&lt;dt&gt;VBR extrema, VBR extrema rápida&lt;/dt&gt;
-&lt;dd&gt;Ao usar a taxa de bits variábel máis alta posíbel, esta predefinición unha calidade algo maior do que a do modo estándar, en caso de ter un ouvido extremadamente bo ou un equipo de son de alta calidade.&lt;/dd&gt;
-
-&lt;dt&gt;VBR calidade&lt;/dt&gt;
-&lt;dd&gt;Esta opción de taxa de bits variábel permítelle especificar a calidade da saída.&lt;/dd&gt;
-
-&lt;dt&gt;Opción rápida&lt;/dt&gt;
-&lt;dd&gt;Activa a nova VBR rápida para un perfil en concreto- Isto é o recomendado.&lt;/dd&gt;
-
-&lt;dt&gt;CBR louco&lt;/dt&gt;
-&lt;dd&gt;Se precisa a calidade máis alta posíbel sen importar cal for o tamaño do ficheiro, a opción que debería usar sería a da taxa de bits constante.&lt;/dd&gt;
-
-&lt;dt&gt;CBR kbps&lt;/dt&gt;
-&lt;dd&gt;Se usa esta predefinición de taxa de bits constante, obterá unha boa calidade á taxa de bits que especifique.&lt;/dd&gt;
-
-&lt;dt&gt;ABR kbps&lt;/dt&gt;
-&lt;dd&gt;Se usa a definición  de taxa de bits media, obterá unha maior calidade que coa opción constante á taxa de bits que se especifique.&lt;/dd&gt;
-</translation>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Usar a taxa de bits</translation>
     </message>
@@ -433,6 +398,57 @@
         <source>ABR kbps</source>
         <translation>ABR kbps</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation>&lt;dt&gt;VBR media&lt;/dt&gt;
+&lt;dd&gt;Ao usar unha taxa de bits variábel de media, esta predefinición proporciona unha aproximación á transparencia para a maioría das persoas e músicas.&lt;/dd&gt;
+
+&lt;dt&gt;VBR estándar e VBR estándar rápido&lt;/dt&gt;
+&lt;dd&gt;Ao usar unha taxa de bits variábel estándar, esta predefinición debería ser  normalmente transparente para a maior parte das persoas coa maior parte das músicas e é igualmente alta en calidade.&lt;/dd&gt;
+
+&lt;dt&gt;VBR extrema, VBR extrema rápida&lt;/dt&gt;
+&lt;dd&gt;Ao usar a taxa de bits variábel máis alta posíbel, esta predefinición unha calidade algo maior do que a do modo estándar, en caso de ter un ouvido extremadamente bo ou un equipo de son de alta calidade.&lt;/dd&gt;
+
+&lt;dt&gt;VBR calidade&lt;/dt&gt;
+&lt;dd&gt;Esta opción de taxa de bits variábel permítelle especificar a calidade da saída.&lt;/dd&gt;
+
+&lt;dt&gt;Opción rápida&lt;/dt&gt;
+&lt;dd&gt;Activa a nova VBR rápida para un perfil en concreto- Isto é o recomendado.&lt;/dd&gt;
+
+&lt;dt&gt;CBR louco&lt;/dt&gt;
+&lt;dd&gt;Se precisa a calidade máis alta posíbel sen importar cal for o tamaño do ficheiro, a opción que debería usar sería a da taxa de bits constante.&lt;/dd&gt;
+
+&lt;dt&gt;CBR kbps&lt;/dt&gt;
+&lt;dd&gt;Se usa esta predefinición de taxa de bits constante, obterá unha boa calidade á taxa de bits que especifique.&lt;/dd&gt;
+
+&lt;dt&gt;ABR kbps&lt;/dt&gt;
+&lt;dd&gt;Se usa a definición  de taxa de bits media, obterá unha maior calidade que coa opción constante á taxa de bits que se especifique.&lt;/dd&gt;
+</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -547,16 +563,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>Non se puido crear o directorio &quot;%1&quot;.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>Non é posíbel realizar a conversión:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>Non se puido escribir no directorio &quot;%1&quot;.</translation>
+        <source>Select cover image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>Non é posíbel realizar a conversión:</translation>
+        <source>Without cover image</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -571,7 +590,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -593,14 +612,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>Non se puido eliminar o ficheiro:
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Erro do codificador:
@@ -611,6 +622,12 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -659,17 +676,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>Non se puido renomear o ficheiro:
-%1 como %2
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -750,10 +756,6 @@
         <translation>&amp;Axuda</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Engadir un ficheiro</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>Engadir un ficheiro de audio ou CUE</translation>
     </message>
@@ -802,14 +804,6 @@
         <translation>&amp;Sobre Flacon</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Eliminar o álbum</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Eliminar o álbum do proxecto</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Del</translation>
     </message>
@@ -955,6 +949,18 @@
         <source>Delete current pattern from history</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -984,13 +990,13 @@
         <translation>Seleccionar o ficheiro de programa</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
+        <source>All files</source>
+        <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1047,11 +1053,34 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1178,4 +1207,15 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_hu.ts -> flacon-4.0.0.tar.gz/translations/flacon_hu.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>Wavpack támogató patch</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Alkalmazás ikon, Csomagolás</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Csomagolás, tesztelés</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>A szálak száma a konvertálási folyamatban.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Ideiglenes könyvtár:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Alapértelmezett kódlap:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Első pregap sáv:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Ideiglenes könyvtár:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Alapértelmezett kódlap:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>FLAC-átalakító beállítása</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Tömörítő:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>Letiltva</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,34 +335,6 @@
         <translation>Bitzosított:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Használt bitráta</translation>
     </message>
@@ -410,6 +398,34 @@
         <source>ABR kbps</source>
         <translation>ABR kbps</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -524,16 +540,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>&quot;%1&quot; könyvtár nem hozható létre.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>Átalakítása nem lehetséges:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>&quot;%1&quot; könyvtárba nem lehet írni.</translation>
+        <source>Select cover image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>Átalakítása nem lehetséges:</translation>
+        <source>Without cover image</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -548,7 +567,7 @@
         <translation>%1 [ lemez %2 ]</translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -570,14 +589,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>Nem tudtam törölni:
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Átalakító hiba
@@ -588,6 +599,12 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation>Nem tudtam olvasni a %1 fájlt</translation>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -633,17 +650,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>Nem tudtam átnevezni:
-%1 to %2
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -724,10 +730,6 @@
         <translation>&amp;Segítség</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Fájl hozzáadása</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>Cue vagy audio-fájl hozzáadása</translation>
     </message>
@@ -776,14 +778,6 @@
         <translation>Flacon &amp;névjegye</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Album eltávolítása</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Album eltávolítása a projektből</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Del</translation>
     </message>
@@ -929,6 +923,18 @@
         <source>Delete current pattern from history</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -958,15 +964,15 @@
         <translation>Programfájl kiválasztása</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
-        <translation>%1 program</translation>
-    </message>
-    <message>
         <source>All files</source>
         <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation>Minden fájl</translation>
     </message>
+    <message>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1021,11 +1027,34 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation>&lt;b&gt;&quot;%1&quot;&lt;/b&gt; audio-fájl nem létezik</translation>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1153,4 +1182,15 @@
 %1</translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_it.ts -> flacon-4.0.0.tar.gz/translations/flacon_it.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="it" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="it" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>Patch di supporto WavPack</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Icona applicazione, pacchettizzazione</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Pacchettizzazione, testing</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>Il numero di processi nella procedura di conversione.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Cartella temporanea:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Tabella dei codici di base:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Pregap della prima traccia:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Cartella temporanea:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Tabella dei codici di base:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Configurazione codificatore Flac</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Compressione:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>Disattivato</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,35 +335,6 @@
         <translation>Preimpostazione:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation>
-</translation>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Usa bitrate</translation>
     </message>
@@ -411,6 +398,57 @@
         <source>ABR kbps</source>
         <translation>ABR kbps</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation>&lt;dt&gt;VBR medio&lt;/dt&gt;
+&lt;dd&gt;Usando un VariableBitRate medio, si dovrebbe ottenere maggiore trasparenza verso le persone e la musica.&lt;/dd&gt;
+
+&lt;dt&gt;VBR standard, VBR standard veloce&lt;/dt&gt;
+&lt;dd&gt;Usando un Variable BitRate standard, si dovrebbe garantire maggiore trasparenza verso le persone e la musica, e si dovrebbe ottenere una qualità alta.&lt;/dd&gt;
+
+&lt;dt&gt;VBR estremoe, VBR estremo veloce&lt;/dt&gt;
+&lt;dd&gt;Usando il più veloce Variable BitRate, si dovrebbe fornire una qualità leggermente superiore alla versione standard se si ascolta con buone orecchie o con apparecchi high-end.&lt;/dd&gt;
+
+&lt;dt&gt;Qualità VBR&lt;/dt&gt;
+&lt;dd&gt;Questa opzione di Variable BitRate ti consente di stabilire la qualità dell&apos;output prodotto.&lt;/dd&gt;
+
+&lt;dt&gt;opzione veloce&lt;/dt&gt;
+&lt;dd&gt;Abilita il nuovo fast VBR per un profilo particolare. Questo è altamente raccomandato.&lt;/dd&gt;
+
+&lt;dt&gt;CBR insano&lt;/dt&gt;
+&lt;dd&gt;Se si vuole ottenere la massima qualità assoluta senza alcun riguardo per la dimensione del file, la si può ottenere utilizzando questo Constant BitRate.&lt;/dd&gt;
+
+&lt;dt&gt;CBR kbps&lt;/dt&gt;
+&lt;dd&gt;Usando questo Constant BitRate si ottiene una buona qualità rispetto al bitrate specificato.&lt;/dd&gt;
+
+&lt;dt&gt;ABR kbps&lt;/dt&gt;
+&lt;dd&gt;Usando questo Average BitRate si ottiene una qualità leggermente superiore la Constatnt BitRate rispetto al bitrate specificato.&lt;/dd&gt;
+</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -525,16 +563,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>Impossibile creare la cartella &quot;%1&quot;.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>Impossibile convertire:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>Impossibile scrivere nella cartella &quot;%1&quot;.</translation>
+        <source>Select cover image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>Impossibile convertire:</translation>
+        <source>Without cover image</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -549,7 +590,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -571,14 +612,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>Impossibile eliminare i file:
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Errore di codifica:
@@ -589,6 +622,12 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -637,17 +676,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>Impossibile rinominare il file:
-%1 a %2
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -728,10 +756,6 @@
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Aggiungi file</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>Aggiungi un file CUE o audio</translation>
     </message>
@@ -780,14 +804,6 @@
         <translation>&amp;Informazioni su Flacon</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Rimuovi album</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Rimuovi album dal progetto</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Del</translation>
     </message>
@@ -949,6 +965,18 @@
         <source>Delete current pattern from history</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -978,13 +1006,13 @@
         <translation>Seleziona file</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
+        <source>All files</source>
+        <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1041,12 +1069,35 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>Il numero delle tracce è superiore al previsto. </translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1172,4 +1223,15 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_ja_JP.ts -> flacon-4.0.0.tar.gz/translations/flacon_ja_JP.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ja_JP" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ja_JP" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>WavPack サポートパッチ</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>アプリケーションアイコン, パッケージング</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>パッケージング, テスティング</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>変換プロセスにおけるスレッド数</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>一時ディレクトリ:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>デフォルトコードページ:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>最初のトラック プレギャップ:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>一時ディレクトリ:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>デフォルトコードページ:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Flac エンコーディング設定</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>圧縮:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>不可</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,34 +335,6 @@
         <translation>プリセット:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>bitrate を使う</translation>
     </message>
@@ -410,6 +398,34 @@
         <source>ABR kbps</source>
         <translation>ABR kbps</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -524,16 +540,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>ディレクトリ作成できません &quot;%1&quot;.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>変換は不可能です:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>ディレクトリ書き込みできません &quot;%1&quot;.</translation>
+        <source>Select cover image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>変換は不可能です:</translation>
+        <source>Without cover image</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -548,7 +567,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -570,14 +589,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>ファイルが削除できません:
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>エンコーディングエラー:
@@ -588,6 +599,12 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -633,17 +650,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>ファイルをリネームできません:
-%1 から %2
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -725,10 +731,6 @@
         <translation>&amp;Helpヘルプ</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>%1 ファイル</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>CUEまたはオーディオファイルを追加</translation>
     </message>
@@ -777,14 +779,6 @@
         <translation>&amp;About Flacon</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>アルバムを除去する</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>プロジェクトからアルバムを除去する</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Del</translation>
     </message>
@@ -929,6 +923,18 @@
         <source>Delete current pattern from history</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -958,13 +964,13 @@
         <translation>プログラムファイルを選択</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
+        <source>All files</source>
+        <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1021,12 +1027,35 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>期待よりトラック数が多い。</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1152,4 +1181,15 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_lt.ts -> flacon-4.0.0.tar.gz/translations/flacon_lt.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="lt" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="lt" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>WavPack palaikymo pataisa</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Programos piktograma, Pakavimas</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Pakavimas, testavimas</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>Gijų skaičius konvertavimo procese.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Laikinas katalogas:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Numatytoji koduotė:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Pirmo takelio &quot;pregap&quot;:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation>Kurti kiekvieno takelio cue lapą</translation>
     </message>
+    <message>
+        <source> px</source>
+        <translation> piks.</translation>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Laikinas katalogas:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Numatytoji koduotė:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation>Viršelio paveikslas</translation>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation>Nekopijuoti paveikslo</translation>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation>Palikti pradinį paveikslo dydį</translation>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation>Keisti dydį, jei paveikslo dydis didesnis nei</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Flac kodavimo konfigūracija</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Glaudinimas:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>Išjungta</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation>FLAC kodavimo konfigūracija</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,57 +335,6 @@
         <translation>Parinktis:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation>&lt;dt&gt;VBR vidutinė&lt;/dt&gt;
-&lt;dd&gt;Naudojant vidutinį kintamąjį pralaidumą, daugelis žmonių neišgirs kokybės iškraipymų daugumoje muzikos įrašų.&lt;/dd&gt;
-
-&lt;dt&gt;VBR standartinė, VBR standartinė greita&lt;/dt&gt;
-&lt;dd&gt;Naudojant standartinį kintamąjį pralaidumą, daugelis žmonių neišgirs kokybės iškraipymų daugumoje muzikos įrašų ir be to, yra pateikiama ganėtinai aukšta kokybė.&lt;/dd&gt;
-
-&lt;dt&gt;VBR ekstremali, VBR ekstremali greita&lt;/dt&gt;
-&lt;dd&gt;Naudojant aukščiausią, koks tik įmanomas, kintamąjį pralaidumą, ši parinktis pateiks šiek tiek geresnę kokybę nei standartinė veiksena. Tai pastebėsite tik tuo atveju, jei turite gerą klausą ar aukštos klasės muzikinę įrangą.&lt;/dd&gt;
-
-&lt;dt&gt;VBR kokybė&lt;/dt&gt;
-&lt;dd&gt;Ši kintamojo pralaidumo parinktis leidžia jums nurodyti išvesties kokybę.&lt;/dd&gt;
-
-&lt;dt&gt;greita parinktis&lt;/dt&gt;
-&lt;dd&gt;Įjungia tam tikram profiliui naują, greitąją VBR parinktį. Tai yra rekomenduojama.&lt;/dd&gt;
-
-&lt;dt&gt;CBR beprotiška&lt;/dt&gt;
-&lt;dd&gt;Jeigu jūs privalote turėti pačią aukščiausią kokybę, neatsižvelgiant į failo dydį, tai pasieksite, naudodami šį pastovųjį pralaidumą.&lt;/dd&gt;
-
-&lt;dt&gt;CBR kbps&lt;/dt&gt;
-&lt;dd&gt;Naudojant šį pastovųjį pralaidumą, gausite gerą kokybę su nurodytu pralaidumu.&lt;/dd&gt;
-
-&lt;dt&gt;ABR kbps&lt;/dt&gt;
-&lt;dd&gt;Naudojant šį vidutinį pralaidumą, dažniausiai, gausite aukštesnę nurodyto pralaidumo kokybę, negu tą, kurią gautumėte, naudodami pastoviojo pralaidumo parinktį.&lt;/dd&gt;
-</translation>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Naudojamas pralaidumas</translation>
     </message>
@@ -433,6 +398,57 @@
         <source>ABR kbps</source>
         <translation>ABR kbps</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation>&lt;dt&gt;VBR vidutinė&lt;/dt&gt;
+&lt;dd&gt;Naudojant vidutinį kintamąjį pralaidumą, daugelis žmonių neišgirs kokybės iškraipymų daugumoje muzikos įrašų.&lt;/dd&gt;
+
+&lt;dt&gt;VBR standartinė, VBR standartinė greita&lt;/dt&gt;
+&lt;dd&gt;Naudojant standartinį kintamąjį pralaidumą, daugelis žmonių neišgirs kokybės iškraipymų daugumoje muzikos įrašų ir be to, yra pateikiama ganėtinai aukšta kokybė.&lt;/dd&gt;
+
+&lt;dt&gt;VBR ekstremali, VBR ekstremali greita&lt;/dt&gt;
+&lt;dd&gt;Naudojant aukščiausią, koks tik įmanomas, kintamąjį pralaidumą, ši parinktis pateiks šiek tiek geresnę kokybę nei standartinė veiksena. Tai pastebėsite tik tuo atveju, jei turite gerą klausą ar aukštos klasės muzikinę įrangą.&lt;/dd&gt;
+
+&lt;dt&gt;VBR kokybė&lt;/dt&gt;
+&lt;dd&gt;Ši kintamojo pralaidumo parinktis leidžia jums nurodyti išvesties kokybę.&lt;/dd&gt;
+
+&lt;dt&gt;greita parinktis&lt;/dt&gt;
+&lt;dd&gt;Įjungia tam tikram profiliui naują, greitąją VBR parinktį. Tai yra rekomenduojama.&lt;/dd&gt;
+
+&lt;dt&gt;CBR beprotiška&lt;/dt&gt;
+&lt;dd&gt;Jeigu jūs privalote turėti pačią aukščiausią kokybę, neatsižvelgiant į failo dydį, tai pasieksite, naudodami šį pastovųjį pralaidumą.&lt;/dd&gt;
+
+&lt;dt&gt;CBR kbps&lt;/dt&gt;
+&lt;dd&gt;Naudojant šį pastovųjį pralaidumą, gausite gerą kokybę su nurodytu pralaidumu.&lt;/dd&gt;
+
+&lt;dt&gt;ABR kbps&lt;/dt&gt;
+&lt;dd&gt;Naudojant šį vidutinį pralaidumą, dažniausiai, gausite aukštesnę nurodyto pralaidumo kokybę, negu tą, kurią gautumėte, naudodami pastoviojo pralaidumo parinktį.&lt;/dd&gt;
+</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -556,16 +572,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>Nepavyksta sukurti katalogo &quot;%1&quot;.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>Konvertavimas neįmanomas:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>Nepavyksta rašyti į katalogą &quot;%1&quot;.</translation>
+        <source>Select cover image</source>
+        <translation>Pasirinkite viršelio paveikslą</translation>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>Konvertavimas neįmanomas:</translation>
+        <source>Without cover image</source>
+        <translation>Be viršelio paveikslo</translation>
     </message>
 </context>
 <context>
@@ -580,8 +599,8 @@
         <translation>%1 [ diskas %2 ]</translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
-        <translation>Cue faile yra informacijos apie kelis diskus. Kurį diską norėtumėte naudoti?</translation>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
+        <translation>CUE faile yra informacija apie kelis diskus. Kurį diską norėtumėte naudoti?</translation>
     </message>
 </context>
 <context>
@@ -602,14 +621,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>Nepavyksta ištrinti failo:
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Koduotuvo klaida:
@@ -620,6 +631,14 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation>Nepavyksta perskaityti failo %1</translation>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation>Nepavyksta pervadinti failo:
+%1 į %2
+%3</translation>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -668,17 +687,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>Nepavyksta pervadinti failo:
-%1 į %2
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -759,10 +767,6 @@
         <translation>&amp;Pagalba</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Pridėti failą</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>Pridėti CUE ar garso failą</translation>
     </message>
@@ -811,14 +815,6 @@
         <translation>&amp;Apie Flacon</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Šalinti albumą</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Šalinti albumą iš projekto</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Del</translation>
     </message>
@@ -982,6 +978,18 @@
         <source>Delete current pattern from history</source>
         <translation>Ištrinti esamą šabloną iš istorijos</translation>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation>Pridėti diską</translation>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation>Šalinti diską</translation>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation>Šalinti diską iš projekto</translation>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -1011,15 +1019,15 @@
         <translation>Pasirinkite programos failą</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
-        <translation>%1 programa</translation>
-    </message>
-    <message>
         <source>All files</source>
         <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation>Visi failai</translation>
     </message>
+    <message>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
+        <translation>%1 programa</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1074,12 +1082,35 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation>Garso failo &lt;b&gt;&quot;%1&quot;&lt;/b&gt; nėra</translation>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation>Nepavyksta sukurti katalogo &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation>Nepavyksta rašyti į katalogą &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation>Nepavyksta nukopijuoti viršelio failo &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation>Nepavyksta perskaityti viršelio failo &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation>Nepavyksta įrašyti viršelio paveikslą &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>Takelių skaičius yra didesnis nei buvo tikėtasi.</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation>Nepavyksta perskaityti &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
     </message>
 </context>
 <context>
@@ -1206,4 +1237,15 @@
 %1</translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation>Nepavyksta sukurti katalogo &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation>Nepavyksta rašyti į katalogą &quot;%1&quot;.</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_nb.ts -> flacon-4.0.0.tar.gz/translations/flacon_nb.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>Programfiks for WavPack-støtte</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Programikon, pakking</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Pakking, testing</translation>
     </message>
@@ -203,7 +199,7 @@
     </message>
     <message>
         <source>General configuration</source>
-        <translation>Generell konfigurasjon</translation>
+        <translation>Generelt oppsett</translation>
     </message>
     <message>
         <source>Thread count:</source>
@@ -214,14 +210,6 @@
         <translation>Antall tråder brukt i konverteringsprosessen.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Midlertidig katalog:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Forvalgt kodeside:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Innledningspause før første spor:</translation>
     </message>
@@ -261,12 +249,40 @@
         <source>Create per track cue sheet</source>
         <translation>Opprett CUE-innholdsfortegnelse per spor</translation>
     </message>
+    <message>
+        <source> px</source>
+        <translation>px</translation>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Midlertidig katalog:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Forvalgt kodeside:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation>Omslagsbilde</translation>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation>Ikke kopier bilde</translation>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation>Behold opprinnelig billedstørrelse</translation>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation>Endre oppløsning på bilde hvis større enn</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
     <message>
         <source>AAC encoding configuration</source>
-        <translation>Konfigurasjon for AAC-koding</translation>
+        <translation>Oppsett for AAC-koding</translation>
     </message>
     <message>
         <source>Use quality setting (recommended)</source>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Konfigurasjon for Flac-koding</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Komprimering:</translation>
     </message>
@@ -305,71 +317,24 @@
     </message>
     <message>
         <source>Disabled</source>
-        <translation>Deaktivert</translation>
+        <translation>Avskrudd</translation>
+    </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
     <message>
         <source>MP3 encoding configuration</source>
-        <translation>Konfigurasjon for MP3-koding</translation>
+        <translation>Oppsett for MP3-koding</translation>
     </message>
     <message>
         <source>Preset:</source>
         <translation>Forvalg:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation>&lt;dt&gt;medium VBR&lt;/dt&gt;
-&lt;dd&gt;Ved bruk av medium variabel bitrate, vil dette forvalget være nesten fullgodt for de fleste og for det meste av musikk.&lt;/dd&gt;
-
-&lt;dt&gt;standard VBR, standard rask VBR&lt;/dt&gt;
-&lt;dd&gt;Ved bruk av standard variabel bitrate, vil dette forvalget i hovedsak være nesten fullgodt for de fleste på mesteparten av musikk og allerede ganske høyt hva angår kvalitet..&lt;/dd&gt;
-
-&lt;dt&gt;ekstrem VBR, ekstrem rask VBR&lt;/dt&gt;
-&lt;dd&gt;Ved å bruke høyeste mulig variable bitrate, vil dette forvalget gi en antydning høyere kvalitet enn standardmoduset hvis du har ekstermt god hørsel eller bra lydutstyr.&lt;/dd&gt;
-
-&lt;dt&gt;kvalitet VBR&lt;/dt&gt;
-&lt;dd&gt;Dette variable bitratevalget lar deg angi utdatakvaliteten.&lt;/dd&gt;
-
-&lt;dt&gt;raskt valg&lt;/dt&gt;
-&lt;dd&gt;Skrur på den nye rask VBR for en spesifikk profil. Dette er anbefalt.&lt;/dd&gt;
-
-&lt;dt&gt;galskap CBR&lt;/dt&gt;
-&lt;dd&gt;Hvis du vil ha den absolutt høyeste kvaliten, uten hensyn til filstørrelse, vil du oppnå dette ved bruk av konstant bitrate.&lt;/dd&gt;
-
-&lt;dt&gt;CBR kbps&lt;/dt&gt;
-&lt;dd&gt;Bruk av forvalget for konstant bitrate vil vanligvis gi deg god kvalitet på en angitt bitrate.&lt;/dd&gt;
-
-&lt;dt&gt;kpbs ABR&lt;/dt&gt;
-&lt;dd&gt;Bruk av forvalget for gjenomsnittlig bitrate vil vanligvis gi deg høyere kvalitet enn valget for konstant bitrate for en spesifikk bitrate.&lt;/dd&gt;
-</translation>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Bruk bithastighet</translation>
     </message>
@@ -379,7 +344,7 @@
     </message>
     <message>
         <source>Sets target bitrate (in kb/s).</source>
-        <translation>Stiller bithastighetsmål (i kb/s).</translation>
+        <translation>Setter bithastighetsmål (i kb/s).</translation>
     </message>
     <message>
         <source>Use quality</source>
@@ -433,12 +398,63 @@
         <source>ABR kbps</source>
         <translation>kbps ABR</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation>&lt;dt&gt;medium VBR&lt;/dt&gt;
+&lt;dd&gt;Ved bruk av medium variabel bitrate, vil dette forvalget være nesten fullgodt for de fleste og for det meste av musikk.&lt;/dd&gt;
+
+&lt;dt&gt;standard VBR, standard rask VBR&lt;/dt&gt;
+&lt;dd&gt;Ved bruk av standard variabel bitrate, vil dette forvalget i hovedsak være nesten fullgodt for de fleste på mesteparten av musikk og allerede ganske høyt hva angår kvalitet..&lt;/dd&gt;
+
+&lt;dt&gt;ekstrem VBR, ekstremt rask VBR&lt;/dt&gt;
+&lt;dd&gt;Ved å bruke høyeste mulig variable bitrate, vil dette forvalget gi en antydning høyere kvalitet enn standardmoduset hvis du har ekstermt god hørsel eller bra lydutstyr.&lt;/dd&gt;
+
+&lt;dt&gt;kvalitet VBR&lt;/dt&gt;
+&lt;dd&gt;Dette variable bitratevalget lar deg angi utdatakvaliteten.&lt;/dd&gt;
+
+&lt;dt&gt;raskt valg&lt;/dt&gt;
+&lt;dd&gt;Skrur på den nye rask VBR for en spesifikk profil. Dette er anbefalt.&lt;/dd&gt;
+
+&lt;dt&gt;galskap CBR&lt;/dt&gt;
+&lt;dd&gt;Hvis du vil ha den absolutt høyeste kvaliten, uten hensyn til filstørrelse, vil du oppnå dette ved bruk av konstant bitrate.&lt;/dd&gt;
+
+&lt;dt&gt;CBR kbps&lt;/dt&gt;
+&lt;dd&gt;Bruk av forvalget for konstant bitrate vil vanligvis gi deg god kvalitet på en angitt bitrate.&lt;/dd&gt;
+
+&lt;dt&gt;kpbs ABR&lt;/dt&gt;
+&lt;dd&gt;Bruk av forvalget for gjenomsnittlig bitrate vil vanligvis gi deg høyere kvalitet enn valget for konstant bitrate for en spesifikk bitrate.&lt;/dd&gt;
+</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
     <message>
         <source>Ogg encoding configuration</source>
-        <translation>Konfigurasjon for Ogg-koding</translation>
+        <translation>Oppsett for Ogg-koding</translation>
     </message>
     <message>
         <source>Use quality setting (recommended)</source>
@@ -485,7 +501,7 @@
     <name>ConfigPage_Opus</name>
     <message>
         <source>Opus encoding configuration</source>
-        <translation>Konfigurasjon for Opus-koding</translation>
+        <translation>Oppsett for Opus-koding</translation>
     </message>
     <message>
         <source>Bitrate type:</source>
@@ -534,7 +550,7 @@
     <name>ConfigPage_Wv</name>
     <message>
         <source>WavPack encoding configuration</source>
-        <translation>Konfigurasjon for WavPack-koding</translation>
+        <translation>Oppsett for WavPack-koding</translation>
     </message>
     <message>
         <source>Compression:</source>
@@ -550,22 +566,25 @@
     </message>
     <message>
         <source>Disabled</source>
-        <translation>Deaktivert</translation>
+        <translation>Avskrudd</translation>
     </message>
 </context>
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>Jeg kan ikke opprette mappa &quot;%1&quot;.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>Konvertering er ikke mulig:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>Jeg kan ikke skrive til mappa &quot;%1&quot;.</translation>
+        <source>Select cover image</source>
+        <translation>Velg omslagsbilde</translation>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>Konvertering er ikke mulig:</translation>
+        <source>Without cover image</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -580,8 +599,8 @@
         <translation>%1 [ disk %2 ]</translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
-        <translation>Cue-fila inneholder informasjon om flere disker. Hvilken disk ønsker du å bruke?</translation>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
+        <translation>CUE-fila inneholder informasjon om flere disker. Hvilken av dem ønsker du å bruke?</translation>
     </message>
 </context>
 <context>
@@ -602,14 +621,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>Jeg kan ikke slette fila:
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Kodingsfeil:
@@ -620,6 +631,14 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation>Jeg kan ikke lese %1 fil</translation>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation>Jeg kan ikke gi fil nytt navn:
+%1 til %2
+%3</translation>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -636,7 +655,7 @@
     <message>
         <source>Disabled</source>
         <comment>ReplayGain type combobox</comment>
-        <translation>Deaktivert</translation>
+        <translation>Avskrudd</translation>
     </message>
     <message>
         <source>Per Track</source>
@@ -664,18 +683,7 @@
     </message>
     <message>
         <source>Default</source>
-        <translation>Standard</translation>
-    </message>
-</context>
-<context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>Jeg kan ikke gi fil nytt navn:
-%1 til %2
-%3</translation>
+        <translation>Forvalg</translation>
     </message>
 </context>
 <context>
@@ -759,10 +767,6 @@
         <translation>&amp;Hjelp</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Legg til fil</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>Legg til CUE eller lydfil</translation>
     </message>
@@ -772,7 +776,7 @@
     </message>
     <message>
         <source>Convert</source>
-        <translation>Konvertere</translation>
+        <translation>Konverter</translation>
     </message>
     <message>
         <source>Start conversion process</source>
@@ -811,14 +815,6 @@
         <translation>&amp;Om Flacon</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Fjern album</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Fjern album fra prosjekt</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Del</translation>
     </message>
@@ -828,7 +824,7 @@
     </message>
     <message>
         <source>...</source>
-        <translation> ...</translation>
+        <translation> …</translation>
     </message>
     <message>
         <source>Select result directory</source>
@@ -982,6 +978,18 @@
         <source>Delete current pattern from history</source>
         <translation>Slett gjeldende mønster fra historikk</translation>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -1011,15 +1019,15 @@
         <translation>Velg programfil</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
-        <translation>%1 program</translation>
-    </message>
-    <message>
         <source>All files</source>
         <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation>Alle filer</translation>
     </message>
+    <message>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
+        <translation>%1 program</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1074,12 +1082,35 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation>Lydfila &lt;b&gt; &quot;%1&quot; &lt;/b&gt; finnes ikke</translation>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation>Jeg kan ikke opprette mappa &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation>Jeg kan ikke skrive til mappa &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation>Jeg kan ikke kopier omslagsfila &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation>Jeg kan ikke lese omslagsbildet &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation>Jeg kan lagre omslagsbildet &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>Antall spor er høyere enn forventet.</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation>Jeg kan ikke lese &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
     </message>
 </context>
 <context>
@@ -1206,4 +1237,15 @@
 %1</translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation>Jeg kan ikke opprette mappa &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation>Jeg kan ikke skrive til mappa &quot;%1&quot;.</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_nl.ts -> flacon-4.0.0.tar.gz/translations/flacon_nl.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -39,7 +39,7 @@
     </message>
     <message>
         <source>Flacon uses external programs. Many thanks to their authors!</source>
-        <translation>Flacon gebruikt externe programma&apos;s. Veel dank aan hun auteurs!</translation>
+        <translation>Flacon gebruikt externe programma’s. Veel dank aan hun auteurs!</translation>
     </message>
     <message>
         <source>Extracts individual tracks from one big audio file containing the entire album.</source>
@@ -54,10 +54,6 @@
         <translation>WavPack-ondersteuningspatch</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Toepassingspictogram, verpakken</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Verpakken, testen</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>Het aantal draden in het conversieproces.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Tijdelijke map:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Standaardcodetabel:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Pregap voor eerste nummer:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation>Maak cueblad aan per nummer</translation>
     </message>
+    <message>
+        <source> px</source>
+        <translation>px</translation>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Tijdelijke map:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Standaardcodetabel:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation>Albumhoes</translation>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation>Afbeelding niet kopiëren</translation>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation>Oorspronkelijke afbeeldingsgrootte behouden</translation>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation>Schalen indien afbeelding groter is dan</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Flac-coderingsconfiguratie</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Compressie:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>Uitgeschakeld</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation>FLAC-coderingsconfiguratie</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,57 +335,6 @@
         <translation>Vooraf ingesteld</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation>&lt;dt&gt;VBR medium&lt;/dt&gt;
-&lt;dd&gt;Deze voorinstelling is voor de meeste mensen en de meeste muziek normaal gezien transparant.&lt;/dd&gt;
-
-&lt;dt&gt;VBR standaard, VBR standaard snel&lt;/dt&gt;
-&lt;dd&gt;Deze voorinstelling is voor de meeste mensen en de meeste muziek normaal gezien transparant, en is al van vrij hoge kwaliteit.&lt;/dd&gt;
-
-&lt;dt&gt;VBR extreem, VBR extreme snel&lt;/dt&gt;
-&lt;dd&gt;Deze voorinstelling biedt iets hogere kwaliteit dan de standaardmodus als je een uitzonderlijk goed gehoord of high-end audio-apparatuur hebt.&lt;/dd&gt;
-
-&lt;dt&gt;VBR kwaliteit&lt;/dt&gt;
-&lt;dd&gt;Deze optie laat je de uitvoerkwaliteit opgeven.&lt;/dd&gt;
-
-&lt;dt&gt;snelle optie&lt;/dt&gt;
-&lt;dd&gt;Schakelt de nieuwe snelle VBR voor een specifiek profiel in. Dit is aanbevolen.&lt;/dd&gt;
-
-&lt;dt&gt;CBR waanzinnig&lt;/dt&gt;
-&lt;dd&gt;Als je absoluut de hoogste kwaliteit nodig hebt ongeacht bestandsgrootte zal je dat met deze constante bitsnelheid bereiken.&lt;/dd&gt;
-
-&lt;dt&gt;CBR kbps&lt;/dt&gt;
-&lt;dd&gt;Deze voorinstelling geeft je normaal gezien goede kwaliteit voor een vooraf opgegeven bitsnelheid.&lt;/dd&gt;
-
-&lt;dt&gt;ABR kbps&lt;/dt&gt;
-&lt;dd&gt;Deze voorinstelling geeft je normaal gezien hogere kwaliteit dan de constante bitsnelheid voor een vooraf opgegeven bitsnelheid.&lt;/dd&gt;
-</translation>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Gebruik bitsnelheid</translation>
     </message>
@@ -433,6 +398,57 @@
         <source>ABR kbps</source>
         <translation>ABR kbps</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation>&lt;dt&gt;VBR medium&lt;/dt&gt;
+&lt;dd&gt;Deze voorinstelling is voor de meeste mensen en de meeste muziek normaal gezien transparant.&lt;/dd&gt;
+
+&lt;dt&gt;VBR standaard, VBR standaard snel&lt;/dt&gt;
+&lt;dd&gt;Deze voorinstelling is voor de meeste mensen en de meeste muziek normaal gezien transparant, en is al van vrij hoge kwaliteit.&lt;/dd&gt;
+
+&lt;dt&gt;VBR extreem, VBR extreme snel&lt;/dt&gt;
+&lt;dd&gt;Deze voorinstelling biedt iets hogere kwaliteit dan de standaardmodus als je een uitzonderlijk goed gehoord of high-end audio-apparatuur hebt.&lt;/dd&gt;
+
+&lt;dt&gt;VBR kwaliteit&lt;/dt&gt;
+&lt;dd&gt;Deze optie laat je de uitvoerkwaliteit opgeven.&lt;/dd&gt;
+
+&lt;dt&gt;snelle optie&lt;/dt&gt;
+&lt;dd&gt;Schakelt de nieuwe snelle VBR voor een specifiek profiel in. Dit is aanbevolen.&lt;/dd&gt;
+
+&lt;dt&gt;CBR waanzinnig&lt;/dt&gt;
+&lt;dd&gt;Als je absoluut de hoogste kwaliteit nodig hebt ongeacht bestandsgrootte zal je dat met deze constante bitsnelheid bereiken.&lt;/dd&gt;
+
+&lt;dt&gt;CBR kbps&lt;/dt&gt;
+&lt;dd&gt;Deze voorinstelling geeft je normaal gezien goede kwaliteit voor een vooraf opgegeven bitsnelheid.&lt;/dd&gt;
+
+&lt;dt&gt;ABR kbps&lt;/dt&gt;
+&lt;dd&gt;Deze voorinstelling geeft je normaal gezien hogere kwaliteit dan de constante bitsnelheid voor een vooraf opgegeven bitsnelheid.&lt;/dd&gt;
+</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -556,16 +572,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>Ik kan de map &quot;%1&quot; niet aanmaken.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>Conversie is niet mogelijk:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>Ik kan niet naar de map &quot;%1&quot; schrijven.</translation>
+        <source>Select cover image</source>
+        <translation>Albumhoes selecteren</translation>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>Conversie is niet mogelijk:</translation>
+        <source>Without cover image</source>
+        <translation>Zonder albumhoes</translation>
     </message>
 </context>
 <context>
@@ -580,8 +599,8 @@
         <translation>%1 [ schijf %2 ]</translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
-        <translation>Het cuebestand bevat informatie over meerdere schijven. Welke schijf wil je gebruiken?</translation>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
+        <translation>Het CUE-bestand bevat informatie over meerdere schijven. Welke schijf wil je gebruiken?</translation>
     </message>
 </context>
 <context>
@@ -602,14 +621,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>Ik kan het bestand niet verwijderen:
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Coderingsfout:
@@ -620,6 +631,14 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation>Ik kan %1 bestand niet lezen</translation>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation>Ik kan het bestand niet hernoemen:
+%1 naar %2
+%3</translation>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -668,17 +687,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>Ik kan het bestand niet hernoemen:
-%1 naar %2
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -759,10 +767,6 @@
         <translation>&amp;Hulp</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Bestand toevoegen</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>CUE- of audiobestand toevoegen</translation>
     </message>
@@ -811,14 +815,6 @@
         <translation>&amp;Over Flacon</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Album verwijderen</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Album verwijderen van project</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Del</translation>
     </message>
@@ -856,31 +852,31 @@
     </message>
     <message>
         <source>Insert &quot;Track number&quot;</source>
-        <translation>&quot;Tracknummer&quot; invoegen</translation>
+        <translation>‘Tracknummer’ invoegen</translation>
     </message>
     <message>
         <source>Insert &quot;Total number of tracks&quot;</source>
-        <translation>&quot;Totaal aantal nummers&quot; invoegen</translation>
+        <translation>‘Totaal aantal nummers’ invoegen</translation>
     </message>
     <message>
         <source>Insert &quot;Artist&quot;</source>
-        <translation>&quot;Artiest&quot; invoegen</translation>
+        <translation>‘Artiest’ invoegen</translation>
     </message>
     <message>
         <source>Insert &quot;Album title&quot;</source>
-        <translation>&quot;Albumtitel&quot; invoegen</translation>
+        <translation>‘Albumtitel’ invoegen</translation>
     </message>
     <message>
         <source>Insert &quot;Track title&quot;</source>
-        <translation>&quot;Nummertitel&quot; invoegen</translation>
+        <translation>‘Nummertitel’ invoegen</translation>
     </message>
     <message>
         <source>Insert &quot;Year&quot;</source>
-        <translation>&quot;Jaar&quot; invoegen</translation>
+        <translation>‘Jaar’ invoegen</translation>
     </message>
     <message>
         <source>Insert &quot;Genre&quot;</source>
-        <translation>&quot;Genre&quot; invoegen</translation>
+        <translation>‘Genre’ invoegen</translation>
     </message>
     <message>
         <source>Some albums will not be converted, they contain errors.
@@ -961,12 +957,12 @@
         <comment>Main form tooltip for &quot;Directory&quot; edit</comment>
         <translation>Je kan naar de doelmap bladeren of ze manueel ingeven.
 
-Als het pad leeg wordt gelaten of begint met &quot;.&quot; (punt) zullen de resultaatbestanden in dezelfde map als de bron geplaatst worden.</translation>
+Als het pad leeg wordt gelaten of begint met “.” (punt), zullen de resultaatbestanden in dezelfde map als de bron geplaatst worden.</translation>
     </message>
     <message>
         <source>Use &quot;%1&quot;</source>
         <comment>Predefined out file pattern, string like 'Use &quot;%a/%A/%n - %t&quot;'</comment>
-        <translation>Gebruik &quot;%1&quot;</translation>
+        <translation>Gebruik ‘%1’</translation>
     </message>
     <message>
         <source>Select cue file</source>
@@ -982,6 +978,18 @@
         <source>Delete current pattern from history</source>
         <translation>Huidig patroon van geschiedenis verwijderen</translation>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation>Schijf toevoegen</translation>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation>Schijf verwijderen</translation>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation>Schijf verwijderen van project</translation>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -1011,15 +1019,15 @@
         <translation>Kies programmabestand</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
-        <translation>%1 programma</translation>
-    </message>
-    <message>
         <source>All files</source>
         <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation>Alle bestanden</translation>
     </message>
+    <message>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
+        <translation>%1 programma</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1072,14 +1080,37 @@
     </message>
     <message>
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
-        <translation>Het audiobestand &lt;b&gt;&quot;%1&quot;&lt;/b&gt; bestaat niet</translation>
+        <translation>Het audiobestand &lt;b&gt;‘%1’&lt;/b&gt; bestaat niet</translation>
+    </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation>Ik kan de map ‘%1’ niet aanmaken.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation>Ik kan niet naar de map ‘%1’ schrijven.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation>Ik kan het albumhoesbestand &lt;b&gt;%1&lt;/b&gt; niet kopiëren:&lt;br&gt;%2</translation>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation>Ik kan het albumhoesbestand &lt;b&gt;%1&lt;/b&gt; niet lezen:&lt;br&gt;%2</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation>Ik kan niet naar het albumhoesbestand &lt;b&gt;%1&lt;/b&gt; schrijven:&lt;br&gt;%2</translation>
     </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>Het aantal nummers is hoger dan verwacht.</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation>Ik kan het bestand &lt;b&gt;%1&lt;/b&gt; niet lezen:&lt;br&gt;%2</translation>
     </message>
 </context>
 <context>
@@ -1206,4 +1237,15 @@
 %1</translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation>Ik kan de map ‘%1’ niet aanmaken.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation>Ik kan niet naar de map ‘%1’ schrijven.</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_pl.ts -> flacon-4.0.0.tar.gz/translations/flacon_pl.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>Poprawka obsługi WavPack.</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Ikona programu, paczkowanie.</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Paczkowanie, testowanie</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>Liczba wątków w procesie konwersji.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Katalog tymczasowy:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Domyślna strona kodowa:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Obszar Pre-Gap pierwszej ścieżki</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Katalog tymczasowy:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Domyślna strona kodowa:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Konfiguracja kodowania FLAC</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Kompresja:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>Nieaktywne</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,56 +335,6 @@
         <translation>Prekonfiguracja:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation>&lt;dt&gt;VBR medium&lt;/dt&gt;
-&lt;dd&gt;Ta prekonfiguracja zapewnia większości osób przyzwoitą jakość muzyki.&lt;/dd&gt;
-
-&lt;dt&gt;VBR standard, VBR standard fast&lt;/dt&gt;
-&lt;dd&gt;Ta prekonfiguracja zapewnia większości osób dość wysoką jakość muzyki.&lt;/dd&gt;
-
-&lt;dt&gt;VBR extreme, VBR extreme fast&lt;/dt&gt;
-&lt;dd&gt;Ta prekonfiguracja zapewnia lepszą jakość, niż tryb normalny, co możesz usłyszeć, jeśli masz bardzo dobry słuch.&lt;/dd&gt;
-
-&lt;dt&gt;VBR quality&lt;/dt&gt;
-&lt;dd&gt;Włącza VBR (zmienną prędkość przepływu bitów) i pozwala ustalać poziom jej jakości.&lt;/dd&gt;
-
-&lt;dt&gt;fast option&lt;/dt&gt;
-&lt;dd&gt;Włącza nowy, szybki tryb VBR w poszczególnych profilach.&lt;/dd&gt;
-
-&lt;dt&gt;CBR insane&lt;/dt&gt;
-&lt;dd&gt;Jeśli chcesz uzyskać absolutnie najwyższą jakość muzyki, bez względu na wielkość plików, powinienieś wybrać właśnie tę prekonfigurację.&lt;/dd&gt;
-
-&lt;dt&gt;CBR kbps&lt;/dt&gt;
-&lt;dd&gt;Korzystanie z tej prekonfiguracji, zapewnia zazwyczaj dobrą jakość dla określonych wartości prędkości przepływu bitów (bitrate).&lt;/dd&gt;
-
-&lt;dt&gt;ABR kbps&lt;/dt&gt;
-&lt;dd&gt;Korzystanie z tej prekonfiguracji, zapewnia zazwyczaj lepszą jakość, niż Constant BitRate (CBR), dla określonych wartości prędkości przepływu bitów (bitrate).&lt;/dd&gt;</translation>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Użyj prędkości transmisji</translation>
     </message>
@@ -432,6 +398,56 @@
         <source>ABR kbps</source>
         <translation>ABR kbps</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation>&lt;dt&gt;VBR medium&lt;/dt&gt;
+&lt;dd&gt;Ta prekonfiguracja zapewnia większości osób przyzwoitą jakość muzyki.&lt;/dd&gt;
+
+&lt;dt&gt;VBR standard, VBR standard fast&lt;/dt&gt;
+&lt;dd&gt;Ta prekonfiguracja zapewnia większości osób dość wysoką jakość muzyki.&lt;/dd&gt;
+
+&lt;dt&gt;VBR extreme, VBR extreme fast&lt;/dt&gt;
+&lt;dd&gt;Ta prekonfiguracja zapewnia lepszą jakość, niż tryb normalny, co możesz usłyszeć, jeśli masz bardzo dobry słuch.&lt;/dd&gt;
+
+&lt;dt&gt;VBR quality&lt;/dt&gt;
+&lt;dd&gt;Włącza VBR (zmienną prędkość przepływu bitów) i pozwala ustalać poziom jej jakości.&lt;/dd&gt;
+
+&lt;dt&gt;fast option&lt;/dt&gt;
+&lt;dd&gt;Włącza nowy, szybki tryb VBR w poszczególnych profilach.&lt;/dd&gt;
+
+&lt;dt&gt;CBR insane&lt;/dt&gt;
+&lt;dd&gt;Jeśli chcesz uzyskać absolutnie najwyższą jakość muzyki, bez względu na wielkość plików, powinienieś wybrać właśnie tę prekonfigurację.&lt;/dd&gt;
+
+&lt;dt&gt;CBR kbps&lt;/dt&gt;
+&lt;dd&gt;Korzystanie z tej prekonfiguracji, zapewnia zazwyczaj dobrą jakość dla określonych wartości prędkości przepływu bitów (bitrate).&lt;/dd&gt;
+
+&lt;dt&gt;ABR kbps&lt;/dt&gt;
+&lt;dd&gt;Korzystanie z tej prekonfiguracji, zapewnia zazwyczaj lepszą jakość, niż Constant BitRate (CBR), dla określonych wartości prędkości przepływu bitów (bitrate).&lt;/dd&gt;</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -546,16 +562,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>Nie można utworzyć katalogu &quot;%1&quot;.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>Konwersja nie jest możliwa:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>Nie można zapisywać w katalogu &quot;%1&quot;.</translation>
+        <source>Select cover image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>Konwersja nie jest możliwa:</translation>
+        <source>Without cover image</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -570,7 +589,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -592,14 +611,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>Nie można usunąć pliku:
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Błąd kodeka:
@@ -610,6 +621,12 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -658,17 +675,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>Nie można zmienić nazwy pliku:
-%1 na %2
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -749,10 +755,6 @@
         <translation>&amp;Pomoc</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Dodaj plik</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>Dodaj plik CUE lub plik audio</translation>
     </message>
@@ -801,14 +803,6 @@
         <translation>&amp;O programie Flacon</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Usuń album</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Usuń album z projektu</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Del</translation>
     </message>
@@ -970,6 +964,18 @@
         <source>Delete current pattern from history</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -999,13 +1005,13 @@
         <translation>Wybierz plik programu</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
+        <source>All files</source>
+        <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1062,12 +1068,35 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>Liczba ścieżek jest większa, niż oczekiwano.</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1193,4 +1222,15 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_pl_PL.ts -> flacon-4.0.0.tar.gz/translations/flacon_pl_PL.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl_PL" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl_PL" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>Poprawki obsługi WavPack.</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Ikona programu, paczkowanie</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Paczkowanie, testowanie.</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>Liczba wątków w procesie konwersji.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Katalog tymczasowy:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Domyślna strona kodowa</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Obszar Pre-Gap pierwszej ścieżki</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation>Twórz arkusze CUE dla poszczególnych ścieżek</translation>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Katalog tymczasowy:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Domyślna strona kodowa</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Konfiguracja kodowania FLAC</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Kompresja:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>Nieaktywne</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,56 +335,6 @@
         <translation>Prekonfiguracja:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation>&lt;dt&gt;VBR medium&lt;/dt&gt;
-&lt;dd&gt;Ta prekonfiguracja zapewnia większości osób przyzwoitą jakość muzyki.&lt;/dd&gt;
-
-&lt;dt&gt;VBR standard, VBR standard fast&lt;/dt&gt;
-&lt;dd&gt;Ta prekonfiguracja zapewnia większości osób dość wysoką jakość muzyki.&lt;/dd&gt;
-
-&lt;dt&gt;VBR extreme, VBR extreme fast&lt;/dt&gt;
-&lt;dd&gt;Ta prekonfiguracja zapewnia lepszą jakość, niż tryb normalny, co możesz usłyszeć, jeśli masz bardzo dobry słuch.&lt;/dd&gt;
-
-&lt;dt&gt;VBR quality&lt;/dt&gt;
-&lt;dd&gt;Włącza VBR (zmienną prędkość transmisji) i pozwala ustalać poziom jej jakości.&lt;/dd&gt;
-
-&lt;dt&gt;fast option&lt;/dt&gt;
-&lt;dd&gt;Włącza nowy, szybki tryb VBR w poszczególnych profilach.&lt;/dd&gt;
-
-&lt;dt&gt;CBR insane&lt;/dt&gt;
-&lt;dd&gt;Jeśli chcesz uzyskać absolutnie najwyższą jakość muzyki, bez względu na wielkość plików, powinienieś wybrać właśnie tę prekonfigurację.&lt;/dd&gt;
-
-&lt;dt&gt;CBR kbps&lt;/dt&gt;
-&lt;dd&gt;Korzystanie z tej prekonfiguracji, zapewnia zazwyczaj dobrą jakość dla określonych wartości prędkości transmisji (bitrate).&lt;/dd&gt;
-
-&lt;dt&gt;ABR kbps&lt;/dt&gt;
-&lt;dd&gt;Korzystanie z tej prekonfiguracji, zapewnia zazwyczaj lepszą jakość, niż Constant BitRate (CBR), dla określonych wartości prędkości transmisji (bitrate).&lt;/dd&gt;</translation>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Użyj prędkości transmisji</translation>
     </message>
@@ -432,6 +398,34 @@
         <source>ABR kbps</source>
         <translation>ABR kbps</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -554,16 +548,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>Nie można utworzyć katalogu &quot;%1&quot;.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>Konwersja nie jest możliwa:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>Nie można zapisywać w katalogu &quot;%1&quot;.</translation>
+        <source>Select cover image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>Konwersja nie jest możliwa:</translation>
+        <source>Without cover image</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -578,8 +575,8 @@
         <translation>%1 [ dysk %2 ]</translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
-        <translation>Plik CUE zawiera informacje o wielu dyskach. Którego z nich chcesz użyć?</translation>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -600,14 +597,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>Nie można usunąć pliku:
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Błąd kodeka:
@@ -618,6 +607,12 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation>Nie można odczytać pliku %1</translation>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -666,17 +661,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>Nie można zmienić nazwy pliku:
-%1 na %2
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -757,10 +741,6 @@
         <translation>&amp;Pomoc</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Dodaj plik</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>Dodaj plik CUE lub plik audio</translation>
     </message>
@@ -809,14 +789,6 @@
         <translation>&amp;O programie Flacon</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Usuń album</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Usuń album z projektu</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Del</translation>
     </message>
@@ -980,6 +952,18 @@
         <source>Delete current pattern from history</source>
         <translation>Usuń bieżący wzorzec z historii</translation>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -1009,15 +993,15 @@
         <translation>Wybierz plik programu</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
-        <translation>Program %1</translation>
-    </message>
-    <message>
         <source>All files</source>
         <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation>Wszystkie pliki</translation>
     </message>
+    <message>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1072,12 +1056,35 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation>Plik audio &lt;b&gt;&quot;%1&quot;&lt;/b&gt; nie znaleziony.</translation>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>Liczba ścieżek jest większa niż oczekiwano.</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1204,4 +1211,15 @@
 %1</translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_pt_BR.ts -> flacon-4.0.0.tar.gz/translations/flacon_pt_BR.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>Patch de suporte a WavPack</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Ícone do aplicativo, empacotamento.</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Empacotamento, teste.</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>O número de linhas de execução no processo de conversão.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Diretório temporário:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Codificação padrão:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Intervalo anterior à primeira faixa:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation>Criar um arquivo cue por faixa</translation>
     </message>
+    <message>
+        <source> px</source>
+        <translation> px</translation>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Diretório temporário:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Codificação padrão:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation>Imagem da capa</translation>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation>Não copiar a imagem</translation>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation>Manter o tamanho original da imagem</translation>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation>Diminuir se o tamanho da imagem for maior que</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Configurações de codificação Flac</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Compressão:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>Desabilitado</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation>Configuração da codificação FLAC</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,57 +335,6 @@
         <translation>Predefinição:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation>&lt;dt&gt;VBR médio&lt;/dt&gt;
-&lt;dd&gt;Ao usar uma taxa de bits média variável, esta predefinição deve fornecer uma transparência mais próxima da maioria das pessoas e da maioria das músicas.&lt;/dd&gt;
-
-&lt;dt&gt;VBR padrão, VBR padrão rápido&lt;/dt&gt;
-&lt;dd&gt;Ao usar uma taxa de bits média variável, esta predefinição geralmente oferece transparência para a maioria das pessoas na maioria das músicas e é bastante elevada em qualidade.&lt;/dd&gt;
-
-&lt;dt&gt;VBR extremo, VBR extremo rápido&lt;/dt&gt;
-&lt;dd&gt;Ao usar a maior taxa de bits variável, esta predefinição oferece qualidade ligeiramente maior do que o modo padrão caso você tenha audição extremamente apurada ou equipamentos de áudio topo de linha.&lt;/dd&gt;
-
-&lt;dt&gt;VBR com qualidade&lt;/dt&gt;
-&lt;dd&gt;Esta opção de taxa de bits variável lhe permite especificar a qualidade da saída.&lt;/dd&gt;
-
-&lt;dt&gt;opção rápida&lt;/dt&gt;
-&lt;dd&gt;Habilita o novo e ágil VBR para um perfil específico. Ela é recomendada.&lt;/dd&gt;
-
-&lt;dt&gt;CBR insano&lt;/dt&gt;
-&lt;dd&gt;Se você precisa ter a absoluta maior qualidade, sem se importar com o tamanho do arquivo, você irá alcançá-la usando esta taxa de bits constante.&lt;/dd&gt;
-
-&lt;dt&gt;CBR kbps&lt;/dt&gt;
-&lt;dd&gt;Ao usar esta predefinição de taxa de bits constante, geralmente você obterá boa qualidade à taxas de bits específicas.&lt;/dd&gt;
-
-&lt;dt&gt;ABR kbps&lt;/dt&gt;
-&lt;dd&gt;Ao usar esta predefinição de taxa de bits média, geralmente você obterá qualidade melhor que a opção de taxa de bits constante à taxas de bits específicas.&lt;/dd&gt;
-</translation>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Usar taxa de bits</translation>
     </message>
@@ -433,6 +398,57 @@
         <source>ABR kbps</source>
         <translation>kbps ABR</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation>&lt;dt&gt;VBR médio&lt;/dt&gt;
+&lt;dd&gt;Ao usar uma taxa de bits média variável, esta predefinição deve fornecer uma transparência mais próxima da maioria das pessoas e da maioria das músicas.&lt;/dd&gt;
+
+&lt;dt&gt;VBR padrão, VBR padrão rápido&lt;/dt&gt;
+&lt;dd&gt;Ao usar uma taxa de bits média variável, esta predefinição geralmente oferece transparência para a maioria das pessoas na maioria das músicas e é bastante elevada em qualidade.&lt;/dd&gt;
+
+&lt;dt&gt;VBR extremo, VBR extremo rápido&lt;/dt&gt;
+&lt;dd&gt;Ao usar a maior taxa de bits variável, esta predefinição oferece qualidade ligeiramente maior do que o modo padrão caso você tenha audição extremamente apurada ou equipamentos de áudio topo de linha.&lt;/dd&gt;
+
+&lt;dt&gt;VBR com qualidade&lt;/dt&gt;
+&lt;dd&gt;Esta opção de taxa de bits variável lhe permite especificar a qualidade da saída.&lt;/dd&gt;
+
+&lt;dt&gt;opção rápida&lt;/dt&gt;
+&lt;dd&gt;Habilita o novo e ágil VBR para um perfil específico. Ela é recomendada.&lt;/dd&gt;
+
+&lt;dt&gt;CBR insano&lt;/dt&gt;
+&lt;dd&gt;Se você precisa ter a absoluta maior qualidade, sem se importar com o tamanho do arquivo, você irá alcançá-la usando esta taxa de bits constante.&lt;/dd&gt;
+
+&lt;dt&gt;CBR kbps&lt;/dt&gt;
+&lt;dd&gt;Ao usar esta predefinição de taxa de bits constante, geralmente você obterá boa qualidade à taxas de bits específicas.&lt;/dd&gt;
+
+&lt;dt&gt;ABR kbps&lt;/dt&gt;
+&lt;dd&gt;Ao usar esta predefinição de taxa de bits média, geralmente você obterá qualidade melhor que a opção de taxa de bits constante à taxas de bits específicas.&lt;/dd&gt;
+</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -556,16 +572,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>Não foi possível criar o diretório &quot;%1&quot;.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>Conversão não é possível:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>Não foi possível gravar no diretório &quot;%1&quot;</translation>
+        <source>Select cover image</source>
+        <translation>Selecione a imagem da capa</translation>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>Conversão não é possível:</translation>
+        <source>Without cover image</source>
+        <translation>Sem imagem da capa</translation>
     </message>
 </context>
 <context>
@@ -580,8 +599,8 @@
         <translation>%1 [ disco %2 ]</translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
-        <translation>O arquivo cue contém informações de vários discos. Qual disco deseja usar?</translation>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
+        <translation>O arquivo CUE contém informações de vários discos. Qual disco deseja usar?</translation>
     </message>
 </context>
 <context>
@@ -602,14 +621,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>Não foi possível excluir o arquivo:
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Erro do codificador:
@@ -620,6 +631,14 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation>Não foi possível ler %1 arquivos</translation>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation>Não foi possível renomear o arquivo:
+%1 para %2
+%3</translation>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -665,17 +684,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>Não foi possível renomear o arquivo:
-%1 para %2
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -755,10 +763,6 @@
         <translation>A&amp;juda</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Adicionar arquivo</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>Adicione arquivo CUE ou áudio</translation>
     </message>
@@ -807,14 +811,6 @@
         <translation>So&amp;bre o Flacon</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Remover álbum</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Remover álbum do projeto</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Del</translation>
     </message>
@@ -978,6 +974,18 @@
         <source>Delete current pattern from history</source>
         <translation>Apagar o padrão atual do histórico</translation>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation>Adicionar disco</translation>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation>Remover  disco</translation>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation>Remover disco do projeto</translation>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -1007,15 +1015,15 @@
         <translation>Selecione o arquivo do programa</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
-        <translation>%1 programa</translation>
-    </message>
-    <message>
         <source>All files</source>
         <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation>Todos os arquivos</translation>
     </message>
+    <message>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
+        <translation>programa %1</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1070,12 +1078,35 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation>O arquivo de áudio &lt;b&gt;&quot;%1&quot;&lt;/b&gt; não existe</translation>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation>Não foi possível criar o diretório &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation>Não foi possível gravar no diretório &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation>Não foi possível copiar a imagem da capa &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation>Não foi possível ler a imagem da capa &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation>Não foi possível salvar a imagem da capa &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>O número de faixas é maior do que o esperado.</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation>Não foi possível acessar &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
     </message>
 </context>
 <context>
@@ -1202,4 +1233,15 @@
 %1</translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation>Não foi possível criar o diretório &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation>Não foi possível gravar no diretório &quot;%1&quot;</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_pt_PT.ts -> flacon-4.0.0.tar.gz/translations/flacon_pt_PT.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_PT" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_PT" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>Suporte ao patch do WavPack</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Ícone da aplicação, Empacotamento</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Empacotamento, testes</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>Número de tarefas no processo conversão.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Pasta temporária:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Página de código padrão:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Intervalo da primeira faixa:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Pasta temporária:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Página de código padrão:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Configuração da codificação Flac</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Compressão:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>Desactivado</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,57 +335,6 @@
         <translation>Opção:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation>&lt;dt&gt;VBR médio&lt;/dt&gt;
-&lt;dd&gt;Se utilizar uma taxa de bits variável média, a fidelidade do som obtido será quase perfeito, na maior parte da músicas e para a maioria das pessoas.&lt;/dd&gt;
-
-&lt;dt&gt;VBR padrão, VBR padrão rápido&lt;/dt&gt;
-&lt;dd&gt;Se usar uma taxa de bits variável padrão, a fidelidade do som obtido será quase perfeito, na maior parte da músicas e para a maioria das pessoas, já é uma qualidade bastante alta.&lt;/dd&gt;
-
-&lt;dt&gt;VBR elevado, VBR elevado rápido&lt;/dt&gt;
-&lt;dd&gt;Se usar uma máxima taxa de bits variável, obterá uma qualidade um pouco mais alta do que a opção padrão.&lt;/dd&gt;
-
-&lt;dt&gt;VBR qualidade&lt;/dt&gt;
-&lt;dd&gt;Esta opção permite que escolher a qualidade.&lt;/dd&gt;
-
-&lt;dt&gt;opção rápido&lt;/dt&gt;
-&lt;dd&gt;Activa a opção &apos;VBR rápido&apos; para um determinado perfil. Recomendado.&lt;/dd&gt;
-
-&lt;dt&gt;CBR demente&lt;/dt&gt;
-&lt;dd&gt;Escolha esta opção para obter a qualidade máxima sem se preocupar com o tamanho do ficheiro.&lt;/dd&gt;
-
-&lt;dt&gt;CBR kbps&lt;/dt&gt;
-&lt;dd&gt;Se usar esta opção obterá uma boa qualidade para a taxa de bits escolhida.&lt;/dd&gt;
-
-&lt;dt&gt;ABR kbps&lt;/dt&gt;
-&lt;dd&gt;Se usar esta opção obterá uma qualidade superior à opção &apos;CBR kbps&apos;, para a mesma taxa de bits.dd&gt;
-</translation>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Usar taxa de bits</translation>
     </message>
@@ -433,6 +398,34 @@
         <source>ABR kbps</source>
         <translation>ABR kbps</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -552,16 +545,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>Não posso criar a pasta %1.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>Não é possível converter:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>Não posso escrever na pasta %1.</translation>
+        <source>Select cover image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>Não é possível converter:</translation>
+        <source>Without cover image</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -576,8 +572,8 @@
         <translation>%1 [ disco %2 ]</translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
-        <translation>O ficheiro cue contém informação sobre vários discos. Qual destes deseja usar? </translation>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -598,14 +594,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>Não posso apagar o ficheiro:
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Erro na codificação:
@@ -616,6 +604,12 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation>Não posso ler o ficheiro %1</translation>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -664,17 +658,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>Não posso mudar o nome do ficheiro:
-%1 para %2
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -755,10 +738,6 @@
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Adicionar ficheiro</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>Adicionar ficheiro CUE ou áudio</translation>
     </message>
@@ -807,14 +786,6 @@
         <translation>&amp;Sobre o Flacon</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Remover álbum</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Remover álbum do projecto</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Del</translation>
     </message>
@@ -976,6 +947,18 @@
         <source>Delete current pattern from history</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -1005,15 +988,15 @@
         <translation>Escolher o ficheiro do programa</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>All files</source>
         <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation>Todos os ficheiros</translation>
     </message>
+    <message>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1068,12 +1051,35 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation>O ficheiro áudio &lt;b&gt;&quot;%1&quot;&lt;/b&gt; não existe</translation>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>O número de faixas é superior ao esperado.</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1200,4 +1206,15 @@
 %1</translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_ro_RO.ts -> flacon-4.0.0.tar.gz/translations/flacon_ro_RO.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ro_RO" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ro_RO" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>Suport WavPack</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Pictogramă aplicație, creare fișiere binare</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Creare fișiere binare, testare</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>Numărul de fire de execuție în procesul de conversie.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Dosar temporar:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Codare implicită caractere:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Pauză înainte de prima pistă:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation>Creare listă de indexare pentru fiecare pistă</translation>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Dosar temporar:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Codare implicită caractere:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Configurare codare FLAC</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Comprimare:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>Dezactivat</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,57 +335,6 @@
         <translation>Preconfigurare:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation>&lt;dt&gt;RBV mediu&lt;/dt&gt;
-&lt;dd&gt;Această pre-configurare este potrivită de obicei pentru toate tipurile de fișiere audio. .&lt;/dd&gt;
-
-&lt;dt&gt;RBV standard, RBV standard rapid&lt;dt&gt;
-&lt;dd&gt;Această pre-configurare este potrivită de obicei pentru toate tipurile de fișiere audio, având deja o calitate destul de bună a sunetului&lt;/dd&gt;
-
-&lt;dt&gt;RBV extremă, RBV extremă rapidă&lt;/dt&gt;
-&lt;dd&gt;Este nivelul cel mai înalt al RBV, care oferă o calitate puțin mia bună decât configurarea standard, dacă aveți auz extrem de fin sau echipamente audio de înaltă calitate..&lt;/dd&gt;
-
-&lt;dt&gt;Calitate RBV/dt&gt;
-&lt;dd&gt;Puteți selectat calitatea RBV dorită a fișierului audio rezultat.&lt;/dd&gt;
-
-&lt;dt&gt;rapid&lt;/dt&gt;
-&lt;dd&gt;Permite activarea RBV rapidă pentru un profil. (recomandat)&lt;/dd&gt;
-
-&lt;dt&gt;RBF „nebună”&lt;/dt&gt;
-&lt;dd&gt; utilizați această configurare dacă tot ce vreți este cea mai bună calitate a sunetului și nu vă interesează mărimea fișierului rezultat.&lt;/dd&gt;
-
-&lt;dt&gt;RBF kbps&lt;/dt&gt;
-&lt;dd&gt;Oferă o calitate a sunetului destul de bună la o rată de biți fixă.&lt;/dd&gt;
-
-&lt;dt&gt;RBM kbps&lt;/dt&gt;
-&lt;dd&gt;Oferă de obicei o calitate a sunetului mai bună decât opțiunea RBF pentru o rată de biți specificată.&lt;/dd&gt;
-</translation>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Utilizare rată de biți</translation>
     </message>
@@ -433,6 +398,57 @@
         <source>ABR kbps</source>
         <translation>RBM kbps</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation>&lt;dt&gt;RBV mediu&lt;/dt&gt;
+&lt;dd&gt;Această pre-configurare este potrivită de obicei pentru toate tipurile de fișiere audio. .&lt;/dd&gt;
+
+&lt;dt&gt;RBV standard, RBV standard rapid&lt;dt&gt;
+&lt;dd&gt;Această pre-configurare este potrivită de obicei pentru toate tipurile de fișiere audio, având deja o calitate destul de bună a sunetului&lt;/dd&gt;
+
+&lt;dt&gt;RBV extremă, RBV extremă rapidă&lt;/dt&gt;
+&lt;dd&gt;Este nivelul cel mai înalt al RBV, care oferă o calitate puțin mia bună decât configurarea standard, dacă aveți auz extrem de fin sau echipamente audio de înaltă calitate..&lt;/dd&gt;
+
+&lt;dt&gt;Calitate RBV/dt&gt;
+&lt;dd&gt;Puteți selectat calitatea RBV dorită a fișierului audio rezultat.&lt;/dd&gt;
+
+&lt;dt&gt;rapid&lt;/dt&gt;
+&lt;dd&gt;Permite activarea RBV rapidă pentru un profil. (recomandat)&lt;/dd&gt;
+
+&lt;dt&gt;RBF „nebună”&lt;/dt&gt;
+&lt;dd&gt; utilizați această configurare dacă tot ce vreți este cea mai bună calitate a sunetului și nu vă interesează mărimea fișierului rezultat.&lt;/dd&gt;
+
+&lt;dt&gt;RBF kbps&lt;/dt&gt;
+&lt;dd&gt;Oferă o calitate a sunetului destul de bună la o rată de biți fixă.&lt;/dd&gt;
+
+&lt;dt&gt;RBM kbps&lt;/dt&gt;
+&lt;dd&gt;Oferă de obicei o calitate a sunetului mai bună decât opțiunea RBF pentru o rată de biți specificată.&lt;/dd&gt;
+</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -556,16 +572,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>Nu se poate crea dosarul „%1”.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>Conversia nu este posibilă:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>Nu se poate scrie în dosarul „%1”.</translation>
+        <source>Select cover image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>Conversia nu este posibilă:</translation>
+        <source>Without cover image</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -580,8 +599,8 @@
         <translation>%1 [ disc %2 ]</translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
-        <translation>Lista de indexare conține informații despre mai multe discuri. Alegeți discul dorit.</translation>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -602,14 +621,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>Nu se poate șterge fișierul:
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Eroare de codare:
@@ -620,6 +631,12 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation>Nu se poate citi fișierul %1</translation>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -668,17 +685,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>Nu se poate redenumi fișierul:
-%1 to %2
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -759,10 +765,6 @@
         <translation>&amp;Ajutor</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Adaugă fișier</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>Adăugare fișier audio sau listă de indexare</translation>
     </message>
@@ -811,14 +813,6 @@
         <translation>&amp;Despre Flacon</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Eliminați album</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Eliminați toate albumele din proiect</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Del</translation>
     </message>
@@ -982,6 +976,18 @@
         <source>Delete current pattern from history</source>
         <translation>Șterge modelul curent din istoricul activităților</translation>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -1011,15 +1017,15 @@
         <translation>Alegeți aplicația</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
-        <translation>Program(ul) %1</translation>
-    </message>
-    <message>
         <source>All files</source>
         <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation>Toate fișierele</translation>
     </message>
+    <message>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1074,12 +1080,35 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation>Fișierul audio &lt;b&gt;&quot;%1&quot;&lt;/b&gt; nu există</translation>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>Numărul de piste este mai mare decât cel așteptat.</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1206,4 +1235,15 @@
 %1</translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_ru.ts -> flacon-4.0.0.tar.gz/translations/flacon_ru.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>Патч для поддержки WavPack</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Иконка для программы, пакетирование</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Пакетирование, тестирование</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>Количество потоков в процессе конвертации.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Временная директория:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Кодировка по умолчанию:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Прегап первого трека:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation>Создавать потрековый CUE</translation>
     </message>
+    <message>
+        <source> px</source>
+        <translation>px</translation>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Временная директория:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Кодировка по умолчанию:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation>Обложка</translation>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation>Не копировать</translation>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation>В оригинальном размере</translation>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation>Масштабировать если картинка больше чем</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Настройки конвертации во FLAC</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Сжатие:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>Отключен</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation>Настройки конвертации во FLAC</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,56 +335,6 @@
         <translation>Пресет:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation>&lt;dt&gt;VBR medium&lt;/dt&gt;
-&lt;dd&gt;При использовании режима со средним переменным битрейтом, большинство людей не услышат искажений на большинстве музыки.&lt;/dd&gt;
-
-&lt;dt&gt;VBR standard, VBR standard fast&lt;/dt&gt;
-&lt;dd&gt;При использовании режима со страндартным переменным битрейтом, большинство людей не услышат искажений на большинстве музыки. Этот режим обеспечивает довольно высокое качество.&lt;/dd&gt;
-
-&lt;dt&gt;VBR extreme, VBR extreme fast&lt;/dt&gt;
-&lt;dd&gt;Этот режим дает более высокое качество чем VBR standard. Вы заметите это, если у вас очень хороший слух, или аппаратура высокого класса.&lt;/dd&gt;
-
-&lt;dt&gt;VBR quality&lt;/dt&gt;
-&lt;dd&gt;В этом режиме Вы можете сами задать качество звука, при этом используется переменный битрейт.&lt;/dd&gt;
-
-&lt;dt&gt;fast option&lt;/dt&gt;
-&lt;dd&gt;Рекомендуем использовать режимы с &quot;fast option&quot;, они используют новый, быстрый алгоритм VBR.&lt;/dd&gt;
-
-&lt;dt&gt;CBR insane&lt;/dt&gt;
-&lt;dd&gt;Если Вы хотите получить максимальное качество звука, а размер файла значения не имеет, используйте этот режим с постоянным битрейтом.&lt;/dd&gt;
-
-&lt;dt&gt;CBR kbps&lt;/dt&gt;
-&lt;dd&gt;Использование этого режима с постоянным битрейтом, даст хорошее качество при фиксированном битейте.&lt;/dd&gt;
-
-&lt;dt&gt;ABR kbps&lt;/dt&gt;
-&lt;dd&gt;Обычно, этот режим с усредненным битрейтом дает лучшее качество чем режимы с постоянным битрейтом.&lt;/dd&gt;</translation>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Установить битрейт</translation>
     </message>
@@ -432,6 +398,56 @@
         <source>ABR kbps</source>
         <translation>ABR kbps</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation>&lt;dt&gt;VBR medium&lt;/dt&gt;
+&lt;dd&gt;При использовании режима со средним переменным битрейтом, большинство людей не услышат искажений на большинстве музыки.&lt;/dd&gt;
+
+&lt;dt&gt;VBR standard, VBR standard fast&lt;/dt&gt;
+&lt;dd&gt;При использовании режима со страндартным переменным битрейтом, большинство людей не услышат искажений на большинстве музыки. Этот режим обеспечивает довольно высокое качество.&lt;/dd&gt;
+
+&lt;dt&gt;VBR extreme, VBR extreme fast&lt;/dt&gt;
+&lt;dd&gt;Этот режим дает более высокое качество чем VBR standard. Вы заметите это, если у вас очень хороший слух, или аппаратура высокого класса.&lt;/dd&gt;
+
+&lt;dt&gt;VBR quality&lt;/dt&gt;
+&lt;dd&gt;В этом режиме Вы можете сами задать качество звука, при этом используется переменный битрейт.&lt;/dd&gt;
+
+&lt;dt&gt;fast option&lt;/dt&gt;
+&lt;dd&gt;Рекомендуем использовать режимы с &quot;fast option&quot;, они используют новый, быстрый алгоритм VBR.&lt;/dd&gt;
+
+&lt;dt&gt;CBR insane&lt;/dt&gt;
+&lt;dd&gt;Если Вы хотите получить максимальное качество звука, а размер файла значения не имеет, используйте этот режим с постоянным битрейтом.&lt;/dd&gt;
+
+&lt;dt&gt;CBR kbps&lt;/dt&gt;
+&lt;dd&gt;Использование этого режима с постоянным битрейтом, даст хорошее качество при фиксированном битейте.&lt;/dd&gt;
+
+&lt;dt&gt;ABR kbps&lt;/dt&gt;
+&lt;dd&gt;Обычно, этот режим с усредненным битрейтом дает лучшее качество чем режимы с постоянным битрейтом.&lt;/dd&gt;</translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -555,16 +571,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>Не получается создать директорию &quot;%1&quot;.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>Конвертация невозможна:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>Не получается писать в директорию &quot;%1&quot;.</translation>
+        <source>Select cover image</source>
+        <translation>Обложка диска</translation>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>Конвертация невозможна:</translation>
+        <source>Without cover image</source>
+        <translation>Без обложки</translation>
     </message>
 </context>
 <context>
@@ -579,7 +598,7 @@
         <translation>%1 [ диск %2 ]</translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
         <translation>CUE содержит несколько дисков. Какой диск Вы хотите использовать?</translation>
     </message>
 </context>
@@ -601,14 +620,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>Не получается удалить файл:
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Ошибка кодирования:</translation>
@@ -618,6 +629,14 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation>Не получается прочитать &quot;%1&quot;</translation>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation>Не получается переименовать файл:
+%1 в %2
+%3</translation>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -666,17 +685,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>Не получается переименовать файл:
-%1 в %2
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -756,10 +764,6 @@
         <translation>&amp;Справка</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Добавить файл</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>Добавить CUE или аудиофайл</translation>
     </message>
@@ -808,14 +812,6 @@
         <translation>О &amp;flacon</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Удалить альбом</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Удалить альбом из проекта</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Del</translation>
     </message>
@@ -979,6 +975,18 @@
         <source>Delete current pattern from history</source>
         <translation>Удалить текущий шаблон из истории.</translation>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation>Добавить диск</translation>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation>Удалить диск</translation>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation>Удалить диск из проекта</translation>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -1008,15 +1016,15 @@
         <translation>Укажите файл программы</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
-        <translation>программа %1</translation>
-    </message>
-    <message>
         <source>All files</source>
         <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation>Все файлы</translation>
     </message>
+    <message>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
+        <translation>программа %1</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1071,12 +1079,35 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation>Аудио файл &lt;b&gt;%1&lt;/b&gt; не существует.</translation>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation>Не получается создать директорию &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation>Не получается писать в директорию &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation>Не получается скопировать файл обложки &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation>Не получается прочитать файл обложки &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation>Не получается записать файл обложки &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>Количество треков больше чем я ожидал.</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation>Не получается прочитать &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</translation>
     </message>
 </context>
 <context>
@@ -1203,4 +1234,15 @@
 %1</translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation>Не получается создать директорию &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation>Не получается писать в директорию &quot;%1&quot;.</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_sr.ts -> flacon-4.0.0.tar.gz/translations/flacon_sr.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="sr" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="sr" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>Закрпа за ВавПак подршку</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Икона програма, пакирање</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Пакирање, тестирање</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>Број нити процеса претварања.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Привремена фасцикла:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Подразумевана кодна страница:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Предпразнина прве нумере:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation>Направи ЦУЕ за сваку нумеру</translation>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Привремена фасцикла:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Подразумевана кодна страница:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Подешавање кодирања у Флац</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Компресија:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>онемогућено</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,34 +335,6 @@
         <translation>Предподешавање:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Користи битски проток</translation>
     </message>
@@ -410,6 +398,34 @@
         <source>ABR kbps</source>
         <translation>ПрБП</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -524,16 +540,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>Не могу да направим фасциклу „%1“.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>Претварање није погуће:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>Не могу да пишем у фасциклу „%1“.</translation>
+        <source>Select cover image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>Претварање није погуће:</translation>
+        <source>Without cover image</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -548,8 +567,8 @@
         <translation>%1 [ диск %2 ]</translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
-        <translation>ЦУЕ фајл саджи податке о више дискова. Који диск желите да користите?</translation>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -570,14 +589,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>Не могу да обришем фајл:\n
-%1\n
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Грешка кодера:\n
@@ -588,6 +599,12 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation>Не могу да читам фајл %1</translation>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -635,17 +652,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>Не могу да преименујем фајл:\n
-%1 у %2\n
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -725,10 +731,6 @@
         <translation>&amp;Помоћ</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Додај фајл</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>Додавање аудио или ЦУЕ фајла</translation>
     </message>
@@ -777,14 +779,6 @@
         <translation>&amp;О Флакону</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Уклони албум</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Уклања албум из пројекта</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>ктрл+дел</translation>
     </message>
@@ -930,6 +924,18 @@
         <source>Delete current pattern from history</source>
         <translation>Избриши текући образац из историјата</translation>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -959,15 +965,15 @@
         <translation>Изаберите фајл програма</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
-        <translation>%1 програм</translation>
-    </message>
-    <message>
         <source>All files</source>
         <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation>Сви фајлови</translation>
     </message>
+    <message>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1022,12 +1028,35 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation>Аудио фајл &lt;b&gt;„%1“&lt;/b&gt; не постоји</translation>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>Број стаза је већи од очекиваног.</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1154,4 +1183,15 @@
 %1</translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_sr@latin.ts -> flacon-4.0.0.tar.gz/translations/flacon_sr@latin.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="sr@latin" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="sr@latin" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>Zakrpa za VavPak podršku</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Ikona programa, pakiranje</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Pakiranje, testiranje</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>Broj niti procesa pretvaranja.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Privremena fascikla:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Podrazumevana kodna stranica:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Predpraznina prve numere:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation>Napravi CUE za svaku numeru</translation>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Privremena fascikla:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Podrazumevana kodna stranica:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Podešavanje kodiranja u Flac</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Kompresija:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>onemogućeno</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,34 +335,6 @@
         <translation>Predpodešavanje:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Koristi bitski protok</translation>
     </message>
@@ -410,6 +398,34 @@
         <source>ABR kbps</source>
         <translation>PrBP</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -524,16 +540,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>Ne mogu da napravim fasciklu „%1“.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>Pretvaranje nije poguće:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>Ne mogu da pišem u fasciklu „%1“.</translation>
+        <source>Select cover image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>Pretvaranje nije poguće:</translation>
+        <source>Without cover image</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -548,8 +567,8 @@
         <translation>%1 [ disk %2 ]</translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
-        <translation>CUE fajl sadži podatke o više diskova. Koji disk želite da koristite?</translation>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -570,14 +589,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>Ne mogu da obrišem fajl:\n
-%1\n
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Greška kodera:\n
@@ -588,6 +599,12 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation>Ne mogu da čitam fajl %1</translation>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -635,17 +652,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>Ne mogu da preimenujem fajl:\n
-%1 u %2\n
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -725,10 +731,6 @@
         <translation>&amp;Pomoć</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Dodaj fajl</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>Dodavanje audio ili CUE fajla</translation>
     </message>
@@ -777,14 +779,6 @@
         <translation>&amp;O Flaconu</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Ukloni album</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Uklanja album iz projekta</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>ktrl+del</translation>
     </message>
@@ -930,6 +924,18 @@
         <source>Delete current pattern from history</source>
         <translation>Izbriši tekući obrazac iz istorijata</translation>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -959,15 +965,15 @@
         <translation>Izaberite fajl programa</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
-        <translation>%1 program</translation>
-    </message>
-    <message>
         <source>All files</source>
         <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation>Svi fajlovi</translation>
     </message>
+    <message>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1022,12 +1028,35 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation>Audio fajl &lt;b&gt;„%1“&lt;/b&gt; ne postoji</translation>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>Broj staza je veći od očekivanog.</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1154,4 +1183,15 @@
 %1</translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_tr.ts -> flacon-4.0.0.tar.gz/translations/flacon_tr.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="tr" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="tr" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>WavPack destek yaması</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Uygulama simgesi, Paketleme</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Paketleme, sınama</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>Dönüşüm işlemindeki iş parçacığı sayısı.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Geçici dizin:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Varsayılan kod sayfası:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>İlk izin boşluğu:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Geçici dizin:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Varsayılan kod sayfası:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Flac kodlama yapılandırması</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Sıkıştırma:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>Devre dışı</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,34 +335,6 @@
         <translation>Ön ayar:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Bit hızı kullanılsın</translation>
     </message>
@@ -410,6 +398,34 @@
         <source>ABR kbps</source>
         <translation>ABR kbps</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -524,15 +540,18 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <source>Conversion is not possible:</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <source>Select cover image</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
+        <source>Without cover image</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -548,7 +567,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -570,12 +589,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation type="unfinished"/>
@@ -585,6 +598,12 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -629,15 +648,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -717,10 +727,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Add file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation type="unfinished"/>
     </message>
@@ -769,14 +775,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation type="unfinished"/>
     </message>
@@ -921,6 +919,18 @@
         <source>Delete current pattern from history</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -950,13 +960,13 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
+        <source>All files</source>
+        <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1013,11 +1023,34 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1144,4 +1177,15 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_uk.ts -> flacon-4.0.0.tar.gz/translations/flacon_uk.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="uk" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="uk" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>Латка для підтримки WavPack</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>Піктограма для проґрами, пакування</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>Пакування, тестування.</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>Кількість потоків під час конвертації.</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>Тимчасова тека:</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>Типове кодування:</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>Прегап першої доріжки:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation>Створювати потрековий CUE</translation>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>Тимчасова тека:</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>Типове кодування:</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Налаштування кодування FLAC</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>Стиснення:</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>Вимкнено</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,57 +335,6 @@
         <translation>Пресет:</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation>&lt;dt&gt;VBR medium&lt;/dt&gt;
-&lt;dd&gt;При використанні режиму з середнім змінним бітрейтом, більшість людей не почують спотворень на більшости музики.&lt;/dd&gt;
-
-&lt;dt&gt;VBR standard, VBR standard fast&lt;/dt&gt;
-&lt;dd&gt;При використанні режиму зі страндартним змінним бітрейтом, більшість людей не почують спотворень на більшости музики. Цей режим забезпечує досить високу якість.&lt;/dd&gt;
-
-&lt;dt&gt;VBR extreme, VBR extreme fast&lt;/dt&gt;
-&lt;dd&gt;Цей режим дає вищу якість ніж VBR standard. Ви помітите це, якщо в Вас дуже добрий слух, або високоякісна апаратура.&lt;/dd&gt;
-
-&lt;dt&gt;VBR quality&lt;/dt&gt;
-&lt;dd&gt;У цьому режимі Ви можете самі вказати якість звуку, при цьому використовується змінний бітрейт.&lt;/dd&gt;
-
-&lt;dt&gt;fast option&lt;/dt&gt;
-&lt;dd&gt;Рекомендуємо використовувати режими з &quot;fast option&quot;, вони використовують новий, швидкий алгоритм VBR.&lt;/dd&gt;
-
-&lt;dt&gt;CBR insane&lt;/dt&gt;
-&lt;dd&gt;Якщо Ви бажаєте отримати максимальну якість звуку, а розмір файлу значення не має, використовуйте цей режим з постійним бітрейтом.&lt;/dd&gt;
-
-&lt;dt&gt;CBR kbps&lt;/dt&gt;
-&lt;dd&gt;Використання цього режиму з постійним бітрейтом, дасть добру якість при фіксованому бітейті.&lt;/dd&gt;
-
-&lt;dt&gt;ABR kbps&lt;/dt&gt;
-&lt;dd&gt;Зазвичай, цей режим з усередненим бітрейтом дає кращу якість ніж режими з постійним бітрейтом.&lt;/dd&gt;
-</translation>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>Вказати бітрейт</translation>
     </message>
@@ -433,6 +398,34 @@
         <source>ABR kbps</source>
         <translation>ABR кбіт/с</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -556,16 +549,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>Не вдається створити теку &quot;%1&quot;.</translation>
+        <source>Conversion is not possible:</source>
+        <translation>Конвертація неможлива:</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>Не вдається писати у теку &quot;%1&quot;.</translation>
+        <source>Select cover image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>Конвертація неможлива:</translation>
+        <source>Without cover image</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -580,8 +576,8 @@
         <translation>%1 [ диск %2 ]</translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
-        <translation>CUE містить декілька дисків. Який диск Ви волієте використовувати?</translation>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -602,14 +598,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>Не вдається вилучити файл:
-%1
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>Помилка кодування:
@@ -620,6 +608,12 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation>Не вдається прочитати &quot;%1&quot;</translation>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -668,17 +662,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>Не вдається перейменувати файл:
-%1 на %2
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -759,10 +742,6 @@
         <translation>&amp;Довідка</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>Додати файл</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>Додати CUE чи аудіо файл</translation>
     </message>
@@ -811,14 +790,6 @@
         <translation>&amp;Про Flacon</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>Вилучити альбом</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>Вилучити альбом з проєкту</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Del</translation>
     </message>
@@ -982,6 +953,18 @@
         <source>Delete current pattern from history</source>
         <translation>Вилучити поточний шабльон з історії.</translation>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -1011,15 +994,15 @@
         <translation>Вкажіть файл проґрами</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
-        <translation>%1 проґрама</translation>
-    </message>
-    <message>
         <source>All files</source>
         <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation>Усі файли</translation>
     </message>
+    <message>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1074,12 +1057,35 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation>Аудіо файл &lt;b&gt;%1&lt;/b&gt; не існує.</translation>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>Кількість доріжок більша ніж я очікував.</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1206,4 +1212,15 @@
 %1</translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_zh_CN.ts -> flacon-4.0.0.tar.gz/translations/flacon_zh_CN.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation>WavPach 支持补丁</translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation>应用程序图标，程序打包。</translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation>打包和测试。</translation>
     </message>
@@ -214,14 +210,6 @@
         <translation>线程数</translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation>临时目录：</translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation>默认字符编码</translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation>第一个音轨的片首留白:</translation>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation>为每个音轨创建 cue 表</translation>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation>临时目录：</translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation>默认字符编码</translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation>Flac 编码设置</translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation>压缩：</translation>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation>禁用</translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,56 +335,6 @@
         <translation>预设</translation>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation>&lt;dt&gt;中等 VBR 模式&lt;/dt&gt;⏎
-&lt;dd&gt;比特率适中, 满足大多数人的需要.&lt;/dd&gt;⏎
-⏎
-&lt;dt&gt;标准 VBR 模式, 快速标准 VBR 模式&lt;/dt&gt;⏎
-&lt;dd&gt;标准比特率, 满足大多数人大多数音乐的需要, 而且音质不错.&lt;/dd&gt;⏎
-⏎
-&lt;dt&gt;极佳 VBR 模式, 快速极佳 VBR 模式&lt;/dt&gt;⏎
-&lt;dd&gt;比特率最高的设定, 适合听力极佳或要求极高的人和高端音频设备 .&lt;/dd&gt;⏎
-⏎
-&lt;dt&gt;VBR 质量&lt;/dt&gt;⏎
-&lt;dd&gt;用于设置输出文件的比特率.&lt;/dd&gt;⏎
-⏎
-&lt;dt&gt;快速选项&lt;/dt&gt;⏎
-&lt;dd&gt;是否使用快速模式, 推荐使用.&lt;/dd&gt;⏎
-⏎
-&lt;dt&gt;极佳 CBR 模式&lt;/dt&gt;⏎
-&lt;dd&gt;获得最高恒定比特率和最高音质的音频文件, 输出文件可能占空间比较大 .&lt;/dd&gt;⏎
-⏎
-&lt;dt&gt;CBR kbps&lt;/dt&gt;⏎
-&lt;dd&gt;获得指定比特率的音频文件.&lt;/dd&gt;⏎
-⏎
-&lt;dt&gt;ABR kbps&lt;/dt&gt;⏎
-&lt;dd&gt;通过特殊算法获得相同比特率情况下比CBR音质更高的音频文件.&lt;dd&gt;</translation>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation>使用固定码率模式</translation>
     </message>
@@ -432,6 +398,34 @@
         <source>ABR kbps</source>
         <translation>ABR kbps</translation>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -555,16 +549,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation>不能创建目录。</translation>
+        <source>Conversion is not possible:</source>
+        <translation>无法转换：</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
-        <translation>不能写入目录 &quot;%1&quot;。</translation>
+        <source>Select cover image</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>无法转换：</translation>
+        <source>Without cover image</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -579,8 +576,8 @@
         <translation>%1 [ 磁盘 %2 ]</translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
-        <translation>该 cue 文件包含多个磁盘的信息。您想使用哪个磁盘？</translation>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -601,14 +598,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation>不能删除文件：⏎
-%1⏎
-%2</translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation>编码错误:⏎
@@ -619,6 +608,14 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation>我无法读取 &quot;%1&quot; 文件</translation>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation>无法重命名文件:
+%1 到 %2
+%3</translation>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -667,17 +664,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation>无法重命名文件:⏎
-%1 到 %2⏎
-%3</translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -757,10 +743,6 @@
         <translation>帮助(&amp;H)</translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation>添加文件</translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation>添加 CUE 或音频文件</translation>
     </message>
@@ -809,14 +791,6 @@
         <translation>关于 Flacon (&amp;A)</translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation>移除专辑</translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation>从工程中移除专辑</translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation>Ctrl+Del</translation>
     </message>
@@ -980,6 +954,18 @@
         <source>Delete current pattern from history</source>
         <translation>从历史中删除当前范例</translation>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -1009,15 +995,15 @@
         <translation>选择程序文件</translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
-        <translation>%1 程序</translation>
-    </message>
-    <message>
         <source>All files</source>
         <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation>所有文件</translation>
     </message>
+    <message>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
+        <translation>1% 程序</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1072,12 +1058,35 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation>音频文件 &lt;b&gt;&quot;%1&quot;&lt;/b&gt; 不存在</translation>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation>无法创建目录“%1”。</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation>无法写入目录“%1”。</translation>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
-        <translation>曲目的数目大于预期.</translation>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
+        <translation>无法读取 &lt;b&gt;%1&lt;/b&gt;：&lt;br&gt;%2</translation>
     </message>
 </context>
 <context>
@@ -1204,4 +1213,15 @@
 %1</translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation>无法创建目录“%1”。</translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation>无法写入目录“%1”。</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/flacon_zh_TW.ts -> flacon-4.0.0.tar.gz/translations/flacon_zh_TW.ts Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_TW" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_TW" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -54,10 +54,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation type="unfinished"/>
     </message>
@@ -214,14 +210,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation type="unfinished"/>
     </message>
@@ -261,6 +249,34 @@
         <source>Create per track cue sheet</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -288,10 +304,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation type="unfinished"/>
     </message>
@@ -307,6 +319,10 @@
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -319,34 +335,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation type="unfinished"/>
     </message>
@@ -410,6 +398,34 @@
         <source>ABR kbps</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>&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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -524,16 +540,19 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
-        <translation type="unfinished"/>
+        <source>Conversion is not possible:</source>
+        <translation>無法轉換：</translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <source>Select cover image</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
-        <translation>無法轉換：</translation>
+        <source>Without cover image</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -548,7 +567,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -570,12 +589,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can't delete file:
-%1
-%2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation type="unfinished"/>
@@ -585,6 +598,12 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>I can't rename file:
+%1 to %2
+%3</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -633,15 +652,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can't rename file:
-%1 to %2
-%3</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -721,10 +731,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Add file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation type="unfinished"/>
     </message>
@@ -773,14 +779,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation type="unfinished"/>
     </message>
@@ -925,6 +923,18 @@
         <source>Delete current pattern from history</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -954,13 +964,13 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'shntool program (shntool)'</comment>
+        <source>All files</source>
+        <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <comment>This is part of filter for 'select program' dialog. 'All files (*)'</comment>
+        <source>%1 program</source>
+        <comment>This is part of filter for 'select program' dialog. %1 is a name of required program. Example: 'flac program (flac)'</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1017,11 +1027,34 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1148,4 +1181,15 @@
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 </TS>
\ No newline at end of file

flacon-3.1.1.tar.gz/translations/src.flacon.ts -> flacon-4.0.0.tar.gz/translations/src.flacon.ts Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -56,10 +56,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Application icon, Packaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Packaging, testing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -216,14 +212,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Temporary directory:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default codepage:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>First track pregap:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -263,6 +251,34 @@
         <source>Create per track cue sheet</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Temporary directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default codepage:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cover image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do not copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keep original image size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resize if image size greater than</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Aac</name>
@@ -290,10 +306,6 @@
 <context>
     <name>ConfigPage_Flac</name>
     <message>
-        <source>Flac encoding configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Compression:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -309,6 +321,10 @@
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>FLAC encoding configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Mp3</name>
@@ -321,34 +337,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&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&apos;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;
-</source>
-        <extracomment>ererere</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Use bitrate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -412,6 +400,34 @@
         <source>ABR kbps</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&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&apos;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;
+</source>
+        <extracomment>ererere</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigPage_Ogg</name>
@@ -526,15 +542,18 @@
 <context>
     <name>Converter</name>
     <message>
-        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <source>Conversion is not possible:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CoverDialog</name>
     <message>
-        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <source>Select cover image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Conversion is not possible:</source>
+        <source>Without cover image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -550,7 +569,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The cue file contains information about multiple disks. Which disk you want to use?</source>
+        <source>The CUE file contains information about multiple disks. Which disk do you want to use?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -572,12 +591,6 @@
 <context>
     <name>Encoder</name>
     <message>
-        <source>I can&apos;t delete file:
-%1
-%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Encoder error:
 </source>
         <translation type="unfinished"></translation>
@@ -587,6 +600,12 @@
         <comment>Encoder error. %1 is a file name.</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>I can&apos;t rename file:
+%1 to %2
+%3</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EncoderConfigPage</name>
@@ -631,15 +650,6 @@
     </message>
 </context>
 <context>
-    <name>Encoder_Wav</name>
-    <message>
-        <source>I can&apos;t rename file:
-%1 to %2
-%3</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Gain</name>
     <message>
         <source>Gain error:
@@ -719,10 +729,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Add CUE or audio file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -771,14 +777,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove album</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove album from project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Ctrl+Del</source>
         <translation type="unfinished"></translation>
     </message>
@@ -923,6 +921,18 @@
         <source>Delete current pattern from history</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove disk from project</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MultiValuesComboBox</name>
@@ -952,13 +962,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 program</source>
-        <comment>This is part of filter for &apos;select program&apos; dialog. %1 is a name of required program. Example: &apos;shntool program (shntool)&apos;</comment>
+        <source>All files</source>
+        <comment>This is part of filter for &apos;select program&apos; dialog. &apos;All files (*)&apos;</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All files</source>
-        <comment>This is part of filter for &apos;select program&apos; dialog. &apos;All files (*)&apos;</comment>
+        <source>%1 program</source>
+        <comment>This is part of filter for &apos;select program&apos; dialog. %1 is a name of required program. Example: &apos;flac program (flac)&apos;</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1015,11 +1025,34 @@
         <source>The audio file &lt;b&gt;&quot;%1&quot;&lt;/b&gt; does not exist</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>I can&apos;t copy cover file &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>I can&apos;t read cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is a file name, %2 - an error text</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>I can&apos;t write cover image &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>%1 - is file name, %2 - an error text</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Splitter</name>
     <message>
-        <source>The number of tracks is higher than expected.</source>
+        <source>I can&apos;t read &lt;b&gt;%1&lt;/b&gt;:&lt;br&gt;%2</source>
+        <comment>Splitter error. %1 is a file name, %2 is a system error text.</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1146,4 +1179,15 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Worker</name>
+    <message>
+        <source>I can&apos;t create directory &quot;%1&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>I can&apos;t write to directory &quot;%1&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

flacon-3.1.1.tar.gz/translations/translators_nb.info -> flacon-4.0.0.tar.gz/translations/translators_nb.info Changed

flacon-4.0.0.tar.gz/types.cpp Added

@@ -0,0 +1,164 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+
+#include "types.h"
+#include <QVector>
+
+
+/************************************************
+ *
+ ************************************************/
+QString preGapTypeToString(PreGapType type)
+{
+    switch(type)
+    {
+    case PreGapType::ExtractToFile:   return "Extract";
+    case PreGapType::AddToFirstTrack: return "AddToFirst";
+    default:                          return "Disable";
+    }
+}
+
+
+/************************************************
+
+ ************************************************/
+PreGapType strToPreGapType(const QString &str)
+{
+    QString s = str.toUpper();
+
+    if (s == "EXTRACT")     return PreGapType::ExtractToFile;
+    if (s == "ADDTOFIRST")  return PreGapType::AddToFirstTrack;
+
+    return PreGapType::AddToFirstTrack;
+}
+
+
+
+/************************************************
+
+ ************************************************/
+QString gainTypeToString(GainType type)
+{
+    switch(type)
+    {
+    case GainType::Disable: return "Disable";
+    case GainType::Track:   return "Track";
+    case GainType::Album:   return "Album";
+    }
+
+    return "Disable";
+}
+
+
+/************************************************
+
+ ************************************************/
+GainType strToGainType(const QString &str)
+{
+    QString s = str.toUpper();
+
+    if (s == "TRACK")   return GainType::Track;
+    if (s == "ALBUM")   return GainType::Album;
+
+    return GainType::Disable;
+}
+
+
+/************************************************
+
+ ************************************************/
+QString coverModeToString(CoverMode mode)
+{
+    switch(mode)
+    {
+    case CoverMode::Disable:  return "Disable";
+    case CoverMode::OrigSize: return "OrigSize";
+    case CoverMode::Scale:    return "Scale";
+    }
+
+    return "Disable";
+
+}
+
+
+/************************************************
+
+ ************************************************/
+CoverMode strToCoverMode(const QString &str)
+{
+    QString s = str.toUpper();
+
+    if (s == "ORIGSIZE") return CoverMode::OrigSize;
+    if (s == "SCALE")    return CoverMode::Scale;
+
+    return CoverMode::Disable;
+}
+
+
+/************************************************
+
+ ************************************************/
+unsigned int levenshteinDistance(const QString &s1, const QString & s2)
+{
+    const size_t len1 = s1.size(), len2 = s2.size();
+    QVector<unsigned int> col(len2+1), prevCol(len2+1);
+
+    for (int i = 0; i < prevCol.size(); i++)
+        prevCol[i] = i;
+
+    for (unsigned int i = 0; i < len1; i++)
+    {
+        col[0] = i+1;
+        for (unsigned int j = 0; j < len2; j++)
+            col[j+1] = qMin( qMin( 1 + col[j], 1 + prevCol[1 + j]),
+                            prevCol[j] + (s1[i]==s2[j] ? 0 : 1) );
+        col.swap(prevCol);
+    }
+    return prevCol[len2];
+}
+
+
+/************************************************
+ *
+ ************************************************/
+QIcon loadIcon(const QString &iconName, bool loadDisable)
+{
+    QVector<int> sizes;
+    sizes << 16 << 22 << 32 << 48 << 64 << 128 << 256 << 512;
+
+    QIcon res;
+    foreach (int size, sizes)
+        res.addFile(QString(":%2/%1").arg(iconName).arg(size), QSize(size, size), QIcon::Normal);
+
+
+    if (loadDisable)
+    {
+        foreach (int size, sizes)
+            res.addFile(QString(":%2/%1_disable").arg(iconName).arg(size), QSize(size, size), QIcon::Disabled);
+    }
+
+    return res;
+}

flacon-4.0.0.tar.gz/types.h Added

@@ -0,0 +1,68 @@
+/* BEGIN_COMMON_COPYRIGHT_HEADER
+ * (c)LGPL2+
+ *
+ * Flacon - audio File Encoder
+ * https://github.com/flacon/flacon
+ *
+ * Copyright: 2017
+ *   Alexander Sokoloff <sokoloff.a@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * END_COMMON_COPYRIGHT_HEADER */
+
+#ifndef TYPES_H
+#define TYPES_H
+
+#include <QString>
+#include <QIcon>
+
+enum class PreGapType
+{
+    Skip,
+    ExtractToFile,
+    AddToFirstTrack
+};
+
+QString preGapTypeToString(PreGapType type);
+PreGapType strToPreGapType(const QString &str);
+
+
+enum class GainType
+{
+    Disable,
+    Track,
+    Album
+};
+
+QString gainTypeToString(GainType type);
+GainType strToGainType(const QString &str);
+
+
+enum class CoverMode
+{
+    Disable,
+    OrigSize,
+    Scale
+};
+
+QString coverModeToString(CoverMode mode);
+CoverMode strToCoverMode(const QString &str);
+
+
+unsigned int levenshteinDistance(const QString &s1, const QString & s2);
+QIcon loadIcon(const QString &iconName, bool loadDisable = true);
+
+#endif // TYPES_H