summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2017-04-27 10:05:03 +0000
committerjabiertxof <info@marker.es>2017-04-27 10:05:03 +0000
commit18e032118bbb1718778c6f2e5e55cdb1723dc1ce (patch)
tree9463d22e1cc138e5c5a08a30b86347981f667fee /src
parentUpdate to trunk (diff)
downloadinkscape-18e032118bbb1718778c6f2e5e55cdb1723dc1ce.tar.gz
inkscape-18e032118bbb1718778c6f2e5e55cdb1723dc1ce.zip
Add end of preferences GUI
(bzr r15620.1.6)
Diffstat (limited to 'src')
-rw-r--r--src/live_effects/effect.cpp2
-rw-r--r--src/live_effects/lpe-bspline.cpp2
-rw-r--r--src/live_effects/lpe-clone-original.cpp2
-rw-r--r--src/live_effects/lpe-copy_rotate.cpp2
-rw-r--r--src/live_effects/lpe-fillet-chamfer.cpp2
-rw-r--r--src/live_effects/lpe-lattice2.cpp2
-rw-r--r--src/live_effects/lpe-measure-line.cpp2
-rw-r--r--src/live_effects/lpe-mirror_symmetry.cpp2
-rw-r--r--src/live_effects/lpe-perspective-envelope.cpp2
-rw-r--r--src/live_effects/lpe-simplify.cpp2
-rw-r--r--src/live_effects/lpe-transform_2pts.cpp2
-rw-r--r--src/live_effects/parameter/item.cpp12
-rw-r--r--src/live_effects/parameter/originalitem.cpp12
-rw-r--r--src/live_effects/parameter/originalpath.cpp12
-rw-r--r--src/live_effects/parameter/parameter.cpp12
-rw-r--r--src/live_effects/parameter/path.cpp12
-rw-r--r--src/live_effects/parameter/point.cpp12
-rw-r--r--src/live_effects/parameter/random.cpp12
-rw-r--r--src/live_effects/parameter/text.cpp12
-rw-r--r--src/live_effects/parameter/togglebutton.cpp12
-rw-r--r--src/live_effects/parameter/transformedpoint.cpp12
-rw-r--r--src/live_effects/parameter/unit.cpp12
-rw-r--r--src/live_effects/parameter/vector.cpp12
-rw-r--r--src/ui/dialog/inkscape-preferences.cpp14
24 files changed, 154 insertions, 26 deletions
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 5246dbf89..a7315b37f 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -786,7 +786,7 @@ Effect::newWidget()
upd_params = false;
if (show_default_widgets) {
Gtk::Label *default_label = Gtk::manage(new Gtk::Label(
- Glib::ustring(_("<b>Defaults</b> set defaultable parameters")),
+ Glib::ustring(_("<b>Defaults</b> set defaultable -prefs- parameters (*)")),
Gtk::ALIGN_START));
default_label->set_use_markup(true);
vbox->pack_start(*default_label, true, true, 2);
diff --git a/src/live_effects/lpe-bspline.cpp b/src/live_effects/lpe-bspline.cpp
index fb803b770..eb6fb5d0a 100644
--- a/src/live_effects/lpe-bspline.cpp
+++ b/src/live_effects/lpe-bspline.cpp
@@ -142,7 +142,7 @@ Gtk::Widget *LPEBSpline::newWidget()
Gtk::HBox * defaultBox = Gtk::manage(new Gtk::HBox(true,0));
if (show_default_widgets) {
Gtk::Label *default_label = Gtk::manage(new Gtk::Label(
- Glib::ustring(_("<b>Defaults</b> set defaultable parameters")),
+ Glib::ustring(_("<b>Defaults</b> set defaultable -prefs- parameters (*)")),
Gtk::ALIGN_START));
default_label->set_use_markup(true);
vbox->pack_start(*default_label, true, true, 2);
diff --git a/src/live_effects/lpe-clone-original.cpp b/src/live_effects/lpe-clone-original.cpp
index ae20b582a..93ea4aa9d 100644
--- a/src/live_effects/lpe-clone-original.cpp
+++ b/src/live_effects/lpe-clone-original.cpp
@@ -320,7 +320,7 @@ LPECloneOriginal::newWidget()
vbox->pack_start(*expander, true, true, 2);
if (show_default_widgets) {
Gtk::Label *default_label = Gtk::manage(new Gtk::Label(
- Glib::ustring(_("<b>Defaults</b> set defaultable parameters")),
+ Glib::ustring(_("<b>Defaults</b> set defaultable -prefs- parameters (*)")),
Gtk::ALIGN_START));
default_label->set_use_markup(true);
vbox->pack_start(*default_label, true, true, 2);
diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp
index 1fd0e466f..3a1925366 100644
--- a/src/live_effects/lpe-copy_rotate.cpp
+++ b/src/live_effects/lpe-copy_rotate.cpp
@@ -330,7 +330,7 @@ Gtk::Widget * LPECopyRotate::newWidget()
if (show_default_widgets) {
Gtk::Label *default_label = Gtk::manage(new Gtk::Label(
- Glib::ustring(_("<b>Defaults</b> set defaultable parameters")),
+ Glib::ustring(_("<b>Defaults</b> set defaultable -prefs- parameters (*)")),
Gtk::ALIGN_START));
default_label->set_use_markup(true);
vbox->pack_start(*default_label, true, true, 2);
diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp
index f21b53f90..585972fee 100644
--- a/src/live_effects/lpe-fillet-chamfer.cpp
+++ b/src/live_effects/lpe-fillet-chamfer.cpp
@@ -178,7 +178,7 @@ Gtk::Widget *LPEFilletChamfer::newWidget()
vbox->pack_start(*chamferContainer, true, true, 2);
if (show_default_widgets) {
Gtk::Label *default_label = Gtk::manage(new Gtk::Label(
- Glib::ustring(_("<b>Defaults</b> set defaultable parameters")),
+ Glib::ustring(_("<b>Defaults</b> set defaultable -prefs- parameters (*)")),
Gtk::ALIGN_START));
default_label->set_use_markup(true);
vbox->pack_start(*default_label, true, true, 2);
diff --git a/src/live_effects/lpe-lattice2.cpp b/src/live_effects/lpe-lattice2.cpp
index fe01ef9ee..88cb815f9 100644
--- a/src/live_effects/lpe-lattice2.cpp
+++ b/src/live_effects/lpe-lattice2.cpp
@@ -258,7 +258,7 @@ LPELattice2::newWidget()
}
if (show_default_widgets) {
Gtk::Label *default_label = Gtk::manage(new Gtk::Label(
- Glib::ustring(_("<b>Defaults</b> set defaultable parameters")),
+ Glib::ustring(_("<b>Defaults</b> set defaultable -prefs- parameters (*)")),
Gtk::ALIGN_START));
default_label->set_use_markup(true);
vbox->pack_start(*default_label, true, true, 2);
diff --git a/src/live_effects/lpe-measure-line.cpp b/src/live_effects/lpe-measure-line.cpp
index 1095cfc0d..64b970e7b 100644
--- a/src/live_effects/lpe-measure-line.cpp
+++ b/src/live_effects/lpe-measure-line.cpp
@@ -729,7 +729,7 @@ Gtk::Widget *LPEMeasureLine::newWidget()
vbox->pack_start(*expander, true, true, 2);
if (show_default_widgets) {
Gtk::Label *default_label = Gtk::manage(new Gtk::Label(
- Glib::ustring(_("<b>Defaults</b> set defaultable parameters")),
+ Glib::ustring(_("<b>Defaults</b> set defaultable -prefs- parameters (*)")),
Gtk::ALIGN_START));
default_label->set_use_markup(true);
vbox->pack_start(*default_label, true, true, 2);
diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp
index a00aac3be..87107f914 100644
--- a/src/live_effects/lpe-mirror_symmetry.cpp
+++ b/src/live_effects/lpe-mirror_symmetry.cpp
@@ -338,7 +338,7 @@ LPEMirrorSymmetry::newWidget()
this->upd_params = false;
if (show_default_widgets) {
Gtk::Label *default_label = Gtk::manage(new Gtk::Label(
- Glib::ustring(_("<b>Defaults</b> set defaultable parameterss")),
+ Glib::ustring(_("<b>Defaults</b> set defaultable -prefs- parameters (*)")),
Gtk::ALIGN_START));
default_label->set_use_markup(true);
vbox->pack_start(*default_label, true, true, 2);
diff --git a/src/live_effects/lpe-perspective-envelope.cpp b/src/live_effects/lpe-perspective-envelope.cpp
index e967a01aa..88998aa49 100644
--- a/src/live_effects/lpe-perspective-envelope.cpp
+++ b/src/live_effects/lpe-perspective-envelope.cpp
@@ -416,7 +416,7 @@ LPEPerspectiveEnvelope::newWidget()
hbox->pack_start(*reset_button, false, false,2);
if (show_default_widgets) {
Gtk::Label *default_label = Gtk::manage(new Gtk::Label(
- Glib::ustring(_("<b>Defaults</b> set defaultable parameters")),
+ Glib::ustring(_("<b>Defaults</b> set defaultable -prefs- parameters (*)")),
Gtk::ALIGN_START));
default_label->set_use_markup(true);
vbox->pack_start(*default_label, true, true, 2);
diff --git a/src/live_effects/lpe-simplify.cpp b/src/live_effects/lpe-simplify.cpp
index 5b5bbea6c..49d869cff 100644
--- a/src/live_effects/lpe-simplify.cpp
+++ b/src/live_effects/lpe-simplify.cpp
@@ -117,7 +117,7 @@ LPESimplify::newWidget()
vbox->pack_start(*buttons,true, true, 2);
if (show_default_widgets) {
Gtk::Label *default_label = Gtk::manage(new Gtk::Label(
- Glib::ustring(_("<b>Defaults</b> set defaultable parameters")),
+ Glib::ustring(_("<b>Defaults</b> set defaultable -prefs- parameters (*)")),
Gtk::ALIGN_START));
default_label->set_use_markup(true);
vbox->pack_start(*default_label, true, true, 2);
diff --git a/src/live_effects/lpe-transform_2pts.cpp b/src/live_effects/lpe-transform_2pts.cpp
index e5bc8657d..6927ee13d 100644
--- a/src/live_effects/lpe-transform_2pts.cpp
+++ b/src/live_effects/lpe-transform_2pts.cpp
@@ -352,7 +352,7 @@ Gtk::Widget *LPETransform2Pts::newWidget()
vbox->pack_start(*button4, true, true, 2);
if (show_default_widgets) {
Gtk::Label *default_label = Gtk::manage(new Gtk::Label(
- Glib::ustring(_("<b>Defaults</b> set defaultable parameters")),
+ Glib::ustring(_("<b>Defaults</b> set defaultable -prefs- parameters (*)")),
Gtk::ALIGN_START));
default_label->set_use_markup(true);
vbox->pack_start(*default_label, true, true, 2);
diff --git a/src/live_effects/parameter/item.cpp b/src/live_effects/parameter/item.cpp
index 7b40f4540..aba61b96a 100644
--- a/src/live_effects/parameter/item.cpp
+++ b/src/live_effects/parameter/item.cpp
@@ -108,10 +108,20 @@ ItemParam::param_getSVGValue() const
Gtk::Widget *
ItemParam::param_newWidget()
{
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ Glib::ustring effectkey = (Glib::ustring)Inkscape::LivePathEffect::LPETypeConverter.get_key(param_effect->effectType());
+ Glib::ustring pref_path = (Glib::ustring)"/live_effects/" +
+ effectkey +
+ (Glib::ustring)"/" +
+ (Glib::ustring)param_key;
+ Glib::ustring label = param_label;
+ if(prefs->getEntry(pref_path).isValid()){
+ label = (Glib::ustring)"* " + param_label;
+ }
Gtk::HBox * _widget = Gtk::manage(new Gtk::HBox());
Gtk::Widget* pIcon = Gtk::manage( sp_icon_get_icon( INKSCAPE_ICON("edit-clone"), Inkscape::ICON_SIZE_BUTTON) );
Gtk::Button * pButton = Gtk::manage(new Gtk::Button());
- Gtk::Label* pLabel = Gtk::manage(new Gtk::Label(param_label));
+ Gtk::Label* pLabel = Gtk::manage(new Gtk::Label(label));
static_cast<Gtk::HBox*>(_widget)->pack_start(*pLabel, true, true);
pLabel->set_tooltip_text(param_tooltip);
pButton->set_relief(Gtk::RELIEF_NONE);
diff --git a/src/live_effects/parameter/originalitem.cpp b/src/live_effects/parameter/originalitem.cpp
index 053062128..8db8851bf 100644
--- a/src/live_effects/parameter/originalitem.cpp
+++ b/src/live_effects/parameter/originalitem.cpp
@@ -46,10 +46,20 @@ OriginalItemParam::~OriginalItemParam()
Gtk::Widget *
OriginalItemParam::param_newWidget()
{
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ Glib::ustring effectkey = (Glib::ustring)Inkscape::LivePathEffect::LPETypeConverter.get_key(param_effect->effectType());
+ Glib::ustring pref_path = (Glib::ustring)"/live_effects/" +
+ effectkey +
+ (Glib::ustring)"/" +
+ (Glib::ustring)param_key;
+ Glib::ustring label = param_label;
+ if(prefs->getEntry(pref_path).isValid()){
+ label = (Glib::ustring)"* " + param_label;
+ }
Gtk::HBox *_widget = Gtk::manage(new Gtk::HBox());
{ // Label
- Gtk::Label *pLabel = Gtk::manage(new Gtk::Label(param_label));
+ Gtk::Label *pLabel = Gtk::manage(new Gtk::Label(label));
static_cast<Gtk::HBox*>(_widget)->pack_start(*pLabel, true, true);
pLabel->set_tooltip_text(param_tooltip);
}
diff --git a/src/live_effects/parameter/originalpath.cpp b/src/live_effects/parameter/originalpath.cpp
index 1e78f7fe1..388a3b5e6 100644
--- a/src/live_effects/parameter/originalpath.cpp
+++ b/src/live_effects/parameter/originalpath.cpp
@@ -47,10 +47,20 @@ OriginalPathParam::~OriginalPathParam()
Gtk::Widget *
OriginalPathParam::param_newWidget()
{
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ Glib::ustring effectkey = (Glib::ustring)Inkscape::LivePathEffect::LPETypeConverter.get_key(param_effect->effectType());
+ Glib::ustring pref_path = (Glib::ustring)"/live_effects/" +
+ effectkey +
+ (Glib::ustring)"/" +
+ (Glib::ustring)param_key;
+ Glib::ustring label = param_label;
+ if(prefs->getEntry(pref_path).isValid()){
+ label = (Glib::ustring)"* " + param_label;
+ }
Gtk::HBox *_widget = Gtk::manage(new Gtk::HBox());
{ // Label
- Gtk::Label *pLabel = Gtk::manage(new Gtk::Label(param_label));
+ Gtk::Label *pLabel = Gtk::manage(new Gtk::Label(label));
static_cast<Gtk::HBox*>(_widget)->pack_start(*pLabel, true, true);
pLabel->set_tooltip_text(param_tooltip);
}
diff --git a/src/live_effects/parameter/parameter.cpp b/src/live_effects/parameter/parameter.cpp
index 15c81d543..359a51913 100644
--- a/src/live_effects/parameter/parameter.cpp
+++ b/src/live_effects/parameter/parameter.cpp
@@ -172,8 +172,18 @@ Gtk::Widget *
ScalarParam::param_newWidget()
{
if(!hide_widget){
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ Glib::ustring effectkey = (Glib::ustring)Inkscape::LivePathEffect::LPETypeConverter.get_key(param_effect->effectType());
+ Glib::ustring pref_path = (Glib::ustring)"/live_effects/" +
+ effectkey +
+ (Glib::ustring)"/" +
+ (Glib::ustring)param_key;
+ Glib::ustring label = param_label;
+ if(prefs->getEntry(pref_path).isValid()){
+ label = (Glib::ustring)"* " + param_label;
+ }
Inkscape::UI::Widget::RegisteredScalar *rsu = Gtk::manage( new Inkscape::UI::Widget::RegisteredScalar(
- param_label, param_tooltip, param_key, *param_wr, param_effect->getRepr(), param_effect->getSPDoc() ) );
+ label, param_tooltip, param_key, *param_wr, param_effect->getRepr(), param_effect->getSPDoc() ) );
rsu->setValue(value);
rsu->setDigits(digits);
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index aa87508ab..9bdebaf47 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -170,9 +170,19 @@ PathParam::param_getSVGValue() const
Gtk::Widget *
PathParam::param_newWidget()
{
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ Glib::ustring effectkey = (Glib::ustring)Inkscape::LivePathEffect::LPETypeConverter.get_key(param_effect->effectType());
+ Glib::ustring pref_path = (Glib::ustring)"/live_effects/" +
+ effectkey +
+ (Glib::ustring)"/" +
+ (Glib::ustring)param_key;
+ Glib::ustring label = param_label;
+ if(prefs->getEntry(pref_path).isValid()){
+ label = (Glib::ustring)"* " + param_label;
+ }
Gtk::HBox * _widget = Gtk::manage(new Gtk::HBox());
- Gtk::Label* pLabel = Gtk::manage(new Gtk::Label(param_label));
+ Gtk::Label* pLabel = Gtk::manage(new Gtk::Label(label));
static_cast<Gtk::HBox*>(_widget)->pack_start(*pLabel, true, true);
pLabel->set_tooltip_text(param_tooltip);
diff --git a/src/live_effects/parameter/point.cpp b/src/live_effects/parameter/point.cpp
index 561f1b34c..2fbe4b3b4 100644
--- a/src/live_effects/parameter/point.cpp
+++ b/src/live_effects/parameter/point.cpp
@@ -126,8 +126,18 @@ PointParam::param_transform_multiply(Geom::Affine const& postmul, bool /*set*/)
Gtk::Widget *
PointParam::param_newWidget()
{
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ Glib::ustring effectkey = (Glib::ustring)Inkscape::LivePathEffect::LPETypeConverter.get_key(param_effect->effectType());
+ Glib::ustring pref_path = (Glib::ustring)"/live_effects/" +
+ effectkey +
+ (Glib::ustring)"/" +
+ (Glib::ustring)param_key;
+ Glib::ustring label = param_label;
+ if(prefs->getEntry(pref_path).isValid()){
+ label = (Glib::ustring)"* " + param_label;
+ }
Inkscape::UI::Widget::RegisteredTransformedPoint * pointwdg = Gtk::manage(
- new Inkscape::UI::Widget::RegisteredTransformedPoint( param_label,
+ new Inkscape::UI::Widget::RegisteredTransformedPoint( label,
param_tooltip,
param_key,
*param_wr,
diff --git a/src/live_effects/parameter/random.cpp b/src/live_effects/parameter/random.cpp
index 90e53ca0e..bcba05399 100644
--- a/src/live_effects/parameter/random.cpp
+++ b/src/live_effects/parameter/random.cpp
@@ -129,8 +129,18 @@ RandomParam::resetRandomizer()
Gtk::Widget *
RandomParam::param_newWidget()
{
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ Glib::ustring effectkey = (Glib::ustring)Inkscape::LivePathEffect::LPETypeConverter.get_key(param_effect->effectType());
+ Glib::ustring pref_path = (Glib::ustring)"/live_effects/" +
+ effectkey +
+ (Glib::ustring)"/" +
+ (Glib::ustring)param_key;
+ Glib::ustring label = param_label;
+ if(prefs->getEntry(pref_path).isValid()){
+ label = (Glib::ustring)"* " + param_label;
+ }
Inkscape::UI::Widget::RegisteredRandom* regrandom = Gtk::manage(
- new Inkscape::UI::Widget::RegisteredRandom( param_label,
+ new Inkscape::UI::Widget::RegisteredRandom( label,
param_tooltip,
param_key,
*param_wr,
diff --git a/src/live_effects/parameter/text.cpp b/src/live_effects/parameter/text.cpp
index 8d526e4cc..5c56e8447 100644
--- a/src/live_effects/parameter/text.cpp
+++ b/src/live_effects/parameter/text.cpp
@@ -119,8 +119,18 @@ TextParam::param_getSVGValue() const
Gtk::Widget *
TextParam::param_newWidget()
{
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ Glib::ustring effectkey = (Glib::ustring)Inkscape::LivePathEffect::LPETypeConverter.get_key(param_effect->effectType());
+ Glib::ustring pref_path = (Glib::ustring)"/live_effects/" +
+ effectkey +
+ (Glib::ustring)"/" +
+ (Glib::ustring)param_key;
+ Glib::ustring label = param_label;
+ if(prefs->getEntry(pref_path).isValid()){
+ label = (Glib::ustring)"* " + param_label;
+ }
Inkscape::UI::Widget::RegisteredText *rsu = Gtk::manage(new Inkscape::UI::Widget::RegisteredText(
- param_label, param_tooltip, param_key, *param_wr, param_effect->getRepr(), param_effect->getSPDoc()));
+ label, param_tooltip, param_key, *param_wr, param_effect->getRepr(), param_effect->getSPDoc()));
rsu->setText(value);
rsu->setProgrammatically = false;
diff --git a/src/live_effects/parameter/togglebutton.cpp b/src/live_effects/parameter/togglebutton.cpp
index 4eaa1aeb2..1d1bc82a6 100644
--- a/src/live_effects/parameter/togglebutton.cpp
+++ b/src/live_effects/parameter/togglebutton.cpp
@@ -75,12 +75,22 @@ ToggleButtonParam::param_update_default(const gchar * default_value)
Gtk::Widget *
ToggleButtonParam::param_newWidget()
{
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ Glib::ustring effectkey = (Glib::ustring)Inkscape::LivePathEffect::LPETypeConverter.get_key(param_effect->effectType());
+ Glib::ustring pref_path = (Glib::ustring)"/live_effects/" +
+ effectkey +
+ (Glib::ustring)"/" +
+ (Glib::ustring)param_key;
+ Glib::ustring label = param_label;
+ if(prefs->getEntry(pref_path).isValid()){
+ label = (Glib::ustring)"* " + param_label;
+ }
if (_toggled_connection.connected()) {
_toggled_connection.disconnect();
}
checkwdg = Gtk::manage(
- new Inkscape::UI::Widget::RegisteredToggleButton( param_label,
+ new Inkscape::UI::Widget::RegisteredToggleButton( label,
param_tooltip,
param_key,
*param_wr,
diff --git a/src/live_effects/parameter/transformedpoint.cpp b/src/live_effects/parameter/transformedpoint.cpp
index 22d5ba3a4..2081a8c0c 100644
--- a/src/live_effects/parameter/transformedpoint.cpp
+++ b/src/live_effects/parameter/transformedpoint.cpp
@@ -104,8 +104,18 @@ TransformedPointParam::param_update_default(const gchar * default_point)
Gtk::Widget *
TransformedPointParam::param_newWidget()
{
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ Glib::ustring effectkey = (Glib::ustring)Inkscape::LivePathEffect::LPETypeConverter.get_key(param_effect->effectType());
+ Glib::ustring pref_path = (Glib::ustring)"/live_effects/" +
+ effectkey +
+ (Glib::ustring)"/" +
+ (Glib::ustring)param_key;
+ Glib::ustring label = param_label;
+ if(prefs->getEntry(pref_path).isValid()){
+ label = (Glib::ustring)"* " + param_label;
+ }
Inkscape::UI::Widget::RegisteredVector * pointwdg = Gtk::manage(
- new Inkscape::UI::Widget::RegisteredVector( param_label,
+ new Inkscape::UI::Widget::RegisteredVector( label,
param_tooltip,
param_key,
*param_wr,
diff --git a/src/live_effects/parameter/unit.cpp b/src/live_effects/parameter/unit.cpp
index b78b75dbf..684f29555 100644
--- a/src/live_effects/parameter/unit.cpp
+++ b/src/live_effects/parameter/unit.cpp
@@ -75,8 +75,18 @@ UnitParam::get_abbreviation() const
Gtk::Widget *
UnitParam::param_newWidget()
{
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ Glib::ustring effectkey = (Glib::ustring)Inkscape::LivePathEffect::LPETypeConverter.get_key(param_effect->effectType());
+ Glib::ustring pref_path = (Glib::ustring)"/live_effects/" +
+ effectkey +
+ (Glib::ustring)"/" +
+ (Glib::ustring)param_key;
+ Glib::ustring label = param_label;
+ if(prefs->getEntry(pref_path).isValid()){
+ label = (Glib::ustring)"* " + param_label;
+ }
Inkscape::UI::Widget::RegisteredUnitMenu* unit_menu = Gtk::manage(
- new Inkscape::UI::Widget::RegisteredUnitMenu(param_label,
+ new Inkscape::UI::Widget::RegisteredUnitMenu(label,
param_key,
*param_wr,
param_effect->getRepr(),
diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp
index 470fa9c2d..d6593871d 100644
--- a/src/live_effects/parameter/vector.cpp
+++ b/src/live_effects/parameter/vector.cpp
@@ -104,8 +104,18 @@ VectorParam::param_getSVGValue() const
Gtk::Widget *
VectorParam::param_newWidget()
{
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ Glib::ustring effectkey = (Glib::ustring)Inkscape::LivePathEffect::LPETypeConverter.get_key(param_effect->effectType());
+ Glib::ustring pref_path = (Glib::ustring)"/live_effects/" +
+ effectkey +
+ (Glib::ustring)"/" +
+ (Glib::ustring)param_key;
+ Glib::ustring label = param_label;
+ if(prefs->getEntry(pref_path).isValid()){
+ label = (Glib::ustring)"* " + param_label;
+ }
Inkscape::UI::Widget::RegisteredVector * pointwdg = Gtk::manage(
- new Inkscape::UI::Widget::RegisteredVector( param_label,
+ new Inkscape::UI::Widget::RegisteredVector( label,
param_tooltip,
param_key,
*param_wr,
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 93cf5eb42..2f83a08e9 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -834,7 +834,7 @@ void InkscapePreferences::initPageUI()
Inkscape::UI::Widget::Registry * wr;
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- for ( int le = Inkscape::LivePathEffect::EffectType::BEND_PATH; le != Inkscape::LivePathEffect::EffectType::INVALID_LPE; le++ ){
+ for ( int le = Inkscape::LivePathEffect::EffectType::BEND_PATH; le != Inkscape::LivePathEffect::EffectType::INVALID_LPE; ++le){
Inkscape::LivePathEffect::EffectType lpenr = static_cast<Inkscape::LivePathEffect::EffectType>(le);
Glib::ustring effectname = (Glib::ustring)Inkscape::LivePathEffect::LPETypeConverter.get_label(lpenr);
Glib::ustring effectkey = (Glib::ustring)Inkscape::LivePathEffect::LPETypeConverter.get_key(lpenr);
@@ -845,6 +845,9 @@ void InkscapePreferences::initPageUI()
Glib::ustring liveeffect = effectname +(Glib::ustring)_(":");
Inkscape::LivePathEffect::Effect* effect = Inkscape::LivePathEffect::Effect::New(lpenr, lpeobj);
std::vector<Inkscape::LivePathEffect::Parameter *> param_vector = effect->getParamVector();
+ if (param_vector.size() == 1) {
+ continue;
+ }
std::vector<Inkscape::LivePathEffect::Parameter *>::iterator it = param_vector.begin();
Gtk::VBox * vbox_expander = Gtk::manage( new Gtk::VBox() );
vbox_expander->set_border_width(10);
@@ -852,8 +855,13 @@ void InkscapePreferences::initPageUI()
while (it != param_vector.end()) {
Inkscape::LivePathEffect::Parameter * param = *it;
const gchar * key = param->param_key.c_str();
+ if (strcmp(key,"is_visible") == 0 ){
+ ++it;
+ continue;
+ }
const gchar * value = param->param_label.c_str();
- const gchar * tooltip = (param->param_tooltip + (Glib::ustring)_(". Toogling this widget in preferences reset custom values for this parameter")).c_str();
+ const gchar * tooltip_extra = _(". Toogling this check in preferences reset to default custom values for this parameter");
+ Glib::ustring tooltip = param->param_tooltip + (Glib::ustring)tooltip_extra;
Glib::ustring pref_path = (Glib::ustring)"/live_effects/" +
effectkey +
(Glib::ustring)"/" +
@@ -865,7 +873,7 @@ void InkscapePreferences::initPageUI()
}
Inkscape::UI::Widget::RegisteredCheckButton * checkwdg = Gtk::manage(
new Inkscape::UI::Widget::RegisteredCheckButton( param->param_label,
- param->param_tooltip,
+ tooltip,
param->param_key,
*wr,
false,