From 616f45f151e3ce065e09dd71da34f1cef3561894 Mon Sep 17 00:00:00 2001 From: Alexander Gryson Date: Wed, 25 Jan 2017 14:19:50 +0100 Subject: [PATCH 1/3] 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 7cab8a575..c16020168 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); From ce416f2a18d752718f97de50d05be278cd84729d Mon Sep 17 00:00:00 2001 From: Alexander Gryson Date: Wed, 25 Jan 2017 21:04:03 +0100 Subject: [PATCH 2/3] Show icon units --- src/Gui/DlgGeneralImp.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Gui/DlgGeneralImp.cpp b/src/Gui/DlgGeneralImp.cpp index c16020168..12816f45b 100644 --- a/src/Gui/DlgGeneralImp.cpp +++ b/src/Gui/DlgGeneralImp.cpp @@ -239,10 +239,10 @@ void DlgGeneralImp::loadSettings() } int current = getMainWindow()->iconSize().width(); - 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)); + this->toolbarIconSize->addItem(tr("Small (%1px)").arg(16), QVariant((int)16)); + this->toolbarIconSize->addItem(tr("Medium (%1px)").arg(24), QVariant((int)24)); + this->toolbarIconSize->addItem(tr("Large (%1px)").arg(32), QVariant((int)32)); + this->toolbarIconSize->addItem(tr("Extra large (%1px)").arg(48), QVariant((int)48)); index = this->toolbarIconSize->findData(QVariant(current)); if (index > -1) this->toolbarIconSize->setCurrentIndex(index); From 1b44eff87c9427ea1b9cad863cb22a53509ad1ec Mon Sep 17 00:00:00 2001 From: Alexander Gryson Date: Sat, 28 Jan 2017 07:01:56 +0100 Subject: [PATCH 3/3] Show current icon size if not in list --- src/Gui/DlgGeneralImp.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Gui/DlgGeneralImp.cpp b/src/Gui/DlgGeneralImp.cpp index 12816f45b..2c5efba8e 100644 --- a/src/Gui/DlgGeneralImp.cpp +++ b/src/Gui/DlgGeneralImp.cpp @@ -244,7 +244,11 @@ void DlgGeneralImp::loadSettings() this->toolbarIconSize->addItem(tr("Large (%1px)").arg(32), QVariant((int)32)); this->toolbarIconSize->addItem(tr("Extra large (%1px)").arg(48), QVariant((int)48)); index = this->toolbarIconSize->findData(QVariant(current)); - if (index > -1) this->toolbarIconSize->setCurrentIndex(index); + if (index < 0) { + this->toolbarIconSize->addItem(tr("Custom (%1px)").arg(current), QVariant((int)current)); + index = this->toolbarIconSize->findData(QVariant(current)); + } + this->toolbarIconSize->setCurrentIndex(index); hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/MainWindow"); this->tiledBackground->setChecked(hGrp->GetBool("TiledBackground", false));