From f182d9f7fce8e9a57c03eb71f4467894394d0104 Mon Sep 17 00:00:00 2001 From: Glynn Foster Date: Sat, 18 Jan 2003 13:35:13 +0000 Subject: Some new window icons. 2003-01-18 Glynn Foster * data/Makefile.am, data/zenity-calendar.png, data/zenity-entry.png, data/zenity-progress.png, data/zenity-text.png: Some new window icons. * src/text.c: Fix crash where the GladeXML ref was getting unref'd before we wanted to use it. * src/main.c: Fix up commandline parsing a little, although we should really add the parsing options for gtk+. * src/zenity.glade: Give some saner defaults. * THANKS, src/about.c: Update for all the people I stole icons and code from. * TODO: Update accordingly. --- ChangeLog | 19 +++++++++++++++++++ THANKS | 8 +++++++- TODO | 1 - data/Makefile.am | 4 +++- data/zenity-calendar.png | Bin 2755 -> 2857 bytes data/zenity-entry.png | Bin 0 -> 1669 bytes data/zenity-progress.png | Bin 4446 -> 4509 bytes data/zenity-text.png | Bin 0 -> 3523 bytes src/about.c | 6 ++++++ src/main.c | 7 ++++--- src/text.c | 9 +++++---- src/zenity.glade | 4 ++-- 12 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 data/zenity-entry.png create mode 100644 data/zenity-text.png diff --git a/ChangeLog b/ChangeLog index cc2a008b..53bd145c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2003-01-18 Glynn Foster + + * data/Makefile.am, data/zenity-calendar.png, + data/zenity-entry.png, data/zenity-progress.png, + data/zenity-text.png: Some new window icons. + + * src/text.c: Fix crash where the GladeXML ref was getting + unref'd before we wanted to use it. + + * src/main.c: Fix up commandline parsing a little, although we + should really add the parsing options for gtk+. + + * src/zenity.glade: Give some saner defaults. + + * THANKS, src/about.c: Update for all the people I stole icons + and code from. + + * TODO: Update accordingly. + 2003-01-16 Mike Newman * src/tree.c: fix a segfault if a --list is constructed and there diff --git a/THANKS b/THANKS index c4566ff1..573f901a 100644 --- a/THANKS +++ b/THANKS @@ -1 +1,7 @@ -Mike Newman +Jonathan Blanford +Anders Carlsson +James Henstridge +Mike Newman +Havoc Pennington +Kristian Rietveld +Jakub Steiner diff --git a/TODO b/TODO index a1f92602..e99757d5 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,3 @@ * Add some accessibility I guess -* Find some nice default window icons * Remove extraneous cruft from configure.in * Start writing help documentation diff --git a/data/Makefile.am b/data/Makefile.am index ef1a1cdd..33ba8d0e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -3,6 +3,8 @@ images_DATA = \ zenity-calendar.png \ zenity-list.png \ zenity-file.png \ - zenity-progress.png + zenity-progress.png \ + zenity-text.png \ + zenity-entry.png EXTRA_DIST = $(images_DATA) diff --git a/data/zenity-calendar.png b/data/zenity-calendar.png index 889f329a..873528a9 100644 Binary files a/data/zenity-calendar.png and b/data/zenity-calendar.png differ diff --git a/data/zenity-entry.png b/data/zenity-entry.png new file mode 100644 index 00000000..3621ea38 Binary files /dev/null and b/data/zenity-entry.png differ diff --git a/data/zenity-progress.png b/data/zenity-progress.png index 505c805e..b789e023 100644 Binary files a/data/zenity-progress.png and b/data/zenity-progress.png differ diff --git a/data/zenity-text.png b/data/zenity-text.png new file mode 100644 index 00000000..07569920 Binary files /dev/null and b/data/zenity-text.png differ diff --git a/src/about.c b/src/about.c index 3818c2c1..c121cdc5 100644 --- a/src/about.c +++ b/src/about.c @@ -37,8 +37,14 @@ static GtkWidget *cred_dialog; static void zenity_about_dialog_response (GtkWidget *widget, int response, gpointer data); static const gchar *author_credits[] = { + "Jonathan Blanford ", + "Anders Carlsson ", "Glynn Foster ", + "James Henstridge ", "Mike Newman ", + "Havoc Pennington ", + "Kristian Rietveld ", + "Jakub Steiner ", NULL }; diff --git a/src/main.c b/src/main.c index bcd3208d..58bb13e7 100644 --- a/src/main.c +++ b/src/main.c @@ -812,6 +812,9 @@ main (gint argc, gchar **argv) { /*nothing*/; if (nextopt != -1) { + /* FIXME : We should probably handle --display, or at least maybe load some of the gtk+ + * commandline options + */ g_printerr (_("%s in an invalid option for this dialog\n"), poptBadOption (ctx, 0)); zenity_free_parsing_options (); exit (-1); @@ -1220,8 +1223,6 @@ void zenity_parse_options_callback (poptContext ctx, exit (0); break; default: - g_warning ("Invalid option %s", arg); - zenity_free_parsing_options (); - exit (-1); + break; } } diff --git a/src/text.c b/src/text.c index ead35ec2..fe9747cb 100644 --- a/src/text.c +++ b/src/text.c @@ -46,9 +46,6 @@ zenity_text (ZenityData *data, ZenityTextData *text_data) dialog = glade_xml_get_widget (glade_dialog, "zenity_text_dialog"); - if (glade_dialog) - g_object_unref (glade_dialog); - g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (zenity_text_dialog_response), data); @@ -58,7 +55,7 @@ zenity_text (ZenityData *data, ZenityTextData *text_data) if (data->window_icon) zenity_util_set_window_icon (dialog, data->window_icon); else - ; + zenity_util_set_window_icon (dialog, ZENITY_IMAGE_FULLPATH ("zenity-text.png")); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); @@ -68,6 +65,10 @@ zenity_text (ZenityData *data, ZenityTextData *text_data) gtk_text_view_set_buffer (GTK_TEXT_VIEW (text_view), text_buffer); gtk_widget_show (dialog); + + if (glade_dialog) + g_object_unref (glade_dialog); + gtk_main (); } diff --git a/src/zenity.glade b/src/zenity.glade index 880ec5b7..3ea0bab4 100644 --- a/src/zenity.glade +++ b/src/zenity.glade @@ -529,7 +529,7 @@ True - zenity_text_dialog + Text View GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER False @@ -601,7 +601,7 @@ 2 2 0 - zenity_text_view + -- cgit