[zenity] about: Remove Zen wisdom of the ancients
- From: Logan Rathbone <larathbone src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [zenity] about: Remove Zen wisdom of the ancients
- Date: Tue, 29 Jun 2021 04:23:25 +0000 (UTC)
commit b40d9bcb9b7928be50f6a2ae4d93912f8c408d8b
Author: Logan Rathbone <poprocks gmail com>
Date: Tue Jun 29 00:22:09 2021 -0400
about: Remove Zen wisdom of the ancients
This easter egg was disabled more than a decade ago, but zenity is still
installing the image files that were used for it. Let's stop doing that.
Signed-off-by: Simon McVittie <smcv collabora com>
data/gnome-tshirt.png | Bin 4147 -> 0 bytes
data/hawaii-shirt.png | Bin 13730 -> 0 bytes
data/meson.build | 9 ---
data/monk.png | Bin 9773 -> 0 bytes
data/sunglasses.png | Bin 2721 -> 0 bytes
data/surfboard.png | Bin 14484 -> 0 bytes
src/about.c | 189 --------------------------------------------------
7 files changed, 198 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 373efcf4..339b3cff 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -11,12 +11,3 @@ install_data(
'zenity-entry.png',
'zenity-notification.png']
)
-
-install_data(
- ['monk.png',
- 'gnome-tshirt.png',
- 'sunglasses.png',
- 'surfboard.png',
- 'hawaii-shirt.png'],
- install_dir: join_paths(zenity_datadir, 'clothes')
- )
diff --git a/src/about.c b/src/about.c
index 627aa1ea..c0baa9e7 100644
--- a/src/about.c
+++ b/src/about.c
@@ -32,10 +32,6 @@
#define GTK_RESPONSE_CREDITS 0
#define ZENITY_HELP_PATH ZENITY_DATADIR "/help/"
-#define ZENITY_CLOTHES_PATH ZENITY_DATADIR "/clothes/"
-
-#define ZENITY_CANVAS_X 400.0
-#define ZENITY_CANVAS_Y 280.0
static GtkWidget *dialog;
@@ -72,186 +68,6 @@ static const char *license[] = {
"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
"02110-1301, USA.")};
-#if 0
-static gint
-zenity_move_clothes_event (GnomeCanvasItem *item,
- GdkEvent *event,
- gpointer data)
-{
- static double x, y;
- double new_x, new_y;
- static int dragging;
- double item_x, item_y;
-
- /* set item_[xy] to the event x,y position in the parent's
- * item-relative coordinates
- */
-
- item_x = event->button.x;
- item_y = event->button.y;
- gnome_canvas_item_w2i (item->parent, &item_x, &item_y);
-
- switch (event->type) {
- case GDK_BUTTON_PRESS:
- x = item_x;
- y = item_y;
- gnome_canvas_item_ungrab (item, event->button.time);
- gnome_canvas_item_raise_to_top (item);
- dragging = TRUE;
- break;
-
- case GDK_MOTION_NOTIFY:
- if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
- new_x = item_x;
- new_y = item_y;
-
- gnome_canvas_item_move (item, new_x - x, new_y - y);
- x = new_x;
- y = new_y;
- }
- break;
-
- case GDK_BUTTON_RELEASE:
- gnome_canvas_item_ungrab (item, event->button.time);
- dragging = FALSE;
- break;
-
- default:
- break;
- }
-
- return FALSE;
-}
-
-typedef struct
-{
- const gchar *filename;
- gdouble x, y;
-} MonkClothes;
-
-static const MonkClothes monk_clothes[] = {
- {"gnome-tshirt.png", 30.0, 20.0},
- {"sunglasses.png", ZENITY_CANVAS_X - 100.0 , ZENITY_CANVAS_Y - 150.0 },
- {"surfboard.png", 30.0, ZENITY_CANVAS_Y - 200.0},
- {"hawaii-shirt.png", ZENITY_CANVAS_X - 50.0, 20.0}
-};
-
-static void
-zenity_create_clothes (GtkWidget *canvas_board)
-{
- GdkPixbuf *pixbuf;
- GnomeCanvasItem *canvas_item;
- gchar *pixbuf_path;
- size_t i;
-
- for (i = 0; i < G_N_ELEMENTS (monk_clothes); i++) {
- pixbuf_path = g_strconcat (ZENITY_CLOTHES_PATH, monk_clothes[i].filename, NULL);
- pixbuf = gdk_pixbuf_new_from_file (pixbuf_path, NULL);
-
- canvas_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (canvas_board)->root),
- GNOME_TYPE_CANVAS_PIXBUF,
- "x", monk_clothes[i].x,
- "y", monk_clothes[i].y,
- "pixbuf", pixbuf,
- "anchor", GTK_ANCHOR_NW,
- NULL);
- g_signal_connect (G_OBJECT (canvas_item), "event",
- G_CALLBACK (zenity_move_clothes_event), NULL);
- }
-}
-
-static GtkWidget *
-zenity_create_monk (void)
-{
- GtkWidget *canvas_board;
- GnomeCanvasItem *canvas_item;
- GdkPixbuf *pixbuf;
- GdkColor color = { 0, 0xffff, 0xffff, 0xffff };
-
- canvas_board = gnome_canvas_new ();
-
- gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas_board), 0, 0,
- ZENITY_CANVAS_X, ZENITY_CANVAS_Y);
-
- gtk_widget_set_size_request (canvas_board, ZENITY_CANVAS_X, ZENITY_CANVAS_Y);
-
- gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (canvas_board)),
- &color, FALSE, TRUE);
-
- gtk_widget_modify_bg (GTK_WIDGET (canvas_board), GTK_STATE_NORMAL, &color);
-
- pixbuf = gdk_pixbuf_new_from_file (ZENITY_CLOTHES_PATH "monk.png", NULL);
-
- canvas_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (canvas_board)->root),
- GNOME_TYPE_CANVAS_PIXBUF,
- "x", (ZENITY_CANVAS_X / 2.0)/2.0 + 10.0,
- "y", (ZENITY_CANVAS_Y / 2.0)/2.0 - 50.0,
- "pixbuf", pixbuf,
- "anchor", GTK_ANCHOR_NW,
- NULL);
-
- zenity_create_clothes (canvas_board);
-
- return canvas_board;
-}
-
-static GtkWidget *
-zenity_create_boutique (void)
-{
- GtkWidget *window;
- GtkWidget *canvas;
-
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
- zenity_util_set_window_icon (window, NULL, ZENITY_IMAGE_FULLPATH ("zenity.png"));
- canvas = zenity_create_monk ();
- gtk_container_add (GTK_CONTAINER (window), canvas);
-
- return window;
-}
-
-static gboolean
-zenity_zen_wisdom (GtkDialog *dialog, GdkEventKey *event, gpointer user_data)
-{
- static gint string_count;
-
- if (string_count >= 3)
- return FALSE;
-
- switch (event->keyval) {
- case GDK_N:
- case GDK_n:
- if (string_count == 2) {
- GtkWidget *window;
- window = zenity_create_boutique ();
- gtk_widget_show_all (window);
- string_count++;
- } else {
- string_count = 0;
- }
- break;
- case GDK_Z:
- case GDK_z:
- if (string_count == 0)
- string_count++;
- else
- string_count = 0;
- break;
- case GDK_E:
- case GDK_e:
- if (string_count == 1)
- string_count++;
- else
- string_count = 0;
- break;
- default:
- string_count = 0;
- }
-
- return FALSE;
-}
-#endif
-
void
zenity_about (ZenityData *data) {
GdkPixbuf *logo;
@@ -301,11 +117,6 @@ zenity_about (ZenityData *data) {
G_CALLBACK (zenity_about_dialog_response),
data);
-#if 0
- g_signal_connect (G_OBJECT (dialog), "key_press_event",
- G_CALLBACK (zenity_zen_wisdom), NULL);
-#endif
-
zenity_util_show_dialog (dialog, data->attach);
gtk_main ();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]