minecraft-pi-reborn
/
zenity
1
0
Fork 0
Code Pull Requests Activity

Patch from Darren Adams <darrenadams@dsl.pipex.com> to make sure the new 

2004-03-19  Glynn Foster  <glynn.foster@sun.com>

	* src/calendar.c, src/entry.c, src/fileselection.c,
	src/msg.c, src/progress.c, src/text.c, src/tree.c:
	Patch from Darren Adams <darrenadams@dsl.pipex.com> to make
	sure the new file chooser resizes nicely. Sanitize the default
	setting of the other widgets.
	* configure.in, src/util.c: Lose gconf dependancy since we
	don't currently use it, although arguably we should to detect
	which help browser we're supposed to run :/
	* THANKS, src/about.c: Add Darren to the list.
This commit is contained in:
Glynn Foster 2004-03-19 02:28:30 +00:00 committed by Glynn Foster
parent f4e2c43e6a
commit b43bbda2e2
12 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2004-03-19 Glynn Foster <glynn.foster@sun.com>
* src/calendar.c, src/entry.c, src/fileselection.c,
src/msg.c, src/progress.c, src/text.c, src/tree.c:
Patch from Darren Adams <darrenadams@dsl.pipex.com> to make
sure the new file chooser resizes nicely. Sanitize the default
setting of the other widgets.
* configure.in, src/util.c: Lose gconf dependancy since we
don't currently use it, although arguably we should to detect
which help browser we're supposed to run :/
* THANKS, src/about.c: Add Darren to the list.
2004-03-16 Alexander Winston <alexander.winston@comcast.net>
* configure.in: Added "en_CA" (Canadian English) to ALL_LINGUAS.

1
THANKS
View File

@ -1,5 +1,6 @@
"Mike Newman <mikegtn@gnome.org">",
"Darren Adams <darrenadams@dsl.pipex.com>"
"Peter Astrand <astrand@lysator.liu.se>",
"Jonathan Blandford <jrb@redhat.com>",
"Ross Burton <ross@burtonini.com>",

2
configure.in
View File

@ -11,7 +11,7 @@ AC_PROG_CC
GTK_REQUIRED=2.3.1
PKG_CHECK_MODULES(ZENITY, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 gconf-2.0 libgnomecanvas-2.0)
PKG_CHECK_MODULES(ZENITY, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 libgnomecanvas-2.0)
AC_SUBST(ZENITY_CFLAGS)
AC_SUBST(ZENITY_LIBS)

1
src/about.c
View File

@ -53,6 +53,7 @@ static const gchar *author_credits[] = {
"",
"Patches from the following people",
"=================================",
"Darren Adams <darrenadams@dsl.pipex.com>",
"Peter Astrand <astrand@lysator.liu.se>",
"Jonathan Blandford <jrb@redhat.com>",
"Ross Burton <ross@burtonini.com>",

3
src/calendar.c
View File

@ -63,7 +63,8 @@ zenity_calendar (ZenityData *data, ZenityCalendarData *cal_data)
else
zenity_util_set_window_icon (dialog, ZENITY_IMAGE_FULLPATH ("zenity-calendar.png"));
gtk_window_set_default_size (GTK_WINDOW (dialog), data->width, data->height);
if (data->width > -1 || data->height > -1)
gtk_window_set_default_size (GTK_WINDOW (dialog), data->width, data->height);
text = glade_xml_get_widget (glade_dialog, "zenity_calendar_text");

3
src/entry.c
View File

@ -59,7 +59,8 @@ zenity_entry (ZenityData *data, ZenityEntryData *entry_data)
else
zenity_util_set_window_icon (dialog, ZENITY_IMAGE_FULLPATH ("zenity-entry.png"));
gtk_window_set_default_size (GTK_WINDOW (dialog), data->width, data->height);
if (data->width > -1 || data->height > -1)
gtk_window_set_default_size (GTK_WINDOW (dialog), data->width, data->height);
text = glade_xml_get_widget (glade_dialog, "zenity_entry_text");

3
src/fileselection.c
View File

@ -54,8 +54,6 @@ void zenity_fileselection (ZenityData *data, ZenityFileData *file_data)
else
zenity_util_set_window_icon (dialog, ZENITY_IMAGE_FULLPATH ("zenity-file.png"));
gtk_window_set_default_size (GTK_WINDOW (dialog), data->width, data->height);
if (file_data->uri) {
dir = g_path_get_dirname (file_data->uri);
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dir);
@ -107,6 +105,7 @@ zenity_fileselection_dialog_response (GtkWidget *widget, int response, gpointer
default:
/* Esc dialog */
zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
gtk_main_quit ();
break;
}
}

5
src/msg.c
View File

@ -107,8 +107,9 @@ zenity_msg (ZenityData *data, ZenityMsgData *msg_data)
break;
}
}
gtk_window_set_default_size (GTK_WINDOW (dialog), data->width, data->height);
if (data->width > -1 || data->height > -1)
gtk_window_set_default_size (GTK_WINDOW (dialog), data->width, data->height);
if (msg_data->dialog_text)
gtk_label_set_text (GTK_LABEL (text), msg_data->dialog_text);

3
src/progress.c
View File

@ -196,7 +196,8 @@ zenity_progress (ZenityData *data, ZenityProgressData *progress_data)
else
zenity_util_set_window_icon (dialog, ZENITY_IMAGE_FULLPATH ("zenity-progress.png"));
gtk_window_set_default_size (GTK_WINDOW (dialog), data->width, data->height);
if (data->width > -1 || data->height > -1)
gtk_window_set_default_size (GTK_WINDOW (dialog), data->width, data->height);
text = glade_xml_get_widget (glade_dialog, "zenity_progress_text");
gtk_label_set_text (GTK_LABEL (text), progress_data->dialog_text);

6
src/text.c
View File

@ -133,7 +133,6 @@ zenity_text (ZenityData *data, ZenityTextData *text_data)
else
zenity_util_set_window_icon (dialog, ZENITY_IMAGE_FULLPATH ("zenity-text.png"));
gtk_window_set_default_size (GTK_WINDOW (dialog), data->width, data->height);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
text_buffer = gtk_text_buffer_new (NULL);
@ -149,6 +148,11 @@ zenity_text (ZenityData *data, ZenityTextData *text_data)
if (text_data->editable)
zen_text_data->buffer = text_buffer;
if (data->width > -1 || data->height > -1)
gtk_window_set_default_size (GTK_WINDOW (dialog), data->width, data->height);
else
gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 400);
gtk_widget_show (dialog);
if (glade_dialog)

3
src/tree.c
View File

@ -308,7 +308,8 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data)
else
zenity_util_set_window_icon (dialog, ZENITY_IMAGE_FULLPATH ("zenity-list.png"));
gtk_window_set_default_size (GTK_WINDOW (dialog), data->width, data->height);
if (data->width > -1 || data->height > -1)
gtk_window_set_default_size (GTK_WINDOW (dialog), data->width, data->height);
tree_view = glade_xml_get_widget (glade_dialog, "zenity_tree_view");

1
src/util.c
View File

@ -34,7 +34,6 @@
#include "config.h"
#include "util.h"
#include "zenity.h"
#include <gconf/gconf-client.h>
#define ZENITY_OK_DEFAULT 0
#define ZENITY_CANCEL_DEFAULT 1