diff --git a/.gitignore b/.gitignore index 298177b7e..0c8cddf85 100644 --- a/.gitignore +++ b/.gitignore @@ -46,7 +46,6 @@ POTFILES po/*.pot 50-metacity-desktop-key.xml 50-metacity-key.xml -inlinepixbufs.h libmutter.pc mutter mutter-theme-viewer diff --git a/src/Makefile.am b/src/Makefile.am index e2cec915e..22cce625a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -139,7 +139,6 @@ libmutter_la_SOURCES = \ meta/common.h \ core/core.h \ ui/ui.h \ - inlinepixbufs.h \ ui/frames.c \ ui/frames.h \ ui/menu.c \ @@ -284,14 +283,7 @@ gsettings_SCHEMAS = org.gnome.mutter.gschema.xml convertdir = $(datadir)/GConf/gsettings convert_DATA = mutter-schemas.convert -IMAGES=stock_maximize.png stock_minimize.png stock_delete.png -VARIABLES=stock_maximize_data $(srcdir)/stock_maximize.png \ - stock_minimize_data $(srcdir)/stock_minimize.png \ - stock_delete_data $(srcdir)/stock_delete.png - -BUILT_SOURCES = inlinepixbufs.h CLEANFILES = \ - inlinepixbufs.h \ mutter.desktop \ mutter-wm.desktop \ org.gnome.mutter.gschema.xml \ @@ -300,9 +292,6 @@ CLEANFILES = \ $(typelib_DATA) \ $(gir_DATA) -inlinepixbufs.h: $(IMAGES) - $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libmutter.pc mutter-plugins.pc @@ -320,7 +309,7 @@ EXTRA_DIST=$(desktopfiles_files) \ mutter-enum-types.h.in \ mutter-enum-types.c.in -BUILT_SOURCES += $(mutter_built_sources) +BUILT_SOURCES = $(mutter_built_sources) MUTTER_STAMP_FILES = stamp-mutter-enum-types.h CLEANFILES += $(MUTTER_STAMP_FILES) diff --git a/src/stock_delete.png b/src/stock_delete.png deleted file mode 100644 index 429401cb7..000000000 Binary files a/src/stock_delete.png and /dev/null differ diff --git a/src/stock_maximize.png b/src/stock_maximize.png deleted file mode 100644 index 6f1084058..000000000 Binary files a/src/stock_maximize.png and /dev/null differ diff --git a/src/stock_minimize.png b/src/stock_minimize.png deleted file mode 100644 index a22e3c45b..000000000 Binary files a/src/stock_minimize.png and /dev/null differ diff --git a/src/ui/menu.c b/src/ui/menu.c index 5372a8ced..ccad1c9df 100644 --- a/src/ui/menu.c +++ b/src/ui/menu.c @@ -40,7 +40,6 @@ typedef enum { MENU_ITEM_SEPARATOR = 0, MENU_ITEM_NORMAL, - MENU_ITEM_IMAGE, MENU_ITEM_CHECKBOX, MENU_ITEM_RADIOBUTTON, MENU_ITEM_WORKSPACE_LIST, @@ -50,7 +49,6 @@ struct _MenuItem { MetaMenuOp op; MetaMenuItemType type; - const char *stock_id; const gboolean checked; const char *label; }; @@ -66,42 +64,42 @@ static void activate_cb (GtkWidget *menuitem, gpointer data); static MenuItem menuitems[] = { /* Translators: Translate this string the same way as you do in libwnck! */ - { META_MENU_OP_MINIMIZE, MENU_ITEM_IMAGE, METACITY_STOCK_MINIMIZE, FALSE, N_("Mi_nimize") }, + { META_MENU_OP_MINIMIZE, MENU_ITEM_NORMAL, FALSE, N_("Mi_nimize") }, /* Translators: Translate this string the same way as you do in libwnck! */ - { META_MENU_OP_MAXIMIZE, MENU_ITEM_IMAGE, METACITY_STOCK_MAXIMIZE, FALSE, N_("Ma_ximize") }, + { META_MENU_OP_MAXIMIZE, MENU_ITEM_NORMAL, FALSE, N_("Ma_ximize") }, /* Translators: Translate this string the same way as you do in libwnck! */ - { META_MENU_OP_UNMAXIMIZE, MENU_ITEM_NORMAL, NULL, FALSE, N_("Unma_ximize") }, + { META_MENU_OP_UNMAXIMIZE, MENU_ITEM_NORMAL, FALSE, N_("Unma_ximize") }, /* Translators: Translate this string the same way as you do in libwnck! */ - { META_MENU_OP_SHADE, MENU_ITEM_NORMAL, NULL, FALSE, N_("Roll _Up") }, + { META_MENU_OP_SHADE, MENU_ITEM_NORMAL, FALSE, N_("Roll _Up") }, /* Translators: Translate this string the same way as you do in libwnck! */ - { META_MENU_OP_UNSHADE, MENU_ITEM_NORMAL, NULL, FALSE, N_("_Unroll") }, + { META_MENU_OP_UNSHADE, MENU_ITEM_NORMAL, FALSE, N_("_Unroll") }, /* Translators: Translate this string the same way as you do in libwnck! */ - { META_MENU_OP_MOVE, MENU_ITEM_NORMAL, NULL, FALSE, N_("_Move") }, + { META_MENU_OP_MOVE, MENU_ITEM_NORMAL, FALSE, N_("_Move") }, /* Translators: Translate this string the same way as you do in libwnck! */ - { META_MENU_OP_RESIZE, MENU_ITEM_NORMAL, NULL, FALSE, N_("_Resize") }, + { META_MENU_OP_RESIZE, MENU_ITEM_NORMAL, FALSE, N_("_Resize") }, /* Translators: Translate this string the same way as you do in libwnck! */ - { META_MENU_OP_RECOVER, MENU_ITEM_NORMAL, NULL, FALSE, N_("Move Titlebar On_screen") }, - { META_MENU_OP_WORKSPACES, MENU_ITEM_SEPARATOR, NULL, FALSE, NULL }, /* separator */ + { META_MENU_OP_RECOVER, MENU_ITEM_NORMAL, FALSE, N_("Move Titlebar On_screen") }, + { META_MENU_OP_WORKSPACES, MENU_ITEM_SEPARATOR, FALSE, NULL }, /* separator */ /* Translators: Translate this string the same way as you do in libwnck! */ - { META_MENU_OP_ABOVE, MENU_ITEM_CHECKBOX, NULL, FALSE, N_("Always on _Top") }, + { META_MENU_OP_ABOVE, MENU_ITEM_CHECKBOX, FALSE, N_("Always on _Top") }, /* Translators: Translate this string the same way as you do in libwnck! */ - { META_MENU_OP_UNABOVE, MENU_ITEM_CHECKBOX, NULL, TRUE, N_("Always on _Top") }, + { META_MENU_OP_UNABOVE, MENU_ITEM_CHECKBOX, TRUE, N_("Always on _Top") }, /* Translators: Translate this string the same way as you do in libwnck! */ - { META_MENU_OP_STICK, MENU_ITEM_RADIOBUTTON, NULL, FALSE, N_("_Always on Visible Workspace") }, + { META_MENU_OP_STICK, MENU_ITEM_RADIOBUTTON, FALSE, N_("_Always on Visible Workspace") }, /* Translators: Translate this string the same way as you do in libwnck! */ - { META_MENU_OP_UNSTICK, MENU_ITEM_RADIOBUTTON, NULL, FALSE, N_("_Only on This Workspace") }, + { META_MENU_OP_UNSTICK, MENU_ITEM_RADIOBUTTON, FALSE, N_("_Only on This Workspace") }, /* Translators: Translate this string the same way as you do in libwnck! */ - { META_MENU_OP_MOVE_LEFT, MENU_ITEM_NORMAL, NULL, FALSE, N_("Move to Workspace _Left") }, + { META_MENU_OP_MOVE_LEFT, MENU_ITEM_NORMAL, FALSE, N_("Move to Workspace _Left") }, /* Translators: Translate this string the same way as you do in libwnck! */ - { META_MENU_OP_MOVE_RIGHT, MENU_ITEM_NORMAL, NULL, FALSE, N_("Move to Workspace R_ight") }, + { META_MENU_OP_MOVE_RIGHT, MENU_ITEM_NORMAL, FALSE, N_("Move to Workspace R_ight") }, /* Translators: Translate this string the same way as you do in libwnck! */ - { META_MENU_OP_MOVE_UP, MENU_ITEM_NORMAL, NULL, FALSE, N_("Move to Workspace _Up") }, + { META_MENU_OP_MOVE_UP, MENU_ITEM_NORMAL, FALSE, N_("Move to Workspace _Up") }, /* Translators: Translate this string the same way as you do in libwnck! */ - { META_MENU_OP_MOVE_DOWN, MENU_ITEM_NORMAL, NULL, FALSE, N_("Move to Workspace _Down") }, - { 0, MENU_ITEM_WORKSPACE_LIST, NULL, FALSE, NULL }, - { 0, MENU_ITEM_SEPARATOR, NULL, FALSE, NULL }, /* separator */ + { META_MENU_OP_MOVE_DOWN, MENU_ITEM_NORMAL, FALSE, N_("Move to Workspace _Down") }, + { 0, MENU_ITEM_WORKSPACE_LIST, FALSE, NULL }, + { 0, MENU_ITEM_SEPARATOR, FALSE, NULL }, /* separator */ /* Translators: Translate this string the same way as you do in libwnck! */ - { META_MENU_OP_DELETE, MENU_ITEM_IMAGE, METACITY_STOCK_DELETE, FALSE, N_("_Close") } + { META_MENU_OP_DELETE, MENU_ITEM_NORMAL, FALSE, N_("_Close") } }; static void @@ -274,16 +272,6 @@ menu_item_new (MenuItem *menuitem, int workspace_id) { mi = gtk_menu_item_new (); } - else if (menuitem->type == MENU_ITEM_IMAGE) - { - GtkWidget *image; - - image = gtk_image_new_from_stock (menuitem->stock_id, GTK_ICON_SIZE_MENU); - mi = gtk_image_menu_item_new (); - - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), image); - gtk_widget_show (image); - } else if (menuitem->type == MENU_ITEM_CHECKBOX) { mi = gtk_check_menu_item_new (); @@ -392,8 +380,7 @@ meta_window_menu_new (MetaFrames *frames, int j; MenuItem to_another_workspace = { - 0, MENU_ITEM_NORMAL, - NULL, FALSE, + 0, MENU_ITEM_NORMAL, FALSE, N_("Move to Another _Workspace") }; diff --git a/src/ui/menu.h b/src/ui/menu.h index c6e8dde4d..adcf32813 100644 --- a/src/ui/menu.h +++ b/src/ui/menu.h @@ -27,11 +27,6 @@ #include #include "frames.h" -/* Stock icons */ -#define METACITY_STOCK_DELETE "metacity-delete" -#define METACITY_STOCK_MINIMIZE "metacity-minimize" -#define METACITY_STOCK_MAXIMIZE "metacity-maximize" - struct _MetaWindowMenu { MetaFrames *frames; diff --git a/src/ui/ui.c b/src/ui/ui.c index c0c819e68..265ecfcca 100644 --- a/src/ui/ui.c +++ b/src/ui/ui.c @@ -4,7 +4,6 @@ /* * Copyright (C) 2002 Havoc Pennington - * stock icon code Copyright (C) 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 @@ -31,13 +30,10 @@ #include "core.h" #include "theme-private.h" -#include "inlinepixbufs.h" - #include #include #include -static void meta_stock_icons_init (void); static void meta_ui_accelerator_parse (const char *accel, guint *keysym, guint *keycode, @@ -62,8 +58,6 @@ meta_ui_init (void) { if (!gtk_init_check (NULL, NULL)) meta_fatal ("Unable to open X display %s\n", XDisplayName (NULL)); - - meta_stock_icons_init (); } Display* @@ -998,48 +992,6 @@ meta_ui_window_is_widget (MetaUI *ui, return FALSE; } -/* stock icon code Copyright (C) 2002 Jorn Baayen */ -typedef struct -{ - char *stock_id; - const guint8 *icon_data; -} MetaStockIcon; - -static void -meta_stock_icons_init (void) -{ - GtkIconFactory *factory; - int i; - - MetaStockIcon items[] = - { - { METACITY_STOCK_DELETE, stock_delete_data }, - { METACITY_STOCK_MINIMIZE, stock_minimize_data }, - { METACITY_STOCK_MAXIMIZE, stock_maximize_data } - }; - - factory = gtk_icon_factory_new (); - gtk_icon_factory_add_default (factory); - - for (i = 0; i < (gint) G_N_ELEMENTS (items); i++) - { - GtkIconSet *icon_set; - GdkPixbuf *pixbuf; - - pixbuf = gdk_pixbuf_new_from_inline (-1, items[i].icon_data, - FALSE, - NULL); - - icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); - gtk_icon_factory_add (factory, items[i].stock_id, icon_set); - gtk_icon_set_unref (icon_set); - - g_object_unref (G_OBJECT (pixbuf)); - } - - g_object_unref (G_OBJECT (factory)); -} - int meta_ui_get_drag_threshold (MetaUI *ui) {