X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fdialog%2Fdocument-properties.cpp;h=4e1ddda2e7b2d95dfa4c54205d3ec8f38182d7d4;hb=39e454bdef986f01ef929a38513fc09b4ae80e32;hp=9c0ba4eeb1e13613adb3ed45e308a88206dc05de;hpb=62ed9fbd42e495fcf2efcf2f7c9cfca593517a40;p=inkscape.git
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 9c0ba4eeb..4e1ddda2e 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -32,6 +32,7 @@
#include "sp-namedview.h"
#include "sp-object-repr.h"
#include "sp-root.h"
+#include "sp-script.h"
#include "ui/widget/color-picker.h"
#include "ui/widget/scalar-unit.h"
#include "verbs.h"
@@ -54,9 +55,6 @@ namespace Dialog {
#define SPACE_SIZE_X 15
#define SPACE_SIZE_Y 10
-#define INKSCAPE_ICON_GRID_XY "grid_xy"
-#define INKSCAPE_ICON_GRID_AXONOM "grid_axonom"
-
//===================================================
@@ -67,11 +65,11 @@ static void on_child_removed(Inkscape::XML::Node *repr, Inkscape::XML::Node *chi
static void on_repr_attr_changed (Inkscape::XML::Node *, gchar const *, gchar const *, gchar const *, bool, gpointer);
static Inkscape::XML::NodeEventVector const _repr_events = {
- on_child_added, /* child_added */
- on_child_removed, /* child_removed */
+ on_child_added, // child_added
+ on_child_removed, // child_removed
on_repr_attr_changed,
- NULL, /* content_changed */
- NULL /* order_changed */
+ NULL, // content_changed
+ NULL // order_changed
};
@@ -87,7 +85,7 @@ DocumentProperties::getInstance()
DocumentProperties::DocumentProperties()
: UI::Widget::Panel ("", "/dialogs/documentoptions", SP_VERB_DIALOG_NAMEDVIEW),
_page_page(1, 1, true, true), _page_guides(1, 1),
- _page_snap(1, 1), _page_snap_dtls(1, 1), _page_cms(1, 1),
+ _page_snap(1, 1), _page_cms(1, 1), _page_scripting(1, 1),
//---------------------------------------------------------------
_rcb_canb(_("Show page _border"), _("If set, rectangular page border is shown"), "showborder", _wr, false),
_rcb_bord(_("Border on _top of drawing"), _("If set, border is always on top of the drawing"), "borderlayer", _wr, false),
@@ -99,32 +97,15 @@ DocumentProperties::DocumentProperties()
//---------------------------------------------------------------
//General snap options
_rcb_sgui(_("Show _guides"), _("Show or hide guides"), "showguides", _wr),
- _rcbsng(_("_Snap guides while dragging"), _("While dragging a guide, snap to object nodes or bounding box corners ('Snap to nodes' or 'snap to bounding box corners' must be enabled in the 'Snap' tab; only a small part of the guide near the cursor will snap)"),
- "inkscape:snap-guide", _wr),
+ _rcbsng(_("_Snap guides while dragging"), _("While dragging a guide, snap to object nodes or bounding box corners ('Snap to nodes' or 'snap to bounding box corners' must be enabled; only a small part of the guide near the cursor will snap)"),
+ "inkscape:snap-from-guide", _wr),
_rcp_gui(_("Guide co_lor:"), _("Guideline color"), _("Color of guidelines"), "guidecolor", "guideopacity", _wr),
_rcp_hgui(_("_Highlight color:"), _("Highlighted guideline color"), _("Color of a guideline when it is under mouse"), "guidehicolor", "guidehiopacity", _wr),
- //---------------------------------------------------------------
- _rcbs(_("_Enable snapping"), _("Toggle snapping on or off"), "inkscape:snap-global", _wr),
- _rcbsnbb(_("_Bounding box corners"), _("Only available in the selector tool: snap bounding box corners to guides, to grids, and to other bounding boxes (but not to nodes or paths)"),
- "inkscape:snap-bbox", _wr),
- _rcbsnn(_("_Nodes"), _("Snap nodes (e.g. path nodes, special points in shapes, gradient handles, text base points, transformation origins, etc.) to guides, to grids, to paths and to other nodes"),
- "inkscape:snap-nodes", _wr),
- //Options for snapping to objects
- _rcbsnop(_("Snap to path_s"), _("Snap nodes to object paths"), "inkscape:object-paths", _wr),
- _rcbsnon(_("Snap to n_odes"), _("Snap nodes and guides to object nodes"), "inkscape:object-nodes", _wr),
- _rcbsnbbp(_("Snap to bounding bo_x edges"), _("Snap bounding box corners and guides to bounding box edges"), "inkscape:bbox-paths", _wr),
- _rcbsnbbn(_("Snap to bounding box co_rners"), _("Snap bounding box corners to other bounding box corners"), "inkscape:bbox-nodes", _wr),
- _rcbsnpb(_("Snap to page border"), _("Snap bounding box corners and nodes to the page border"), "inkscape:snap-page", _wr),
- //---------------------------------------------------------------
- //Applies to both nodes and guides, but not to bboxes, that's why its located here
- _rcbic( _("Rotation _center"), _("Consider the rotation center of an object when snapping"), "inkscape:snap-center", _wr),
- _rcbsm( _("_Smooth nodes"), _("Snap to smooth nodes too, instead of only snapping to cusp nodes"), "inkscape:snap-smooth-nodes", _wr),
- _rcbsigg(_("_Grid with guides"), _("Snap to grid-guide intersections"), "inkscape:snap-intersection-grid-guide", _wr),
- _rcbsils(_("_Paths"), _("Snap to intersections of paths ('snap to paths' must be enabled, see the previous tab)"),
- "inkscape:snap-intersection-paths", _wr),
//---------------------------------------------------------------
_grids_label_crea("", Gtk::ALIGN_LEFT),
- //TRANSLATORS: In Grid|_New translate only the word _New. It ref to grid
+ //TRANSLATORS: only translate "string" in "context|string".
+ // For more details, see http://developer.gnome.org/doc/API/2.0/glib/glib-I18N.html#Q-:CAPS
+ // "New" refers to grid
_grids_button_new(Q_("Grid|_New"), _("Create new grid.")),
_grids_button_remove(_("_Remove"), _("Remove selected grid.")),
_grids_label_def("", Gtk::ALIGN_LEFT)
@@ -138,17 +119,17 @@ DocumentProperties::DocumentProperties()
_notebook.append_page(_page_guides, _("Guides"));
_notebook.append_page(_grids_vbox, _("Grids"));
_notebook.append_page(_page_snap, _("Snap"));
- _notebook.append_page(_page_snap_dtls, _("Snap points"));
_notebook.append_page(_page_cms, _("Color Management"));
+ _notebook.append_page(_page_scripting, _("Scripting"));
build_page();
build_guides();
build_gridspage();
build_snap();
- build_snap_dtls();
#if ENABLE_LCMS
build_cms();
#endif // ENABLE_LCMS
+ build_scripting();
_grids_button_new.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::onNewGrid));
_grids_button_remove.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::onRemoveGrid));
@@ -241,7 +222,7 @@ DocumentProperties::build_page()
Gtk::Label* label_bor = manage (new Gtk::Label);
label_bor->set_markup (_("Border"));
Gtk::Label *label_for = manage (new Gtk::Label);
- label_for->set_markup (_("Format"));
+ label_for->set_markup (_("Page Size"));
_page_sizer.init();
Gtk::Widget *const widget_array[] =
@@ -305,27 +286,6 @@ DocumentProperties::build_snap()
_("If set, objects only snap to a guide when it's within the range specified below"),
"guidetolerance", _wr);
- //Other options to locate here: e.g. visual snapping indicators on/off
-
- std::list slaves;
- slaves.push_back(&_rcbsnop);
- slaves.push_back(&_rcbsnon);
- _rcbsnn.setSlaveWidgets(slaves);
-
- slaves.clear();
- slaves.push_back(&_rcbsnbbp);
- slaves.push_back(&_rcbsnbbn);
- _rcbsnbb.setSlaveWidgets(slaves);
-
- slaves.clear();
- slaves.push_back(&_rcbsnn);
- slaves.push_back(&_rcbsnbb);
- _rcbs.setSlaveWidgets(slaves);
-
- Gtk::Label *label_g = manage (new Gtk::Label);
- label_g->set_markup (_("Snapping"));
- Gtk::Label *label_w = manage (new Gtk::Label);
- label_w->set_markup (_("What snaps"));
Gtk::Label *label_o = manage (new Gtk::Label);
label_o->set_markup (_("Snap to objects"));
Gtk::Label *label_gr = manage (new Gtk::Label);
@@ -335,19 +295,7 @@ DocumentProperties::build_snap()
Gtk::Widget *const array[] =
{
- label_g, 0,
- 0, &_rcbs,
- 0, 0,
- label_w, 0,
- 0, &_rcbsnn,
- 0, &_rcbsnbb,
- 0, 0,
label_o, 0,
- 0, &_rcbsnop,
- 0, &_rcbsnon,
- 0, &_rcbsnbbp,
- 0, &_rcbsnbbn,
- 0, &_rcbsnpb,
0, _rsu_sno._vbox,
0, 0,
label_gr, 0,
@@ -360,68 +308,6 @@ DocumentProperties::build_snap()
attach_all(_page_snap.table(), array, G_N_ELEMENTS(array));
}
-void
-DocumentProperties::build_snap_dtls()
-{
- _page_snap_dtls.show();
-
- //Other options to locate here: e.g. visual snapping indicators on/off
-
- Gtk::Label *label_i= manage (new Gtk::Label);
- label_i->set_markup (_("Snapping to intersections of"));
- Gtk::Label *label_m = manage (new Gtk::Label);
- label_m->set_markup (_("Special points to consider"));
-
- Gtk::Widget *const array[] =
- {
- label_i, 0,
- 0, &_rcbsigg,
- 0, &_rcbsils,
- 0, 0,
- label_m, 0,
- 0, &_rcbic,
- 0, &_rcbsm
- };
-
- attach_all(_page_snap_dtls.table(), array, G_N_ELEMENTS(array));
-}
-
-// Very simple observer that just emits a signal if anything happens to a node
-DocumentProperties::SignalObserver::SignalObserver()
- : _oldsel(0)
-{}
-
-// Add this observer to the SPObject and remove it from any previous object
-void
-DocumentProperties::SignalObserver::set(SPObject* o)
-{
- if(_oldsel && _oldsel->repr)
- _oldsel->repr->removeObserver(*this);
- if(o && o->repr)
- o->repr->addObserver(*this);
- _oldsel = o;
-}
-
-void DocumentProperties::SignalObserver::notifyChildAdded(XML::Node&, XML::Node&, XML::Node*)
-{ signal_changed()(); }
-
-void DocumentProperties::SignalObserver::notifyChildRemoved(XML::Node&, XML::Node&, XML::Node*)
-{ signal_changed()(); }
-
-void DocumentProperties::SignalObserver::notifyChildOrderChanged(XML::Node&, XML::Node&, XML::Node*, XML::Node*)
-{ signal_changed()(); }
-
-void DocumentProperties::SignalObserver::notifyContentChanged(XML::Node&, Util::ptr_shared, Util::ptr_shared)
-{}
-
-void DocumentProperties::SignalObserver::notifyAttributeChanged(XML::Node&, GQuark, Util::ptr_shared, Util::ptr_shared)
-{ signal_changed()(); }
-
-sigc::signal& DocumentProperties::SignalObserver::signal_changed()
-{
- return _signal_changed;
-}
-
#if ENABLE_LCMS
static void
lcms_profile_get_name (cmsHPROFILE profile, const gchar **name)
@@ -444,14 +330,18 @@ lcms_profile_get_name (cmsHPROFILE profile, const gchar **name)
void
DocumentProperties::populate_available_profiles(){
- std::list sources = ColorProfile::getProfileDirs();
+ Glib::ListHandle children = _menu.get_children();
+ for ( Glib::ListHandle::iterator it2 = children.begin(); it2 != children.end(); ++it2 ) {
+ _menu.remove(**it2);
+ delete(*it2);
+ }
- int index = 1;
+ std::list sources = ColorProfile::getProfileDirs();
// Use this loop to iterate through a list of possible document locations.
for ( std::list::const_iterator it = sources.begin(); it != sources.end(); ++it ) {
if ( Inkscape::IO::file_test( it->c_str(), G_FILE_TEST_EXISTS )
- && Inkscape::IO::file_test( it->c_str(), G_FILE_TEST_IS_DIR )) {
+ && Inkscape::IO::file_test( it->c_str(), G_FILE_TEST_IS_DIR )) {
GError *err = 0;
GDir *directory = g_dir_open(it->c_str(), 0, &err);
if (!directory) {
@@ -461,17 +351,17 @@ DocumentProperties::populate_available_profiles(){
} else {
gchar *filename = 0;
while ((filename = (gchar *)g_dir_read_name(directory)) != NULL) {
- gchar* lower = g_ascii_strdown( filename, -1 );
gchar* full = g_build_filename(it->c_str(), filename, NULL);
if ( !Inkscape::IO::file_test( full, G_FILE_TEST_IS_DIR ) ) {
+ cmsErrorAction( LCMS_ERROR_SHOW );
cmsHPROFILE hProfile = cmsOpenProfileFromFile(full, "r");
if (hProfile != NULL){
const gchar* name;
lcms_profile_get_name(hProfile, &name);
- Gtk::MenuItem* mi = new Gtk::MenuItem();
+ Gtk::MenuItem* mi = manage(new Gtk::MenuItem());
mi->set_data("filepath", g_strdup(full));
mi->set_data("name", g_strdup(name));
- Gtk::HBox *hbox = new Gtk::HBox();
+ Gtk::HBox *hbox = manage(new Gtk::HBox());
hbox->show();
Gtk::Label* lbl = manage(new Gtk::Label(name));
lbl->show();
@@ -480,12 +370,10 @@ DocumentProperties::populate_available_profiles(){
mi->show_all();
_menu.append(*mi);
// g_free((void*)name);
+ cmsCloseProfile(hProfile);
}
- cmsCloseProfile(hProfile);
- index++;
}
g_free(full);
- g_free(lower);
}
g_dir_close(directory);
}
@@ -494,62 +382,111 @@ DocumentProperties::populate_available_profiles(){
_menu.show_all();
}
+/**
+ * Cleans up name to remove disallowed characters.
+ * Some discussion at http://markmail.org/message/bhfvdfptt25kgtmj
+ * Allowed ASCII first characters: ':', 'A'-'Z', '_', 'a'-'z'
+ * Allowed ASCII remaining chars add: '-', '.', '0'-'9',
+ *
+ * @param str the string to clean up.
+ */
+static void sanitizeName( Glib::ustring& str )
+{
+ if (str.size() > 1) {
+ char val = str.at(0);
+ if (((val < 'A') || (val > 'Z'))
+ && ((val < 'a') || (val > 'z'))
+ && (val != '_')
+ && (val != ':')) {
+ str.replace(0, 1, "-");
+ }
+ for (Glib::ustring::size_type i = 1; i < str.size(); i++) {
+ char val = str.at(i);
+ if (((val < 'A') || (val > 'Z'))
+ && ((val < 'a') || (val > 'z'))
+ && ((val < '0') || (val > '9'))
+ && (val != '_')
+ && (val != ':')
+ && (val != '-')
+ && (val != '.')) {
+ str.replace(i, 1, "-");
+ }
+ }
+ }
+}
+
void
-DocumentProperties::onEmbedProfile()
+DocumentProperties::linkSelectedProfile()
{
//store this profile in the SVG document (create element in the XML)
+ // TODO remove use of 'active' desktop
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
if (!desktop){
g_warning("No active desktop");
- return;
- }
- Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
- Inkscape::XML::Node *cprofRepr = xml_doc->createElement("svg:color-profile");
- cprofRepr->setAttribute("name", (gchar*) _menu.get_active()->get_data("name"));
- cprofRepr->setAttribute("xlink:href", (gchar*) _menu.get_active()->get_data("filepath"));
-
- /* Checks whether there is a defs element. Creates it when needed */
- Inkscape::XML::Node *defsRepr = sp_repr_lookup_name(xml_doc, "svg:defs");
- if (!defsRepr){
- defsRepr = xml_doc->createElement("svg:defs");
- xml_doc->root()->addChild(defsRepr, NULL);
- }
+ } else {
+ if (!_menu.get_active()){
+ g_warning("No color profile available.");
+ return;
+ }
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+ Inkscape::XML::Node *cprofRepr = xml_doc->createElement("svg:color-profile");
+ gchar* tmp = static_cast(_menu.get_active()->get_data("name"));
+ Glib::ustring nameStr = tmp ? tmp : "profile"; // TODO add some auto-numbering to avoid collisions
+ sanitizeName(nameStr);
+ cprofRepr->setAttribute("name", nameStr.c_str());
+ cprofRepr->setAttribute("xlink:href", (gchar*) _menu.get_active()->get_data("filepath"));
+
+ // Checks whether there is a defs element. Creates it when needed
+ Inkscape::XML::Node *defsRepr = sp_repr_lookup_name(xml_doc, "svg:defs");
+ if (!defsRepr){
+ defsRepr = xml_doc->createElement("svg:defs");
+ xml_doc->root()->addChild(defsRepr, NULL);
+ }
- g_assert(SP_ROOT(desktop->doc()->root)->defs);
- defsRepr->addChild(cprofRepr, NULL);
+ g_assert(SP_ROOT(desktop->doc()->root)->defs);
+ defsRepr->addChild(cprofRepr, NULL);
- Inkscape::GC::release(defsRepr);
+ // TODO check if this next line was sometimes needed. It being there caused an assertion.
+ //Inkscape::GC::release(defsRepr);
- // inform the document, so we can undo
- sp_document_done(desktop->doc(), SP_VERB_EDIT_EMBED_COLOR_PROFILE, _("Embed Color Profile"));
+ // inform the document, so we can undo
+ SPDocumentUndo::done(desktop->doc(), SP_VERB_EDIT_LINK_COLOR_PROFILE, _("Link Color Profile"));
- populate_embedded_profiles_box();
+ populate_linked_profiles_box();
+ }
}
void
-DocumentProperties::populate_embedded_profiles_box()
+DocumentProperties::populate_linked_profiles_box()
{
- _EmbeddedProfilesListStore->clear();
- const GSList *current = sp_document_get_resource_list( SP_ACTIVE_DOCUMENT, "iccprofile" );
+ _LinkedProfilesListStore->clear();
+ const GSList *current = SP_ACTIVE_DOCUMENT->get_resource_list( "iccprofile" );
if (current) _emb_profiles_observer.set(SP_OBJECT(current->data)->parent);
while ( current ) {
SPObject* obj = SP_OBJECT(current->data);
Inkscape::ColorProfile* prof = reinterpret_cast(obj);
- Gtk::TreeModel::Row row = *(_EmbeddedProfilesListStore->append());
- row[_EmbeddedProfilesListColumns.nameColumn] = prof->name;
-// row[_EmbeddedProfilesListColumns.previewColumn] = "Color Preview";
+ Gtk::TreeModel::Row row = *(_LinkedProfilesListStore->append());
+ row[_LinkedProfilesListColumns.nameColumn] = prof->name;
+// row[_LinkedProfilesListColumns.previewColumn] = "Color Preview";
current = g_slist_next(current);
}
}
-void DocumentProperties::embedded_profiles_list_button_release(GdkEventButton* event)
+void DocumentProperties::external_scripts_list_button_release(GdkEventButton* event)
+{
+ if((event->type == GDK_BUTTON_RELEASE) && (event->button == 3)) {
+ _ExternalScriptsContextMenu.popup(event->button, event->time);
+ }
+}
+
+void DocumentProperties::linked_profiles_list_button_release(GdkEventButton* event)
{
if((event->type == GDK_BUTTON_RELEASE) && (event->button == 3)) {
_EmbProfContextMenu.popup(event->button, event->time);
}
}
-void DocumentProperties::create_popup_menu(Gtk::Widget& parent, sigc::slot rem)
+void DocumentProperties::cms_create_popup_menu(Gtk::Widget& parent, sigc::slot rem)
{
Gtk::MenuItem* mi = Gtk::manage(new Gtk::ImageMenuItem(Gtk::Stock::REMOVE));
_EmbProfContextMenu.append(*mi);
@@ -558,30 +495,42 @@ void DocumentProperties::create_popup_menu(Gtk::Widget& parent, sigc::slot
_EmbProfContextMenu.accelerate(parent);
}
-void DocumentProperties::remove_profile(){
+
+void DocumentProperties::scripting_create_popup_menu(Gtk::Widget& parent, sigc::slot rem)
+{
+ Gtk::MenuItem* mi = Gtk::manage(new Gtk::ImageMenuItem(Gtk::Stock::REMOVE));
+ _ExternalScriptsContextMenu.append(*mi);
+ mi->signal_activate().connect(rem);
+ mi->show();
+ _ExternalScriptsContextMenu.accelerate(parent);
+}
+
+void DocumentProperties::removeSelectedProfile(){
Glib::ustring name;
- if(_EmbeddedProfilesList.get_selection()) {
- Gtk::TreeModel::iterator i = _EmbeddedProfilesList.get_selection()->get_selected();
+ if(_LinkedProfilesList.get_selection()) {
+ Gtk::TreeModel::iterator i = _LinkedProfilesList.get_selection()->get_selected();
if(i){
- name = (*i)[_EmbeddedProfilesListColumns.nameColumn];
+ name = (*i)[_LinkedProfilesListColumns.nameColumn];
} else {
return;
}
}
- const GSList *current = sp_document_get_resource_list( SP_ACTIVE_DOCUMENT, "iccprofile" );
+ const GSList *current = SP_ACTIVE_DOCUMENT->get_resource_list( "iccprofile" );
while ( current ) {
SPObject* obj = SP_OBJECT(current->data);
Inkscape::ColorProfile* prof = reinterpret_cast(obj);
if (!name.compare(prof->name)){
- sp_repr_unparent(obj->repr);
- sp_document_done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_REMOVE_COLOR_PROFILE, _("Remove embedded color profile"));
+
+ //XML Tree being used directly here while it shouldn't be.
+ sp_repr_unparent(obj->getRepr());
+ SPDocumentUndo::done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_REMOVE_COLOR_PROFILE, _("Remove linked color profile"));
}
current = g_slist_next(current);
}
- populate_embedded_profiles_box();
+ populate_linked_profiles_box();
}
void
@@ -589,20 +538,20 @@ DocumentProperties::build_cms()
{
_page_cms.show();
- Gtk::Label *label_embed= manage (new Gtk::Label("", Gtk::ALIGN_LEFT));
- label_embed->set_markup (_("Embedded Color Profiles:"));
+ Gtk::Label *label_link= manage (new Gtk::Label("", Gtk::ALIGN_LEFT));
+ label_link->set_markup (_("Linked Color Profiles:"));
Gtk::Label *label_avail = manage (new Gtk::Label("", Gtk::ALIGN_LEFT));
label_avail->set_markup (_("Available Color Profiles:"));
- _embed_btn.set_label(_("Embed Profile"));
+ _link_btn.set_label(_("Link Profile"));
_page_cms.set_spacing(4);
gint row = 0;
- label_embed->set_alignment(0.0);
- _page_cms.table().attach(*label_embed, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+ label_link->set_alignment(0.0);
+ _page_cms.table().attach(*label_link, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
row++;
- _page_cms.table().attach(_EmbeddedProfilesListScroller, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+ _page_cms.table().attach(_LinkedProfilesListScroller, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
row++;
Gtk::HBox* spacer = Gtk::manage(new Gtk::HBox());
@@ -614,7 +563,7 @@ DocumentProperties::build_cms()
_page_cms.table().attach(*label_avail, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
row++;
_page_cms.table().attach(_combo_avail, 0, 2, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
- _page_cms.table().attach(_embed_btn, 2, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+ _page_cms.table().attach(_link_btn, 2, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
populate_available_profiles();
@@ -622,34 +571,157 @@ DocumentProperties::build_cms()
_combo_avail.set_history(0);
_combo_avail.show_all();
- //# Set up the Embedded Profiles combo box
- _EmbeddedProfilesListStore = Gtk::ListStore::create(_EmbeddedProfilesListColumns);
- _EmbeddedProfilesList.set_model(_EmbeddedProfilesListStore);
- _EmbeddedProfilesList.append_column(_("Profile Name"), _EmbeddedProfilesListColumns.nameColumn);
-// _EmbeddedProfilesList.append_column(_("Color Preview"), _EmbeddedProfilesListColumns.previewColumn);
- _EmbeddedProfilesList.set_headers_visible(false);
-// TODO restore? _EmbeddedProfilesList.set_fixed_height_mode(true);
+ //# Set up the Linked Profiles combo box
+ _LinkedProfilesListStore = Gtk::ListStore::create(_LinkedProfilesListColumns);
+ _LinkedProfilesList.set_model(_LinkedProfilesListStore);
+ _LinkedProfilesList.append_column(_("Profile Name"), _LinkedProfilesListColumns.nameColumn);
+// _LinkedProfilesList.append_column(_("Color Preview"), _LinkedProfilesListColumns.previewColumn);
+ _LinkedProfilesList.set_headers_visible(false);
+// TODO restore? _LinkedProfilesList.set_fixed_height_mode(true);
- populate_embedded_profiles_box();
+ populate_linked_profiles_box();
- _EmbeddedProfilesListScroller.add(_EmbeddedProfilesList);
- _EmbeddedProfilesListScroller.set_shadow_type(Gtk::SHADOW_IN);
- _EmbeddedProfilesListScroller.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_ALWAYS);
- _EmbeddedProfilesListScroller.set_size_request(-1, 90);
+ _LinkedProfilesListScroller.add(_LinkedProfilesList);
+ _LinkedProfilesListScroller.set_shadow_type(Gtk::SHADOW_IN);
+ _LinkedProfilesListScroller.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_ALWAYS);
+ _LinkedProfilesListScroller.set_size_request(-1, 90);
- _embed_btn.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::onEmbedProfile));
+ _link_btn.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::linkSelectedProfile));
- _EmbeddedProfilesList.signal_button_release_event().connect_notify(sigc::mem_fun(*this, &DocumentProperties::embedded_profiles_list_button_release));
- create_popup_menu(_EmbeddedProfilesList, sigc::mem_fun(*this, &DocumentProperties::remove_profile));
+ _LinkedProfilesList.signal_button_release_event().connect_notify(sigc::mem_fun(*this, &DocumentProperties::linked_profiles_list_button_release));
+ cms_create_popup_menu(_LinkedProfilesList, sigc::mem_fun(*this, &DocumentProperties::removeSelectedProfile));
- const GSList *current = sp_document_get_resource_list( SP_ACTIVE_DOCUMENT, "defs" );
+ const GSList *current = SP_ACTIVE_DOCUMENT->get_resource_list( "defs" );
if (current) {
_emb_profiles_observer.set(SP_OBJECT(current->data)->parent);
}
- _emb_profiles_observer.signal_changed().connect(sigc::mem_fun(*this, &DocumentProperties::populate_embedded_profiles_box));
+ _emb_profiles_observer.signal_changed().connect(sigc::mem_fun(*this, &DocumentProperties::populate_linked_profiles_box));
}
#endif // ENABLE_LCMS
+void
+DocumentProperties::build_scripting()
+{
+ _page_scripting.show();
+
+ Gtk::Label *label_script= manage (new Gtk::Label("", Gtk::ALIGN_LEFT));
+ label_script->set_markup (_("External script files:"));
+
+ _add_btn.set_label(_("Add"));
+
+ _page_scripting.set_spacing(4);
+ gint row = 0;
+
+ label_script->set_alignment(0.0);
+ _page_scripting.table().attach(*label_script, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+ row++;
+ _page_scripting.table().attach(_ExternalScriptsListScroller, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+ row++;
+
+ Gtk::HBox* spacer = Gtk::manage(new Gtk::HBox());
+ spacer->set_size_request(SPACE_SIZE_X, SPACE_SIZE_Y);
+ _page_scripting.table().attach(*spacer, 0, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+ row++;
+
+ _page_scripting.table().attach(_script_entry, 0, 2, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+ _page_scripting.table().attach(_add_btn, 2, 3, row, row + 1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0, 0, 0);
+ row++;
+
+ //# Set up the External Scripts box
+ _ExternalScriptsListStore = Gtk::ListStore::create(_ExternalScriptsListColumns);
+ _ExternalScriptsList.set_model(_ExternalScriptsListStore);
+ _ExternalScriptsList.append_column(_("Filename"), _ExternalScriptsListColumns.filenameColumn);
+ _ExternalScriptsList.set_headers_visible(true);
+// TODO restore? _ExternalScriptsList.set_fixed_height_mode(true);
+
+ populate_external_scripts_box();
+
+ _ExternalScriptsListScroller.add(_ExternalScriptsList);
+ _ExternalScriptsListScroller.set_shadow_type(Gtk::SHADOW_IN);
+ _ExternalScriptsListScroller.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_ALWAYS);
+ _ExternalScriptsListScroller.set_size_request(-1, 90);
+
+ _add_btn.signal_clicked().connect(sigc::mem_fun(*this, &DocumentProperties::addExternalScript));
+
+#if ENABLE_LCMS
+ _ExternalScriptsList.signal_button_release_event().connect_notify(sigc::mem_fun(*this, &DocumentProperties::external_scripts_list_button_release));
+ scripting_create_popup_menu(_ExternalScriptsList, sigc::mem_fun(*this, &DocumentProperties::removeExternalScript));
+#endif // ENABLE_LCMS
+
+//TODO: review this observers code:
+ const GSList *current = SP_ACTIVE_DOCUMENT->get_resource_list( "script" );
+ if (current) {
+ _ext_scripts_observer.set(SP_OBJECT(current->data)->parent);
+ }
+ _ext_scripts_observer.signal_changed().connect(sigc::mem_fun(*this, &DocumentProperties::populate_external_scripts_box));
+}
+
+
+void DocumentProperties::addExternalScript(){
+ SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+ if (!desktop){
+ g_warning("No active desktop");
+ } else {
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+ Inkscape::XML::Node *scriptRepr = xml_doc->createElement("svg:script");
+ scriptRepr->setAttribute("xlink:href", (gchar*) _script_entry.get_text().c_str());
+ _script_entry.set_text("");
+
+ xml_doc->root()->addChild(scriptRepr, NULL);
+
+ // inform the document, so we can undo
+ SPDocumentUndo::done(desktop->doc(), SP_VERB_EDIT_ADD_EXTERNAL_SCRIPT, _("Add external script..."));
+
+ populate_external_scripts_box();
+ }
+}
+
+void DocumentProperties::removeExternalScript(){
+ Glib::ustring name;
+ if(_ExternalScriptsList.get_selection()) {
+ Gtk::TreeModel::iterator i = _ExternalScriptsList.get_selection()->get_selected();
+
+ if(i){
+ name = (*i)[_ExternalScriptsListColumns.filenameColumn];
+ } else {
+ return;
+ }
+ }
+
+ const GSList *current = SP_ACTIVE_DOCUMENT->get_resource_list( "script" );
+ while ( current ) {
+ SPObject* obj = SP_OBJECT(current->data);
+ SPScript* script = (SPScript*) obj;
+ if (name == script->xlinkhref){
+
+ //XML Tree being used directly here while it shouldn't be.
+ sp_repr_unparent(obj->getRepr());
+ SPDocumentUndo::done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_REMOVE_EXTERNAL_SCRIPT, _("Remove external script"));
+ }
+ current = g_slist_next(current);
+ }
+
+ populate_external_scripts_box();
+
+}
+
+void DocumentProperties::populate_external_scripts_box(){
+ _ExternalScriptsListStore->clear();
+ const GSList *current = SP_ACTIVE_DOCUMENT->get_resource_list( "script" );
+ if (current) _ext_scripts_observer.set(SP_OBJECT(current->data)->parent);
+ while ( current ) {
+ SPObject* obj = SP_OBJECT(current->data);
+ SPScript* script = (SPScript*) obj;
+ if (script->xlinkhref)
+ {
+ Gtk::TreeModel::Row row = *(_ExternalScriptsListStore->append());
+ row[_ExternalScriptsListColumns.filenameColumn] = script->xlinkhref;
+ }
+
+ current = g_slist_next(current);
+ }
+}
+
/**
* Called for _updating_ the dialog (e.g. when a new grid was manually added in XML)
*/
@@ -673,10 +745,10 @@ DocumentProperties::update_gridspage()
const char *icon = NULL;
switch (grid->getGridType()) {
case GRID_RECTANGULAR:
- icon = INKSCAPE_ICON_GRID_XY;
+ icon = "grid-rectangular";
break;
case GRID_AXONOMETRIC:
- icon = INKSCAPE_ICON_GRID_AXONOM;
+ icon = "grid-axonometric";
break;
default:
break;
@@ -754,37 +826,24 @@ DocumentProperties::update()
if (nv->doc_units)
_rum_deflt.setUnit (nv->doc_units);
- double const doc_w_px = sp_document_width(sp_desktop_document(dt));
- double const doc_h_px = sp_document_height(sp_desktop_document(dt));
+ double const doc_w_px = sp_desktop_document(dt)->getWidth();
+ double const doc_h_px = sp_desktop_document(dt)->getHeight();
_page_sizer.setDim (doc_w_px, doc_h_px);
+ _page_sizer.updateFitMarginsUI(SP_OBJECT_REPR(nv));
//-----------------------------------------------------------guide page
_rcb_sgui.setActive (nv->showguides);
_rcp_gui.setRgba32 (nv->guidecolor);
_rcp_hgui.setRgba32 (nv->guidehicolor);
+ _rcbsng.setActive(nv->snap_manager.snapprefs.getSnapModeGuide());
//-----------------------------------------------------------snap page
- _rcbsnbb.setActive (nv->snap_manager.snapprefs.getSnapModeBBox());
- _rcbsnn.setActive (nv->snap_manager.snapprefs.getSnapModeNode());
- _rcbsng.setActive (nv->snap_manager.snapprefs.getSnapModeGuide());
- _rcbic.setActive (nv->snap_manager.snapprefs.getIncludeItemCenter());
- _rcbsm.setActive (nv->snap_manager.snapprefs.getSnapSmoothNodes());
- _rcbsigg.setActive (nv->snap_manager.snapprefs.getSnapIntersectionGG());
- _rcbsils.setActive (nv->snap_manager.snapprefs.getSnapIntersectionCS());
- _rcbsnop.setActive(nv->snap_manager.object.getSnapToItemPath());
- _rcbsnon.setActive(nv->snap_manager.object.getSnapToItemNode());
- _rcbsnbbp.setActive(nv->snap_manager.object.getSnapToBBoxPath());
- _rcbsnbbn.setActive(nv->snap_manager.object.getSnapToBBoxNode());
- _rcbsnpb.setActive(nv->snap_manager.object.getSnapToPageBorder());
- _rsu_sno.setValue (nv->objecttolerance);
-
- _rsu_sn.setValue (nv->gridtolerance);
-
- _rsu_gusn.setValue (nv->guidetolerance);
+ _rsu_sno.setValue (nv->snap_manager.snapprefs.getObjectTolerance());
+ _rsu_sn.setValue (nv->snap_manager.snapprefs.getGridTolerance());
+ _rsu_gusn.setValue (nv->snap_manager.snapprefs.getGuideTolerance());
- _rcbs.setActive (nv->snap_manager.snapprefs.getSnapEnabledGlobally());
//-----------------------------------------------------------grids page
@@ -793,7 +852,7 @@ DocumentProperties::update()
//------------------------------------------------Color Management page
#if ENABLE_LCMS
- populate_embedded_profiles_box();
+ populate_linked_profiles_box();
populate_available_profiles();
#endif // ENABLE_LCMS
@@ -930,7 +989,7 @@ DocumentProperties::onRemoveGrid()
// delete the grid that corresponds with the selected tab
// when the grid is deleted from SVG, the SPNamedview handler automatically deletes the object, so found_grid becomes an invalid pointer!
found_grid->repr->parent()->removeChild(found_grid->repr);
- sp_document_done(sp_desktop_document(dt), SP_VERB_DIALOG_NAMEDVIEW, _("Remove grid"));
+ SPDocumentUndo::done(sp_desktop_document(dt), SP_VERB_DIALOG_NAMEDVIEW, _("Remove grid"));
}
}