feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix ui language for custom wizards.

Browse Source 
Introduces a ICore::userInterfaceLanguage method, which centralizes the
previous qApp property hack for help and designer integration.

Reviewed-by: Friedemann Kleint
This commit is contained in:
con
2010-11-11 12:53:02 +01:00
parent 796cb76044
commit 17fb150f10
6 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/coreplugin/coreimpl.cpp
View File

@@ -164,6 +164,11 @@ QPrinter *CoreImpl::printer() const
return m_mainwindow->printer();
}
QString CoreImpl::userInterfaceLanguage() const
{
return qApp->property("qtc_locale").toString();
}
#ifdef Q_OS_MAC
# define SHARE_PATH "/../Resources"
#else

1
src/plugins/coreplugin/coreimpl.h
View File

@@ -72,6 +72,7 @@ public:
QSettings *settings(QSettings::Scope scope = QSettings::UserScope) const;
SettingsDatabase *settingsDatabase() const;
QPrinter *printer() const;
QString userInterfaceLanguage() const;
QString resourcePath() const;
QString userResourcePath() const;

1
src/plugins/coreplugin/icore.h
View File

@@ -101,6 +101,7 @@ public:
virtual QSettings *settings(QSettings::Scope scope = QSettings::UserScope) const = 0;
virtual SettingsDatabase *settingsDatabase() const = 0;
virtual QPrinter *printer() const = 0;
virtual QString userInterfaceLanguage() const = 0;
virtual QString resourcePath() const = 0;
virtual QString userResourcePath() const = 0;

2
src/plugins/designer/formeditorplugin.cpp
View File

@@ -86,7 +86,7 @@ bool FormEditorPlugin::initialize(const QStringList &arguments, QString *error)
addAutoReleasedObject(new FormEditorFactory);
// Ensure that loading designer translations is done before FormEditorW is instantiated
const QString locale = qApp->property("qtc_locale").toString();
const QString locale = Core::ICore::instance()->userInterfaceLanguage();
if (!locale.isEmpty()) {
QTranslator *qtr = new QTranslator(this);
const QString &creatorTrPath =

2
src/plugins/help/helpplugin.cpp
View File

@@ -151,7 +151,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
Core::Context globalcontext(Core::Constants::C_GLOBAL);
Core::Context modecontext(Constants::C_MODE_HELP);
const QString &locale = qApp->property("qtc_locale").toString();
const QString &locale = m_core->userInterfaceLanguage();
if (!locale.isEmpty()) {
QTranslator *qtr = new QTranslator(this);
QTranslator *qhelptr = new QTranslator(this);

7
src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
View File

@@ -507,10 +507,9 @@ static inline QString attributeValue(const QXmlStreamReader &r, const char *name
}
// Return locale language attribute "de_UTF8" -> "de", empty string for "C"
static inline QString localeLanguage()
static inline QString languageSetting()
{
QLocale loc;
QString name = loc.name();
QString name = Core::ICore::instance()->userInterfaceLanguage();
const int underScorePos = name.indexOf(QLatin1Char('_'));
if (underScorePos != -1)
name.truncate(underScorePos);
@@ -538,7 +537,7 @@ CustomWizardParameters::ParseResult
clear();
bp->clear();
bp->setKind(Core::IWizard::ProjectWizard);
const QString language = localeLanguage();
const QString language = languageSetting();
CustomWizardField field;
do {
token = reader.readNext();