Commit bb591d0f authored by Steve Frécinaux's avatar Steve Frécinaux

Move icon locations, use theme and new plugin icon

parent 3635b444
2006-04-18 Steve Frécinaux <steve@istique.net>
* pixmaps/*.png: add Andreas Nilsson's puzzle icon (gedit-plugin.png).
Get rid of gedit-icon.png and gedit-plugin-manager.png since they are
not used anymore.
* pixmaps/Makefile.am: install the logo into $prefix/share/gedit-2/logo
and the plugin icon into $prefix/share/gedit-2/icons.
* gedit/Makefile.am: define GEDIT_DATADIR and GEDIT_ICONDIR, and
remove GNOME_ICONDIR which is not used anymore.
* gedit/gedit-commands-help.c: update the logo path.
* gedit/gedit.c: add GEDIT_ICONDIR to the icon theme lookup directories.
* gedit/gedit-plugin-manager.c: use the gedit-plugin icon from icon
theme in the plugin about box.
* configure.ac: Remove unused definition of GEDIT_DATA_DIR in config.h.
2006-04-18 Brian Pepple <bdpepple@gmail.com>
* configure.ac: Use IT_PROG_INTLTOOL instead of AC_PROG_INTLTOOL.
......
......@@ -97,23 +97,6 @@ dnl ================================================================
AM_GCONF_SOURCE_2
dnl ================================================================
dnl GEDIT_DATA_DIR - Sets the location of the data directory, where we install
dnl source files added to projects (such as all the Gnome m4 macros).
dnl This will substitute GEDIT_DATA_DIR in config.h.
dnl ================================================================
if test "x${datadir}" = 'x${prefix}/share'; then
if test "x${prefix}" = "xNONE"; then
AC_DEFINE_UNQUOTED(GEDIT_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Directory of data files])
else
AC_DEFINE_UNQUOTED(GEDIT_DATA_DIR, "${prefix}/share/${PACKAGE}", [Directory of data files])
fi
else
AC_DEFINE_UNQUOTED(GEDIT_DATA_DIR, "${datadir}/${PACKAGE}", [Directory of data files])
fi
dnl ================================================================
dnl Python
dnl ================================================================
......
......@@ -10,11 +10,12 @@ INCLUDES = \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" \
-DGEDIT_DATADIR=\""$(datadir)/gedit-2"\" \
-DGEDIT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DGEDIT_UI_DIR=\""$(datadir)/gedit-2/ui/"\" \
-DGEDIT_PLUGINDIR=\""$(libdir)/gedit-2/plugins"\" \
-DGEDIT_GLADEDIR=\""$(datadir)/gedit-2/glade/"\"
-DGEDIT_GLADEDIR=\""$(datadir)/gedit-2/glade/"\" \
-DGEDIT_ICONDIR=\""$(datadir)/gedit-2/icons"\"
if ENABLE_PYTHON
INCLUDES += \
......
......@@ -82,7 +82,8 @@ gedit_cmd_help_about (GtkAction *action,
gedit_debug (DEBUG_COMMANDS);
logo = gdk_pixbuf_new_from_file (GNOME_ICONDIR "/gedit-logo.png", NULL);
logo = gdk_pixbuf_new_from_file (GEDIT_DATADIR "/logo/gedit-logo.png",
NULL);
gtk_show_about_dialog (GTK_WINDOW (window),
"authors", authors,
......
......@@ -88,7 +88,6 @@ about_button_cb (GtkWidget *button,
GeditPluginManager *pm)
{
GeditPluginInfo *info;
GdkPixbuf *pixbuf = NULL;
gedit_debug (DEBUG_PLUGINS);
......@@ -96,8 +95,6 @@ about_button_cb (GtkWidget *button,
g_return_if_fail (info != NULL);
pixbuf = gdk_pixbuf_new_from_file (GNOME_ICONDIR "/gedit-plugin-manager.png", NULL);
/* if there is another about dialog already open destroy it */
if (pm->priv->about)
gtk_widget_destroy (pm->priv->about);
......@@ -108,7 +105,7 @@ about_button_cb (GtkWidget *button,
"authors", gedit_plugins_engine_get_plugin_authors (info),
"comments", gedit_plugins_engine_get_plugin_description (info),
"website", gedit_plugins_engine_get_plugin_website (info),
"logo", pixbuf,
"logo-icon-name", "gedit-plugin",
NULL);
gtk_window_set_destroy_with_parent (GTK_WINDOW (pm->priv->about),
......@@ -126,9 +123,6 @@ about_button_cb (GtkWidget *button,
gtk_window_set_transient_for (GTK_WINDOW (pm->priv->about),
GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET(pm))));
gtk_widget_show (pm->priv->about);
if (pixbuf != NULL)
g_object_unref (pixbuf);
}
static void
......
......@@ -500,6 +500,9 @@ main (int argc, char *argv[])
gedit_debug_message (DEBUG_APP, "Set icon");
gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
GEDIT_ICONDIR);
/* Set default icon */
gtk_window_set_default_icon_name ("text-editor");
......
icondir = $(datadir)/gedit-2/icons
icon_DATA = gedit-plugin.png
appicondir = $(datadir)/pixmaps
appicon_DATA = gedit-icon.png
applogodir = $(datadir)/pixmaps
applogo_DATA = gedit-logo.png \
gedit-plugin-manager.png
logodir = $(datadir)/gedit-2/logo
logo_DATA = gedit-logo.png
EXTRA_DIST = \
$(appicon_DATA) \
$(applogo_DATA)
$(icon_DATA) \
$(logo_DATA)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment