aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-01-04 21:46:26 +0800
committerChristian Persch <chpe@src.gnome.org>2006-01-04 21:46:26 +0800
commitda5d9256984938434aea101a2d9ca615a91fa534 (patch)
treee6473467bdb3779be21b4ec52d03bf289b563e14
parentce41d0f2c6becdb0032813f8917ff82e984b860f (diff)
downloadgsoc2013-epiphany-da5d9256984938434aea101a2d9ca615a91fa534.tar
gsoc2013-epiphany-da5d9256984938434aea101a2d9ca615a91fa534.tar.gz
gsoc2013-epiphany-da5d9256984938434aea101a2d9ca615a91fa534.tar.bz2
gsoc2013-epiphany-da5d9256984938434aea101a2d9ca615a91fa534.tar.lz
gsoc2013-epiphany-da5d9256984938434aea101a2d9ca615a91fa534.tar.xz
gsoc2013-epiphany-da5d9256984938434aea101a2d9ca615a91fa534.tar.zst
gsoc2013-epiphany-da5d9256984938434aea101a2d9ca615a91fa534.zip
R data/art/epiphany-close-tab.png:
2006-01-04 Christian Persch <chpe@cvs.gnome.org> R data/art/epiphany-close-tab.png: * lib/ephy-stock-icons.c: (ephy_stock_icons_init): * lib/ephy-stock-icons.h: * src/ephy-notebook.c: (build_tab_label): Go back to using the gtk stock close icon, to get correct themeing in a11y themes.
-rw-r--r--ChangeLog10
-rw-r--r--data/art/Makefile.am1
-rw-r--r--data/art/epiphany-close-tab.pngbin260 -> 0 bytes
-rw-r--r--doc/reference/tmpl/ephy-embed.sgml3
-rw-r--r--lib/ephy-stock-icons.c2
-rw-r--r--lib/ephy-stock-icons.h2
-rw-r--r--src/ephy-notebook.c16
7 files changed, 22 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 9784ac924..75046031d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2006-01-04 Christian Persch <chpe@cvs.gnome.org>
+ R data/art/epiphany-close-tab.png:
+ * lib/ephy-stock-icons.c: (ephy_stock_icons_init):
+ * lib/ephy-stock-icons.h:
+ * src/ephy-notebook.c: (build_tab_label):
+
+ Go back to using the gtk stock close icon, to get correct
+ themeing in a11y themes.
+
+2006-01-04 Christian Persch <chpe@cvs.gnome.org>
+
* src/ephy-find-toolbar.c: (entry_changed_cb), (set_focus_cb),
(ephy_find_toolbar_grab_focus), (ephy_find_toolbar_find_next),
(ephy_find_toolbar_find_previous), (ephy_find_toolbar_open),
diff --git a/data/art/Makefile.am b/data/art/Makefile.am
index 445ad87c3..24a6892a5 100644
--- a/data/art/Makefile.am
+++ b/data/art/Makefile.am
@@ -1,5 +1,4 @@
art_DATA = \
- epiphany-close-tab.png \
epiphany-entry.png \
epiphany-download.png \
epiphany-history.png \
diff --git a/data/art/epiphany-close-tab.png b/data/art/epiphany-close-tab.png
deleted file mode 100644
index 43a549aa1..000000000
--- a/data/art/epiphany-close-tab.png
+++ /dev/null
Binary files differ
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index bf976179d..b43fe35e1 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -309,6 +309,9 @@ be done by casting).
@:
@:
@:
+@:
+@:
+@:
@:
<!-- ##### SIGNAL EphyEmbed::ge-search-key-press ##### -->
diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c
index 07ae50c06..4087305d0 100644
--- a/lib/ephy-stock-icons.c
+++ b/lib/ephy-stock-icons.c
@@ -97,6 +97,4 @@ ephy_stock_icons_init (void)
gtk_icon_factory_add_default (factory);
g_object_unref (factory);
-
- gtk_icon_size_register (EPHY_ICON_SIZE_TAB_BUTTON, 10, 10);
}
diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h
index 9fcdd9911..328ad0460 100644
--- a/lib/ephy-stock-icons.h
+++ b/lib/ephy-stock-icons.h
@@ -23,8 +23,6 @@
G_BEGIN_DECLS
-#define EPHY_ICON_SIZE_TAB_BUTTON "epiphany-icon-size-tab-button"
-
#define EPHY_STOCK_CLOSE_TAB "epiphany-close-tab"
#define EPHY_STOCK_POPUPS "epiphany-popup-hidden"
#define EPHY_STOCK_HISTORY "epiphany-history"
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index ef2790a74..cd13b09b9 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -23,7 +23,6 @@
#include "config.h"
#include "ephy-notebook.h"
-#include "ephy-stock-icons.h"
#include "eel-gconf-extensions.h"
#include "ephy-prefs.h"
#include "ephy-marshal.h"
@@ -36,7 +35,7 @@
#include "ephy-link.h"
#include "ephy-debug.h"
-#include <glib-object.h>
+#include <glib/gi18n.h>
#include <gtk/gtkeventbox.h>
#include <gtk/gtknotebook.h>
#include <gtk/gtkhbox.h>
@@ -48,8 +47,6 @@
#include <gtk/gtkimage.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtkiconfactory.h>
-#include <glib/gi18n.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
#define TAB_WIDTH_N_CHARS 15
@@ -1057,7 +1054,7 @@ build_tab_label (EphyNotebook *nb, EphyTab *tab)
{
GtkWidget *hbox, *label_hbox, *label_ebox;
GtkWidget *label, *close_button, *image, *spinner, *icon;
- GtkIconSize close_icon_size;
+ GtkRcStyle *rcstyle;
/* set hbox spacing and label padding (see below) so that there's an
* equal amount of space around the label */
@@ -1076,9 +1073,14 @@ build_tab_label (EphyNotebook *nb, EphyTab *tab)
GTK_RELIEF_NONE);
/* don't allow focus on the close button */
gtk_button_set_focus_on_click (GTK_BUTTON (close_button), FALSE);
+ gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE);
+
+ rcstyle = gtk_rc_style_new ();
+ rcstyle->xthickness = rcstyle->ythickness = 0;
+ gtk_widget_modify_style (close_button, rcstyle);
+ gtk_rc_style_unref (rcstyle),
- close_icon_size = gtk_icon_size_from_name (EPHY_ICON_SIZE_TAB_BUTTON);
- image = gtk_image_new_from_stock (EPHY_STOCK_CLOSE_TAB, close_icon_size);
+ image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (close_button), image);
gtk_box_pack_start (GTK_BOX (hbox), close_button, FALSE, FALSE, 0);