aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog18
-rw-r--r--configure.ac3
-rw-r--r--data/icons/16x16/Makefile.am3
-rw-r--r--data/icons/16x16/places/Makefile.am15
-rw-r--r--data/icons/16x16/places/bookmark-web.pngbin0 -> 576 bytes
-rw-r--r--data/icons/16x16/places/bookmark-web.svg121
-rw-r--r--data/icons/22x22/Makefile.am3
-rw-r--r--data/icons/22x22/places/Makefile.am15
-rw-r--r--data/icons/22x22/places/bookmark-web.pngbin0 -> 989 bytes
-rw-r--r--data/icons/22x22/places/bookmark-web.svg134
-rw-r--r--data/icons/24x24/Makefile.am3
-rw-r--r--data/icons/24x24/places/Makefile.am14
-rw-r--r--data/icons/24x24/places/bookmark-web.pngbin0 -> 1025 bytes
-rw-r--r--lib/ephy-stock-icons.c2
-rw-r--r--lib/ephy-stock-icons.h2
-rw-r--r--src/bookmarks/ephy-bookmark-action.c2
-rw-r--r--src/bookmarks/ephy-bookmark-properties.c2
17 files changed, 330 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index f5a85a2db..06217d07a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2007-01-18 Luca Ferretti <elle.uca@libero.it>
+
+ * data/icons/*/places/bookmark-web.*:
+ * data/icons/*/places/Makefile.am:
+ * data/icons/*/Makefile.am:
+ * configure.ac
+
+ Add to build new "bookmark-web" custom named icon at
+ 16, 22 and 24 pixels - under new places directory.
+
+ * lib/ephy-stock-icons.c:
+ * lib/ephy-stock-icons.h:
+ * src/bookmarks/ephy-bookmark-properties.c:
+ * src/bookmarks/ephy-bookmark-action.c:
+
+ Remove STOCK_BOOKMARK and add EPHY_STOCK_BOOKMARK using
+ new "bookmark-web" custom named icon.
+
2007-01-17 Diego Escalante Urrelo <diegoe@svn.gnome.org>
* src/popup-commands.c:
diff --git a/configure.ac b/configure.ac
index c59f76be8..5fb868e93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -642,12 +642,15 @@ data/glade/Makefile
data/icons/Makefile
data/icons/16x16/Makefile
data/icons/16x16/actions/Makefile
+data/icons/16x16/places/Makefile
data/icons/16x16/status/Makefile
data/icons/22x22/Makefile
data/icons/22x22/actions/Makefile
+data/icons/22x22/places/Makefile
data/icons/22x22/status/Makefile
data/icons/24x24/Makefile
data/icons/24x24/actions/Makefile
+data/icons/24x24/places/Makefile
data/icons/24x24/status/Makefile
data/icons/32x32/Makefile
data/icons/32x32/actions/Makefile
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index a7a411110..a15b2be3f 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -1,3 +1,4 @@
SUBDIRS = \
- actions \
+ actions \
+ places \
status
diff --git a/data/icons/16x16/places/Makefile.am b/data/icons/16x16/places/Makefile.am
new file mode 100644
index 000000000..e0280192d
--- /dev/null
+++ b/data/icons/16x16/places/Makefile.am
@@ -0,0 +1,15 @@
+themedir = $(pkgdatadir)/icons/hicolor
+size = 16x16
+context = actions
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+ bookmark-web.png
+
+noinst_DATA = \
+ bookmark-web.svg
+
+EXTRA_DIST = \
+ $(icons_DATA) \
+ $(noinst_DATA)
diff --git a/data/icons/16x16/places/bookmark-web.png b/data/icons/16x16/places/bookmark-web.png
new file mode 100644
index 000000000..627f7ade1
--- /dev/null
+++ b/data/icons/16x16/places/bookmark-web.png
Binary files differ
diff --git a/data/icons/16x16/places/bookmark-web.svg b/data/icons/16x16/places/bookmark-web.svg
new file mode 100644
index 000000000..80d969a32
--- /dev/null
+++ b/data/icons/16x16/places/bookmark-web.svg
@@ -0,0 +1,121 @@
+<?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="16px"
+ height="16px"
+ id="svg1872"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ sodipodi:docbase="/home/luca/Progetti/Artwork/epiphany/16x16"
+ sodipodi:docname="bookmark.svg">
+ <defs
+ id="defs1874">
+ <linearGradient
+ id="linearGradient2772">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop2775" />
+ <stop
+ style="stop-color:white;stop-opacity:0;"
+ offset="1"
+ id="stop2777" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2770">
+ <stop
+ style="stop-color:black;stop-opacity:1;"
+ offset="0"
+ id="stop2772" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop2774" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2770"
+ id="radialGradient2776"
+ cx="8.5"
+ cy="13.744378"
+ fx="8.5"
+ fy="13.744378"
+ r="6.5"
+ gradientTransform="matrix(1,0,0,0.199401,0,11.00375)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2772"
+ id="linearGradient2779"
+ x1="8.521739"
+ y1="5.5532236"
+ x2="10.497751"
+ y2="7.1604199"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="41.75"
+ inkscape:cx="8"
+ inkscape:cy="8"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:grid-points="false"
+ gridtolerance="0.4"
+ inkscape:window-width="1027"
+ inkscape:window-height="884"
+ inkscape:window-x="218"
+ inkscape:window-y="32" />
+ <metadata
+ id="metadata1877">
+ <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">
+ <path
+ style="fill:#d59b3f;fill-opacity:1;fill-rule:evenodd;stroke:#8f5902;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+ d="M 5.5104946,14.5 L 5.505247,10.491004 L 1.457271,10.497001 L 10.551724,1.4040478 L 14.551724,5.4040478 L 5.5104946,14.5 z "
+ id="path1880"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:0.2;fill:url(#radialGradient2776);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="path1882"
+ sodipodi:cx="8.5"
+ sodipodi:cy="13.744378"
+ sodipodi:rx="6.5"
+ sodipodi:ry="1.7758621"
+ d="M 15 13.744378 A 6.5 1.7758621 0 1 1 2,13.744378 A 6.5 1.7758621 0 1 1 15 13.744378 z"
+ transform="translate(-1,1.006706)" />
+ <path
+ sodipodi:nodetypes="cccccc"
+ id="path1884"
+ d="M 6,13.257871 L 6,10 L 2.6761619,10.005997 L 10.563718,2.113943 L 13.844078,5.4160418 L 6,13.257871 z "
+ style="fill:url(#linearGradient2779);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.5" />
+ </g>
+</svg>
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index a7a411110..a15b2be3f 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -1,3 +1,4 @@
SUBDIRS = \
- actions \
+ actions \
+ places \
status
diff --git a/data/icons/22x22/places/Makefile.am b/data/icons/22x22/places/Makefile.am
new file mode 100644
index 000000000..8c6f09410
--- /dev/null
+++ b/data/icons/22x22/places/Makefile.am
@@ -0,0 +1,15 @@
+themedir = $(pkgdatadir)/icons/hicolor
+size = 22x22
+context = actions
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+ bookmark-web.png
+
+noinst_DATA = \
+ bookmark-web.svg
+
+EXTRA_DIST = \
+ $(icons_DATA) \
+ $(noinst_DATA)
diff --git a/data/icons/22x22/places/bookmark-web.png b/data/icons/22x22/places/bookmark-web.png
new file mode 100644
index 000000000..f254b2c91
--- /dev/null
+++ b/data/icons/22x22/places/bookmark-web.png
Binary files differ
diff --git a/data/icons/22x22/places/bookmark-web.svg b/data/icons/22x22/places/bookmark-web.svg
new file mode 100644
index 000000000..d59a6e07a
--- /dev/null
+++ b/data/icons/22x22/places/bookmark-web.svg
@@ -0,0 +1,134 @@
+<?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="22"
+ height="22"
+ id="svg1872"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ sodipodi:docbase="/home/luca/Progetti/Artwork/epiphany/22x22"
+ sodipodi:docname="bookmark.svg"
+ inkscape:export-filename="/home/luca/Progetti/Artwork/epiphany/22x22/bookmark.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ version="1.0">
+ <defs
+ id="defs1874">
+ <linearGradient
+ id="linearGradient2772">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop2775" />
+ <stop
+ style="stop-color:white;stop-opacity:0;"
+ offset="1"
+ id="stop2777" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2770">
+ <stop
+ style="stop-color:black;stop-opacity:1;"
+ offset="0"
+ id="stop2772" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop2774" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2770"
+ id="radialGradient6326"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.199401,0,11.00375)"
+ cx="8.5"
+ cy="13.744378"
+ fx="8.5"
+ fy="13.744378"
+ r="6.5" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2772"
+ id="linearGradient6331"
+ gradientUnits="userSpaceOnUse"
+ x1="8.521739"
+ y1="5.5532236"
+ x2="10.497751"
+ y2="7.1604199"
+ gradientTransform="matrix(1.423764,0,0,1.423764,0.594343,0.373577)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="33.318182"
+ inkscape:cx="11"
+ inkscape:cy="11"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:grid-points="false"
+ gridtolerance="0.4"
+ inkscape:window-width="1280"
+ inkscape:window-height="949"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ width="22px"
+ height="22px" />
+ <metadata
+ id="metadata1877">
+ <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"
+ transform="translate(-0.957271,-0.904048)">
+ <path
+ style="fill:#d59b3f;fill-opacity:1;fill-rule:evenodd;stroke:#8f5902;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+ d="M 8.4399868,21.408332 L 8.4625291,15.415339 L 2.4440507,15.378856 L 15.527467,2.432637 L 21.432619,8.2777612 L 8.4399868,21.408332 z "
+ id="path1880"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:0.2;fill:url(#radialGradient6326);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="path1882"
+ sodipodi:cx="8.5"
+ sodipodi:cy="13.744378"
+ sodipodi:rx="6.5"
+ sodipodi:ry="1.7758621"
+ d="M 15 13.744378 A 6.5 1.7758621 0 1 1 2,13.744378 A 6.5 1.7758621 0 1 1 15 13.744378 z"
+ transform="matrix(1.423764,0,0,1.423764,-0.829421,1.806889)" />
+ <path
+ sodipodi:nodetypes="cccccc"
+ id="path1884"
+ d="M 9.4445669,18.964526 L 9.5421112,14.363604 L 4.8097502,14.394653 L 15.514529,3.8335376 L 20.064934,8.2948378 L 9.4445669,18.964526 z "
+ style="opacity:0.5;fill:url(#linearGradient6331);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#e9b96e;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 9.4445669,18.964526 L 9.5421112,14.363604 L 4.8097502,14.394653 L 15.514529,3.8335376 L 20.064934,8.2948378 L 9.4445669,18.964526 z "
+ id="path9878"
+ sodipodi:nodetypes="cccccc" />
+ </g>
+</svg>
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index a7a411110..9e425c3e6 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@@ -1,3 +1,4 @@
SUBDIRS = \
- actions \
+ actions \
+ places \
status
diff --git a/data/icons/24x24/places/Makefile.am b/data/icons/24x24/places/Makefile.am
new file mode 100644
index 000000000..226d76fee
--- /dev/null
+++ b/data/icons/24x24/places/Makefile.am
@@ -0,0 +1,14 @@
+themedir = $(pkgdatadir)/icons/hicolor
+size = 24x24
+context = actions
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+ bookmark-web.png
+
+noinst_DATA =
+
+EXTRA_DIST = \
+ $(icons_DATA) \
+ $(noinst_DATA)
diff --git a/data/icons/24x24/places/bookmark-web.png b/data/icons/24x24/places/bookmark-web.png
new file mode 100644
index 000000000..f86e7b78a
--- /dev/null
+++ b/data/icons/24x24/places/bookmark-web.png
Binary files differ
diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c
index 57faf72f1..e09276d8f 100644
--- a/lib/ephy-stock-icons.c
+++ b/lib/ephy-stock-icons.c
@@ -43,7 +43,6 @@ ephy_stock_icons_init (void)
STOCK_NEW_WINDOW,
STOCK_SEND_MAIL,
STOCK_ADD_BOOKMARK,
- STOCK_BOOKMARK,
STOCK_PRINT_SETUP,
STOCK_LOCK_INSECURE,
STOCK_LOCK_SECURE,
@@ -54,6 +53,7 @@ ephy_stock_icons_init (void)
{
{ EPHY_STOCK_POPUPS, N_("Popup Windows"), 0, 0, NULL },
{ EPHY_STOCK_HISTORY, N_("History"), 0, 0, NULL },
+ { EPHY_STOCK_BOOKMARK, N_("Bookmark"), 0, 0, NULL },
{ EPHY_STOCK_BOOKMARKS, N_("Bookmarks"), 0, 0, NULL },
{ EPHY_STOCK_ENTRY, N_("Address Entry"), 0, 0, NULL },
{ EPHY_STOCK_DOWNLOAD, N_("_Download"), 0, 0, NULL }
diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h
index 030ad1dc9..3e0003040 100644
--- a/lib/ephy-stock-icons.h
+++ b/lib/ephy-stock-icons.h
@@ -27,6 +27,7 @@ G_BEGIN_DECLS
#define EPHY_STOCK_POPUPS "popup-hidden"
#define EPHY_STOCK_HISTORY "history-view"
+#define EPHY_STOCK_BOOKMARK "bookmark-web"
#define EPHY_STOCK_BOOKMARKS "bookmark-view"
#define EPHY_STOCK_ENTRY "location-entry"
#define EPHY_STOCK_DOWNLOAD "download"
@@ -35,7 +36,6 @@ G_BEGIN_DECLS
#define STOCK_NEW_WINDOW "window-new"
#define STOCK_SEND_MAIL "mail-forward"
#define STOCK_ADD_BOOKMARK "bookmark-new"
-#define STOCK_BOOKMARK "stock_bookmark"
#define STOCK_PRINT_SETUP "stock_print-setup" /*document-page-setup*/
#define STOCK_LOCK_INSECURE "stock_lock-open"
#define STOCK_LOCK_SECURE "stock_lock"
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index acb8b7b4e..9d14554e7 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -214,7 +214,7 @@ ephy_bookmark_action_sync_icon (GtkAction *action,
if (pixbuf == NULL && icon_location == NULL)
{
- pixbuf = gtk_widget_render_icon (proxy, STOCK_BOOKMARK,
+ pixbuf = gtk_widget_render_icon (proxy, EPHY_STOCK_BOOKMARK,
GTK_ICON_SIZE_MENU, NULL);
}
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index bc83675d2..29528a9d8 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -514,7 +514,7 @@ ephy_bookmark_properties_constructor (GType type,
properties = EPHY_BOOKMARK_PROPERTIES (object);
priv = properties->priv;
- gtk_window_set_icon_name (window, STOCK_BOOKMARK);
+ gtk_window_set_icon_name (window, EPHY_STOCK_BOOKMARK);
gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_NORMAL);
g_signal_connect (properties, "response",
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 07:45:24 +0800