diff options
| author | Glynn Foster <glynn.foster@sun.com> | 2003-01-18 18:02:14 +0000 |
|---|---|---|
| committer | Glynn Foster <gman@src.gnome.org> | 2003-01-18 18:02:14 +0000 |
| commit | 18760d406d64f71f7ca6fec5a7a01978418fa8f5 (patch) | |
| tree | 9cdc81d02fc1eae8bb380daa33af2706ba8d17a1 /src | |
| parent | Hooray! Zenity now has an about window icon. It's very zen too. (diff) | |
| download | zenity-18760d406d64f71f7ca6fec5a7a01978418fa8f5.tar.gz zenity-18760d406d64f71f7ca6fec5a7a01978418fa8f5.tar.bz2 zenity-18760d406d64f71f7ca6fec5a7a01978418fa8f5.zip | |
Only some examples and some screenshots and we're mostly done for a first
2003-01-18 Glynn Foster <glynn.foster@sun.com>
* help/C/zenity.xml: Only some examples and some screenshots
and we're mostly done for a first draft.
* src/calendar.c: Don't set the text if it's NULL.
* src/main.c: Swap the order of the commandline dialogs so
that we're alphabetical.
* src/zenity.glade: Add some default strings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/calendar.c | 4 | ||||
| -rw-r--r-- | src/main.c | 24 | ||||
| -rw-r--r-- | src/zenity.glade | 2 |
3 files changed, 16 insertions, 14 deletions
diff --git a/src/calendar.c b/src/calendar.c index 65c2bf90..68956e76 100644 --- a/src/calendar.c +++ b/src/calendar.c @@ -64,7 +64,9 @@ zenity_calendar (ZenityData *data, ZenityCalendarData *cal_data) zenity_util_set_window_icon (dialog, ZENITY_IMAGE_FULLPATH ("zenity-calendar.png")); text = glade_xml_get_widget (glade_dialog, "zenity_calendar_text"); - gtk_label_set_text (GTK_LABEL (text), cal_data->dialog_text); + + if (cal_data->dialog_text) + gtk_label_set_text (GTK_LABEL (text), cal_data->dialog_text); calendar = glade_xml_get_widget (glade_dialog, "zenity_calendar"); @@ -137,21 +137,21 @@ struct poptOption options[] = { NULL }, { - "info", + "file-selection", '\0', POPT_ARG_NONE, NULL, - OPTION_INFO, - N_("Display info dialog"), + OPTION_FILE, + N_("Display file selection dialog"), NULL }, { - "file-selection", + "info", '\0', POPT_ARG_NONE, NULL, - OPTION_FILE, - N_("Display file selection dialog"), + OPTION_INFO, + N_("Display info dialog"), NULL }, { @@ -614,27 +614,27 @@ struct poptOption application_options[] = { NULL, '\0', POPT_ARG_INCLUDE_TABLE, - info_options, + error_options, 0, - N_("Info options"), + N_("Error options"), NULL }, { NULL, '\0', POPT_ARG_INCLUDE_TABLE, - error_options, + file_selection_options, 0, - N_("Error options"), + N_("File selection options"), NULL }, { NULL, '\0', POPT_ARG_INCLUDE_TABLE, - file_selection_options, + info_options, 0, - N_("File selection options"), + N_("Info options"), NULL }, { diff --git a/src/zenity.glade b/src/zenity.glade index 3ea0bab4..f22c1018 100644 --- a/src/zenity.glade +++ b/src/zenity.glade @@ -74,7 +74,7 @@ <child> <widget class="GtkLabel" id="zenity_calendar_text"> <property name="visible">True</property> - <property name="label" translatable="yes">Select a date from below</property> + <property name="label" translatable="yes">Select a date from below.</property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> |