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

Merge remote-tracking branch 'origin/qds/dev' into 13.0

Browse Source 
Change-Id: I09a0e8514c8ad7badaa7af6d101c71d5c96b5465
This commit is contained in:
Tim Jenssen
2024-01-31 20:25:34 +01:00
parent 05d7070178 a4d8348432
commit a3a69d83f3
208 changed files with 1726 additions and 2189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/generalsettings.cpp
View File

@@ -110,6 +110,10 @@ GeneralSettingsWidget::GeneralSettingsWidget()
m_languageBox->setObjectName("languageBox");
m_languageBox->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLengthWithIcon);
m_languageBox->setMinimumContentsLength(20);
if (Core::ICore::isQtDesignStudio()) {
m_languageBox->setDisabled(true);
m_languageBox->setToolTip("Qt Design Studio is currently available in English only.");
}
m_codecBox->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLengthWithIcon);
m_codecBox->setMinimumContentsLength(20);
@@ -211,7 +215,7 @@ void GeneralSettingsWidget::fillLanguageBox() const
m_languageBox->addItem(Tr::tr("<System Language>"), QString());
// need to add this explicitly, since there is no qm file for English
m_languageBox->addItem(QLatin1String("English"), QLatin1String("C"));
if (currentLocale == QLatin1String("C"))
if (currentLocale == QLatin1String("C") || Core::ICore::isQtDesignStudio())
m_languageBox->setCurrentIndex(m_languageBox->count() - 1);
const FilePath creatorTrPath = ICore::resourcePath("translations");