![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 36861ad2c7f0db5b6c373c2d59775f657b0d14a2..e147791634b28769cd18b432bcf7915683d896df 100644 (file)
#define SPACE_SIZE_X 15
#define SPACE_SIZE_Y 10
-#define INKSCAPE_ICON_GRID_XY "grid_xy"
-#define INKSCAPE_ICON_GRID_AXONOM "grid_axonom"
-
//===================================================
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_scripting(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),
//---------------------------------------------------------------
//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),
- _rcbmp( _("_Midpoints"), _("Snap midpoints of straight line segments"), "inkscape:snap-midpoints", _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
- _grids_button_new(Q_("Grid|_New"), _("Create new grid.")),
- _grids_button_remove(_("_Remove"), _("Remove selected grid.")),
+ _grids_button_new(C_("Grid", "_New"), _("Create new grid.")),
+ _grids_button_remove(C_("Grid", "_Remove"), _("Remove selected grid.")),
_grids_label_def("", Gtk::ALIGN_LEFT)
//---------------------------------------------------------------
{
_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_guides();
build_gridspage();
build_snap();
- build_snap_dtls();
#if ENABLE_LCMS
build_cms();
#endif // ENABLE_LCMS
Gtk::Label* label_bor = manage (new Gtk::Label);
label_bor->set_markup (_("<b>Border</b>"));
Gtk::Label *label_for = manage (new Gtk::Label);
- label_for->set_markup (_("<b>Format</b>"));
+ label_for->set_markup (_("<b>Page Size</b>"));
_page_sizer.init();
Gtk::Widget *const widget_array[] =
_("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<Gtk::Widget*> 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 (_("<b>Snapping</b>"));
- Gtk::Label *label_w = manage (new Gtk::Label);
- label_w->set_markup (_("<b>What snaps</b>"));
Gtk::Label *label_o = manage (new Gtk::Label);
label_o->set_markup (_("<b>Snap to objects</b>"));
Gtk::Label *label_gr = manage (new Gtk::Label);
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,
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 (_("<b>Snapping intersections of</b>"));
- Gtk::Label *label_m = manage (new Gtk::Label);
- label_m->set_markup (_("<b>Special points to consider</b>"));
-
- Gtk::Widget *const array[] =
- {
- label_i, 0,
- 0, &_rcbsigg,
- 0, &_rcbsils,
- 0, 0,
- label_m, 0,
- 0, &_rcbic,
- 0, &_rcbsm,
- 0, &_rcbmp
- };
-
- attach_all(_page_snap_dtls.table(), array, G_N_ELEMENTS(array));
-}
-
#if ENABLE_LCMS
static void
lcms_profile_get_name (cmsHPROFILE profile, const gchar **name)
while ((filename = (gchar *)g_dir_read_name(directory)) != NULL) {
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;
_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::linkSelectedProfile()
{
if (!desktop){
g_warning("No active desktop");
} 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");
- cprofRepr->setAttribute("name", (gchar*) _menu.get_active()->get_data("name"));
+ gchar* tmp = static_cast<gchar*>(_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
_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_document_get_resource_list( SP_ACTIVE_DOCUMENT, "script" );
while ( current ) {
SPObject* obj = SP_OBJECT(current->data);
SPScript* script = (SPScript*) obj;
- if (!name.compare(script->xlinkhref)){
+ if (name == script->xlinkhref){
sp_repr_unparent(obj->repr);
sp_document_done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_REMOVE_EXTERNAL_SCRIPT, _("Remove external script"));
}
while ( current ) {
SPObject* obj = SP_OBJECT(current->data);
SPScript* script = (SPScript*) obj;
- Gtk::TreeModel::Row row = *(_ExternalScriptsListStore->append());
- row[_ExternalScriptsListColumns.filenameColumn] = script->xlinkhref;
+ if (script->xlinkhref)
+ {
+ Gtk::TreeModel::Row row = *(_ExternalScriptsListStore->append());
+ row[_ExternalScriptsListColumns.filenameColumn] = script->xlinkhref;
+ }
+
current = g_slist_next(current);
}
}
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;
double const doc_w_px = sp_document_width(sp_desktop_document(dt));
double const doc_h_px = sp_document_height(sp_desktop_document(dt));
_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());
- _rcbmp.setActive (nv->snap_manager.snapprefs.getSnapLineMidpoints());
- _rcbsigg.setActive (nv->snap_manager.snapprefs.getSnapIntersectionGG());
- _rcbsils.setActive (nv->snap_manager.snapprefs.getSnapIntersectionCS());
- _rcbsnop.setActive(nv->snap_manager.snapprefs.getSnapToItemPath());
- _rcbsnon.setActive(nv->snap_manager.snapprefs.getSnapToItemNode());
- _rcbsnbbp.setActive(nv->snap_manager.snapprefs.getSnapToBBoxPath());
- _rcbsnbbn.setActive(nv->snap_manager.snapprefs.getSnapToBBoxNode());
- _rcbsnpb.setActive(nv->snap_manager.snapprefs.getSnapToPageBorder());
- _rsu_sno.setValue (nv->objecttolerance);
-
- _rsu_sn.setValue (nv->gridtolerance);
-
- _rsu_gusn.setValue (nv->guidetolerance);
-
- _rcbs.setActive (nv->snap_manager.snapprefs.getSnapEnabledGlobally());
+ _rsu_sno.setValue (nv->snap_manager.snapprefs.getObjectTolerance());
+ _rsu_sn.setValue (nv->snap_manager.snapprefs.getGridTolerance());
+ _rsu_gusn.setValue (nv->snap_manager.snapprefs.getGuideTolerance());
+
//-----------------------------------------------------------grids page