diff options
author | Xan Lopez <xan@igalia.com> | 2012-01-27 17:12:22 +0800 |
---|---|---|
committer | Xan Lopez <xan@igalia.com> | 2012-01-27 17:12:22 +0800 |
commit | 17ef6d1c777e63fdbbb11cf2afb21bbe5c1acfa4 (patch) | |
tree | 13facdcc6f246a6d541259dc2d6128c82e599800 | |
parent | 86a17ef48fd7a3e549b5d0cd9dc57a59ad233332 (diff) | |
download | gsoc2013-epiphany-17ef6d1c777e63fdbbb11cf2afb21bbe5c1acfa4.tar gsoc2013-epiphany-17ef6d1c777e63fdbbb11cf2afb21bbe5c1acfa4.tar.gz gsoc2013-epiphany-17ef6d1c777e63fdbbb11cf2afb21bbe5c1acfa4.tar.bz2 gsoc2013-epiphany-17ef6d1c777e63fdbbb11cf2afb21bbe5c1acfa4.tar.lz gsoc2013-epiphany-17ef6d1c777e63fdbbb11cf2afb21bbe5c1acfa4.tar.xz gsoc2013-epiphany-17ef6d1c777e63fdbbb11cf2afb21bbe5c1acfa4.tar.zst gsoc2013-epiphany-17ef6d1c777e63fdbbb11cf2afb21bbe5c1acfa4.zip |
And remove the last stock icon, bookmarks
We can kill data/icons now.
-rw-r--r-- | data/Makefile.am | 2 | ||||
-rw-r--r-- | data/icons/Makefile.am | 45 | ||||
-rw-r--r-- | data/icons/README | 13 | ||||
-rw-r--r-- | data/icons/hicolor_actions_16x16_bookmark-view.png | bin | 474 -> 0 bytes | |||
-rw-r--r-- | data/icons/hicolor_actions_16x16_bookmark-view.xcf | bin | 1969 -> 0 bytes | |||
-rw-r--r-- | data/icons/hicolor_actions_22x22_bookmark-view.png | bin | 595 -> 0 bytes | |||
-rw-r--r-- | data/icons/hicolor_actions_22x22_bookmark-view.xcf | bin | 2461 -> 0 bytes | |||
-rw-r--r-- | data/icons/hicolor_actions_24x24_bookmark-view.png | bin | 585 -> 0 bytes | |||
-rw-r--r-- | data/icons/hicolor_actions_32x32_bookmark-view.png | bin | 934 -> 0 bytes | |||
-rw-r--r-- | data/icons/hicolor_actions_32x32_bookmark-view.svg | 299 | ||||
-rw-r--r-- | data/icons/hicolor_actions_scalable_bookmark-view.svg | 355 | ||||
-rw-r--r-- | lib/Makefile.am | 1 | ||||
-rw-r--r-- | lib/ephy-stock-icons.c | 66 | ||||
-rw-r--r-- | lib/ephy-stock-icons.h | 5 | ||||
-rw-r--r-- | src/bookmarks/ephy-bookmarks-editor.c | 2 | ||||
-rw-r--r-- | src/ephy-main.c | 1 |
16 files changed, 1 insertions, 788 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 2da510465..24b356b06 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = art icons pages ui +SUBDIRS = art pages ui @INTLTOOL_SERVER_RULE@ @INTLTOOL_DESKTOP_RULE@ diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am deleted file mode 100644 index 579a4ad81..000000000 --- a/data/icons/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -NULL = - -private_icons = \ - hicolor_actions_16x16_bookmark-view.png \ - hicolor_actions_22x22_bookmark-view.png \ - hicolor_actions_24x24_bookmark-view.png \ - hicolor_actions_32x32_bookmark-view.png \ - hicolor_actions_scalable_bookmark-view.svg \ - $(NULL) - -noinst_DATA = \ - hicolor_actions_32x32_bookmark-view.svg \ - hicolor_actions_16x16_bookmark-view.xcf \ - hicolor_actions_22x22_bookmark-view.xcf \ - $(NULL) - -EXTRA_DIST = \ - $(private_icons) \ - $(noinst_DATA) \ - $(NULL) - -############################################################################### - -install-icons: - for icon in $(private_icons); do \ - THEME=`echo $$icon | cut -d_ -f1`; \ - CONTEXT=`echo $$icon | cut -d_ -f2`; \ - SIZE=`echo $$icon | cut -d_ -f3`; \ - ICONFILE=`echo $$icon | cut -d_ -f4`; \ - mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ - $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ - done - -uninstall-icons: - for icon in $(private_icons); do \ - THEME=`echo $$icon | cut -d_ -f1`; \ - CONTEXT=`echo $$icon | cut -d_ -f2`; \ - SIZE=`echo $$icon | cut -d_ -f3`; \ - ICONFILE=`echo $$icon | cut -d_ -f4`; \ - rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ - done - -install-data-local: install-icons - -uninstall-local: uninstall-icons diff --git a/data/icons/README b/data/icons/README deleted file mode 100644 index 4d49699c6..000000000 --- a/data/icons/README +++ /dev/null @@ -1,13 +0,0 @@ -From Tango website (http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines) - - - Historically Gnome uses 24×24 size (which is 1/4 of 48×48); - just adding a 1 pixel empty space on all sides can make - Tango icons useful on the Gnome desktop in the transition - phase. One can easily do this with imagemagick: - - convert -bordercolor Transparent -border 1x1 tango_size.png gnome_size.png - - -So sources for "small" size should be drawn at 22x22 pixel and converted -to 24x24 adding a transparent border.
\ No newline at end of file diff --git a/data/icons/hicolor_actions_16x16_bookmark-view.png b/data/icons/hicolor_actions_16x16_bookmark-view.png Binary files differdeleted file mode 100644 index 7817a0fa7..000000000 --- a/data/icons/hicolor_actions_16x16_bookmark-view.png +++ /dev/null diff --git a/data/icons/hicolor_actions_16x16_bookmark-view.xcf b/data/icons/hicolor_actions_16x16_bookmark-view.xcf Binary files differdeleted file mode 100644 index 653e3472e..000000000 --- a/data/icons/hicolor_actions_16x16_bookmark-view.xcf +++ /dev/null diff --git a/data/icons/hicolor_actions_22x22_bookmark-view.png b/data/icons/hicolor_actions_22x22_bookmark-view.png Binary files differdeleted file mode 100644 index 3c94640fb..000000000 --- a/data/icons/hicolor_actions_22x22_bookmark-view.png +++ /dev/null diff --git a/data/icons/hicolor_actions_22x22_bookmark-view.xcf b/data/icons/hicolor_actions_22x22_bookmark-view.xcf Binary files differdeleted file mode 100644 index a9da95aca..000000000 --- a/data/icons/hicolor_actions_22x22_bookmark-view.xcf +++ /dev/null diff --git a/data/icons/hicolor_actions_24x24_bookmark-view.png b/data/icons/hicolor_actions_24x24_bookmark-view.png Binary files differdeleted file mode 100644 index a2b5dd484..000000000 --- a/data/icons/hicolor_actions_24x24_bookmark-view.png +++ /dev/null diff --git a/data/icons/hicolor_actions_32x32_bookmark-view.png b/data/icons/hicolor_actions_32x32_bookmark-view.png Binary files differdeleted file mode 100644 index 3b9616477..000000000 --- a/data/icons/hicolor_actions_32x32_bookmark-view.png +++ /dev/null diff --git a/data/icons/hicolor_actions_32x32_bookmark-view.svg b/data/icons/hicolor_actions_32x32_bookmark-view.svg deleted file mode 100644 index 2e3284602..000000000 --- a/data/icons/hicolor_actions_32x32_bookmark-view.svg +++ /dev/null @@ -1,299 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="32" - height="32" - id="svg4908" - sodipodi:version="0.32" - inkscape:version="0.44+devel" - sodipodi:docbase="/home/andreas/project/misc icons/32x32/actions" - sodipodi:docname="bookmark-view.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/andreas/project/misc icons/32x32/actions/bookmark-view.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - version="1.0" - sodipodi:modified="true"> - <defs - id="defs4910"> - <linearGradient - id="linearGradient5345"> - <stop - style="stop-color:#c78c2b;stop-opacity:1;" - offset="0" - id="stop5347" /> - <stop - id="stop7129" - offset="0" - style="stop-color:#d9a752;stop-opacity:1;" /> - <stop - style="stop-color:#e5c184;stop-opacity:1" - offset="1" - id="stop5349" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5345" - id="linearGradient5351" - x1="17.9375" - y1="6.0630388" - x2="17.948223" - y2="3.1438448" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.5862548,0,0,0.671804,4.1367585,1.790801)" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient5031" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)" - cx="605.71429" - cy="486.64789" - fx="605.71429" - fy="486.64789" - r="117.14286" /> - <linearGradient - inkscape:collect="always" - id="linearGradient5060"> - <stop - style="stop-color:black;stop-opacity:1;" - offset="0" - id="stop5062" /> - <stop - style="stop-color:black;stop-opacity:0;" - offset="1" - id="stop5064" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient5029" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)" - cx="605.71429" - cy="486.64789" - fx="605.71429" - fy="486.64789" - r="117.14286" /> - <linearGradient - id="linearGradient5048"> - <stop - style="stop-color:black;stop-opacity:0;" - offset="0" - id="stop5050" /> - <stop - id="stop5056" - offset="0.5" - style="stop-color:black;stop-opacity:1;" /> - <stop - style="stop-color:black;stop-opacity:0;" - offset="1" - id="stop5052" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5048" - id="linearGradient5027" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)" - x1="302.85715" - y1="366.64789" - x2="302.85715" - y2="609.50507" /> - <linearGradient - inkscape:collect="always" - id="linearGradient6232"> - <stop - style="stop-color:#f5f5f3;stop-opacity:1" - offset="0" - id="stop6234" /> - <stop - style="stop-color:#eaeae7;stop-opacity:1" - offset="1" - id="stop6236" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient6212"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop6214" /> - <stop - style="stop-color:#ffffff;stop-opacity:0;" - offset="1" - id="stop6216" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6212" - id="linearGradient6218" - x1="10.875" - y1="7.78125" - x2="0.71875" - y2="8" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.0000001,0,0,2.0909092,-0.5000006,-1.8181822)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6232" - id="linearGradient6238" - x1="7.0792751" - y1="7.8707604" - x2="10.358378" - y2="12.182442" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.6757636,0,0,1.9230771,1.201428,-0.3076915)" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="16" - inkscape:cx="27.55397" - inkscape:cy="12.989927" - inkscape:current-layer="layer1" - showgrid="false" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:window-width="1674" - inkscape:window-height="970" - inkscape:window-x="0" - inkscape:window-y="25" - width="32px" - height="32px" /> - <metadata - id="metadata4913"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer"> - <g - style="display:inline" - id="g5022" - transform="matrix(1.4775167e-2,0,0,1.045244e-2,28.141559,27.57515)"> - <rect - y="-150.69685" - x="-1559.2523" - height="478.35718" - width="1339.6335" - id="rect4173" - style="opacity:0.39195981;color:#000000;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <path - sodipodi:nodetypes="cccc" - id="path5058" - d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z " - style="opacity:0.40206185;color:#000000;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <path - style="opacity:0.40206185;color:#000000;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z " - id="path5018" - sodipodi:nodetypes="cccc" /> - </g> - <rect - style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#7a7c78;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4918" - width="20.80443" - height="26" - x="6.6955705" - y="2.5" - rx="0.48613593" - ry="0.48613593" /> - <rect - style="opacity:1;fill:url(#linearGradient6238);fill-opacity:1;stroke:#7a7c78;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4916" - width="21.784925" - height="25" - x="3.7150738" - y="4.5" - rx="0.44194174" - ry="0.44194177" /> - <path - style="fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#7a7c78;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 23.5,4.5000001 L 5.1642467,4.4676102 C 5.1642467,4.4676102 4.1731477,4.3798633 4.1957137,3.5319793 C 4.2182799,2.6840952 5.2430628,2.50123 5.2091292,2.50123 L 23.464842,2.5000001" - id="path4920" - sodipodi:nodetypes="cczcc" /> - <path - style="fill:#555753;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dashoffset:0;stroke-opacity:1" - d="M 3,3.5 C 4.4322918,4.4816879 6.3427611,3.7073118 8,3.8028532 L 8,30 L 3,30 L 3,3.5 z " - id="rect4922" - sodipodi:nodetypes="ccccc" /> - <rect - style="opacity:0.44021738;fill:none;fill-opacity:1;stroke:url(#linearGradient6218);stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect5893" - width="20" - height="23" - x="4.5" - y="5.5" /> - <rect - style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect5895" - width="12.455757" - height="1" - x="6" - y="3" /> - <rect - style="opacity:1;fill:#babdb6;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect6220" - width="3.0183182" - height="1.1250002" - x="3.9816818" - y="2.8749998" - rx="0" - ry="0" /> - <path - style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 6.1006153,4.5000002 L 4.9188247,4.4605986 C 4.9188247,4.4605986 3.4775233,4.3105629 3.5002663,3.4956076 C 3.5230184,2.6803301 4.9982589,2.5014963 4.9640592,2.5014963 L 9.0268018,2.4999999" - id="path6139" - sodipodi:nodetypes="cczcc" /> - <rect - style="opacity:0.09239131;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4921" - width="1" - height="20" - x="6" - y="7" - rx="0.5" - ry="0.5" /> - <path - style="opacity:0.15;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;display:inline" - d="M 9.440291,3.826563 L 18.492808,3.826563 L 18.492808,17.895419 L 14.810267,13.398897 L 11.080672,17.943787 L 11.080672,4.468677 C 11.080672,4.107512 10.056091,3.826563 9.440291,3.826563 z " - id="path7273" - sodipodi:nodetypes="ccccccc" /> - <path - style="opacity:0.15;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;display:inline" - d="M 8.411242,4 L 17.463759,4 L 17.463759,18.068856 L 13.781218,13.572334 L 10.051622,18.117224 L 10.051622,4.642114 C 10.051622,4.280949 9.027041,4 8.411242,4 z " - id="path7434" - sodipodi:nodetypes="ccccccc" /> - <path - style="fill:url(#linearGradient5351);fill-opacity:1;fill-rule:evenodd;stroke:#8f5902;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;display:inline" - d="M 9.447484,3.5 L 18.5,3.5 L 18.5,17.568856 L 15.046284,13.072334 L 11.548436,17.617224 L 11.548436,4.142115 C 11.548436,3.780949 10.02502,3.5 9.447484,3.5 z " - id="path4386" - sodipodi:nodetypes="ccccccc" /> - <path - style="opacity:0.3;fill:#d59c3e;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000036px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" - d="M 17.500002,4.5 L 17.500002,14.680655 L 15.030199,11.450919 L 12.548924,14.815869 L 12.500002,4.557058 L 17.500002,4.5 z " - id="path4388" - sodipodi:nodetypes="cccccc" /> - </g> -</svg> diff --git a/data/icons/hicolor_actions_scalable_bookmark-view.svg b/data/icons/hicolor_actions_scalable_bookmark-view.svg deleted file mode 100644 index 3f87fd15a..000000000 --- a/data/icons/hicolor_actions_scalable_bookmark-view.svg +++ /dev/null @@ -1,355 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="48" - height="48" - id="svg4908" - sodipodi:version="0.32" - inkscape:version="0.44+devel" - sodipodi:docbase="/home/andreas/project/misc icons/48x48/actions" - sodipodi:docname="bookmark-view.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/andreas/project/misc icons/32x32/actions/bookmark-view.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - version="1.0" - sodipodi:modified="true"> - <defs - id="defs4910"> - <linearGradient - inkscape:collect="always" - id="linearGradient2833"> - <stop - style="stop-color:white;stop-opacity:1;" - offset="0" - id="stop2835" /> - <stop - style="stop-color:white;stop-opacity:0.56273764" - offset="1" - id="stop2837" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2833" - id="linearGradient2839" - x1="13.46875" - y1="3.0304594" - x2="13.46875" - y2="5.5014644" - gradientUnits="userSpaceOnUse" /> - <linearGradient - id="linearGradient5345"> - <stop - style="stop-color:#c78c2b;stop-opacity:1;" - offset="0" - id="stop5347" /> - <stop - id="stop7129" - offset="0" - style="stop-color:#d9a752;stop-opacity:1;" /> - <stop - style="stop-color:#e5c184;stop-opacity:1" - offset="1" - id="stop5349" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5345" - id="linearGradient5351" - x1="17.9375" - y1="6.0630388" - x2="17.948223" - y2="3.1438448" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.9308123,0,0,1.0671146,11.281619,3.373487)" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient5031" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)" - cx="605.71429" - cy="486.64789" - fx="605.71429" - fy="486.64789" - r="117.14286" /> - <linearGradient - inkscape:collect="always" - id="linearGradient5060"> - <stop - style="stop-color:black;stop-opacity:1;" - offset="0" - id="stop5062" /> - <stop - style="stop-color:black;stop-opacity:0;" - offset="1" - id="stop5064" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient5029" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)" - cx="605.71429" - cy="486.64789" - fx="605.71429" - fy="486.64789" - r="117.14286" /> - <linearGradient - id="linearGradient5048"> - <stop - style="stop-color:black;stop-opacity:0;" - offset="0" - id="stop5050" /> - <stop - id="stop5056" - offset="0.5" - style="stop-color:black;stop-opacity:1;" /> - <stop - style="stop-color:black;stop-opacity:0;" - offset="1" - id="stop5052" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5048" - id="linearGradient5027" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)" - x1="302.85715" - y1="366.64789" - x2="302.85715" - y2="609.50507" /> - <linearGradient - inkscape:collect="always" - id="linearGradient6232"> - <stop - style="stop-color:#f0f0ef;stop-opacity:1" - offset="0" - id="stop6234" /> - <stop - style="stop-color:#eaeae7;stop-opacity:1" - offset="1" - id="stop6236" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient6212"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop6214" /> - <stop - style="stop-color:#ffffff;stop-opacity:0;" - offset="1" - id="stop6216" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6212" - id="linearGradient6218" - x1="10.875" - y1="7.78125" - x2="0.71875" - y2="8" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2641657,0,0,3.4545453,-1.3020677,-5.5909086)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6232" - id="linearGradient6238" - x1="7.6382079" - y1="8.3582602" - x2="10.358378" - y2="12.182442" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.683685,0,0,3.0769234,1.5865706,-2.1923068)" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="33.595504" - inkscape:cy="29.311858" - inkscape:current-layer="layer1" - showgrid="false" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:window-width="1674" - inkscape:window-height="970" - inkscape:window-x="0" - inkscape:window-y="25" - width="48px" - height="48px" - showguides="true" - inkscape:guide-bbox="true" /> - <metadata - id="metadata4913"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>View Bookmark</dc:title> - <dc:date>December 2006</dc:date> - <dc:creator> - <cc:Agent> - <dc:title>Andreas Nilsson</dc:title> - </cc:Agent> - </dc:creator> - <dc:subject> - <rdf:Bag> - <rdf:li>bookmark</rdf:li> - </rdf:Bag> - </dc:subject> - <cc:license - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> - <dc:source>http://www.gnome.org</dc:source> - </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/ShareAlike" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/SourceCode" /> - </cc:License> - </rdf:RDF> - </metadata> - <g - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer"> - <g - style="display:inline" - id="g5022" - transform="matrix(2.1670245e-2,0,0,1.4992695e-2,43.274287,42.087489)"> - <rect - y="-150.69685" - x="-1559.2523" - height="478.35718" - width="1339.6335" - id="rect4173" - style="opacity:0.39195981;color:#000000;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <path - sodipodi:nodetypes="cccc" - id="path5058" - d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z " - style="opacity:0.40206185;color:#000000;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <path - style="opacity:0.40206185;color:#000000;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z " - id="path5018" - sodipodi:nodetypes="cccc" /> - </g> - <rect - style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#7a7c78;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4918" - width="33.155689" - height="41" - x="10.344313" - y="2.5000002" - rx="0.48613596" - ry="0.48613593" /> - <rect - style="opacity:1;fill:url(#linearGradient6238);fill-opacity:1;stroke:#7a7c78;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4916" - width="34.887901" - height="39.999996" - x="5.6120992" - y="5.5" - rx="0.44194174" - ry="0.4419418" /> - <path - style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#7a7c78;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 37.025152,5.5 L 7.912989,5.4514152 C 7.912989,5.4514152 6.3393947,5.3197948 6.3752233,4.0479689 C 6.4110523,2.7761429 8.0381274,2.5018451 7.9842501,2.5018451 L 36.969331,2.5000003" - id="path4920" - sodipodi:nodetypes="cczcc" /> - <path - style="fill:#555753;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dashoffset:0;stroke-opacity:1" - d="M 5,4 C 7.8890919,5.4674944 10.475361,4.8588996 12,5.0103236 L 12,46 L 5,46 L 5,4 z " - id="rect4922" - sodipodi:nodetypes="ccccc" /> - <rect - style="opacity:0.44021738;fill:none;fill-opacity:1;stroke:url(#linearGradient6218);stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect5893" - width="32.641655" - height="38" - x="6.8583469" - y="6.4999995" /> - <rect - style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect5895" - width="19.776337" - height="1.5884314" - x="9.2399368" - y="3.2942157" /> - <rect - style="opacity:1;fill:#babdb6;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect6220" - width="5.964601" - height="2" - x="6.035399" - y="3" - rx="0" - ry="0" /> - <path - style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dashoffset:0;stroke-opacity:1" - d="M 12,4.96875 L 12,4 L 42,4 L 42,43 L 41,43 L 41,5.0625 L 12,4.96875 z " - id="rect4945" - sodipodi:nodetypes="ccccccc" /> - <path - style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 9.6290662,5.5 L 7.7527058,5.4408977 C 7.7527058,5.4408977 5.4643132,5.2158442 5.5004229,3.9934114 C 5.536547,2.7704953 7.8788256,2.5022447 7.8245258,2.5022447 L 14.275051,2.5" - id="path6139" - sodipodi:nodetypes="cczcc" /> - <rect - style="opacity:0.09239131;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4921" - width="1.8276633" - height="33.565617" - x="9" - y="9" - rx="0.91383165" - ry="0.91383165" /> - <path - style="opacity:0.15;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;display:inline" - d="M 13.518215,4.986098 L 27.000001,4.986098 L 27.000001,25.928002 L 21.515645,19.234797 L 15.961211,26 L 15.961211,5.941904 C 15.961211,5.404299 14.435317,4.986098 13.518215,4.986098 z " - id="path7273" - sodipodi:nodetypes="ccccccc" /> - <path - style="fill:url(#linearGradient5351);fill-opacity:1;fill-rule:evenodd;stroke:#8f5902;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;display:inline" - d="M 15.018214,4.5 L 26.422874,4.5 C 27.994418,4.5 28.5,5.007391 28.5,6.470952 L 28.5,25.441904 L 23.015644,18.748699 L 17.46121,25.513902 L 17.508085,6.455806 C 17.508085,4.870633 15.935316,4.5 15.018214,4.5 z " - id="path4386" - sodipodi:nodetypes="cccccccc" /> - <path - sodipodi:type="inkscape:offset" - inkscape:radius="-1.03125" - inkscape:original="M 10.03125 2.5 C 10.948352 2.5 12.5 2.883577 12.5 4.46875 L 12.46875 23.5 L 18.03125 16.75 L 23.5 23.4375 L 23.5 4.46875 C 23.5 3.0051883 23.009044 2.5 21.4375 2.5 L 10.03125 2.5 z " - style="opacity:0.6;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2839);stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" - id="path1934" - d="M 13.25,3.53125 C 13.362221,3.8338001 13.53125,4.1151264 13.53125,4.46875 L 13.5,20.625 L 17.25,16.09375 C 17.445904,15.855316 17.738283,15.717133 18.046875,15.717133 C 18.355467,15.717133 18.647846,15.855316 18.84375,16.09375 L 22.46875,20.53125 L 22.46875,4.46875 C 22.46875,3.8522811 22.365083,3.7081684 22.34375,3.6875 C 22.322417,3.6668316 22.11277,3.53125 21.4375,3.53125 L 13.25,3.53125 z " - transform="translate(5.0000008,2.0000005)" /> - </g> -</svg> diff --git a/lib/Makefile.am b/lib/Makefile.am index 2a1ec7556..a2826fe2f 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -67,7 +67,6 @@ libephymisc_la_SOURCES = \ ephy-smaps.c \ ephy-state.c \ ephy-string.c \ - ephy-stock-icons.c \ ephy-time-helpers.c \ ephy-zoom.c \ $(INST_H_FILES) \ diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c deleted file mode 100644 index 0cbb5f81b..000000000 --- a/lib/ephy-stock-icons.c +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright © 2002 Jorn Baayen - * - * 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, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include "config.h" - -#include <gtk/gtk.h> -#include <glib/gi18n.h> - -#include "ephy-stock-icons.h" - -void -ephy_stock_icons_init (void) -{ - GtkIconFactory *factory; - GtkIconSet *icon_set; - GtkIconSource *icon_source; - int i; - - static const GtkStockItem items[] = - { - { EPHY_STOCK_BOOKMARKS, N_("Bookmarks"), 0, 0, NULL } - }; - - factory = gtk_icon_factory_new (); - - for (i = 0; i < (int) G_N_ELEMENTS (items); i++) - { - icon_source = gtk_icon_source_new (); - gtk_icon_source_set_icon_name (icon_source, items[i].stock_id); - - icon_set = gtk_icon_set_new (); - gtk_icon_set_add_source (icon_set, icon_source); - gtk_icon_source_free (icon_source); - - gtk_icon_factory_add (factory, items[i].stock_id, icon_set); - gtk_icon_set_unref (icon_set); - } - - gtk_stock_add_static (items, G_N_ELEMENTS (items)); - - gtk_icon_factory_add_default (factory); - g_object_unref (factory); - - /* GtkIconTheme will then look in Ephy custom hicolor dir - * for icons as well as the standard search paths - */ - /* FIXME: multi-head! */ - gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), - SHARE_DIR G_DIR_SEPARATOR_S "icons"); -} diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h index 3b8bba324..9bf6ec52d 100644 --- a/lib/ephy-stock-icons.h +++ b/lib/ephy-stock-icons.h @@ -28,11 +28,6 @@ G_BEGIN_DECLS #define EPHY_STOCK_EPHY "web-browser" -/* Custom Epiphany named icons */ -#define EPHY_STOCK_BOOKMARKS "bookmark-view" - -void ephy_stock_icons_init (void); - G_END_DECLS #endif /* EPHY_STOCK_ICONS_H */ diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index 74d6ff47d..c64d1db48 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -38,7 +38,6 @@ #include "ephy-settings.h" #include "ephy-shell.h" #include "ephy-state.h" -#include "ephy-stock-icons.h" #include "ephy-topic-action.h" #include "ephy-window.h" #include "popup-commands.h" @@ -1519,7 +1518,6 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor) ephy_gui_ensure_window_group (GTK_WINDOW (editor)); gtk_window_set_title (GTK_WINDOW (editor), _("Bookmarks")); - gtk_window_set_icon_name (GTK_WINDOW (editor), EPHY_STOCK_BOOKMARKS); g_signal_connect (editor, "delete_event", G_CALLBACK (delete_event_cb), NULL); diff --git a/src/ephy-main.c b/src/ephy-main.c index e7196a1cb..0fca11d59 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -427,7 +427,6 @@ main (int argc, exit (0); } - ephy_stock_icons_init (); ephy_file_load_accels (); /* Now create the shell */ |