diff options
144 files changed, 161 insertions, 727 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index 671d313f3..815c7481b 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -19,10 +19,10 @@ ***************************************************************************/ #include <QApplication> -#include <QTranslator> #include <QLocale> #include <QLibraryInfo> #include <QIcon> +#include <QTranslator> #include <stdio.h> #include <stdlib.h> #ifdef Q_OS_WIN diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp index 3153fd6f6..fb40781a3 100644 --- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp +++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include <QtPlugin> -#include <QTranslator> #include <QLocale> #include <QPair> #include <qmmp/soundcore.h> @@ -63,10 +62,10 @@ const QString IncDecVolumeCommandLineOption::name() const return "IncDecVolumeCommandLineOption"; } -QTranslator *IncDecVolumeCommandLineOption::createTranslator(QObject *parent) +/*QTranslator *IncDecVolumeCommandLineOption::createTranslator(QObject *parent) { QTranslator *translator = new QTranslator(parent); QString locale = Qmmp::systemLanguageID(); translator->load(QString(":/incdecvolume_plugin_") + locale); return translator; -} +}*/ diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h index ad734880d..49ff9939b 100644 --- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h +++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h @@ -38,7 +38,6 @@ public: virtual const QString name() const; virtual const QStringList helpString() const; virtual QString executeCommand(const QString& opt_str, const QStringList &args); - virtual QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp index 9f01bbca2..ccf774942 100644 --- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp +++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include <QtPlugin> -#include <QTranslator> #include <QLocale> #include <qmmp/soundcore.h> #include <qmmpui/playlistmanager.h> @@ -149,13 +148,13 @@ const QString PlayListOption::name() const return "PlayListOption"; } -QTranslator *PlayListOption::createTranslator(QObject *parent) +/*QTranslator *PlayListOption::createTranslator(QObject *parent) { QTranslator *translator = new QTranslator(parent); QString locale = Qmmp::systemLanguageID(); translator->load(QString(":/playlist_plugin_") + locale); return translator; -} +}*/ QString PlayListOption::boolToText(bool enabled) { diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h index a255e095a..308a1ff77 100644 --- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h +++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h @@ -40,7 +40,6 @@ public: virtual const QString name() const; virtual const QStringList helpString() const; virtual QString executeCommand(const QString& opt_str, const QStringList &args); - virtual QTranslator *createTranslator(QObject *parent); private: QString boolToText(bool enabled); diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp index 0b0a0b0b2..29c70728f 100644 --- a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp +++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include <QtPlugin> -#include <QTranslator> #include <QLocale> #include <QRegExp> #include <qmmp/soundcore.h> @@ -80,10 +79,10 @@ const QString SeekOption::name() const return "SeekOption"; } -QTranslator *SeekOption::createTranslator(QObject *parent) +/*QTranslator *SeekOption::createTranslator(QObject *parent) { QTranslator *translator = new QTranslator(parent); QString locale = Qmmp::systemLanguageID(); translator->load(QString(":/seek_plugin_") + locale); return translator; -} +}*/ diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.h b/src/plugins/CommandLineOptions/SeekOption/seekoption.h index 4310b1e53..80113cd38 100644 --- a/src/plugins/CommandLineOptions/SeekOption/seekoption.h +++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.h @@ -38,7 +38,6 @@ public: virtual const QString name() const; virtual const QStringList helpString() const; virtual QString executeCommand(const QString& opt_str, const QStringList &args); - virtual QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp index 96a26b9aa..02500be13 100644 --- a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp +++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include <QtPlugin> -#include <QTranslator> #include <QLocale> #include <QMap> #include <qmmp/soundcore.h> @@ -110,13 +109,13 @@ const QString StatusOption::name() const return "StatusOption"; } -QTranslator *StatusOption::createTranslator(QObject *parent) +/*QTranslator *StatusOption::createTranslator(QObject *parent) { QTranslator *translator = new QTranslator(parent); QString locale = Qmmp::systemLanguageID(); translator->load(QString(":/status_plugin_") + locale); return translator; -} +}*/ QString StatusOption::genProgressBar() { diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.h b/src/plugins/CommandLineOptions/StatusOption/statusoption.h index 1764aa136..1cf69db67 100644 --- a/src/plugins/CommandLineOptions/StatusOption/statusoption.h +++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.h @@ -27,7 +27,6 @@ #include <qmmpui/commandlineoption.h> #include <qmmpui/commandlinemanager.h> - /** @author Ilya Kotov <forkotov02@ya.ru> */ @@ -41,7 +40,6 @@ public: virtual const QString name() const; virtual const QStringList helpString() const; virtual QString executeCommand(const QString& opt_str, const QStringList &args); - virtual QTranslator *createTranslator(QObject *parent); private: QString genProgressBar(); diff --git a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp index a4a096f1b..f6efb4e57 100644 --- a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp +++ b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include <QtPlugin> -#include <QTranslator> #include <QLocale> #include <QApplication> #include <qmmpui/winfileassoc.h> diff --git a/src/plugins/Effect/bs2b/effectbs2bfactory.cpp b/src/plugins/Effect/bs2b/effectbs2bfactory.cpp index ef60a6d88..8f48344bb 100644 --- a/src/plugins/Effect/bs2b/effectbs2bfactory.cpp +++ b/src/plugins/Effect/bs2b/effectbs2bfactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QMessageBox> #include <bs2b/bs2bversion.h> #include <qmmp/qmmp.h> @@ -31,6 +30,7 @@ const EffectProperties EffectBs2bFactory::properties() const EffectProperties properties; properties.name = tr("BS2B Plugin"); properties.shortName = "bs2b"; + properties.translation = QLatin1String(":/bs2b_plugin_"); properties.hasSettings = true; properties.hasAbout = true; return properties; @@ -59,11 +59,3 @@ void EffectBs2bFactory::showAbout(QWidget *parent) tr("Ilya Kotov <forkotov02@ya.ru>")+"<br>"+ tr("Sebastian Pipping <sebastian@pipping.org>")+"</p>"); } - -QTranslator *EffectBs2bFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/bs2b_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Effect/bs2b/effectbs2bfactory.h b/src/plugins/Effect/bs2b/effectbs2bfactory.h index 3abe51a1d..29db0d551 100644 --- a/src/plugins/Effect/bs2b/effectbs2bfactory.h +++ b/src/plugins/Effect/bs2b/effectbs2bfactory.h @@ -38,7 +38,6 @@ public: Effect *create(); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; diff --git a/src/plugins/Effect/crossfade/effectcrossfadefactory.cpp b/src/plugins/Effect/crossfade/effectcrossfadefactory.cpp index 5fb4061e3..a5f12e94d 100644 --- a/src/plugins/Effect/crossfade/effectcrossfadefactory.cpp +++ b/src/plugins/Effect/crossfade/effectcrossfadefactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QMessageBox> #include <qmmp/qmmp.h> #include "effectcrossfadefactory.h" @@ -30,6 +29,7 @@ const EffectProperties EffectCrossfadeFactory::properties() const EffectProperties properties; properties.name = tr("Crossfade Plugin"); properties.shortName = "crossfade"; + properties.translation = QLatin1String(":/crossfade_plugin_"); properties.hasSettings = true; properties.hasAbout = true; properties.priority = EffectProperties::EFFECT_PRIORITY_LOW; @@ -53,11 +53,3 @@ void EffectCrossfadeFactory::showAbout(QWidget *parent) tr("Qmmp Crossfade Plugin")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *EffectCrossfadeFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/crossfade_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Effect/crossfade/effectcrossfadefactory.h b/src/plugins/Effect/crossfade/effectcrossfadefactory.h index b2f268441..dc52a9138 100644 --- a/src/plugins/Effect/crossfade/effectcrossfadefactory.h +++ b/src/plugins/Effect/crossfade/effectcrossfadefactory.h @@ -38,7 +38,6 @@ public: Effect *create(); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; diff --git a/src/plugins/Effect/filewriter/effectfilewriterfactory.cpp b/src/plugins/Effect/filewriter/effectfilewriterfactory.cpp index 140b14f50..87af164a7 100644 --- a/src/plugins/Effect/filewriter/effectfilewriterfactory.cpp +++ b/src/plugins/Effect/filewriter/effectfilewriterfactory.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include <QMessageBox> -#include <QTranslator> #include <qmmp/qmmp.h> #include "filewriterplugin.h" #include "settingsdialog.h" @@ -30,6 +29,7 @@ const EffectProperties EffectFileWriterFactory::properties() const EffectProperties properties; properties.name = tr("File Writer Plugin"); properties.shortName = "filewriter"; + properties.translation = QLatin1String(":/filewriter_plugin_"); properties.hasSettings = true; properties.hasAbout = true; properties.priority = EffectProperties::EFFECT_PRIORITY_LOW; @@ -53,11 +53,3 @@ void EffectFileWriterFactory::showAbout(QWidget *parent) tr("Qmmp File Writer Plugin")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *EffectFileWriterFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/filewriter_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Effect/filewriter/effectfilewriterfactory.h b/src/plugins/Effect/filewriter/effectfilewriterfactory.h index 8f15a13db..6f74d20e8 100644 --- a/src/plugins/Effect/filewriter/effectfilewriterfactory.h +++ b/src/plugins/Effect/filewriter/effectfilewriterfactory.h @@ -38,7 +38,6 @@ public: Effect *create(); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; diff --git a/src/plugins/Effect/ladspa/effectladspafactory.cpp b/src/plugins/Effect/ladspa/effectladspafactory.cpp index af746e2ae..0ee9a9e42 100644 --- a/src/plugins/Effect/ladspa/effectladspafactory.cpp +++ b/src/plugins/Effect/ladspa/effectladspafactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QMessageBox> #include <qmmp/qmmp.h> #include "settingsdialog.h" @@ -30,6 +29,7 @@ const EffectProperties EffectLADSPAFactory::properties() const EffectProperties properties; properties.name = tr("LADSPA Plugin"); properties.shortName = "ladspa"; + properties.translation = QLatin1String(":/ladspa_plugin_"); properties.hasSettings = true; properties.hasAbout = true; return properties; @@ -56,11 +56,3 @@ void EffectLADSPAFactory::showAbout(QWidget *parent) tr("Nick Lamb <njl195@zepler.org.uk>")+"\n"+ tr("Giacomo Lozito <city_hunter@users.sf.net>")); } - -QTranslator *EffectLADSPAFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/ladspa_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Effect/ladspa/effectladspafactory.h b/src/plugins/Effect/ladspa/effectladspafactory.h index b8c9b2fdb..afa2b5b04 100644 --- a/src/plugins/Effect/ladspa/effectladspafactory.h +++ b/src/plugins/Effect/ladspa/effectladspafactory.h @@ -38,7 +38,6 @@ public: Effect *create(); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; diff --git a/src/plugins/Effect/soxr/effectsoxrfactory.cpp b/src/plugins/Effect/soxr/effectsoxrfactory.cpp index 2d5004e40..afdaf044c 100644 --- a/src/plugins/Effect/soxr/effectsoxrfactory.cpp +++ b/src/plugins/Effect/soxr/effectsoxrfactory.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include <QMessageBox> -#include <QTranslator> #include <qmmp/qmmp.h> #include "settingsdialog.h" #include "soxresampler.h" @@ -30,6 +29,7 @@ const EffectProperties EffectSoXRFactory::properties() const EffectProperties properties; properties.name = tr("SoX Resampler Plugin"); properties.shortName = "soxr"; + properties.translation = QLatin1String(":/soxr_plugin_"); properties.hasSettings = true; properties.hasAbout = true; properties.priority = EffectProperties::EFFECT_PRIORITY_HIGH; @@ -53,11 +53,3 @@ void EffectSoXRFactory::showAbout(QWidget *parent) tr("Qmmp SoX Resampler Plugin")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *EffectSoXRFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/soxr_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Effect/soxr/effectsoxrfactory.h b/src/plugins/Effect/soxr/effectsoxrfactory.h index c5cb435dd..f4d670d50 100644 --- a/src/plugins/Effect/soxr/effectsoxrfactory.h +++ b/src/plugins/Effect/soxr/effectsoxrfactory.h @@ -38,7 +38,6 @@ public: Effect *create(); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; diff --git a/src/plugins/Effect/stereo/effectstereofactory.cpp b/src/plugins/Effect/stereo/effectstereofactory.cpp index 4c87179d8..105f23139 100644 --- a/src/plugins/Effect/stereo/effectstereofactory.cpp +++ b/src/plugins/Effect/stereo/effectstereofactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2015 by Ilya Kotov * + * Copyright (C) 2009-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QMessageBox> #include <qmmp/qmmp.h> #include "effectstereofactory.h" @@ -30,6 +29,7 @@ const EffectProperties EffectStereoFactory::properties() const EffectProperties properties; properties.name = tr("Extra Stereo Plugin"); properties.shortName = "stereo"; + properties.translation = QLatin1String(":/stereo_plugin_"); properties.hasSettings = true; properties.hasAbout = true; return properties; @@ -53,11 +53,3 @@ void EffectStereoFactory::showAbout(QWidget *parent) tr("Written by: Ilya Kotov <forkotov02@ya.ru>")+"\n"+ tr("Based on the Extra Stereo Plugin for Xmms by Johan Levin")); } - -QTranslator *EffectStereoFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/stereo_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Effect/stereo/effectstereofactory.h b/src/plugins/Effect/stereo/effectstereofactory.h index 5e072d23d..09a60b150 100644 --- a/src/plugins/Effect/stereo/effectstereofactory.h +++ b/src/plugins/Effect/stereo/effectstereofactory.h @@ -38,7 +38,6 @@ public: Effect *create(); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; diff --git a/src/plugins/Engines/mplayer/mplayerenginefactory.cpp b/src/plugins/Engines/mplayer/mplayerenginefactory.cpp index c145aabe1..68d087269 100644 --- a/src/plugins/Engines/mplayer/mplayerenginefactory.cpp +++ b/src/plugins/Engines/mplayer/mplayerenginefactory.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include <QMessageBox> -#include <QTranslator> #include "mplayermetadatamodel.h" #include "settingsdialog.h" #include "mplayerengine.h" @@ -33,6 +32,7 @@ const EngineProperties MplayerEngineFactory::properties() const EngineProperties properties; properties.name = tr("Mplayer Plugin"); properties.shortName = "mplayer"; + properties.translation = QLatin1String(":/mplayer_plugin_"); properties.filters = MplayerInfo::filters(); properties.description = tr("Video Files"); //properties.contentType = "application/ogg;audio/x-vorbis+ogg"; @@ -85,11 +85,3 @@ void MplayerEngineFactory::showAbout(QWidget *parent) tr("This plugin uses MPlayer as backend")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *MplayerEngineFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/mplayer_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Engines/mplayer/mplayerenginefactory.h b/src/plugins/Engines/mplayer/mplayerenginefactory.h index c87fdf28e..fb89b14c5 100644 --- a/src/plugins/Engines/mplayer/mplayerenginefactory.h +++ b/src/plugins/Engines/mplayer/mplayerenginefactory.h @@ -36,7 +36,6 @@ public: MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp index 298ddfa72..f9f696397 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp +++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include <QtPlugin> -#include <QTranslator> #include <QMessageBox> #include <qmmp/qmmp.h> #include "qmmpfiledialogimpl.h" @@ -69,6 +68,7 @@ const FileDialogProperties QmmpFileDialogFactory::properties() const FileDialogProperties properties; properties.name = tr("Qmmp File Dialog"); properties.shortName = "qmmp_dialog"; + properties.translation = QLatin1String(":/qmmp_file_dialog_plugin_"); properties.hasAbout = true; properties.modal = false; return properties; @@ -84,11 +84,3 @@ void QmmpFileDialogFactory::showAbout(QWidget *parent) tr("Some code is copied from the Qt library")); } - -QTranslator *QmmpFileDialogFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/qmmp_file_dialog_plugin_") + locale); - return translator; -} diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h index d0d0e5c26..3ccce93fa 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h +++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h @@ -53,7 +53,6 @@ public: virtual FileDialog* create(); virtual const FileDialogProperties properties() const; virtual void showAbout(QWidget*); - virtual QTranslator *createTranslator(QObject *parent); virtual ~QmmpFileDialogFactory() { ; diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp index 9d182189b..b5bd416a0 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include <QtPlugin> -#include <QTranslator> #include <QMessageBox> #include <qmmp/qmmp.h> #include "twopanelfiledialogimpl.h" @@ -68,6 +67,7 @@ const FileDialogProperties TwoPanelFileDialogFactory::properties() const properties.name = tr("Two-panel File Dialog"); properties.shortName = "twopanel_dialog"; properties.hasAbout = true; + properties.translation = QLatin1String(":/two_panel_file_dialog_plugin_"); properties.modal = false; return properties; } @@ -79,11 +79,3 @@ void TwoPanelFileDialogFactory::showAbout(QWidget *parent) tr("Written by: Ilya Kotov <forkotov02@ya.ru>") + "\n" + tr("Based on code from the Qt library")); } - -QTranslator *TwoPanelFileDialogFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/two_panel_file_dialog_plugin_") + locale); - return translator; -} diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h index 5cd2b7455..80e40a354 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h @@ -60,7 +60,6 @@ public: FileDialog* create(); const FileDialogProperties properties() const; void showAbout(QWidget*); - QTranslator *createTranslator(QObject *parent); }; diff --git a/src/plugins/General/converter/converterfactory.cpp b/src/plugins/General/converter/converterfactory.cpp index cda17108c..0254cda82 100644 --- a/src/plugins/General/converter/converterfactory.cpp +++ b/src/plugins/General/converter/converterfactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ - #include <QMessageBox> #include "converterhelper.h" #include "converterfactory.h" @@ -28,6 +27,7 @@ const GeneralProperties ConverterFactory::properties() const GeneralProperties properties; properties.name = tr("Converter Plugin"); properties.shortName = "converter"; + properties.translation = QLatin1String(":/converter_plugin_"); properties.hasAbout = true; properties.hasSettings = false; properties.visibilityControl = false; @@ -53,11 +53,3 @@ void ConverterFactory::showAbout(QWidget *parent) "using external command-line encoders") +"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *ConverterFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/converter_plugin_") + locale); - return translator; -} diff --git a/src/plugins/General/converter/converterfactory.h b/src/plugins/General/converter/converterfactory.h index 88017bfcf..83a7f3bf3 100644 --- a/src/plugins/General/converter/converterfactory.h +++ b/src/plugins/General/converter/converterfactory.h @@ -20,9 +20,7 @@ #ifndef CONVERTERFACTORY_H #define CONVERTERFACTORY_H - #include <QObject> -#include <QTranslator> #include <QDialog> #include <qmmpui/general.h> #include <qmmpui/generalfactory.h> @@ -40,7 +38,6 @@ public: QObject *create(QObject *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/General/copypaste/copypastefactory.cpp b/src/plugins/General/copypaste/copypastefactory.cpp index bbd189c55..458d6a764 100644 --- a/src/plugins/General/copypaste/copypastefactory.cpp +++ b/src/plugins/General/copypaste/copypastefactory.cpp @@ -28,6 +28,7 @@ const GeneralProperties CopyPasteFactory::properties() const GeneralProperties properties; properties.name = tr("Copy/Paste Plugin"); properties.shortName = "copypaste"; + properties.translation = QLatin1String(":/copypaste_plugin_"); properties.hasAbout = true; properties.hasSettings = false; properties.visibilityControl = false; @@ -51,11 +52,3 @@ void CopyPasteFactory::showAbout(QWidget *parent) tr("This plugin allows one to copy selected tracks from one playlist to another")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *CopyPasteFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/copypaste_plugin_") + locale); - return translator; -} diff --git a/src/plugins/General/copypaste/copypastefactory.h b/src/plugins/General/copypaste/copypastefactory.h index 0b8f5c7fa..1dda634e4 100644 --- a/src/plugins/General/copypaste/copypastefactory.h +++ b/src/plugins/General/copypaste/copypastefactory.h @@ -24,7 +24,6 @@ @author Ilya Kotov <forkotov02@ya.ru> */ #include <QObject> -#include <QTranslator> #include <QDialog> #include <qmmpui/general.h> #include <qmmpui/generalfactory.h> @@ -39,7 +38,6 @@ public: QObject *create(QObject *parent); QDialog *createConfigDialog(QWidget *); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif // COPYPASTEFACTORY_H diff --git a/src/plugins/General/covermanager/covermanagerfactory.cpp b/src/plugins/General/covermanager/covermanagerfactory.cpp index 1bdc22f99..ef79a0520 100644 --- a/src/plugins/General/covermanager/covermanagerfactory.cpp +++ b/src/plugins/General/covermanager/covermanagerfactory.cpp @@ -29,6 +29,7 @@ const GeneralProperties CoverManagerFactory::properties() const GeneralProperties properties; properties.name = tr("Cover Manager Plugin"); properties.shortName = "cover_manager"; + properties.translation = QLatin1String(":/covermanager_plugin_"); properties.hasAbout = true; properties.hasSettings = false; properties.visibilityControl = false; @@ -51,11 +52,3 @@ void CoverManagerFactory::showAbout(QWidget *parent) tr("Qmmp Cover Manager Plugin")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *CoverManagerFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/covermanager_plugin_") + locale); - return translator; -} diff --git a/src/plugins/General/covermanager/covermanagerfactory.h b/src/plugins/General/covermanager/covermanagerfactory.h index c0394cc75..c9c78a277 100644 --- a/src/plugins/General/covermanager/covermanagerfactory.h +++ b/src/plugins/General/covermanager/covermanagerfactory.h @@ -24,7 +24,6 @@ @author Ilya Kotov <forkotov02@ya.ru> */ #include <QObject> -#include <QTranslator> #include <qmmpui/general.h> #include <qmmpui/generalfactory.h> @@ -39,8 +38,6 @@ public: QObject *create(QObject *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); - }; #endif diff --git a/src/plugins/General/fileops/fileopsfactory.cpp b/src/plugins/General/fileops/fileopsfactory.cpp index 799d9e3db..12dfd08a0 100644 --- a/src/plugins/General/fileops/fileopsfactory.cpp +++ b/src/plugins/General/fileops/fileopsfactory.cpp @@ -29,6 +29,7 @@ const GeneralProperties FileOpsFactory::properties() const GeneralProperties properties; properties.name = tr("File Operations Plugin"); properties.shortName = "fileops"; + properties.translation = QLatin1String(":/fileops_plugin_"); properties.hasAbout = true; properties.hasSettings = true; properties.visibilityControl = false; @@ -51,11 +52,3 @@ void FileOpsFactory::showAbout(QWidget *parent) tr("Qmmp File Operations Plugin")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *FileOpsFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/fileops_plugin_") + locale); - return translator; -} diff --git a/src/plugins/General/fileops/fileopsfactory.h b/src/plugins/General/fileops/fileopsfactory.h index 5d070c2a6..1118b67b9 100644 --- a/src/plugins/General/fileops/fileopsfactory.h +++ b/src/plugins/General/fileops/fileopsfactory.h @@ -24,7 +24,6 @@ @author Ilya Kotov <forkotov02@ya.ru> */ #include <QObject> -#include <QTranslator> #include <QDialog> #include <qmmpui/general.h> @@ -40,7 +39,6 @@ public: QObject *create(QObject *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/General/gnomehotkey/gnomehotkeyfactory.cpp b/src/plugins/General/gnomehotkey/gnomehotkeyfactory.cpp index 82c535c28..5e9ba1c7b 100644 --- a/src/plugins/General/gnomehotkey/gnomehotkeyfactory.cpp +++ b/src/plugins/General/gnomehotkey/gnomehotkeyfactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ - #include <QMessageBox> #include <qmmp/qmmp.h> #include "mediakeys.h" @@ -29,6 +28,7 @@ const GeneralProperties GnomeHotkeyFactory::properties() const GeneralProperties properties; properties.name = tr("Gnome Hotkey Plugin"); properties.shortName = "gnomehotkey"; + properties.translation = QLatin1String(":/gnomehotkey_plugin_"); properties.hasAbout = true; properties.hasSettings = false; properties.visibilityControl = false; @@ -53,11 +53,3 @@ void GnomeHotkeyFactory::showAbout(QWidget *parent) tr("This plugin adds support of the GNOME/Cinnamon hotkeys") + "\n" + tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *GnomeHotkeyFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/gnomehotkey_plugin_") + locale); - return translator; -} diff --git a/src/plugins/General/gnomehotkey/gnomehotkeyfactory.h b/src/plugins/General/gnomehotkey/gnomehotkeyfactory.h index 0210dde80..ebe082435 100644 --- a/src/plugins/General/gnomehotkey/gnomehotkeyfactory.h +++ b/src/plugins/General/gnomehotkey/gnomehotkeyfactory.h @@ -22,7 +22,6 @@ #include <QObject> -#include <QTranslator> #include <qmmpui/general.h> #include <qmmpui/generalfactory.h> @@ -39,8 +38,6 @@ public: QObject *create(QObject *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); - }; #endif diff --git a/src/plugins/General/hal/halfactory.cpp b/src/plugins/General/hal/halfactory.cpp index cbdd0d825..6046ba105 100644 --- a/src/plugins/General/hal/halfactory.cpp +++ b/src/plugins/General/hal/halfactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ - #include <QMessageBox> #include <qmmp/qmmp.h> #include "settingsdialog.h" @@ -30,6 +29,7 @@ const GeneralProperties HalFactory::properties() const GeneralProperties properties; properties.name = tr("HAL Plugin"); properties.shortName = "hal"; + properties.translation = QLatin1String(":/hal_plugin_"); properties.hasAbout = true; properties.hasSettings = true; properties.visibilityControl = false; @@ -54,11 +54,3 @@ void HalFactory::showAbout(QWidget *parent) tr("Written by: Ilya Kotov <forkotov02@ya.ru>") + "\n" + tr("Based on Solid (KDE hardware library)")); } - -QTranslator *HalFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/hal_plugin_") + locale); - return translator; -} diff --git a/src/plugins/General/hal/halfactory.h b/src/plugins/General/hal/halfactory.h index 02c063993..a2b8b5ed9 100644 --- a/src/plugins/General/hal/halfactory.h +++ b/src/plugins/General/hal/halfactory.h @@ -24,8 +24,6 @@ @author Ilya Kotov <forkotov02@ya.ru> */ #include <QObject> -#include <QTranslator> - #include <qmmpui/general.h> #include <qmmpui/generalfactory.h> @@ -39,8 +37,6 @@ public: QObject *create(QObject *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); - }; #endif diff --git a/src/plugins/General/hotkey/hotkeyfactory.cpp b/src/plugins/General/hotkey/hotkeyfactory.cpp index 72c3ed9ab..7092e1d06 100644 --- a/src/plugins/General/hotkey/hotkeyfactory.cpp +++ b/src/plugins/General/hotkey/hotkeyfactory.cpp @@ -30,6 +30,7 @@ const GeneralProperties HotkeyFactory::properties() const GeneralProperties properties; properties.name = tr("Global Hotkey Plugin"); properties.shortName = "hotkey"; + properties.translation = QLatin1String(":/hotkey_plugin_"); properties.hasAbout = true; properties.hasSettings = true; properties.visibilityControl = false; @@ -59,11 +60,3 @@ void HotkeyFactory::showAbout(QWidget *parent) tr("This plugin adds support for multimedia keys or global key combinations")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *HotkeyFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/hotkey_plugin_") + locale); - return translator; -} diff --git a/src/plugins/General/hotkey/hotkeyfactory.h b/src/plugins/General/hotkey/hotkeyfactory.h index d4f1618a5..98e8cbcac 100644 --- a/src/plugins/General/hotkey/hotkeyfactory.h +++ b/src/plugins/General/hotkey/hotkeyfactory.h @@ -24,8 +24,6 @@ @author Ilya Kotov <forkotov02@ya.ru> */ #include <QObject> -#include <QTranslator> - #include <qmmpui/general.h> #include <qmmpui/generalfactory.h> @@ -39,7 +37,6 @@ public: QObject *create(QObject *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/General/kdenotify/kdenotifyfactory.cpp b/src/plugins/General/kdenotify/kdenotifyfactory.cpp index c36ec0675..1597f3eb6 100644 --- a/src/plugins/General/kdenotify/kdenotifyfactory.cpp +++ b/src/plugins/General/kdenotify/kdenotifyfactory.cpp @@ -28,6 +28,7 @@ const GeneralProperties KdeNotifyFactory::properties() const GeneralProperties properties; properties.name = tr("KDE notification plugin"); properties.shortName = "kdenotify_icon"; + properties.translation = QLatin1String(":/kdenotify_plugin_"); properties.hasAbout = true; properties.hasSettings = true; properties.visibilityControl = false; @@ -50,11 +51,3 @@ void KdeNotifyFactory::showAbout(QWidget *parent) tr("KDE notification plugin for Qmmp") + "<br>" "Artur Guzik <a.guzik88@gmail.com>"); } - -QTranslator *KdeNotifyFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/kdenotify_plugin_") + locale); - return translator; -} diff --git a/src/plugins/General/kdenotify/kdenotifyfactory.h b/src/plugins/General/kdenotify/kdenotifyfactory.h index 1c6f7543a..083a95e6c 100644 --- a/src/plugins/General/kdenotify/kdenotifyfactory.h +++ b/src/plugins/General/kdenotify/kdenotifyfactory.h @@ -22,7 +22,6 @@ #define KDENOTIFYFACTORY_H #include <QObject> -#include <QTranslator> #include <QDialog> #include <qmmpui/general.h> @@ -38,7 +37,6 @@ public: QObject *create(QObject *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif // KDENOTIFYFACTORY_H diff --git a/src/plugins/General/lyrics/lyricsfactory.cpp b/src/plugins/General/lyrics/lyricsfactory.cpp index 60cb001f1..cf1440469 100644 --- a/src/plugins/General/lyrics/lyricsfactory.cpp +++ b/src/plugins/General/lyrics/lyricsfactory.cpp @@ -28,6 +28,7 @@ const GeneralProperties LyricsFactory::properties() const GeneralProperties properties; properties.name = tr("Lyrics Plugin"); properties.shortName = "lyrics"; + properties.translation = QLatin1String(":/lyrics_plugin_"); properties.hasAbout = true; properties.hasSettings = false; properties.visibilityControl = false; @@ -52,11 +53,3 @@ void LyricsFactory::showAbout(QWidget *parent) tr("This plugin retrieves lyrics from LyricWiki")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *LyricsFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/lyrics_plugin_") + locale); - return translator; -} diff --git a/src/plugins/General/lyrics/lyricsfactory.h b/src/plugins/General/lyrics/lyricsfactory.h index 6d61e864c..fdcddb897 100644 --- a/src/plugins/General/lyrics/lyricsfactory.h +++ b/src/plugins/General/lyrics/lyricsfactory.h @@ -24,7 +24,6 @@ @author Ilya Kotov <forkotov02@ya.ru> */ #include <QObject> -#include <QTranslator> #include <QDialog> #include <qmmpui/general.h> @@ -40,7 +39,6 @@ public: QObject *create(QObject *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/General/mpris/mprisfactory.cpp b/src/plugins/General/mpris/mprisfactory.cpp index 30c013713..645d42480 100644 --- a/src/plugins/General/mpris/mprisfactory.cpp +++ b/src/plugins/General/mpris/mprisfactory.cpp @@ -29,6 +29,7 @@ const GeneralProperties MPRISFactory::properties() const GeneralProperties properties; properties.name = tr("MPRIS Plugin"); properties.shortName = "mpris"; + properties.translation = QLatin1String(":/mpris_plugin_"); properties.hasAbout = true; properties.hasSettings = false; properties.visibilityControl = false; @@ -51,11 +52,3 @@ void MPRISFactory::showAbout(QWidget *parent) tr("Qmmp MPRIS Plugin")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *MPRISFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/mpris_plugin_") + locale); - return translator; -} diff --git a/src/plugins/General/mpris/mprisfactory.h b/src/plugins/General/mpris/mprisfactory.h index 7d1fd85e3..28abf020e 100644 --- a/src/plugins/General/mpris/mprisfactory.h +++ b/src/plugins/General/mpris/mprisfactory.h @@ -24,7 +24,6 @@ @author Ilya Kotov <forkotov02@ya.ru> */ #include <QObject> -#include <QTranslator> #include <qmmpui/general.h> #include <qmmpui/generalfactory.h> @@ -39,8 +38,6 @@ public: QObject *create(QObject *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); - }; #endif diff --git a/src/plugins/General/notifier/notifierfactory.cpp b/src/plugins/General/notifier/notifierfactory.cpp index 1e6f47d36..e69aa2b20 100644 --- a/src/plugins/General/notifier/notifierfactory.cpp +++ b/src/plugins/General/notifier/notifierfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2012 by Ilya Kotov * + * Copyright (C) 2008-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ - #include <QMessageBox> #include "notifier.h" #include "settingsdialog.h" @@ -29,6 +28,7 @@ const GeneralProperties NotifierFactory::properties() const GeneralProperties properties; properties.name = tr("Notifier Plugin"); properties.shortName = "notifier"; + properties.translation = QLatin1String(":/notifier_plugin_"); properties.hasAbout = true; properties.hasSettings = true; properties.visibilityControl = false; @@ -51,11 +51,3 @@ void NotifierFactory::showAbout(QWidget *parent) tr("Qmmp Notifier Plugin")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *NotifierFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/notifier_plugin_") + locale); - return translator; -} diff --git a/src/plugins/General/notifier/notifierfactory.h b/src/plugins/General/notifier/notifierfactory.h index a968c9c67..764ed45f5 100644 --- a/src/plugins/General/notifier/notifierfactory.h +++ b/src/plugins/General/notifier/notifierfactory.h @@ -24,7 +24,6 @@ @author Ilya Kotov <forkotov02@ya.ru> */ #include <QObject> -#include <QTranslator> #include <QDialog> #include <qmmpui/general.h> @@ -40,7 +39,6 @@ public: QObject *create(QObject *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/General/rgscan/rgscanfactory.cpp b/src/plugins/General/rgscan/rgscanfactory.cpp index 1bc3545fe..fe89a62c1 100644 --- a/src/plugins/General/rgscan/rgscanfactory.cpp +++ b/src/plugins/General/rgscan/rgscanfactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ - #include <QMessageBox> #include "rgscanhelper.h" #include "rgscanfactory.h" @@ -28,6 +27,7 @@ const GeneralProperties RGScanFactory::properties() const GeneralProperties properties; properties.name = tr("ReplayGain Scanner Plugin"); properties.shortName = "rgscan"; + properties.translation = QLatin1String(":/rgscan_plugin_"); properties.hasAbout = true; properties.hasSettings = false; properties.visibilityControl = false; @@ -57,11 +57,3 @@ void RGScanFactory::showAbout(QWidget *parent) tr("Frank Klemm")); } - -QTranslator *RGScanFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/rgscan_plugin_") + locale); - return translator; -} diff --git a/src/plugins/General/rgscan/rgscanfactory.h b/src/plugins/General/rgscan/rgscanfactory.h index ecd75a49a..63c900b7d 100644 --- a/src/plugins/General/rgscan/rgscanfactory.h +++ b/src/plugins/General/rgscan/rgscanfactory.h @@ -21,7 +21,6 @@ #define RGSCANFACTORY_H #include <QObject> -#include <QTranslator> #include <QDialog> #include <qmmpui/general.h> #include <qmmpui/generalfactory.h> @@ -39,7 +38,6 @@ public: QObject *create(QObject *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/General/scrobbler/scrobblerfactory.cpp b/src/plugins/General/scrobbler/scrobblerfactory.cpp index 4cfced38c..d79b26e50 100644 --- a/src/plugins/General/scrobbler/scrobblerfactory.cpp +++ b/src/plugins/General/scrobbler/scrobblerfactory.cpp @@ -30,6 +30,7 @@ const GeneralProperties ScrobblerFactory::properties() const GeneralProperties properties; properties.name = tr("Scrobbler Plugin"); properties.shortName = "scrobbler"; + properties.translation = QLatin1String(":/scrobbler_plugin_"); properties.hasAbout = true; properties.hasSettings = true; properties.visibilityControl = false; @@ -52,11 +53,3 @@ void ScrobblerFactory::showAbout(QWidget *parent) tr("Qmmp AudioScrobbler Plugin")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *ScrobblerFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/scrobbler_plugin_") + locale); - return translator; -} diff --git a/src/plugins/General/scrobbler/scrobblerfactory.h b/src/plugins/General/scrobbler/scrobblerfactory.h index d41d674ca..9b07a927e 100644 --- a/src/plugins/General/scrobbler/scrobblerfactory.h +++ b/src/plugins/General/scrobbler/scrobblerfactory.h @@ -24,7 +24,6 @@ @author Ilya Kotov <forkotov02@ya.ru> */ #include <QObject> -#include <QTranslator> #include <qmmpui/general.h> #include <qmmpui/generalfactory.h> @@ -39,8 +38,6 @@ public: QObject *create(QObject *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); - }; #endif diff --git a/src/plugins/General/statusicon/statusiconfactory.cpp b/src/plugins/General/statusicon/statusiconfactory.cpp index bdc5acb84..26b0f4641 100644 --- a/src/plugins/General/statusicon/statusiconfactory.cpp +++ b/src/plugins/General/statusicon/statusiconfactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ - #include <QMessageBox> #include "statusicon.h" #include "settingsdialog.h" @@ -32,6 +31,7 @@ const GeneralProperties StatusIconFactory::properties() const properties.hasAbout = true; properties.hasSettings = true; properties.visibilityControl = true; + properties.translation = QLatin1String(":/statusicon_plugin_"); return properties; } @@ -53,11 +53,3 @@ void StatusIconFactory::showAbout(QWidget *parent) tr("Ilya Kotov <forkotov02@ya.ru>")+"\n"+ tr("Artur Guzik <a.guzik88@gmail.com>")); } - -QTranslator *StatusIconFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/statusicon_plugin_") + locale); - return translator; -} diff --git a/src/plugins/General/statusicon/statusiconfactory.h b/src/plugins/General/statusicon/statusiconfactory.h index af6f2ae92..434929d73 100644 --- a/src/plugins/General/statusicon/statusiconfactory.h +++ b/src/plugins/General/statusicon/statusiconfactory.h @@ -24,7 +24,6 @@ @author Ilya Kotov <forkotov02@ya.ru> */ #include <QObject> -#include <QTranslator> #include <QDialog> #include <qmmpui/general.h> @@ -40,8 +39,6 @@ public: QObject *create(QObject *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); - }; #endif diff --git a/src/plugins/General/streambrowser/streambrowserfactory.cpp b/src/plugins/General/streambrowser/streambrowserfactory.cpp index 8c4b53fbe..4cdbd12cc 100644 --- a/src/plugins/General/streambrowser/streambrowserfactory.cpp +++ b/src/plugins/General/streambrowser/streambrowserfactory.cpp @@ -28,6 +28,7 @@ const GeneralProperties StreamBrowserFactory::properties() const GeneralProperties properties; properties.name = tr("Stream Browser Plugin"); properties.shortName = "streambrowser"; + properties.translation = QLatin1String(":/streambrowser_plugin_"); properties.hasAbout = true; properties.hasSettings = false; properties.visibilityControl = false; @@ -52,11 +53,3 @@ void StreamBrowserFactory::showAbout(QWidget *parent) tr("This plugin allows one to add stream from IceCast stream directory")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *StreamBrowserFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/streambrowser_plugin_") + locale); - return translator; -} diff --git a/src/plugins/General/streambrowser/streambrowserfactory.h b/src/plugins/General/streambrowser/streambrowserfactory.h index fcaba574c..320bb77ba 100644 --- a/src/plugins/General/streambrowser/streambrowserfactory.h +++ b/src/plugins/General/streambrowser/streambrowserfactory.h @@ -24,7 +24,6 @@ @author Ilya Kotov <forkotov02@ya.ru> */ #include <QObject> -#include <QTranslator> #include <QDialog> #include <qmmpui/general.h> @@ -40,7 +39,6 @@ public: QObject *create(QObject *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/General/trackchange/trackchangefactory.cpp b/src/plugins/General/trackchange/trackchangefactory.cpp index dcbf6000b..806f3f073 100644 --- a/src/plugins/General/trackchange/trackchangefactory.cpp +++ b/src/plugins/General/trackchange/trackchangefactory.cpp @@ -29,6 +29,7 @@ const GeneralProperties TrackChangeFactory::properties() const GeneralProperties properties; properties.name = tr("Track Change Plugin"); properties.shortName = "trackchange"; + properties.translation = QLatin1String(":/trackchange_plugin_"); properties.hasAbout = true; properties.hasSettings = true; properties.visibilityControl = false; @@ -52,11 +53,3 @@ void TrackChangeFactory::showAbout(QWidget *parent) tr("This plugin executes external command when current track is changed") + "\n" + tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *TrackChangeFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/trackchange_plugin_") + locale); - return translator; -} diff --git a/src/plugins/General/trackchange/trackchangefactory.h b/src/plugins/General/trackchange/trackchangefactory.h index 482d973b6..955053a72 100644 --- a/src/plugins/General/trackchange/trackchangefactory.h +++ b/src/plugins/General/trackchange/trackchangefactory.h @@ -24,7 +24,6 @@ @author Ilya Kotov <forkotov02@ya.ru> */ #include <QObject> -#include <QTranslator> #include <QDialog> #include <qmmpui/general.h> #include <qmmpui/generalfactory.h> @@ -39,7 +38,6 @@ public: QObject *create(QObject *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/General/udisks2/udisks2factory.cpp b/src/plugins/General/udisks2/udisks2factory.cpp index 0548b8932..4be6d28f2 100644 --- a/src/plugins/General/udisks2/udisks2factory.cpp +++ b/src/plugins/General/udisks2/udisks2factory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ - #include <QMessageBox> #include <qmmp/qmmp.h> #include "settingsdialog.h" @@ -30,6 +29,7 @@ const GeneralProperties UDisks2Factory::properties() const GeneralProperties properties; properties.name = tr("UDisks2 Plugin"); properties.shortName = "udisks2"; + properties.translation = QLatin1String(":/udisks2_plugin_"); properties.hasAbout = true; properties.hasSettings = true; properties.visibilityControl = false; @@ -53,11 +53,3 @@ void UDisks2Factory::showAbout(QWidget *parent) tr("This plugin provides removable devices detection using UDisks2") + "\n" + tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *UDisks2Factory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/udisks2_plugin_") + locale); - return translator; -} diff --git a/src/plugins/General/udisks2/udisks2factory.h b/src/plugins/General/udisks2/udisks2factory.h index e4d1f94ff..cdf1081fb 100644 --- a/src/plugins/General/udisks2/udisks2factory.h +++ b/src/plugins/General/udisks2/udisks2factory.h @@ -24,7 +24,6 @@ @author Ilya Kotov <forkotov02@ya.ru> */ #include <QObject> -#include <QTranslator> #include <qmmpui/general.h> #include <qmmpui/generalfactory.h> @@ -39,8 +38,6 @@ public: QObject *create(QObject *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); - }; #endif diff --git a/src/plugins/Input/aac/decoderaacfactory.cpp b/src/plugins/Input/aac/decoderaacfactory.cpp index e641db1c7..77a9fdfcb 100644 --- a/src/plugins/Input/aac/decoderaacfactory.cpp +++ b/src/plugins/Input/aac/decoderaacfactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QFile> #include <QMessageBox> #include "aacfile.h" @@ -43,6 +42,7 @@ const DecoderProperties DecoderAACFactory::properties() const properties.description = tr("AAC Files"); properties.contentTypes << "audio/aacp" << "audio/aac"; properties.shortName = "aac"; + properties.translation = QLatin1String(":/aac_plugin_"); properties.hasAbout = true; properties.hasSettings = false; return properties; @@ -104,11 +104,3 @@ void DecoderAACFactory::showAbout(QWidget *parent) tr("Qmmp AAC Audio Plugin")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *DecoderAACFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/aac_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Input/aac/decoderaacfactory.h b/src/plugins/Input/aac/decoderaacfactory.h index f9a4dae66..789b558b9 100644 --- a/src/plugins/Input/aac/decoderaacfactory.h +++ b/src/plugins/Input/aac/decoderaacfactory.h @@ -36,7 +36,6 @@ public: MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/Input/archive/decoderarchivefactory.cpp b/src/plugins/Input/archive/decoderarchivefactory.cpp index bc8588c3a..774294397 100644 --- a/src/plugins/Input/archive/decoderarchivefactory.cpp +++ b/src/plugins/Input/archive/decoderarchivefactory.cpp @@ -20,7 +20,6 @@ #include <QRegExp> #include <QMessageBox> -#include <QTranslator> #include <archive.h> #include <archive_entry.h> #include "decoder_archive.h" @@ -43,6 +42,7 @@ const DecoderProperties DecoderArchiveFactory::properties() const properties.description = tr("Archives"); properties.contentTypes << "application/zip" << "application/x-rar-compressed"; properties.shortName = "archive"; + properties.translation = QLatin1String(":/archive_plugin_"); properties.hasAbout = true; properties.hasSettings = false; properties.noInput = true; @@ -152,11 +152,3 @@ void DecoderArchiveFactory::showAbout(QWidget *parent) tr("Compiled against %1").arg(ARCHIVE_VERSION_STRING)+"\n" + tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *DecoderArchiveFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/archive_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Input/archive/decoderarchivefactory.h b/src/plugins/Input/archive/decoderarchivefactory.h index 804b8db3b..3bef8ecde 100644 --- a/src/plugins/Input/archive/decoderarchivefactory.h +++ b/src/plugins/Input/archive/decoderarchivefactory.h @@ -37,7 +37,6 @@ public: MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp index 0bf7f742a..4c7bbcf73 100644 --- a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp +++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QMessageBox> #include <QRegExp> #include <cdio/version.h> @@ -40,6 +39,7 @@ const DecoderProperties DecoderCDAudioFactory::properties() const DecoderProperties properties; properties.name = tr("CD Audio Plugin"); properties.shortName = "cdaudio"; + properties.translation = QLatin1String(":/cdaudio_plugin_"); properties.protocols << "cdda"; properties.hasAbout = true; properties.noInput = true; @@ -89,11 +89,3 @@ void DecoderCDAudioFactory::showAbout(QWidget *parent) tr("Written by: Ilya Kotov <forkotov02@ya.ru>")+"\n"+ tr("Usage: open cdda:/// using Add URL dialog or command line")); } - -QTranslator *DecoderCDAudioFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/cdaudio_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.h b/src/plugins/Input/cdaudio/decodercdaudiofactory.h index a117a5995..b836bd594 100644 --- a/src/plugins/Input/cdaudio/decodercdaudiofactory.h +++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.h @@ -36,7 +36,6 @@ public: MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/Input/cue/decodercuefactory.cpp b/src/plugins/Input/cue/decodercuefactory.cpp index e9e63c02b..06275420d 100644 --- a/src/plugins/Input/cue/decodercuefactory.cpp +++ b/src/plugins/Input/cue/decodercuefactory.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include <QMessageBox> -#include <QTranslator> #include "decoder_cue.h" #include "cuemetadatamodel.h" #include "cueparser.h" @@ -38,6 +37,7 @@ const DecoderProperties DecoderCUEFactory::properties() const DecoderProperties properties; properties.name = tr("CUE Plugin"); properties.shortName = "cue"; + properties.translation = QLatin1String(":/cue_plugin_"); properties.filters << "*.cue"; properties.description = tr("CUE Files"); properties.protocols << "cue"; @@ -92,11 +92,3 @@ void DecoderCUEFactory::showAbout(QWidget *parent) tr("Qmmp CUE Audio Plugin")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *DecoderCUEFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/cue_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Input/cue/decodercuefactory.h b/src/plugins/Input/cue/decodercuefactory.h index 7397cf8b7..61ae9c928 100644 --- a/src/plugins/Input/cue/decodercuefactory.h +++ b/src/plugins/Input/cue/decodercuefactory.h @@ -38,7 +38,6 @@ public: MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index 944ac98ec..608bff7a5 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QSettings> #include <QMessageBox> extern "C"{ @@ -142,6 +141,7 @@ const DecoderProperties DecoderFFmpegFactory::properties() const if(filters.contains("*.mka")) properties.contentTypes << "audio/true-hd" << "audio/x-matroska"; properties.shortName = "ffmpeg"; + properties.translation = QLatin1String(":/ffmpeg_plugin_"); properties.hasAbout = true; properties.hasSettings = true; properties.noInput = false; @@ -268,11 +268,3 @@ void DecoderFFmpegFactory::showAbout(QWidget *parent) .arg(LIBAVUTIL_VERSION_MICRO) +"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *DecoderFFmpegFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/ffmpeg_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.h b/src/plugins/Input/ffmpeg/decoderffmpegfactory.h index ce2caa166..980096515 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.h +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.h @@ -38,7 +38,6 @@ public: MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/Input/flac/decoderflacfactory.cpp b/src/plugins/Input/flac/decoderflacfactory.cpp index bf62307ab..2643c51ac 100644 --- a/src/plugins/Input/flac/decoderflacfactory.cpp +++ b/src/plugins/Input/flac/decoderflacfactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QMessageBox> #include <taglib/tag.h> #include <taglib/fileref.h> @@ -55,6 +54,7 @@ const DecoderProperties DecoderFLACFactory::properties() const properties.description = tr("FLAC Files"); properties.contentTypes << "audio/x-flac" << "audio/flac"; properties.shortName = "flac"; + properties.translation = QLatin1String(":/flac_plugin_"); properties.protocols << "flac"; properties.hasAbout = true; properties.hasSettings = false; @@ -213,11 +213,3 @@ void DecoderFLACFactory::showAbout(QWidget *parent) tr("Qmmp FLAC Audio Plugin")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *DecoderFLACFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/flac_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Input/flac/decoderflacfactory.h b/src/plugins/Input/flac/decoderflacfactory.h index ddc0526a3..3647c6de0 100644 --- a/src/plugins/Input/flac/decoderflacfactory.h +++ b/src/plugins/Input/flac/decoderflacfactory.h @@ -37,7 +37,6 @@ public: MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/Input/gme/decodergmefactory.cpp b/src/plugins/Input/gme/decodergmefactory.cpp index a7c8d931a..d8de3b50b 100644 --- a/src/plugins/Input/gme/decodergmefactory.cpp +++ b/src/plugins/Input/gme/decodergmefactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QMessageBox> #include <QRegExp> #include "settingsdialog.h" @@ -42,6 +41,7 @@ const DecoderProperties DecoderGmeFactory::properties() const properties.description = tr("Game Music Files"); //properties.contentType = ; properties.shortName = "gme"; + properties.translation = QLatin1String(":/gme_plugin_"); properties.hasAbout = true; properties.hasSettings = true; properties.noInput = true; @@ -106,11 +106,3 @@ void DecoderGmeFactory::showAbout(QWidget *parent) tr("This plugin uses Game_Music_Emu library to play game music files")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *DecoderGmeFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/gme_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Input/gme/decodergmefactory.h b/src/plugins/Input/gme/decodergmefactory.h index 12de413f2..40c738e11 100644 --- a/src/plugins/Input/gme/decodergmefactory.h +++ b/src/plugins/Input/gme/decodergmefactory.h @@ -39,7 +39,6 @@ public: MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/Input/modplug/decodermodplugfactory.cpp b/src/plugins/Input/modplug/decodermodplugfactory.cpp index 93de4bb90..c47dded6b 100644 --- a/src/plugins/Input/modplug/decodermodplugfactory.cpp +++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp @@ -20,7 +20,6 @@ #include <QSettings> #include <QFile> -#include <QTranslator> #include <QMessageBox> #include <QStringList> #include <QRegExp> @@ -53,6 +52,7 @@ const DecoderProperties DecoderModPlugFactory::properties() const properties.description = tr("ModPlug Files"); //properties.contentType = ; properties.shortName = "modplug"; + properties.translation = QLatin1String(":/modplug_plugin_"); properties.hasAbout = true; properties.hasSettings = true; properties.noInput = true; @@ -142,11 +142,3 @@ void DecoderModPlugFactory::showAbout(QWidget *parent) tr("Kenton Varda <temporal@gauge3d.org>")+"\n"+ tr("Konstanty Bialkowski <konstanty@ieee.org>")); } - -QTranslator *DecoderModPlugFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/modplug_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Input/modplug/decodermodplugfactory.h b/src/plugins/Input/modplug/decodermodplugfactory.h index 41ee51d01..1c32eacbf 100644 --- a/src/plugins/Input/modplug/decodermodplugfactory.h +++ b/src/plugins/Input/modplug/decodermodplugfactory.h @@ -36,7 +36,6 @@ public: MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/Input/mpc/decodermpcfactory.cpp b/src/plugins/Input/mpc/decodermpcfactory.cpp index 27026fb03..77614b0ac 100644 --- a/src/plugins/Input/mpc/decodermpcfactory.cpp +++ b/src/plugins/Input/mpc/decodermpcfactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QMessageBox> #include <taglib/tag.h> #include <taglib/fileref.h> @@ -55,6 +54,7 @@ const DecoderProperties DecoderMPCFactory::properties() const properties.description = tr("Musepack Files"); //properties.contentType = ; properties.shortName = "mpc"; + properties.translation = QLatin1String(":/mpc_plugin_"); properties.hasAbout = true; properties.hasSettings = false; return properties; @@ -119,11 +119,3 @@ void DecoderMPCFactory::showAbout(QWidget *parent) tr("Qmmp Musepack Audio Plugin")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *DecoderMPCFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/mpc_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Input/mpc/decodermpcfactory.h b/src/plugins/Input/mpc/decodermpcfactory.h index ca2a56719..15f16a004 100644 --- a/src/plugins/Input/mpc/decodermpcfactory.h +++ b/src/plugins/Input/mpc/decodermpcfactory.h @@ -36,7 +36,6 @@ public: MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/Input/mpeg/decodermpegfactory.cpp b/src/plugins/Input/mpeg/decodermpegfactory.cpp index 6e4cadd7f..ef54eaff0 100644 --- a/src/plugins/Input/mpeg/decodermpegfactory.cpp +++ b/src/plugins/Input/mpeg/decodermpegfactory.cpp @@ -21,7 +21,6 @@ #include <QDialog> #include <QMessageBox> #include <QSettings> -#include <QTranslator> #include <QFile> #include <QTextCodec> #include <taglib/tag.h> @@ -169,6 +168,7 @@ const DecoderProperties DecoderMPEGFactory::properties() const properties.filters << "*.mp1" << "*.mp2" << "*.mp3" << "*.wav"; properties.description = tr("MPEG Files"); properties.contentTypes << "audio/mp3" << "audio/mpeg"; + properties.translation = QLatin1String(":/mpeg_plugin_"); properties.hasAbout = true; properties.hasSettings = true; return properties; @@ -394,11 +394,3 @@ void DecoderMPEGFactory::showAbout(QWidget *parent) tr("Source code based on mq3 and madplay projects") ); } - -QTranslator *DecoderMPEGFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/mpeg_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Input/mpeg/decodermpegfactory.h b/src/plugins/Input/mpeg/decodermpegfactory.h index 029ca26d0..156cb8e44 100644 --- a/src/plugins/Input/mpeg/decodermpegfactory.h +++ b/src/plugins/Input/mpeg/decodermpegfactory.h @@ -38,7 +38,6 @@ public: MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); private: bool m_using_rusxmms; diff --git a/src/plugins/Input/opus/decoderopusfactory.cpp b/src/plugins/Input/opus/decoderopusfactory.cpp index d24d57a79..39bfab91e 100644 --- a/src/plugins/Input/opus/decoderopusfactory.cpp +++ b/src/plugins/Input/opus/decoderopusfactory.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include <QMessageBox> -#include <QTranslator> #include <taglib/tag.h> #include <taglib/fileref.h> #include <taglib/opusfile.h> @@ -42,6 +41,7 @@ const DecoderProperties DecoderOpusFactory::properties() const DecoderProperties properties; properties.name = tr("Opus Plugin"); properties.shortName = "opus"; + properties.translation = QLatin1String(":/opus_plugin_"); properties.filters << "*.opus"; properties.description = tr("Ogg Opus Files"); properties.contentTypes << "audio/opus"; @@ -118,11 +118,3 @@ void DecoderOpusFactory::showAbout(QWidget *parent) tr("Qmmp Opus Audio Plugin")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *DecoderOpusFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/opus_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Input/opus/decoderopusfactory.h b/src/plugins/Input/opus/decoderopusfactory.h index 539014832..52a2cd5f1 100644 --- a/src/plugins/Input/opus/decoderopusfactory.h +++ b/src/plugins/Input/opus/decoderopusfactory.h @@ -41,7 +41,6 @@ public: QObject* showDetails(QWidget *parent, const QString &path); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif //DECODEROPUSFACTORY_H diff --git a/src/plugins/Input/sid/decodersidfactory.cpp b/src/plugins/Input/sid/decodersidfactory.cpp index 2cf410b37..0ba0b8297 100644 --- a/src/plugins/Input/sid/decodersidfactory.cpp +++ b/src/plugins/Input/sid/decodersidfactory.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include <QSettings> -#include <QTranslator> #include <QRegExp> #include <QMessageBox> #include <QFile> @@ -61,6 +60,7 @@ const DecoderProperties DecoderSIDFactory::properties() const properties.description = tr("SID Files"); //properties.contentType = ; properties.shortName = "sid"; + properties.translation = QLatin1String(":/sid_plugin_"); properties.hasAbout = true; properties.hasSettings = true; properties.noInput = true; @@ -117,11 +117,3 @@ void DecoderSIDFactory::showAbout(QWidget *parent) tr("This plugin plays Commodore 64 music files using libsidplayfp library")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *DecoderSIDFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/sid_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Input/sid/decodersidfactory.h b/src/plugins/Input/sid/decodersidfactory.h index 1fa556770..39c3a8f90 100644 --- a/src/plugins/Input/sid/decodersidfactory.h +++ b/src/plugins/Input/sid/decodersidfactory.h @@ -43,7 +43,6 @@ public: MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); private: SidDatabase m_db; diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.cpp b/src/plugins/Input/sndfile/decodersndfilefactory.cpp index 1d4e6d382..ef733357d 100644 --- a/src/plugins/Input/sndfile/decodersndfilefactory.cpp +++ b/src/plugins/Input/sndfile/decodersndfilefactory.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include <QMessageBox> -#include <QTranslator> #include <QRegExp> #include <QFileInfo> #ifdef Q_OS_WIN @@ -84,6 +83,7 @@ const DecoderProperties DecoderSndFileFactory::properties() const { DecoderProperties properties; properties.name = tr("Sndfile Plugin"); + properties.translation = QLatin1String(":/sndfile_plugin_"); properties.filters << "*.wav" << "*.au" << "*.snd" << "*.aif" << "*.aiff" << "*.8svx"; properties.filters << "*.sph" << "*.sf" << "*.voc" << "*.w64"; properties.description = tr("PCM Files"); @@ -187,18 +187,10 @@ void DecoderSndFileFactory::showSettings(QWidget *) void DecoderSndFileFactory::showAbout(QWidget *parent) { - char version [128] ; + char version [128] = { 0 }; sf_command (NULL, SFC_GET_LIB_VERSION, version, sizeof (version)) ; QMessageBox::about (parent, tr("About Sndfile Audio Plugin"), tr("Qmmp Sndfile Audio Plugin")+"\n"+ tr("Compiled against")+" "+QString(version)+"\n" + tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *DecoderSndFileFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/sndfile_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.h b/src/plugins/Input/sndfile/decodersndfilefactory.h index 4882fcef8..0d0707792 100644 --- a/src/plugins/Input/sndfile/decodersndfilefactory.h +++ b/src/plugins/Input/sndfile/decodersndfilefactory.h @@ -37,7 +37,6 @@ public: MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp index c04276e3f..3e25c5814 100644 --- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp +++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include <QMessageBox> -#include <QTranslator> #include <taglib/tag.h> #include <taglib/fileref.h> #include <taglib/vorbisfile.h> @@ -44,6 +43,7 @@ const DecoderProperties DecoderVorbisFactory::properties() const DecoderProperties properties; properties.name = tr("Ogg Vorbis Plugin"); properties.shortName = "vorbis"; + properties.translation = QLatin1String(":/vorbis_plugin_"); properties.filters << "*.ogg"; properties.description = tr("Ogg Vorbis Files"); properties.contentTypes << "application/ogg" << "audio/x-vorbis+ogg"; @@ -123,11 +123,3 @@ void DecoderVorbisFactory::showAbout(QWidget *parent) tr("Source code based on mq3 project") ); } - -QTranslator *DecoderVorbisFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/vorbis_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.h b/src/plugins/Input/vorbis/decodervorbisfactory.h index e197e1873..7f57918f0 100644 --- a/src/plugins/Input/vorbis/decodervorbisfactory.h +++ b/src/plugins/Input/vorbis/decodervorbisfactory.h @@ -41,7 +41,6 @@ public: QObject* showDetails(QWidget *parent, const QString &path); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp index 94f26723b..2383f87f3 100644 --- a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp +++ b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QMessageBox> #include "wavpackmetadatamodel.h" #include "decoder_wavpack.h" @@ -38,6 +37,7 @@ const DecoderProperties DecoderWavPackFactory::properties() const properties.name = tr("WavPack Plugin"); properties.filters << "*.wv"; properties.description = tr("WavPack Files"); + properties.translation = QLatin1String(":/wavpack_plugin_"); //properties.contentType = ; properties.shortName = "wavpack"; properties.hasAbout = true; @@ -180,11 +180,3 @@ void DecoderWavPackFactory::showAbout(QWidget *parent) QString(" %1").arg(WavpackGetLibraryVersionString ())+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *DecoderWavPackFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/wavpack_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.h b/src/plugins/Input/wavpack/decoderwavpackfactory.h index 66edf5f70..52f7b2e2d 100644 --- a/src/plugins/Input/wavpack/decoderwavpackfactory.h +++ b/src/plugins/Input/wavpack/decoderwavpackfactory.h @@ -37,7 +37,6 @@ public: MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp b/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp index 0a12aa75f..e16e35cd5 100644 --- a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp +++ b/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QMessageBox> #include "wildmidihelper.h" #include "decoder_wildmidi.h" @@ -55,6 +54,7 @@ const DecoderProperties DecoderWildMidiFactory::properties() const properties.description = tr("Midi Files"); //properties.contentType = ; properties.shortName = "wildmidi"; + properties.translation = QLatin1String(":/wildmidi_plugin_"); properties.hasAbout = true; properties.hasSettings = true; properties.noInput = true; @@ -109,11 +109,3 @@ void DecoderWildMidiFactory::showAbout(QWidget *parent) tr("This plugin uses WildMidi library to play midi files")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *DecoderWildMidiFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/wildmidi_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Input/wildmidi/decoderwildmidifactory.h b/src/plugins/Input/wildmidi/decoderwildmidifactory.h index 702b6906f..606ff43ef 100644 --- a/src/plugins/Input/wildmidi/decoderwildmidifactory.h +++ b/src/plugins/Input/wildmidi/decoderwildmidifactory.h @@ -37,7 +37,6 @@ public: MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/Output/alsa/outputalsafactory.cpp b/src/plugins/Output/alsa/outputalsafactory.cpp index 784139055..d5529101b 100644 --- a/src/plugins/Output/alsa/outputalsafactory.cpp +++ b/src/plugins/Output/alsa/outputalsafactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QMessageBox> #include <qmmp/qmmp.h> #include "settingsdialog.h" @@ -31,6 +30,7 @@ const OutputProperties OutputALSAFactory::properties() const OutputProperties properties; properties.name = tr("ALSA Plugin"); properties.shortName = "alsa"; + properties.translation = QLatin1String(":/alsa_plugin_"); properties.hasAbout = true; properties.hasSettings = true; return properties; @@ -58,11 +58,3 @@ void OutputALSAFactory::showAbout(QWidget *parent) tr("Qmmp ALSA Output Plugin")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *OutputALSAFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/alsa_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Output/alsa/outputalsafactory.h b/src/plugins/Output/alsa/outputalsafactory.h index 86fecd91a..873474687 100644 --- a/src/plugins/Output/alsa/outputalsafactory.h +++ b/src/plugins/Output/alsa/outputalsafactory.h @@ -42,8 +42,6 @@ public: Volume *createVolume(); void showSettings(QWidget* parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); - }; #endif diff --git a/src/plugins/Output/directsound/outputdirectsound.h b/src/plugins/Output/directsound/outputdirectsound.h index fca83fd0a..94a07d9b7 100644 --- a/src/plugins/Output/directsound/outputdirectsound.h +++ b/src/plugins/Output/directsound/outputdirectsound.h @@ -21,7 +21,6 @@ #ifndef OUTPUTDIRECTSOUND_H
#define OUTPUTDIRECTSOUND_H
-#include <QTranslator>
#include <stdio.h>
#include <windows.h>
#include <ksmedia.h>
diff --git a/src/plugins/Output/jack/outputjackfactory.cpp b/src/plugins/Output/jack/outputjackfactory.cpp index 2f9e1c68f..1ef4f48fd 100644 --- a/src/plugins/Output/jack/outputjackfactory.cpp +++ b/src/plugins/Output/jack/outputjackfactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QMessageBox> #include <qmmp/qmmp.h> #include "outputjack.h" @@ -32,6 +31,7 @@ const OutputProperties OutputJACKFactory::properties() const properties.hasAbout = true; properties.hasSettings = false; properties.shortName = "jack"; + properties.translation = QLatin1String(":/jack_plugin_"); return properties; } @@ -55,11 +55,3 @@ void OutputJACKFactory::showAbout(QWidget *parent) tr("Qmmp Jack Output Plugin")+"\n"+ tr("Written by: Yuriy Zhuravlev <slalkerg@gmail.com>")); } - -QTranslator *OutputJACKFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/jack_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Output/jack/outputjackfactory.h b/src/plugins/Output/jack/outputjackfactory.h index 3edc54ba2..8deb7dbf5 100644 --- a/src/plugins/Output/jack/outputjackfactory.h +++ b/src/plugins/Output/jack/outputjackfactory.h @@ -42,8 +42,6 @@ public: Volume *createVolume(); void showSettings(QWidget* parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); - }; #endif diff --git a/src/plugins/Output/null/outputnullfactory.cpp b/src/plugins/Output/null/outputnullfactory.cpp index 2a7249165..590a9dfc9 100644 --- a/src/plugins/Output/null/outputnullfactory.cpp +++ b/src/plugins/Output/null/outputnullfactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QMessageBox> #include <qmmp/qmmp.h> #include "outputnull.h" @@ -32,6 +31,7 @@ const OutputProperties OutputNullFactory::properties() const properties.hasAbout = true; properties.hasSettings = false; properties.shortName = "null"; + properties.translation = QLatin1String(":/null_plugin_"); return properties; } @@ -56,11 +56,3 @@ void OutputNullFactory::showAbout(QWidget *parent) tr("Qmmp Null Output Plugin")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *OutputNullFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/null_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Output/null/outputnullfactory.h b/src/plugins/Output/null/outputnullfactory.h index 645d37815..931c0f6a3 100644 --- a/src/plugins/Output/null/outputnullfactory.h +++ b/src/plugins/Output/null/outputnullfactory.h @@ -42,8 +42,6 @@ public: Volume *createVolume(); void showSettings(QWidget* parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); - }; #endif diff --git a/src/plugins/Output/oss/outputossfactory.cpp b/src/plugins/Output/oss/outputossfactory.cpp index f4ed82d9f..6686d86c6 100644 --- a/src/plugins/Output/oss/outputossfactory.cpp +++ b/src/plugins/Output/oss/outputossfactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QMessageBox> #include <qmmp/qmmp.h> #include "settingsdialog.h" @@ -36,6 +35,7 @@ const OutputProperties OutputOSSFactory::properties() const OutputProperties properties; properties.name = tr("OSS Plugin"); properties.shortName = "oss"; + properties.translation = QLatin1String(":/oss_plugin_"); properties.hasAbout = true; properties.hasSettings = true; return properties; @@ -59,11 +59,3 @@ QMessageBox::about (parent, tr("About OSS Output Plugin"), tr("Written by: Yuriy Zhuravlev <slalkerg@gmail.com>")+"\n"+ tr("Based on code by: Brad Hughes <bhughes@trolltech.com>")); } - -QTranslator *OutputOSSFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/oss_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Output/oss/outputossfactory.h b/src/plugins/Output/oss/outputossfactory.h index 23f0b1b49..1a9ff7e36 100644 --- a/src/plugins/Output/oss/outputossfactory.h +++ b/src/plugins/Output/oss/outputossfactory.h @@ -42,7 +42,6 @@ public: Volume *createVolume(); void showSettings(QWidget* parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/Output/oss4/outputoss4factory.cpp b/src/plugins/Output/oss4/outputoss4factory.cpp index 76787e1aa..b3d0c7d33 100644 --- a/src/plugins/Output/oss4/outputoss4factory.cpp +++ b/src/plugins/Output/oss4/outputoss4factory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QMessageBox> #include <qmmp/qmmp.h> #include "settingsdialog.h" diff --git a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp index 20e7af32c..da8d8f2d1 100644 --- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp +++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QMessageBox> #include <qmmp/qmmp.h> #include "outputpulseaudio.h" @@ -32,6 +31,7 @@ const OutputProperties OutputPulseAudioFactory::properties() const properties.hasAbout = true; properties.hasSettings = false; properties.shortName = "pulse"; + properties.translation = QLatin1String(":/pulseaudio_plugin_"); return properties; } @@ -56,11 +56,3 @@ void OutputPulseAudioFactory::showAbout(QWidget *parent) tr("Qmmp PulseAudio Output Plugin")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *OutputPulseAudioFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/pulseaudio_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h index 64eda4ae7..bfd4b07e9 100644 --- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h +++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h @@ -43,8 +43,6 @@ public: Volume *createVolume(); void showSettings(QWidget* parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); - }; #endif diff --git a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp index 402617f96..070bd5f23 100644 --- a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp +++ b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp @@ -22,7 +22,6 @@ #include "settingsdialog.h" #include <QMessageBox> -#include <QTranslator> #include <qmmp/qmmp.h> #include "outputqtmultimedia.h" @@ -34,6 +33,7 @@ const OutputProperties OutputQtMultimediaFactory::properties() const properties.hasAbout = true; properties.hasSettings = true; properties.shortName = "qtmultimedia"; + properties.translation = QLatin1String(":/qtmultimedia_plugin_"); return properties; } @@ -59,11 +59,3 @@ void OutputQtMultimediaFactory::showAbout(QWidget *parent) tr("Qmmp Qt Multimedia Output Plugin")+"\n"+ tr("Written by: Ivan Ponomarev <ivantrue@gmail.com>")); } - -QTranslator *OutputQtMultimediaFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/qtmultimedia_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h index 6a0a86ea4..ae109db28 100644 --- a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h +++ b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h @@ -42,7 +42,6 @@ public: virtual Volume *createVolume(); virtual void showSettings(QWidget* parent); virtual void showAbout(QWidget *parent); - virtual QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/Output/shout/outputshoutfactory.cpp b/src/plugins/Output/shout/outputshoutfactory.cpp index c186e99cf..80e875ec6 100644 --- a/src/plugins/Output/shout/outputshoutfactory.cpp +++ b/src/plugins/Output/shout/outputshoutfactory.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include <QMessageBox> -#include <QTranslator> #include <QtPlugin> #include <QApplication> #include <qmmp/qmmp.h> @@ -41,6 +40,7 @@ const OutputProperties OutputShoutFactory::properties() const properties.hasAbout = true; properties.hasSettings = true; properties.shortName = "shout"; + properties.translation = QLatin1String(":/shout_plugin_"); return properties; } @@ -67,11 +67,3 @@ void OutputShoutFactory::showAbout(QWidget *parent) tr("Compiled against libshout-%1").arg(shout_version(0,0,0))+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *OutputShoutFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/shout_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Output/shout/outputshoutfactory.h b/src/plugins/Output/shout/outputshoutfactory.h index bd3683d02..f1288cd4a 100644 --- a/src/plugins/Output/shout/outputshoutfactory.h +++ b/src/plugins/Output/shout/outputshoutfactory.h @@ -42,7 +42,6 @@ public: Volume *createVolume(); void showSettings(QWidget* parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); private: ShoutClient *m_connection; diff --git a/src/plugins/Output/wasapi/outputwasapifactory.cpp b/src/plugins/Output/wasapi/outputwasapifactory.cpp index 196a8c2be..e3516ce72 100644 --- a/src/plugins/Output/wasapi/outputwasapifactory.cpp +++ b/src/plugins/Output/wasapi/outputwasapifactory.cpp @@ -19,7 +19,6 @@ ***************************************************************************/
#include <QMessageBox>
-#include <QTranslator>
#include "settingsdialog.h"
#include "outputwasapi.h"
#include "outputwasapifactory.h"
diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.h b/src/plugins/Output/waveout/outputwaveoutfactory.h index 16675a27a..c8b992408 100644 --- a/src/plugins/Output/waveout/outputwaveoutfactory.h +++ b/src/plugins/Output/waveout/outputwaveoutfactory.h @@ -24,7 +24,6 @@ #include <QString>
#include <QIODevice>
#include <QWidget>
-#include <QTranslator>
#include <qmmp/output.h>
#include <qmmp/outputfactory.h>
diff --git a/src/plugins/Transports/http/httpinputfactory.cpp b/src/plugins/Transports/http/httpinputfactory.cpp index daedaf9f7..b733492b0 100644 --- a/src/plugins/Transports/http/httpinputfactory.cpp +++ b/src/plugins/Transports/http/httpinputfactory.cpp @@ -20,7 +20,6 @@ #include <QtPlugin> #include <QMessageBox> -#include <QTranslator> #include <curl/curlver.h> #include <qmmp/qmmp.h> #include "settingsdialog.h" @@ -29,13 +28,14 @@ const InputSourceProperties HTTPInputFactory::properties() const { - InputSourceProperties p; - p.protocols << "http" << "https"; - p.name = tr("HTTP Plugin"); - p.shortName = "http"; - p.hasAbout = true; - p.hasSettings = true; - return p; + InputSourceProperties properties; + properties.protocols << "http" << "https"; + properties.name = tr("HTTP Plugin"); + properties.shortName = "http"; + properties.translation = QLatin1String(":/http_plugin_"); + properties.hasAbout = true; + properties.hasSettings = true; + return properties; } InputSource *HTTPInputFactory::create(const QString &url, QObject *parent) @@ -56,11 +56,3 @@ void HTTPInputFactory::showAbout(QWidget *parent) tr("Compiled against libcurl-%1").arg(LIBCURL_VERSION) + "\n" + tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *HTTPInputFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/http_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Transports/http/httpinputfactory.h b/src/plugins/Transports/http/httpinputfactory.h index 9aea98f09..7bd7f3bce 100644 --- a/src/plugins/Transports/http/httpinputfactory.h +++ b/src/plugins/Transports/http/httpinputfactory.h @@ -25,8 +25,6 @@ #include <QStringList> #include <qmmp/inputsourcefactory.h> -class QTranslator; - /*! * @author Ilya Kotov <forkotov02@ya.ru> */ @@ -40,7 +38,6 @@ public: InputSource *create(const QString &url, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif // HTTPINPUTFACTORY_H diff --git a/src/plugins/Transports/mms/mmsinputfactory.cpp b/src/plugins/Transports/mms/mmsinputfactory.cpp index 2dc0c84bf..2257392b2 100644 --- a/src/plugins/Transports/mms/mmsinputfactory.cpp +++ b/src/plugins/Transports/mms/mmsinputfactory.cpp @@ -20,7 +20,6 @@ #include <QtPlugin> #include <QMessageBox> -#include <QTranslator> #include <qmmp/qmmp.h> #include "settingsdialog.h" #include "mmsinputsource.h" @@ -28,13 +27,14 @@ const InputSourceProperties MMSInputFactory::properties() const { - InputSourceProperties p; - p.protocols << "mms" << "mmsh" << "mmst" << "mmsu"; - p.name = tr("MMS Plugin"); - p.shortName = "mms"; - p.hasAbout = true; - p.hasSettings = true; - return p; + InputSourceProperties properties; + properties.protocols << "mms" << "mmsh" << "mmst" << "mmsu"; + properties.name = tr("MMS Plugin"); + properties.shortName = "mms"; + properties.translation = QLatin1String(":/mms_plugin_"); + properties.hasAbout = true; + properties.hasSettings = true; + return properties; } InputSource *MMSInputFactory::create(const QString &url, QObject *parent) @@ -54,11 +54,3 @@ void MMSInputFactory::showAbout(QWidget *parent) tr("Qmmp MMS Transport Plugin")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *MMSInputFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/mms_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Transports/mms/mmsinputfactory.h b/src/plugins/Transports/mms/mmsinputfactory.h index 3b6e8576c..756d3ea19 100644 --- a/src/plugins/Transports/mms/mmsinputfactory.h +++ b/src/plugins/Transports/mms/mmsinputfactory.h @@ -25,8 +25,6 @@ #include <QStringList> #include <qmmp/inputsourcefactory.h> -class QTranslator; - /*! * @author Ilya Kotov <forkotov02@ya.ru> */ @@ -40,7 +38,6 @@ public: InputSource *create(const QString &url, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif // MMSINPUTFACTORY_H diff --git a/src/plugins/Ui/qsui/qsuifactory.cpp b/src/plugins/Ui/qsui/qsuifactory.cpp index ccf2401dd..374104ea6 100644 --- a/src/plugins/Ui/qsui/qsuifactory.cpp +++ b/src/plugins/Ui/qsui/qsuifactory.cpp @@ -31,6 +31,7 @@ const UiProperties QSUIFactory::properties() const props.hasAbout = true; props.name = tr("Simple User Interface"); props.shortName = "qsui"; + props.translation = QLatin1String(":/qsui_plugin_"); return props; } @@ -45,11 +46,3 @@ void QSUIFactory::showAbout(QWidget *parent) AboutQSUIDialog about(parent); about.exec(); } - -QTranslator *QSUIFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/qsui_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Ui/qsui/qsuifactory.h b/src/plugins/Ui/qsui/qsuifactory.h index 138807308..fcaf06452 100644 --- a/src/plugins/Ui/qsui/qsuifactory.h +++ b/src/plugins/Ui/qsui/qsuifactory.h @@ -21,7 +21,6 @@ #define QSUIFACTORY_H #include <QObject> -#include <QTranslator> #include <qmmpui/uifactory.h> /*! @@ -36,7 +35,6 @@ public: const UiProperties properties() const; QObject *create(); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/Ui/skinned/skinnedfactory.cpp b/src/plugins/Ui/skinned/skinnedfactory.cpp index 064a0ffc5..8b146e233 100644 --- a/src/plugins/Ui/skinned/skinnedfactory.cpp +++ b/src/plugins/Ui/skinned/skinnedfactory.cpp @@ -30,6 +30,7 @@ const UiProperties SkinnedFactory::properties() const props.hasAbout = true; props.name = tr("Skinned User Interface"); props.shortName = "skinned"; + props.translation = QLatin1String(":/skinned_plugin_"); return props; } @@ -52,11 +53,3 @@ void SkinnedFactory::showAbout(QWidget *parent) tr("sixixfive <http://sixsixfive.deviantart.com/>")); } - -QTranslator *SkinnedFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/skinned_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Ui/skinned/skinnedfactory.h b/src/plugins/Ui/skinned/skinnedfactory.h index 2c8859e6d..4ee3b1b71 100644 --- a/src/plugins/Ui/skinned/skinnedfactory.h +++ b/src/plugins/Ui/skinned/skinnedfactory.h @@ -21,10 +21,8 @@ #define SKINNEDFACTORY_H #include <QObject> -#include <QTranslator> #include <qmmpui/uifactory.h> - /*! * @author Ilya Kotov <forkotov02@ya.ru> */ @@ -37,7 +35,6 @@ public: const UiProperties properties() const; QObject *create(); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; #endif diff --git a/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp b/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp index a41eb89f1..21210f0dc 100644 --- a/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp +++ b/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QMessageBox> #include <qmmp/qmmp.h> #include "settingsdialog.h" @@ -30,6 +29,7 @@ const VisualProperties VisualAnalyzerFactory::properties() const VisualProperties properties; properties.name = tr("Analyzer Plugin"); properties.shortName = "analyzer"; + properties.translation = QLatin1String(":/analyzer_plugin_"); properties.hasSettings = true; properties.hasAbout = true; return properties; @@ -51,11 +51,3 @@ void VisualAnalyzerFactory::showAbout(QWidget *parent) tr("Qmmp Analyzer Visual Plugin")+"\n"+ tr("Written by: Ilya Kotov <forkotov02@ya.ru>")); } - -QTranslator *VisualAnalyzerFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/analyzer_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Visual/analyzer/visualanalyzerfactory.h b/src/plugins/Visual/analyzer/visualanalyzerfactory.h index 4e49c7836..837fbb686 100644 --- a/src/plugins/Visual/analyzer/visualanalyzerfactory.h +++ b/src/plugins/Visual/analyzer/visualanalyzerfactory.h @@ -40,7 +40,6 @@ public: Visual *create(QWidget *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; diff --git a/src/plugins/Visual/projectm/visualprojectmfactory.cpp b/src/plugins/Visual/projectm/visualprojectmfactory.cpp index a66531f0b..15b90d648 100644 --- a/src/plugins/Visual/projectm/visualprojectmfactory.cpp +++ b/src/plugins/Visual/projectm/visualprojectmfactory.cpp @@ -18,7 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <QTranslator> #include <QMessageBox> #include <qmmp/qmmp.h> #include "visualprojectmfactory.h" @@ -29,6 +28,7 @@ const VisualProperties VisualProjectMFactory::properties() const VisualProperties properties; properties.name = tr("ProjectM"); properties.shortName = "projectm"; + properties.translation = QLatin1String(":/projectm_plugin_"); properties.hasSettings = false; properties.hasAbout = true; return properties; @@ -53,11 +53,3 @@ void VisualProjectMFactory::showAbout(QWidget *parent) tr("Written by: Ilya Kotov <forkotov02@ya.ru>")+"\n"+ tr("Based on libprojectM-qt library")); } - -QTranslator *VisualProjectMFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/projectm_plugin_") + locale); - return translator; -} diff --git a/src/plugins/Visual/projectm/visualprojectmfactory.h b/src/plugins/Visual/projectm/visualprojectmfactory.h index ffede2f93..5c6f18fcd 100644 --- a/src/plugins/Visual/projectm/visualprojectmfactory.h +++ b/src/plugins/Visual/projectm/visualprojectmfactory.h @@ -38,7 +38,6 @@ public: Visual *create(QWidget *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); }; diff --git a/src/qmmp/decoderfactory.h b/src/qmmp/decoderfactory.h index f4fe8f943..9cd876129 100644 --- a/src/qmmp/decoderfactory.h +++ b/src/qmmp/decoderfactory.h @@ -24,7 +24,6 @@ #include <QObject> #include <QString> #include <QIODevice> -#include <QTranslator> #include <QStringList> #include "qmmp_export.h" #include "decoder.h" @@ -49,6 +48,7 @@ public: } QString name; /*!< Input plugin full name */ QString shortName; /*!< Input plugin short name for internal usage */ + QString translation; /*!< Translation file path without locale code and extension */ QStringList filters; /*!< File filters (example: "*.mp3") */ QString description; /*!< File filters description */ QStringList contentTypes; /*!< Supported content types */ @@ -109,11 +109,6 @@ public: * @param parent Parent widget. */ virtual void showAbout(QWidget *parent) = 0; - /*! - * Creates QTranslator object of the system locale. Should return 0 if translation doesn't exist. - * @param parent Parent object. - */ - virtual QTranslator *createTranslator(QObject *parent) = 0; }; Q_DECLARE_INTERFACE(DecoderFactory, "DecoderFactory/1.0") diff --git a/src/qmmp/effectfactory.h b/src/qmmp/effectfactory.h index e18961443..c95db93ff 100644 --- a/src/qmmp/effectfactory.h +++ b/src/qmmp/effectfactory.h @@ -25,7 +25,6 @@ class QObject; class QWidget; -class QTranslator; class Effect; /*! @brief Helper class to store effect plugin properties. @@ -52,11 +51,12 @@ public: hasSettings = false; priority = EFFECT_PRIORITY_DEFAULT; } - QString name; /*!< Effect plugin full name */ - QString shortName; /*!< Effect plugin short name for internal usage */ - bool hasAbout; /*!< Should be \b true if plugin has about dialog, otherwise returns \b false */ - bool hasSettings; /*!< Should be \b true if plugin has settings dialog, otherwise returns \b false */ - int priority; /*!< Effect priority. Effecs with higher priority will be applied first */ + QString name; /*!< Effect plugin full name */ + QString shortName; /*!< Effect plugin short name for internal usage */ + QString translation; /*!< Translation file path without locale code and extension */ + bool hasAbout; /*!< Should be \b true if plugin has about dialog, otherwise returns \b false */ + bool hasSettings; /*!< Should be \b true if plugin has settings dialog, otherwise returns \b false */ + int priority; /*!< Effect priority. Effecs with higher priority will be applied first */ }; /*! @brief Effect plugin interface (effect factory). * @author Ilya Kotov <forkotov02@ya.ru> @@ -82,13 +82,8 @@ public: * @param parent Parent widget. */ virtual void showAbout(QWidget *parent) = 0; - /*! - * Creates QTranslator object of the system locale. Should return 0 if translation doesn't exist. - * @param parent Parent object. - */ - virtual QTranslator *createTranslator(QObject *parent) = 0; }; -Q_DECLARE_INTERFACE(EffectFactory, "EffectFactory/1.0"); +Q_DECLARE_INTERFACE(EffectFactory, "EffectFactory/1.0") #endif diff --git a/src/qmmp/enginefactory.h b/src/qmmp/enginefactory.h index d8b697f9d..338111efe 100644 --- a/src/qmmp/enginefactory.h +++ b/src/qmmp/enginefactory.h @@ -25,7 +25,6 @@ #include <QList> #include <QMap> #include <QIODevice> -#include <QTranslator> #include "qmmp_export.h" #include "qmmp.h" #include "trackinfo.h" @@ -48,14 +47,15 @@ public: hasAbout = false; hasSettings = false; } - QString name; /*!< Input plugin full name */ - QString shortName; /*!< Input plugin short name for internal usage */ - QStringList filters; /*!< File filters (example: "*.mp3,*.ogg") */ - QString description; /*!< File filter description */ + QString name; /*!< Input plugin full name */ + QString shortName; /*!< Input plugin short name for internal usage */ + QString translation; /*!< Translation file path without locale code and extension */ + QStringList filters; /*!< File filters (example: "*.mp3,*.ogg") */ + QString description; /*!< File filter description */ QStringList contentTypes; /*!< Supported content types */ - QStringList protocols; /*!< Supported protocols. Should be empty if plugin uses stream input. */ - bool hasAbout; /*!< Should be \b true if plugin has about dialog, otherwise returns \b false */ - bool hasSettings; /*!< Should be \b true if plugin has settings dialog, otherwise returns \b false */ + QStringList protocols; /*!< Supported protocols. Should be empty if plugin uses stream input. */ + bool hasAbout; /*!< Should be \b true if plugin has about dialog, otherwise returns \b false */ + bool hasSettings; /*!< Should be \b true if plugin has settings dialog, otherwise returns \b false */ }; /*! @brief Engine plugin interface. * @author Ilya Kotov <forkotov02@ya.ru> @@ -105,11 +105,6 @@ public: * @param parent Parent widget. */ virtual void showAbout(QWidget *parent) = 0; - /*! - * Creates QTranslator object of the system locale. Should return 0 if translation doesn't exist. - * @param parent Parent object. - */ - virtual QTranslator *createTranslator(QObject *parent) = 0; }; Q_DECLARE_INTERFACE(EngineFactory, "EngineFactory/1.0") diff --git a/src/qmmp/inputsourcefactory.h b/src/qmmp/inputsourcefactory.h index 2b041e74b..10fde8f68 100644 --- a/src/qmmp/inputsourcefactory.h +++ b/src/qmmp/inputsourcefactory.h @@ -24,7 +24,6 @@ #include <QObject> #include "qmmp_export.h" -class QTranslator; class QStringList; class InputSource; @@ -45,6 +44,7 @@ public: QString name; /*!< Transport plugin full name */ QString shortName; /*!< Transport plugin name for internal usage */ + QString translation; /*!< Translation file path without locale code and extension */ QStringList protocols; /*!< A list of supported protocols. */ bool hasAbout; /*!< Should be \b true if plugin has about dialog, otherwise \b false */ bool hasSettings; /*!< Should be \b true if plugin has settings dialog, otherwise \b false */ @@ -77,11 +77,6 @@ public: * @param parent Parent widget. */ virtual void showAbout(QWidget *parent) = 0; - /*! - * Creates QTranslator object of the system locale. Should return 0 if translation doesn't exist. - * @param parent Parent object. - */ - virtual QTranslator *createTranslator(QObject *parent) = 0; }; Q_DECLARE_INTERFACE(InputSourceFactory, "InputSourceFactory/1.0") diff --git a/src/qmmp/outputfactory.h b/src/qmmp/outputfactory.h index 5a76f78e7..de40cca0b 100644 --- a/src/qmmp/outputfactory.h +++ b/src/qmmp/outputfactory.h @@ -27,7 +27,6 @@ class QObject; class QString; class QIODevice; class QWidget; -class QTranslator; class Volume; class Decoder; class Output; @@ -46,10 +45,11 @@ public: hasAbout = false; hasSettings = false; } - QString name; /*!< Effect plugin full name */ - QString shortName; /*!< Effect plugin short name for internal usage */ - bool hasAbout; /*!< Should be \b true if plugin has about dialog, otherwise returns \b false */ - bool hasSettings; /*!< Should be \b true if plugin has settings dialog, otherwise returns \b false */ + QString name; /*!< Effect plugin full name */ + QString shortName; /*!< Effect plugin short name for internal usage */ + QString translation; /*!< Translation file path without locale code and extension */ + bool hasAbout; /*!< Should be \b true if plugin has about dialog, otherwise returns \b false */ + bool hasSettings; /*!< Should be \b true if plugin has settings dialog, otherwise returns \b false */ }; /*! @brief %Output plugin interface (output factory). * @author Ilya Kotov <forkotov02@ya.ru> @@ -84,11 +84,6 @@ public: * @param parent Parent widget. */ virtual void showAbout(QWidget *parent) = 0; - /*! - * Creates QTranslator object of the system locale. Should return 0 if translation doesn't exist. - * @param parent Parent object. - */ - virtual QTranslator *createTranslator(QObject *parent) = 0; }; Q_DECLARE_INTERFACE(OutputFactory, "OutputFactory/1.0") diff --git a/src/qmmp/qmmpplugincache.cpp b/src/qmmp/qmmpplugincache.cpp index 83c0aff9f..b76b44fa3 100644 --- a/src/qmmp/qmmpplugincache.cpp +++ b/src/qmmp/qmmpplugincache.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013 by Ilya Kotov * + * Copyright (C) 2013-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -135,7 +135,7 @@ DecoderFactory *QmmpPluginCache::decoderFactory() { m_decoderFactory = qobject_cast<DecoderFactory *> (instance()); if(m_decoderFactory) - qApp->installTranslator(m_decoderFactory->createTranslator(qApp)); + loadTranslation(m_decoderFactory->properties().translation); } return m_decoderFactory; } @@ -146,7 +146,7 @@ OutputFactory *QmmpPluginCache::outputFactory() { m_outputFactory = qobject_cast<OutputFactory *> (instance()); if(m_outputFactory) - qApp->installTranslator(m_outputFactory->createTranslator(qApp)); + loadTranslation(m_outputFactory->properties().translation); } return m_outputFactory; } @@ -157,7 +157,7 @@ EngineFactory *QmmpPluginCache::engineFactory() { m_engineFactory = qobject_cast<EngineFactory *> (instance()); if(m_engineFactory) - qApp->installTranslator(m_engineFactory->createTranslator(qApp)); + loadTranslation(m_engineFactory->properties().translation); } return m_engineFactory; } @@ -168,7 +168,7 @@ EffectFactory *QmmpPluginCache::effectFactory() { m_effectFactory = qobject_cast<EffectFactory *> (instance()); if(m_effectFactory) - qApp->installTranslator(m_effectFactory->createTranslator(qApp)); + loadTranslation(m_effectFactory->properties().translation); } return m_effectFactory; } @@ -179,7 +179,7 @@ InputSourceFactory *QmmpPluginCache::inputSourceFactory() { m_inputSourceFactory = qobject_cast<InputSourceFactory *> (instance()); if(m_inputSourceFactory) - qApp->installTranslator(m_inputSourceFactory->createTranslator(qApp)); + loadTranslation(m_inputSourceFactory->properties().translation); } return m_inputSourceFactory; } @@ -207,6 +207,16 @@ QObject *QmmpPluginCache::instance() return m_instance; } +void QmmpPluginCache::loadTranslation(const QString &translation) +{ + if(!translation.isEmpty()) + { + QTranslator *translator = new QTranslator(qApp); + translator->load(translation + Qmmp::systemLanguageID()); + qApp->installTranslator(translator); + } +} + void QmmpPluginCache::cleanup(QSettings *settings) { settings->beginGroup("PluginCache"); diff --git a/src/qmmp/qmmpplugincache_p.h b/src/qmmp/qmmpplugincache_p.h index 7c5388981..4dfb938b4 100644 --- a/src/qmmp/qmmpplugincache_p.h +++ b/src/qmmp/qmmpplugincache_p.h @@ -54,6 +54,7 @@ public: private: QObject *instance(); + void loadTranslation(const QString &translation); QString m_path; QString m_shortName; bool m_error; diff --git a/src/qmmp/visual.cpp b/src/qmmp/visual.cpp index eb7062dda..5738f1aec 100644 --- a/src/qmmp/visual.cpp +++ b/src/qmmp/visual.cpp @@ -27,6 +27,7 @@ #include <QApplication> #include <QDialog> #include <QPluginLoader> +#include <QTranslator> #include "statehandler.h" #include "visualfactory.h" #include "visualbuffer_p.h" @@ -261,7 +262,12 @@ void Visual::checkFactories() { m_factories->append(factory); m_files->insert(factory, filePath); - qApp->installTranslator(factory->createTranslator(qApp)); + if(!factory->properties().translation.isEmpty()) + { + QTranslator *translator = new QTranslator(qApp); + translator->load(factory->properties().translation + Qmmp::systemLanguageID()); + qApp->installTranslator(translator); + } } } } diff --git a/src/qmmp/visualfactory.h b/src/qmmp/visualfactory.h index 4779aba48..597f284d6 100644 --- a/src/qmmp/visualfactory.h +++ b/src/qmmp/visualfactory.h @@ -25,7 +25,6 @@ class QObject; class QWidget; -class QTranslator; class QDialog; class Visual; @@ -43,10 +42,11 @@ public: hasAbout = false; hasSettings = false; } - QString name; /*!< Effect plugin full name */ - QString shortName; /*!< Effect plugin short name for internal usage */ - bool hasAbout; /*!< Should be \b true if plugin has about dialog, otherwise returns \b false */ - bool hasSettings; /*!< Should be \b true if plugin has settings dialog, otherwise returns \b false */ + QString name; /*!< Effect plugin full name */ + QString shortName; /*!< Effect plugin short name for internal usage */ + QString translation; /*!< Translation file path without locale code and extension */ + bool hasAbout; /*!< Should be \b true if plugin has about dialog, otherwise returns \b false */ + bool hasSettings; /*!< Should be \b true if plugin has settings dialog, otherwise returns \b false */ }; /*! @brief %Visual plugin interface (visual factory). * @author Ilya Kotov <forkotov02@ya.ru> @@ -78,11 +78,6 @@ public: * @param parent Parent widget. */ virtual void showAbout(QWidget *parent) = 0; - /*! - * Creates QTranslator object of the system locale. Should return \b 0 if translation doesn't exist. - * @param parent Parent object. - */ - virtual QTranslator *createTranslator(QObject *parent) = 0; }; Q_DECLARE_INTERFACE(VisualFactory, "VisualFactory/1.0") diff --git a/src/qmmpui/commandlinemanager.cpp b/src/qmmpui/commandlinemanager.cpp index 8074d5b12..fb672e335 100644 --- a/src/qmmpui/commandlinemanager.cpp +++ b/src/qmmpui/commandlinemanager.cpp @@ -60,7 +60,7 @@ void CommandLineManager::checkOptions() { m_options->append(option); m_files->insert(option, filePath); - qApp->installTranslator(option->createTranslator(qApp)); + //qApp->installTranslator(option->createTranslator(qApp)); } } } diff --git a/src/qmmpui/commandlineoption.h b/src/qmmpui/commandlineoption.h index a8847897d..6e1a52638 100644 --- a/src/qmmpui/commandlineoption.h +++ b/src/qmmpui/commandlineoption.h @@ -23,7 +23,6 @@ #include "qmmpui_export.h" class CommandLineManager; -class QTranslator; class QString; class QObject; class QStringList; @@ -56,10 +55,6 @@ public: */ virtual QString executeCommand(const QString &opt_str, const QStringList &args) = 0; /*! - * Creates translator with parent object \b parent - */ - virtual QTranslator *createTranslator(QObject *parent) = 0; - /*! * Object destructor */ virtual ~CommandLineOption() {} diff --git a/src/qmmpui/filedialog.cpp b/src/qmmpui/filedialog.cpp index 60f9c6e97..75cef24e2 100644 --- a/src/qmmpui/filedialog.cpp +++ b/src/qmmpui/filedialog.cpp @@ -20,7 +20,6 @@ #include <QFile> #include <QSettings> -#include <QTranslator> #include <QApplication> #include <QPluginLoader> #include <QMetaObject> diff --git a/src/qmmpui/filedialogfactory.h b/src/qmmpui/filedialogfactory.h index fd416f1e1..5174a8f1b 100644 --- a/src/qmmpui/filedialogfactory.h +++ b/src/qmmpui/filedialogfactory.h @@ -23,7 +23,6 @@ #include "qmmpui_export.h" class QObject; -class QTranslator; class FileDialog; class QWidget; class QString; @@ -41,12 +40,13 @@ public: hasAbout = false; modal = true; } - bool hasAbout; /*!< Should be \b true if the file dialog plugin has about dialog, - * otherwise should be \b false */ - QString name; /*!< File dialog plugin full name */ - QString shortName; /*!< File dialog short name for internal usage */ - bool modal; /*!< Should be \b true if the file dialog doesn't support nonmodal mode, - * otherwise should be \b false */ + bool hasAbout; /*!< Should be \b true if the file dialog plugin has about dialog, + * otherwise should be \b false */ + QString name; /*!< File dialog plugin full name */ + QString shortName; /*!< File dialog short name for internal usage */ + QString translation; /*!< Translation file path without locale code and extension */ + bool modal; /*!< Should be \b true if the file dialog doesn't support nonmodal mode, + * otherwise should be \b false */ }; /*! @brief File dialog plugin interface. * @author Vladimir Kuznetsov <vovanec@gmail.com> @@ -71,11 +71,6 @@ public: * @param parent Parent widget. */ virtual void showAbout(QWidget *parent) = 0; - /*! - * Creates QTranslator object of the system locale. Should return 0 if translation doesn't exist. - * @param parent Parent object. - */ - virtual QTranslator *createTranslator(QObject *parent) = 0; }; Q_DECLARE_INTERFACE(FileDialogFactory, "FileDialogFactory/1.0") diff --git a/src/qmmpui/generalfactory.h b/src/qmmpui/generalfactory.h index dcb2e87e9..5075f60d7 100644 --- a/src/qmmpui/generalfactory.h +++ b/src/qmmpui/generalfactory.h @@ -23,7 +23,6 @@ #include "qmmpui_export.h" class QObject; -class QTranslator; class QDialog; class QString; class QWidget; @@ -46,6 +45,7 @@ public: } QString name; /*!< File dialog plugin full name */ QString shortName; /*!< File dialog short name for internal usage */ + QString translation; /*!< Translation file path without locale code and extension */ bool hasAbout; /*!< Should be \b true if plugin has about dialog, otherwise returns \b false */ bool hasSettings; /*!< Should be \b true if plugin has settings dialog, otherwise returns \b false */ bool visibilityControl; /*!< Should be \b true if plugin can show/hide main window of the player, @@ -80,11 +80,6 @@ public: * @param parent Parent widget. */ virtual void showAbout(QWidget *parent) = 0; - /*! - * Creates QTranslator object of the system locale. Should return \b 0 if translation doesn't exist. - * @param parent Parent object. - */ - virtual QTranslator *createTranslator(QObject *parent) = 0; }; Q_DECLARE_INTERFACE(GeneralFactory, "GeneralFactory/1.0") diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp index b60596739..8dd0fbf61 100644 --- a/src/qmmpui/mediaplayer.cpp +++ b/src/qmmpui/mediaplayer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2015 by Ilya Kotov * + * Copyright (C) 2008-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -20,9 +20,9 @@ #include <QApplication> #include <QString> -#include <QTranslator> #include <QLocale> #include <QTimer> +#include <QTranslator> #include "playlistitem.h" #include "qmmpuisettings.h" #include "mediaplayer.h" diff --git a/src/qmmpui/qmmpuiplugincache.cpp b/src/qmmpui/qmmpuiplugincache.cpp index 0969b1a29..9495f6fa1 100644 --- a/src/qmmpui/qmmpuiplugincache.cpp +++ b/src/qmmpui/qmmpuiplugincache.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013 by Ilya Kotov * + * Copyright (C) 2013-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -24,6 +24,7 @@ #include <QPluginLoader> #include <QApplication> #include <QTranslator> +#include <qmmp/qmmp.h> #include "generalfactory.h" #include "uifactory.h" #include "filedialogfactory.h" @@ -159,7 +160,7 @@ GeneralFactory *QmmpUiPluginCache::generalFactory() { m_generalFactory = qobject_cast<GeneralFactory *> (instance()); if(m_generalFactory) - qApp->installTranslator(m_generalFactory->createTranslator(qApp)); + loadTranslation(m_generalFactory->properties().translation); } return m_generalFactory; } @@ -170,7 +171,7 @@ UiFactory *QmmpUiPluginCache::uiFactory() { m_uiFactory = qobject_cast<UiFactory *> (instance()); if(m_uiFactory) - qApp->installTranslator(m_uiFactory->createTranslator(qApp)); + loadTranslation(m_uiFactory->properties().translation); } return m_uiFactory; } @@ -181,7 +182,7 @@ FileDialogFactory *QmmpUiPluginCache::fileDialogFactory() { m_fileDialogFactory = qobject_cast<FileDialogFactory *> (instance()); if(m_fileDialogFactory) - qApp->installTranslator(m_fileDialogFactory->createTranslator(qApp)); + loadTranslation(m_fileDialogFactory->properties().translation); } return m_fileDialogFactory; } @@ -204,6 +205,16 @@ QObject *QmmpUiPluginCache::instance() return m_instance; } +void QmmpUiPluginCache::loadTranslation(const QString &translation) +{ + if(!translation.isEmpty()) + { + QTranslator *translator = new QTranslator(qApp); + translator->load(translation + Qmmp::systemLanguageID()); + qApp->installTranslator(translator); + } +} + void QmmpUiPluginCache::cleanup(QSettings *settings) { settings->beginGroup("PluginCache"); diff --git a/src/qmmpui/qmmpuiplugincache_p.h b/src/qmmpui/qmmpuiplugincache_p.h index 2c06c5c1c..e961463db 100644 --- a/src/qmmpui/qmmpuiplugincache_p.h +++ b/src/qmmpui/qmmpuiplugincache_p.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013 by Ilya Kotov * + * Copyright (C) 2013-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -51,6 +51,7 @@ public: private: QObject *instance(); + void loadTranslation(const QString &translation); QString m_path; QString m_shortName; bool m_error; diff --git a/src/qmmpui/qtfiledialog.cpp b/src/qmmpui/qtfiledialog.cpp index e81330c60..7ec53c5f9 100644 --- a/src/qmmpui/qtfiledialog.cpp +++ b/src/qmmpui/qtfiledialog.cpp @@ -41,12 +41,6 @@ const FileDialogProperties QtFileDialogFactory::properties() const void QtFileDialogFactory::showAbout(QWidget*){} -QTranslator *QtFileDialogFactory::createTranslator(QObject *parent) -{ - Q_UNUSED(parent) - return 0; -} - QtFileDialog::~QtFileDialog() { qDebug("QtFileDialog::~QtFileDialog()"); diff --git a/src/qmmpui/qtfiledialog_p.h b/src/qmmpui/qtfiledialog_p.h index 9955802aa..bbc60282d 100644 --- a/src/qmmpui/qtfiledialog_p.h +++ b/src/qmmpui/qtfiledialog_p.h @@ -23,8 +23,6 @@ #include <QObject> #include "filedialog.h" -class QTranslator; - /*! @internal * @author Vladimir Kuznetsov <vovanec@gmail.com> */ @@ -38,7 +36,6 @@ public: FileDialog* create(); const FileDialogProperties properties() const; void showAbout(QWidget*); - QTranslator *createTranslator(QObject*); virtual ~QtFileDialogFactory() { ; diff --git a/src/qmmpui/uifactory.h b/src/qmmpui/uifactory.h index caabde506..9b4acad39 100644 --- a/src/qmmpui/uifactory.h +++ b/src/qmmpui/uifactory.h @@ -23,7 +23,6 @@ #include "qmmpui_export.h" class QObject; -class QTranslator; class QDialog; class QString; class QWidget; @@ -44,6 +43,7 @@ public: } QString name; /*!< File dialog plugin full name */ QString shortName; /*!< File dialog short name for internal usage */ + QString translation; /*!< Translation file path without locale code and extension */ bool hasAbout; /*!< Should be \b true if plugin has about dialog, otherwise returns \b false */ }; /*! @brief User interface plugin interface. @@ -69,11 +69,6 @@ public: * @param parent Parent widget. */ virtual void showAbout(QWidget *parent) = 0; - /*! - * Creates QTranslator object of the system locale. Should return \b 0 if translation doesn't exist. - * @param parent Parent object. - */ - virtual QTranslator *createTranslator(QObject *parent) = 0; }; Q_DECLARE_INTERFACE(UiFactory, "UiFactory/1.0") |