From 7455073e85df57ea6b090c398ac44994b2921fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20M=C3=B6ller?= Date: Fri, 26 Oct 2012 11:06:08 +0000 Subject: [PATCH] fix: removes error message at start, when all materials were erased !! renamed save key !! refs #1148 git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@15728 383ad7c9-94d9-4d36-a494-682f7c89f535 --- MaterialPicker.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/MaterialPicker.cc b/MaterialPicker.cc index e5d1c28..300f072 100644 --- a/MaterialPicker.cc +++ b/MaterialPicker.cc @@ -52,7 +52,7 @@ MaterialPicker::MaterialPicker() : pickModeName_("MaterialPicker"), - propName_(name()+QString("/Material/Materials")), + propName_(name()+QString("/Materials")), pickMaterialButton_(0), fillMaterialButton_(0), materialListWidget_(0), @@ -175,7 +175,10 @@ void MaterialPicker::removeItem(QListWidgetItem* _item) materialListWidget_->takeItem(index); materialList_.erase(materialList_.begin()+index); materialStrings_.erase(materialStrings_.begin()+index); - OpenFlipperSettings().setValue(propName_, materialStrings_); + if (materialStrings_.isEmpty()) + OpenFlipperSettings().remove(propName_); + else + OpenFlipperSettings().setValue(propName_, materialStrings_); fillMaterialButton_->setEnabled(materialListWidget_->count()); //update hotkey table @@ -189,6 +192,7 @@ void MaterialPicker::removeItem(QListWidgetItem* _item) } if (eraseIter != shortKeyRow_.end()) shortKeyRow_.erase(eraseIter); + } //------------------------------------------------------------------------------ @@ -199,6 +203,7 @@ void MaterialPicker::clearList() { materialStrings_.clear(); OpenFlipperSettings().setValue(propName_, materialStrings_); fillMaterialButton_->setEnabled(false); + OpenFlipperSettings().remove(propName_); } //------------------------------------------------------------------------------ -- GitLab