diff options
Diffstat (limited to 'src/qmmpui')
| -rw-r--r-- | src/qmmpui/commandlinemanager.cpp | 4 | ||||
| -rw-r--r-- | src/qmmpui/commandlineoption.h | 7 | ||||
| -rw-r--r-- | src/qmmpui/filedialogfactory.h | 7 | ||||
| -rw-r--r-- | src/qmmpui/generalfactory.h | 7 | ||||
| -rw-r--r-- | src/qmmpui/qmmpuiplugincache.cpp | 6 | ||||
| -rw-r--r-- | src/qmmpui/qtfiledialog.cpp | 7 | ||||
| -rw-r--r-- | src/qmmpui/qtfiledialog_p.h | 3 | ||||
| -rw-r--r-- | src/qmmpui/uifactory.h | 7 |
8 files changed, 33 insertions, 15 deletions
diff --git a/src/qmmpui/commandlinemanager.cpp b/src/qmmpui/commandlinemanager.cpp index 08424fa41..f2571839f 100644 --- a/src/qmmpui/commandlinemanager.cpp +++ b/src/qmmpui/commandlinemanager.cpp @@ -61,10 +61,10 @@ void CommandLineManager::checkOptions() { m_options->append(option); m_files->insert(option, filePath); - if(!option->properties().translation.isEmpty()) + if(!option->translation().isEmpty()) { QTranslator *translator = new QTranslator(qApp); - translator->load(option->properties().translation + Qmmp::systemLanguageID()); + translator->load(option->translation() + Qmmp::systemLanguageID()); qApp->installTranslator(translator); } } diff --git a/src/qmmpui/commandlineoption.h b/src/qmmpui/commandlineoption.h index f6f67d5e5..1b2255dc5 100644 --- a/src/qmmpui/commandlineoption.h +++ b/src/qmmpui/commandlineoption.h @@ -34,7 +34,6 @@ class CommandLineProperties { public: QString shortName; /*!< Input plugin short name for internal usage */ - QString translation; /*!< Translation file path without locale code and extension */ QStringList helpString; /*!< A list of specially formatted help strings. Example: "--help||Display this text and exit" */ }; @@ -48,7 +47,7 @@ public: /*! * Returns command line plugin properties. */ - virtual const CommandLineProperties properties() const = 0; + virtual CommandLineProperties properties() const = 0; /*! * Returns \b true if \b opt_str string can be processed, * otherise \b false @@ -65,6 +64,10 @@ public: * Object destructor */ virtual ~CommandLineOption() {} + /*! + * Returns translation file path without locale code and extension + */ + virtual QString translation() const = 0; }; Q_DECLARE_INTERFACE(CommandLineOption,"CommandLineOptionInterface/1.0") diff --git a/src/qmmpui/filedialogfactory.h b/src/qmmpui/filedialogfactory.h index 5174a8f1b..32d5bf031 100644 --- a/src/qmmpui/filedialogfactory.h +++ b/src/qmmpui/filedialogfactory.h @@ -44,7 +44,6 @@ public: * 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 */ }; @@ -65,12 +64,16 @@ public: /*! * Returns file dialog plugin properties. */ - virtual const FileDialogProperties properties() const = 0; + virtual FileDialogProperties properties() const = 0; /*! * Shows about dialog. * @param parent Parent widget. */ virtual void showAbout(QWidget *parent) = 0; + /*! + * Returns translation file path without locale code and extension + */ + virtual QString translation() const = 0; }; Q_DECLARE_INTERFACE(FileDialogFactory, "FileDialogFactory/1.0") diff --git a/src/qmmpui/generalfactory.h b/src/qmmpui/generalfactory.h index 5075f60d7..7bd2dc5a2 100644 --- a/src/qmmpui/generalfactory.h +++ b/src/qmmpui/generalfactory.h @@ -45,7 +45,6 @@ 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, @@ -64,7 +63,7 @@ public: /*! * Returns general plugin properties. */ - virtual const GeneralProperties properties() const = 0; + virtual GeneralProperties properties() const = 0; /*! * Creates object of the General class. */ @@ -80,6 +79,10 @@ public: * @param parent Parent widget. */ virtual void showAbout(QWidget *parent) = 0; + /*! + * Returns translation file path without locale code and extension + */ + virtual QString translation() const = 0; }; Q_DECLARE_INTERFACE(GeneralFactory, "GeneralFactory/1.0") diff --git a/src/qmmpui/qmmpuiplugincache.cpp b/src/qmmpui/qmmpuiplugincache.cpp index 9495f6fa1..ed739168d 100644 --- a/src/qmmpui/qmmpuiplugincache.cpp +++ b/src/qmmpui/qmmpuiplugincache.cpp @@ -160,7 +160,7 @@ GeneralFactory *QmmpUiPluginCache::generalFactory() { m_generalFactory = qobject_cast<GeneralFactory *> (instance()); if(m_generalFactory) - loadTranslation(m_generalFactory->properties().translation); + loadTranslation(m_generalFactory->translation()); } return m_generalFactory; } @@ -171,7 +171,7 @@ UiFactory *QmmpUiPluginCache::uiFactory() { m_uiFactory = qobject_cast<UiFactory *> (instance()); if(m_uiFactory) - loadTranslation(m_uiFactory->properties().translation); + loadTranslation(m_uiFactory->translation()); } return m_uiFactory; } @@ -182,7 +182,7 @@ FileDialogFactory *QmmpUiPluginCache::fileDialogFactory() { m_fileDialogFactory = qobject_cast<FileDialogFactory *> (instance()); if(m_fileDialogFactory) - loadTranslation(m_fileDialogFactory->properties().translation); + loadTranslation(m_fileDialogFactory->translation()); } return m_fileDialogFactory; } diff --git a/src/qmmpui/qtfiledialog.cpp b/src/qmmpui/qtfiledialog.cpp index 7ec53c5f9..a4f51846a 100644 --- a/src/qmmpui/qtfiledialog.cpp +++ b/src/qmmpui/qtfiledialog.cpp @@ -29,7 +29,7 @@ FileDialog* QtFileDialogFactory::create() return new QtFileDialog(); } -const FileDialogProperties QtFileDialogFactory::properties() const +FileDialogProperties QtFileDialogFactory::properties() const { FileDialogProperties properties; properties.name = tr("Qt File Dialog"); @@ -41,6 +41,11 @@ const FileDialogProperties QtFileDialogFactory::properties() const void QtFileDialogFactory::showAbout(QWidget*){} +QString QtFileDialogFactory::translation() const +{ + return QString(); +} + QtFileDialog::~QtFileDialog() { qDebug("QtFileDialog::~QtFileDialog()"); diff --git a/src/qmmpui/qtfiledialog_p.h b/src/qmmpui/qtfiledialog_p.h index bbc60282d..a6f555647 100644 --- a/src/qmmpui/qtfiledialog_p.h +++ b/src/qmmpui/qtfiledialog_p.h @@ -34,8 +34,9 @@ class QtFileDialogFactory : public QObject, public FileDialogFactory public: QtFileDialogFactory(){} FileDialog* create(); - const FileDialogProperties properties() const; + FileDialogProperties properties() const; void showAbout(QWidget*); + QString translation() const; virtual ~QtFileDialogFactory() { ; diff --git a/src/qmmpui/uifactory.h b/src/qmmpui/uifactory.h index 9b4acad39..88a1f9af3 100644 --- a/src/qmmpui/uifactory.h +++ b/src/qmmpui/uifactory.h @@ -43,7 +43,6 @@ 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. @@ -59,7 +58,7 @@ public: /*! * Returns user interface plugin properties. */ - virtual const UiProperties properties() const = 0; + virtual UiProperties properties() const = 0; /*! * Creates user interface instance. */ @@ -69,6 +68,10 @@ public: * @param parent Parent widget. */ virtual void showAbout(QWidget *parent) = 0; + /*! + * Returns translation file path without locale code and extension + */ + virtual QString translation() const = 0; }; Q_DECLARE_INTERFACE(UiFactory, "UiFactory/1.0") |