diff options
| author | Andy Hertzfeld <andy@src.gnome.org> | 2000-10-06 00:07:46 +0000 |
|---|---|---|
| committer | Andy Hertzfeld <andy@src.gnome.org> | 2000-10-06 00:07:46 +0000 |
| commit | 85fedef727f6953884891a5d85ed0af029059810 (patch) | |
| tree | f49a2f9ab7c92535696985d425f9f9554e4d3e52 | |
| parent | 4cbf66e49fbe3e14db8e7cf8262f417ba4224a81 (diff) | |
| download | nautilus-85fedef727f6953884891a5d85ed0af029059810.tar.gz | |
made it use nautilus_image instead of gtk_pixmap so nice anti-aliased
made it use nautilus_image instead of gtk_pixmap so nice
anti-aliased emblems can be displayed, plus new or updated
emblems from Susan.
34 files changed, 285 insertions, 145 deletions
@@ -1,3 +1,35 @@ +2000-10-05 Andy Hertzfeld <andy@eazel.com> + + * libnautilus-extensions/nautilus-customization-data.c: + (nautilus_customization_data_get_next_element_for_display): + made it use nautilus_image instead of gtk_pixmap so nice + anti-aliased emblems can be displayed + + * src/nautilus-property-browser.c: (make_drag_image), + (element_clicked_callback), (make_properties_from_xml_node): + made it deal with nautilus_image instead of pixwidgets + + * data/emblems/Makefile.am: + * icons/Makefile.am: + * icons/emblem-OK.svg: + * icons/emblem-distinguished.svg: + * icons/emblem-draft.svg: + * icons/emblem-favorite.svg: + * icons/emblem-generic.svg: + * icons/emblem-important.svg: + * icons/emblem-new.svg: + * icons/emblem-noread.svg: + * icons/emblem-nowrite.svg: + * icons/emblem-ohno.svg: + * icons/emblem-personal.svg: + * icons/emblem-shared.svg: + * icons/emblem-special.svg: + * icons/emblem-urgent.svg: + new or update emblems from Susan + + * libnautilus-extensions/nautilus-image.h: + removed spurious comment + 2000-10-05 Mike Fleming <mfleming@eazel.com> * nautilus-clean.sh: diff --git a/data/emblems/Makefile.am b/data/emblems/Makefile.am index 6ffb45a11..ef785634b 100644 --- a/data/emblems/Makefile.am +++ b/data/emblems/Makefile.am @@ -13,6 +13,8 @@ emblems_DATA = \ ohno.png \ OK.png \ personal.png \ + special.png \ + shared.png \ urgent.png \ $(NULL) diff --git a/data/emblems/OK.png b/data/emblems/OK.png Binary files differindex c5847fb26..0d16b7e51 100644 --- a/data/emblems/OK.png +++ b/data/emblems/OK.png diff --git a/data/emblems/distinguished.png b/data/emblems/distinguished.png Binary files differindex ed3d2faf3..f6641bb38 100644 --- a/data/emblems/distinguished.png +++ b/data/emblems/distinguished.png diff --git a/data/emblems/draft.png b/data/emblems/draft.png Binary files differindex 09bf1cfae..1d03a97fd 100644 --- a/data/emblems/draft.png +++ b/data/emblems/draft.png diff --git a/data/emblems/favorite.png b/data/emblems/favorite.png Binary files differindex e260cae07..afe161c56 100644 --- a/data/emblems/favorite.png +++ b/data/emblems/favorite.png diff --git a/data/emblems/important.png b/data/emblems/important.png Binary files differindex 83ecc2353..1a55fba3c 100644 --- a/data/emblems/important.png +++ b/data/emblems/important.png diff --git a/data/emblems/new.png b/data/emblems/new.png Binary files differindex 4501c9b8a..7ae668458 100644 --- a/data/emblems/new.png +++ b/data/emblems/new.png diff --git a/data/emblems/ohno.png b/data/emblems/ohno.png Binary files differindex f994fd5b1..b6ea1b52d 100644 --- a/data/emblems/ohno.png +++ b/data/emblems/ohno.png diff --git a/data/emblems/personal.png b/data/emblems/personal.png Binary files differindex b9d060bb2..6c437190f 100644 --- a/data/emblems/personal.png +++ b/data/emblems/personal.png diff --git a/data/emblems/shared.png b/data/emblems/shared.png Binary files differnew file mode 100644 index 000000000..e94bdaa25 --- /dev/null +++ b/data/emblems/shared.png diff --git a/data/emblems/special.png b/data/emblems/special.png Binary files differnew file mode 100644 index 000000000..1b6d969a7 --- /dev/null +++ b/data/emblems/special.png diff --git a/data/emblems/urgent.png b/data/emblems/urgent.png Binary files differindex 27987a01d..4e9d9f18c 100644 --- a/data/emblems/urgent.png +++ b/data/emblems/urgent.png diff --git a/icons/Makefile.am b/icons/Makefile.am index 9695456e0..48e1dc90c 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -30,12 +30,14 @@ icon_DATA =\ emblem-important.svg \ emblem-new.svg \ emblem-noread.svg \ - emblem-nowrite.png \ + emblem-nowrite.svg \ emblem-ohno.svg \ emblem-OK.svg \ emblem-personal.svg \ emblem-remote.gif \ emblem-trash.png \ + emblem-shared.svg \ + emblem-special.svg \ emblem-symbolic-link.png \ emblem-urgent.svg \ emblems.png \ diff --git a/icons/emblem-OK.svg b/icons/emblem-OK.svg index df50c1f28..6e074f843 100644 --- a/icons/emblem-OK.svg +++ b/icons/emblem-OK.svg @@ -2,16 +2,22 @@ <!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN" "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [ <!ENTITY st0 "fill-rule:nonzero;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;"> - <!ENTITY st1 "fill:#3466DE;"> + <!ENTITY st1 "fill:#3466DE;stroke:#3466DE;stroke-width:2.9783;"> <!ENTITY st2 "stroke:none;"> ]> -<svg width="26pt" height="24pt" viewBox="0 0 26 24" xml:space="preserve"> +<svg width="30pt" height="30pt" viewBox="0 0 30 30" xml:space="preserve"> <g id="Layer_x0020_1" style="&st0;"> <g style="&st2;"> - <path style="&st1;" d="M19.454,3.337c4.451,4.45,4.449,11.666,0,16.117c-4.449,4.449-11.664,4.449-16.115,0c-4.451-4.451-4.451-11.667,0-16.116c4.451-4.45,11.666-4.45,16.115,0z"/> - <path d="M5.734,15.292c-0.642-0.643-2.193-1.994-0.974-3.213c1.152-1.152,2.592,0.354,3.256,1.02l2.128,2.127c0.798,0.799,1.927,1.95,0.82,3.059c-1.063,1.063-2.237,0-2.927-0.688l-2.304-2.305z M5.668,18.417c2.216,2.217,3.999,3.667,6.549,1.119 - c2.546-2.549,1.096-4.332-1.121-6.549l-1.186-1.185c-2.184-2.049-3.923-3.457-6.403-0.976c-2.483,2.482-1.074,4.223,0.974,6.404l1.188,1.186z"/> - <path d="M16.116,15.237l-8.31-8.31l1.552-1.551l3.689,3.69l0.021-0.022c-0.41-0.897-0.742-2.028-1.02-2.97l-0.786-2.604l1.749-1.751l1.52,5.618l6.891,2.592l-1.75,1.751L14.93,9.864l0.355,1.44l2.381,2.382l-1.551,1.551z"/> + <g> + <g> + <path style="&st1;" d="M14.364,27.242c7.111,0,12.876-5.766,12.876-12.877c0-7.111-5.765-12.876-12.876-12.876S1.487,7.253,1.487,14.365c0,7.112,5.766,12.877,12.877,12.877z"/> + </g> + </g> + <g> + <path d="M6.757,18.987c-0.795-0.797-2.715-2.47-1.207-3.979c1.428-1.427,3.211,0.438,4.035,1.263l2.635,2.634c0.986,0.988,2.387,2.415,1.014,3.787c-1.316,1.317-2.771,0-3.621-0.851l-2.855-2.854z M6.675,22.856c2.744,2.744,4.953,4.541,8.109,1.386 + c3.156-3.156,1.359-5.364-1.385-8.109l-1.469-1.468c-2.703-2.538-4.857-4.28-7.932-1.208c-3.072,3.074-1.33,5.229,1.209,7.932l1.467,1.468z"/> + <path d="M19.614,18.918L9.323,8.628l1.922-1.921l4.568,4.569l0.027-0.027c-0.508-1.111-0.918-2.512-1.262-3.678l-0.975-3.225l2.168-2.168l1.879,6.957l8.535,3.21l-2.168,2.168l-5.873-2.25l0.439,1.784l2.949,2.949l-1.92,1.921z"/> + </g> </g> </g> </svg> diff --git a/icons/emblem-distinguished.svg b/icons/emblem-distinguished.svg index f5d3aa6ea..45477196c 100644 --- a/icons/emblem-distinguished.svg +++ b/icons/emblem-distinguished.svg @@ -1,24 +1,22 @@ -<svg width="29" height="42"> - <!-- CertifiedEmblem62000.eps converted by ill2svg.pl --> - <defs> - </defs> - <g> <!-- Layer: Layer 1 --> - <g style="fill: #254b8b"> - <path d="M7.808 14.461L8.756 37.652L12.704 33.036L16.373 36.953C16.373 36.953 15.618 16.521 15.914 13.303"/> - <!-- 0 1 1 1 0.8745 0.5333 0.1294 0.0353 /BBAccumRotation --> - <!-- (0.288975) XT --> - </g> - <g style="fill: #254b8b; stroke: #ffffff; stroke-width: 1.35; stroke-miterlimit: 4"> - <path d="M16.625 12.228L27.618 32.671L22.132 32.11L20.764 39.09C20.764 39.09 9.949 17.695 8.056 15.076"/> - <!-- 0 0 0 0 /BBAccumRotation --> - <!-- (0.288975) XT --> - <!-- 1 Ap --> - <path d="M13.384 19.268C18.212 17.832 20.964 12.753 19.528 7.925C18.093 3.096 13.014 0.345 8.185 1.781C3.356 3.216 0.605 8.295 2.041 13.123C3.477 17.952 8.555 20.703 13.384 19.268z"/> - <!-- /BBAccumRotation --> - <!-- (0.288975) XT --> - <path d="M12.077 14.873C14.476 14.16 15.841 11.635 15.127 9.233C14.413 6.832 11.89 5.463 9.492 6.176C7.093 6.889 5.728 9.414 6.442 11.815C7.156 14.217 9.679 15.586 12.077 14.873z"/> - <!-- /BBAccumRotation --> - <!-- (0.288975) XT --> - </g> - </g> +<?xml version="1.0" encoding="iso-8859-1"?> +<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN" "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [ + <!ENTITY st0 "fill:#FFE64C;stroke:none;"> + <!ENTITY st1 "fill:#264C8B;stroke:#FFFFFF;stroke-width:0.6946;"> + <!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;"> +]> +<svg width="27.7pt" height="43.871pt" viewBox="0 0 27.7 43.871" xml:space="preserve"> + <g id="Layer_x0020_1" style="&st2;"> + <g> + <g> + <g> + <g> + </g> + </g> + </g> + <path style="&st1;" d="M0.44,5.131l12.855,37.835l4.558-9.247l9.248,4.558L14.245,0.44L0.44,5.131z"/> + <path style="&st0;" d="M15.958,16.398L9.271,18.67l-0.595-1.749l2.109-0.717l-1.8-5.297l-2.109,0.716L6.323,9.994C6.645,9.885,6.948,9.761,7.23,9.622c0.283-0.139,0.507-0.289,0.672-0.45c0.194-0.19,0.319-0.396,0.375-0.615S8.325,8.09,8.251,7.814l2.233-0.759 + l2.817,8.293l2.062-0.7l0.594,1.75z"/> + </g> + </g> </svg> diff --git a/icons/emblem-draft.svg b/icons/emblem-draft.svg index 112459c74..46537fe54 100644 --- a/icons/emblem-draft.svg +++ b/icons/emblem-draft.svg @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN" "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [ - <!ENTITY st0 "fill:#FFFFFF;stroke:#274D8B;stroke-width:2;"> - <!ENTITY st1 "fill:#FFFFFF;stroke:#274D8B;stroke-width:1.8646;"> - <!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;fill:#274D8B;stroke:#000000;stroke-miterlimit:4;"> - <!ENTITY st3 "stroke:none;"> + <!ENTITY st0 "fill-rule:nonzero;clip-rule:nonzero;fill:#274D8B;stroke:#000000;stroke-miterlimit:4;"> + <!ENTITY st1 "fill:#FFFFFF;stroke:#274D8B;stroke-width:3.15;"> + <!ENTITY st2 "stroke:none;"> ]> -<svg width="38pt" height="18pt" viewBox="0 0 38 18" xml:space="preserve"> - <g id="Layer_x0020_1" style="&st2;"> - <g style="&st3;"> - <path style="&st1;" d="M25.573,15.512c4.008,0,7.256-3.248,7.256-7.256S29.581,1,25.573,1H8.186C4.18,1,0.931,4.249,0.931,8.256s3.249,7.256,7.255,7.256h17.387z"/> - <path style="&st0;" d="M26.047,15.512c4.008,0,7.256-3.248,7.256-7.256S30.055,1,26.047,1H8.661C4.655,1,1.406,4.249,1.406,8.256s3.249,7.256,7.255,7.256h17.387z"/> - <path d="M6.826,6.527c0.87,0,1.017,1.063,1.017,1.829c0,0.662-0.146,1.745-1.017,1.754V6.527z M4.922,11.809h1.662c1.156,0,3.201-0.299,3.201-3.546c0-2.128-1.168-3.49-3.333-3.49h-1.53v7.036z"/> - <path d="M12.604,8.02V6.284c0.521-0.028,0.895,0.234,0.895,0.849c0,0.457-0.271,0.896-0.773,0.896l-0.121-0.01z M15.709,11.809l-1.418-2.932c0.756-0.297,1.094-0.988,1.094-1.763c0-1.857-1.195-2.342-2.848-2.342H10.7v7.036h1.904V9.933 - c0-0.346-0.021-0.69-0.028-1.036l0.017-0.02l1.057,2.932h2.061z"/> - <path d="M18.221,9.411l0.261-1.633c0.076-0.439,0.122-0.887,0.177-1.326h0.02c0.044,0.439,0.084,0.887,0.138,1.326l0.206,1.633h-0.801z M21.356,11.809l-1.494-7.036H17.54l-1.689,7.036h1.96l0.157-0.906h1.281l0.137,0.906h1.971z"/> - <path d="M21.983,11.809V4.773h3.358v1.661h-1.458v1.017h1.363v1.66h-1.363v2.698h-1.9z"/> - <path d="M27.17,11.809V6.49h-1.047V4.773h4.041V6.49h-1.092v5.319H27.17z"/> +<svg width="52pt" height="26pt" viewBox="0 0 52 26" xml:space="preserve"> + <g id="Layer_x0020_1" style="&st0;"> + <g style="&st2;"> + <g> + <path style="&st1;" d="M38.743,23.465c6.044,0,10.945-4.9,10.945-10.945c0-6.045-4.901-10.945-10.945-10.945H12.519c-6.045,0-10.946,4.9-10.946,10.945c0,6.044,4.901,10.945,10.946,10.945h26.224z"/> + </g> + <path d="M9.777,9.958c1.306,0,1.529,1.601,1.529,2.752c0,0.997-0.224,2.625-1.529,2.639V9.958z M6.913,17.905h2.499c1.741,0,4.816-0.449,4.816-5.334c0-3.201-1.757-5.251-5.014-5.251H6.913v10.586z"/> + <path d="M18.467,12.205V9.594c0.786-0.042,1.348,0.351,1.348,1.278c0,0.688-0.406,1.348-1.164,1.348l-0.184-0.014z M23.143,17.905l-2.135-4.408c1.137-0.449,1.643-1.488,1.643-2.653c0-2.794-1.797-3.524-4.281-3.524h-2.766v10.586h2.863v-2.821 + c0-0.52-0.027-1.039-0.042-1.559l0.028-0.028l1.586,4.408h3.104z"/> + <path d="M26.919,14.297l0.393-2.457c0.112-0.66,0.183-1.334,0.267-1.994h0.027c0.07,0.66,0.127,1.334,0.211,1.994l0.311,2.457h-1.208z M31.637,17.905L29.391,7.319h-3.496l-2.543,10.586h2.949l0.238-1.361h1.924l0.21,1.361h2.964z"/> + <path d="M32.578,17.905V7.319h5.054v2.5h-2.19v1.53h2.05v2.5h-2.05v4.057h-2.863z"/> + <path d="M40.383,17.905V9.903h-1.572V7.319h6.078v2.584h-1.642v8.002h-2.864z"/> </g> </g> </svg> diff --git a/icons/emblem-favorite.svg b/icons/emblem-favorite.svg index 098716e5c..e984fe58c 100644 --- a/icons/emblem-favorite.svg +++ b/icons/emblem-favorite.svg @@ -1,14 +1,18 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN" "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [ - <!ENTITY st0 "fill:#006532;stroke:none;"> + <!ENTITY st0 "fill:#890C4C;stroke:none;"> <!ENTITY st1 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;"> ]> -<svg width="22pt" height="24" viewBox="0 0 22 24" xml:space="preserve"> +<svg width="30pt" height="30pt" viewBox="0 0 30 30" xml:space="preserve"> <g id="Layer_x0020_1" style="&st1;"> <g> - <path style="&st0;" d="M9.691,21.246c-4.141-4.592-7.279-9.018-7.279-9.018C0.906,10.249-0.393,6.887,0,4.504C0.393,2.113,2.393,0,4.785,0c2.6,0,4.285,1.92,4.906,4.255"/> - <path style="&st0;" d="M9.676,4.255C10.297,1.92,11.981,0,14.581,0c2.394,0,4.393,2.113,4.786,4.504c0.393,2.383-0.906,5.745-2.414,7.725c0,0-3.139,4.426-7.277,9.018"/> + <g> + <path style="&st0;" d="M13.382,6.24c0.25-1.125,1.186-4.296,4.041-5.833c3.25-1.75,7.875-0.375,9.375,3.125c1.322,3.083,1.102,6.049-0.875,10c-1.375,2.75-5,6.875-6.25,8.25c-1.07,1.178-5.5,5.5-5.875,5.875"/> + </g> + <g> + <path style="&st0;" d="M14.215,6.24c-0.25-1.125-1.187-4.296-4.042-5.833c-3.25-1.75-7.875-0.375-9.375,3.125c-1.321,3.083-1.101,6.049,0.875,10c1.375,2.75,5,6.875,6.25,8.25c1.07,1.178,5.5,5.5,5.875,5.875"/> + </g> </g> </g> </svg> diff --git a/icons/emblem-generic.svg b/icons/emblem-generic.svg index 409424e44..a24c8712d 100644 --- a/icons/emblem-generic.svg +++ b/icons/emblem-generic.svg @@ -1,15 +1,23 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN" "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [ - <!ENTITY st0 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;"> - <!ENTITY st1 "fill:#409D27;stroke:none;"> - <!ENTITY st2 "fill:#FFFFFF;stroke:#409D27;stroke-width:3;"> + <!ENTITY st0 "fill:#4FA52B;stroke:none;"> + <!ENTITY st1 "fill:#FFFFFF;stroke:#4FA52B;stroke-width:3.75;"> + <!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;"> ]> -<svg width="24.221pt" height="24.226pt" viewBox="0 0 24.221 24.226" xml:space="preserve"> - <g id="Layer_x0020_1" style="&st0;"> +<svg width="32pt" height="32pt" viewBox="0 0 32 32" xml:space="preserve"> + <g id="Layer_x0020_1" style="&st2;"> <g> - <path style="&st2;" d="M22.723,12.112c0,5.862-4.752,10.614-10.613,10.614c-5.86,0-10.611-4.752-10.611-10.614C1.498,6.251,6.249,1.5,12.109,1.5c5.861,0,10.613,4.752,10.613,10.613z"/> - <path style="&st1;" d="M10.061,18.867l0.383-3.939l-3.137,2.252l-1.99-3.438l3.559-1.608l-3.559-1.648l1.99-3.446l3.137,2.3l-0.383-3.98h3.979l-0.382,3.98l3.217-2.3l2.029,3.446l-3.638,1.648l3.638,1.608l-2.029,3.438l-3.217-2.252l0.382,3.939h-3.979"/> + <g> + <g> + <path style="&st1;" d="M14.75,27.628c7.112,0,12.875-5.766,12.875-12.877c0-7.111-5.764-12.876-12.875-12.876c-7.111,0-12.877,5.765-12.877,12.876c0,7.112,5.766,12.877,12.877,12.877z"/> + </g> + </g> + <g> + </g> + </g> + <g> + <path style="&st0;" d="M16.934,22.39h-4.5l0.432-4.457l-3.549,2.553l-2.25-3.895l4.025-1.818l-4.025-1.861l2.25-3.895l3.549,2.598l-0.432-4.502h4.5l-0.432,4.502l3.635-2.598l2.295,3.895l-4.113,1.861l4.113,1.818l-2.295,3.895l-3.635-2.553l0.432,4.457z"/> </g> </g> </svg> diff --git a/icons/emblem-important.svg b/icons/emblem-important.svg index de24418b2..774f4e76e 100644 --- a/icons/emblem-important.svg +++ b/icons/emblem-important.svg @@ -2,15 +2,25 @@ <!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN" "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [ <!ENTITY st0 "fill:#D90000;stroke:none;"> - <!ENTITY st1 "fill:#FFFFFF;stroke:#D40026;stroke-width:2.6552;"> + <!ENTITY st1 "fill:#FFFFFF;stroke:#D90000;stroke-width:3.75;"> <!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;"> ]> -<svg width="26pt" height="26pt" viewBox="0 0 26 26" xml:space="preserve"> +<svg width="32pt" height="32pt" viewBox="0 0 32 32" xml:space="preserve"> <g id="Layer_x0020_1" style="&st2;"> <g> - <path style="&st1;" d="M22.568,11.949c0,5.865-4.756,10.62-10.621,10.62S1.326,17.814,1.326,11.949c0-5.866,4.756-10.622,10.621-10.622s10.621,4.756,10.621,10.622z"/> - <path style="&st0;" d="M10.311,17.873c0-0.982,0.793-1.775,1.777-1.775c0.962,0,1.753,0.793,1.753,1.775c0,0.97-0.791,1.761-1.753,1.761c-0.984,0-1.777-0.791-1.777-1.761 M11.684,14.637c-0.198-4.227-1.448-7.005-1.448-8.07c0-1.023,0.848-1.755,1.853-1.755 - c1.002,0,1.849,0.731,1.849,1.755c0,1.065-1.25,3.844-1.447,8.07h-0.806"/> + <g> + <g> + <g> + <path style="&st1;" d="M14.75,27.628c7.112,0,12.875-5.766,12.875-12.877c0-7.111-5.764-12.876-12.875-12.876c-7.111,0-12.877,5.765-12.877,12.876c0,7.112,5.766,12.877,12.877,12.877z"/> + </g> + </g> + <g> + </g> + </g> + <g> + <path style="&st0;" d="M14.214,17.931c-0.255-5.571-1.908-9.233-1.908-10.632c0-1.348,1.119-2.315,2.441-2.315c1.325,0,2.444,0.967,2.444,2.315c0,1.399-1.654,5.061-1.908,10.632h-1.069z M14.748,19.863c1.274,0,2.315,1.043,2.315,2.34 + c0,1.272-1.041,2.315-2.315,2.315c-1.297,0-2.34-1.043-2.34-2.315c0-1.297,1.043-2.34,2.34-2.34z"/> + </g> </g> </g> </svg> diff --git a/icons/emblem-new.svg b/icons/emblem-new.svg index e39a14882..d8c4fb1b5 100644 --- a/icons/emblem-new.svg +++ b/icons/emblem-new.svg @@ -1,23 +1,38 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN" "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [ - <!ENTITY st0 "fill-rule:nonzero;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;"> - <!ENTITY st1 "stroke:none;"> - <!ENTITY st2 "fill:#409D27;"> + <!ENTITY st0 "fill:#522D18;stroke:none;"> + <!ENTITY st1 "font-family:'TrebuchetMS-Bold';"> + <!ENTITY st2 "fill:#FFFFFF;stroke:none;"> + <!ENTITY st3 "font-size:16.1788;"> + <!ENTITY st4 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;"> + <!ENTITY st5 "fill:#409D27;stroke:none;"> ]> -<svg width="28pt" height="28pt" viewBox="0 0 28 28" xml:space="preserve"> - <g id="Layer_x0020_1" style="&st0;"> - <g style="&st1;"> +<svg width="52pt" height="30pt" viewBox="0 0 52 30" xml:space="preserve"> + <style type="text/css"> + <![CDATA[ +@font-face{font-family:'TrebuchetMS-Bold';src:url("data:;base64,\ +T1RUTwACACAAAQAAQ0ZGIJK8nO8AAAAsAAABu2NtYXAAagEoAAAB6AAAADwBAAQCAAEBARFUcmVi\ +dWNoZXRNUy1Cb2xkAAEBATX4GwwA+BQE+2L8vBwIFBwH2AUeoABIgoEl/4uLHqAASIKBJf+LiwwH\ +9ysPjBD3MhGS+EgSAAEBAT9Db3B5cmlnaHQgKGMpIDE5OTYgTWljcm9zb2Z0IENvcnBvcmF0aW9u\ +LiBBbGwgcmlnaHRzIHJlc2VydmVkLgAAAABGAE8AWAAEAgABABsAkwDYAQog9xT38hX5lPmU/ZQH\ +/RT3FBX4lPiU/JQGDrn61/hfFf2RBpA2qEjBXAhcwdRz5hv3BuKpxsYf7PtTBUQz+xdn+0Mb+zf7\ +FbvrLB8s6lv3Gvc/Gvc9v/cc9PQe9PP3Eb/3Jhv3L/cRXS7pH+kuuvsK+yMabIRdfU0e/Yj3UBX4\ +ogb3MXo02fswG/sjMz37MWgfDtn5zBb4/wfmes5otR61aFGgPBtmZIF2Yh9hdmpydGwI/Zr7jvrD\ +90gHuScF28/vs/cZG/cT8GU/1R/UPrAh+x0a/SUHDhwEo3cVMAb7uvkm+7n9JgUvBvwo+tcF95sG\ +92v9E/ea+RMF5Qb3o/0X93z5FwX3igYOHAZFFPr/FQAAAAABAAAAAwAAAAwABAAwAAAACAAIAAIA\ +AABlAG4Ad///AAAAZQBuAHf///+c/5T/jAABAAAAAAAAAAAA3d3dAN3d3QDd3d0M6eTYAN3d3QDd\ +")} + ]]> + </style> + <g id="Layer_x0020_1" style="&st4; &st1; &st3;"> + <g> <g> - <path style="&st2;" d="M24.99,12.495L12.494,24.991L0,12.495L12.496,0L24.99,12.495z"/> + <path style="&st5;" d="M50.879,14.545L25.439,29.09L0,14.545L25.439,0l25.439,14.545z"/> </g> <g> - <path d="M8.118,10.748c0.318,0.265,0.478,0.702,0.478,1.312v3.276H7.283v-2.958c0-0.256-0.033-0.452-0.101-0.589c-0.123-0.25-0.356-0.375-0.701-0.375c-0.424,0-0.715,0.183-0.872,0.549c-0.082,0.193-0.123,0.44-0.123,0.741v2.632H4.221v-4.859h1.219v0.713 - c0.162-0.251,0.316-0.432,0.462-0.542c0.26-0.197,0.59-0.296,0.989-0.296c0.5,0,0.91,0.132,1.228,0.396z"/> - <path d="M12.939,10.578c0.338,0.151,0.617,0.39,0.837,0.716c0.198,0.288,0.327,0.622,0.386,1.001c0.034,0.223,0.048,0.543,0.042,0.961h-3.537c0.02,0.485,0.189,0.826,0.511,1.021c0.195,0.121,0.431,0.182,0.705,0.182c0.291,0,0.527-0.072,0.71-0.219 - c0.099-0.078,0.187-0.188,0.263-0.328h1.28c-0.034,0.287-0.19,0.578-0.47,0.873c-0.434,0.471-1.041,0.705-1.821,0.705c-0.645,0-1.213-0.199-1.705-0.597s-0.738-1.044-0.738-1.94c0-0.839,0.222-1.483,0.667-1.932c0.444-0.448,1.021-0.672,1.731-0.672 - c0.422,0,0.802,0.076,1.14,0.227z M11.025,11.683c-0.183,0.18-0.297,0.423-0.343,0.73h2.219c-0.023-0.327-0.139-0.576-0.344-0.746s-0.46-0.254-0.764-0.254c-0.33,0-0.587,0.09-0.769,0.27z"/> - <path d="M17.158,10.476h1.247l0.777,3.5l0.745-3.5h1.321l-1.39,4.859h-1.298l-0.785-3.54l-0.785,3.54h-1.318l-1.356-4.859h1.362l0.754,3.486l0.726-3.486z"/> + <text transform="matrix(1 0 0 1 9.6758 18.5098)"><tspan x="0" y="0" style="&st0;">new</tspan></text> + <text transform="matrix(1 0 0 1 9.6758 18.5098)"><tspan x="0" y="0" style="&st2;">new</tspan></text> </g> </g> </g> diff --git a/icons/emblem-noread.svg b/icons/emblem-noread.svg index efc34a41e..f3dca2dd6 100644 --- a/icons/emblem-noread.svg +++ b/icons/emblem-noread.svg @@ -1,19 +1,14 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN" "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [ - <!ENTITY st0 "fill:none;stroke:#D90000;stroke-width:3.06;"> - <!ENTITY st1 "fill-rule:nonzero;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;"> - <!ENTITY st2 "stroke:none;"> + <!ENTITY st0 "fill-rule:nonzero;clip-rule:nonzero;fill:#FFFFFF;stroke:#D90000;stroke-width:3.75;stroke-miterlimit:4;"> ]> -<svg width="32pt" height="20pt" viewBox="0 0 32 20" xml:space="preserve"> - <g id="Layer_x0020_1" style="&st1;"> - <g style="&st2;"> - <path d="M1.528,9.18c0,4.225,6.165,7.65,13.771,7.65s13.77-3.426,13.77-7.65c0-4.225-6.164-7.65-13.77-7.65S1.528,4.955,1.528,9.18z"/> - <path style="&st0;" d="M1.528,9.18c0,4.225,6.165,7.65,13.771,7.65s13.77-3.426,13.77-7.65c0-4.225-6.164-7.65-13.77-7.65S1.528,4.955,1.528,9.18z"/> - <path d="M8.414,8.415c0,3.802,3.082,6.885,6.885,6.885s6.885-3.083,6.885-6.885c0-3.803-3.082-6.885-6.885-6.885S8.414,4.612,8.414,8.415z"/> - <path style="&st0;" d="M8.414,8.415c0,3.802,3.082,6.885,6.885,6.885s6.885-3.083,6.885-6.885c0-3.803-3.082-6.885-6.885-6.885S8.414,4.612,8.414,8.415z"/> - <path d="M18.741,12.622l-7.268-8.797 M18.741,12.622"/> - <path style="&st0;" d="M18.741,12.622l-7.268-8.797 M18.741,12.622"/> +<svg width="38pt" height="24pt" viewBox="0 0 38 24" xml:space="preserve"> + <g id="Layer_x0020_1" style="&st0;"> + <g> + <path d="M1.867,11.325c0,5.22,7.615,9.45,17.01,9.45c9.395,0,17.008-4.23,17.008-9.45c0-5.219-7.613-9.45-17.008-9.45c-9.395,0-17.01,4.231-17.01,9.45z"/> + <path d="M10.372,10.381c0,4.697,3.808,8.505,8.505,8.505c4.698,0,8.504-3.808,8.504-8.505s-3.807-8.506-8.504-8.506c-4.697,0-8.505,3.809-8.505,8.506z"/> + <path d="M23.129,15.578L14.152,4.711"/> </g> </g> </svg> diff --git a/icons/emblem-nowrite.png b/icons/emblem-nowrite.png Binary files differdeleted file mode 100644 index d82ff2dfa..000000000 --- a/icons/emblem-nowrite.png +++ /dev/null diff --git a/icons/emblem-nowrite.svg b/icons/emblem-nowrite.svg new file mode 100644 index 000000000..f31134f30 --- /dev/null +++ b/icons/emblem-nowrite.svg @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN" "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [ + <!ENTITY st0 "fill:#FF7F00;stroke:#FF7F00;stroke-width:2.43;stroke-linecap:round;stroke-linejoin:round;"> + <!ENTITY st1 "fill:#FF7F00;stroke:#FF7F00;stroke-width:2.43;"> + <!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;fill:#FFFFFF;stroke:#D90000;stroke-width:3.4986;stroke-miterlimit:4;"> + <!ENTITY st3 "stroke:none;"> +]> +<svg width="42pt" height="32pt" viewBox="0 0 42 32" xml:space="preserve"> + <g id="Layer_x0020_1" style="&st2;"> + <g> + <g> + <g> + <path style="&st0;" d="M1.215,30.69l7.762-11.587C23.602,9.429,33.336,2.107,35.414,1.216c0.788-0.338,4.244,2.038,5.062,6.188c0.082,0.415-25.594,17.736-27,18.562L1.215,30.69z"/> + <path style="&st3;" d="M8.865,20.454c0,0-4.725,6.795-4.793,6.862c-0.067,0.067,1.013,1.013,1.013,1.013s7.401-2.902,7.604-3.038c0.203-0.135-0.787-2.295-1.529-3.104c-0.743-0.811-1.822-1.801-2.295-1.732"/> + <path style="&st1;" d="M4.365,26.304c1.574,0.787,1.799,1.688,1.664,2.229c-0.135,0.539-2.699,1.214-3.105,1.214c-0.404,0,1.441-3.442,1.441-3.442z"/> + </g> + </g> + <g> + <path d="M16.289,13.816c0,4.225,3.627,7.65,8.101,7.65s8.101-3.425,8.101-7.65c0-4.225-3.627-7.65-8.101-7.65s-8.101,3.425-8.101,7.65z"/> + <path d="M28.439,18.491l-8.55-9.775"/> + </g> + </g> + </g> +</svg> diff --git a/icons/emblem-ohno.svg b/icons/emblem-ohno.svg index b4be694e3..262ba5fee 100644 --- a/icons/emblem-ohno.svg +++ b/icons/emblem-ohno.svg @@ -1,18 +1,24 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN" "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [ - <!ENTITY st0 "stroke:none;"> - <!ENTITY st1 "fill:#FFFFFF;stroke:#1B1076;stroke-width:2.6;"> - <!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;fill:#1B1076;stroke:#000000;stroke-miterlimit:4;"> + <!ENTITY st0 "fill-rule:nonzero;clip-rule:nonzero;fill:#101177;stroke:#000000;stroke-miterlimit:4;"> + <!ENTITY st1 "fill:#FFFFFF;stroke:#101177;stroke-width:3.75;"> + <!ENTITY st2 "stroke:none;"> ]> -<svg width="26pt" height="26pt" viewBox="0 0 26 26" xml:space="preserve"> - <g id="Layer_x0020_1" style="&st2;"> - <g style="&st0;"> - <path style="&st1;" d="M21.185,6.885c2.752,5.145,0.811,11.548-4.334,14.3c-5.146,2.753-11.547,0.812-14.3-4.334c-2.754-5.145-0.813-11.546,4.333-14.3c5.146-2.752,11.548-0.812,14.301,4.334z"/> - <path d="M18.88,13.437c0.733,1.37-0.823,3.627-3.475,5.046s-5.393,1.458-6.125,0.091c-0.73-1.368,0.824-3.628,3.476-5.045c2.651-1.419,5.392-1.458,6.124-0.092z"/> +<svg width="32pt" height="32pt" viewBox="0 0 32 32" xml:space="preserve"> + <g id="Layer_x0020_1" style="&st0;"> + <g style="&st2;"> <g> - <path d="M7.433,8.896c0.414,0.773,0.314,1.632-0.221,1.918s-1.305-0.108-1.719-0.882C5.081,9.159,5.18,8.301,5.714,8.015c0.535-0.286,1.305,0.108,1.719,0.881z"/> - <path d="M13.795,5.494c0.413,0.772,0.314,1.631-0.22,1.917c-0.535,0.286-1.306-0.108-1.719-0.882c-0.414-0.773-0.314-1.631,0.221-1.917s1.305,0.108,1.718,0.882z"/> + <g> + <path style="&st1;" d="M14.75,27.628c7.112,0,12.875-5.766,12.875-12.877c0-7.111-5.764-12.876-12.875-12.876c-7.111,0-12.877,5.765-12.877,12.876c0,7.112,5.766,12.877,12.877,12.877z"/> + </g> + </g> + <g> + <path d="M22.131,16.511c0.791,1.48-0.891,3.92-3.756,5.453s-5.828,1.576-6.62,0.098c-0.79-1.479,0.891-3.92,3.756-5.453c2.865-1.533,5.828-1.575,6.619-0.098z"/> + <g> + <path d="M10.012,12.35c0.594,1.114,0.452,2.351-0.317,2.762c-0.772,0.41-1.878-0.156-2.472-1.269c-0.595-1.112-0.453-2.347,0.315-2.759c0.771-0.412,1.878,0.156,2.474,1.266z"/> + <path d="M17.77,8.204c0.594,1.111,0.453,2.347-0.318,2.759c-0.77,0.414-1.877-0.155-2.471-1.268c-0.593-1.111-0.451-2.348,0.319-2.761c0.768-0.409,1.877,0.157,2.471,1.27z"/> + </g> </g> </g> </g> diff --git a/icons/emblem-personal.svg b/icons/emblem-personal.svg index cd00c79e0..b7f074fa0 100644 --- a/icons/emblem-personal.svg +++ b/icons/emblem-personal.svg @@ -4,11 +4,11 @@ <!ENTITY st0 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;"> <!ENTITY st1 "fill:#2A5FAA;stroke:none;"> ]> -<svg width="21.444pt" height="23.685pt" viewBox="0 0 21.444 23.685" xml:space="preserve"> +<svg width="30pt" height="32pt" viewBox="0 0 30 32" xml:space="preserve"> <g id="Layer_x0020_1" style="&st0;"> - <path style="&st1;" d="M0,18.16c0.341,0.171,1.587,0.45,3.53,0.798c3.021,0.54,3.728,1.787,6.38,3.304c1.196,0.685,2.733,1.366,3.246,1.424c2.776,0.31,3.366-0.726,4.898-1.31c2.393-0.911,3.077-2.051,3.39-4.131c0.332-2.197-0.428-3.104-2.135-6.749 - c-0.884-1.882-1.377-5.741-1.861-8.282c-0.52-2.732-2.539-2.381-2.334,0.058c0.182,2.161,0.287,2.554,0.436,4.636c0.099,1.374-0.501,0.66-0.923-0.395c-1.114-2.79-1.476-4.219-2.321-5.977c-1.15-2.401-3.021-1.899-2.258,0.867c0.459,1.657,2.996,7.213,1.828,7.128 - c-0.449-0.033-3.844-6.579-5.555-8.715C5.104-0.705,3.929,0.047,3.929,1.157c0,1.057,5.127,9.313,4.785,9.741c-0.416,0.521-2.648-2.82-4.529-5.126c-1.793-2.204-2.818-2.137-3.33-0.939c-0.514,1.195,5.297,8.543,5.98,9.911c0.683,1.367,0.179,1.614-1.111,1.452 - c-1.365-0.171-2.59-0.542-4.641-0.028C-0.042,16.448-0.628,17.705,0,18.16z"/> + <path style="&st1;" d="M0.151,23.672c0.444,0.224,2.069,0.588,4.602,1.04c3.938,0.704,4.857,2.33,8.317,4.307c1.56,0.892,3.564,1.782,4.232,1.856c3.619,0.402,4.387-0.946,6.385-1.708c3.119-1.188,4.01-2.673,4.418-5.383c0.434-2.865-0.557-4.047-2.783-8.799 + c-1.152-2.454-1.795-7.483-2.426-10.797c-0.678-3.562-3.311-3.104-3.043,0.075c0.238,2.816,0.375,3.33,0.568,6.044c0.127,1.791-0.652,0.86-1.203-0.515c-1.453-3.636-1.924-5.5-3.025-7.791c-1.5-3.129-3.94-2.476-2.944,1.13c0.598,2.16,3.907,9.403,2.383,9.292 + c-0.586-0.043-5.012-8.576-7.241-11.36C6.804-0.919,5.273,0.062,5.273,1.509c0,1.377,6.683,12.14,6.238,12.697c-0.544,0.679-3.454-3.676-5.904-6.683C3.266,4.649,1.932,4.738,1.265,6.299C0.595,7.857,8.17,17.436,9.062,19.218C9.951,21,9.294,21.322,7.613,21.11 + c-1.782-0.223-3.379-0.705-6.052-0.036c-1.465,0.366-2.228,2.005-1.41,2.598z"/> </g> </svg> diff --git a/icons/emblem-shared.svg b/icons/emblem-shared.svg new file mode 100644 index 000000000..fda3ea4fc --- /dev/null +++ b/icons/emblem-shared.svg @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN" "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [ + <!ENTITY st0 "fill:none;stroke:#006532;stroke-width:3.2992;"> + <!ENTITY st1 "fill:#9ED67D;stroke:#006532;stroke-width:3.2992;"> + <!ENTITY st2 "fill:#3EA639;stroke:none;"> + <!ENTITY st3 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;"> +]> +<svg width="42" height="26pt" viewBox="0 0 426 26" xml:space="preserve"> + <g id="Layer_x0020_1" style="&st3;"> + <g> + <g> + <g> + <path style="&st1;" d="M12.976,24.304c6.256,0,11.33-5.071,11.33-11.328c0-6.257-5.074-11.328-11.33-11.328c-6.256,0-11.329,5.071-11.329,11.328c0,6.257,5.072,11.328,11.329,11.328z"/> + </g> + </g> + <g> + <g> + <path style="&st1;" d="M27.18,24.323c6.257,0,11.329-5.072,11.329-11.329c0-6.256-5.072-11.328-11.329-11.328S15.851,6.738,15.851,12.994c0,6.257,5.072,11.329,11.329,11.329z"/> + </g> + </g> + <path style="&st2;" d="M20.711,4.288c-1.686,1.467-3.447,3.959-3.665,5.719c-0.221,1.76-0.735,2.492-0.295,4.546c0.442,2.052,0.88,3.444,1.76,4.546c0.879,1.099,1.906,2.053,2.126,2.272s0.073,0.073,1.467-2.272c1.393-2.348,1.832-3.959,1.832-5.939 + s-0.66-4.619-1.026-5.719c-0.366-1.099-2.199-3.153-2.199-3.153z"/> + <g> + <g> + <path style="&st0;" d="M12.976,24.304c6.256,0,11.33-5.071,11.33-11.328c0-6.257-5.074-11.328-11.33-11.328c-6.256,0-11.329,5.071-11.329,11.328c0,6.257,5.072,11.328,11.329,11.328z"/> + </g> + </g> + <g> + <g> + <path style="&st0;" d="M27.18,24.323c6.257,0,11.329-5.072,11.329-11.329c0-6.256-5.072-11.328-11.329-11.328S15.851,6.738,15.851,12.994c0,6.257,5.072,11.329,11.329,11.329z"/> + </g> + </g> + </g> + </g> +</svg> diff --git a/icons/emblem-special.svg b/icons/emblem-special.svg new file mode 100644 index 000000000..d1d3c6234 --- /dev/null +++ b/icons/emblem-special.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN" "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [ + <!ENTITY st0 "fill:#FEB32E;stroke:#FEB32E;stroke-width:2.9783;"> + <!ENTITY st1 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;"> + <!ENTITY st2 "fill:#FFFFFF;stroke:#FFFFFF;stroke-width:3.52;"> +]> +<svg width="30pt" height="30pt" viewBox="0 0 30 30" xml:space="preserve"> + <g id="Layer_x0020_1" style="&st1;"> + <g> + <g> + <path style="&st0;" d="M14.364,27.242c7.112,0,12.875-5.766,12.875-12.877c0-7.111-5.764-12.876-12.875-12.876c-7.111,0-12.877,5.765-12.877,12.876c0,7.112,5.766,12.877,12.877,12.877z"/> + </g> + </g> + <path style="&st2;" d="M19.66,21.832l-5.209-2.74L9.24,21.83l0.995-5.801l-4.212-4.111l5.825-0.843l2.606-5.279l2.604,5.279l5.825,0.847l-4.217,4.109l0.994,5.802z"/> + </g> +</svg> diff --git a/icons/emblem-urgent.svg b/icons/emblem-urgent.svg index 1680613d4..5e61c5242 100644 --- a/icons/emblem-urgent.svg +++ b/icons/emblem-urgent.svg @@ -1,15 +1,19 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN" "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [ - <!ENTITY st0 "fill:#FF4F00;stroke:none;"> - <!ENTITY st1 "fill:#FFFFFF;stroke:#FF4F00;stroke-width:3;"> - <!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;"> + <!ENTITY st0 "fill-rule:nonzero;clip-rule:nonzero;fill:#FFFFFF;stroke:#D90000;stroke-width:3.75;stroke-miterlimit:4;"> ]> -<svg width="26pt" height="26pt" viewBox="0 0 26 26" xml:space="preserve"> - <g id="Layer_x0020_1" style="&st2;"> +<svg width="32pt" height="32pt" viewBox="0 0 32 32" xml:space="preserve"> + <g id="Layer_x0020_1" style="&st0;"> <g> - <path style="&st1;" d="M22.723,12.112c0,5.862-4.752,10.614-10.613,10.614c-5.86,0-10.611-4.752-10.611-10.614C1.498,6.251,6.249,1.5,12.109,1.5c5.861,0,10.613,4.752,10.613,10.613z"/> - <path style="&st0;" d="M10.998,13.824l-0.438-0.421v-0.607h1.434h-1.434l0.017-8.869l2.859,0.008l-0.008,8.256l4.471,4.323l-1.984,2.058l-4.917-4.747"/> + <g> + <g> + <path d="M14.75,27.628c7.112,0,12.875-5.766,12.875-12.877c0-7.111-5.764-12.876-12.875-12.876c-7.111,0-12.877,5.765-12.877,12.876c0,7.112,5.766,12.877,12.877,12.877z"/> + </g> + </g> + <g> + </g> + <path d="M13.784,5.938l-0.015,9.852l5.459,5.273"/> </g> </g> </svg> diff --git a/libnautilus-extensions/nautilus-customization-data.c b/libnautilus-extensions/nautilus-customization-data.c index b515ac972..4b275b4c1 100644 --- a/libnautilus-extensions/nautilus-customization-data.c +++ b/libnautilus-extensions/nautilus-customization-data.c @@ -39,6 +39,7 @@ #include "nautilus-file-utilities.h" #include "nautilus-gdk-extensions.h" #include "nautilus-gtk-extensions.h" +#include "nautilus-image.h" #include "nautilus-label.h" #include "nautilus-string.h" @@ -150,8 +151,6 @@ nautilus_customization_data_get_next_element_for_display (NautilusCustomizationD GnomeVFSFileInfo *current_file_info; char *image_file_name, *filtered_name, *truncated_name; - GdkPixmap *pixmap; - GdkBitmap *mask; GdkPixbuf *pixbuf; GdkPixbuf *orig_pixbuf; @@ -206,11 +205,10 @@ nautilus_customization_data_get_next_element_for_display (NautilusCustomizationD gdk_pixbuf_unref (orig_pixbuf); } - /* make a pixmap and mask to pass to the widget */ - gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, NAUTILUS_STANDARD_ALPHA_THRESHHOLD); + *pixmap_widget = nautilus_image_new (); + nautilus_image_set_pixbuf (NAUTILUS_IMAGE (*pixmap_widget), pixbuf); gdk_pixbuf_unref (pixbuf); - *pixmap_widget = GTK_WIDGET (gtk_pixmap_new (pixmap, mask)); filtered_name = format_name_for_display (current_file_info->name); /* If the data is for a menu, we want to truncate it and not use the nautilus diff --git a/libnautilus-extensions/nautilus-image.h b/libnautilus-extensions/nautilus-image.h index 972cb4c91..648116269 100644 --- a/libnautilus-extensions/nautilus-image.h +++ b/libnautilus-extensions/nautilus-image.h @@ -39,10 +39,6 @@ #include <libnautilus-extensions/nautilus-buffered-widget.h> #include <libnautilus-extensions/nautilus-scalable-font.h> -/* NautilusImage is GtkWidget that draws a string using the high quality - * anti aliased librsvg/freetype. - */ - BEGIN_GNOME_DECLS #define NAUTILUS_TYPE_IMAGE (nautilus_image_get_type ()) diff --git a/libnautilus-private/nautilus-customization-data.c b/libnautilus-private/nautilus-customization-data.c index b515ac972..4b275b4c1 100644 --- a/libnautilus-private/nautilus-customization-data.c +++ b/libnautilus-private/nautilus-customization-data.c @@ -39,6 +39,7 @@ #include "nautilus-file-utilities.h" #include "nautilus-gdk-extensions.h" #include "nautilus-gtk-extensions.h" +#include "nautilus-image.h" #include "nautilus-label.h" #include "nautilus-string.h" @@ -150,8 +151,6 @@ nautilus_customization_data_get_next_element_for_display (NautilusCustomizationD GnomeVFSFileInfo *current_file_info; char *image_file_name, *filtered_name, *truncated_name; - GdkPixmap *pixmap; - GdkBitmap *mask; GdkPixbuf *pixbuf; GdkPixbuf *orig_pixbuf; @@ -206,11 +205,10 @@ nautilus_customization_data_get_next_element_for_display (NautilusCustomizationD gdk_pixbuf_unref (orig_pixbuf); } - /* make a pixmap and mask to pass to the widget */ - gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, NAUTILUS_STANDARD_ALPHA_THRESHHOLD); + *pixmap_widget = nautilus_image_new (); + nautilus_image_set_pixbuf (NAUTILUS_IMAGE (*pixmap_widget), pixbuf); gdk_pixbuf_unref (pixbuf); - *pixmap_widget = GTK_WIDGET (gtk_pixmap_new (pixmap, mask)); filtered_name = format_name_for_display (current_file_info->name); /* If the data is for a menu, we want to truncate it and not use the nautilus diff --git a/libnautilus-private/nautilus-image.h b/libnautilus-private/nautilus-image.h index 972cb4c91..648116269 100644 --- a/libnautilus-private/nautilus-image.h +++ b/libnautilus-private/nautilus-image.h @@ -39,10 +39,6 @@ #include <libnautilus-extensions/nautilus-buffered-widget.h> #include <libnautilus-extensions/nautilus-scalable-font.h> -/* NautilusImage is GtkWidget that draws a string using the high quality - * anti aliased librsvg/freetype. - */ - BEGIN_GNOME_DECLS #define NAUTILUS_TYPE_IMAGE (nautilus_image_get_type ()) diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c index 15b409e95..008a36a3b 100644 --- a/src/nautilus-property-browser.c +++ b/src/nautilus-property-browser.c @@ -558,8 +558,9 @@ ensure_uri_is_image(const char *uri) } /* create the appropriate pixbuf for the passed in file */ + static GdkPixbuf * -make_drag_image(NautilusPropertyBrowser *property_browser, const char* file_name) +make_drag_image (NautilusPropertyBrowser *property_browser, const char* file_name) { GdkPixbuf *pixbuf, *orig_pixbuf; char *image_file_name; @@ -585,7 +586,6 @@ make_drag_image(NautilusPropertyBrowser *property_browser, const char* file_name orig_pixbuf = gdk_pixbuf_new_from_file (image_file_name); - /* background properties are always a fixed size, while others are pinned to the max size */ if (!strcmp(property_browser->details->category, "backgrounds")) { pixbuf = nautilus_customization_make_background_chit (orig_pixbuf, property_browser->details->property_chit, TRUE); } else { @@ -598,6 +598,7 @@ make_drag_image(NautilusPropertyBrowser *property_browser, const char* file_name return pixbuf; } + /* create a pixbuf and fill it with a color */ static GdkPixbuf* @@ -1274,11 +1275,9 @@ element_clicked_callback(GtkWidget *widget, GdkEventButton *event, char *element { GtkTargetList *target_list; GdkDragContext *context; - GtkWidget *pixwidget; GdkPixbuf *pixbuf; GdkPixmap *pixmap_for_dragged_file; GdkBitmap *mask_for_dragged_file; - int pixmap_width, pixmap_height; int x_delta, y_delta; NautilusPropertyBrowser *property_browser = NAUTILUS_PROPERTY_BROWSER(gtk_object_get_user_data(GTK_OBJECT(widget))); @@ -1309,20 +1308,15 @@ element_clicked_callback(GtkWidget *widget, GdkEventButton *event, char *element if (strcmp(property_browser->details->drag_type, "application/x-color")) { /*it's not a color, so, for now, it must be an image */ + pixbuf = make_drag_image (property_browser, element_name); - pixwidget = GTK_BIN(widget)->child; - gtk_pixmap_get(GTK_PIXMAP(pixwidget), &pixmap_for_dragged_file, &mask_for_dragged_file); - gdk_window_get_size((GdkWindow*) pixmap_for_dragged_file, &pixmap_width, &pixmap_height); - - x_delta -= (widget->allocation.width - pixmap_width) >> 1; - y_delta -= (widget->allocation.height - pixmap_height) >> 1; + x_delta -= (widget->allocation.width - gdk_pixbuf_get_width (pixbuf)) >> 1; + y_delta -= (widget->allocation.height - gdk_pixbuf_get_height (pixbuf)) >> 1; - pixbuf = make_drag_image(property_browser, element_name); } else { - pixbuf = make_color_drag_image(property_browser, element_name, TRUE); + pixbuf = make_color_drag_image (property_browser, element_name, TRUE); } - /* set the pixmap and mask for dragging */ if (pixbuf != NULL) { gdk_pixbuf_render_pixmap_and_mask @@ -1484,10 +1478,8 @@ make_properties_from_xml_node (NautilusPropertyBrowser *property_browser, xmlNod { xmlNode *current_node; GdkPixbuf *pixbuf; - GtkWidget *pixmap_widget, *label; + GtkWidget *image_widget, *label; int index; - GdkPixmap *pixmap; - GdkBitmap *mask; gboolean local_only = property_browser->details->remove_mode; @@ -1512,16 +1504,16 @@ make_properties_from_xml_node (NautilusPropertyBrowser *property_browser, xmlNod /* make the image from the color spec */ pixbuf = make_color_drag_image (property_browser, color_str, FALSE); - gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, NAUTILUS_STANDARD_ALPHA_THRESHHOLD); + image_widget = nautilus_image_new (); + nautilus_image_set_pixbuf (NAUTILUS_IMAGE (image_widget), pixbuf); gdk_pixbuf_unref (pixbuf); - pixmap_widget = GTK_WIDGET (gtk_pixmap_new (pixmap, mask)); /* make the label from the name */ label = nautilus_label_new (name_str); nautilus_label_set_font_size (NAUTILUS_LABEL (label), 12); /* make the tile from the pixmap and name */ - new_property = make_property_tile (property_browser, pixmap_widget, label, color_str); + new_property = make_property_tile (property_browser, image_widget, label, color_str); add_to_content_table (property_browser, new_property, index++, 12); } } |
