diff --git a/configure.ac b/configure.ac
index 1eb840a..30d0a8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@ GTK_REQUIRED_VERSION=2.11.5
LIBGNOME_MENU_REQUIRED_VERSION=2.11.1
GNOME_DESKTOP_REQUIRED_VERSION=2.23.2
-GLADE_REQUIRED_VERSION=2.5.0
LIBGNOMEKBDUI_REQUIRED_VERSION=0.1
AC_CHECK_HEADERS(unistd.h)
@@ -64,7 +63,6 @@ AC_SUBST(GNOME_SCREENSAVER_CFLAGS)
AC_SUBST(GNOME_SCREENSAVER_LIBS)
PKG_CHECK_MODULES(GNOME_SCREENSAVER_DIALOG,
- libglade-2.0 >= $GLADE_REQUIRED_VERSION
gconf-2.0 >= $GCONF_REQUIRED_VERSION
gthread-2.0
gtk+-2.0 >= $GTK_REQUIRED_VERSION)
@@ -74,7 +72,6 @@ AC_SUBST(GNOME_SCREENSAVER_DIALOG_LIBS)
PKG_CHECK_MODULES(GNOME_SCREENSAVER_CAPPLET,
gio-2.0 >= $GLIB_REQUIRED_VERSION
gconf-2.0 >= $GCONF_REQUIRED_VERSION
- libglade-2.0 >= $GLADE_REQUIRED_VERSION
gtk+-2.0 >= $GTK_REQUIRED_VERSION
libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION)
AC_SUBST(GNOME_SCREENSAVER_CAPPLET_CFLAGS)
diff --git a/data/Makefile.am b/data/Makefile.am
index 87d46d6..9833cae 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -34,10 +34,10 @@ menu_DATA = \
gnome-screensavers.menu \
$(NULL)
-gladedir = $(pkgdatadir)
-glade_DATA = \
- gnome-screensaver-preferences.glade \
- lock-dialog-default.glade \
+gtkbuilderdir = $(pkgdatadir)
+gtkbuilder_DATA = \
+ gnome-screensaver-preferences.ui \
+ lock-dialog-default.ui \
$(NULL)
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/data/gnome-screensaver-preferences.glade b/data/gnome-screensaver-preferences.glade
deleted file mode 100644
index 574e142..0000000
--- a/data/gnome-screensaver-preferences.glade
+++ /dev/null
@@ -1,760 +0,0 @@
-
-
-
-
-
-
- 5
- True
- Screensaver Preferences
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- 600
- 400
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- True
- False
- False
-
-
-
- True
- False
- 2
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-help
- True
- GTK_RELIEF_NORMAL
- True
- -11
-
-
-
-
-
- True
- True
- True
- GTK_RELIEF_NORMAL
- True
- -2
-
-
-
- True
- 0.5
- 0.5
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
- True
- False
- 2
-
-
-
- True
- gtk-jump-to
- 4
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- Power _Management
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
-
-
-
-
-
-
- True
- True
- True
- gtk-close
- True
- GTK_RELIEF_NORMAL
- True
- -7
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 5
- True
- False
- 12
-
-
-
- True
- False
- 12
-
-
-
- True
- False
- 6
-
-
-
- True
- _Screensaver theme:
- True
- True
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- False
- 0
-
-
-
- True
- 2
- 2
- False
- 6
- 6
-
-
-
- True
- True
- GTK_POLICY_NEVER
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
- True
- True
- False
- False
- False
- True
- False
- False
- False
-
-
-
-
-
-
-
- 0
- 1
- 0
- 1
- fill
-
-
-
-
-
-
-
- 1
- 2
- 0
- 2
-
-
-
-
-
- True
- GTK_BUTTONBOX_START
- 0
-
-
-
- True
- True
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
- True
- 0.5
- 0.5
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
- True
- False
- 2
-
-
-
- True
- gtk-fullscreen
- 4
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- _Preview
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
-
-
-
-
-
- 0
- 1
- 1
- 2
- fill
- fill
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
- False
- 0
-
-
-
- True
- False
- 0
-
-
-
- True
- False
- 0
-
-
-
- True
- False
- 0
-
-
-
- True
- False
- 6
-
-
-
- True
- False
- 12
-
-
-
- True
- Regard the computer as _idle after:
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- False
- 6
-
-
-
- True
- True
- True
- GTK_POS_TOP
- 0
- GTK_UPDATE_CONTINUOUS
- False
- 10 1 120 1 10 0
-
-
- 0
- True
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- False
- True
-
-
-
-
-
- True
- True
- _Activate screensaver when computer is idle
- True
- GTK_RELIEF_NORMAL
- True
- False
- False
- True
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- _Lock screen when screensaver is active
- True
- GTK_RELIEF_NORMAL
- True
- False
- False
- True
-
-
- 0
- False
- False
-
-
-
-
-
- <b>Warning: the screen will not be locked for the root user.</b>
- False
- True
- GTK_JUSTIFY_LEFT
- True
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- False
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
- True
- True
- Screensaver Preview
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_CENTER
- True
- True
- True
- False
- True
- True
- GDK_WINDOW_TYPE_HINT_NORMAL
- GDK_GRAVITY_NORTH_WEST
- True
- False
-
-
-
- True
- False
- 0
-
-
-
- True
- False
- 0
-
-
-
- True
- gtk-dialog-warning
- 4
- 0.5
- 0.5
- 10
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- <b>Screensaver preview</b>
- False
- True
- GTK_JUSTIFY_FILL
- True
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- True
-
-
-
-
-
- True
-
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- True
- True
-
-
-
-
-
- True
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
- True
- gtk-go-back
- 4
- 0.5
- 0.5
- 0
- 0
-
-
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
- True
- gtk-go-forward
- 4
- 0.5
- 0.5
- 0
- 0
-
-
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- gtk-leave-fullscreen
- True
- GTK_RELIEF_NORMAL
- True
-
-
- 0
- False
- False
-
-
-
-
- 0
- False
- False
-
-
-
-
-
- True
-
-
- 0
- True
- True
-
-
-
-
-
-
-
diff --git a/data/gnome-screensaver-preferences.ui b/data/gnome-screensaver-preferences.ui
new file mode 100644
index 0000000..6b88f37
--- /dev/null
+++ b/data/gnome-screensaver-preferences.ui
@@ -0,0 +1,719 @@
+
+
+
+
+
+
+ True
+ True
+ Screensaver Preview
+ GTK_WINDOW_TOPLEVEL
+ GTK_WIN_POS_CENTER
+ True
+ True
+ True
+ False
+ True
+ True
+ GDK_WINDOW_TYPE_HINT_NORMAL
+ GDK_GRAVITY_NORTH_WEST
+ True
+ False
+
+
+ True
+ False
+ 0
+
+
+ True
+ False
+ 0
+
+
+ True
+ gtk-dialog-warning
+ 4
+ 0.5
+ 0.5
+ 10
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+ True
+ <b>Screensaver preview</b>
+ False
+ True
+ GTK_JUSTIFY_FILL
+ True
+ False
+ 0
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ False
+ True
+
+
+
+
+ True
+
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ True
+ True
+
+
+
+
+ True
+ True
+ GTK_RELIEF_NORMAL
+ True
+
+
+ True
+ gtk-go-back
+ 4
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+
+
+ 0
+ False
+ False
+
+
+
+
+ True
+ True
+ GTK_RELIEF_NORMAL
+ True
+
+
+ True
+ gtk-go-forward
+ 4
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+
+
+ 0
+ False
+ False
+
+
+
+
+ True
+ True
+ gtk-leave-fullscreen
+ True
+ GTK_RELIEF_NORMAL
+ True
+
+
+ 0
+ False
+ False
+
+
+
+
+ 0
+ False
+ False
+
+
+
+
+ True
+
+
+ 0
+ True
+ True
+
+
+
+
+
+
diff --git a/data/lock-dialog-default.glade b/data/lock-dialog-default.glade
deleted file mode 100644
index 17f4e21..0000000
--- a/data/lock-dialog-default.glade
+++ /dev/null
@@ -1,568 +0,0 @@
-
-
-
-
-
-
- True
- window1
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_NORMAL
- GDK_GRAVITY_NORTH_WEST
- True
- False
-
-
-
- True
- 0
- 0.5
- GTK_SHADOW_OUT
-
-
-
- 12
- True
- 0.5
- 0.5
- 1
- 1
- 0
- 0
- 0
- 0
-
-
-
- 18
- True
- False
- 0
-
-
-
- True
- False
- False
- GTK_POS_TOP
- False
- False
-
-
-
- True
- 0.5
- 0.5
- 1
- 1
- 0
- 0
- 0
- 0
-
-
-
- True
- False
- 12
-
-
-
- True
- 0.5
- 1
- 0
- 0
-
-
- 0
- True
- True
-
-
-
-
-
- True
- False
- 0
-
-
-
- True
- <span size="x-large">%R</span>
- False
- True
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- <span size="small">%U on %h</span>
- False
- True
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
-
- False
- False
- GTK_JUSTIFY_LEFT
- True
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- True
- True
-
-
-
-
-
- True
- False
- 0
-
-
-
- True
- False
- 6
-
-
-
-
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- False
- 0
-
- True
- True
-
-
- 0
- True
- True
-
-
-
-
-
- True
- False
- 0
-
-
-
-
-
-
- 0
- False
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
-
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
-
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- GTK_BUTTONBOX_END
- 6
-
-
-
- True
- True
- True
- _Leave Message
- True
- GTK_RELIEF_NORMAL
- False
-
-
-
-
-
- True
- True
- True
- _Switch User
- True
- GTK_RELIEF_NORMAL
- False
-
-
-
-
-
- True
- True
- True
- _Log Out
- True
- GTK_RELIEF_NORMAL
- False
-
-
-
-
-
- True
- True
- True
- _Cancel
- True
- GTK_RELIEF_NORMAL
- False
-
-
-
-
-
- True
- True
- True
- _Unlock
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
- False
- True
-
-
-
-
-
- True
-
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- tab
-
-
-
-
-
- True
- False
- 10
-
-
-
- True
- <b>Leave a message for %R:</b>
- 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
- False
- True
- GTK_JUSTIFY_LEFT
- GTK_WRAP_WORD
- True
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
- GTK_BUTTONBOX_END
- 6
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
-
- True
- True
- True
- gtk-save
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
- 0
- False
- False
-
-
-
-
- False
- True
-
-
-
-
-
- True
-
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- tab
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/data/lock-dialog-default.ui b/data/lock-dialog-default.ui
new file mode 100644
index 0000000..6b90c29
--- /dev/null
+++ b/data/lock-dialog-default.ui
@@ -0,0 +1,523 @@
+
+
+
+
+ True
+ window1
+ GTK_WINDOW_TOPLEVEL
+ GTK_WIN_POS_NONE
+ False
+ True
+ False
+ True
+ False
+ False
+ GDK_WINDOW_TYPE_HINT_NORMAL
+ GDK_GRAVITY_NORTH_WEST
+ True
+ False
+
+
+ True
+ 0
+ 0.5
+ GTK_SHADOW_OUT
+
+
+ 12
+ True
+ 0.5
+ 0.5
+ 1
+ 1
+ 0
+ 0
+ 0
+ 0
+
+
+ 18
+ True
+ False
+ 0
+
+
+ True
+ False
+ False
+ GTK_POS_TOP
+ False
+ False
+
+
+ True
+ 0.5
+ 0.5
+ 1
+ 1
+ 0
+ 0
+ 0
+ 0
+
+
+ True
+ False
+ 12
+
+
+ True
+ 0.5
+ 1
+ 0
+ 0
+
+
+ 0
+ True
+ True
+
+
+
+
+ True
+ False
+ 0
+
+
+ True
+ <span size="x-large">%R</span>
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+ True
+ <span size="small">%U on %h</span>
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+ 0
+ True
+ True
+
+
+
+
+ True
+
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ True
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ True
+ True
+
+
+
+
+ True
+ False
+ 0
+
+
+ True
+ False
+ 6
+
+
+
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+ True
+ True
+ False
+ 0
+
+ True
+ True
+
+
+ 0
+ True
+ True
+
+
+
+
+ True
+ False
+ 0
+
+
+
+
+
+ 0
+ False
+ True
+
+
+
+
+ 0
+ True
+ True
+
+
+
+
+ True
+
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+ 0
+ True
+ True
+
+
+
+
+ True
+
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+ True
+ GTK_BUTTONBOX_END
+ 6
+
+
+ True
+ True
+ True
+ _Leave Message
+ True
+ GTK_RELIEF_NORMAL
+ False
+
+
+
+
+ True
+ True
+ True
+ _Switch User
+ True
+ GTK_RELIEF_NORMAL
+ False
+
+
+
+
+ True
+ True
+ True
+ _Log Out
+ True
+ GTK_RELIEF_NORMAL
+ False
+
+
+
+
+ True
+ True
+ True
+ _Cancel
+ True
+ GTK_RELIEF_NORMAL
+ False
+
+
+
+
+ True
+ True
+ True
+ _Unlock
+ True
+ GTK_RELIEF_NORMAL
+ True
+
+
+
+
+ 0
+ True
+ True
+
+
+
+
+
+
+ False
+ True
+
+
+
+
+ True
+
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+
+
+ True
+ False
+ 10
+
+
+ True
+ <b>Leave a message for %R:</b>
+ 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
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ GTK_WRAP_WORD
+ True
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+
+
+ 0
+ True
+ True
+
+
+
+
+ True
+ GTK_BUTTONBOX_END
+ 6
+
+
+ True
+ True
+ True
+ gtk-cancel
+ True
+ GTK_RELIEF_NORMAL
+ True
+
+
+
+
+ True
+ True
+ True
+ gtk-save
+ True
+ GTK_RELIEF_NORMAL
+ True
+
+
+
+
+ 0
+ False
+ False
+
+
+
+
+ False
+ True
+
+
+
+
+ True
+
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+
+
+ 0
+ True
+ True
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cf5c1ad..c965e8a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,10 +1,10 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
data/gnome-screensaver-preferences.desktop.in
-data/gnome-screensaver-preferences.glade
+[type: gettext/glade]data/gnome-screensaver-preferences.ui
data/gnome-screensaver.directory.in
data/gnome-screensaver.schemas.in
-data/lock-dialog-default.glade
+[type: gettext/glade]data/lock-dialog-default.ui
savers/cosmos-slideshow.desktop.in.in
savers/footlogo-floaters.desktop.in.in
savers/personal-slideshow.desktop.in.in
diff --git a/src/Makefile.am b/src/Makefile.am
index aac7b65..290aac1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@ INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DSAVERDIR=\""$(saverdir)"\" \
-DTHEMESDIR=\""$(themesdir)"\" \
- -DGLADEDIR=\"$(pkgdatadir)\" \
+ -DGTKBUILDERDIR=\"$(pkgdatadir)\" \
-DPAM_SERVICE_NAME=\""gnome-screensaver"\" \
$(WARN_CFLAGS) \
$(AUTH_CFLAGS) \
diff --git a/src/gnome-screensaver-preferences.c b/src/gnome-screensaver-preferences.c
index 4e600d4..d8376fb 100644
--- a/src/gnome-screensaver-preferences.c
+++ b/src/gnome-screensaver-preferences.c
@@ -33,7 +33,6 @@
#include
#include
#include
-#include
#include
#include
@@ -44,7 +43,7 @@
#include "gs-job.h"
#include "gs-prefs.h" /* for GS_MODE enum */
-#define GLADE_XML_FILE "gnome-screensaver-preferences.glade"
+#define GTK_BUILDER_FILE "gnome-screensaver-preferences.ui"
#define GNOME_LOCKDOWN_DIR "/desktop/gnome/lockdown"
#define KEY_LOCK_DISABLE GNOME_LOCKDOWN_DIR "/disable_lock_screen"
@@ -86,7 +85,7 @@ static GtkTargetEntry drop_types [] =
{ "_NETSCAPE_URL", 0, TARGET_NS_URL }
};
-static GladeXML *xml = NULL;
+static GtkBuilder *builder = NULL;
static GSThemeManager *theme_manager = NULL;
static GSJob *job = NULL;
@@ -399,7 +398,7 @@ preview_set_theme (GtkWidget *widget,
preview_clear (widget);
- label = glade_xml_get_widget (xml, "fullscreen_preview_theme_label");
+ label = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_theme_label"));
markup = g_markup_printf_escaped ("%s", name);
gtk_label_set_markup (GTK_LABEL (label), markup);
g_free (markup);
@@ -825,7 +824,7 @@ reload_themes (void)
GtkWidget *treeview;
GtkTreeModel *model;
- treeview = glade_xml_get_widget (xml, "savers_treeview");
+ treeview = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview));
gtk_tree_store_clear (GTK_TREE_STORE (model));
populate_model (GTK_TREE_STORE (model));
@@ -960,7 +959,7 @@ drag_data_received_cb (GtkWidget *widget,
if (files != NULL) {
GtkWidget *prefs_dialog;
- prefs_dialog = glade_xml_get_widget (xml, "prefs_dialog");
+ prefs_dialog = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_dialog"));
theme_installer_run (prefs_dialog, files);
}
}
@@ -1052,7 +1051,7 @@ ui_disable_lock (gboolean disable)
{
GtkWidget *widget;
- widget = glade_xml_get_widget (xml, "lock_checkbox");
+ widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_checkbox"));
gtk_widget_set_sensitive (widget, !disable);
if (disable) {
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
@@ -1066,7 +1065,7 @@ ui_set_lock (gboolean enabled)
gboolean active;
gboolean lock_disabled;
- widget = glade_xml_get_widget (xml, "lock_checkbox");
+ widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_checkbox"));
active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
if (active != enabled) {
@@ -1084,13 +1083,13 @@ ui_set_enabled (gboolean enabled)
gboolean is_writable;
gboolean lock_disabled;
- widget = glade_xml_get_widget (xml, "enable_checkbox");
+ widget = GTK_WIDGET (gtk_builder_get_object (builder, "enable_checkbox"));
active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
if (active != enabled) {
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), enabled);
}
- widget = glade_xml_get_widget (xml, "lock_checkbox");
+ widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_checkbox"));
config_get_lock (&is_writable);
if (is_writable) {
gtk_widget_set_sensitive (widget, enabled);
@@ -1104,7 +1103,7 @@ ui_set_delay (int delay)
{
GtkWidget *widget;
- widget = glade_xml_get_widget (xml, "activate_delay_hscale");
+ widget = GTK_WIDGET (gtk_builder_get_object (builder, "activate_delay_hscale"));
gtk_range_set_value (GTK_RANGE (widget), delay);
}
@@ -1159,7 +1158,7 @@ key_changed_cb (GConfClient *client,
if (value->type == GCONF_VALUE_LIST) {
GtkWidget *treeview;
- treeview = glade_xml_get_widget (xml, "savers_treeview");
+ treeview = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
setup_treeview_selection (treeview);
} else {
invalid_type_warning (key);
@@ -1187,7 +1186,7 @@ fullscreen_preview_previous_cb (GtkWidget *fullscreen_preview_window,
GtkWidget *treeview;
GtkTreeSelection *selection;
- treeview = glade_xml_get_widget (xml, "savers_treeview");
+ treeview = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
tree_selection_previous (selection);
}
@@ -1199,7 +1198,7 @@ fullscreen_preview_next_cb (GtkWidget *fullscreen_preview_window,
GtkWidget *treeview;
GtkTreeSelection *selection;
- treeview = glade_xml_get_widget (xml, "savers_treeview");
+ treeview = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
tree_selection_next (selection);
}
@@ -1214,16 +1213,16 @@ fullscreen_preview_cancelled_cb (GtkWidget *button,
GtkWidget *preview_area;
GtkWidget *dialog;
- preview_area = glade_xml_get_widget (xml, "preview_area");
+ preview_area = GTK_WIDGET (gtk_builder_get_object (builder, "preview_area"));
gs_job_set_widget (job, preview_area);
- fullscreen_preview_area = glade_xml_get_widget (xml, "fullscreen_preview_area");
+ fullscreen_preview_area = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_area"));
preview_clear (fullscreen_preview_area);
- fullscreen_preview_window = glade_xml_get_widget (xml, "fullscreen_preview_window");
+ fullscreen_preview_window = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_window"));
gtk_widget_hide (fullscreen_preview_window);
- dialog = glade_xml_get_widget (xml, "prefs_dialog");
+ dialog = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_dialog"));
gtk_widget_show (dialog);
gtk_window_present (GTK_WINDOW (dialog));
}
@@ -1236,10 +1235,10 @@ fullscreen_preview_start_cb (GtkWidget *widget,
GtkWidget *fullscreen_preview_window;
GtkWidget *dialog;
- dialog = glade_xml_get_widget (xml, "prefs_dialog");
+ dialog = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_dialog"));
gtk_widget_hide (dialog);
- fullscreen_preview_window = glade_xml_get_widget (xml, "fullscreen_preview_window");
+ fullscreen_preview_window = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_window"));
gtk_window_fullscreen (GTK_WINDOW (fullscreen_preview_window));
gtk_window_set_keep_above (GTK_WINDOW (fullscreen_preview_window), TRUE);
@@ -1247,7 +1246,7 @@ fullscreen_preview_start_cb (GtkWidget *widget,
gtk_widget_show (fullscreen_preview_window);
gtk_widget_grab_focus (fullscreen_preview_window);
- fullscreen_preview_area = glade_xml_get_widget (xml, "fullscreen_preview_area");
+ fullscreen_preview_area = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_area"));
preview_clear (fullscreen_preview_area);
gs_job_set_widget (job, fullscreen_preview_area);
}
@@ -1308,8 +1307,8 @@ setup_for_root_user (void)
GtkWidget *lock_checkbox;
GtkWidget *label;
- lock_checkbox = glade_xml_get_widget (xml, "lock_checkbox");
- label = glade_xml_get_widget (xml, "root_warning_label");
+ lock_checkbox = GTK_WIDGET (gtk_builder_get_object (builder, "lock_checkbox"));
+ label = GTK_WIDGET (gtk_builder_get_object (builder, "root_warning_label"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lock_checkbox), FALSE);
gtk_widget_set_sensitive (lock_checkbox, FALSE);
@@ -1403,8 +1402,8 @@ setup_treeview_idle (gpointer data)
GtkWidget *preview;
GtkWidget *treeview;
- preview = glade_xml_get_widget (xml, "preview_area");
- treeview = glade_xml_get_widget (xml, "savers_treeview");
+ preview = GTK_WIDGET (gtk_builder_get_object (builder, "preview_area"));
+ treeview = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
setup_treeview (treeview, preview);
setup_treeview_selection (treeview);
@@ -1444,18 +1443,23 @@ init_capplet (void)
GtkWidget *fullscreen_preview_next;
GtkWidget *fullscreen_preview_area;
GtkWidget *fullscreen_preview_close;
- char *glade_file;
+ char *gtk_builder_file;
char *string;
gdouble activate_delay;
gboolean enabled;
gboolean is_writable;
GConfClient *client;
+ GError *error=NULL;
- glade_file = g_build_filename (GLADEDIR, GLADE_XML_FILE, NULL);
- xml = glade_xml_new (glade_file, NULL, PACKAGE);
- g_free (glade_file);
+ gtk_builder_file = g_build_filename (GTKBUILDERDIR, GTK_BUILDER_FILE, NULL);
+ builder = gtk_builder_new();
+ if (!gtk_builder_add_from_file(builder, gtk_builder_file, &error)) {
+ g_warning("Couldn't load builder file: %s", error->message);
+ g_error_free(error);
+ }
+ g_free (gtk_builder_file);
- if (xml == NULL) {
+ if (builder == NULL) {
dialog = gtk_message_dialog_new (NULL,
0, GTK_MESSAGE_ERROR,
@@ -1471,26 +1475,26 @@ init_capplet (void)
exit (1);
}
- preview = glade_xml_get_widget (xml, "preview_area");
- dialog = glade_xml_get_widget (xml, "prefs_dialog");
- treeview = glade_xml_get_widget (xml, "savers_treeview");
- list_scroller = glade_xml_get_widget (xml, "themes_scrolled_window");
- activate_delay_hscale = glade_xml_get_widget (xml, "activate_delay_hscale");
- activate_delay_hbox = glade_xml_get_widget (xml, "activate_delay_hbox");
- enabled_checkbox = glade_xml_get_widget (xml, "enable_checkbox");
- lock_checkbox = glade_xml_get_widget (xml, "lock_checkbox");
- root_warning_label = glade_xml_get_widget (xml, "root_warning_label");
- preview_button = glade_xml_get_widget (xml, "preview_button");
- gpm_button = glade_xml_get_widget (xml, "gpm_button");
- fullscreen_preview_window = glade_xml_get_widget (xml, "fullscreen_preview_window");
- fullscreen_preview_area = glade_xml_get_widget (xml, "fullscreen_preview_area");
- fullscreen_preview_close = glade_xml_get_widget (xml, "fullscreen_preview_close");
- fullscreen_preview_previous = glade_xml_get_widget (xml, "fullscreen_preview_previous_button");
- fullscreen_preview_next = glade_xml_get_widget (xml, "fullscreen_preview_next_button");
-
- label = glade_xml_get_widget (xml, "activate_delay_label");
+ preview = GTK_WIDGET (gtk_builder_get_object (builder, "preview_area"));
+ dialog = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_dialog"));
+ treeview = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
+ list_scroller = GTK_WIDGET (gtk_builder_get_object (builder, "themes_scrolled_window"));
+ activate_delay_hscale = GTK_WIDGET (gtk_builder_get_object (builder, "activate_delay_hscale"));
+ activate_delay_hbox = GTK_WIDGET (gtk_builder_get_object (builder, "activate_delay_hbox"));
+ enabled_checkbox = GTK_WIDGET (gtk_builder_get_object (builder, "enable_checkbox"));
+ lock_checkbox = GTK_WIDGET (gtk_builder_get_object (builder, "lock_checkbox"));
+ root_warning_label = GTK_WIDGET (gtk_builder_get_object (builder, "root_warning_label"));
+ preview_button = GTK_WIDGET (gtk_builder_get_object (builder, "preview_button"));
+ gpm_button = GTK_WIDGET (gtk_builder_get_object (builder, "gpm_button"));
+ fullscreen_preview_window = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_window"));
+ fullscreen_preview_area = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_area"));
+ fullscreen_preview_close = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_close"));
+ fullscreen_preview_previous = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_previous_button"));
+ fullscreen_preview_next = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_next_button"));
+
+ label = GTK_WIDGET (gtk_builder_get_object (builder, "activate_delay_label"));
gtk_label_set_mnemonic_widget (GTK_LABEL (label), activate_delay_hscale);
- label = glade_xml_get_widget (xml, "savers_label");
+ label = GTK_WIDGET (gtk_builder_get_object (builder, "savers_label"));
gtk_label_set_mnemonic_widget (GTK_LABEL (label), treeview);
gtk_widget_set_no_show_all (root_warning_label, TRUE);
diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index 0b36a7c..bdb68ae 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -37,7 +37,6 @@
#include
#include
#include
-#include
#include
#ifdef WITH_KBD_LAYOUT_INDICATOR
@@ -1627,21 +1626,22 @@ load_theme (GSLockPlug *plug)
{
char *theme;
char *filename;
- char *glade;
+ char *gtkbuilder;
char *rc;
- GladeXML *xml;
+ GtkBuilder *builder;
GtkWidget *lock_dialog;
+ GError *error=NULL;
theme = get_dialog_theme_name (plug);
if (theme == NULL) {
return FALSE;
}
- filename = g_strdup_printf ("lock-dialog-%s.glade", theme);
- glade = g_build_filename (GLADEDIR, filename, NULL);
+ filename = g_strdup_printf ("lock-dialog-%s.ui", theme);
+ gtkbuilder = g_build_filename (GTKBUILDERDIR, filename, NULL);
g_free (filename);
- if (! g_file_test (glade, G_FILE_TEST_IS_REGULAR)) {
- g_free (glade);
+ if (! g_file_test (gtkbuilder, G_FILE_TEST_IS_REGULAR)) {
+ g_free (gtkbuilder);
g_free (theme);
return FALSE;
}
@@ -1649,50 +1649,51 @@ load_theme (GSLockPlug *plug)
filename = g_strdup_printf ("lock-dialog-%s.gtkrc", theme);
g_free (theme);
- rc = g_build_filename (GLADEDIR, filename, NULL);
+ rc = g_build_filename (GTKBUILDERDIR, filename, NULL);
g_free (filename);
if (g_file_test (rc, G_FILE_TEST_IS_REGULAR)) {
gtk_rc_parse (rc);
}
g_free (rc);
- xml = glade_xml_new (glade, "lock-dialog", NULL);
+ builder = gtk_builder_new();
- if (xml == NULL) {
- g_warning ("Failed to load '%s'\n", glade);
- g_free (glade);
+ if (!gtk_builder_add_from_file (builder,filename ,&error)) {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free(error);
+ g_free (gtkbuilder);
return FALSE;
}
- g_free (glade);
+ g_free (gtkbuilder);
- lock_dialog = glade_xml_get_widget (xml, "lock-dialog");
+ lock_dialog = GTK_WIDGET (gtk_builder_get_object(builder, "lock-dialog"));
gtk_container_add (GTK_CONTAINER (plug), lock_dialog);
plug->priv->vbox = NULL;
- plug->priv->notebook = glade_xml_get_widget (xml, "notebook");
-
- plug->priv->auth_face_image = glade_xml_get_widget (xml, "auth-face-image");
- plug->priv->auth_action_area = glade_xml_get_widget (xml, "auth-action-area");
- plug->priv->auth_realname_label = glade_xml_get_widget (xml, "auth-realname-label");
- plug->priv->auth_username_label = glade_xml_get_widget (xml, "auth-username-label");
- plug->priv->auth_prompt_label = glade_xml_get_widget (xml, "auth-prompt-label");
- plug->priv->auth_prompt_entry = glade_xml_get_widget (xml, "auth-prompt-entry");
- plug->priv->auth_prompt_box = glade_xml_get_widget (xml, "auth-prompt-box");
- plug->priv->auth_capslock_label = glade_xml_get_widget (xml, "auth-capslock-label");
- plug->priv->auth_message_label = glade_xml_get_widget (xml, "auth-status-label");
- plug->priv->auth_unlock_button = glade_xml_get_widget (xml, "auth-unlock-button");
- plug->priv->auth_cancel_button = glade_xml_get_widget (xml, "auth-cancel-button");
- plug->priv->auth_logout_button = glade_xml_get_widget (xml, "auth-logout-button");
- plug->priv->auth_switch_button = glade_xml_get_widget (xml, "auth-switch-button");
- plug->priv->auth_note_button = glade_xml_get_widget (xml, "auth-note-button");
- plug->priv->note_tab = glade_xml_get_widget (xml, "note-tab");
- plug->priv->note_tab_label = glade_xml_get_widget (xml, "note-tab-label");
- plug->priv->note_ok_button = glade_xml_get_widget (xml, "note-ok-button");
- plug->priv->note_text_view = glade_xml_get_widget (xml, "note-text-view");
- plug->priv->note_cancel_button = glade_xml_get_widget (xml, "note-cancel-button");
+ plug->priv->notebook = GTK_WIDGET (gtk_builder_get_object(builder, "notebook"));
+
+ plug->priv->auth_face_image = GTK_WIDGET (gtk_builder_get_object(builder, "auth-face-image"));
+ plug->priv->auth_action_area = GTK_WIDGET (gtk_builder_get_object(builder, "auth-action-area"));
+ plug->priv->auth_realname_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-realname-label"));
+ plug->priv->auth_username_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-username-label"));
+ plug->priv->auth_prompt_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-label"));
+ plug->priv->auth_prompt_entry = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-entry"));
+ plug->priv->auth_prompt_box = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-box"));
+ plug->priv->auth_capslock_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-capslock-label"));
+ plug->priv->auth_message_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-status-label"));
+ plug->priv->auth_unlock_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-unlock-button"));
+ plug->priv->auth_cancel_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-cancel-button"));
+ plug->priv->auth_logout_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-logout-button"));
+ plug->priv->auth_switch_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-switch-button"));
+ plug->priv->auth_note_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-note-button"));
+ plug->priv->note_tab = GTK_WIDGET (gtk_builder_get_object(builder, "note-tab"));
+ plug->priv->note_tab_label = GTK_WIDGET (gtk_builder_get_object(builder, "note-tab-label"));
+ plug->priv->note_ok_button = GTK_WIDGET (gtk_builder_get_object(builder, "note-ok-button"));
+ plug->priv->note_text_view = GTK_WIDGET (gtk_builder_get_object(builder, "note-text-view"));
+ plug->priv->note_cancel_button = GTK_WIDGET (gtk_builder_get_object(builder, "note-cancel-button"));
/* Placeholder for the keyboard indicator */
- plug->priv->auth_prompt_kbd_layout_indicator = glade_xml_get_widget (xml, "auth-prompt-kbd-layout-indicator");
+ plug->priv->auth_prompt_kbd_layout_indicator = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-kbd-layout-indicator"));
if (plug->priv->auth_logout_button != NULL) {
gtk_widget_set_no_show_all (plug->priv->auth_logout_button, TRUE);
}
@@ -1705,7 +1706,7 @@ load_theme (GSLockPlug *plug)
gtk_widget_show_all (lock_dialog);
- plug->priv->status_message_label = glade_xml_get_widget (xml, "status-message-label");
+ plug->priv->status_message_label = GTK_WIDGET (gtk_builder_get_object(builder, "status-message-label"));
return TRUE;
}