Use default complexity mode defined in preferences when adding tool

This commit is contained in:
Pandagrapher
2020-05-04 20:03:58 +02:00
parent d0d79c7d59
commit bdb8a95b14
6 changed files with 30 additions and 48 deletions

View File

@@ -94,7 +94,6 @@ ControlSpotPanel::ControlSpotPanel():
maskPrevActive(false)
{
const bool showtooltip = options.showtooltip;
const int complexsoft = options.complexity;
Gtk::HBox* const hbox1_ = Gtk::manage(new Gtk::HBox(true, 4));
buttonaddconn_ = button_add_->signal_clicked().connect(
@@ -230,10 +229,7 @@ ControlSpotPanel::ControlSpotPanel():
sigc::mem_fun(
*this, &ControlSpotPanel::shapeMethodChanged));
ctboxshapemethod->pack_start(*shapeMethod_);
if (complexsoft < 2) {
pack_start(*ctboxshapemethod);
}
pack_start(*ctboxshapemethod);
pack_start(*locX_);
locX_->setAdjusterListener(this);
@@ -271,10 +267,7 @@ ControlSpotPanel::ControlSpotPanel():
sigc::mem_fun(
*this, &ControlSpotPanel::qualityMethodChanged));
ctboxqualitymethod->pack_start(*qualityMethod_);
if (complexsoft < 2) {
pack_start(*ctboxqualitymethod);
}
pack_start(*ctboxqualitymethod);
Gtk::Frame* const transitFrame = Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_TRANSIT")));
transitFrame->set_label_align(0.025, 0.5);
@@ -338,14 +331,8 @@ ControlSpotPanel::ControlSpotPanel():
colorde_->set_tooltip_text(M("TP_LOCALLAB_COLORDE_TOOLTIP"));
}
if (complexsoft < 2) {
artifBox->pack_start(*struc_);
}
if (complexsoft < 2) {
artifBox->pack_start(*thresh_);
}
artifBox->pack_start(*struc_);
artifBox->pack_start(*thresh_);
artifBox->pack_start(*iter_);
artifBox->pack_start(*balan_);
artifBox->pack_start(*balanh_);
@@ -393,10 +380,7 @@ ControlSpotPanel::ControlSpotPanel():
savrest_->set_tooltip_text(M("TP_LOCALLAB_SAVREST_TOOLTIP"));
}
if (complexsoft < 1) {
maskBox->pack_start(*laplac_);
}
maskBox->pack_start(*laplac_);
maskBox->pack_start(*deltae_);
maskBox->pack_start(*scopemask_);
// maskBox->pack_start(*shortc_);