diff --git a/Makefile.am b/Makefile.am
index fd670f9..b224ee5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,8 +6,6 @@ SUBDIRS = \
EXTRA_DIST = \
autogen.sh \
- zenity.spec \
- zenity.spec.in \
COPYING \
HACKING \
ChangeLog \
diff --git a/README b/README
index af7084a..b273354 100644
--- a/README
+++ b/README
@@ -10,4 +10,4 @@ This software is licensed under the LGPL.
Zen Requirements -
==================
scrollkeeper and intltool.
-gtk+-2.0, libglade-2.0, and libgnomecanvas-2.0.
+gtk+-2.0 and libgnomecanvas-2.0.
diff --git a/configure.in b/configure.in
index 8c30444..b3f8ea2 100644
--- a/configure.in
+++ b/configure.in
@@ -77,7 +77,6 @@ AC_SUBST([AM_LDFLAGS])
AC_CONFIG_FILES([
Makefile
-zenity.spec
po/Makefile.in
src/Makefile
src/gdialog
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index c834f54..c66bc6f 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -6,5 +6,4 @@ src/progress.c
src/text.c
src/util.h
src/util.c
-src/zenity.glade
src/zenity.h
diff --git a/src/zenity.glade b/src/zenity.glade
deleted file mode 100644
index c23d09b..0000000
--- a/src/zenity.glade
+++ /dev/null
@@ -1,1224 +0,0 @@
-
-
-
-
-
-
- 5
- Calendar selection
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_CENTER
- False
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- False
- False
- False
-
-
-
-
- True
- False
- 2
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
- -6
-
-
-
-
-
- True
- True
- True
- True
- gtk-ok
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 5
- True
- False
- 6
-
-
-
- True
- False
- 6
-
-
-
- True
- Select a date from below.
- False
- True
- GTK_JUSTIFY_LEFT
- True
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
- C_alendar:
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- zenity_calendar
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
-
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- GTK_CALENDAR_SHOW_HEADING|GTK_CALENDAR_SHOW_DAY_NAMES
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
- 5
- Warning
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_CENTER
- False
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- False
- False
- False
-
-
-
-
- True
- False
- 14
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- True
- gtk-ok
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 5
- True
- False
- 12
-
-
-
- True
- gtk-dialog-warning
- 6
- 0
- 0
- 0
- 0
-
-
- 0
- False
- True
-
-
-
-
-
- True
- True
- Are you sure you want to proceed?
- False
- True
- GTK_JUSTIFY_LEFT
- True
- True
- 0.5
- 0
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
- 5
- Question
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_CENTER
- False
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- False
- False
- False
-
-
-
-
- True
- False
- 14
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 5
- True
- False
- 12
-
-
-
- True
- gtk-dialog-question
- 6
- 0
- 0
- 0
- 0
-
-
- 0
- False
- True
-
-
-
-
-
- True
- True
- Are you sure you want to proceed?
- False
- True
- GTK_JUSTIFY_LEFT
- True
- True
- 0.5
- 0
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
- 5
- Add a new entry
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_CENTER
- False
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- False
- False
- False
-
-
-
-
- True
- False
- 2
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
- -6
-
-
-
-
-
- True
- True
- True
- True
- gtk-ok
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 6
- True
- False
- 0
-
-
-
- True
- False
- 6
-
-
-
- True
- _Enter new text:
- True
- True
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
-
-
-
- 0
- False
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
- 5
- Text View
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_CENTER
- False
- 300
- 200
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- False
- False
- False
-
-
-
-
- True
- False
- 2
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-close
- True
- GTK_RELIEF_NORMAL
- True
- -7
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 5
- True
- False
- 0
-
-
-
- True
- True
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_ETCHED_IN
- GTK_CORNER_TOP_LEFT
-
-
-
- True
- True
- False
- False
- True
- GTK_JUSTIFY_LEFT
- GTK_WRAP_WORD
- True
- 2
- 2
- 0
- 2
- 2
- 0
-
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
- 5
- Progress
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_CENTER
- False
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- False
- False
- False
-
-
-
-
- True
- False
- 2
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
- -6
-
-
-
-
-
- True
- False
- True
- True
- True
- gtk-ok
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 5
- True
- False
- 6
-
-
-
- True
- Running...
- False
- True
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- GTK_PROGRESS_LEFT_TO_RIGHT
- 0
- 0.10000000149
-
- PANGO_ELLIPSIZE_NONE
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
- 5
- Error
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_CENTER
- False
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- False
- False
- False
-
-
-
-
- True
- False
- 14
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-ok
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 6
- True
- False
- 0
-
-
-
- 5
- True
- False
- 12
-
-
-
- True
- gtk-dialog-error
- 6
- 0.5
- 0
- 0
- 0
-
-
- 0
- True
- True
-
-
-
-
-
- True
- True
- An error has occurred.
- False
- True
- GTK_JUSTIFY_LEFT
- True
- True
- 0.5
- 0
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
- 5
- Select items from the list
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_CENTER
- False
- 300
- 196
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- False
- False
- False
-
-
-
-
- True
- False
- 0
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
- -6
-
-
-
-
-
- True
- True
- True
- gtk-ok
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 5
- True
- False
- 6
-
-
-
- True
- Select items from the list below.
- False
- True
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
- True
- True
- True
- True
- False
- False
- True
- False
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
- 5
- Information
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_CENTER
- False
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- False
- False
- False
-
-
-
-
- True
- False
- 14
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-ok
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 5
- True
- False
- 12
-
-
-
- True
- gtk-dialog-info
- 6
- 0.5
- 0
- 0
- 0
-
-
- 0
- True
- True
-
-
-
-
-
- True
- True
- All updates are complete.
- False
- True
- GTK_JUSTIFY_LEFT
- True
- True
- 0.5
- 0
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
- 5
- True
- Adjust the scale value
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- 300
- 100
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- False
- False
- False
-
-
-
-
- True
- False
- 0
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
- -6
-
-
-
-
-
- True
- True
- True
- gtk-ok
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 5
- True
- False
- 6
-
-
-
- True
- Adjust the scale value
- False
- True
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 4
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- True
- GTK_POS_RIGHT
- 0
- GTK_UPDATE_DISCONTINUOUS
- False
- 0 0 100 1 1 0
-
-
- 0
- True
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
diff --git a/src/zenity.ui b/src/zenity.ui
index 48f0501..db30432 100644
--- a/src/zenity.ui
+++ b/src/zenity.ui
@@ -1,7 +1,7 @@
-
-
+
+
-
-
-
-
-
- 5
- Calendar selection
- center
- dialog
- False
- False
-
-
-
- True
- 2
-
-
- True
- 5
- 6
-
-
- True
- 6
-
-
- True
- 0
- Select a date from below.
- True
- True
-
-
- False
- False
- 0
-
-
-
-
- 0
-
-
-
-
- True
- 0
- C_alendar:
- True
- zenity_calendar
-
-
-
-
-
- False
- False
- 1
-
-
-
-
- True
- True
-
-
- False
- False
- 2
-
-
-
-
- 1
-
-
-
-
- True
- end
-
-
- gtk-cancel
- True
- True
- True
- False
- True
-
-
- False
- False
- 0
-
-
-
-
- gtk-ok
- True
- True
- True
- True
- False
- True
-
-
- False
- False
- 1
-
-
-
-
- False
- end
- 0
-
-
-
-
-
- zenity_calendar_cancel_button
- zenity_calendar_ok_button
-
-
-
- 5
- Warning
- center
- dialog
- False
- False
-
-
-
- True
- 14
-
-
- True
- 5
- 12
-
-
- True
- 0
- 0
- gtk-dialog-warning
- 6
-
-
- False
- 0
-
-
-
-
- True
- True
- 0
- Are you sure you want to proceed?
- True
- True
- True
-
-
- False
- False
- 1
-
-
-
-
- 1
-
-
-
-
- True
- end
-
-
- gtk-ok
- True
- True
- True
- True
- False
- True
-
-
- False
- False
- 0
-
-
-
-
- False
- end
- 0
-
-
-
-
-
- zenity_warning_ok_button
-
-
-
- 5
- Question
- center
- dialog
- False
- False
-
-
-
- True
- 14
-
-
- True
- 5
- 12
-
-
- True
- 0
- 0
- gtk-dialog-question
- 6
-
-
- False
- 0
-
-
-
-
- True
- True
- 0
- Are you sure you want to proceed?
- True
- True
- True
-
-
- False
- False
- 1
-
-
-
-
- 1
-
-
-
-
- True
- end
-
-
- False
- end
- 0
-
-
-
-
-
-
- 5
- Add a new entry
- center
- dialog
- False
- False
-
-
-
- True
- 2
-
-
- True
- 6
-
-
- True
- 6
-
-
- True
- 0
- _Enter new text:
- True
- True
-
-
- False
- False
- 0
-
-
-
-
-
-
-
- False
- 0
-
-
-
-
- 1
-
-
-
-
- True
- end
-
-
- gtk-cancel
- True
- True
- True
- False
- True
-
-
- False
- False
- 0
-
-
-
-
- gtk-ok
- True
- True
- True
- True
- False
- True
-
-
- False
- False
- 1
-
-
-
-
- False
- end
- 0
-
-
-
-
-
- zenity_entry_cancel_button
- zenity_entry_ok_button
-
-
-
- 5
- Text View
- center
- 300
- 200
- dialog
- False
- False
-
-
-
- True
- 2
-
-
- True
- 5
-
-
- True
- True
- automatic
- automatic
- etched-in
-
-
- True
- True
- 2
- 2
- False
- word
- 2
- 2
- textbuffer1
-
-
-
-
- 0
-
-
-
-
- 1
-
-
-
-
- True
- end
-
-
- gtk-close
- True
- True
- True
- False
- True
-
-
- False
- False
- 0
-
-
-
-
- False
- end
- 0
-
-
-
-
-
- zenity_text_close_button
-
-
-
- 5
- Progress
- center
- dialog
- False
- False
-
-
-
- True
- 2
-
-
- True
- 5
- 6
-
-
- True
- 0
- Running...
- True
-
-
- False
- False
- 0
-
-
-
-
- True
- 0.10000000149
-
-
- False
- False
- 1
-
-
-
-
- 1
-
-
-
-
- True
- end
-
-
- gtk-cancel
- True
- True
- True
- False
- True
-
-
- False
- False
- 0
-
-
-
-
- gtk-ok
- True
- False
- True
- True
- True
- False
- True
-
-
- False
- False
- 1
-
-
-
-
- False
- end
- 0
-
-
-
-
-
- zenity_progress_cancel_button
- zenity_progress_ok_button
-
-
-
- 5
- Error
- center
- dialog
- False
- False
-
-
-
- True
- 14
-
-
- True
- 6
-
-
- True
- 5
- 12
-
-
- True
- 0
- gtk-dialog-error
- 6
-
-
- 0
-
-
-
-
- True
- True
- 0
- An error has occurred.
- True
- True
- True
-
-
- False
- False
- 1
-
-
-
-
- 0
-
-
-
-
- 1
-
-
-
-
- True
- end
-
-
- gtk-ok
- True
- True
- True
- False
- True
-
-
- False
- False
- 0
-
-
-
-
- False
- end
- 0
-
-
-
-
-
- zenity_error_ok_button
-
-
-
- 5
- Select items from the list
- center
- 300
- 196
- dialog
- False
- False
-
-
-
- True
-
-
- True
- 5
- 6
-
-
- True
- 0
- Select items from the list below.
- True
-
-
- False
- False
- 0
-
-
-
-
- True
- True
- automatic
- automatic
- in
-
-
- True
- True
- True
-
-
-
-
- 1
-
-
-
-
- 1
-
-
-
-
- True
- end
-
-
- gtk-cancel
- True
- True
- True
- False
- True
-
-
- False
- False
- 0
-
-
-
-
- gtk-ok
- True
- True
- True
- False
- True
-
-
- False
- False
- 1
-
-
-
-
- False
- end
- 0
-
-
-
-
-
- zenity_tree_cancel_button
- zenity_tree_ok_button
-
-
-
- 5
- Information
- center
- dialog
- False
- False
-
-
-
- True
- 14
-
-
- True
- 5
- 12
-
-
- True
- 0
- gtk-dialog-info
- 6
-
-
- 0
-
-
-
-
- True
- True
- 0
- All updates are complete.
- True
- True
- True
-
-
- False
- False
- 1
-
-
-
-
- 1
-
-
-
-
+
True
end
diff --git a/zenity.spec.in b/zenity.spec.in
deleted file mode 100644
index d6e9605..0000000
--- a/zenity.spec.in
+++ /dev/null
@@ -1,86 +0,0 @@
-%define version @VERSION@
-%define name zenity
-Summary: Zenity is a basic rewrite of gdialog, with simplicity of use in mind.
-Name: %{name}
-Version: %{version}
-Release: 1
-Vendor: N/A
-URL: http://ftp.gnome.org/pub/GNOME/sources/zenity/%{version}/
-Source: http://ftp.gnome.org/pub/GNOME/sources/zenity/%{version}/%{name}-%{version}.tar.bz2
-License: LGPL
-Group: Applications/System
-Packager: Mihai Lazarescu
-BuildRoot: %{_tmppath}/%{name}-buildroot
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: binutils
-BuildRequires: bzip2
-BuildRequires: fileutils
-BuildRequires: gcc
-BuildRequires: gettext
-BuildRequires: glibc-devel
-BuildRequires: gtk+ >= 2.0.0
-BuildRequires: gzip
-BuildRequires: info
-BuildRequires: intltool
-BuildRequires: libglade >= 2.0.0
-BuildRequires: libgnomecanvas >= 2.0.0
-BuildRequires: libtool
-BuildRequires: make
-BuildRequires: popt
-BuildRequires: scrollkeeper
-BuildRequires: sh-utils
-BuildRequires: tar
-Requires: gtk+ >= 2.0.0
-Requires: libglade >= 2.0.0
-Requires: libgnomecanvas >= 2.0.0
-Provides: %{name}
-
-%define rpm_prefix /usr
-
-%description
-Zenity is a basic rewrite of gdialog, without the pain involved
-of trying to figure out commandline parsing. Zenity is
-zen-like; simple and easy to use.
-
-Zenity Dialogs: Calendar, Text Entry, Error, Informational,
-File Selection, List, Progress, Question, Text Information,
-and Warning.
-
-Zenity is especially useful in scripts.
-
-
-%prep
-%setup -q
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-
-
-%build
-./configure --prefix=%{rpm_prefix}
-%{__make} all
-
-
-%install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-%{__make} prefix=$RPM_BUILD_ROOT%{rpm_prefix} install
-
-
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT%{rpm_prefix}
-
-
-%files
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog HACKING INSTALL
-%doc NEWS README THANKS TODO help
-
-%{rpm_prefix}
-
-
-%changelog
-* Thu Mar 6 2003 Glynn Foster
-- Fix up the %defines. Not sure if this makes a difference but it
- seems cleaner to me
-
-* Thu Feb 1 2003 Mihai Lazarescu
-- first release for version 1.0