forked from qt-creator/qt-creator
General settings: Move toolbar style to theme setting
And fix label style, we don't use book style capitalization for labels. Change-Id: Ibd98c911165f720adee73654d8214adfc02d9f9e Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
@@ -107,6 +107,7 @@ GeneralSettingsWidget::GeneralSettingsWidget(GeneralSettings *q)
|
|||||||
Form form;
|
Form form;
|
||||||
form.addRow({Tr::tr("Color:"), m_colorButton, resetColorButton, st});
|
form.addRow({Tr::tr("Color:"), m_colorButton, resetColorButton, st});
|
||||||
form.addRow({Tr::tr("Theme:"), m_themeChooser});
|
form.addRow({Tr::tr("Theme:"), m_themeChooser});
|
||||||
|
form.addRow({Tr::tr("Toolbar style:"), m_toolbarStyleBox, st});
|
||||||
form.addRow({Tr::tr("Language:"), m_languageBox, st});
|
form.addRow({Tr::tr("Language:"), m_languageBox, st});
|
||||||
|
|
||||||
if (!Utils::HostOsInfo::isMacHost()) {
|
if (!Utils::HostOsInfo::isMacHost()) {
|
||||||
@@ -125,7 +126,6 @@ GeneralSettingsWidget::GeneralSettingsWidget(GeneralSettings *q)
|
|||||||
form.addRow({empty, m_showShortcutsInContextMenus});
|
form.addRow({empty, m_showShortcutsInContextMenus});
|
||||||
form.addRow({Row{m_resetWarningsButton, st}});
|
form.addRow({Row{m_resetWarningsButton, st}});
|
||||||
form.addRow({Tr::tr("Text codec for tools:"), m_codecBox, st});
|
form.addRow({Tr::tr("Text codec for tools:"), m_codecBox, st});
|
||||||
form.addRow({Tr::tr("Toolbar Style:"), m_toolbarStyleBox, st});
|
|
||||||
Column{Group{title(Tr::tr("User Interface")), form}}.attachTo(this);
|
Column{Group{title(Tr::tr("User Interface")), form}}.attachTo(this);
|
||||||
|
|
||||||
fillLanguageBox();
|
fillLanguageBox();
|
||||||
|
|||||||
Reference in New Issue
Block a user