[Xfce4-commits] <xfce4-session:master> Fix orientation properties in glade file.
Nick Schermer
noreply at xfce.org
Thu Jan 28 19:52:23 CET 2010
Updating branch refs/heads/master
to 9b5077215b589fc5fb96173adad950d1b7ed8601 (commit)
from d98536274785cbf3650bf00097fd2e60f9236824 (commit)
commit 9b5077215b589fc5fb96173adad950d1b7ed8601
Author: Nick Schermer <nick at xfce.org>
Date: Thu Jan 28 18:12:33 2010 +0100
Fix orientation properties in glade file.
settings/xfce4-session-settings.glade | 153 ++++++++++++++++++++++++---------
1 files changed, 112 insertions(+), 41 deletions(-)
diff --git a/settings/xfce4-session-settings.glade b/settings/xfce4-session-settings.glade
index f09cf9e..c815bc5 100644
--- a/settings/xfce4-session-settings.glade
+++ b/settings/xfce4-session-settings.glade
@@ -1,16 +1,19 @@
<?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Wed Nov 12 20:45:14 2008 -->
<interface>
+ <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-requires libxfce4ui 4.5 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<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="window_position">center-on-parent</property>
<property name="icon_name">xfce4-session</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<property name="subtitle" translatable="yes">Customize desktop startup and splash screen</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkNotebook" id="plug-child">
@@ -21,11 +24,12 @@
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
@@ -34,10 +38,11 @@
<property name="left_padding">12</property>
<child>
<object class="GtkCheckButton" id="chk_display_chooser">
+ <property name="label" translatable="yes">_Display chooser on login</property>
<property name="visible">True</property>
<property name="can_focus">True</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="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Display the session chooser every time Xfce starts</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -54,13 +59,14 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
@@ -70,26 +76,30 @@
<child>
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="chk_session_autosave">
+ <property name="label" translatable="yes">Automatically save session on _logout</property>
<property name="visible">True</property>
<property name="can_focus">True</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="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Always save the session when logging out</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="chk_logout_prompt">
+ <property name="label" translatable="yes">_Prompt on logout</property>
<property name="visible">True</property>
<property name="can_focus">True</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="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Prompt for confirmation when logging out</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -135,14 +145,15 @@
<child>
<object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<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>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">etched-in</property>
<child>
<object class="GtkTreeView" id="treeview_splash">
<property name="visible">True</property>
@@ -151,6 +162,9 @@
</object>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="btn_splash_configure">
@@ -158,7 +172,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip-text" translatable="yes">Opens the configuration panel for the selected splash screen</property>
+ <property name="tooltip_text" translatable="yes">Opens the configuration panel for the selected splash screen</property>
<child>
<object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
@@ -169,6 +183,9 @@
<property name="xalign">1</property>
<property name="stock">gtk-preferences</property>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel" id="label11">
@@ -196,7 +213,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip-text" translatable="yes">Demonstrates the selected splash screen</property>
+ <property name="tooltip_text" translatable="yes">Demonstrates the selected splash screen</property>
<child>
<object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
@@ -207,6 +224,9 @@
<property name="xalign">1</property>
<property name="stock">gtk-execute</property>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel" id="label12">
@@ -231,17 +251,22 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage" id="img_splash_preview">
<property name="visible">True</property>
<property name="stock">gtk-missing-image</property>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkFrame" id="frame5">
@@ -386,6 +411,9 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
<child type="tab">
<object class="GtkLabel" id="label2">
@@ -402,6 +430,7 @@
<object class="GtkVBox" id="vbox8">
<property name="visible">True</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox10">
@@ -411,10 +440,11 @@
<object class="GtkImage" id="image10">
<property name="visible">True</property>
<property name="stock">gtk-dialog-info</property>
- <property name="icon_size">6</property>
+ <property name="icon-size">6</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -422,7 +452,7 @@
<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="justify">fill</property>
<property name="wrap">True</property>
</object>
<packing>
@@ -433,15 +463,16 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<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>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">etched-in</property>
<child>
<object class="GtkTreeView" id="treeview_clients">
<property name="visible">True</property>
@@ -472,6 +503,9 @@
<property name="xalign">1</property>
<property name="stock">gtk-save</property>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel" id="label5">
@@ -498,7 +532,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip-text" translatable="yes">Quit the program, and remove it from the session</property>
+ <property name="tooltip_text" translatable="yes">Quit the program, and remove it from the session</property>
<child>
<object class="GtkHBox" id="hbox6">
<property name="visible">True</property>
@@ -509,6 +543,9 @@
<property name="xalign">1</property>
<property name="stock">gtk-quit</property>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel" id="label23">
@@ -526,7 +563,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -537,6 +574,9 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
</child>
<child type="tab">
<object class="GtkLabel" id="label3">
@@ -553,12 +593,13 @@
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
@@ -572,26 +613,30 @@
<child>
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="chk_compat_gnome">
+ <property name="label" translatable="yes">Launch GN_OME services on startup</property>
<property name="visible">True</property>
<property name="can_focus">True</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="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Start GNOME services, such as gnome-keyring and the GNOME accessibility framework</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="chk_compat_kde">
+ <property name="label" translatable="yes">Launch _KDE services on startup</property>
<property name="visible">True</property>
<property name="can_focus">True</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="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Start KDE services, such as "kdeinit," DCOP, and ARTS</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -601,6 +646,9 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkImage" id="image1">
@@ -628,13 +676,14 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame4">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
@@ -643,10 +692,11 @@
<property name="left_padding">12</property>
<child>
<object class="GtkCheckButton" id="chk_enable_tcp">
+ <property name="label" translatable="yes">Manage _remote applications</property>
<property name="visible">True</property>
<property name="can_focus">True</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="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Manage remote applications over the network (this may be a security risk)</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -667,6 +717,9 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
</child>
<child type="tab">
<object class="GtkLabel" id="label4">
@@ -689,29 +742,37 @@
<property name="visible">True</property>
<child>
<object class="GtkButton" id="button1">
+ <property name="label">gtk-help</property>
<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>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="button2">
+ <property name="label">gtk-close</property>
<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>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -725,10 +786,10 @@
<property name="border_width">5</property>
<property name="title" translatable="yes">Saving Session</property>
<property name="resizable">False</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="window_position">center-on-parent</property>
<property name="destroy_with_parent">True</property>
<property name="icon_name">xfce4-session</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
<property name="transient_for">xfce4_session_settings_dialog</property>
@@ -736,11 +797,13 @@
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
<property name="border_width">6</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox8">
@@ -750,10 +813,11 @@
<object class="GtkImage" id="image6">
<property name="visible">True</property>
<property name="stock">gtk-dialog-info</property>
- <property name="icon_size">6</property>
+ <property name="icon-size">6</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -761,7 +825,7 @@
<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="justify">fill</property>
<property name="wrap">True</property>
</object>
<packing>
@@ -771,6 +835,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -792,20 +857,26 @@
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button3">
+ <property name="label">gtk-close</property>
<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>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
More information about the Xfce4-commits
mailing list