From e2f72173014b5a876bb947125aab0a92481730cc Mon Sep 17 00:00:00 2001 From: su_v Date: Sun, 22 Mar 2015 17:39:54 +0100 Subject: symbolic_icons: resave with current trunk (r14027) (bzr r14027.1.1) --- share/icons/symbolic_icons.svg | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'share') diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index 53eb4be96..21dbf88d7 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -1,7 +1,7 @@ - + Inkscape Icon Theme @@ -1893,7 +1893,7 @@ - + @@ -1902,12 +1902,12 @@ - - + + - + @@ -2188,7 +2188,7 @@ - + @@ -2987,15 +2987,15 @@ - - - - - - + + + + + + - + @@ -3006,10 +3006,10 @@ - - - - + + + + -- cgit v1.2.3 From b78280768db0da9a0e9d4cd707116d5d151e012c Mon Sep 17 00:00:00 2001 From: su_v Date: Sun, 22 Mar 2015 17:52:55 +0100 Subject: symbolic_icons: cleanup document root (delete orphaned clones and empty groups) (bzr r14027.1.2) --- share/icons/symbolic_icons.svg | 73 ++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 46 deletions(-) (limited to 'share') diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index 21dbf88d7..c74299f58 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -36,6 +36,7 @@ +Use the swatch palette to change color globally @@ -304,10 +305,6 @@ - - - - @@ -396,8 +393,6 @@ - - @@ -608,7 +603,6 @@ - @@ -687,8 +681,6 @@ - - emblem-new @@ -963,7 +955,6 @@ - @@ -1483,7 +1474,6 @@ - @@ -1543,9 +1533,9 @@ - + @@ -1694,7 +1684,6 @@ - @@ -1703,8 +1692,6 @@ - - @@ -1725,7 +1712,6 @@ - @@ -2126,8 +2112,6 @@ - - @@ -2135,12 +2119,6 @@ - - - - - - @@ -2240,9 +2218,6 @@ - - - @@ -2392,22 +2367,30 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -2757,9 +2740,7 @@ - - -Use the swatch palette to change color globally + -- cgit v1.2.3 From 2d0beb0a08a5341274a9148b15c5809d19176740 Mon Sep 17 00:00:00 2001 From: su_v Date: Sun, 22 Mar 2015 18:20:29 +0100 Subject: symbolic_icons: cleanup zoom icons (fix icon names, purge nested groups) (bzr r14027.1.3) --- share/icons/symbolic_icons.svg | 283 ++++++----------------------------------- 1 file changed, 40 insertions(+), 243 deletions(-) (limited to 'share') diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index c74299f58..c57802ec0 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -5,10 +5,10 @@ Inkscape Icon Theme - + - + @@ -297,128 +297,41 @@ - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -1404,57 +1317,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -1810,64 +1679,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -2532,23 +2351,9 @@ - - - - - - - - - - - - - - - + @@ -2740,14 +2545,6 @@ - - - - - - - - @@ -3425,8 +3222,8 @@ - - + + -- cgit v1.2.3 From 6a49c05df447f1f7bdc691bbb91bef9d705179e1 Mon Sep 17 00:00:00 2001 From: su_v Date: Sun, 22 Mar 2015 18:28:11 +0100 Subject: symbolic_icons: cleanup ellipse icons (fix icon names) (bzr r14027.1.4) --- share/icons/symbolic_icons.svg | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'share') diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index c57802ec0..5a21698b6 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -1333,15 +1333,13 @@ - + - + - - - - - + + + @@ -1702,13 +1700,13 @@ - + - + - - - + + + -- cgit v1.2.3 From b3152a8c8e2e62687792617aefab272f20802f61 Mon Sep 17 00:00:00 2001 From: su_v Date: Sun, 22 Mar 2015 18:38:31 +0100 Subject: symbolic_icons: cleanup layer icons (fix icon names, add missing icon 'layer-duplicate') (bzr r14027.1.5) --- share/icons/symbolic_icons.svg | 46 ++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'share') diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index 5a21698b6..dd560c8d5 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -517,15 +517,13 @@ - - - - - + + + - + @@ -541,8 +539,6 @@ - - @@ -573,12 +569,12 @@ - + - - - - + + + + @@ -594,19 +590,21 @@ - - -emblem-new - - - - + + + + - + - - - + + + + + + + + -- cgit v1.2.3 From aca3d018457798046a5bff23dd48569d56df133d Mon Sep 17 00:00:00 2001 From: su_v Date: Sun, 22 Mar 2015 19:21:35 +0100 Subject: symbolic_icons: cleanup rest of menu icons (add missing labels, flatten nested groups) (bzr r14027.1.6) --- share/icons/symbolic_icons.svg | 499 +++++++++++++++++------------------------ 1 file changed, 212 insertions(+), 287 deletions(-) (limited to 'share') diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index dd560c8d5..03515a613 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -5,7 +5,7 @@ Inkscape Icon Theme - + @@ -13,7 +13,7 @@ - + @@ -43,24 +43,22 @@ - - - - - + + + + - + - @@ -72,14 +70,14 @@ - + - + @@ -89,12 +87,10 @@ - - - - - - + + + + @@ -102,27 +98,25 @@ + - - - - - - + + + - + - + - + @@ -199,39 +193,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -281,9 +273,9 @@ - + - + @@ -293,9 +285,9 @@ + - @@ -333,11 +325,11 @@ - + - + - + @@ -352,12 +344,12 @@ - + - + @@ -377,116 +369,74 @@ - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - + @@ -667,21 +617,21 @@ - + - + - + - + @@ -691,10 +641,10 @@ - + - - + + @@ -710,15 +660,15 @@ - + - - + + @@ -743,16 +693,12 @@ - - - - - - - - - - + + + + + + @@ -765,33 +711,31 @@ - - - - - - - - - + + + + + + + - + - + + - - + @@ -802,50 +746,38 @@ - + - + - - - - + + - - - - - - - - + + + + - + - - - + + + + + - - - - - - - - - + @@ -861,7 +793,7 @@ - + @@ -928,17 +860,6 @@ - - - - - - - - - - - @@ -958,6 +879,15 @@ + + + + + + + + + @@ -978,25 +908,20 @@ - - - - - + - -- cgit v1.2.3 From 92717d75c83334b3fb09b503b98824e35c7726e5 Mon Sep 17 00:00:00 2001 From: su_v Date: Sun, 22 Mar 2015 20:30:49 +0100 Subject: symbolic_icons: cleanup tool icons (bzr r14027.1.8) --- share/icons/symbolic_icons.svg | 200 ++++++++++++++++++++--------------------- 1 file changed, 99 insertions(+), 101 deletions(-) (limited to 'share') diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index 4908d0923..f8ee796a1 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -5,7 +5,7 @@ Inkscape Icon Theme - + @@ -1285,9 +1285,9 @@ - + - + @@ -1297,42 +1297,42 @@ - + - + - + - + - + - + - + - - - - - - - + - + + + + + + + @@ -1343,15 +1343,15 @@ - - - - + + + + - - - - + + + + @@ -1359,17 +1359,10 @@ - + - - - - - - - - - + + @@ -1378,6 +1371,13 @@ + + + + + + + @@ -1388,9 +1388,9 @@ - - - + + + @@ -1404,81 +1404,63 @@ - + - - - - - - - - - - - + + + - + - - - - - - + + + + + + + + + + - - - - - + + + + + + - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -1499,6 +1481,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -2496,14 +2502,6 @@ - - - - - - - - -- cgit v1.2.3 From 5714b5cf8060e25758034fa7fcc3cd5e6adba97f Mon Sep 17 00:00:00 2001 From: su_v Date: Sun, 22 Mar 2015 20:39:42 +0100 Subject: symbolic_icons: fix usage of custom swatch color (bzr r14027.1.9) --- share/icons/symbolic_icons.svg | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'share') diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index f8ee796a1..d738a8982 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -1036,10 +1036,10 @@ - + - - + + @@ -1049,7 +1049,7 @@ - + @@ -1949,8 +1949,8 @@ - - + + @@ -3362,14 +3362,14 @@ - - + + - - - + + + -- cgit v1.2.3 From 2b9026396bb625e8fef2494320636588e1af3d0f Mon Sep 17 00:00:00 2001 From: su_v Date: Sun, 22 Mar 2015 20:57:28 +0100 Subject: symbolic_icons: add icons for mesh gradient (new in trunk) (bzr r14027.1.10) --- share/icons/symbolic_icons.svg | 61 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 5 deletions(-) (limited to 'share') diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index d738a8982..c2df5dcaa 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -13,7 +13,7 @@ - + @@ -3085,6 +3085,11 @@ + +no-marker + + + @@ -3341,9 +3346,9 @@ - + - + @@ -3353,9 +3358,9 @@ - + - + @@ -3451,5 +3456,51 @@ + +mesh-gradient + + + + + + + + + + + + + + + + +mesh-gradient-16px + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 9a12ac937fb97e6407709b2be78ff61e4844dd09 Mon Sep 17 00:00:00 2001 From: su_v Date: Sun, 22 Mar 2015 21:46:29 +0100 Subject: symbolic_icons: include missing stock icons from Gnome symbolic icons (bug #1269698), add templates icon (bug #1378338) (bzr r14027.1.11) --- share/icons/symbolic_icons.svg | 72 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index c2df5dcaa..43920f6e1 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -13,7 +13,7 @@ - + @@ -3502,5 +3502,75 @@ + +folder-templates + + + + + + + + + + + + + + + + + + + + +preferences-system + + + + + +document-revert + + + + +document-revert-rtl + + + + +go-up + + + + +go-down + + + + +edit-delete + + + + +format-indent-more + + + + + + + + +format-indent-less + + + + + + + -- cgit v1.2.3 From 69c802150c523ef855b705c3518d494123ae9619 Mon Sep 17 00:00:00 2001 From: su_v Date: Sun, 22 Mar 2015 22:42:36 +0100 Subject: symbolic_icons: cleanup the rest (toolbar controls, dialog buttons) (bzr r14027.1.12) --- share/icons/symbolic_icons.svg | 576 +++++++++++++++++++---------------------- 1 file changed, 271 insertions(+), 305 deletions(-) (limited to 'share') diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index 43920f6e1..e3480cdf0 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -5,7 +5,7 @@ Inkscape Icon Theme - + @@ -13,7 +13,7 @@ - + @@ -793,10 +793,10 @@ - + - + @@ -1008,33 +1008,33 @@ - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + @@ -1042,7 +1042,7 @@ - + @@ -1052,7 +1052,7 @@ - + @@ -1082,8 +1082,9 @@ - - + + + @@ -1109,10 +1110,10 @@ - - - + + + @@ -1139,9 +1140,9 @@ - - + + @@ -1167,54 +1168,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - + + @@ -1245,7 +1244,6 @@ - @@ -1506,25 +1504,25 @@ + - - + + - @@ -1542,42 +1540,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1670,31 +1666,25 @@ - + - + - + - - - - - - - - - - - + + + + + @@ -1724,25 +1714,25 @@ - + - - + + - + - - + + - + - - + + @@ -1752,15 +1742,15 @@ - + - - + + - + - - + + @@ -1779,37 +1769,37 @@ - + - + - + - - + + - + - + - + - + - + - + @@ -1818,28 +1808,22 @@ - - - + + + - - - - - - - + + + + + - - - - - - + + - + @@ -1848,32 +1832,30 @@ - - + + - + - - + + - - - - - - + + + + @@ -1881,22 +1863,22 @@ - + - - + + - - + - + + - - + + @@ -1904,28 +1886,20 @@ - - - - - - - - - + + + + + - - - - - - - - + + + + @@ -1934,9 +1908,9 @@ - - + + @@ -1989,49 +1963,47 @@ - + - + - - + + - - - - - + + + + - - - - - + + + + + - + - @@ -2056,7 +2028,7 @@ - + @@ -2078,10 +2050,10 @@ - - + + - + @@ -2089,19 +2061,19 @@ - - + + - + - + - - + + - + @@ -2816,18 +2788,18 @@ + - - + - - + + @@ -3073,12 +3045,8 @@ - - - - - + @@ -3104,10 +3072,10 @@ - + - + @@ -3118,7 +3086,7 @@ - + @@ -3129,8 +3097,8 @@ - - + + @@ -3201,130 +3169,128 @@ - + - + - - - - - - - - - + + + + + + + - + - + - + - + - - + + - - - + + + - + - - - + + + - + - + - - - + + + - + - - + + - - - + + + - - - + + + - - - + + + - - + + - + - - + + - + - - + + - - + + - + - - + + - + @@ -3367,15 +3333,15 @@ + - + - -- cgit v1.2.3 From ac1cc85a36fb0c23420f051c5e8bda4a5c24e21c Mon Sep 17 00:00:00 2001 From: su_v Date: Sun, 22 Mar 2015 23:13:07 +0100 Subject: symbolic_icons: add missing new icons for Arrange, Align and Distribute dialog (bzr r14027.1.13) --- share/icons/symbolic_icons.svg | 155 ++++++++++++++++++++++++++++++++--------- 1 file changed, 124 insertions(+), 31 deletions(-) (limited to 'share') diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index e3480cdf0..2ef03ab07 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -5,7 +5,7 @@ Inkscape Icon Theme - + @@ -13,7 +13,7 @@ - + @@ -95,6 +95,27 @@ + +folder-templates + + + + + + + + + + + + + + + + + + + @@ -721,6 +742,10 @@ + + + + @@ -1170,8 +1195,8 @@ - - + + @@ -1200,7 +1225,7 @@ - + @@ -3343,10 +3368,6 @@ - - - - object-symbol @@ -3468,27 +3489,6 @@ - -folder-templates - - - - - - - - - - - - - - - - - - - preferences-system @@ -3515,7 +3515,7 @@ - + edit-delete @@ -3538,5 +3538,98 @@ + +boundingbox_top_left + + + + + +boundingbox_top + + + + + +boundingbox_top_right + + + + + + + +boundingbox_left + + + + + + + +boundingbox_right + + + + + + + +boundingbox_bottom_left + + + + + + + +boundingbox_bottom + + + + + + + +boundingbox_bottom_right + + + + + + + +boundingbox_center + + + + +exchange-positions + + + + + + + + +exchange-positions-zorder + + + + + + + + + +exchange-positions-clockwise + + + + + + + -- cgit v1.2.3 From df8c6fbe899fc4fbc8e69c21cd11333ab6a5f75b Mon Sep 17 00:00:00 2001 From: su_v Date: Sun, 22 Mar 2015 23:19:43 +0100 Subject: symbolic_icons: fix icon for 'Fill between many' patheffect (bzr r14027.1.14) --- share/icons/symbolic_icons.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index 2ef03ab07..58d3a9d05 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -2608,7 +2608,7 @@ - + -- cgit v1.2.3 From e104a8a4e101d7c66e4277f811e83d6313f92047 Mon Sep 17 00:00:00 2001 From: su_v Date: Sun, 22 Mar 2015 23:28:43 +0100 Subject: symbolic_icons: check and remove improper attributes, inappropriate and unneeded style properties (bzr r14027.1.15) --- share/icons/symbolic_icons.svg | 5186 ++++++++++++++++++++-------------------- 1 file changed, 2593 insertions(+), 2593 deletions(-) (limited to 'share') diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index 58d3a9d05..789ed4175 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -6,14 +6,14 @@ - + - + @@ -36,3364 +36,3364 @@ -Use the swatch palette to change color globally +Use the swatch palette to change color globally - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + folder-templates - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - - + + - - - - - - + + + + + + - - + + - - - - - - + + + + + + - - + + - - - - - - + + + + + + - - + + - - - - + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - + - - + + - - - - - - - + + + + + + + - - - + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - + + + - - + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - + - - + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + stock-reshow-filter - - - + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - - - - - + + + + + + - - - - - - + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - + - - + + - - + + - - + + - - - - + + + + - + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - + + - + - - - + + + - - + + - + - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + - - + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - + + + - - - - - + + + + + - - + + - - + + - - - - + + + + - - + + - - + + - - - + + + - - + + - + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - + + - + - + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - + + - - + + - - + + - + - - + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - + - - + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - + + + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - + - - - + + + - - - + + + - + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - + + - - - + + + - - - - - + + + + + - - - + + + - + - - + + - - - + + + - + - + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - + + - - + + - - - - - - - + + + + + + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - - + + + no-marker - + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - + + - + - - + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - - + + + - - - - + + + + object-symbol - - + + - + object-unsymbol - + - + pack-less - - - - - + + + + + @@ -3401,16 +3401,16 @@ pack-more - - - - - - - - - - + + + + + + + + + + @@ -3423,213 +3423,213 @@ symbol-fit - + - + symbol-smaller - + - + symbol-bigger - - + + mesh-gradient - - - - - + + + + + - - - - - - + + + + + + mesh-gradient-16px - - - - - + + + + + - - - - - - + + + + + + - - - + + + - - - + + + preferences-system - - - + + + document-revert - - + + document-revert-rtl - - + + go-up - - + + go-down - - + + edit-delete - - + + format-indent-more - - - - - - + + + + + + format-indent-less - - - - - - + + + + + + boundingbox_top_left - + - + boundingbox_top - + - + boundingbox_top_right - + - + boundingbox_left - + - + boundingbox_right - + - + boundingbox_bottom_left - + - + boundingbox_bottom - + - + boundingbox_bottom_right - + - + boundingbox_center - + exchange-positions - - - - - - + + + + + + exchange-positions-zorder - - - - - - - + + + + + + + exchange-positions-clockwise - - - - - - + + + + + + -- cgit v1.2.3 From 7aff7be707266f6c52ca3f27c2a43c7b49d30aae Mon Sep 17 00:00:00 2001 From: su_v Date: Sun, 22 Mar 2015 23:38:31 +0100 Subject: symbolic_icons: fix style properties of a few clones (delete 'style' attribute) (bzr r14027.1.16) --- share/icons/symbolic_icons.svg | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'share') diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index 789ed4175..59613d543 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -6,7 +6,7 @@ - + @@ -2620,7 +2620,7 @@ - + @@ -2628,7 +2628,7 @@ - + @@ -2636,7 +2636,7 @@ - + @@ -2644,17 +2644,17 @@ - + - + - + @@ -2662,7 +2662,7 @@ - + @@ -2671,7 +2671,7 @@ - + @@ -2681,13 +2681,13 @@ - + - + @@ -2823,7 +2823,7 @@ - + @@ -3410,7 +3410,7 @@ - + -- cgit v1.2.3 From fcd1484e021af27709d7e6b134ba3288d9896e81 Mon Sep 17 00:00:00 2001 From: su_v Date: Mon, 23 Mar 2015 01:10:03 +0100 Subject: symbolic_icons: increase page size, cleanup osb swatch uses (bzr r14027.1.17) --- share/icons/symbolic_icons.svg | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'share') diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index 59613d543..c1d45ccbb 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -1,19 +1,15 @@ - + Inkscape Icon Theme - + - - - - - + @@ -336,7 +332,7 @@ - + @@ -2274,10 +2270,10 @@ - + - - + + @@ -3612,7 +3608,7 @@ - + exchange-positions-zorder @@ -3622,7 +3618,7 @@ - + exchange-positions-clockwise -- cgit v1.2.3 From 53a5a4892c54cfd52e7d85b1a494c505d83ecc68 Mon Sep 17 00:00:00 2001 From: su_v Date: Mon, 23 Mar 2015 01:34:09 +0100 Subject: symbolic_icons: group included stock icons (bzr r14027.1.18) --- share/icons/symbolic_icons.svg | 328 +++++++++++++++++++++-------------------- 1 file changed, 165 insertions(+), 163 deletions(-) (limited to 'share') diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index c1d45ccbb..8a16bb502 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -2495,120 +2495,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3485,55 +3371,6 @@ - -preferences-system - - - - - -document-revert - - - - -document-revert-rtl - - - - -go-up - - - - -go-down - - - - -edit-delete - - - - -format-indent-more - - - - - - - - -format-indent-less - - - - - - - boundingbox_top_left @@ -3627,5 +3464,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +preferences-system + + + + + +document-revert + + + + +document-revert-rtl + + + + +go-up + + + + +go-down + + + + +edit-delete + + + + +format-indent-more + + + + + + + + +format-indent-less + + + + + + + + -- cgit v1.2.3 From d72b87f55367f75d470cf561b38e68a6d66978e2 Mon Sep 17 00:00:00 2001 From: su_v Date: Mon, 23 Mar 2015 13:39:16 +0100 Subject: symbolic_icons: cleanup stock icons (remove unnecessary inkscape labels and other attributes) (bzr r14027.1.19) --- share/icons/symbolic_icons.svg | 126 ++++++++++++++++++----------------------- 1 file changed, 55 insertions(+), 71 deletions(-) (limited to 'share') diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index 8a16bb502..cd61c14df 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -5,7 +5,7 @@ Inkscape Icon Theme - + @@ -3464,119 +3464,103 @@ - - + + - + - - - - - - - + + + + + + - - + - - - + + + - + - + - - - + + + - - + + - - - + + + - + - - - - - - - - - - - - - - - + + + + + + + + + - + - - + + - + - - + + + + - - - - - - - + - - - - - + + - - - - - + + + + - - - + + + - + - - + + -- cgit v1.2.3 From 08b072a89f85d3f7432668c903fcf7684a97e05a Mon Sep 17 00:00:00 2001 From: su_v Date: Tue, 21 Apr 2015 01:11:13 +0200 Subject: symbolic_icons: fix details for Arrange buttons (bzr r14027.1.20) --- share/icons/symbolic_icons.svg | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'share') diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index cd61c14df..bc385f460 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -1,7 +1,7 @@ - + Inkscape Icon Theme @@ -3374,61 +3374,61 @@ boundingbox_top_left - + boundingbox_top + - boundingbox_top_right - + boundingbox_left + - boundingbox_right + - boundingbox_bottom_left - + boundingbox_bottom + - boundingbox_bottom_right - + -- cgit v1.2.3 From d065dd0b182b88afc1c6f53cce6a189147e70b08 Mon Sep 17 00:00:00 2001 From: Alvin Penner Date: Mon, 11 May 2015 15:24:52 -0400 Subject: patch by tbnorth for Bug 1277649 Fixed bugs: - https://launchpad.net/bugs/1277649 (bzr r14146) --- share/extensions/layout_nup.inx | 1 - share/extensions/layout_nup.py | 216 ++++++++++++++++++++++++++++- share/extensions/layout_nup_pageframe.py | 230 ------------------------------- 3 files changed, 212 insertions(+), 235 deletions(-) delete mode 100755 share/extensions/layout_nup_pageframe.py (limited to 'share') diff --git a/share/extensions/layout_nup.inx b/share/extensions/layout_nup.inx index 2b7734fc3..1d4d1ef0f 100644 --- a/share/extensions/layout_nup.inx +++ b/share/extensions/layout_nup.inx @@ -3,7 +3,6 @@ <_name>N-up layout org.greygreen.inkscape.effects.nup layout_nup.py - layout_nup_pageframe.py inkex.py diff --git a/share/extensions/layout_nup.py b/share/extensions/layout_nup.py index 5f8451c45..20532f72a 100755 --- a/share/extensions/layout_nup.py +++ b/share/extensions/layout_nup.py @@ -19,7 +19,19 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import inkex import sys -import layout_nup_pageframe +try: + import xml.etree.ElementTree as ElementTree +except: + try: + from lxml import etree as ElementTree + except: + try: + from elementtree.ElementTree import ElementTree + except: + sys.stderr.write("""Requires ElementTree module, included +in Python 2.5 or supplied by lxml or elementtree modules. + +""") class Nup(inkex.Effect): def __init__(self): @@ -64,7 +76,7 @@ class Nup(inkex.Effect): if getattr(self.options, i): showList.append(i.lower().replace('show', '')) o = self.options - self.pf = layout_nup_pageframe.GenerateNup( + self.pf = self.GenerateNup( unit=o.unit, pgSize=(o.pgSizeX,o.pgSizeY), pgMargin=(o.pgMarginTop,o.pgMarginRight,o.pgMarginBottom,o.pgMarginLeft), @@ -84,7 +96,203 @@ class Nup(inkex.Effect): def output(self): sys.stdout.write(self.pf) + def expandTuple(self, unit, x, length = 4): + try: + iter(x) + except: + return None + + if len(x) != length: x = x*2 + if len(x) != length: + raise Exception("expandTuple: requires 2 or 4 item tuple") + try: + return tuple(map(lambda ev: (self.unittouu(str(eval(str(ev)))+unit)), x)) + except: + return None + + def GenerateNup(self, + unit="px", + pgSize=("8.5*96","11*96"), + pgMargin=(0,0), + pgPadding=(0,0), + num=(2,2), + calculateSize=True, + size=None, + margin=(0,0), + padding=(20,20), + show=['default'], + container='svg', + returnTree = False, + ): + """Generate the SVG. Inputs are run through 'eval(str(x))' so you can use + '8.5*72' instead of 612. Margin / padding dimension tuples can be + (top & bottom, left & right) or (top, right, bottom, left). + + Keyword arguments: + pgSize -- page size, width x height + pgMargin -- extra space around each page + pgPadding -- added to pgMargin + n -- rows x cols + size -- override calculated size, width x height + margin -- white space around each piece + padding -- inner padding for each piece + show -- list of keywords indicating what to show + - 'crosses' - cutting guides + - 'inner' - inner boundary + - 'outer' - outer boundary + container -- 'svg' or 'g' + returnTree -- whether to return the ElementTree or the string + """ + + if 'default' in show: + show = set(show).union(['inner', 'innerbox', 'holder', 'crosses']) + + pgMargin = self.expandTuple(unit, pgMargin) + pgPadding = self.expandTuple(unit, pgPadding) + margin = self.expandTuple(unit, margin) + padding = self.expandTuple(unit, padding) + + pgSize = self.expandTuple(unit, pgSize, length = 2) + # num = tuple(map(lambda ev: eval(str(ev)), num)) + + pgEdge = map(sum,zip(pgMargin, pgPadding)) + + top, right, bottom, left = 0,1,2,3 + width, height = 0,1 + rows, cols = 0,1 + size = self.expandTuple(unit, size, length = 2) + if size == None or calculateSize == True or len(size) < 2 or size[0] == 0 or size[1] == 0: + size = ((pgSize[width] + - pgEdge[left] - pgEdge[right] + - num[cols]*(margin[left] + margin[right])) / num[cols], + (pgSize[height] + - pgEdge[top] - pgEdge[bottom] + - num[rows]*(margin[top] + margin[bottom])) / num[rows] + ) + else: + size = self.expandTuple(unit, size, length = 2) + + # sep is separation between same points on pieces + sep = (size[width]+margin[right]+margin[left], + size[height]+margin[top]+margin[bottom]) + + style = 'stroke:#000000;stroke-opacity:1;fill:none;fill-opacity:1;' + + padbox = 'rect', { + 'x': str(pgEdge[left] + margin[left] + padding[left]), + 'y': str(pgEdge[top] + margin[top] + padding[top]), + 'width': str(size[width] - padding[left] - padding[right]), + 'height': str(size[height] - padding[top] - padding[bottom]), + 'style': style, + } + margbox = 'rect', { + 'x': str(pgEdge[left] + margin[left]), + 'y': str(pgEdge[top] + margin[top]), + 'width': str(size[width]), + 'height': str(size[height]), + 'style': style, + } + + doc = ElementTree.ElementTree(ElementTree.Element(container, + {'xmlns:inkscape':"http://www.inkscape.org/namespaces/inkscape", + 'xmlns:xlink':"http://www.w3.org/1999/xlink", + 'width':str(pgSize[width]), + 'height':str(pgSize[height]), + })) + + sub = ElementTree.SubElement + + root = doc.getroot() + + def makeClones(under, to): + for r in range(0,num[rows]): + for c in range(0,num[cols]): + if r == 0 and c == 0: continue + sub(under, 'use', { + 'xlink:href': '#' + to, + 'transform': 'translate(%f,%f)' % + (c*sep[width], r*sep[height])}) + + # guidelayer ##################################################### + if set(['inner', 'outer']).intersection(show): + layer = sub(root, 'g', {'id':'guidelayer', + 'inkscape:groupmode':'layer'}) + if 'inner' in show: + padbox[1]['id'] = 'innerguide' + padbox[1]['style'] = padbox[1]['style'].replace('stroke:#000000', + 'stroke:#8080ff') + sub(layer, *padbox) + del padbox[1]['id'] + padbox[1]['style'] = padbox[1]['style'].replace('stroke:#8080ff', + 'stroke:#000000') + makeClones(layer, 'innerguide') + if 'outer' in show: + margbox[1]['id'] = 'outerguide' + margbox[1]['style'] = padbox[1]['style'].replace('stroke:#000000', + 'stroke:#8080ff') + sub(layer, *margbox) + del margbox[1]['id'] + margbox[1]['style'] = padbox[1]['style'].replace('stroke:#8080ff', + 'stroke:#000000') + makeClones(layer, 'outerguide') + + # crosslayer ##################################################### + if set(['crosses']).intersection(show): + layer = sub(root, 'g', {'id':'cutlayer', + 'inkscape:groupmode':'layer'}) + + if 'crosses' in show: + crosslen = 12 + group = sub(layer, 'g', id='cross') + x,y = 0,0 + path = 'M%f %f' % (x+pgEdge[left] + margin[left], + y+pgEdge[top] + margin[top]-crosslen) + path += ' L%f %f' % (x+pgEdge[left] + margin[left], + y+pgEdge[top] + margin[top]+crosslen) + path += ' M%f %f' % (x+pgEdge[left] + margin[left]-crosslen, + y+pgEdge[top] + margin[top]) + path += ' L%f %f' % (x+pgEdge[left] + margin[left]+crosslen, + y+pgEdge[top] + margin[top]) + sub(group, 'path', style=style+'stroke-width:0.05', + d = path, id = 'crossmarker') + for r in 0, 1: + for c in 0, 1: + if r or c: + x,y = c*size[width], r*size[height] + sub(group, 'use', { + 'xlink:href': '#crossmarker', + 'transform': 'translate(%f,%f)' % + (x,y)}) + makeClones(layer, 'cross') + + # clonelayer ##################################################### + layer = sub(root, 'g', {'id':'clonelayer', 'inkscape:groupmode':'layer'}) + makeClones(layer, 'main') + + # mainlayer ###################################################### + layer = sub(root, 'g', {'id':'mainlayer', 'inkscape:groupmode':'layer'}) + group = sub(layer, 'g', {'id':'main'}) + + if 'innerbox' in show: + sub(group, *padbox) + if 'outerbox' in show: + sub(group, *margbox) + if 'holder' in show: + x, y = (pgEdge[left] + margin[left] + padding[left], + pgEdge[top] + margin[top] + padding[top]) + w, h = (size[width] - padding[left] - padding[right], + size[height] - padding[top] - padding[bottom]) + path = 'M%f %f' % (x + w/2., y) + path += ' L%f %f' % (x + w, y + h/2.) + path += ' L%f %f' % (x + w/2., y + h) + path += ' L%f %f' % (x, y + h/2.) + path += ' Z' + sub(group, 'path', style=style, d = path) + + if returnTree: + return doc + else: + return ElementTree.tostring(root) + e = Nup() e.affect() - - diff --git a/share/extensions/layout_nup_pageframe.py b/share/extensions/layout_nup_pageframe.py deleted file mode 100755 index 471a75dd3..000000000 --- a/share/extensions/layout_nup_pageframe.py +++ /dev/null @@ -1,230 +0,0 @@ -#!/usr/bin/env python -#@+leo-ver=4-thin -#@+node:tbrown.20070622094435.1:@thin pageframe.py -"""Create n-up SVG layouts""" - -#@+others -#@+node:tbrown.20070622103716:imports -import sys, inkex - -try: - import xml.etree.ElementTree as ElementTree -except: - try: - from lxml import etree as ElementTree - except: - try: - from elementtree.ElementTree import ElementTree - except: - sys.stderr.write("""Requires ElementTree module, included -in Python 2.5 or supplied by lxml or elementtree modules. - -""") -#@-node:tbrown.20070622103716:imports -#@+node:tbrown.20070622103716.1:expandTuple -def expandTuple(unit, x, length = 4): - try: - iter(x) - except: - return None - - if len(x) != length: x = x*2 - if len(x) != length: - raise Exception("expandTuple: requires 2 or 4 item tuple") - try: - return tuple(map(lambda ev: (self.unittouu(str(eval(str(ev)))+unit)), x)) - except: - return None -#@-node:tbrown.20070622103716.1:expandTuple -#@+node:tbrown.20070622103716.2:GenerateNup -def GenerateNup(unit="px", - pgSize=("8.5*96","11*96"), - pgMargin=(0,0), - pgPadding=(0,0), - num=(2,2), - calculateSize=True, - size=None, - margin=(0,0), - padding=(20,20), - show=['default'], - container='svg', - returnTree = False, - ): - """Generate the SVG. Inputs are run through 'eval(str(x))' so you can use -'8.5*72' instead of 612. Margin / padding dimension tuples can be -(top & bottom, left & right) or (top, right, bottom, left). - -Keyword arguments: -pgSize -- page size, width x height -pgMargin -- extra space around each page -pgPadding -- added to pgMargin -n -- rows x cols -size -- override calculated size, width x height -margin -- white space around each piece -padding -- inner padding for each piece -show -- list of keywords indicating what to show - - 'crosses' - cutting guides - - 'inner' - inner boundary - - 'outer' - outer boundary -container -- 'svg' or 'g' -returnTree -- whether to return the ElementTree or the string -""" - - if 'default' in show: - show = set(show).union(['inner', 'innerbox', 'holder', 'crosses']) - - pgMargin = expandTuple(unit, pgMargin) - pgPadding = expandTuple(unit, pgPadding) - margin = expandTuple(unit, margin) - padding = expandTuple(unit, padding) - - pgSize = expandTuple(unit, pgSize, length = 2) -# num = tuple(map(lambda ev: eval(str(ev)), num)) - - pgEdge = map(sum,zip(pgMargin, pgPadding)) - - top, right, bottom, left = 0,1,2,3 - width, height = 0,1 - rows, cols = 0,1 - size = expandTuple(unit, size, length = 2) - if size == None or calculateSize == True or len(size) < 2 or size[0] == 0 or size[1] == 0: - size = ((pgSize[width] - - pgEdge[left] - pgEdge[right] - - num[cols]*(margin[left] + margin[right])) / num[cols], - (pgSize[height] - - pgEdge[top] - pgEdge[bottom] - - num[rows]*(margin[top] + margin[bottom])) / num[rows] - ) - else: - size = expandTuple(unit, size, length = 2) - - # sep is separation between same points on pieces - sep = (size[width]+margin[right]+margin[left], - size[height]+margin[top]+margin[bottom]) - - style = 'stroke:#000000;stroke-opacity:1;fill:none;fill-opacity:1;' - - padbox = 'rect', { - 'x': str(pgEdge[left] + margin[left] + padding[left]), - 'y': str(pgEdge[top] + margin[top] + padding[top]), - 'width': str(size[width] - padding[left] - padding[right]), - 'height': str(size[height] - padding[top] - padding[bottom]), - 'style': style, - } - margbox = 'rect', { - 'x': str(pgEdge[left] + margin[left]), - 'y': str(pgEdge[top] + margin[top]), - 'width': str(size[width]), - 'height': str(size[height]), - 'style': style, - } - - doc = ElementTree.ElementTree(ElementTree.Element(container, - {'xmlns:inkscape':"http://www.inkscape.org/namespaces/inkscape", - 'xmlns:xlink':"http://www.w3.org/1999/xlink", - 'width':str(pgSize[width]), - 'height':str(pgSize[height]), - })) - - sub = ElementTree.SubElement - - root = doc.getroot() - - def makeClones(under, to): - for r in range(0,num[rows]): - for c in range(0,num[cols]): - if r == 0 and c == 0: continue - sub(under, 'use', { - 'xlink:href': '#' + to, - 'transform': 'translate(%f,%f)' % - (c*sep[width], r*sep[height])}) - - # guidelayer ##################################################### - if set(['inner', 'outer']).intersection(show): - layer = sub(root, 'g', {'id':'guidelayer', - 'inkscape:groupmode':'layer'}) - if 'inner' in show: - padbox[1]['id'] = 'innerguide' - padbox[1]['style'] = padbox[1]['style'].replace('stroke:#000000', - 'stroke:#8080ff') - sub(layer, *padbox) - del padbox[1]['id'] - padbox[1]['style'] = padbox[1]['style'].replace('stroke:#8080ff', - 'stroke:#000000') - makeClones(layer, 'innerguide') - if 'outer' in show: - margbox[1]['id'] = 'outerguide' - margbox[1]['style'] = padbox[1]['style'].replace('stroke:#000000', - 'stroke:#8080ff') - sub(layer, *margbox) - del margbox[1]['id'] - margbox[1]['style'] = padbox[1]['style'].replace('stroke:#8080ff', - 'stroke:#000000') - makeClones(layer, 'outerguide') - - # crosslayer ##################################################### - if set(['crosses']).intersection(show): - layer = sub(root, 'g', {'id':'cutlayer', - 'inkscape:groupmode':'layer'}) - - if 'crosses' in show: - crosslen = 12 - group = sub(layer, 'g', id='cross') - x,y = 0,0 - path = 'M%f %f' % (x+pgEdge[left] + margin[left], - y+pgEdge[top] + margin[top]-crosslen) - path += ' L%f %f' % (x+pgEdge[left] + margin[left], - y+pgEdge[top] + margin[top]+crosslen) - path += ' M%f %f' % (x+pgEdge[left] + margin[left]-crosslen, - y+pgEdge[top] + margin[top]) - path += ' L%f %f' % (x+pgEdge[left] + margin[left]+crosslen, - y+pgEdge[top] + margin[top]) - sub(group, 'path', style=style+'stroke-width:0.05', - d = path, id = 'crossmarker') - for r in 0, 1: - for c in 0, 1: - if r or c: - x,y = c*size[width], r*size[height] - sub(group, 'use', { - 'xlink:href': '#crossmarker', - 'transform': 'translate(%f,%f)' % - (x,y)}) - makeClones(layer, 'cross') - - # clonelayer ##################################################### - layer = sub(root, 'g', {'id':'clonelayer', 'inkscape:groupmode':'layer'}) - makeClones(layer, 'main') - - # mainlayer ###################################################### - layer = sub(root, 'g', {'id':'mainlayer', 'inkscape:groupmode':'layer'}) - group = sub(layer, 'g', {'id':'main'}) - - if 'innerbox' in show: - sub(group, *padbox) - if 'outerbox' in show: - sub(group, *margbox) - if 'holder' in show: - x, y = (pgEdge[left] + margin[left] + padding[left], - pgEdge[top] + margin[top] + padding[top]) - w, h = (size[width] - padding[left] - padding[right], - size[height] - padding[top] - padding[bottom]) - path = 'M%f %f' % (x + w/2., y) - path += ' L%f %f' % (x + w, y + h/2.) - path += ' L%f %f' % (x + w/2., y + h) - path += ' L%f %f' % (x, y + h/2.) - path += ' Z' - sub(group, 'path', style=style, d = path) - - if returnTree: - return doc - else: - return ElementTree.tostring(root) - -if __name__ == '__main__': - print GenerateNup(num=(10,3), margin=(5,5), show=['default', 'outer']) -#@-node:tbrown.20070622103716.2:GenerateNup -#@-others -#@-node:tbrown.20070622094435.1:@thin pageframe.py -#@-leo - - -- cgit v1.2.3 From 188d2565925f2d015fd138e87c5e80e29085dcee Mon Sep 17 00:00:00 2001 From: Alvin Penner Date: Thu, 14 May 2015 07:31:23 -0400 Subject: extensions. layout_nup. convert units. (Bug 1453982) Fixed bugs: - https://launchpad.net/bugs/1453982 (bzr r14153) --- share/extensions/layout_nup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/extensions/layout_nup.py b/share/extensions/layout_nup.py index 20532f72a..266a3950d 100755 --- a/share/extensions/layout_nup.py +++ b/share/extensions/layout_nup.py @@ -106,7 +106,7 @@ class Nup(inkex.Effect): if len(x) != length: raise Exception("expandTuple: requires 2 or 4 item tuple") try: - return tuple(map(lambda ev: (self.unittouu(str(eval(str(ev)))+unit)), x)) + return tuple(map(lambda ev: (self.unittouu(str(eval(str(ev)))+unit)/self.unittouu('1px')), x)) except: return None -- cgit v1.2.3 From cca96cf13aa03a1ea90b64b69af8e4410d0f34d1 Mon Sep 17 00:00:00 2001 From: su_v Date: Wed, 20 May 2015 18:33:54 +0200 Subject: Add extension to set attributes for bitmap images (bug #1357808) Inkscape >= 0.91 adds the attribute 'preserveAspectRatio' to imported bitmap images, and sets it to 'none' (to support non-uniform scaling). Unlike older versions it also respects the attribute for rendering. This change may break Inkscape documents with embedded or linked bitmap images which had been created with older versions of Inkscape (the images do not have the attribute set, and thus default to 'xMidYMid' with enforced uniform scaling). The extension allows to add the attribute to selected or all bitmap images in the current document (including bitmap images used as masks, which are stored in the section). Fixed bugs: - https://launchpad.net/bugs/1357808 (bzr r14164) --- share/extensions/image_attributes.inx | 82 +++++++++++++++++ share/extensions/image_attributes.py | 169 ++++++++++++++++++++++++++++++++++ 2 files changed, 251 insertions(+) create mode 100644 share/extensions/image_attributes.inx create mode 100755 share/extensions/image_attributes.py (limited to 'share') diff --git a/share/extensions/image_attributes.inx b/share/extensions/image_attributes.inx new file mode 100644 index 000000000..d0c00f6a2 --- /dev/null +++ b/share/extensions/image_attributes.inx @@ -0,0 +1,82 @@ + + + + <_name>Set Image Attributes + org.inkscape.effect.image_attributes + + image_attributes.py + inkex.py + + + + + + Render all bitmap images like in older Inskcape versions. + +Available options: + true + false + + + + + + none + Unset + xMinYMin + xMidYMin + xMaxYMin + xMinYMid + xMidYMid + xMaxYMid + xMinYMax + xMidYMax + xMaxYMax + + + - + meet + slice + + + Change only selected image(s) + Change all images in selection + Change all images in document + + + + + + + Unset + auto + optimizeQuality + optimizeSpeed + inherit + + + Change only selected image(s) + Change all images in selection + Change all images in document + Apply attribute to parent group of selection + Apply attribute to SVG root + + + + + + + all + + + + + + + + + + + diff --git a/share/extensions/image_attributes.py b/share/extensions/image_attributes.py new file mode 100755 index 000000000..ddd5a8b87 --- /dev/null +++ b/share/extensions/image_attributes.py @@ -0,0 +1,169 @@ +#!/usr/bin/env python +''' +image_attributes.py - adjust image attributes which don't have global +GUI options yet + +Tool for Inkscape 0.91 to adjust rendering of drawings with linked +or embedded bitmap images created with older versions of Inkscape +or third-party applications. + +Copyright (C) 2015, ~suv + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +''' + +# local library +import inkex +import simplestyle + +try: + inkex.localize() +except: + import gettext + _ = gettext.gettext + + +class SetAttrImage(inkex.Effect): + def __init__(self): + inkex.Effect.__init__(self) + # main options + self.OptionParser.add_option("--fix_scaling", + action="store", type="inkbool", + dest="fix_scaling", default=True, + help="") + self.OptionParser.add_option("--fix_rendering", + action="store", type="inkbool", + dest="fix_rendering", default=False, + help="") + self.OptionParser.add_option("--aspect_ratio", + action="store", type="string", + dest="aspect_ratio", default="none", + help="Value for attribute 'preserveAspectRatio'") + self.OptionParser.add_option("--aspect_clip", + action="store", type="string", + dest="aspect_clip", default="unset", + help="optional 'meetOrSlice' value") + self.OptionParser.add_option("--aspect_ratio_scope", + action="store", type="string", + dest="aspect_ratio_scope", default="selected_only", + help="scope within which to edit 'preserveAspectRatio' attribute") + self.OptionParser.add_option("--image_rendering", + action="store", type="string", + dest="image_rendering", default="unset", + help="Value for attribute 'image-rendering'") + self.OptionParser.add_option("--image_rendering_scope", + action="store", type="string", + dest="image_rendering_scope", default="selected_only", + help="scope within which to edit 'image-rendering' attribute") + # tabs + self.OptionParser.add_option("--tab_main", + action="store", type="string", + dest="tab_main") + + # core method + + def change_attribute(self, node, attribute): + for key, value in attribute.items(): + if key == 'preserveAspectRatio': + # set presentation attribute + if value != "unset": + node.set(key, str(value)) + else: + if node.get(key): + del node.attrib[key] + elif key == 'image-rendering': + node_style = simplestyle.parseStyle(node.get('style')) + if key not in node_style: + # set presentation attribute + if value != "unset": + node.set(key, str(value)) + else: + if node.get(key): + del node.attrib[key] + else: + # set style property + if value != "unset": + node_style[key] = str(value) + else: + del node_style[key] + node.set('style', simplestyle.formatStyle(node_style)) + else: + pass + + def change_all_images(self, node, attribute): + path = 'descendant-or-self::svg:image' + for img in node.xpath(path, namespaces=inkex.NSS): + self.change_attribute(img, attribute) + + # methods called via dispatcher + + def change_selected_only(self, selected, attribute): + if selected: + for node_id, node in selected.iteritems(): + if node.tag == inkex.addNS('image', 'svg'): + self.change_attribute(node, attribute) + + def change_in_selection(self, selected, attribute): + if selected: + for node_id, node in selected.iteritems(): + self.change_all_images(node, attribute) + + def change_in_document(self, selected, attribute): + self.change_all_images(self.document.getroot(), attribute) + + def change_on_parent_group(self, selected, attribute): + if selected: + for node_id, node in selected.iteritems(): + self.change_attribute(node.getparent(), attribute) + + def change_on_root_only(self, selected, attribute): + self.change_attribute(self.document.getroot(), attribute) + + # main + + def effect(self): + attr_val = [] + attr_dict = {} + cmd_scope = None + if self.options.tab_main == '"tab_basic"': + cmd_scope = "in_document" + attr_dict['preserveAspectRatio'] = ("none" if self.options.fix_scaling else "unset") + attr_dict['image-rendering'] = ("optimizeSpeed" if self.options.fix_rendering else "unset") + elif self.options.tab_main == '"tab_aspectRatio"': + attr_val = [self.options.aspect_ratio] + if self.options.aspect_clip != "unset": + attr_val.append(self.options.aspect_clip) + attr_dict['preserveAspectRatio'] = ' '.join(attr_val) + cmd_scope = self.options.aspect_ratio_scope + elif self.options.tab_main == '"tab_image_rendering"': + attr_dict['image-rendering'] = self.options.image_rendering + cmd_scope = self.options.image_rendering_scope + else: # help tab + pass + # dispatcher + if cmd_scope is not None: + try: + change_cmd = getattr(self, 'change_{0}'.format(cmd_scope)) + change_cmd(self.selected, attr_dict) + except AttributeError: + inkex.errormsg('Scope "{0}" not supported'.format(cmd_scope)) + + +if __name__ == '__main__': + e = SetAttrImage() + e.affect() + + +# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99 -- cgit v1.2.3 From b448141187609c91e294668e6a1bc2fef90097f7 Mon Sep 17 00:00:00 2001 From: su_v Date: Thu, 21 May 2015 04:41:20 +0200 Subject: image_attributes.inx: mark more strings for translation; update POTFILES.in (bzr r14165) --- share/extensions/image_attributes.inx | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'share') diff --git a/share/extensions/image_attributes.inx b/share/extensions/image_attributes.inx index d0c00f6a2..a353d17e5 100644 --- a/share/extensions/image_attributes.inx +++ b/share/extensions/image_attributes.inx @@ -11,9 +11,9 @@ - Render all bitmap images like in older Inskcape versions. + <_param name="basic_desc1" type="description">Render all bitmap images like in older Inskcape versions. -Available options: +Available options: true false @@ -22,7 +22,7 @@ Available options: none - Unset + <_item value="unset">Unset xMinYMin xMidYMin xMaxYMin @@ -39,27 +39,27 @@ Available options: slice - Change only selected image(s) - Change all images in selection - Change all images in document + <_item value="selected_only">Change only selected image(s) + <_item value="in_selection">Change all images in selection + <_item value="in_document">Change all images in document - Unset + <_item value="unset">Unset auto optimizeQuality optimizeSpeed inherit - Change only selected image(s) - Change all images in selection - Change all images in document - Apply attribute to parent group of selection - Apply attribute to SVG root + <_item value="selected_only">Change only selected image(s) + <_item value="in_selection">Change all images in selection + <_item value="in_document">Change all images in document + <_item value="on_parent_group">Apply attribute to parent group of selection + <_item value="on_root_only" >Apply attribute to SVG root -- cgit v1.2.3 From 6fef189d76c8b1b794834ed0a6a66398ccc68aee Mon Sep 17 00:00:00 2001 From: Alvin Penner Date: Thu, 28 May 2015 06:59:37 -0400 Subject: extensions. measure path. fix for Bug 1429932 Fixed bugs: - https://launchpad.net/bugs/1429932 (bzr r14182) --- share/extensions/measure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/extensions/measure.py b/share/extensions/measure.py index cdccb6bb8..e7c91feec 100755 --- a/share/extensions/measure.py +++ b/share/extensions/measure.py @@ -188,13 +188,13 @@ class Length(inkex.Effect): factor = self.unittouu(doc.get('height'))/float(viewh) factor /= self.unittouu('1px') self.options.fontsize /= factor + factor *= scale/self.unittouu('1'+self.options.unit) # loop over all selected paths for id, node in self.selected.iteritems(): if node.tag == inkex.addNS('path','svg'): mat = simpletransform.composeParents(node, [[1.0, 0.0, 0.0], [0.0, 1.0, 0.0]]) p = cubicsuperpath.parsePath(node.get('d')) simpletransform.applyTransformToPath(mat, p) - factor *= scale/self.unittouu('1'+self.options.unit) if self.options.type == "length": slengths, stotal = csplength(p) self.group = inkex.etree.SubElement(node.getparent(),inkex.addNS('text','svg')) -- cgit v1.2.3 From ebd4c060dc031ef78cabf02cac328534023a91c3 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Thu, 25 Jun 2015 12:58:10 +0200 Subject: XAML. Fix for bug #1457891 (FillRule property values are case sensitive). Fixed bugs: - https://launchpad.net/bugs/1457891 (bzr r14214) --- share/extensions/svg2xaml.xsl | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'share') diff --git a/share/extensions/svg2xaml.xsl b/share/extensions/svg2xaml.xsl index d2796c93c..c384b022f 100755 --- a/share/extensions/svg2xaml.xsl +++ b/share/extensions/svg2xaml.xsl @@ -1266,25 +1266,28 @@ exclude-result-prefixes="rdf xlink xs exsl libxslt inkscape"> --> - - - - + + NonZero + + + EvenOdd - - - - + + NonZero + + + EvenOdd - - - - + + NonZero + + + EvenOdd -- cgit v1.2.3 From dfbca58488048a3dbce51ab83d05987a4fa86ce9 Mon Sep 17 00:00:00 2001 From: su_v Date: Thu, 25 Jun 2015 16:03:32 +0200 Subject: Extensions. webslicer_export.py - return message if no slicer layer found (bug #1198826) (bzr r14216) --- share/extensions/webslicer_export.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/extensions/webslicer_export.py b/share/extensions/webslicer_export.py index c9ea761a7..a8a3c67ba 100755 --- a/share/extensions/webslicer_export.py +++ b/share/extensions/webslicer_export.py @@ -72,7 +72,13 @@ class WebSlicer_Export(WebSlicer_Effect): else: inkex.errormsg(_('The directory "%s" does not exists.') % self.options.dir) return - self.unique_html_id( self.get_slicer_layer() ) + # Check whether slicer layer exists (bug #1198826) + slicer_layer = self.get_slicer_layer() + if slicer_layer is None: + inkex.errormsg(_('No slicer layer found.')) + return {'error':'No slicer layer found.'} + else: + self.unique_html_id( slicer_layer ) return None -- cgit v1.2.3