From 616f45f151e3ce065e09dd71da34f1cef3561894 Mon Sep 17 00:00:00 2001 From: Alexander Gryson Date: Wed, 25 Jan 2017 14:19:50 +0100 Subject: [PATCH] Remove reliance on PM_ToolBarIconSize --- src/Gui/DlgGeneralImp.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Gui/DlgGeneralImp.cpp b/src/Gui/DlgGeneralImp.cpp index 7cab8a575c..c16020168c 100644 --- a/src/Gui/DlgGeneralImp.cpp +++ b/src/Gui/DlgGeneralImp.cpp @@ -238,12 +238,11 @@ void DlgGeneralImp::loadSettings() } } - int size = QApplication::style()->pixelMetric(QStyle::PM_ToolBarIconSize); int current = getMainWindow()->iconSize().width(); - this->toolbarIconSize->addItem(tr("Default (%1 x %1)").arg(size), QVariant((int)size)); - this->toolbarIconSize->addItem(tr("Small (%1 x %1)").arg(16), QVariant((int)16)); - this->toolbarIconSize->addItem(tr("Large (%1 x %1)").arg(32), QVariant((int)32)); - this->toolbarIconSize->addItem(tr("Extra large (%1 x %1)").arg(48), QVariant((int)48)); + this->toolbarIconSize->addItem(tr("Small (%1)").arg(16), QVariant((int)16)); + this->toolbarIconSize->addItem(tr("Medium (%1)").arg(24), QVariant((int)24)); + this->toolbarIconSize->addItem(tr("Large (%1)").arg(32), QVariant((int)32)); + this->toolbarIconSize->addItem(tr("Extra large (%1)").arg(48), QVariant((int)48)); index = this->toolbarIconSize->findData(QVariant(current)); if (index > -1) this->toolbarIconSize->setCurrentIndex(index);