From e97a530ad3a5bfb7c7cfdf9a1ca76b66f586fab4 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Fri, 19 Apr 2013 14:59:27 -0400 Subject: New flow char symbols (bzr r12283) --- share/symbols/FlowSymbols.svg | 1287 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1287 insertions(+) create mode 100644 share/symbols/FlowSymbols.svg diff --git a/share/symbols/FlowSymbols.svg b/share/symbols/FlowSymbols.svg new file mode 100644 index 000000000..86faf78fb --- /dev/null +++ b/share/symbols/FlowSymbols.svg @@ -0,0 +1,1287 @@ + + + + + + + + + + image/svg+xml + + Flow Chart + 2013-04-18 + + + Martin Owens + + + + + + + + + + Martin Owens + + + English + Basic Flowchart Symbols + + + + + + + + + + + Flow Chart + + + + + + + + + + + + An operation or action step + Process + + Process + + + A formally defined sub-process. + Predefined Process + + + DefinedProcess + + + An alternate to the normal process step. + Alternate Process + + AlternateProcess + + + Split processes or a measurement or finished goods. + Extract + + Extract + + + Manually input into a system. + Manual Input + + ManualInput + + + Merge multiple processes into one or raw material storage. + Merge + + Merge + + + A waiting period. + Delay + + Delay + + + Indicates data inputs and outputs to and from a process. + Data I/O + + Data + + + Data stored in memory. + Internal Storage + + + InternalStorage + + + + + + Old computer punch card + Card + + Card + + + A document or report + Document + + Document + + + Storage on a hard drive + Direct Access Storage + + + + + DirectAccess + + + A general data storage flowchart symbol. + Stored Data + + Stored + + + A database + Magnetic Disk (Database) + + + + + MagneticStorage + + + Old computer punched tape input. + Punched Tape + + Tape + + + A start or stop point in a process. + Terminator + + Termination + + + Thick Arrow + Indicates movement of blocks. + + + + Transfer of materials. + Transfer + + + + A question or branch in the process. + Decision + + Decision + + + Shows flow from one block to another. + Flow Arrow + + + + Arrow with additional circle. + Circle Arrow + + + + Continuation on another page + Off-Page Connector + + Page ... + + + A jump from one point to another. + Connector + + Connector + + + Logical Or + + + + + + Summing Junction + Logical And + + + + + + A process step that isn't automated. + Manual Operation + + ManualOperation + + + A preparation or setup process step. + Preparation + + Preparation + + + A machine display. + Display + + Display + + + Sorting of data into a pre-defined order. + Sort + + + + + Organising data into a standard format or arrangement. + Collate + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 37223a86299a41bf17b9e392e3da549cd2c4b32b Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Fri, 19 Apr 2013 16:19:45 -0400 Subject: Cleaned up flow symbols file (bzr r12284) --- share/symbols/FlowSymbols.svg | 1546 +++++++---------------------------------- 1 file changed, 265 insertions(+), 1281 deletions(-) diff --git a/share/symbols/FlowSymbols.svg b/share/symbols/FlowSymbols.svg index 86faf78fb..28a376820 100644 --- a/share/symbols/FlowSymbols.svg +++ b/share/symbols/FlowSymbols.svg @@ -3,1285 +3,269 @@ - - - - - image/svg+xml - - Flow Chart - 2013-04-18 - - - Martin Owens - - - - - - - - - - Martin Owens - - - English - Basic Flowchart Symbols - - - - - - - - - - - Flow Chart - - - - - - - - - - - - An operation or action step - Process - - Process - - - A formally defined sub-process. - Predefined Process - - - DefinedProcess - - - An alternate to the normal process step. - Alternate Process - - AlternateProcess - - - Split processes or a measurement or finished goods. - Extract - - Extract - - - Manually input into a system. - Manual Input - - ManualInput - - - Merge multiple processes into one or raw material storage. - Merge - - Merge - - - A waiting period. - Delay - - Delay - - - Indicates data inputs and outputs to and from a process. - Data I/O - - Data - - - Data stored in memory. - Internal Storage - - - InternalStorage - - - - - - Old computer punch card - Card - - Card - - - A document or report - Document - - Document - - - Storage on a hard drive - Direct Access Storage - - - - - DirectAccess - - - A general data storage flowchart symbol. - Stored Data - - Stored - - - A database - Magnetic Disk (Database) - - - - - MagneticStorage - - - Old computer punched tape input. - Punched Tape - - Tape - - - A start or stop point in a process. - Terminator - - Termination - - - Thick Arrow - Indicates movement of blocks. - - - - Transfer of materials. - Transfer - - - - A question or branch in the process. - Decision - - Decision - - - Shows flow from one block to another. - Flow Arrow - - - - Arrow with additional circle. - Circle Arrow - - - - Continuation on another page - Off-Page Connector - - Page ... - - - A jump from one point to another. - Connector - - Connector - - - Logical Or - - - - - - Summing Junction - Logical And - - - - - - A process step that isn't automated. - Manual Operation - - ManualOperation - - - A preparation or setup process step. - Preparation - - Preparation - - - A machine display. - Display - - Display - - - Sorting of data into a pre-defined order. - Sort - - - - - Organising data into a standard format or arrangement. - Collate - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + +image/svg+xml + +Flow Chart Shapes +2013-04-18 + + +Martin Owens + + + + + + + + + +Martin Owens + + +English +Basic Flowchart Symbols + + + + + + + + + + +Flow Chart Shapes + + + + + + + + + + + +An operation or action step +Process + +Process + + +A formally defined sub-process. +Predefined Process + + +DefinedProcess + + +An alternate to the normal process step. +Alternate Process + +AlternateProcess + + +Split processes or a measurement or finished goods. +Extract + +Extract + + +Manually input into a system. +Manual Input + +ManualInput + + +Merge multiple processes into one or raw material storage. +Merge + +Merge + + +A waiting period. +Delay + +Delay + + +Indicates data inputs and outputs to and from a process. +Data I/O + +Data + + +Data stored in memory. +Internal Storage + + +InternalStorage + + + + + +Old computer punch card +Card + +Card + + +A document or report +Document + +Document + + +Storage on a hard drive +Direct Access Storage + + + + +DirectAccess + + +A general data storage flowchart symbol. +Stored Data + +Stored + + +A database +Magnetic Disk (Database) + + + + +MagneticStorage + + +Old computer punched tape input. +Punched Tape + +Tape + + +A start or stop point in a process. +Terminator + +Termination + + +Thick Arrow +Indicates movement of blocks. + + + +Transfer of materials. +Transfer + + + +A question or branch in the process. +Decision + +Decision + + +Shows flow from one block to another. +Flow Arrow + + + +Arrow with additional circle. +Circle Arrow + + + +Continuation on another page +Off-Page Connector + +Page ... + + +A jump from one point to another. +Connector + +Connector + + +Logical Or + + + + + +Summing Junction +Logical And + + + + + +A process step that isn't automated. +Manual Operation + +ManualOperation + + +A preparation or setup process step. +Preparation + +Preparation + + +A machine display. +Display + +Display + + +Sorting of data into a pre-defined order. +Sort + + + + +Organising data into a standard format or arrangement. +Collate + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 1583b4fd46bb5aeb98a22ae38a9342594f426779 Mon Sep 17 00:00:00 2001 From: Josh Andler Date: Fri, 19 Apr 2013 14:07:41 -0700 Subject: Install the new Flow symbols (bzr r12283.1.1) --- share/symbols/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/share/symbols/Makefile.am b/share/symbols/Makefile.am index 97ed43e1a..25f39983f 100644 --- a/share/symbols/Makefile.am +++ b/share/symbols/Makefile.am @@ -3,6 +3,7 @@ symbolsdir = $(datadir)/inkscape/symbols symbols_DATA = \ AigaSymbols.svg \ + FlowSymbols.svg \ LogicSymbols.svg EXTRA_DIST = $(symbols_DATA) -- cgit v1.2.3 From 611b8db1a0eb07b892da8d69fc5fb29f811eb742 Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Sat, 20 Apr 2013 20:26:11 +0200 Subject: minor odg export update (bzr r12285.1.1) --- src/extension/internal/odf.cpp | 69 ++++++++++++++++++++---------------------- src/extension/internal/odf.h | 2 +- 2 files changed, 33 insertions(+), 38 deletions(-) diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp index 70798099d..b23378fc3 100644 --- a/src/extension/internal/odf.cpp +++ b/src/extension/internal/odf.cpp @@ -47,7 +47,7 @@ #include #include #include - +#include //# Inkscape includes #include "clear-n_.h" @@ -1315,8 +1315,9 @@ writePath(Writer &outs, Geom::PathVector const &pathv, return nrPoints; } -bool OdfOutput::processStyle(Writer &outs, SPItem *item, const Glib::ustring &id, const Glib::ustring &gradientNameFill, const Glib::ustring &gradientNameStroke) +bool OdfOutput::processStyle(SPItem *item, const Glib::ustring &id, const Glib::ustring &gradientNameFill, const Glib::ustring &gradientNameStroke, Glib::ustring& output) { + output.clear(); if (!item) { return false; @@ -1408,37 +1409,34 @@ bool OdfOutput::processStyle(Writer &outs, SPItem *item, const Glib::ustring &id styleTable.push_back(si); styleLookupTable[id] = styleName; - Glib::ustring tmpstring = Glib::ustring::compose ("\n", si.name); - tmpstring += "\n", si.name); + output += "y1.value; gi.x2 = linGrad->x2.value; gi.y2 = linGrad->y2.value; + gradientName2 = Glib::ustring::compose("ImportedLinearGradient%1", gradientTable.size()); } else if (SP_IS_RADIALGRADIENT(gradient)) { gi.style = "radial"; SPRadialGradient *radGrad = SP_RADIALGRADIENT(gradient); - SPRadialGradient tmpGrad = *radGrad; - tmpGrad.cx.unit= SVGLength::PERCENT; - tmpGrad.cy.unit= SVGLength::PERCENT; - gi.cx = tmpGrad.cx.computed;// * 100.0;//ODG cx is percentages - gi.cy = tmpGrad.cy.computed;// * 100.0; + Geom::OptRect bbox = item->documentVisualBounds(); + gi.cx = (radGrad->cx.value-bbox->left())/bbox->width(); + gi.cy = (radGrad->cy.value-bbox->top())/bbox->height(); + gradientName2 = Glib::ustring::compose("ImportedRadialGradient%1", gradientTable.size()); } else { @@ -1529,7 +1528,7 @@ bool OdfOutput::processGradient(SPItem *item, } // No match, let us write a new entry - gradientName = Glib::ustring::compose("gradient%1", gradientTable.size()); + gradientName = gradientName2; gi.name = gradientName; gradientTable.push_back(gi); gradientLookupTable[id] = gradientName; @@ -1555,12 +1554,17 @@ bool OdfOutput::processGradient(SPItem *item, return false; } output += Glib::ustring::compose("\n", - gi.stops[0].opacity * 100.0, gi.stops[1].opacity * 100.0);// draw:border=\"0%%\" + //TODO: apply maths, to define begin of gradient, taking gradient begin and end, as well as object boundary into account + double angle = (gi.y2-gi.y1); + angle = (angle != 0.) ? (atan((gi.x2-gi.x1)/(gi.y2-gi.y1))* 180. / pi) : 90; + angle = (angle < 0)?(180+angle):angle; + angle = angle * 10; //why do we need this: precision????????????? + output += Glib::ustring::compose(" draw:start-intensity=\"%1\" draw:end-intensity=\"%2\" draw:angle=\"%3\"/>\n", + gi.stops[0].opacity * 100.0, gi.stops[1].opacity * 100.0, angle);// draw:border=\"0%%\" } else if (gi.style == "radial") { @@ -1581,8 +1585,8 @@ bool OdfOutput::processGradient(SPItem *item, g_warning("Need at least 2 stops for a radial gradient"); return false; } - output += Glib::ustring::compose("second; couts.printf("draw:style-name=\"%s\" ", styleName.c_str()); } - // couts.writeUString(styleString); - - // std::map::iterator giter; - // giter = gradientLookupTable.find(id); - // if (giter != gradientLookupTable.end()) - // { - // Glib::ustring gradientName = giter->second; - // couts.printf("draw:fill-gradient-name=\"%s\" ", - // gradientName.c_str()); - // } couts.printf("draw:layer=\"layout\" svg:x=\"%.3fcm\" svg:y=\"%.3fcm\" ", bbox_x, bbox_y); diff --git a/src/extension/internal/odf.h b/src/extension/internal/odf.h index 7dfbf9786..6b915e347 100644 --- a/src/extension/internal/odf.h +++ b/src/extension/internal/odf.h @@ -313,7 +313,7 @@ private: bool writeStyle(ZipFile &zf); - bool processStyle(Writer &outs, SPItem *item, const Glib::ustring &id, const Glib::ustring &gradientNameFill, const Glib::ustring &gradientNameStroke); + bool processStyle(SPItem *item, const Glib::ustring &id, const Glib::ustring &gradientNameFill, const Glib::ustring &gradientNameStroke, Glib::ustring& output); bool processGradient(SPItem *item, const Glib::ustring &id, Geom::Affine &tf, Glib::ustring& gradientName, Glib::ustring& output, bool checkFillGradient = 1); -- cgit v1.2.3 From e042b14d47a3a32a4c5db204f7aff26183587161 Mon Sep 17 00:00:00 2001 From: Alvin Penner Date: Sat, 20 Apr 2013 16:50:02 -0400 Subject: Group bbox update (Bug 1168979) Fixed bugs: - https://launchpad.net/bugs/1168979 (bzr r12285.1.2) --- src/selection-chemistry.cpp | 1 + src/ui/dialog/xml-tree.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index 41ebc9bfc..fc410897a 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -360,6 +360,7 @@ void sp_selection_delete(SPDesktop *desktop) selection->clear(); sp_selection_delete_impl(selected); g_slist_free(const_cast(selected)); + reinterpret_cast(desktop->currentLayer())->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); /* a tool may have set up private information in it's selection context * that depends on desktop items. I think the only sane way to deal with diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index 29dbc4b93..a537b7fca 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -986,6 +986,7 @@ void XmlTree::cmd_delete_node() g_assert(selected_repr != NULL); sp_repr_unparent(selected_repr); + reinterpret_cast(current_desktop->currentLayer())->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); DocumentUndo::done(current_document, SP_VERB_DIALOG_XML_EDITOR, Q_("nodeAsInXMLinHistoryDialog|Delete node")); } -- cgit v1.2.3 From 5a6b3ffac5aa76386cc2c2db8bd8952a8325b488 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sat, 20 Apr 2013 20:16:01 -0400 Subject: Remove GLib error and remove some cruft (bzr r12286) --- src/ui/clipboard.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index f2b9fb02a..72ddd90a9 100644 --- a/src/ui/clipboard.cpp +++ b/src/ui/clipboard.cpp @@ -332,6 +332,10 @@ void ClipboardManagerImpl::copySymbol(Inkscape::XML::Node* symbol, gchar const* use->setAttribute("style", style ); _root->appendChild(use); + // This min and max sets offsets, we don't have any so set to zero. + sp_repr_set_point(_clipnode, "min", Geom::Point(0,0)); + sp_repr_set_point(_clipnode, "max", Geom::Point(0,0)); + fit_canvas_to_drawing(_clipboardSPDoc); _setClipboardTargets(); } @@ -767,14 +771,6 @@ void ClipboardManagerImpl::_copyUsedDefs(SPItem *item) } } - // Copy symbols: We may want to be more clever... - // if (SP_IS_USE(item)) { - // SPObject *symbol = SP_USE(item)->child; - // if( symbol && SP_IS_SYMBOL(symbol) ) { - // _copyNode(symbol->getRepr(), _doc, _defs); - // } - // } - // recurse for (SPObject *o = item->children ; o != NULL ; o = o->next) { if (SP_IS_ITEM(o)) { -- cgit v1.2.3 From 5ceb89e41d788ae9ed18b972cedbbfcb923ddc27 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sat, 20 Apr 2013 20:34:35 -0400 Subject: Throw better error when attribute isn't available (bzr r12288) --- src/xml/repr-util.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp index 6ea20b87a..8c8425de0 100644 --- a/src/xml/repr-util.cpp +++ b/src/xml/repr-util.cpp @@ -524,6 +524,8 @@ unsigned int sp_repr_get_point(Inkscape::XML::Node *repr, gchar const *key, Geom gchar const *v = repr->attribute(key); + g_return_val_if_fail(v != NULL, FALSE); + gchar ** strarray = g_strsplit(v, ",", 2); if (strarray && strarray[0] && strarray[1]) { -- cgit v1.2.3 From 03e576fe99bb820f758ad3075459e43e26dff7f6 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sat, 20 Apr 2013 21:03:36 -0400 Subject: Output attributes as lengths instead of doubles. Fixed bugs: - https://launchpad.net/bugs/1107924 (bzr r12289) --- src/sp-use.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/sp-use.cpp b/src/sp-use.cpp index d5b3c004a..6fd7c6970 100644 --- a/src/sp-use.cpp +++ b/src/sp-use.cpp @@ -30,6 +30,7 @@ #include "uri.h" #include "print.h" #include "xml/repr.h" +#include "svg/svg.h" #include "preferences.h" #include "style.h" #include "sp-symbol.h" @@ -238,8 +239,9 @@ sp_use_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML:: sp_repr_set_svg_double(repr, "x", use->x.computed); sp_repr_set_svg_double(repr, "y", use->y.computed); - sp_repr_set_svg_double(repr, "width", use->width.computed); - sp_repr_set_svg_double(repr, "height", use->height.computed); + + repr->setAttribute("width", sp_svg_length_write_with_units(use->width).c_str()); + repr->setAttribute("height", sp_svg_length_write_with_units(use->height).c_str()); if (use->ref->getURI()) { gchar *uri_string = use->ref->getURI()->toString(); -- cgit v1.2.3 From 2905b594387d7f4c5d2618d45a1759c2f57abb8d Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sat, 20 Apr 2013 21:33:45 -0400 Subject: Warn if we get a NULL object Fixed bugs: - https://launchpad.net/bugs/1104326 (bzr r12290) --- src/ui/dialog/symbols.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp index 4eeb1b5f0..46dbcaae6 100644 --- a/src/ui/dialog/symbols.cpp +++ b/src/ui/dialog/symbols.cpp @@ -484,10 +484,8 @@ void SymbolsDialog::get_symbols() { } GSList* SymbolsDialog::symbols_in_doc_recursive (SPObject *r, GSList *l) -{ - if (!r) { - return l; - } +{ + g_return_val_if_fail(r != NULL, l); // Stop multiple counting of same symbol if( SP_IS_USE(r) ) { -- cgit v1.2.3 From bbe7c2c6760dc21615800ea0ce89c0c58608fc20 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sun, 21 Apr 2013 00:20:25 -0400 Subject: Clean up symbol pixmap generator and title description (bzr r12291) --- src/sp-use.cpp | 7 +++--- src/ui/dialog/symbols.cpp | 58 ++++++++++++++++++++--------------------------- src/ui/dialog/symbols.h | 5 ++-- 3 files changed, 29 insertions(+), 41 deletions(-) diff --git a/src/sp-use.cpp b/src/sp-use.cpp index 6fd7c6970..2220b4b47 100644 --- a/src/sp-use.cpp +++ b/src/sp-use.cpp @@ -299,10 +299,9 @@ sp_use_description(SPItem *item) if (use->child) { if( SP_IS_SYMBOL( use->child ) ) { - //char *symbol_desc = SP_ITEM(use->child)->description(); - //g_free(symbol_desc); - return g_strdup(_("Clone of Symbol")); - //return g_strdup_printf(_("Clone of Symbol: %s"), symbol_desc ); + char *symbol_desc = SP_ITEM(use->child)->title(); + return g_strdup_printf(_("'%s' Symbol"), symbol_desc ); + g_free(symbol_desc); } static unsigned recursion_depth = 0; diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp index 46dbcaae6..57e2e7285 100644 --- a/src/ui/dialog/symbols.cpp +++ b/src/ui/dialog/symbols.cpp @@ -557,32 +557,32 @@ gchar const* SymbolsDialog::style_from_use( gchar const* id, SPDocument* documen void SymbolsDialog::draw_symbols( SPDocument* symbolDocument ) { - - SymbolColumns* columns = getColumns(); - GSList* l = symbols_in_doc( symbolDocument ); for( ; l != NULL; l = l->next ) { - SPObject* symbol = SP_OBJECT(l->data); - if (!SP_IS_SYMBOL(symbol)) { - //std::cout << " Error: not symbol" << std::endl; - continue; + if (SP_IS_SYMBOL(symbol)) { + draw_symbol( symbol ); } + } +} - gchar const *id = symbol->getRepr()->attribute("id"); - gchar const *title = symbol->title(); // From title element - if( !title ) { - title = id; - } +void SymbolsDialog::draw_symbol( SPObject* symbol ) { - Glib::RefPtr pixbuf = create_symbol_image(id, symbolDocument, &renderDrawing, key ); - if( pixbuf ) { + SymbolColumns* columns = getColumns(); - Gtk::ListStore::iterator row = store->append(); - (*row)[columns->symbol_id] = Glib::ustring( id ); - (*row)[columns->symbol_title] = Glib::ustring( title ); - (*row)[columns->symbol_image] = pixbuf; - } + gchar const *id = symbol->getRepr()->attribute("id"); + gchar const *title = symbol->title(); // From title element + if( !title ) { + title = id; + } + + Glib::RefPtr pixbuf = create_symbol_image(id, symbol ); + + if( pixbuf ) { + Gtk::ListStore::iterator row = store->append(); + (*row)[columns->symbol_id] = Glib::ustring( id ); + (*row)[columns->symbol_title] = Glib::ustring( title ); + (*row)[columns->symbol_image] = pixbuf; } delete columns; @@ -598,18 +598,8 @@ void SymbolsDialog::draw_symbols( SPDocument* symbolDocument ) { * the temporary document is rendered. */ Glib::RefPtr -SymbolsDialog::create_symbol_image(gchar const *symbol_id, - SPDocument *source, - Inkscape::Drawing* drawing, - unsigned /*visionkey*/) +SymbolsDialog::create_symbol_image(gchar const *symbol_id, SPObject *symbol) { - // Retrieve the symbol named 'symbol_id' from the source SVG document - SPObject const* symbol = source->getObjectById(symbol_id); - if (symbol == NULL) { - //std::cout << " Failed to find symbol: " << symbol_id << std::endl; - //return 0; - } - // Create a copy repr of the symbol with id="the_symbol" Inkscape::XML::Document *xml_doc = previewDocument->getReprDoc(); Inkscape::XML::Node *repr = symbol->getRepr()->duplicate(xml_doc); @@ -626,10 +616,10 @@ SymbolsDialog::create_symbol_image(gchar const *symbol_id, gchar const* style = repr->attribute("inkscape:symbol-style"); if( !style ) { // If no default style in , look in documents. - if( source == currentDocument ) { - style = style_from_use( symbol_id, source ); + if( symbol->document == currentDocument ) { + style = style_from_use( symbol_id, symbol->document ); } else { - style = source->getReprRoot()->attribute("style"); + style = symbol->document->getReprRoot()->attribute("style"); } } // Last ditch effort to provide some default styling @@ -719,7 +709,7 @@ SymbolsDialog::create_symbol_image(gchar const *symbol_id, scale = atof( previewScaleString.c_str() ); } - pixbuf = Glib::wrap(render_pixbuf(*drawing, scale, *dbox, psize)); + pixbuf = Glib::wrap(render_pixbuf(renderDrawing, scale, *dbox, psize)); svg_preview_cache.set_preview_in_cache(key, pixbuf->gobj()); } diff --git a/src/ui/dialog/symbols.h b/src/ui/dialog/symbols.h index 08221bf22..2d408386f 100644 --- a/src/ui/dialog/symbols.h +++ b/src/ui/dialog/symbols.h @@ -51,6 +51,7 @@ private: void get_symbols(); void draw_symbols( SPDocument* symbol_document ); + void draw_symbol( SPObject* symbol_document ); SPDocument* symbols_preview_doc(); GSList* symbols_in_doc_recursive(SPObject *r, GSList *l); @@ -60,9 +61,7 @@ private: gchar const* style_from_use( gchar const* id, SPDocument* document); Glib::RefPtr - create_symbol_image(gchar const *symbol_name, - SPDocument *source, Inkscape::Drawing* drawing, - unsigned /*visionkey*/); + create_symbol_image(gchar const *symbol_name, SPObject *symbol); /* Keep track of all symbol template documents */ std::map symbolSets; -- cgit v1.2.3 From dfbdcb6c821304d7959b43bd5d04e67e19f265c7 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sun, 21 Apr 2013 00:28:43 -0400 Subject: Fix symbols not being installed bug reported by suv (bzr r12292) --- share/symbols/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/symbols/Makefile.am b/share/symbols/Makefile.am index 357c73ca5..7ade18976 100644 --- a/share/symbols/Makefile.am +++ b/share/symbols/Makefile.am @@ -1,5 +1,7 @@ symbolsdir = $(datadir)/inkscape/symbols -EXTRA_DIST = $(wildcard *.svg) +symbols_DATA = $(wildcard *.svg) + +EXTRA_DIST = $(symbols_DATA) -- cgit v1.2.3 From 8d793593fff1737c91b76f820e1b4aa021897cee Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Sun, 21 Apr 2013 11:56:09 +0200 Subject: cppcheck (bzr r12293) --- src/color-profile.cpp | 6 +- src/color.cpp | 4 +- src/dom/util/ziptool.cpp | 26 +++++--- src/snapped-point.cpp | 163 ++++++++++++++++++++++++++--------------------- 4 files changed, 109 insertions(+), 90 deletions(-) diff --git a/src/color-profile.cpp b/src/color-profile.cpp index 14f88c77e..5fb84d8ac 100644 --- a/src/color-profile.cpp +++ b/src/color-profile.cpp @@ -619,8 +619,6 @@ cmsHTRANSFORM ColorProfile::getTransfGamutCheck() bool ColorProfile::GamutCheck(SPColor color) { - bool result = false; - guint32 val = color.toRGBA32(0); #if HAVE_LIBLCMS1 @@ -651,9 +649,7 @@ bool ColorProfile::GamutCheck(SPColor color) cmsSetAlarmCodes(oldAlarmCodes); #endif // HAVE_LIBLCMS1 - result = (outofgamut != 0); - - return result; + return (outofgamut != 0); } class ProfileInfo diff --git a/src/color.cpp b/src/color.cpp index 0a07d3f21..5eb0d91ef 100644 --- a/src/color.cpp +++ b/src/color.cpp @@ -99,9 +99,7 @@ bool SPColor::operator == (SPColor const& other) const */ bool SPColor::isClose( SPColor const& other, float epsilon ) const { - bool match = false; - - match = (fabs((v.c[0]) - (other.v.c[0])) < epsilon) + bool match = (fabs((v.c[0]) - (other.v.c[0])) < epsilon) && (fabs((v.c[1]) - (other.v.c[1])) < epsilon) && (fabs((v.c[2]) - (other.v.c[2])) < epsilon); diff --git a/src/dom/util/ziptool.cpp b/src/dom/util/ziptool.cpp index 9d9d5685c..cf024008f 100644 --- a/src/dom/util/ziptool.cpp +++ b/src/dom/util/ziptool.cpp @@ -1895,24 +1895,30 @@ bool GzipFile::readFile(const std::string &fileName) /** * Constructor */ -ZipEntry::ZipEntry() +ZipEntry::ZipEntry() : + crc (0L), + fileName (), + comment (), + compressionMethod (8), + compressedData (), + uncompressedData (), + position (0) { - crc = 0L; - compressionMethod = 8; - position = 0; } /** * */ ZipEntry::ZipEntry(const std::string &fileNameArg, - const std::string &commentArg) + const std::string &commentArg) : + crc (0L), + fileName (fileNameArg), + comment (commentArg), + compressionMethod (8), + compressedData (), + uncompressedData (), + position (0) { - crc = 0L; - compressionMethod = 8; - fileName = fileNameArg; - comment = commentArg; - position = 0; } /** diff --git a/src/snapped-point.cpp b/src/snapped-point.cpp index d155babd7..ca45410c5 100644 --- a/src/snapped-point.cpp +++ b/src/snapped-point.cpp @@ -14,92 +14,111 @@ #include "preferences.h" // overloaded constructor -Inkscape::SnappedPoint::SnappedPoint(Geom::Point const &p, SnapSourceType const &source, long source_num, SnapTargetType const &target, Geom::Coord const &d, Geom::Coord const &t, bool const &a, bool const &constrained_snap, bool const &fully_constrained, Geom::OptRect target_bbox) - : _point(p), _source(source), _source_num(source_num), _target(target), _distance(d), _tolerance(std::max(t,1.0)), _always_snap(a), _target_bbox(target_bbox) +Inkscape::SnappedPoint::SnappedPoint(Geom::Point const &p, SnapSourceType const &source, long source_num, SnapTargetType const &target, Geom::Coord const &d, Geom::Coord const &t, bool const &a, bool const &constrained_snap, bool const &fully_constrained, Geom::OptRect target_bbox) : + _point(p), + _tangent(Geom::Point(0,0)), + _source(source), + _source_num(source_num), + _target(target), + _at_intersection (false), + _constrained_snap (constrained_snap), + _fully_constrained (fully_constrained), + _distance(d), + _tolerance(std::max(t,1.0)),// tolerance should never be smaller than 1 px, as it is used for normalization in isOtherSnapBetter. We don't want a division by zero. + _always_snap(a), + _second_distance (Geom::infinity()), + _second_tolerance (1), + _second_always_snap (false), + _transformation (Geom::Point(1,1)), + _target_bbox(target_bbox), + _pointer_distance (Geom::infinity()) { - // tolerance should never be smaller than 1 px, as it is used for normalization in isOtherSnapBetter. We don't want a division by zero. - _at_intersection = false; - _constrained_snap = constrained_snap; - _fully_constrained = fully_constrained; - _second_distance = Geom::infinity(); - _second_tolerance = 1; - _second_always_snap = false; - _transformation = Geom::Point(1,1); - _tangent = Geom::Point(0,0); - _pointer_distance = Geom::infinity(); } -Inkscape::SnappedPoint::SnappedPoint(Inkscape::SnapCandidatePoint const &p, SnapTargetType const &target, Geom::Coord const &d, Geom::Coord const &t, bool const &a, bool const &constrained_snap, bool const &fully_constrained) - : _target(target), _distance(d), _tolerance(std::max(t,1.0)), _always_snap(a) +Inkscape::SnappedPoint::SnappedPoint(Inkscape::SnapCandidatePoint const &p, SnapTargetType const &target, Geom::Coord const &d, Geom::Coord const &t, bool const &a, bool const &constrained_snap, bool const &fully_constrained) : + _point (p.getPoint()), + _tangent (Geom::Point(0,0)), + _source (p.getSourceType()), + _source_num (p.getSourceNum()), + _target(target), + _at_intersection (false), + _constrained_snap (constrained_snap), + _fully_constrained (fully_constrained), + _distance(d), + _tolerance(std::max(t,1.0)), + _always_snap(a), + _second_distance (Geom::infinity()), + _second_tolerance (1), + _second_always_snap (false), + _transformation (Geom::Point(1,1)), + _target_bbox (p.getTargetBBox()), + _pointer_distance (Geom::infinity()) { - _point = p.getPoint(); - _source = p.getSourceType(); - _source_num = p.getSourceNum(); - _at_intersection = false; - _constrained_snap = constrained_snap; - _fully_constrained = fully_constrained; - _second_distance = Geom::infinity(); - _second_tolerance = 1; - _second_always_snap = false; - _transformation = Geom::Point(1,1); - _tangent = Geom::Point(0,0); - _pointer_distance = Geom::infinity(); - _target_bbox = p.getTargetBBox(); - } -Inkscape::SnappedPoint::SnappedPoint(Geom::Point const &p, SnapSourceType const &source, long source_num, SnapTargetType const &target, Geom::Coord const &d, Geom::Coord const &t, bool const &a, bool const &at_intersection, bool const &constrained_snap, bool const &fully_constrained, Geom::Coord const &d2, Geom::Coord const &t2, bool const &a2) - : _point(p), _source(source), _source_num(source_num), _target(target), _at_intersection(at_intersection), _constrained_snap(constrained_snap), _fully_constrained(fully_constrained), _distance(d), _tolerance(std::max(t,1.0)), _always_snap(a), - _second_distance(d2), _second_tolerance(std::max(t2,1.0)), _second_always_snap(a2) -{ +Inkscape::SnappedPoint::SnappedPoint(Geom::Point const &p, SnapSourceType const &source, long source_num, SnapTargetType const &target, Geom::Coord const &d, Geom::Coord const &t, bool const &a, bool const &at_intersection, bool const &constrained_snap, bool const &fully_constrained, Geom::Coord const &d2, Geom::Coord const &t2, bool const &a2) : + _point(p), + _tangent (Geom::Point(0,0)), + _source(source), + _source_num(source_num), + _target(target), + _at_intersection(at_intersection), + _constrained_snap(constrained_snap), + _fully_constrained(fully_constrained), + _distance(d), + _tolerance(std::max(t,1.0)), + _always_snap(a), + _second_distance(d2), + _second_tolerance(std::max(t2,1.0)), + _second_always_snap(a2), // tolerance should never be smaller than 1 px, as it is used for normalization in // isOtherSnapBetter. We don't want a division by zero. - _transformation = Geom::Point(1,1); - _tangent = Geom::Point(0,0); - _pointer_distance = Geom::infinity(); - _target_bbox = Geom::OptRect(); + _transformation (Geom::Point(1,1)), + _pointer_distance (Geom::infinity()), + _target_bbox (Geom::OptRect()) +{ } -Inkscape::SnappedPoint::SnappedPoint() +Inkscape::SnappedPoint::SnappedPoint(): + _point (Geom::Point(0,0)), + _tangent (Geom::Point(0,0)), + _source (SNAPSOURCE_UNDEFINED), + _source_num (-1), + _target (SNAPTARGET_UNDEFINED), + _at_intersection (false), + _constrained_snap (false), + _fully_constrained (false), + _distance (Geom::infinity()), + _tolerance (1), + _always_snap (false), + _second_distance (Geom::infinity()), + _second_tolerance (1), + _second_always_snap (false), + _transformation (Geom::Point(1,1)), + _pointer_distance (Geom::infinity()), + _target_bbox (Geom::OptRect()) { - _point = Geom::Point(0,0); - _source = SNAPSOURCE_UNDEFINED, - _source_num = -1, - _target = SNAPTARGET_UNDEFINED, - _at_intersection = false; - _constrained_snap = false; - _fully_constrained = false; - _distance = Geom::infinity(); - _tolerance = 1; - _always_snap = false; - _second_distance = Geom::infinity(); - _second_tolerance = 1; - _second_always_snap = false; - _transformation = Geom::Point(1,1); - _tangent = Geom::Point(0,0); - _pointer_distance = Geom::infinity(); - _target_bbox = Geom::OptRect(); } -Inkscape::SnappedPoint::SnappedPoint(Geom::Point const &p) +Inkscape::SnappedPoint::SnappedPoint(Geom::Point const &p): + _point (p), + _tangent (Geom::Point(0,0)), + _source (SNAPSOURCE_UNDEFINED), + _source_num (-1), + _target (SNAPTARGET_UNDEFINED), + _at_intersection (false), + _constrained_snap (false), + _fully_constrained (false), + _distance (Geom::infinity()), + _tolerance (1), + _always_snap (false), + _second_distance (Geom::infinity()), + _second_tolerance (1), + _second_always_snap (false), + _transformation (Geom::Point(1,1)), + _pointer_distance (Geom::infinity()), + _target_bbox (Geom::OptRect()) { - _point = p; - _source = SNAPSOURCE_UNDEFINED, - _source_num = -1, - _target = SNAPTARGET_UNDEFINED, - _at_intersection = false; - _constrained_snap = false; - _fully_constrained = false; - _distance = Geom::infinity(); - _tolerance = 1; - _always_snap = false; - _second_distance = Geom::infinity(); - _second_tolerance = 1; - _second_always_snap = false; - _transformation = Geom::Point(1,1); - _tangent = Geom::Point(0,0); - _pointer_distance = Geom::infinity(); - _target_bbox = Geom::OptRect(); } Inkscape::SnappedPoint::~SnappedPoint() -- cgit v1.2.3 From f35dbafd9a8dd77dbda1e5f51596c2c68ed2acdb Mon Sep 17 00:00:00 2001 From: John Smith Date: Sun, 21 Apr 2013 22:19:40 +0900 Subject: Fix for 600285 : Zoom slider (bzr r12294) --- src/widgets/desktop-widget.cpp | 20 ++++++++++++++------ src/widgets/widget-sizes.h | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 4af7c0795..ca76cb568 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -55,6 +55,7 @@ #include "ui/widget/dock.h" #include "ui/widget/layer-selector.h" #include "ui/widget/selected-style.h" +#include "ui/widget/gimpspinscale.h" #include "ui/uxmanager.h" #include "util/ege-appear-time-tracker.h" #include "sp-root.h" @@ -628,7 +629,14 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) gtk_box_pack_end (GTK_BOX (dtw->statusbar), statusbar_tail, FALSE, FALSE, 0); // zoom status spinbutton - dtw->zoom_status = gtk_spin_button_new_with_range (log(SP_DESKTOP_ZOOM_MIN)/log(2), log(SP_DESKTOP_ZOOM_MAX)/log(2), 0.1); +#if WITH_GTKMM_3_0 + Glib::RefPtr _adjustment = Gtk::Adjustment::create(100.0, log(SP_DESKTOP_ZOOM_MIN)/log(2), log(SP_DESKTOP_ZOOM_MAX)/log(2), 0.1, 1.0); +#else + Gtk::Adjustment *_adjustment = new Gtk::Adjustment(100.0, log(SP_DESKTOP_ZOOM_MIN)/log(2), log(SP_DESKTOP_ZOOM_MAX)/log(2), 0.1, 1.0); +#endif + dtw->zoom_status = gimp_spin_scale_new (_adjustment->gobj(), _("Zoom"), 1); + + //dtw->zoom_status = gtk_spin_button_new_with_range (log(SP_DESKTOP_ZOOM_MIN)/log(2), log(SP_DESKTOP_ZOOM_MAX)/log(2), 0.1); gtk_widget_set_tooltip_text (dtw->zoom_status, _("Zoom")); gtk_widget_set_size_request (dtw->zoom_status, STATUS_ZOOM_WIDTH, -1); gtk_entry_set_width_chars (GTK_ENTRY (dtw->zoom_status), 6); @@ -689,18 +697,18 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) dtw->coord_status_y = gtk_label_new(NULL); gtk_label_set_markup( GTK_LABEL(dtw->coord_status_y), " 0.00 " ); gtk_misc_set_alignment (GTK_MISC(dtw->coord_status_y), 1.0, 0.5); - GtkWidget* label_z = gtk_label_new(_("Z:")); + //GtkWidget* label_z = gtk_label_new(_("Z:")); #if GTK_CHECK_VERSION(3,0,0) gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->coord_status_x, 2, 0, 1, 1); gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->coord_status_y, 2, 1, 1, 1); - gtk_grid_attach(GTK_GRID(dtw->coord_status), label_z, 3, 0, 1, 2); - gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->zoom_status, 4, 0, 1, 2); + //gtk_grid_attach(GTK_GRID(dtw->coord_status), label_z, 3, 0, 1, 2); + gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->zoom_status, 3, 0, 1, 2); #else gtk_table_attach(GTK_TABLE(dtw->coord_status), dtw->coord_status_x, 2,3, 0,1, GTK_FILL, GTK_FILL, 0, 0); gtk_table_attach(GTK_TABLE(dtw->coord_status), dtw->coord_status_y, 2,3, 1,2, GTK_FILL, GTK_FILL, 0, 0); - gtk_table_attach(GTK_TABLE(dtw->coord_status), label_z, 3,4, 0,2, GTK_FILL, GTK_FILL, 0, 0); - gtk_table_attach(GTK_TABLE(dtw->coord_status), dtw->zoom_status, 4,5, 0,2, GTK_FILL, GTK_FILL, 0, 0); + //gtk_table_attach(GTK_TABLE(dtw->coord_status), label_z, 3,4, 0,2, GTK_FILL, GTK_FILL, 0, 0); + gtk_table_attach(GTK_TABLE(dtw->coord_status), dtw->zoom_status, 3,4, 0,2, GTK_FILL, GTK_FILL, 0, 0); #endif sp_set_font_size_smaller (dtw->coord_status); diff --git a/src/widgets/widget-sizes.h b/src/widgets/widget-sizes.h index 87c7ca2e0..8db036734 100644 --- a/src/widgets/widget-sizes.h +++ b/src/widgets/widget-sizes.h @@ -27,7 +27,7 @@ #define STATUS_BAR_FONT_SIZE 10000 -#define STATUS_ZOOM_WIDTH 57 +#define STATUS_ZOOM_WIDTH 100 #define SELECTED_STYLE_SB_WIDTH 48 #define SELECTED_STYLE_WIDTH 190 -- cgit v1.2.3 From 3373e6b43bd3c9eab5f2af81b4a175a250fbc025 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Sun, 21 Apr 2013 17:39:16 +0200 Subject: Fix for Bug #1023797 (Unnecessary scroll bars in swatches dialog) by Slagvi. Fixed bugs: - https://launchpad.net/bugs/1023797 (bzr r12295) --- src/ui/previewholder.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp index b5a1a29a8..38f6f353f 100644 --- a/src/ui/previewholder.cpp +++ b/src/ui/previewholder.cpp @@ -50,6 +50,8 @@ PreviewHolder::PreviewHolder() : _border(BORDER_NONE) { _scroller = manage(new Gtk::ScrolledWindow()); + ((Gtk::ScrolledWindow *)_scroller)->set_policy(Gtk::POLICY_AUTOMATIC, + Gtk::POLICY_AUTOMATIC); #if WITH_GTKMM_3_0 _insides = manage(new Gtk::Grid()); -- cgit v1.2.3 From bf90914fb7f9cef4691c9371ab86200ae8e985b0 Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Sun, 21 Apr 2013 21:04:13 +0200 Subject: fix warnings (bzr r12296) --- src/snapped-point.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/snapped-point.cpp b/src/snapped-point.cpp index ca45410c5..ab545bd5f 100644 --- a/src/snapped-point.cpp +++ b/src/snapped-point.cpp @@ -74,8 +74,8 @@ Inkscape::SnappedPoint::SnappedPoint(Geom::Point const &p, SnapSourceType const // tolerance should never be smaller than 1 px, as it is used for normalization in // isOtherSnapBetter. We don't want a division by zero. _transformation (Geom::Point(1,1)), - _pointer_distance (Geom::infinity()), - _target_bbox (Geom::OptRect()) + _target_bbox (Geom::OptRect()), + _pointer_distance (Geom::infinity()) { } @@ -95,8 +95,8 @@ Inkscape::SnappedPoint::SnappedPoint(): _second_tolerance (1), _second_always_snap (false), _transformation (Geom::Point(1,1)), - _pointer_distance (Geom::infinity()), - _target_bbox (Geom::OptRect()) + _target_bbox (Geom::OptRect()), + _pointer_distance (Geom::infinity()) { } @@ -116,8 +116,8 @@ Inkscape::SnappedPoint::SnappedPoint(Geom::Point const &p): _second_tolerance (1), _second_always_snap (false), _transformation (Geom::Point(1,1)), - _pointer_distance (Geom::infinity()), - _target_bbox (Geom::OptRect()) + _target_bbox (Geom::OptRect()), + _pointer_distance (Geom::infinity()) { } -- cgit v1.2.3 From 370881548b1d8f65def9aa03254316aa22c3b670 Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Mon, 22 Apr 2013 14:19:57 +0200 Subject: define booleans as booleans (prevent future errors in comparisons) (bzr r12297) --- src/style.cpp | 2 +- src/style.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/style.cpp b/src/style.cpp index ca89e6f65..479f30597 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -4358,7 +4358,7 @@ sp_style_write_ifilter(gchar *p, gint const len, gchar const *key, } SPIPaint::SPIPaint() : - set(0), + set(false), inherit(0), currentcolor(0), colorSet(0), diff --git a/src/style.h b/src/style.h index 534a6ae70..f456eaa61 100644 --- a/src/style.h +++ b/src/style.h @@ -136,11 +136,11 @@ struct SPILength { /// Paint type internal to SPStyle. struct SPIPaint { - unsigned set : 1; - unsigned inherit : 1; - unsigned currentcolor : 1; - unsigned int colorSet : 1; - unsigned int noneSet : 1; + bool set; //todo check if other properties are also booleans + unsigned inherit; + unsigned currentcolor; + unsigned int colorSet; + unsigned int noneSet; struct { SPPaintServerReference *href; SPColor color; -- cgit v1.2.3 From 3c5cd145660b50b8b96bfa8c22bd6b28d72e452c Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Mon, 22 Apr 2013 10:58:19 -0400 Subject: Add balloon symbols and connect defs modified signal. Fixed bugs: - https://launchpad.net/bugs/1170817 (bzr r12298) --- share/symbols/BalloonSymbols.svg | 128 +++++++++++++++++++++++++++++++++++++++ src/selection-chemistry.cpp | 8 +-- src/ui/dialog/symbols.cpp | 17 +++++- src/ui/dialog/symbols.h | 3 +- 4 files changed, 146 insertions(+), 10 deletions(-) create mode 100644 share/symbols/BalloonSymbols.svg diff --git a/share/symbols/BalloonSymbols.svg b/share/symbols/BalloonSymbols.svg new file mode 100644 index 000000000..8c7e840e2 --- /dev/null +++ b/share/symbols/BalloonSymbols.svg @@ -0,0 +1,128 @@ + + + + +Word Balloons + + +Exclaim Balloon + + + +Exclaim Balloon!! + +Speaking Dream + + + + + +Dream Speaking + + +Squared Balloon + + + + + +Squared Balloon + + +Rounded Balloon + + + + + +Rounded Balloon + + +Cricle Balloon + + + + + +Circle Balloon + + +Hip Balloon + + + + + +Hip Balloon + + +Electronic Balloon + + + + + +Over the Phone + + +Thought Balloon + + + + + +Think Balloon + + + + + + + + +image/svg+xml + +Word Balloons +2013-04-22 + + +Martin Owens + + + + +Public Domain + + +English + + +word +balloon +comic +cartoon +speach +exclaim + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index fc410897a..28dd51e81 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -2973,7 +2973,6 @@ void sp_selection_symbol(SPDesktop *desktop, bool /*apply*/ ) */ void sp_selection_unsymbol(SPDesktop *desktop) { - if (desktop == NULL) { return; } @@ -2992,13 +2991,8 @@ void sp_selection_unsymbol(SPDesktop *desktop) SPObject* use = selection->single(); // Make sure we have only one object in selection. - if( use == NULL ) { - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select only one symbol to convert to group.")); - return; - } - // Require that we really have a that references a . - if( !SP_IS_USE( use ) && !SP_IS_SYMBOL( use->firstChild() ) ) { + if( use == NULL || ( !SP_IS_USE( use ) && !SP_IS_SYMBOL( use->firstChild() ))) { desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select only one symbol to convert to group.")); return; } diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp index 57e2e7285..989375bbd 100644 --- a/src/ui/dialog/symbols.cpp +++ b/src/ui/dialog/symbols.cpp @@ -49,6 +49,7 @@ #include "inkscape.h" #include "sp-root.h" #include "sp-use.h" +#include "sp-defs.h" #include "sp-symbol.h" #ifdef WITH_LIBVISIO @@ -246,12 +247,19 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) : key = SPItem::display_key_new(1); renderDrawing.setRoot(previewDocument->getRoot()->invoke_show(renderDrawing, key, SP_ITEM_SHOW_DISPLAY )); + // This might need to be a global variable so setTargetDesktop can modify it + SPDefs *defs = currentDocument->getDefs(); + sigc::connection defsModifiedConn = (SP_OBJECT(defs))->connectModified( + sigc::mem_fun(*this, &SymbolsDialog::defsModified)); + instanceConns.push_back(defsModifiedConn); + get_symbols(); draw_symbols( currentDocument ); /* Defaults to current document */ - desktopChangeConn = + sigc::connection desktopChangeConn = deskTrack.connectDesktopChanged( sigc::mem_fun(*this, &SymbolsDialog::setTargetDesktop) ); instanceConns.push_back( desktopChangeConn ); + deskTrack.connect(GTK_WIDGET(gobj())); } @@ -304,6 +312,13 @@ void SymbolsDialog::iconDragDataGet(const Glib::RefPtr& /*cont } +void SymbolsDialog::defsModified(SPObject *object, guint flags) +{ + if ( !symbolSets[symbolSet->get_active_text()] ) { + rebuild(); + } +} + void SymbolsDialog::iconChanged() { #if WITH_GTKMM_3_0 std::vector iconArray = iconView->get_selected_items(); diff --git a/src/ui/dialog/symbols.h b/src/ui/dialog/symbols.h index 2d408386f..b81f6981e 100644 --- a/src/ui/dialog/symbols.h +++ b/src/ui/dialog/symbols.h @@ -46,6 +46,7 @@ private: static SymbolColumns *getColumns(); void rebuild(); + void defsModified(SPObject *object, guint flags); void iconChanged(); void iconDragDataGet(const Glib::RefPtr& context, Gtk::SelectionData& selection_data, guint info, guint time); @@ -84,8 +85,6 @@ private: Inkscape::Drawing renderDrawing; std::vector instanceConns; - sigc::connection desktopChangeConn; - }; } //namespace Dialogs -- cgit v1.2.3 From fcb08f0f63d3fc0d539472fa06ef39bd2fceaca9 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Mon, 22 Apr 2013 21:15:57 -0400 Subject: Allow out of src building for wildcard Makes Fixed bugs: - https://launchpad.net/bugs/1170803 (bzr r12299) --- share/symbols/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/symbols/Makefile.am b/share/symbols/Makefile.am index 7ade18976..5ddaac706 100644 --- a/share/symbols/Makefile.am +++ b/share/symbols/Makefile.am @@ -1,7 +1,8 @@ symbolsdir = $(datadir)/inkscape/symbols -symbols_DATA = $(wildcard *.svg) +# Adding srcdir allows out-of-src builds to work +symbols_DATA = $(wildcard $(srcdir)/*.svg) EXTRA_DIST = $(symbols_DATA) -- cgit v1.2.3 From a40d9996c9252ebf79b951e0023340870f0347af Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Tue, 23 Apr 2013 13:40:15 -0400 Subject: Allow multiple groups to be symbolised and replace groups with clones. (bzr r12300) --- src/selection-chemistry.cpp | 70 ++++++++++++++++++++++++++------------------- src/selection-chemistry.h | 3 +- src/verbs.cpp | 2 +- 3 files changed, 44 insertions(+), 31 deletions(-) diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index 28dd51e81..beafc59a5 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -2892,45 +2892,52 @@ void sp_selection_to_guides(SPDesktop *desktop) /* * Convert to , leaving all elements referencing group unchanged. */ -void sp_selection_symbol(SPDesktop *desktop, bool /*apply*/ ) +void sp_selection_symbols(SPDesktop *desktop, bool /*apply*/ ) { - if (desktop == NULL) { return; } SPDocument *doc = sp_desktop_document(desktop); - Inkscape::XML::Document *xml_doc = doc->getReprDoc(); + doc->ensureUpToDate(); Inkscape::Selection *selection = sp_desktop_selection(desktop); // Check if something is selected. if (selection->isEmpty()) { - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select one group to convert to symbol.")); - return; + desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select groups to convert to symbols.")); + return; } - SPObject* group = selection->single(); + GSList *items = g_slist_copy(const_cast(selection->list())); + bool hasWorked = false; - // Make sure we have only one object in selection. - if( group == NULL ) { - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select only one group to convert to symbol.")); - return; - } + for ( GSList const *iter=items; iter != NULL ; iter = iter->next ) { + SPObject *object = reinterpret_cast( iter->data ); - // Make sure we convert the original. - if( SP_IS_USE( group ) ) { - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select original (Shift+D) to convert to symbol.")); - return; + // Require that we really have a group. + if( SP_IS_GROUP( object ) ) { + sp_selection_symbol( doc, object ); + hasWorked = true; + } } - // Require that we really have a group. - if( !SP_IS_GROUP( group ) ) { - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Group selection first to convert to symbol.")); - return; + g_slist_free(items); + + if( !hasWorked ) { + desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("No groups converted to symbols.")); + return; } - doc->ensureUpToDate(); + selection->clear(); + // Group just disappears, nothing to select. + + DocumentUndo::done(doc, SP_VERB_EDIT_SYMBOL, _("Group to symbol")); +} + +void sp_selection_symbol(SPDocument *doc, SPObject *group) +{ + Inkscape::XML::Document *xml_doc = doc->getReprDoc(); Inkscape::XML::Node *symbol = xml_doc->createElement("svg:symbol"); symbol->setAttribute("style", group->getAttribute("style")); @@ -2952,20 +2959,25 @@ void sp_selection_symbol(SPDesktop *desktop, bool /*apply*/ ) // Need to delete ; all elements that referenced should // auto-magically reference . doc->getDefs()->getRepr()->appendChild(symbol); - symbol->setAttribute("id",id.c_str()); // After we delete group with same id. - // Mysterious, must set symbol ID before deleting group or all - // refering to symbol get turned into groups. (Linked to unlinking clones?) - group->deleteObject(true); + // Mysterious, must set symbol ID before deleting group or all items + // get turned into groups. (Linked to unlinking clones?) + symbol->setAttribute("id",id.c_str()); - Inkscape::GC::release(symbol); - selection->clear(); - // Group just disappears, nothing to select. + // Create a clone of the symbol to replace the deleted group. + Inkscape::XML::Node *clone = xml_doc->createElement("svg:use"); + clone->setAttribute("x", "0", false); + clone->setAttribute("y", "0", false); + clone->setAttribute("xlink:href", g_strdup_printf("#%s", id.c_str()), false); - // Need to signal Symbol dialog to update + clone->setAttribute("inkscape:transform-center-x", group->getAttribute("inkscape:transform-center-x"), false); + clone->setAttribute("inkscape:transform-center-y", group->getAttribute("inkscape:transform-center-y"), false); + group->parent->getRepr()->appendChild(clone); + + group->deleteObject(true); g_slist_free(children); - DocumentUndo::done(doc, SP_VERB_EDIT_SYMBOL, _("Group to symbol")); + Inkscape::GC::release(symbol); } /* diff --git a/src/selection-chemistry.h b/src/selection-chemistry.h index 83dd93bdd..1c627fd1a 100644 --- a/src/selection-chemistry.h +++ b/src/selection-chemistry.h @@ -68,7 +68,8 @@ void sp_selection_clone_original_path_lpe(SPDesktop *desktop); void sp_selection_to_marker(SPDesktop *desktop, bool apply = true); void sp_selection_to_guides(SPDesktop *desktop); -void sp_selection_symbol(SPDesktop *desktop, bool apply = true); +void sp_selection_symbols(SPDesktop *desktop, bool apply = true); +void sp_selection_symbol(SPDocument *doc, SPObject *group); void sp_selection_unsymbol(SPDesktop *desktop); void sp_selection_tile(SPDesktop *desktop, bool apply = true); diff --git a/src/verbs.cpp b/src/verbs.cpp index 4777e168c..ec7cad8dd 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -955,7 +955,7 @@ void EditVerb::perform(SPAction *action, void *data) sp_selection_untile(dt); break; case SP_VERB_EDIT_SYMBOL: - sp_selection_symbol(dt); + sp_selection_symbols(dt); break; case SP_VERB_EDIT_UNSYMBOL: sp_selection_unsymbol(dt); -- cgit v1.2.3 From b74e49733347b36dc7375df6947f819c76e4808c Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Tue, 23 Apr 2013 14:33:06 -0400 Subject: Add MapSymbols from OpenStreetMap. (bzr r12301) --- share/symbols/MapSymbols.svg | 2777 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2777 insertions(+) create mode 100644 share/symbols/MapSymbols.svg diff --git a/share/symbols/MapSymbols.svg b/share/symbols/MapSymbols.svg new file mode 100644 index 000000000..0d3e1b0fa --- /dev/null +++ b/share/symbols/MapSymbols.svg @@ -0,0 +1,2777 @@ + + + + +Map Symbols + + + + +Bed and Breakfast + + + + + + + + + +Youth Hostel + + + + + + + + + +Shelter + + + + + + + + + + + + + + + + + + + + + + + + + + + +Motel + + + + + + + + + + + + + + + + + + + + +Hotel + + + + + + + + + + + + +Hostel + + + + + + + + + + + + + + + + +Chalet + + + + + + + + +Caravan Park + + + + + + + +Camping + + + + + + + + + + +Alpine Hut + + + + + + + + + + + + + + +Bench or Park + + + + + + + + + +Playground + + + + + + + + + + + + + + + +Fountain + + + + + + + + + + + + + + + + + + + + +Library + + + + + + + + + + +Town Hall + + + + + + + + + + + + + + + + + + + + + + + + + + + +Court + + + + + + + + + + + + + + + + +Fire Station / House + + + + + + + + + + + + + + + + + + + + + +Police Station + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Prison + + + + + + + + + + + + + + + + + + + + +Post Office + + + + + + + + + +Public Building + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Recycling + + + + + + + +Survey Point + + + + + + + + + + +Toll Booth + + + + + + + + + + + + + + + + + + + + + + +Lift Gate + + + + + + + + + + + + + + +Steps + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Stile + + + + + + + + + + + + + + +Kissing Gate + + + + + + + + + + + + + + + + + + + + + + +Gate + + + + + + + + + + + + + + +Exit + + + + + + + + + + + + + + + + + + + +Entrance + + + + + + + + + + + + + + + + + +Cycle Barrier + + + + + + + + + + + + + + +Cattle Grid + + + + + + + + + + + + +Bollard + + + + + + + + + + + + + + +University + + + + + + + + + + + + + + + +High/Secondary School + + + + + + + + + +School + + + + + + + + + +Kindergatten + + + + + + + + + + + + + + + + + +Nursery + + + + + + + + + + + + + + + + + + + + +Restaurant + + + + + + + +Pub + + + + + + + +Deserts/Cakes Shop + + + + + + + + + + + + +Fast Food + + + + + + + +Public Tap/Water + + + + + + + + + + + + + + + +Cafe + + + + + + + +Beer Garden + + + + + + + + + + + + +Wine Bar + + + + + + +Opticians/Eye Doctors + + + + + + + + +Dentist + + + + + + +Veterinarian + + + + + + + + + + + + +Drugs Dispensary + + + + + + + + + + +Pharmacy + + + + + + + + + +Accident & Emergency + + + + + + + + + + +Hospital + + + + + + + + + +Doctors + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Scrub Land + + + + + + + + + + + + + + + + + +Swamp + + + + + + + + + + + + + + +Hills + + + + + + + + +Grass Land + + + + + + + + + + + + + + + + + + +Deciduous Forest + + + + + + + + +Mixed Forest + + + + + + + + + +Coniferous Forest + + + + + + + + +Church or Place of Worship + + + + + + + + + + + + + +Bank + + + + + + + + + + + + + +Power Lines + + + + + + + + + + + + + + + + + +Watch Tower + + + + + + + + +Transmitter + + + + + + + + + + + + + + + + + + +Village + + + + + + + + +Town + + + + + + + + + +Hamlet + + + + + + + + + +City + + + + + + + + + + + +Peak + + + + + + + + + + + + + + +Mountain Pass + + + + + + + + +Mine + + + + + + + +Military Complex + + + + + + + + + + + + + + + +Embassy + + + + + + + + + +Toy Shop + + + + + + + + + + + + +Supermarket + + + + + + + + + + + + + + + +Jewlers + + + + + + + + + + + + + +Hairdressers + + + + + + + + + + + + + + + + + + + +Greengrocer + + + + + + + + + + + + + +Gift Shop + + + + + + + + + + + + + + + + + + + +Garden Center + + + + + + + + + + + + + + + + +Florist + + + + + + + + + + + + + + + +Fish Monger + + + + + + + + + + +Real Estate + + + + + + + + + + + +Hardware / DIY + + + + + + + + + + + + + + + +Shop + + + + + + + + + + + + + + + +Confectioner + + + + + + + + +Computer Shop + + + + + + + + + + + + + + + + + + + + + + + + +Clothing + + + + + + + + + + + + + + + + + + +Mechanic + + + + + + + + + + + + + + + + + + + + +Car Dealer + + + + + + + + + + + + +Butcher + + + + + + + + + + + + + + + + + + + + +Meat Shop + + + + + + + + + + + + + + + + + +Bicycle Shop + + + + + + + + + + + + + + + + + + + + + +Baker + + + + + + + + + +Off License / Liquor Store + + + + + + + + + + + + + + + + + + + + +Wind Surfing + + + + + + + + + + + + + +Tennis + + + + + + + +Outdoor Pool + + + + + + + + + + + +Indoor Pool + + + + + + + + + + + +Skiing + + + + + + + +Sailing + + + + + + + +Leasure Center + + + + + + + + +Ice Skating + + + + + + + + + + + + + + +Equine Sports + + + + + + + + + + + + + + + +Rock Climbing + + + + + + + +Gym + + + + + + + + + + + + +Golf + + + + + + + + +Diving + + + + + + + +Archery + + + + + + + +Zoo + + + + + + + +Wreck + + + + + + + + +Water Wheel + + + + + + + + + + + + + + + + + + + + + + + + +Point of Interest + + + + + + + + + + + +Theater + + + + + + + + + + +Park / Picnick Area + + + + + + + + + + + + + + + + + + + +Monument + + + + + + + + + +Intormation + + + + + + +Beach + + + + + + + + +Battle Location + + + + + + + + + + + + + + + + + + + +Archaeology / Ruins + + + + + + + + +Walking + + + + + + + + + + + + + + + + +Train + + + + + + + + + + + + + + + + + +Taxi + + + + + + + + + + + + + + + + + + + + + + + + + +Underground Rail + + + + + + + + +Car Rental + + + + + + + + + + + + + + + + + + +Bike Rental + + + + + + + + + + + + + + + + + + + + + + + + + + + +Heliport + + + + + + + + + + +Carpool + + + + + + + + + + + + + + +Flood Gate + + + + + + + + + + + + + + + + + +Shipping + + + + + + + + + + + + +Disabled Parking + + + + + + + + + +Paid Parking + + + + + + + + + + + + + + + + + + + +Bike Parking + + + + + + + + + + + + + + + + + + + + + + +Parking + + + + + + + + + + + + +Marina + + + + + + + +Fuel Station + + + + + + + + + + + + + +Bus Stop + + + + + + + + + + + + + + + + +Bus Station + + + + + + + + + + + + + + + + + + +Airport + + + + + + + + + + + + + + + + + + + + + + +image/svg+xml + +Map Symbols +2011-04-06 + + +Brian & Authors + + + + +SJJB Management + + +http://www.sjjb.co.uk/mapicons/introduction + + +map +catography + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Accommodation +Amenity +Barrier +Education +Food +Health +Landuse +POI +Shopping +Sport +Tourist +Transport +Other + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From f9be42a5e41dc5bb2a1676e9f64e3990624072f4 Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Tue, 23 Apr 2013 21:17:26 +0200 Subject: revert r12297 (bzr r12302) --- src/style.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/style.h b/src/style.h index f456eaa61..2b98c9e5d 100644 --- a/src/style.h +++ b/src/style.h @@ -136,11 +136,11 @@ struct SPILength { /// Paint type internal to SPStyle. struct SPIPaint { - bool set; //todo check if other properties are also booleans - unsigned inherit; - unsigned currentcolor; - unsigned int colorSet; - unsigned int noneSet; + unsigned int set : 1; //c++ bitfields are used here as opposed to bools to reduce memory consumption, see http://tinyurl.com/cswh6mq + unsigned int inherit : 1; + unsigned int currentcolor : 1; + unsigned int colorSet : 1; + unsigned int noneSet : 1; struct { SPPaintServerReference *href; SPColor color; -- cgit v1.2.3 From 4755e2e39fd53fa9f228645b1f6a0619dc9e83ff Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Tue, 23 Apr 2013 21:17:59 +0200 Subject: Dutch translation update (bzr r12303) --- po/nl.po | 653 +++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 410 insertions(+), 243 deletions(-) diff --git a/po/nl.po b/po/nl.po index 594b04242..cc5badb6d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -57,8 +57,8 @@ msgid "" msgstr "" "Project-Id-Version: inkscape 0.49\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-03-27 16:52+0100\n" -"PO-Revision-Date: 2013-03-27 20:57+0100\n" +"POT-Creation-Date: 2013-03-30 18:29+0100\n" +"PO-Revision-Date: 2013-04-03 23:01+0100\n" "Last-Translator: Kris De Gussem \n" "Language-Team: Dutch\n" "MIME-Version: 1.0\n" @@ -991,8 +991,8 @@ msgid "Black Light" msgstr "Zwart licht" #: ../share/filters/filters.svg.h:1 -#: ../src/ui/dialog/clonetiler.cpp:832 -#: ../src/ui/dialog/clonetiler.cpp:983 +#: ../src/ui/dialog/clonetiler.cpp:831 +#: ../src/ui/dialog/clonetiler.cpp:982 #: ../src/extension/internal/bitmap/colorize.cpp:52 #: ../src/extension/internal/filter/bumps.h:101 #: ../src/extension/internal/filter/bumps.h:321 @@ -3429,445 +3429,445 @@ msgstr "Er is geen vorige zoom." msgid "No next zoom." msgstr "Er is geen volgende zoom." -#: ../src/ui/dialog/clonetiler.cpp:112 +#: ../src/ui/dialog/clonetiler.cpp:111 msgid "_Symmetry" msgstr "_Symmetrie" #. TRANSLATORS: "translation" means "shift" / "displacement" here. -#: ../src/ui/dialog/clonetiler.cpp:124 +#: ../src/ui/dialog/clonetiler.cpp:123 msgid "P1: simple translation" msgstr "P1: eenvoudige verplaatsing" -#: ../src/ui/dialog/clonetiler.cpp:125 +#: ../src/ui/dialog/clonetiler.cpp:124 msgid "P2: 180° rotation" msgstr "P2: 180° draaien" -#: ../src/ui/dialog/clonetiler.cpp:126 +#: ../src/ui/dialog/clonetiler.cpp:125 msgid "PM: reflection" msgstr "PM: spiegeling" #. TRANSLATORS: "glide reflection" is a reflection and a translation combined. #. For more info, see http://mathforum.org/sum95/suzanne/symsusan.html -#: ../src/ui/dialog/clonetiler.cpp:129 +#: ../src/ui/dialog/clonetiler.cpp:128 msgid "PG: glide reflection" msgstr "PG: schuifspiegeling" -#: ../src/ui/dialog/clonetiler.cpp:130 +#: ../src/ui/dialog/clonetiler.cpp:129 msgid "CM: reflection + glide reflection" msgstr "CM: spiegeling + schuifspiegeling" -#: ../src/ui/dialog/clonetiler.cpp:131 +#: ../src/ui/dialog/clonetiler.cpp:130 msgid "PMM: reflection + reflection" msgstr "PMM: spiegeling + spiegeling" -#: ../src/ui/dialog/clonetiler.cpp:132 +#: ../src/ui/dialog/clonetiler.cpp:131 msgid "PMG: reflection + 180° rotation" msgstr "PMG: spiegeling + 180° draaien" -#: ../src/ui/dialog/clonetiler.cpp:133 +#: ../src/ui/dialog/clonetiler.cpp:132 msgid "PGG: glide reflection + 180° rotation" msgstr "PGG: schuifspiegeling + 180° draaien" -#: ../src/ui/dialog/clonetiler.cpp:134 +#: ../src/ui/dialog/clonetiler.cpp:133 msgid "CMM: reflection + reflection + 180° rotation" msgstr "CMM: spiegeling + spiegeling + 180° draaien" -#: ../src/ui/dialog/clonetiler.cpp:135 +#: ../src/ui/dialog/clonetiler.cpp:134 msgid "P4: 90° rotation" msgstr "P4: 90° draaien" -#: ../src/ui/dialog/clonetiler.cpp:136 +#: ../src/ui/dialog/clonetiler.cpp:135 msgid "P4M: 90° rotation + 45° reflection" msgstr "P4M: 90° draaien + 45° spiegeling" -#: ../src/ui/dialog/clonetiler.cpp:137 +#: ../src/ui/dialog/clonetiler.cpp:136 msgid "P4G: 90° rotation + 90° reflection" msgstr "P4G: 90° draaien + 90° spiegeling" -#: ../src/ui/dialog/clonetiler.cpp:138 +#: ../src/ui/dialog/clonetiler.cpp:137 msgid "P3: 120° rotation" msgstr "P3: 120° draaien" -#: ../src/ui/dialog/clonetiler.cpp:139 +#: ../src/ui/dialog/clonetiler.cpp:138 msgid "P31M: reflection + 120° rotation, dense" msgstr "P31M: spiegeling + 120° draaien, dicht" -#: ../src/ui/dialog/clonetiler.cpp:140 +#: ../src/ui/dialog/clonetiler.cpp:139 msgid "P3M1: reflection + 120° rotation, sparse" msgstr "P3M1: spiegeling + 120° draaien, dun" -#: ../src/ui/dialog/clonetiler.cpp:141 +#: ../src/ui/dialog/clonetiler.cpp:140 msgid "P6: 60° rotation" msgstr "P6: 60° draaien" -#: ../src/ui/dialog/clonetiler.cpp:142 +#: ../src/ui/dialog/clonetiler.cpp:141 msgid "P6M: reflection + 60° rotation" msgstr "P6M: spiegeling + 60° draaien" -#: ../src/ui/dialog/clonetiler.cpp:162 +#: ../src/ui/dialog/clonetiler.cpp:161 msgid "Select one of the 17 symmetry groups for the tiling" msgstr "Selecteer één van de 17 symmetriegroepen voor het tegelen" -#: ../src/ui/dialog/clonetiler.cpp:180 +#: ../src/ui/dialog/clonetiler.cpp:179 msgid "S_hift" msgstr "Ver_plaatsing" #. TRANSLATORS: "shift" means: the tiles will be shifted (offset) horizontally by this amount -#: ../src/ui/dialog/clonetiler.cpp:190 +#: ../src/ui/dialog/clonetiler.cpp:189 #, no-c-format msgid "Shift X:" msgstr "X-verplaatsing:" -#: ../src/ui/dialog/clonetiler.cpp:198 +#: ../src/ui/dialog/clonetiler.cpp:197 #, no-c-format msgid "Horizontal shift per row (in % of tile width)" msgstr "Horizontale verplaatsing voor elke volgende rij (in % van de tegelbreedte)" -#: ../src/ui/dialog/clonetiler.cpp:206 +#: ../src/ui/dialog/clonetiler.cpp:205 #, no-c-format msgid "Horizontal shift per column (in % of tile width)" msgstr "Horizontale verplaatsing voor elke volgende kolom (in % van de tegelbreedte)" -#: ../src/ui/dialog/clonetiler.cpp:212 +#: ../src/ui/dialog/clonetiler.cpp:211 msgid "Randomize the horizontal shift by this percentage" msgstr "De horizontale positie binnen dit percentage willekeurig aanpassen" #. TRANSLATORS: "shift" means: the tiles will be shifted (offset) vertically by this amount -#: ../src/ui/dialog/clonetiler.cpp:222 +#: ../src/ui/dialog/clonetiler.cpp:221 #, no-c-format msgid "Shift Y:" msgstr "Y-verplaatsing:" -#: ../src/ui/dialog/clonetiler.cpp:230 +#: ../src/ui/dialog/clonetiler.cpp:229 #, no-c-format msgid "Vertical shift per row (in % of tile height)" msgstr "Verticale verplaatsing voor elke volgende rij (in % van de tegelhoogte)" -#: ../src/ui/dialog/clonetiler.cpp:238 +#: ../src/ui/dialog/clonetiler.cpp:237 #, no-c-format msgid "Vertical shift per column (in % of tile height)" msgstr "Verticale verplaatsing voor elke volgende kolom (in % van de tegelhoogte)" -#: ../src/ui/dialog/clonetiler.cpp:245 +#: ../src/ui/dialog/clonetiler.cpp:244 msgid "Randomize the vertical shift by this percentage" msgstr "De verticale positie binnen dit percentage willekeurig aanpassen" -#: ../src/ui/dialog/clonetiler.cpp:253 -#: ../src/ui/dialog/clonetiler.cpp:399 +#: ../src/ui/dialog/clonetiler.cpp:252 +#: ../src/ui/dialog/clonetiler.cpp:398 msgid "Exponent:" msgstr "Exponent:" -#: ../src/ui/dialog/clonetiler.cpp:260 +#: ../src/ui/dialog/clonetiler.cpp:259 msgid "Whether rows are spaced evenly (1), converge (<1) or diverge (>1)" msgstr "Of de rij-afstand gelijk blijft (1), afneemt (<1) of toeneemt (>1)" -#: ../src/ui/dialog/clonetiler.cpp:267 +#: ../src/ui/dialog/clonetiler.cpp:266 msgid "Whether columns are spaced evenly (1), converge (<1) or diverge (>1)" msgstr "Of de kolom-afstand gelijk blijft (1), afneemt (<1) of toeneemt (>1)" #. TRANSLATORS: "Alternate" is a verb here -#: ../src/ui/dialog/clonetiler.cpp:275 -#: ../src/ui/dialog/clonetiler.cpp:439 -#: ../src/ui/dialog/clonetiler.cpp:515 -#: ../src/ui/dialog/clonetiler.cpp:588 -#: ../src/ui/dialog/clonetiler.cpp:634 -#: ../src/ui/dialog/clonetiler.cpp:761 +#: ../src/ui/dialog/clonetiler.cpp:274 +#: ../src/ui/dialog/clonetiler.cpp:438 +#: ../src/ui/dialog/clonetiler.cpp:514 +#: ../src/ui/dialog/clonetiler.cpp:587 +#: ../src/ui/dialog/clonetiler.cpp:633 +#: ../src/ui/dialog/clonetiler.cpp:760 msgid "Alternate:" msgstr "Afwisselen:" -#: ../src/ui/dialog/clonetiler.cpp:281 +#: ../src/ui/dialog/clonetiler.cpp:280 msgid "Alternate the sign of shifts for each row" msgstr "De verplaatsingen voor elke rij om-en-om afwisselen" -#: ../src/ui/dialog/clonetiler.cpp:286 +#: ../src/ui/dialog/clonetiler.cpp:285 msgid "Alternate the sign of shifts for each column" msgstr "De verplaatsingen voor elke kolom om-en-om afwisselen" #. TRANSLATORS: "Cumulate" is a verb here -#: ../src/ui/dialog/clonetiler.cpp:293 -#: ../src/ui/dialog/clonetiler.cpp:457 -#: ../src/ui/dialog/clonetiler.cpp:533 +#: ../src/ui/dialog/clonetiler.cpp:292 +#: ../src/ui/dialog/clonetiler.cpp:456 +#: ../src/ui/dialog/clonetiler.cpp:532 msgid "Cumulate:" msgstr "Optellen:" -#: ../src/ui/dialog/clonetiler.cpp:299 +#: ../src/ui/dialog/clonetiler.cpp:298 msgid "Cumulate the shifts for each row" msgstr "De verplaatsingen voor elke rij optellen" -#: ../src/ui/dialog/clonetiler.cpp:304 +#: ../src/ui/dialog/clonetiler.cpp:303 msgid "Cumulate the shifts for each column" msgstr "De verplaatsingen voor elke kolom optellen" #. TRANSLATORS: "Cumulate" is a verb here -#: ../src/ui/dialog/clonetiler.cpp:311 +#: ../src/ui/dialog/clonetiler.cpp:310 msgid "Exclude tile:" msgstr "Tegel uitsluiten:" -#: ../src/ui/dialog/clonetiler.cpp:317 +#: ../src/ui/dialog/clonetiler.cpp:316 msgid "Exclude tile height in shift" msgstr "Tegelhoogte niet bij verplaatsing optellen" -#: ../src/ui/dialog/clonetiler.cpp:322 +#: ../src/ui/dialog/clonetiler.cpp:321 msgid "Exclude tile width in shift" msgstr "Tegelbreedte niet bij verplaatsing optellen" -#: ../src/ui/dialog/clonetiler.cpp:331 +#: ../src/ui/dialog/clonetiler.cpp:330 msgid "Sc_ale" msgstr "_Schalen" -#: ../src/ui/dialog/clonetiler.cpp:339 +#: ../src/ui/dialog/clonetiler.cpp:338 msgid "Scale X:" msgstr "X-vergroting:" -#: ../src/ui/dialog/clonetiler.cpp:347 +#: ../src/ui/dialog/clonetiler.cpp:346 #, no-c-format msgid "Horizontal scale per row (in % of tile width)" msgstr "Horizontale vergroting voor elke volgende rij (in % van de tegelbreedte)" -#: ../src/ui/dialog/clonetiler.cpp:355 +#: ../src/ui/dialog/clonetiler.cpp:354 #, no-c-format msgid "Horizontal scale per column (in % of tile width)" msgstr "Horizontale vergroting voor elke volgende kolom (in % van de tegelbreedte)" -#: ../src/ui/dialog/clonetiler.cpp:361 +#: ../src/ui/dialog/clonetiler.cpp:360 msgid "Randomize the horizontal scale by this percentage" msgstr "De horizontale afmeting binnen dit percentage willekeurig aanpassen" -#: ../src/ui/dialog/clonetiler.cpp:369 +#: ../src/ui/dialog/clonetiler.cpp:368 msgid "Scale Y:" msgstr "Y-vergroting:" -#: ../src/ui/dialog/clonetiler.cpp:377 +#: ../src/ui/dialog/clonetiler.cpp:376 #, no-c-format msgid "Vertical scale per row (in % of tile height)" msgstr "Verticale vergroting voor elke volgende rij (in % van de tegelhoogte)" -#: ../src/ui/dialog/clonetiler.cpp:385 +#: ../src/ui/dialog/clonetiler.cpp:384 #, no-c-format msgid "Vertical scale per column (in % of tile height)" msgstr "Verticale vergroting voor elke volgende kolom (in % van de tegelhoogte)" -#: ../src/ui/dialog/clonetiler.cpp:391 +#: ../src/ui/dialog/clonetiler.cpp:390 msgid "Randomize the vertical scale by this percentage" msgstr "De verticale afmeting binnen dit percentage willekeurig aanpassen" -#: ../src/ui/dialog/clonetiler.cpp:405 +#: ../src/ui/dialog/clonetiler.cpp:404 msgid "Whether row scaling is uniform (1), converge (<1) or diverge (>1)" msgstr "Soort rijvergroting: uniform (1), convergent (<1) of divergent (>1)" -#: ../src/ui/dialog/clonetiler.cpp:411 +#: ../src/ui/dialog/clonetiler.cpp:410 msgid "Whether column scaling is uniform (1), converge (<1) or diverge (>1)" msgstr "Soort kolomvergroting: uniform (1), convergent (<1) of divergent (>1)" -#: ../src/ui/dialog/clonetiler.cpp:419 +#: ../src/ui/dialog/clonetiler.cpp:418 msgid "Base:" msgstr "Grondtal:" -#: ../src/ui/dialog/clonetiler.cpp:425 -#: ../src/ui/dialog/clonetiler.cpp:431 +#: ../src/ui/dialog/clonetiler.cpp:424 +#: ../src/ui/dialog/clonetiler.cpp:430 msgid "Base for a logarithmic spiral: not used (0), converge (<1), or diverge (>1)" msgstr "Grondtal voor logaritmische spiraal: ongebruikt (0), convergent (<1) of divergent (>1)" -#: ../src/ui/dialog/clonetiler.cpp:445 +#: ../src/ui/dialog/clonetiler.cpp:444 msgid "Alternate the sign of scales for each row" msgstr "De vergroting voor elke rij om-en-om afwisselen" -#: ../src/ui/dialog/clonetiler.cpp:450 +#: ../src/ui/dialog/clonetiler.cpp:449 msgid "Alternate the sign of scales for each column" msgstr "De vergroting voor elke kolom om-en-om afwisselen" -#: ../src/ui/dialog/clonetiler.cpp:463 +#: ../src/ui/dialog/clonetiler.cpp:462 msgid "Cumulate the scales for each row" msgstr "De vergrotingen voor elke rij optellen" -#: ../src/ui/dialog/clonetiler.cpp:468 +#: ../src/ui/dialog/clonetiler.cpp:467 msgid "Cumulate the scales for each column" msgstr "De vergrotingen voor elke kolom optellen" -#: ../src/ui/dialog/clonetiler.cpp:477 +#: ../src/ui/dialog/clonetiler.cpp:476 msgid "_Rotation" msgstr "_Rotatie" -#: ../src/ui/dialog/clonetiler.cpp:485 +#: ../src/ui/dialog/clonetiler.cpp:484 msgid "Angle:" msgstr "Hoek:" -#: ../src/ui/dialog/clonetiler.cpp:493 +#: ../src/ui/dialog/clonetiler.cpp:492 #, no-c-format msgid "Rotate tiles by this angle for each row" msgstr "Voor elke volgende rij de tegels over deze hoek draaien" -#: ../src/ui/dialog/clonetiler.cpp:501 +#: ../src/ui/dialog/clonetiler.cpp:500 #, no-c-format msgid "Rotate tiles by this angle for each column" msgstr "Voor elke volgende kolom de tegels over deze hoek draaien" -#: ../src/ui/dialog/clonetiler.cpp:507 +#: ../src/ui/dialog/clonetiler.cpp:506 msgid "Randomize the rotation angle by this percentage" msgstr "De draaihoek binnen dit percentage willekeurig aanpassen" -#: ../src/ui/dialog/clonetiler.cpp:521 +#: ../src/ui/dialog/clonetiler.cpp:520 msgid "Alternate the rotation direction for each row" msgstr "De draairichting voor elke rij om-en-om afwisselen" -#: ../src/ui/dialog/clonetiler.cpp:526 +#: ../src/ui/dialog/clonetiler.cpp:525 msgid "Alternate the rotation direction for each column" msgstr "De draairichting voor elke kolom om-en-om afwisselen" -#: ../src/ui/dialog/clonetiler.cpp:539 +#: ../src/ui/dialog/clonetiler.cpp:538 msgid "Cumulate the rotation for each row" msgstr "De rotaties voor elke rij optellen" -#: ../src/ui/dialog/clonetiler.cpp:544 +#: ../src/ui/dialog/clonetiler.cpp:543 msgid "Cumulate the rotation for each column" msgstr "De rotaties voor elke kolom optellen" -#: ../src/ui/dialog/clonetiler.cpp:553 +#: ../src/ui/dialog/clonetiler.cpp:552 msgid "_Blur & opacity" msgstr "_Vervaging & ondoorzichtigheid" -#: ../src/ui/dialog/clonetiler.cpp:562 +#: ../src/ui/dialog/clonetiler.cpp:561 msgid "Blur:" msgstr "Vervaging:" -#: ../src/ui/dialog/clonetiler.cpp:568 +#: ../src/ui/dialog/clonetiler.cpp:567 msgid "Blur tiles by this percentage for each row" msgstr "De tegels elke volgende rij met dit percentage vervagen" -#: ../src/ui/dialog/clonetiler.cpp:574 +#: ../src/ui/dialog/clonetiler.cpp:573 msgid "Blur tiles by this percentage for each column" msgstr "De tegels elke volgende kolom met dit percentage vervagen" -#: ../src/ui/dialog/clonetiler.cpp:580 +#: ../src/ui/dialog/clonetiler.cpp:579 msgid "Randomize the tile blur by this percentage" msgstr "Tegels binnen dit percentage willekeurig vervagen" -#: ../src/ui/dialog/clonetiler.cpp:594 +#: ../src/ui/dialog/clonetiler.cpp:593 msgid "Alternate the sign of blur change for each row" msgstr "De vervaging voor elke rij om-en-om afwisselen" -#: ../src/ui/dialog/clonetiler.cpp:599 +#: ../src/ui/dialog/clonetiler.cpp:598 msgid "Alternate the sign of blur change for each column" msgstr "De vervaging voor elke kolom om-en-om afwisselen" -#: ../src/ui/dialog/clonetiler.cpp:608 +#: ../src/ui/dialog/clonetiler.cpp:607 msgid "Opacity:" msgstr "Ondoorzichtigheid:" -#: ../src/ui/dialog/clonetiler.cpp:614 +#: ../src/ui/dialog/clonetiler.cpp:613 msgid "Decrease tile opacity by this percentage for each row" msgstr "De ondoorzichtigheid elke volgende rij met dit percentage verminderen" -#: ../src/ui/dialog/clonetiler.cpp:620 +#: ../src/ui/dialog/clonetiler.cpp:619 msgid "Decrease tile opacity by this percentage for each column" msgstr "De ondoorzichtigheid elke volgende kolom met dit percentage verminderen" -#: ../src/ui/dialog/clonetiler.cpp:626 +#: ../src/ui/dialog/clonetiler.cpp:625 msgid "Randomize the tile opacity by this percentage" msgstr "De ondoorzichtigheid binnen dit percentage willekeurig aanpassen" -#: ../src/ui/dialog/clonetiler.cpp:640 +#: ../src/ui/dialog/clonetiler.cpp:639 msgid "Alternate the sign of opacity change for each row" msgstr "De doorzichtigheid voor elke rij om-en-om afwisselen" -#: ../src/ui/dialog/clonetiler.cpp:645 +#: ../src/ui/dialog/clonetiler.cpp:644 msgid "Alternate the sign of opacity change for each column" msgstr "De doorzichtigheid voor elke kolom om-en-om afwisselen" -#: ../src/ui/dialog/clonetiler.cpp:653 +#: ../src/ui/dialog/clonetiler.cpp:652 msgid "Co_lor" msgstr "_Kleur" -#: ../src/ui/dialog/clonetiler.cpp:663 +#: ../src/ui/dialog/clonetiler.cpp:662 msgid "Initial color: " msgstr "Beginkleur: " -#: ../src/ui/dialog/clonetiler.cpp:667 +#: ../src/ui/dialog/clonetiler.cpp:666 msgid "Initial color of tiled clones" msgstr "Beginkleur van getegelde klonen" -#: ../src/ui/dialog/clonetiler.cpp:667 +#: ../src/ui/dialog/clonetiler.cpp:666 msgid "Initial color for clones (works only if the original has unset fill or stroke)" msgstr "Beginkleur van klonen (werkt alleen als het origineel geen vulling of lijn heeft)" -#: ../src/ui/dialog/clonetiler.cpp:682 +#: ../src/ui/dialog/clonetiler.cpp:681 msgid "H:" msgstr "Tint:" -#: ../src/ui/dialog/clonetiler.cpp:688 +#: ../src/ui/dialog/clonetiler.cpp:687 msgid "Change the tile hue by this percentage for each row" msgstr "De tint elke volgende rij met dit percentage aanpassen" -#: ../src/ui/dialog/clonetiler.cpp:694 +#: ../src/ui/dialog/clonetiler.cpp:693 msgid "Change the tile hue by this percentage for each column" msgstr "De tint elke volgende kolom met dit percentage aanpassen" -#: ../src/ui/dialog/clonetiler.cpp:700 +#: ../src/ui/dialog/clonetiler.cpp:699 msgid "Randomize the tile hue by this percentage" msgstr "De tint binnen dit percentage willekeurig aanpassen" -#: ../src/ui/dialog/clonetiler.cpp:709 +#: ../src/ui/dialog/clonetiler.cpp:708 msgid "S:" msgstr "Verzadiging:" -#: ../src/ui/dialog/clonetiler.cpp:715 +#: ../src/ui/dialog/clonetiler.cpp:714 msgid "Change the color saturation by this percentage for each row" msgstr "De verzadiging elke volgende rij met dit percentage aanpassen" -#: ../src/ui/dialog/clonetiler.cpp:721 +#: ../src/ui/dialog/clonetiler.cpp:720 msgid "Change the color saturation by this percentage for each column" msgstr "De verzadiging elke volgende kolom met dit percentage aanpassen" -#: ../src/ui/dialog/clonetiler.cpp:727 +#: ../src/ui/dialog/clonetiler.cpp:726 msgid "Randomize the color saturation by this percentage" msgstr "De verzadiging binnen dit percentage willekeurig aanpassen" -#: ../src/ui/dialog/clonetiler.cpp:735 +#: ../src/ui/dialog/clonetiler.cpp:734 msgid "L:" msgstr "Helderheid:" -#: ../src/ui/dialog/clonetiler.cpp:741 +#: ../src/ui/dialog/clonetiler.cpp:740 msgid "Change the color lightness by this percentage for each row" msgstr "De helderheid elke volgende rij met dit percentage aanpassen" -#: ../src/ui/dialog/clonetiler.cpp:747 +#: ../src/ui/dialog/clonetiler.cpp:746 msgid "Change the color lightness by this percentage for each column" msgstr "De helderheid elke volgende kolom met dit percentage aanpassen" -#: ../src/ui/dialog/clonetiler.cpp:753 +#: ../src/ui/dialog/clonetiler.cpp:752 msgid "Randomize the color lightness by this percentage" msgstr "De helderheid binnen dit percentage willekeurig aanpassen" -#: ../src/ui/dialog/clonetiler.cpp:767 +#: ../src/ui/dialog/clonetiler.cpp:766 msgid "Alternate the sign of color changes for each row" msgstr "De kleurwijzigingen voor elke rij om-en-om afwisselen" -#: ../src/ui/dialog/clonetiler.cpp:772 +#: ../src/ui/dialog/clonetiler.cpp:771 msgid "Alternate the sign of color changes for each column" msgstr "De kleurwijzigingen voor elke kolom om-en-om afwisselen" -#: ../src/ui/dialog/clonetiler.cpp:780 +#: ../src/ui/dialog/clonetiler.cpp:779 msgid "_Trace" msgstr "_Overtrekken" -#: ../src/ui/dialog/clonetiler.cpp:792 +#: ../src/ui/dialog/clonetiler.cpp:791 msgid "Trace the drawing under the tiles" msgstr "De tekening onder de tegels gebruiken" -#: ../src/ui/dialog/clonetiler.cpp:796 +#: ../src/ui/dialog/clonetiler.cpp:795 msgid "For each clone, pick a value from the drawing in that clone's location and apply it to the clone" msgstr "Voor elke kloon een eigenschap van de tekening op dat punt gebruiken om die kloon te beïnvloeden." -#: ../src/ui/dialog/clonetiler.cpp:815 +#: ../src/ui/dialog/clonetiler.cpp:814 msgid "1. Pick from the drawing:" msgstr "1. Kies een eigenschap uit de tekening:" -#: ../src/ui/dialog/clonetiler.cpp:833 +#: ../src/ui/dialog/clonetiler.cpp:832 msgid "Pick the visible color and opacity" msgstr "Selecteer de zichtbare kleur en de ondoorzichtigheid" -#: ../src/ui/dialog/clonetiler.cpp:840 -#: ../src/ui/dialog/clonetiler.cpp:993 +#: ../src/ui/dialog/clonetiler.cpp:839 +#: ../src/ui/dialog/clonetiler.cpp:992 #: ../src/extension/internal/bitmap/opacity.cpp:38 #: ../src/extension/internal/filter/transparency.h:279 #: ../src/widgets/tweak-toolbar.cpp:352 @@ -3875,162 +3875,162 @@ msgstr "Selecteer de zichtbare kleur en de ondoorzichtigheid" msgid "Opacity" msgstr "Ondoorzichtigheid" -#: ../src/ui/dialog/clonetiler.cpp:841 +#: ../src/ui/dialog/clonetiler.cpp:840 msgid "Pick the total accumulated opacity" msgstr "Selecteer de gesommeerde ondoorzichtigheid" -#: ../src/ui/dialog/clonetiler.cpp:848 +#: ../src/ui/dialog/clonetiler.cpp:847 msgid "R" msgstr "R" -#: ../src/ui/dialog/clonetiler.cpp:849 +#: ../src/ui/dialog/clonetiler.cpp:848 msgid "Pick the Red component of the color" msgstr "Selecteer de roodcomponent van de kleur" -#: ../src/ui/dialog/clonetiler.cpp:856 +#: ../src/ui/dialog/clonetiler.cpp:855 msgid "G" msgstr "G" -#: ../src/ui/dialog/clonetiler.cpp:857 +#: ../src/ui/dialog/clonetiler.cpp:856 msgid "Pick the Green component of the color" msgstr "Selecteer de groencomponent van de kleur" -#: ../src/ui/dialog/clonetiler.cpp:864 +#: ../src/ui/dialog/clonetiler.cpp:863 msgid "B" msgstr "B" -#: ../src/ui/dialog/clonetiler.cpp:865 +#: ../src/ui/dialog/clonetiler.cpp:864 msgid "Pick the Blue component of the color" msgstr "Selecteer de blauwcomponent van de kleur" -#: ../src/ui/dialog/clonetiler.cpp:872 +#: ../src/ui/dialog/clonetiler.cpp:871 msgctxt "Clonetiler color hue" msgid "H" msgstr "T" -#: ../src/ui/dialog/clonetiler.cpp:873 +#: ../src/ui/dialog/clonetiler.cpp:872 msgid "Pick the hue of the color" msgstr "De tint van de kleur kiezen" -#: ../src/ui/dialog/clonetiler.cpp:880 +#: ../src/ui/dialog/clonetiler.cpp:879 msgctxt "Clonetiler color saturation" msgid "S" msgstr "V" -#: ../src/ui/dialog/clonetiler.cpp:881 +#: ../src/ui/dialog/clonetiler.cpp:880 msgid "Pick the saturation of the color" msgstr "De verzadiging van de kleur kiezen" -#: ../src/ui/dialog/clonetiler.cpp:888 +#: ../src/ui/dialog/clonetiler.cpp:887 msgctxt "Clonetiler color lightness" msgid "L" msgstr "L" -#: ../src/ui/dialog/clonetiler.cpp:889 +#: ../src/ui/dialog/clonetiler.cpp:888 msgid "Pick the lightness of the color" msgstr "De helderheid van de kleur kiezen" -#: ../src/ui/dialog/clonetiler.cpp:899 +#: ../src/ui/dialog/clonetiler.cpp:898 msgid "2. Tweak the picked value:" msgstr "2. De geselecteerde eigenschap fijnafstemmen:" -#: ../src/ui/dialog/clonetiler.cpp:916 +#: ../src/ui/dialog/clonetiler.cpp:915 msgid "Gamma-correct:" msgstr "Gammacorrectie:" -#: ../src/ui/dialog/clonetiler.cpp:920 +#: ../src/ui/dialog/clonetiler.cpp:919 msgid "Shift the mid-range of the picked value upwards (>0) or downwards (<0)" msgstr "Het middengebied van de gekozen eigenschap verhogen (>0) of verlagen (<0)" -#: ../src/ui/dialog/clonetiler.cpp:927 +#: ../src/ui/dialog/clonetiler.cpp:926 msgid "Randomize:" msgstr "Willekeur:" -#: ../src/ui/dialog/clonetiler.cpp:931 +#: ../src/ui/dialog/clonetiler.cpp:930 msgid "Randomize the picked value by this percentage" msgstr "De geselecteerde eigenschap binnen dit percentage willekeurig aanpassen" -#: ../src/ui/dialog/clonetiler.cpp:938 +#: ../src/ui/dialog/clonetiler.cpp:937 msgid "Invert:" msgstr "Omdraaien:" -#: ../src/ui/dialog/clonetiler.cpp:942 +#: ../src/ui/dialog/clonetiler.cpp:941 msgid "Invert the picked value" msgstr "Draai de geselecteerde eigenschap om" -#: ../src/ui/dialog/clonetiler.cpp:948 +#: ../src/ui/dialog/clonetiler.cpp:947 msgid "3. Apply the value to the clones':" msgstr "3. De relatie tussen de eigenschap en de klonen:" -#: ../src/ui/dialog/clonetiler.cpp:963 +#: ../src/ui/dialog/clonetiler.cpp:962 msgid "Presence" msgstr "Aanwezigheid" -#: ../src/ui/dialog/clonetiler.cpp:966 +#: ../src/ui/dialog/clonetiler.cpp:965 msgid "Each clone is created with the probability determined by the picked value in that point" msgstr "De kans dat een kloon op een plek wordt gemaakt is afhankelijk van de waarde van de geselecteerde eigenschap op dat punt." -#: ../src/ui/dialog/clonetiler.cpp:973 +#: ../src/ui/dialog/clonetiler.cpp:972 msgid "Size" msgstr "Afmeting" -#: ../src/ui/dialog/clonetiler.cpp:976 +#: ../src/ui/dialog/clonetiler.cpp:975 msgid "Each clone's size is determined by the picked value in that point" msgstr "De grootte van een kloon is afhankelijk van de waarde van de geselecteerde eigenschap op dat punt" -#: ../src/ui/dialog/clonetiler.cpp:986 +#: ../src/ui/dialog/clonetiler.cpp:985 msgid "Each clone is painted by the picked color (the original must have unset fill or stroke)" msgstr "Klonen worden getekend in de geselecteerde kleur (werkt alleen als de kleur van de lijnen of de vulling van het origineel verwijderd is)" -#: ../src/ui/dialog/clonetiler.cpp:996 +#: ../src/ui/dialog/clonetiler.cpp:995 msgid "Each clone's opacity is determined by the picked value in that point" msgstr "De ondoorzichtigheid van een kloon is afhankelijk van de waarde van de geselecteerde eigenschap op dat punt" -#: ../src/ui/dialog/clonetiler.cpp:1044 +#: ../src/ui/dialog/clonetiler.cpp:1043 msgid "How many rows in the tiling" msgstr "Hoeveel rijen er betegeld moeten worden" -#: ../src/ui/dialog/clonetiler.cpp:1074 +#: ../src/ui/dialog/clonetiler.cpp:1073 msgid "How many columns in the tiling" msgstr "Hoeveel kolommen er betegeld moeten worden" -#: ../src/ui/dialog/clonetiler.cpp:1118 +#: ../src/ui/dialog/clonetiler.cpp:1117 msgid "Width of the rectangle to be filled" msgstr "Breedte van de rechthoek die gevuld moet worden" -#: ../src/ui/dialog/clonetiler.cpp:1152 +#: ../src/ui/dialog/clonetiler.cpp:1151 msgid "Height of the rectangle to be filled" msgstr "Hoogte van de rechthoek die gevuld moet worden" -#: ../src/ui/dialog/clonetiler.cpp:1169 +#: ../src/ui/dialog/clonetiler.cpp:1168 msgid "Rows, columns: " msgstr "Rijen, kolommen: " -#: ../src/ui/dialog/clonetiler.cpp:1170 +#: ../src/ui/dialog/clonetiler.cpp:1169 msgid "Create the specified number of rows and columns" msgstr "Het opgegeven aantal rijen en kolommen aanmaken" -#: ../src/ui/dialog/clonetiler.cpp:1179 +#: ../src/ui/dialog/clonetiler.cpp:1178 msgid "Width, height: " msgstr "Breedte, hoogte: " -#: ../src/ui/dialog/clonetiler.cpp:1180 +#: ../src/ui/dialog/clonetiler.cpp:1179 msgid "Fill the specified width and height with the tiling" msgstr "Vul een gebied met opgegeven breedte en hoogte met de betegeling" -#: ../src/ui/dialog/clonetiler.cpp:1201 +#: ../src/ui/dialog/clonetiler.cpp:1200 msgid "Use saved size and position of the tile" msgstr "De opgeslagen grootte en positie van de tegel gebruiken" -#: ../src/ui/dialog/clonetiler.cpp:1204 +#: ../src/ui/dialog/clonetiler.cpp:1203 msgid "Pretend that the size and position of the tile are the same as the last time you tiled it (if any), instead of using the current size" msgstr "Doen alsof de grootte en positie van de tegel hetzelfde zijn als de laatste keer dat u er mee tegelde, in plaats van de huidige grootte en positie te gebruiken." -#: ../src/ui/dialog/clonetiler.cpp:1238 +#: ../src/ui/dialog/clonetiler.cpp:1237 msgid " _Create " msgstr " _Aanmaken " -#: ../src/ui/dialog/clonetiler.cpp:1240 +#: ../src/ui/dialog/clonetiler.cpp:1239 msgid "Create and tile the clones of the selection" msgstr "Maak klonen van de selectie en gebruik ze als betegeling" @@ -4039,90 +4039,90 @@ msgstr "Maak klonen van de selectie en gebruik ze als betegeling" #. diagrams on the left in the following screenshot: #. http://www.inkscape.org/screenshots/gallery/inkscape-0.42-CVS-tiles-unclump.png #. So unclumping is the process of spreading a number of objects out more evenly. -#: ../src/ui/dialog/clonetiler.cpp:1260 +#: ../src/ui/dialog/clonetiler.cpp:1259 msgid " _Unclump " msgstr " _Ontklonteren " -#: ../src/ui/dialog/clonetiler.cpp:1261 +#: ../src/ui/dialog/clonetiler.cpp:1260 msgid "Spread out clones to reduce clumping; can be applied repeatedly" msgstr "De klonen verspreiden om ze te ontklonteren; kan herhaaldelijk worden toegepast" -#: ../src/ui/dialog/clonetiler.cpp:1267 +#: ../src/ui/dialog/clonetiler.cpp:1266 msgid " Re_move " msgstr " Ver_wijderen " -#: ../src/ui/dialog/clonetiler.cpp:1268 +#: ../src/ui/dialog/clonetiler.cpp:1267 msgid "Remove existing tiled clones of the selected object (siblings only)" msgstr "Verwijder bestaande getegelde klonen van het geselecteerde object" -#: ../src/ui/dialog/clonetiler.cpp:1284 +#: ../src/ui/dialog/clonetiler.cpp:1283 msgid " R_eset " msgstr " _Beginwaarden " #. TRANSLATORS: "change" is a noun here -#: ../src/ui/dialog/clonetiler.cpp:1286 +#: ../src/ui/dialog/clonetiler.cpp:1285 msgid "Reset all shifts, scales, rotates, opacity and color changes in the dialog to zero" msgstr "Alle verplaatsingen, vergrotingen, rotaties en kleurveranderingen in het venster terugzetten op nul" -#: ../src/ui/dialog/clonetiler.cpp:1359 +#: ../src/ui/dialog/clonetiler.cpp:1358 msgid "Nothing selected." msgstr "Niets geselecteerd." -#: ../src/ui/dialog/clonetiler.cpp:1365 +#: ../src/ui/dialog/clonetiler.cpp:1364 msgid "More than one object selected." msgstr "Meer dan één object geselecteerd." -#: ../src/ui/dialog/clonetiler.cpp:1372 +#: ../src/ui/dialog/clonetiler.cpp:1371 #, c-format msgid "Object has %d tiled clones." msgstr "Het object heeft %d getegelde klonen." -#: ../src/ui/dialog/clonetiler.cpp:1377 +#: ../src/ui/dialog/clonetiler.cpp:1376 msgid "Object has no tiled clones." msgstr "Het object heeft geen getegelde klonen." -#: ../src/ui/dialog/clonetiler.cpp:2097 +#: ../src/ui/dialog/clonetiler.cpp:2096 msgid "Select one object whose tiled clones to unclump." msgstr "Selecteer één object wiens klonen ontklonterd moeten worden." -#: ../src/ui/dialog/clonetiler.cpp:2119 +#: ../src/ui/dialog/clonetiler.cpp:2118 msgid "Unclump tiled clones" msgstr "Getegelde klonen ontklonteren" -#: ../src/ui/dialog/clonetiler.cpp:2148 +#: ../src/ui/dialog/clonetiler.cpp:2147 msgid "Select one object whose tiled clones to remove." msgstr "Selecteer één object waarvan de getegelde klonen verwijderd moeten worden." -#: ../src/ui/dialog/clonetiler.cpp:2171 +#: ../src/ui/dialog/clonetiler.cpp:2170 msgid "Delete tiled clones" msgstr "Verwijder getegelde klonen" -#: ../src/ui/dialog/clonetiler.cpp:2218 +#: ../src/ui/dialog/clonetiler.cpp:2217 #: ../src/selection-chemistry.cpp:2468 msgid "Select an object to clone." msgstr "Selecteer een object om te klonen." -#: ../src/ui/dialog/clonetiler.cpp:2224 +#: ../src/ui/dialog/clonetiler.cpp:2223 msgid "If you want to clone several objects, group them and clone the group." msgstr "Als u meerdere objecten wilt klonen, groepeer ze dan en kloon de groep." -#: ../src/ui/dialog/clonetiler.cpp:2233 +#: ../src/ui/dialog/clonetiler.cpp:2232 msgid "Creating tiled clones..." msgstr "Getegelde klonen maken..." -#: ../src/ui/dialog/clonetiler.cpp:2638 +#: ../src/ui/dialog/clonetiler.cpp:2637 msgid "Create tiled clones" msgstr "Tegelen met klonen" -#: ../src/ui/dialog/clonetiler.cpp:2871 +#: ../src/ui/dialog/clonetiler.cpp:2870 msgid "Per row:" msgstr "Per rij:" -#: ../src/ui/dialog/clonetiler.cpp:2889 +#: ../src/ui/dialog/clonetiler.cpp:2888 msgid "Per column:" msgstr "Per kolom:" -#: ../src/ui/dialog/clonetiler.cpp:2897 +#: ../src/ui/dialog/clonetiler.cpp:2896 msgid "Randomize:" msgstr "Willekeurig:" @@ -5222,8 +5222,8 @@ msgstr "Aanpassende drempelwaarde" #: ../src/extension/internal/bitmap/sample.cpp:41 #: ../src/extension/internal/bluredge.cpp:137 #: ../src/extension/internal/filter/morphology.h:65 -#: ../src/ui/dialog/object-attributes.cpp:67 -#: ../src/ui/dialog/object-attributes.cpp:75 +#: ../src/ui/dialog/object-attributes.cpp:68 +#: ../src/ui/dialog/object-attributes.cpp:76 #: ../src/widgets/calligraphy-toolbar.cpp:451 #: ../src/widgets/erasor-toolbar.cpp:149 #: ../src/widgets/spray-toolbar.cpp:132 @@ -5237,8 +5237,8 @@ msgstr "Breedte:" #: ../src/extension/internal/bitmap/sample.cpp:42 #: ../src/extension/internal/filter/bumps.h:98 #: ../src/extension/internal/filter/bumps.h:329 -#: ../src/ui/dialog/object-attributes.cpp:68 -#: ../src/ui/dialog/object-attributes.cpp:76 +#: ../src/ui/dialog/object-attributes.cpp:69 +#: ../src/ui/dialog/object-attributes.cpp:77 #: ../share/extensions/foldablebox.inx.h:3 msgid "Height:" msgstr "Hoogte:" @@ -5309,7 +5309,7 @@ msgstr "Ruis toevoegen" #: ../src/rdf.cpp:241 #: ../src/ui/dialog/filter-effects-dialog.cpp:2612 #: ../src/ui/dialog/filter-effects-dialog.cpp:2691 -#: ../src/ui/dialog/object-attributes.cpp:48 +#: ../src/ui/dialog/object-attributes.cpp:49 #: ../share/extensions/jessyInk_effects.inx.h:5 #: ../share/extensions/jessyInk_export.inx.h:3 #: ../share/extensions/jessyInk_transitions.inx.h:5 @@ -5946,6 +5946,77 @@ msgstr "PDF+LaTeX: tekst in PDF negeren en LaTeX-bestand maken" msgid "Bleed/margin (mm)" msgstr "Overschot/marge (mm)" +# Zonder dubbele punt is duidelijker. +#: ../src/extension/internal/cdr-input.cpp:100 +#: ../src/extension/internal/pdf-input-cairo.cpp:70 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:86 +#: ../src/extension/internal/vsd-input.cpp:100 +msgid "Select page:" +msgstr "Pagina importeren:" + +# Met haakjes is duidelijker. +#. Display total number of pages +#: ../src/extension/internal/cdr-input.cpp:112 +#: ../src/extension/internal/pdf-input-cairo.cpp:88 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:105 +#: ../src/extension/internal/vsd-input.cpp:112 +#, c-format +msgid "out of %i" +msgstr "(van %i)" + +#: ../src/extension/internal/cdr-input.cpp:143 +#: ../src/extension/internal/vsd-input.cpp:143 +msgid "Page Selector" +msgstr "Paginaselectie" + +#: ../src/extension/internal/cdr-input.cpp:267 +msgid "Corel DRAW Input" +msgstr "Corel DRAW invoer" + +#: ../src/extension/internal/cdr-input.cpp:272 +msgid "Corel DRAW 7-X4 files (*.cdr)" +msgstr "Corel DRAW 7-X4 bestanden (*.cdr)" + +#: ../src/extension/internal/cdr-input.cpp:273 +msgid "Open files saved in Corel DRAW 7-X4" +msgstr "Open bestanden van Corel DRAW 7-X4" + +#: ../src/extension/internal/cdr-input.cpp:280 +msgid "Corel DRAW templates input" +msgstr "Corel DRAW templates invoer" + +#: ../src/extension/internal/cdr-input.cpp:285 +msgid "Corel DRAW 7-13 template files (*.cdt)" +msgstr "Corel DRAW 7-13 template bestanden (*.cdt)" + +#: ../src/extension/internal/cdr-input.cpp:286 +msgid "Open files saved in Corel DRAW 7-13" +msgstr "Open bestanden van Corel DRAW 7-13" + +#: ../src/extension/internal/cdr-input.cpp:293 +msgid "Corel DRAW Compressed Exchange files input" +msgstr "Corel DRAW gecomprimeerde uitwisselingsbestanden invoer" + +#: ../src/extension/internal/cdr-input.cpp:298 +msgid "Corel DRAW Compressed Exchange files (*.ccx)" +msgstr "Corel DRAW gecomprimeerde uitwisselingsbestanden (*.ccx)" + +#: ../src/extension/internal/cdr-input.cpp:299 +msgid "Open compressed exchange files saved in Corel DRAW" +msgstr "Open Corel DRAW gecomprimeerde uitwisselingsbestanden" + +#: ../src/extension/internal/cdr-input.cpp:306 +msgid "Corel DRAW Presentation Exchange files input" +msgstr "Corel DRAW Presentation uitwisselingsbestanden invoer" + +#: ../src/extension/internal/cdr-input.cpp:311 +msgid "Corel DRAW Presentation Exchange files (*.cmx)" +msgstr "Corel DRAW Presentation uitwisselingsbestanden (*.cmx)" + +#: ../src/extension/internal/cdr-input.cpp:312 +msgid "Open presentation exchange files saved in Corel DRAW" +msgstr "Open Presentation uitwisselingsbestanden opgeslagen met Corel DRAW" + #: ../src/extension/internal/emf-win32-inout.cpp:2523 msgid "EMF Input" msgstr "EMF-invoer" @@ -6857,8 +6928,8 @@ msgstr "Verplaatsing rood" #: ../src/extension/internal/filter/color.h:1307 #: ../src/extension/internal/filter/color.h:1310 #: ../src/extension/internal/filter/color.h:1313 -#: ../src/ui/dialog/object-attributes.cpp:65 -#: ../src/ui/dialog/object-attributes.cpp:73 +#: ../src/ui/dialog/object-attributes.cpp:66 +#: ../src/ui/dialog/object-attributes.cpp:74 #: ../src/ui/dialog/tile.cpp:618 #: ../src/widgets/desktop-widget.cpp:667 #: ../src/widgets/node-toolbar.cpp:590 @@ -6871,8 +6942,8 @@ msgstr "X:" #: ../src/extension/internal/filter/color.h:1308 #: ../src/extension/internal/filter/color.h:1311 #: ../src/extension/internal/filter/color.h:1314 -#: ../src/ui/dialog/object-attributes.cpp:66 -#: ../src/ui/dialog/object-attributes.cpp:74 +#: ../src/ui/dialog/object-attributes.cpp:67 +#: ../src/ui/dialog/object-attributes.cpp:75 #: ../src/ui/dialog/tile.cpp:619 #: ../src/widgets/desktop-widget.cpp:677 #: ../src/widgets/node-toolbar.cpp:608 @@ -7857,109 +7928,127 @@ msgstr "OpenDocument-tekeningbestand" #. TRANSLATORS: The following are document crop settings for PDF import #. more info: http://www.acrobatusers.com/tech_corners/javascript_corner/tips/2006/page_bounds/ +#: ../src/extension/internal/pdf-input-cairo.cpp:52 #: ../src/extension/internal/pdfinput/pdf-input.cpp:70 msgid "media box" msgstr "mediavak" +#: ../src/extension/internal/pdf-input-cairo.cpp:53 #: ../src/extension/internal/pdfinput/pdf-input.cpp:71 msgid "crop box" msgstr "afsnijvak" +#: ../src/extension/internal/pdf-input-cairo.cpp:54 #: ../src/extension/internal/pdfinput/pdf-input.cpp:72 msgid "trim box" msgstr "trimvak" +#: ../src/extension/internal/pdf-input-cairo.cpp:55 #: ../src/extension/internal/pdfinput/pdf-input.cpp:73 msgid "bleed box" msgstr "overschotvak" +#: ../src/extension/internal/pdf-input-cairo.cpp:56 #: ../src/extension/internal/pdfinput/pdf-input.cpp:74 msgid "art box" msgstr "kunstvak" -# Zonder dubbele punt is duidelijker. -#: ../src/extension/internal/pdfinput/pdf-input.cpp:86 -msgid "Select page:" -msgstr "Pagina importeren:" - -# Met haakjes is duidelijker. -#. Display total number of pages -#: ../src/extension/internal/pdfinput/pdf-input.cpp:105 -#, c-format -msgid "out of %i" -msgstr "(van de %i)" - #. Crop settings +#: ../src/extension/internal/pdf-input-cairo.cpp:94 #: ../src/extension/internal/pdfinput/pdf-input.cpp:111 msgid "Clip to:" msgstr "Afsnijden op:" +#: ../src/extension/internal/pdf-input-cairo.cpp:105 #: ../src/extension/internal/pdfinput/pdf-input.cpp:122 msgid "Page settings" msgstr "Pagina-instellingen" +#: ../src/extension/internal/pdf-input-cairo.cpp:106 #: ../src/extension/internal/pdfinput/pdf-input.cpp:123 msgid "Precision of approximating gradient meshes:" msgstr "Benaderingsprecisie van kleurverlopen:" +#: ../src/extension/internal/pdf-input-cairo.cpp:107 #: ../src/extension/internal/pdfinput/pdf-input.cpp:124 msgid "Note: setting the precision too high may result in a large SVG file and slow performance." msgstr "NB: de precisie te hoog instellen kan resulteren in een groot SVG-bestand en trage verwerking." +#: ../src/extension/internal/pdf-input-cairo.cpp:117 #: ../src/extension/internal/pdfinput/pdf-input.cpp:134 msgid "rough" msgstr "globaal" #. Text options +#: ../src/extension/internal/pdf-input-cairo.cpp:121 #: ../src/extension/internal/pdfinput/pdf-input.cpp:138 msgid "Text handling:" msgstr "Tekstafhandeling:" +#: ../src/extension/internal/pdf-input-cairo.cpp:123 +#: ../src/extension/internal/pdf-input-cairo.cpp:124 #: ../src/extension/internal/pdfinput/pdf-input.cpp:140 #: ../src/extension/internal/pdfinput/pdf-input.cpp:141 msgid "Import text as text" msgstr "Tekst als tekst importeren" +#: ../src/extension/internal/pdf-input-cairo.cpp:125 #: ../src/extension/internal/pdfinput/pdf-input.cpp:142 msgid "Replace PDF fonts by closest-named installed fonts" msgstr "PDF-lettertypen vervangen door het geïnstalleerde lettertype met de meest gelijkaardige naam" +#: ../src/extension/internal/pdf-input-cairo.cpp:128 #: ../src/extension/internal/pdfinput/pdf-input.cpp:145 msgid "Embed images" msgstr "Afbeeldingen invoegen" +#: ../src/extension/internal/pdf-input-cairo.cpp:130 #: ../src/extension/internal/pdfinput/pdf-input.cpp:147 msgid "Import settings" msgstr "Importinstellingen" +#: ../src/extension/internal/pdf-input-cairo.cpp:238 #: ../src/extension/internal/pdfinput/pdf-input.cpp:255 msgid "PDF Import Settings" msgstr "PDF-importinstellingen" +#: ../src/extension/internal/pdf-input-cairo.cpp:370 #: ../src/extension/internal/pdfinput/pdf-input.cpp:400 msgctxt "PDF input precision" msgid "rough" msgstr "ruw" +#: ../src/extension/internal/pdf-input-cairo.cpp:371 #: ../src/extension/internal/pdfinput/pdf-input.cpp:401 msgctxt "PDF input precision" msgid "medium" msgstr "Middel" +#: ../src/extension/internal/pdf-input-cairo.cpp:372 #: ../src/extension/internal/pdfinput/pdf-input.cpp:402 msgctxt "PDF input precision" msgid "fine" msgstr "nauwkeurig" +#: ../src/extension/internal/pdf-input-cairo.cpp:373 #: ../src/extension/internal/pdfinput/pdf-input.cpp:403 msgctxt "PDF input precision" msgid "very fine" msgstr "precies" +#: ../src/extension/internal/pdf-input-cairo.cpp:646 #: ../src/extension/internal/pdfinput/pdf-input.cpp:762 msgid "PDF Input" msgstr "PDF-invoer" +#: ../src/extension/internal/pdf-input-cairo.cpp:651 +msgid "Adobe PDF via poppler-cairo (*.pdf)" +msgstr "Adobe PDF via poppler-cairo (*.pdf)" + +#: ../src/extension/internal/pdf-input-cairo.cpp:652 +msgid "PDF Document" +msgstr "PDF Document" + #: ../src/extension/internal/pdfinput/pdf-input.cpp:767 msgid "Adobe PDF (*.pdf)" msgstr "Adobe PDF (*.pdf)" @@ -8058,6 +8147,51 @@ msgstr "Gecomprimeerde gewone SVG (*.svgz)" msgid "Scalable Vector Graphics format compressed with GZip" msgstr "Scalable Vector Graphics-formaat gecomprimeerd met GZip" +#: ../src/extension/internal/vsd-input.cpp:267 +msgid "VSD Input" +msgstr "VSD-invoer" + +#: ../src/extension/internal/vsd-input.cpp:272 +msgid "Microsoft Visio Diagram (*.vsd)" +msgstr "Microsoft Visio Diagram (*.vsd)" + +#: ../src/extension/internal/vsd-input.cpp:273 +msgid "File format used by Microsoft Visio 6 and later" +msgstr "Bestandsformaat gebruikt door Microsoft Visio 6 en later" + +#: ../src/extension/internal/vsd-input.cpp:280 +msgid "VDX Input" +msgstr "VDX-invoer" + +#: ../src/extension/internal/vsd-input.cpp:285 +msgid "Microsoft Visio XML Diagram (*.vdx)" +msgstr "Microsoft Visio XML Diagram (*.vdx)" + +#: ../src/extension/internal/vsd-input.cpp:286 +msgid "File format used by Microsoft Visio 2010 and later" +msgstr "Bestandsformaat gebruikt door Microsoft Visio 2010 en later" + +#: ../src/extension/internal/vsd-input.cpp:293 +msgid "VSDM Input" +msgstr "VSDM-invoer" + +#: ../src/extension/internal/vsd-input.cpp:298 +msgid "Microsoft Visio 2013 drawing (*.vsdm)" +msgstr "Microsoft Visio 2013 tekening (*.vsdm)" + +#: ../src/extension/internal/vsd-input.cpp:299 +#: ../src/extension/internal/vsd-input.cpp:312 +msgid "File format used by Microsoft Visio 2013 and later" +msgstr "Bestandsformaat gebruikt door Microsoft Visio 2013 en later" + +#: ../src/extension/internal/vsd-input.cpp:306 +msgid "VSDX Input" +msgstr "VSDX-invoer" + +#: ../src/extension/internal/vsd-input.cpp:311 +msgid "Microsoft Visio 2013 drawing (*.vsdx)" +msgstr "Microsoft Visio 2013 tekening (*.vsdx)" + #: ../src/extension/internal/wpg-input.cpp:121 msgid "WPG Input" msgstr "WPG-invoer" @@ -11419,7 +11553,7 @@ msgstr "Open Font-licentie" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/linking.html#AElementXLinkTitleAttribute #: ../src/rdf.cpp:232 -#: ../src/ui/dialog/object-attributes.cpp:56 +#: ../src/ui/dialog/object-attributes.cpp:57 msgid "Title:" msgstr "Titel:" @@ -14498,7 +14632,7 @@ msgstr "Hoogte van de convolutiematrix" #. default x: #. default y: #: ../src/ui/dialog/filter-effects-dialog.cpp:2636 -#: ../src/ui/dialog/object-attributes.cpp:47 +#: ../src/ui/dialog/object-attributes.cpp:48 msgid "Target:" msgstr "Doel:" @@ -15070,7 +15204,7 @@ msgstr "Selecteer een objecttype" msgid "Select a property" msgstr "Selecteer een eigenschap" -#: ../src/ui/dialog/font-substitution.cpp:75 +#: ../src/ui/dialog/font-substitution.cpp:82 msgid "" "\n" "Some fonts are not available and have been substituted." @@ -15078,18 +15212,22 @@ msgstr "" "\n" "Sommige lettertypen zijn niet beschikbaar en werden vervangen." -#: ../src/ui/dialog/font-substitution.cpp:78 +#: ../src/ui/dialog/font-substitution.cpp:85 msgid "Font substitution" msgstr "Lettertypevervanging" -#: ../src/ui/dialog/font-substitution.cpp:97 +#: ../src/ui/dialog/font-substitution.cpp:104 msgid "Select all the affected items" msgstr "Selecteer alle geaffecteerde objecten" -#: ../src/ui/dialog/font-substitution.cpp:102 +#: ../src/ui/dialog/font-substitution.cpp:109 msgid "Don't show this warning again" msgstr "Toon deze waarschuwing niet meer" +#: ../src/ui/dialog/font-substitution.cpp:250 +msgid "Font '%1' substituted with '%2'" +msgstr "Lettertype '%1' vervangen door "%2'" + #: ../src/ui/dialog/glyphs.cpp:60 #: ../src/ui/dialog/glyphs.cpp:152 msgid "all" @@ -15917,25 +16055,25 @@ msgstr "Hulplijn ID: %s" msgid "Current: %s" msgstr "Huidig: %s" -#: ../src/ui/dialog/icon-preview.cpp:156 +#: ../src/ui/dialog/icon-preview.cpp:155 #, c-format msgid "%d x %d" msgstr "%d x %d" -#: ../src/ui/dialog/icon-preview.cpp:168 +#: ../src/ui/dialog/icon-preview.cpp:167 msgid "Magnified:" msgstr "Uitvergroot:" -#: ../src/ui/dialog/icon-preview.cpp:237 +#: ../src/ui/dialog/icon-preview.cpp:236 msgid "Actual Size:" msgstr "Huidige grootte:" -#: ../src/ui/dialog/icon-preview.cpp:242 +#: ../src/ui/dialog/icon-preview.cpp:241 msgctxt "Icon preview window" msgid "Sele_ction" msgstr "Sele_ctie" -#: ../src/ui/dialog/icon-preview.cpp:244 +#: ../src/ui/dialog/icon-preview.cpp:243 msgid "Selection only or whole document" msgstr "Alleen selectie of volledig document" @@ -16764,7 +16902,7 @@ msgstr "Alleen tekst" #: ../src/ui/dialog/inkscape-preferences.cpp:605 #: ../src/ui/dialog/inkscape-preferences.cpp:613 msgid "Icons and text" -msgstr "Iconen en tekst" +msgstr "Iconen en tekst" #: ../src/ui/dialog/inkscape-preferences.cpp:610 msgid "Dockbar style (requires restart):" @@ -16772,16 +16910,15 @@ msgstr "Dockbarstijl (vereist herstart):" #: ../src/ui/dialog/inkscape-preferences.cpp:611 msgid "Selects whether the vertical bars on the dockbar will show text labels, icons, or both" -msgstr "Bepaalt of de verticale balken op de dockbar tekstlabels, iconen of beide tonen" +msgstr "Bepaalt of geminimaliseerde dialogen op de verticale balken op de dockbar tekstlabels, iconen of beide tonen" #: ../src/ui/dialog/inkscape-preferences.cpp:618 -#, fuzzy msgid "Switcher style (requires restart):" -msgstr " (vereist herstart):" +msgstr "Stijl dialoogwisselaar (vereist herstart):" #: ../src/ui/dialog/inkscape-preferences.cpp:619 msgid "Selects whether the dockbar switcher will show text labels, icons, or both" -msgstr "" +msgstr "Bepaalt of de dialoogwisselaar op de dockbar tekstlabels, iconen of beide toont" #. Windows #: ../src/ui/dialog/inkscape-preferences.cpp:623 @@ -18660,33 +18797,33 @@ msgstr "Loggen begonnen." msgid "Log capture stopped." msgstr "Log aanleggen gestopt." -#: ../src/ui/dialog/object-attributes.cpp:46 +#: ../src/ui/dialog/object-attributes.cpp:47 msgid "Href:" msgstr "Href:" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/linking.html#AElementXLinkRoleAttribute #. Identifies the type of the related resource with an absolute URI -#: ../src/ui/dialog/object-attributes.cpp:51 +#: ../src/ui/dialog/object-attributes.cpp:52 msgid "Role:" msgstr "Role:" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/linking.html#AElementXLinkArcRoleAttribute #. For situations where the nature/role alone isn't enough, this offers an additional URI defining the purpose of the link. -#: ../src/ui/dialog/object-attributes.cpp:54 +#: ../src/ui/dialog/object-attributes.cpp:55 msgid "Arcrole:" msgstr "Arcrole:" -#: ../src/ui/dialog/object-attributes.cpp:57 +#: ../src/ui/dialog/object-attributes.cpp:58 #: ../share/extensions/polyhedron_3d.inx.h:47 msgid "Show:" msgstr "Tonen:" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/linking.html#AElementXLinkActuateAttribute -#: ../src/ui/dialog/object-attributes.cpp:59 +#: ../src/ui/dialog/object-attributes.cpp:60 msgid "Actuate:" msgstr "Activatie:" -#: ../src/ui/dialog/object-attributes.cpp:64 +#: ../src/ui/dialog/object-attributes.cpp:65 msgid "URL:" msgstr "URL:" @@ -19066,7 +19203,7 @@ msgstr "Huidig document" #. ******************* Preview Scale ********************** #: ../src/ui/dialog/symbols.cpp:178 msgid "Preview scale: " -msgstr "Schaal voortonen:" +msgstr "Schaal voorvertoning: " #: ../src/ui/dialog/symbols.cpp:188 msgid "Fit" @@ -20581,6 +20718,7 @@ msgid "Adjusting stroke width: was %.3g, now %.3g (diff %.3g)" msgstr "Lijndikte aangepast: was %.3g, nu %.3g (verschil %.3g)" #. TRANSLATORS: "Link" means to _link_ two sliders together +#: ../src/ui/widget/spin-scale.cpp:137 #: ../src/ui/widget/spin-slider.cpp:156 msgctxt "Sliders" msgid "Link" @@ -26388,7 +26526,6 @@ msgstr "Voeg aub. een invoerstring in" #. abort if converting blank text #: ../share/extensions/render_barcode_qrcode.py:1053 -#, fuzzy msgid "Please enter an input text" msgstr "Geef aub. een invoertekst op" @@ -27261,9 +27398,14 @@ msgid "Embed Images" msgstr "Afbeeldingen invoegen" #: ../share/extensions/embedimage.inx.h:2 +#: ../share/extensions/embedselectedimages.inx.h:2 msgid "Embed only selected images" msgstr "Alleen geselecteerde afbeeldingen invoegen" +#: ../share/extensions/embedselectedimages.inx.h:1 +msgid "Embed Selected Images" +msgstr "Geselecteerde afbeeldingen invoegen" + #: ../share/extensions/eps_input.inx.h:1 msgid "EPS Input" msgstr "EPS-invoer" @@ -27476,9 +27618,8 @@ msgid "First derivative:" msgstr "Eerste afgeleide:" #: ../share/extensions/funcplot.inx.h:34 -#, fuzzy msgid "Clip with rectangle" -msgstr "Breedte van de rechthoek" +msgstr "Afsnijden op rechthoek" #: ../share/extensions/funcplot.inx.h:35 #: ../share/extensions/param_curves.inx.h:28 @@ -28491,6 +28632,7 @@ msgid "Ignore these settings and use export hints?" msgstr "Deze instellingen negeren en export hints gebruiken?" #: ../share/extensions/guillotine.inx.h:5 +#: ../share/extensions/print_win32_vector.inx.h:2 msgid "Export" msgstr "Exporteren" @@ -28551,9 +28693,8 @@ msgid "Curves are divided into lines, this number controls how fine the curves w msgstr "" #: ../share/extensions/hpgl_output.inx.h:15 -#, fuzzy msgid "Use Overcut" -msgstr "_Standaard gebruiken" +msgstr "" #: ../share/extensions/hpgl_output.inx.h:16 msgid "Whether the overcut will be used, if not the 'Overcut' parameter is unused (Standard: 'True')" @@ -28577,18 +28718,16 @@ msgid "Whether the tool offset should be corrected, if not the 'Tool offset' and msgstr "" #: ../share/extensions/hpgl_output.inx.h:21 -#, fuzzy msgid "Tool offset (mm)" -msgstr "Horizontale verplaatsing (px):" +msgstr "" #: ../share/extensions/hpgl_output.inx.h:22 msgid "The offset from the tool tip to the tool axis in mm (Standard: '0.25')" msgstr "" #: ../share/extensions/hpgl_output.inx.h:23 -#, fuzzy msgid "Return Factor" -msgstr "Factor:" +msgstr "" #: ../share/extensions/hpgl_output.inx.h:24 msgid "The return factor multiplied by the tool offset is the length that is used to guide the tool back to the original path after an overcut is performed, you can only determine this value by experimentation (Standard: '2.50')" @@ -28612,12 +28751,9 @@ msgstr "Y-afstand (mm)" msgid "Plot invisible layers" msgstr "Onzichtbare lagen tonen" -# De volgende zes strings beschrijven wat enkele toetsen doen. -# Een kleine letter maakt duidelijker dat ze een voortzetting zijn. #: ../share/extensions/hpgl_output.inx.h:29 -#, fuzzy msgid "Plot invisible layers (Standard: 'False')" -msgstr "Onzichtbare lagen tonen" +msgstr "Onzichtbare lagen tonen (standaard: uit)" #: ../share/extensions/hpgl_output.inx.h:30 msgid "Send to Plotter also" @@ -28651,6 +28787,22 @@ msgstr "HP Graphics Language-bestand (*.hpgl)" msgid "Export to an HP Graphics Language file" msgstr "Naar een HP Graphics Language bestand exporteren" +#: ../share/extensions/ink2canvas.inx.h:1 +msgid "Convert to html5 canvas" +msgstr "Omzetten naar html5 canvas" + +#: ../share/extensions/ink2canvas.inx.h:2 +msgid "HTML 5 canvas (*.html)" +msgstr "HTML 5 canvas (*.html)" + +#: ../share/extensions/ink2canvas.inx.h:3 +msgid "HTML 5 canvas code" +msgstr "HTML 5 canvas code" + +#: ../share/extensions/inkscape_follow_link.inx.h:1 +msgid "Follow Link" +msgstr "Koppeling volgen" + #: ../share/extensions/inkscape_help_askaquestion.inx.h:1 msgid "Ask Us a Question" msgstr "Stel ons een vraag" @@ -29715,9 +29867,8 @@ msgid "Ribbon" msgstr "Lint" #: ../share/extensions/pathalongpath.inx.h:17 -#, fuzzy msgid "This effect scatters or bends a pattern along arbitrary \"skeleton\" paths. The pattern is the topmost object in the selection. Groups of paths, shapes or clones are allowed." -msgstr "Dit effect verspreidt een patroon langs willekeurige \"skeletpaden\". Het patroon is het bovenste object in de selectie. Een mix van paden/vormen/klonen/... is toegestaan." +msgstr "Dit effect verspreidt een patroon langs willekeurige \"skeletpaden\". Het patroon is het bovenste object in de selectie. Groepen van paden, vormen of klonen zijn toegestaan." #: ../share/extensions/pathscatter.inx.h:3 msgid "Follow path orientation" @@ -30073,6 +30224,10 @@ msgstr "Gemiddelde" msgid "View Previous Glyph" msgstr "Vorig karakter bekijken" +#: ../share/extensions/print_win32_vector.inx.h:1 +msgid "Win32 Vector Print" +msgstr "" + #: ../share/extensions/printing_marks.inx.h:1 msgid "Printing Marks" msgstr "Afdrukmarkeringen" @@ -30460,7 +30615,7 @@ msgid "Help (Options)" msgstr "Help (Opties)" #: ../share/extensions/scour.inx.h:27 -#, fuzzy, no-c-format +#, no-c-format msgid "" "This extension optimizes the SVG file according to the following options:\n" " * Shorten color names: convert all colors to #RRGGBB or #RGB format.\n" @@ -30476,15 +30631,15 @@ msgid "" " * Number of significant digits for coords: all coordinates are output with that number of significant digits. For example, if 3 is specified, the coordinate 3.5153 is output as 3.51 and the coordinate 471.55 is output as 472.\n" " * XML indentation (pretty-printing): either None for no indentation, Space to use one space per nesting level, or Tab to use one tab per nesting level." msgstr "" -"Deze uitbreiding optimaliseert het SVG-bestand volgens deze opties:\n" +"Deze uitbreiding optimaliseert het SVG-bestand volgens de opties:\n" " * Kleurwaarden afkorten: alle kleuren van omzetten in #RRGGBB of #RGB formaat.\n" -" * CSS-attributen omzetten in XML-attributen: stijlen van <style> tags en inline style=\"\" declaraties omzetten in XML-attributen.\n" -" * Groepen samenvouwen: verwijdert ongebruikte <g> elementen om de inhoud één niveau hoger te plaatsen. Hiervoor moet \"Ongebruikte ID-namen voor elementen verwijderd\" ingeschakeld zijn.\n" -" * Groepen maken voor gelijkaardige attributen: <g> elementen maken voor een serie elementen met ten minste een gemeenschappelijk attribuut (bv. vulkleur, lijntransparantie, ...).\n" +" * CSS-attributen omzetten in XML-attributen: stijlen van style tags en inline style=\"\" declaraties omzetten in XML-attributen.\n" +" * Groepen samenvouwen: verwijdert ongebruikte g elementen om de inhoud één niveau hoger te plaatsen. Hiervoor moet \"Ongebruikte ID-namen voor elementen verwijderd\" ingeschakeld zijn.\n" +" * Groepen maken voor gelijkaardige attributen: g elementen maken voor een serie elementen met ten minste een gemeenschappelijk attribuut (bv. vulkleur, lijntransparantie, ...).\n" " * Rasterafbeeldingen invoegen: rasterafbeeldingen invoegen als base64-geëncodeerde data URL's.\n" " * Programmadata behouden: geen Inkscape, Sodipodi of Adobe Illustrator elementen en attributen verwijderen.\n" -" * Metadata verwijderen: <metadata> tags verwijderen, die licentiemetadata, alternatieve versies voor niet-SVG-compatibele browsers, etc. bevatten.\n" -" * Opmerkingen verwijderen: <!-- --> tags verwijderen.\n" +" * Metadata verwijderen: metadata tags verwijderen, die licentiemetadata, alternatieve versies voor niet-SVG-compatibele browsers, etc. bevatten.\n" +" * Opmerkingen verwijderen: commentaartags verwijderen.\n" " * Omzeilen van renderbugs: maakt iets grotere SVG-data aan, maar omzeilt een in bug de librsvg renderer, die door Eye of GNOME en andere applicaties gebruikt wordt.\n" " * Viewbox activeren: afbeelding op 100%/100% instellen en een viewBox introduceren.\n" " * Aantal beduidende cijfers voor coördinaten: alle coördinaten worden weggeschreven met dit aantal beduidende cijfers. Bijvoorbeeld, indien 3 is opgegeven wordt de coördinaat 3.5153 weggeschreven als 3.51 en de coördinaat 471.55 als 472.\n" @@ -30848,6 +31003,18 @@ msgstr "SVG-lettertype in karakterlagen omzetten" msgid "Load only the first 30 glyphs (Recommended)" msgstr "Slechts eerste 30 karakters laden (aanbevolen)" +#: ../share/extensions/synfig_output.inx.h:1 +msgid "Synfig Output" +msgstr "Synfig-uitvoer" + +#: ../share/extensions/synfig_output.inx.h:2 +msgid "Synfig Animation (*.sif)" +msgstr "Synfiganimatie (*.sif)" + +#: ../share/extensions/synfig_output.inx.h:3 +msgid "Synfig Animation written using the sif-file exporter extension" +msgstr "" + #: ../share/extensions/text_braille.inx.h:1 msgid "Convert to Braille" msgstr "Omzetten naar Braille" -- cgit v1.2.3 From 35be05925a35b439485a4cc9a284cf26cf445c7a Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Tue, 23 Apr 2013 23:12:21 +0200 Subject: translation typo (bzr r12304) --- po/nl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/nl.po b/po/nl.po index cc5badb6d..0b2010ccc 100644 --- a/po/nl.po +++ b/po/nl.po @@ -58,7 +58,7 @@ msgstr "" "Project-Id-Version: inkscape 0.49\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-03-30 18:29+0100\n" -"PO-Revision-Date: 2013-04-03 23:01+0100\n" +"PO-Revision-Date: 2013-04-23 23:11+0100\n" "Last-Translator: Kris De Gussem \n" "Language-Team: Dutch\n" "MIME-Version: 1.0\n" @@ -15226,7 +15226,7 @@ msgstr "Toon deze waarschuwing niet meer" #: ../src/ui/dialog/font-substitution.cpp:250 msgid "Font '%1' substituted with '%2'" -msgstr "Lettertype '%1' vervangen door "%2'" +msgstr "Lettertype '%1' vervangen door '%2'" #: ../src/ui/dialog/glyphs.cpp:60 #: ../src/ui/dialog/glyphs.cpp:152 @@ -28757,7 +28757,7 @@ msgstr "Onzichtbare lagen tonen (standaard: uit)" #: ../share/extensions/hpgl_output.inx.h:30 msgid "Send to Plotter also" -msgstr "Ook naar plotter zendern" +msgstr "Ook naar plotter zenden" #: ../share/extensions/hpgl_output.inx.h:31 msgid "Sends the generated HPGL data also via serial connection to your plotter (Standard: 'False')" -- cgit v1.2.3