diff options
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | THANKS | 8 | ||||
| -rw-r--r-- | TODO | 1 | ||||
| -rw-r--r-- | data/Makefile.am | 4 | ||||
| -rw-r--r-- | data/zenity-calendar.png | bin | 2755 -> 2857 bytes | |||
| -rw-r--r-- | data/zenity-entry.png | bin | 0 -> 1669 bytes | |||
| -rw-r--r-- | data/zenity-progress.png | bin | 4446 -> 4509 bytes | |||
| -rw-r--r-- | data/zenity-text.png | bin | 0 -> 3523 bytes | |||
| -rw-r--r-- | src/about.c | 6 | ||||
| -rw-r--r-- | src/main.c | 7 | ||||
| -rw-r--r-- | src/text.c | 9 | ||||
| -rw-r--r-- | src/zenity.glade | 4 |
12 files changed, 46 insertions, 12 deletions
@@ -1,3 +1,22 @@ +2003-01-18 Glynn Foster <glynn.foster@sun.com> + + * 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 <mike@gtnorthern.demon.co.uk> * src/tree.c: fix a segfault if a --list is constructed and there @@ -1 +1,7 @@ -Mike Newman <mike@gtnorthern.demon.co.uk> +Jonathan Blanford <jrb@redhat.com> +Anders Carlsson <andersca@gnu.org> +James Henstridge <james@daa.com.au> +Mike Newman <mike@gtnorthern.demon.co.uk> +Havoc Pennington <hp@redhat.com> +Kristian Rietveld <kris@gtk.org> +Jakub Steiner <jimmac@ximian.com> @@ -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 ef1a1cd..33ba8d0 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 Binary files differindex 889f329..873528a 100644 --- a/data/zenity-calendar.png +++ b/data/zenity-calendar.png diff --git a/data/zenity-entry.png b/data/zenity-entry.png Binary files differnew file mode 100644 index 0000000..3621ea3 --- /dev/null +++ b/data/zenity-entry.png diff --git a/data/zenity-progress.png b/data/zenity-progress.png Binary files differindex 505c805..b789e02 100644 --- a/data/zenity-progress.png +++ b/data/zenity-progress.png diff --git a/data/zenity-text.png b/data/zenity-text.png Binary files differnew file mode 100644 index 0000000..0756992 --- /dev/null +++ b/data/zenity-text.png diff --git a/src/about.c b/src/about.c index 3818c2c..c121cdc 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 <jrb@redhat.com>", + "Anders Carlsson <andersca@gnu.org>", "Glynn Foster <glynn.foster@sun.com>", + "James Henstridge <james@daa.com.au>", "Mike Newman <mike@gtnorthern.demon.co.uk>", + "Havoc Pennington <hp@redhat.com>", + "Kristian Rietveld <kris@gtk.org>", + "Jakub Steiner <jimmac@ximian.com>", NULL }; @@ -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; } } @@ -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 880ec5b..3ea0bab 100644 --- a/src/zenity.glade +++ b/src/zenity.glade @@ -529,7 +529,7 @@ <widget class="GtkDialog" id="zenity_text_dialog"> <property name="visible">True</property> - <property name="title" translatable="yes">zenity_text_dialog</property> + <property name="title" translatable="yes">Text View</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_CENTER</property> <property name="modal">False</property> @@ -601,7 +601,7 @@ <property name="left_margin">2</property> <property name="right_margin">2</property> <property name="indent">0</property> - <property name="text" translatable="yes">zenity_text_view</property> + <property name="text" translatable="yes"></property> </widget> </child> </widget> |
