summaryrefslogtreecommitdiffstats
path: root/src/extension/param
diff options
context:
space:
mode:
Diffstat (limited to 'src/extension/param')
-rw-r--r--src/extension/param/bool.cpp21
-rw-r--r--src/extension/param/color.cpp4
-rw-r--r--src/extension/param/color.h6
-rw-r--r--src/extension/param/description.cpp8
-rw-r--r--src/extension/param/enum.cpp20
-rw-r--r--src/extension/param/float.cpp12
-rw-r--r--src/extension/param/int.cpp25
-rw-r--r--src/extension/param/notebook.cpp14
-rw-r--r--src/extension/param/parameter.cpp12
-rw-r--r--src/extension/param/parameter.h32
-rw-r--r--src/extension/param/radiobutton.cpp10
-rw-r--r--src/extension/param/string.cpp9
12 files changed, 90 insertions, 83 deletions
diff --git a/src/extension/param/bool.cpp b/src/extension/param/bool.cpp
index ab90ddaf9..1dda3d73f 100644
--- a/src/extension/param/bool.cpp
+++ b/src/extension/param/bool.cpp
@@ -13,10 +13,10 @@
#include <gtkmm/box.h>
#include <gtkmm/spinbutton.h>
-#include <xml/node.h>
-
+#include "xml/node.h"
#include "../extension.h"
#include "bool.h"
+#include "preferences.h"
namespace Inkscape {
namespace Extension {
@@ -36,7 +36,8 @@ ParamBool::ParamBool (const gchar * name, const gchar * guitext, const gchar * d
}
gchar * pref_name = this->pref_name();
- _value = (bool)prefs_get_int_attribute(PREF_DIR, pref_name, _value);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ _value = prefs->getBool(extension_pref_root + pref_name, _value);
g_free(pref_name);
return;
@@ -57,7 +58,8 @@ ParamBool::set( bool in, SPDocument * /*doc*/, Inkscape::XML::Node * /*node*/ )
_value = in;
gchar * prefname = this->pref_name();
- prefs_set_int_attribute(PREF_DIR, prefname, _value == true ? 1 : 0);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ prefs->setBool(extension_pref_root + prefname, _value);
g_free(prefname);
return _value;
@@ -150,3 +152,14 @@ ParamBool::get_widget (SPDocument * doc, Inkscape::XML::Node * node, sigc::signa
} /* namespace Extension */
} /* namespace Inkscape */
+
+/*
+ Local Variables:
+ mode:c++
+ c-file-style:"stroustrup"
+ c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+ indent-tabs-mode:nil
+ fill-column:99
+ End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
diff --git a/src/extension/param/color.cpp b/src/extension/param/color.cpp
index 555461bc7..58db85748 100644
--- a/src/extension/param/color.cpp
+++ b/src/extension/param/color.cpp
@@ -50,7 +50,7 @@ ParamColor::set( guint32 in, SPDocument * /*doc*/, Inkscape::XML::Node * /*node*
string(value);
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- prefs->setString(PREF_DIR, prefname, value);
+ prefs->setString(extension_pref_root + prefname, value);
g_free(prefname);
return _value;
@@ -66,7 +66,7 @@ ParamColor::ParamColor (const gchar * name, const gchar * guitext, const gchar *
gchar * pref_name = this->pref_name();
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- Glib::ustring paramval = prefs->getString(PREF_DIR, pref_name);
+ Glib::ustring paramval = prefs->getString(extension_pref_root + pref_name);
g_free(pref_name);
if (!paramval.empty())
diff --git a/src/extension/param/color.h b/src/extension/param/color.h
index 6836442a1..e6b44fbcb 100644
--- a/src/extension/param/color.h
+++ b/src/extension/param/color.h
@@ -8,10 +8,10 @@
*/
#include <gtkmm/widget.h>
-#include <xml/node.h>
-#include <document.h>
+#include "xml/node.h"
+#include "document.h"
#include <color.h>
-#include "parameter.h"
+#include "extension/param/parameter.h"
namespace Inkscape {
namespace Extension {
diff --git a/src/extension/param/description.cpp b/src/extension/param/description.cpp
index 61bfa9f5a..656e58c49 100644
--- a/src/extension/param/description.cpp
+++ b/src/extension/param/description.cpp
@@ -20,14 +20,10 @@
#include <gtkmm/box.h>
#include <gtkmm/spinbutton.h>
#include <sstream>
-
-
#include <glibmm/i18n.h>
-#include <xml/node.h>
-
-#include <extension/extension.h>
-#include <prefs-utils.h>
+#include "xml/node.h"
+#include "extension/extension.h"
namespace Inkscape {
namespace Extension {
diff --git a/src/extension/param/enum.cpp b/src/extension/param/enum.cpp
index 33c153434..9d324a47c 100644
--- a/src/extension/param/enum.cpp
+++ b/src/extension/param/enum.cpp
@@ -22,23 +22,15 @@
#include <gtkmm/comboboxtext.h>
#include <gtkmm/tooltips.h>
#include <gtkmm/label.h>
-
#include <glibmm/i18n.h>
-#include <xml/node.h>
-
-#include <extension/extension.h>
-#include <prefs-utils.h>
-#include <document-private.h>
-#include <sp-object.h>
-
+#include "xml/node.h"
+#include "extension/extension.h"
+#include "document-private.h"
+#include "sp-object.h"
#include "enum.h"
#include "preferences.h"
-/** \brief The root directory in the preferences database for extension
- related parameters. */
-#define PREF_DIR "extensions"
-
namespace Inkscape {
namespace Extension {
@@ -106,7 +98,7 @@ ParamComboBox::ParamComboBox (const gchar * name, const gchar * guitext, const g
gchar * pref_name = this->pref_name();
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- Glib::ustring paramval = prefs->getString(PREF_DIR, pref_name);
+ Glib::ustring paramval = prefs->getString(extension_pref_root + pref_name);
g_free(pref_name);
if (!paramval.empty())
@@ -160,7 +152,7 @@ ParamComboBox::set (const gchar * in, SPDocument * /*doc*/, Inkscape::XML::Node
_value = g_strdup(settext->c_str());
gchar * prefname = this->pref_name();
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- prefs->setString(PREF_DIR, prefname, _value);
+ prefs->setString(extension_pref_root + prefname, _value);
g_free(prefname);
}
diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp
index 1225648d6..40cb81ddd 100644
--- a/src/extension/param/float.cpp
+++ b/src/extension/param/float.cpp
@@ -13,9 +13,9 @@
#include <gtkmm/box.h>
#include <gtkmm/spinbutton.h>
-#include <xml/node.h>
-
-#include <extension/extension.h>
+#include "xml/node.h"
+#include "extension/extension.h"
+#include "preferences.h"
#include "float.h"
namespace Inkscape {
@@ -53,7 +53,8 @@ ParamFloat::ParamFloat (const gchar * name, const gchar * guitext, const gchar *
}
gchar * pref_name = this->pref_name();
- _value = prefs_get_double_attribute(PREF_DIR, pref_name, _value);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ _value = prefs->getDouble(extension_pref_root + pref_name, _value);
g_free(pref_name);
// std::cout << "New Float:: value: " << _value << " max: " << _max << " min: " << _min << std::endl;
@@ -81,7 +82,8 @@ ParamFloat::set (float in, SPDocument * /*doc*/, Inkscape::XML::Node * /*node*/)
if (_value < _min) _value = _min;
gchar * prefname = this->pref_name();
- prefs_set_double_attribute(PREF_DIR, prefname, _value);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ prefs->setDouble(extension_pref_root + prefname, _value);
g_free(prefname);
return _value;
diff --git a/src/extension/param/int.cpp b/src/extension/param/int.cpp
index dc523435e..db7f9c67b 100644
--- a/src/extension/param/int.cpp
+++ b/src/extension/param/int.cpp
@@ -13,9 +13,9 @@
#include <gtkmm/box.h>
#include <gtkmm/spinbutton.h>
-#include <xml/node.h>
-
-#include <extension/extension.h>
+#include "xml/node.h"
+#include "extension/extension.h"
+#include "preferences.h"
#include "int.h"
namespace Inkscape {
@@ -47,8 +47,9 @@ ParamInt::ParamInt (const gchar * name, const gchar * guitext, const gchar * des
_min = 0;
}
- gchar * pref_name = this->pref_name();
- _value = prefs_get_int_attribute(PREF_DIR, pref_name, _value);
+ gchar *pref_name = this->pref_name();
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ _value = prefs->getInt(extension_pref_root + pref_name, _value);
g_free(pref_name);
// std::cout << "New Int:: value: " << _value << " max: " << _max << " min: " << _min << std::endl;
@@ -76,7 +77,8 @@ ParamInt::set (int in, SPDocument * /*doc*/, Inkscape::XML::Node * /*node*/)
if (_value < _min) _value = _min;
gchar * prefname = this->pref_name();
- prefs_set_int_attribute(PREF_DIR, prefname, _value);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ prefs->setInt(extension_pref_root + prefname, _value);
g_free(prefname);
return _value;
@@ -157,3 +159,14 @@ ParamInt::string (std::string &string)
} /* namespace Extension */
} /* namespace Inkscape */
+
+/*
+ Local Variables:
+ mode:c++
+ c-file-style:"stroustrup"
+ c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+ indent-tabs-mode:nil
+ fill-column:99
+ End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp
index bce6bc3d0..1c30b7e0e 100644
--- a/src/extension/param/notebook.cpp
+++ b/src/extension/param/notebook.cpp
@@ -223,13 +223,6 @@ ParamNotebookPage::get_widget (SPDocument * doc, Inkscape::XML::Node * node, sig
}
-
-
-
-
-
-
-
ParamNotebook::ParamNotebook (const gchar * name, const gchar * guitext, const gchar * desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar * gui_tip, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml) :
Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext)
{
@@ -264,7 +257,7 @@ ParamNotebook::ParamNotebook (const gchar * name, const gchar * guitext, const g
gchar * pref_name = this->pref_name();
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- Glib::ustring paramval = prefs->getString(PREF_DIR, pref_name);
+ Glib::ustring paramval = prefs->getString(extension_pref_root + pref_name);
g_free(pref_name);
if (!paramval.empty())
@@ -317,7 +310,8 @@ ParamNotebook::set (const int in, SPDocument * /*doc*/, Inkscape::XML::Node * /*
_value = g_strdup(page->name());
gchar * prefname = this->pref_name();
- prefs_set_string_attribute(PREF_DIR, prefname, _value);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ prefs->setString(extension_pref_root + prefname, _value);
g_free(prefname);
return _value;
@@ -434,4 +428,4 @@ ParamNotebook::get_widget (SPDocument * doc, Inkscape::XML::Node * node, sigc::s
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp
index 5f434e5e1..2773af61d 100644
--- a/src/extension/param/parameter.cpp
+++ b/src/extension/param/parameter.cpp
@@ -1,9 +1,7 @@
-/** \file
- * Parameters for extensions.
+/** @file
+ * @brief Parameters for extensions.
*/
-
-/*
- * Author:
+/* Author:
* Ted Gould <ted@gould.cx>
* Johan Engelen <johan@shouraizou.nl>
*
@@ -386,6 +384,8 @@ Parameter::string (std::list <std::string> &list)
return;
}
+Glib::ustring const extension_pref_root = "/extensions/";
+
} /* namespace Extension */
} /* namespace Inkscape */
@@ -398,4 +398,4 @@ Parameter::string (std::list <std::string> &list)
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
diff --git a/src/extension/param/parameter.h b/src/extension/param/parameter.h
index 1aeafbd7c..54249c12e 100644
--- a/src/extension/param/parameter.h
+++ b/src/extension/param/parameter.h
@@ -1,12 +1,7 @@
-#ifndef __INK_EXTENSION_PARAM_H__
-#define __INK_EXTENSION_PARAM_H__
-
-/** \file
- * Parameters for extensions.
+/** @file
+ * @brief Parameters for extensions.
*/
-
-/*
- * Authors:
+/* Authors:
* Ted Gould <ted@gould.cx>
*
* Copyright (C) 2005-2006 Authors
@@ -14,24 +9,29 @@
* Released under GNU GPL, read the file 'COPYING' for more information
*/
-/** \brief The root directory in the preferences database for extension-related parameters. */
-#define PREF_DIR "extensions"
+#ifndef SEEN_INK_EXTENSION_PARAM_H__
+#define SEEN_INK_EXTENSION_PARAM_H__
#include <gtkmm/widget.h>
+#include <glibmm/i18n.h>
#include "xml/document.h"
#include "xml/node.h"
#include "document.h"
-#include <extension/extension-forward.h>
-#include "prefs-utils.h"
-
-#include <glibmm/i18n.h>
-
+#include "extension/extension-forward.h"
#include <color.h>
namespace Inkscape {
namespace Extension {
+/**
+ * @brief The root directory in the preferences database for extension-related parameters
+ *
+ * The directory path has both a leading and a trailing slash, so that extension_pref_root + pref_name works
+ * without having to append a separator.
+ */
+extern Glib::ustring const extension_pref_root;
+
/** \brief A class to represent the parameter of an extension
This is really a super class that allows them to abstract all
@@ -132,4 +132,4 @@ public:
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp
index c05191b58..1e4ba3c8f 100644
--- a/src/extension/param/radiobutton.cpp
+++ b/src/extension/param/radiobutton.cpp
@@ -25,12 +25,10 @@
#include <gtkmm/radiobuttongroup.h>
#include <gtkmm/tooltips.h>
#include <gtkmm/label.h>
-
#include <glibmm/i18n.h>
-#include <xml/node.h>
-
-#include <extension/extension.h>
+#include "xml/node.h"
+#include "extension/extension.h"
#include "preferences.h"
#include "document-private.h"
#include "sp-object.h"
@@ -113,7 +111,7 @@ ParamRadioButton::ParamRadioButton (const gchar * name,
gchar * pref_name = this->pref_name();
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- Glib::ustring paramval = prefs->getString(PREF_DIR, pref_name);
+ Glib::ustring paramval = prefs->getString(extension_pref_root + pref_name);
g_free(pref_name);
if (!paramval.empty())
@@ -167,7 +165,7 @@ ParamRadioButton::set (const gchar * in, SPDocument * /*doc*/, Inkscape::XML::No
_value = g_strdup(settext->c_str());
gchar * prefname = this->pref_name();
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- prefs->setString(PREF_DIR, prefname, _value);
+ prefs->setString(extension_pref_root + prefname, _value);
g_free(prefname);
}
diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp
index 56ceeaad5..e32224332 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/string.cpp
@@ -13,9 +13,8 @@
#include <gtkmm/box.h>
#include <gtkmm/spinbutton.h>
-#include <xml/node.h>
-
-#include <extension/extension.h>
+#include "xml/node.h"
+#include "extension/extension.h"
#include "string.h"
#include "preferences.h"
@@ -53,7 +52,7 @@ ParamString::set (const gchar * in, SPDocument * /*doc*/, Inkscape::XML::Node *
gchar * prefname = this->pref_name();
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- prefs->setString(PREF_DIR, prefname, _value);
+ prefs->setString(extension_pref_root + prefname, _value);
g_free(prefname);
return _value;
@@ -80,7 +79,7 @@ ParamString::ParamString (const gchar * name, const gchar * guitext, const gchar
gchar * pref_name = this->pref_name();
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- Glib::ustring paramval = prefs->getString(PREF_DIR, pref_name);
+ Glib::ustring paramval = prefs->getString(extension_pref_root + pref_name);
g_free(pref_name);
if (!paramval.empty())
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 06:12:33 +0000