[Xfce4-commits] <xfce4-session:master> Port the settings dialog to GtkBuilder.
Nick Schermer
noreply at xfce.org
Thu Jan 28 19:52:14 CET 2010
Updating branch refs/heads/master
to 3999a5ac1e4f6343cae0398595c103e628e78acf (commit)
from 4db997ae46afe91c3eecaf145e0bcfa46272ef20 (commit)
commit 3999a5ac1e4f6343cae0398595c103e628e78acf
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date: Sun Jan 24 16:19:26 2010 +0100
Port the settings dialog to GtkBuilder.
configure.in.in | 1 -
settings/Makefile.am | 10 +-
settings/main.c | 35 ++-
settings/session-editor.c | 19 +-
settings/splash-settings.c | 28 +-
settings/startup-settings.c | 15 +-
settings/xfce4-session-settings-common.h | 8 +-
settings/xfce4-session-settings.glade | 424 ++++++++++++++----------------
8 files changed, 248 insertions(+), 292 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 9b09044..d74a9ba 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -76,7 +76,6 @@ XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.12])
XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0])
XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.73])
XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
-XDT_CHECK_PACKAGE([LIBGLADE], [libglade-2.0], [2.0.0])
dnl we provide a panel plugin now
XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.6.0],
diff --git a/settings/Makefile.am b/settings/Makefile.am
index ebb0770..26a5976 100644
--- a/settings/Makefile.am
+++ b/settings/Makefile.am
@@ -17,7 +17,7 @@ xfce4_session_settings_SOURCES = \
xfce4-session-marshal.c \
xfce4-session-marshal.h \
xfce4-session-settings-common.h \
- xfce4-session-settings_glade.h \
+ xfce4-session-settings_ui.h \
xfsm-client-dbus-client.h \
xfsm-manager-dbus-client.h
@@ -28,7 +28,6 @@ xfce4_session_settings_CFLAGS = \
-I$(top_srcdir) \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
- $(LIBGLADE_CFLAGS) \
$(XFCONF_CFLAGS) \
$(DBUS_GLIB_CFLAGS)
@@ -36,7 +35,6 @@ xfce4_session_settings_LDADD = \
$(top_builddir)/libxfsm/libxfsm-4.6.la \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_LIBS) \
- $(LIBGLADE_LIBS) \
$(XFCONF_LIBS) \
$(DBUS_GLIB_LIBS)
@@ -58,7 +56,7 @@ if MAINTAINER_MODE
BUILT_SOURCES = \
xfce4-session-marshal.c \
xfce4-session-marshal.h \
- xfce4-session-settings_glade.h \
+ xfce4-session-settings_ui.h \
xfsm-client-dbus-client.h \
xfsm-manager-dbus-client.h
@@ -74,8 +72,8 @@ xfce4-session-marshal.c: xfce4-session-marshal.list Makefile
echo '#include "xfce4-session-marshal.h"' > $@
glib-genmarshal --prefix=xfce4_session_marshal xfce4-session-marshal.list --body >> xfce4-session-marshal.c
-xfce4-session-settings_glade.h: xfce4-session-settings.glade
- exo-csource --static --strip-comments --strip-content --name=xfce4_session_settings_glade $< >$@
+xfce4-session-settings_ui.h: xfce4-session-settings.glade
+ exo-csource --static --strip-comments --strip-content --name=xfce4_session_settings_ui $< >$@
xfsm-client-dbus-client.h: $(top_srcdir)/xfce4-session/xfsm-client-dbus.xml Makefile
dbus-binding-tool --mode=glib-client $(top_srcdir)/xfce4-session/xfsm-client-dbus.xml > $@
diff --git a/settings/main.c b/settings/main.c
index 287fff9..e5ebecc 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -26,14 +26,13 @@
#include <xfconf/xfconf.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <libxfce4util/libxfce4util.h>
#include <libxfce4ui/libxfce4ui.h>
#include "xfae-window.h"
#include "xfce4-session-settings-common.h"
-#include "xfce4-session-settings_glade.h"
+#include "xfce4-session-settings_ui.h"
static GdkNativeWindow opt_socket_id = 0;
@@ -50,7 +49,7 @@ int
main(int argc,
char **argv)
{
- GladeXML *gxml;
+ GtkBuilder *builder;
GtkWidget *notebook, *xfae_page, *lbl;
GError *error = NULL;
@@ -90,10 +89,17 @@ main(int argc,
gtk_window_set_default_icon_name("xfce4-session");
- gxml = glade_xml_new_from_buffer(xfce4_session_settings_glade,
- xfce4_session_settings_glade_length,
- NULL, NULL);
- if(!gxml) {
+ /* hook to make sure the libxfce4ui library is linked */
+ if (xfce_titled_dialog_get_type() == 0)
+ return EXIT_FAILURE;
+
+ builder = gtk_builder_new();
+ gtk_builder_add_from_string(builder,
+ xfce4_session_settings_ui,
+ xfce4_session_settings_ui_length,
+ NULL);
+
+ if(!builder) {
xfce_message_dialog(NULL, _("Internal Error"), GTK_STOCK_DIALOG_ERROR,
_("Unable to create user interface from embedded definition data"),
_("This is likely a problem with your Xfce installation"),
@@ -101,21 +107,20 @@ main(int argc,
return EXIT_FAILURE;
}
- startup_settings_init(gxml);
- splash_settings_init(gxml);
- session_editor_init(gxml);
+ startup_settings_init(builder);
+ splash_settings_init(builder);
+ session_editor_init(builder);
/* FIXME: someday, glade-ify this, maybe. */
xfae_page = xfae_window_new();
gtk_widget_show(xfae_page);
- notebook = glade_xml_get_widget(gxml, "plug-child");
+ notebook = GTK_WIDGET(gtk_builder_get_object(builder, "plug-child"));
lbl = gtk_label_new_with_mnemonic(_("_Application Autostart"));
gtk_widget_show(lbl);
gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), xfae_page, lbl, 2);
if(G_UNLIKELY(opt_socket_id == 0)) {
- GtkWidget *dialog = glade_xml_get_widget(gxml, "xfce4_session_settings_dialog");
- g_object_unref(gxml);
+ GtkWidget *dialog = GTK_WIDGET(gtk_builder_get_object(builder, "xfce4_session_settings_dialog"));
while(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_HELP)
g_spawn_command_line_async("xfhelp4 xfce4-session.html", NULL);
@@ -129,11 +134,11 @@ main(int argc,
g_signal_connect(plug, "delete-event",
G_CALLBACK(gtk_main_quit), NULL);
- plug_child = glade_xml_get_widget(gxml, "plug-child");
+ plug_child = GTK_WIDGET(gtk_builder_get_object(builder, "plug-child"));
gtk_widget_reparent(plug_child, plug);
gtk_widget_show(plug_child);
- g_object_unref(gxml);
+ g_object_unref(builder);
/* Stop startup notification */
gdk_notify_startup_complete();
diff --git a/settings/session-editor.c b/settings/session-editor.c
index dbb76be..d29a764 100644
--- a/settings/session-editor.c
+++ b/settings/session-editor.c
@@ -26,7 +26,6 @@
#include <X11/SM/SMlib.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <dbus/dbus-glib.h>
@@ -698,9 +697,9 @@ session_editor_populate_treeview(GtkTreeView *treeview)
}
void
-session_editor_init(GladeXML *gxml)
+session_editor_init(GtkBuilder *builder)
{
- GtkWidget *treeview, *btn_save, *btn_quit, *dlg_saving;
+ GObject *treeview, *btn_save, *btn_quit, *dlg_saving;
GtkTreeSelection *sel;
dbus_g_object_register_marshaller(g_cclosure_marshal_VOID__STRING,
@@ -713,21 +712,21 @@ session_editor_init(GladeXML *gxml)
G_TYPE_NONE, G_TYPE_UINT, G_TYPE_UINT,
G_TYPE_INVALID);
- treeview = glade_xml_get_widget(gxml, "treeview_clients");
+ treeview = gtk_builder_get_object(builder, "treeview_clients");
sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
session_editor_populate_treeview(GTK_TREE_VIEW(treeview));
- dlg_saving = glade_xml_get_widget(gxml, "dialog_saving");
+ dlg_saving = gtk_builder_get_object(builder, "dialog_saving");
g_object_set_data(G_OBJECT(dlg_saving), "pbar",
- glade_xml_get_widget(gxml, "progress_save_session"));
+ GTK_WIDGET(gtk_builder_get_object(builder, "progress_save_session")));
- btn_save = glade_xml_get_widget(gxml, "btn_save_session");
+ btn_save = gtk_builder_get_object(builder, "btn_save_session");
g_signal_connect(btn_save, "clicked",
- G_CALLBACK(session_editor_save_session), dlg_saving);
+ G_CALLBACK(session_editor_save_session), GTK_WIDGET(dlg_saving));
- btn_quit = glade_xml_get_widget(gxml, "btn_quit_client");
+ btn_quit = gtk_builder_get_object(builder, "btn_quit_client");
g_signal_connect(btn_quit, "clicked",
G_CALLBACK(session_editor_quit_client), treeview);
g_signal_connect(sel, "changed",
- G_CALLBACK(session_editor_sel_changed_btn), btn_quit);
+ G_CALLBACK(session_editor_sel_changed_btn), GTK_WIDGET(btn_quit));
}
diff --git a/settings/splash-settings.c b/settings/splash-settings.c
index 1098f49..ef72db3 100644
--- a/settings/splash-settings.c
+++ b/settings/splash-settings.c
@@ -44,8 +44,6 @@
#include <gmodule.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
-
#include <libxfce4ui/libxfce4ui.h>
#include <libxfsm/xfsm-util.h>
@@ -323,7 +321,7 @@ splash_dialog_destroy (GtkWidget *widget,
void
-splash_settings_init (GladeXML *gxml)
+splash_settings_init (GtkBuilder *builder)
{
XfconfChannel *channel;
GtkTreeSelection *selection;
@@ -375,7 +373,7 @@ splash_settings_init (GladeXML *gxml)
splash_centered = FALSE;
- splash_treeview = glade_xml_get_widget (gxml, "treeview_splash");
+ splash_treeview = GTK_WIDGET(gtk_builder_get_object (builder, "treeview_splash"));
gtk_tree_view_set_model (GTK_TREE_VIEW (splash_treeview), GTK_TREE_MODEL (store));
g_object_unref (G_OBJECT (store));
@@ -393,24 +391,24 @@ splash_settings_init (GladeXML *gxml)
NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (splash_treeview), column);
- splash_button_cfg = glade_xml_get_widget (gxml, "btn_splash_configure");
+ splash_button_cfg = GTK_WIDGET(gtk_builder_get_object (builder, "btn_splash_configure"));
g_signal_connect (G_OBJECT (splash_button_cfg), "clicked",
splash_configure, NULL);
- splash_button_test = glade_xml_get_widget (gxml, "btn_splash_test");
+ splash_button_test = GTK_WIDGET(gtk_builder_get_object (builder, "btn_splash_test"));
g_signal_connect (G_OBJECT (splash_button_test), "clicked",
splash_test, NULL);
- splash_image = glade_xml_get_widget (gxml, "img_splash_preview");
+ splash_image = GTK_WIDGET(gtk_builder_get_object (builder, "img_splash_preview"));
- splash_descr0 = glade_xml_get_widget (gxml, "lbl_splash_desc0");
- splash_version0 = glade_xml_get_widget (gxml, "lbl_splash_version0");
- splash_author0 = glade_xml_get_widget (gxml, "lbl_splash_author0");
- splash_www0 = glade_xml_get_widget (gxml, "lbl_splash_homepage0");
- splash_descr1 = glade_xml_get_widget (gxml, "lbl_splash_desc1");
- splash_version1 = glade_xml_get_widget (gxml, "lbl_splash_version1");
- splash_author1 = glade_xml_get_widget (gxml, "lbl_splash_author1");
- splash_www1 = glade_xml_get_widget (gxml, "lbl_splash_homepage1");
+ splash_descr0 = GTK_WIDGET(gtk_builder_get_object (builder, "lbl_splash_desc0"));
+ splash_version0 =GTK_WIDGET(gtk_builder_get_object (builder, "lbl_splash_version0"));
+ splash_author0 = GTK_WIDGET(gtk_builder_get_object (builder, "lbl_splash_author0"));
+ splash_www0 = GTK_WIDGET(gtk_builder_get_object (builder, "lbl_splash_homepage0"));
+ splash_descr1 = GTK_WIDGET(gtk_builder_get_object (builder, "lbl_splash_desc1"));
+ splash_version1 = GTK_WIDGET(gtk_builder_get_object (builder, "lbl_splash_version1"));
+ splash_author1 = GTK_WIDGET(gtk_builder_get_object (builder, "lbl_splash_author1"));
+ splash_www1 = GTK_WIDGET(gtk_builder_get_object (builder, "lbl_splash_homepage1"));
/* handle selection */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (splash_treeview));
diff --git a/settings/startup-settings.c b/settings/startup-settings.c
index a7ae89d..ebaae8f 100644
--- a/settings/startup-settings.c
+++ b/settings/startup-settings.c
@@ -21,7 +21,6 @@
#include <xfconf/xfconf.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include "xfce4-session-settings-common.h"
@@ -36,29 +35,29 @@
#define ENABLE_TCP_PROP "/security/EnableTcp"
void
-startup_settings_init(GladeXML *gxml)
+startup_settings_init(GtkBuilder *builder)
{
XfconfChannel *channel = xfconf_channel_get(SETTINGS_CHANNEL);
xfconf_g_property_bind(channel, DISP_CHOOSER_PROP, G_TYPE_BOOLEAN,
- glade_xml_get_widget(gxml, "chk_display_chooser"),
+ gtk_builder_get_object(builder, "chk_display_chooser"),
"active");
xfconf_g_property_bind(channel, AUTO_SAVE_PROP, G_TYPE_BOOLEAN,
- glade_xml_get_widget(gxml, "chk_session_autosave"),
+ gtk_builder_get_object(builder, "chk_session_autosave"),
"active");
xfconf_g_property_bind(channel, LOGOUT_PROMPT_PROP, G_TYPE_BOOLEAN,
- glade_xml_get_widget(gxml, "chk_logout_prompt"),
+ gtk_builder_get_object(builder, "chk_logout_prompt"),
"active");
xfconf_g_property_bind(channel, GNOME_SUPPORT_PROP, G_TYPE_BOOLEAN,
- glade_xml_get_widget(gxml, "chk_compat_gnome"),
+ gtk_builder_get_object(builder, "chk_compat_gnome"),
"active");
xfconf_g_property_bind(channel, KDE_SUPPORT_PROP, G_TYPE_BOOLEAN,
- glade_xml_get_widget(gxml, "chk_compat_kde"),
+ gtk_builder_get_object(builder, "chk_compat_kde"),
"active");
xfconf_g_property_bind(channel, ENABLE_TCP_PROP, G_TYPE_BOOLEAN,
- glade_xml_get_widget(gxml, "chk_enable_tcp"),
+ gtk_builder_get_object(builder, "chk_enable_tcp"),
"active");
}
diff --git a/settings/xfce4-session-settings-common.h b/settings/xfce4-session-settings-common.h
index 76a5307..d3f9254 100644
--- a/settings/xfce4-session-settings-common.h
+++ b/settings/xfce4-session-settings-common.h
@@ -18,12 +18,10 @@
#ifndef __XFCE4_SESSION_SETTINGS_COMMON_H__
#define __XFCE4_SESSION_SETTINGS_COMMON_H__
-#include <glade/glade.h>
-
#define SETTINGS_CHANNEL "xfce4-session"
-void startup_settings_init(GladeXML *gxml);
-void splash_settings_init(GladeXML *gxml);
-void session_editor_init(GladeXML *gxml);
+void startup_settings_init(GtkBuilder *builder);
+void splash_settings_init(GtkBuilder *builder);
+void session_editor_init(GtkBuilder *builder);
#endif
diff --git a/settings/xfce4-session-settings.glade b/settings/xfce4-session-settings.glade
index 0df2aaa..d84e17e 100644
--- a/settings/xfce4-session-settings.glade
+++ b/settings/xfce4-session-settings.glade
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
<!--Generated with glade3 3.4.5 on Wed Nov 12 20:45:14 2008 -->
-<glade-interface>
- <requires lib="xfce4"/>
- <widget class="XfceTitledDialog" id="xfce4_session_settings_dialog">
+<interface>
+ <object class="XfceTitledDialog" id="xfce4_session_settings_dialog">
<property name="title" translatable="yes">Session and Startup</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="icon_name">xfce4-session</property>
@@ -11,286 +9,274 @@
<property name="has_separator">False</property>
<property name="subtitle" translatable="yes">Customize desktop startup and splash screen</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkNotebook" id="plug-child">
+ <object class="GtkNotebook" id="plug-child">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">6</property>
<child>
- <widget class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="border_width">12</property>
<child>
- <widget class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkCheckButton" id="chk_display_chooser">
+ <object class="GtkCheckButton" id="chk_display_chooser">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Display the session chooser every time Xfce starts</property>
+ <property name="tooltip-text" translatable="yes">Display the session chooser every time Xfce starts</property>
<property name="label" translatable="yes">_Display chooser on login</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label6">
+ <child type="label">
+ <object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Session Chooser</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkAlignment" id="alignment3">
+ <object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="chk_session_autosave">
+ <object class="GtkCheckButton" id="chk_session_autosave">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Always save the session when logging out</property>
+ <property name="tooltip-text" translatable="yes">Always save the session when logging out</property>
<property name="label" translatable="yes">Automatically save session on _logout</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="chk_logout_prompt">
+ <object class="GtkCheckButton" id="chk_logout_prompt">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Prompt for confirmation when logging out</property>
+ <property name="tooltip-text" translatable="yes">Prompt for confirmation when logging out</property>
<property name="label" translatable="yes">_Prompt on logout</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label7">
+ <child type="label">
+ <object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Logout Settings</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label1">
+ <child type="tab">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes">_General</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
- <property name="type">tab</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox2">
+ <object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkVBox" id="vbox6">
+ <object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
- <widget class="GtkTreeView" id="treeview_splash">
+ <object class="GtkTreeView" id="treeview_splash">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkButton" id="btn_splash_configure">
+ <object class="GtkButton" id="btn_splash_configure">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip" translatable="yes">Opens the configuration panel for the selected splash screen</property>
- <property name="response_id">0</property>
+ <property name="tooltip-text" translatable="yes">Opens the configuration panel for the selected splash screen</property>
<child>
- <widget class="GtkHBox" id="hbox3">
+ <object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkImage" id="image2">
+ <object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="stock">gtk-preferences</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkLabel" id="label11">
+ <object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Con_figure</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">btn_splash_configure</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="btn_splash_test">
+ <object class="GtkButton" id="btn_splash_test">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip" translatable="yes">Demonstrates the selected splash screen</property>
- <property name="response_id">0</property>
+ <property name="tooltip-text" translatable="yes">Demonstrates the selected splash screen</property>
<child>
- <widget class="GtkHBox" id="hbox4">
+ <object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkImage" id="image3">
+ <object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="stock">gtk-execute</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkLabel" id="label12">
+ <object class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Test</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">btn_splash_test</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox7">
+ <object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkImage" id="img_splash_preview">
+ <object class="GtkImage" id="img_splash_preview">
<property name="visible">True</property>
<property name="stock">gtk-missing-image</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkFrame" id="frame5">
+ <object class="GtkFrame" id="frame5">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<child>
- <widget class="GtkAlignment" id="alignment6">
+ <object class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
<property name="bottom_padding">4</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="table1">
+ <object class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">2</property>
<child>
- <widget class="GtkLabel" id="lbl_splash_desc0">
+ <object class="GtkLabel" id="lbl_splash_desc0">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Description:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="lbl_splash_version0">
+ <object class="GtkLabel" id="lbl_splash_version0">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Version:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
@@ -298,12 +284,12 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="lbl_splash_author0">
+ <object class="GtkLabel" id="lbl_splash_author0">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Author:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
@@ -311,12 +297,12 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="lbl_splash_homepage0">
+ <object class="GtkLabel" id="lbl_splash_homepage0">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Homepage:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
@@ -324,24 +310,24 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="lbl_splash_desc1">
+ <object class="GtkLabel" id="lbl_splash_desc1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">label</property>
<property name="selectable">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="lbl_splash_version1">
+ <object class="GtkLabel" id="lbl_splash_version1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">label</property>
<property name="selectable">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -350,12 +336,12 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="lbl_splash_author1">
+ <object class="GtkLabel" id="lbl_splash_author1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">label</property>
<property name="selectable">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -364,12 +350,12 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="lbl_splash_homepage1">
+ <object class="GtkLabel" id="lbl_splash_homepage1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">label</property>
<property name="selectable">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -377,389 +363,361 @@
<property name="bottom_attach">4</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label13">
+ <child type="label">
+ <object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Information</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label2">
+ <child type="tab">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="label" translatable="yes">S_plash</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
- <property name="type">tab</property>
<property name="position">1</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox8">
+ <object class="GtkVBox" id="vbox8">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox10">
+ <object class="GtkHBox" id="hbox10">
<property name="visible">True</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkImage" id="image10">
+ <object class="GtkImage" id="image10">
<property name="visible">True</property>
<property name="stock">gtk-dialog-info</property>
<property name="icon_size">6</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label21">
+ <object class="GtkLabel" id="label21">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">These applications are a part of the currently-running session, and can be saved when you log out. Changes below will only take effect when the session is saved.</property>
<property name="justify">GTK_JUSTIFY_FILL</property>
<property name="wrap">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow4">
+ <object class="GtkScrolledWindow" id="scrolledwindow4">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
- <widget class="GtkTreeView" id="treeview_clients">
+ <object class="GtkTreeView" id="treeview_clients">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox7">
+ <object class="GtkHBox" id="hbox7">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkButton" id="btn_save_session">
+ <object class="GtkButton" id="btn_save_session">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="response_id">0</property>
<child>
- <widget class="GtkHBox" id="hbox5">
+ <object class="GtkHBox" id="hbox5">
<property name="visible">True</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkImage" id="image4">
+ <object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="stock">gtk-save</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkLabel" id="label5">
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Save Sessio_n</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="btn_quit_client">
+ <object class="GtkButton" id="btn_quit_client">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip" translatable="yes">Quit the program, and remove it from the session</property>
- <property name="response_id">0</property>
+ <property name="tooltip-text" translatable="yes">Quit the program, and remove it from the session</property>
<child>
- <widget class="GtkHBox" id="hbox6">
+ <object class="GtkHBox" id="hbox6">
<property name="visible">True</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkImage" id="image5">
+ <object class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="stock">gtk-quit</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkLabel" id="label23">
+ <object class="GtkLabel" id="label23">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Quit Program</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="pack_type">GTK_PACK_END</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label3">
+ <child type="tab">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="label" translatable="yes">_Session</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
- <property name="type">tab</property>
<property name="position">2</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox3">
+ <object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkFrame" id="frame3">
+ <object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkAlignment" id="alignment4">
+ <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkVBox" id="vbox4">
+ <object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="chk_compat_gnome">
+ <object class="GtkCheckButton" id="chk_compat_gnome">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Start GNOME services, such as gnome-keyring and the GNOME accessibility framework</property>
+ <property name="tooltip-text" translatable="yes">Start GNOME services, such as gnome-keyring and the GNOME accessibility framework</property>
<property name="label" translatable="yes">Launch GN_OME services on startup</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="chk_compat_kde">
+ <object class="GtkCheckButton" id="chk_compat_kde">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Start KDE services, such as "kdeinit," DCOP, and ARTS</property>
+ <property name="tooltip-text" translatable="yes">Start KDE services, such as "kdeinit," DCOP, and ARTS</property>
<property name="label" translatable="yes">Launch _KDE services on startup</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkImage" id="image1">
+ <object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="yalign">0</property>
<property name="pixel_size">64</property>
<property name="icon_name">xfsm-gnome-kde-logo</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label8">
+ <child type="label">
+ <object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Compatibility</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame4">
+ <object class="GtkFrame" id="frame4">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkAlignment" id="alignment5">
+ <object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkCheckButton" id="chk_enable_tcp">
+ <object class="GtkCheckButton" id="chk_enable_tcp">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Manage remote applications over the network (this may be a security risk)</property>
+ <property name="tooltip-text" translatable="yes">Manage remote applications over the network (this may be a security risk)</property>
<property name="label" translatable="yes">Manage _remote applications</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label9">
+ <child type="label">
+ <object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Security</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="position">3</property>
- </packing>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label4">
+ <child type="tab">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="label" translatable="yes">Ad_vanced</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
- <property name="type">tab</property>
<property name="position">3</property>
<property name="tab_fill">False</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<child>
- <widget class="GtkButton" id="button1">
+ <object class="GtkButton" id="button1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="label">gtk-help</property>
<property name="use_stock">True</property>
- <property name="response_id">-11</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkButton" id="button2">
+ <object class="GtkButton" id="button2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_saving">
+ </object>
+ <object class="GtkDialog" id="dialog_saving">
<property name="border_width">5</property>
<property name="title" translatable="yes">Saving Session</property>
<property name="resizable">False</property>
@@ -772,82 +730,84 @@
<property name="transient_for">xfce4_session_settings_dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox2">
+ <object class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkVBox" id="vbox5">
+ <object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox8">
+ <object class="GtkHBox" id="hbox8">
<property name="visible">True</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkImage" id="image6">
+ <object class="GtkImage" id="image6">
<property name="visible">True</property>
<property name="stock">gtk-dialog-info</property>
<property name="icon_size">6</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label10">
+ <object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Your session is being saved. If you do not wish to wait, you may close this window.</property>
<property name="justify">GTK_JUSTIFY_FILL</property>
<property name="wrap">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkProgressBar" id="progress_save_session">
+ <object class="GtkProgressBar" id="progress_save_session">
<property name="visible">True</property>
<property name="activity_mode">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area2">
+ <object class="GtkHButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="button3">
+ <object class="GtkButton" id="button3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
-</glade-interface>
+ <action-widgets>
+ <action-widget response="0">button3</action-widget>
+ </action-widgets>
+ </object>
+</interface>
More information about the Xfce4-commits
mailing list