From 625f6e779a23739b1c8e04c810a17b608df129c6 Mon Sep 17 00:00:00 2001

From: Ray Strode <rstrode@redhat.com>

Date: Fri, 20 Dec 2013 10:53:33 -0500

Subject: [PATCH 06/19] session-properties: refresh from recent glade

The ui file is rather old.  This commit just opens it up in a recent

glade and resaves it, so we have a fresh starting point to make

changes.

---

 data/session-properties.ui | 43 ++++++++++++++++++++++++++++++--------

 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/data/session-properties.ui b/data/session-properties.ui

index 1f0cb9a5..47a30f78 100644

--- a/data/session-properties.ui

+++ b/data/session-properties.ui

@@ -1,323 +1,348 @@

-

+

 <interface>

-  <requires lib="gtk+" version="2.16"/>

-  

+  

   <object class="GtkNotebook" id="main-notebook">

     <property name="visible">True</property>

     <property name="can_focus">True</property>

     <property name="border_width">6</property>

     <child>

       <object class="GtkVBox" id="vbox1">

         <property name="visible">True</property>

+        <property name="can_focus">False</property>

         <property name="border_width">12</property>

-        <property name="orientation">vertical</property>

         <property name="spacing">3</property>

         <child>

           <object class="GtkLabel" id="label6">

             <property name="visible">True</property>

+            <property name="can_focus">False</property>

             <property name="xalign">0</property>

             <property name="xpad">3</property>

             <property name="ypad">3</property>

             <property name="label" translatable="yes">Additional startup _programs:</property>

             <property name="use_underline">True</property>

             <property name="mnemonic_widget">session_properties_treeview</property>

           </object>

           <packing>

             <property name="expand">False</property>

+            <property name="fill">True</property>

             <property name="position">0</property>

           </packing>

         </child>

         <child>

           <object class="GtkHBox" id="hbox1">

             <property name="visible">True</property>

+            <property name="can_focus">False</property>

             <property name="spacing">6</property>

             <child>

               <object class="GtkScrolledWindow" id="scrolledwindow1">

                 <property name="visible">True</property>

                 <property name="can_focus">True</property>

                 <property name="hscrollbar_policy">never</property>

-                <property name="vscrollbar_policy">automatic</property>

                 <property name="shadow_type">etched-in</property>

                 <child>

                   <object class="GtkTreeView" id="session_properties_treeview">

                     <property name="height_request">210</property>

                     <property name="visible">True</property>

                     <property name="can_focus">True</property>

+                    <child internal-child="selection">

+                      <object class="GtkTreeSelection" id="treeview-selection1"/>

+                    </child>

                   </object>

                 </child>

               </object>

               <packing>

+                <property name="expand">True</property>

+                <property name="fill">True</property>

                 <property name="position">0</property>

               </packing>

             </child>

             <child>

               <object class="GtkVButtonBox" id="vbuttonbox1">

                 <property name="visible">True</property>

+                <property name="can_focus">False</property>

                 <property name="spacing">6</property>

                 <property name="layout_style">start</property>

                 <child>

                   <object class="GtkButton" id="session_properties_add_button">

                     <property name="label">gtk-add</property>

                     <property name="visible">True</property>

                     <property name="can_focus">True</property>

                     <property name="receives_default">True</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="session_properties_delete_button">

                     <property name="label">gtk-remove</property>

                     <property name="visible">True</property>

                     <property name="sensitive">False</property>

                     <property name="can_focus">True</property>

                     <property name="receives_default">True</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>

                 <child>

                   <object class="GtkButton" id="session_properties_edit_button">

                     <property name="label">gtk-edit</property>

                     <property name="visible">True</property>

                     <property name="sensitive">False</property>

                     <property name="can_focus">True</property>

                     <property name="receives_default">True</property>

                     <property name="use_stock">True</property>

                   </object>

                   <packing>

                     <property name="expand">False</property>

                     <property name="fill">False</property>

                     <property name="position">2</property>

                   </packing>

                 </child>

               </object>

               <packing>

                 <property name="expand">False</property>

                 <property name="fill">False</property>

                 <property name="position">1</property>

               </packing>

             </child>

           </object>

           <packing>

+            <property name="expand">True</property>

+            <property name="fill">True</property>

             <property name="position">1</property>

           </packing>

         </child>

       </object>

     </child>

     <child type="tab">

       <object class="GtkLabel" id="label4">

         <property name="visible">True</property>

+        <property name="can_focus">False</property>

         <property name="label" translatable="yes">Startup Programs</property>

       </object>

       <packing>

         <property name="tab_fill">False</property>

       </packing>

     </child>

     <child>

       <object class="GtkVBox" id="vbox3">

         <property name="visible">True</property>

+        <property name="can_focus">False</property>

         <property name="border_width">12</property>

-        <property name="orientation">vertical</property>

         <property name="spacing">6</property>

         <child>

           <object class="GtkCheckButton" id="session_properties_remember_toggle">

             <property name="label" translatable="yes">_Automatically remember running applications when logging out</property>

             <property name="visible">True</property>

             <property name="can_focus">True</property>

             <property name="receives_default">False</property>

             <property name="use_underline">True</property>

+            <property name="xalign">0.5</property>

             <property name="draw_indicator">True</property>

           </object>

           <packing>

             <property name="expand">False</property>

             <property name="fill">False</property>

             <property name="position">0</property>

           </packing>

         </child>

         <child>

           <object class="GtkHButtonBox" id="hbuttonbox1">

             <property name="visible">True</property>

+            <property name="can_focus">False</property>

             <child>

               <object class="GtkButton" id="session_properties_save_button">

                 <property name="can_focus">True</property>

                 <property name="receives_default">True</property>

                 <child>

                   <object class="GtkHBox" id="hbox2">

                     <property name="visible">True</property>

+                    <property name="can_focus">False</property>

                     <property name="spacing">4</property>

                     <child>

                       <object class="GtkImage" id="image1">

                         <property name="visible">True</property>

+                        <property name="can_focus">False</property>

                         <property name="stock">gtk-save</property>

                       </object>

                       <packing>

                         <property name="expand">False</property>

                         <property name="fill">False</property>

                         <property name="position">0</property>

                       </packing>

                     </child>

                     <child>

                       <object class="GtkLabel" id="label7">

                         <property name="visible">True</property>

+                        <property name="can_focus">False</property>

                         <property name="label" translatable="yes">_Remember Currently Running Applications</property>

                         <property name="use_underline">True</property>

                       </object>

                       <packing>

+                        <property name="expand">True</property>

+                        <property name="fill">True</property>

                         <property name="position">1</property>

                       </packing>

                     </child>

                   </object>

                 </child>

               </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="fill">False</property>

             <property name="position">1</property>

           </packing>

         </child>

       </object>

       <packing>

         <property name="position">1</property>

       </packing>

     </child>

     <child type="tab">

       <object class="GtkLabel" id="label5">

         <property name="visible">True</property>

+        <property name="can_focus">False</property>

         <property name="label" translatable="yes">Options</property>

       </object>

       <packing>

         <property name="position">1</property>

         <property name="tab_fill">False</property>

       </packing>

     </child>

   </object>

   <object class="GtkTable" id="main-table">

     <property name="visible">True</property>

+    <property name="can_focus">False</property>

     <property name="border_width">6</property>

     <property name="n_rows">3</property>

     <property name="n_columns">2</property>

     <property name="column_spacing">12</property>

     <property name="row_spacing">6</property>

     <child>

       <object class="GtkHBox" id="hbox3">

         <property name="visible">True</property>

+        <property name="can_focus">False</property>

         <property name="spacing">12</property>

         <child>

           <object class="GtkEntry" id="session_properties_command_entry">

             <property name="visible">True</property>

             <property name="can_focus">True</property>

-            <property name="invisible_char">●</property>

+            <property name="invisible_char">●</property>

           </object>

           <packing>

+            <property name="expand">True</property>

+            <property name="fill">True</property>

             <property name="position">0</property>

           </packing>

         </child>

         <child>

           <object class="GtkButton" id="session_properties_browse_button">

             <property name="label" translatable="yes">Browse…</property>

             <property name="visible">True</property>

             <property name="can_focus">True</property>

             <property name="receives_default">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="left_attach">1</property>

         <property name="right_attach">2</property>

         <property name="top_attach">1</property>

         <property name="bottom_attach">2</property>

         <property name="y_options">GTK_FILL</property>

       </packing>

     </child>

     <child>

       <object class="GtkEntry" id="session_properties_comment_entry">

         <property name="visible">True</property>

         <property name="can_focus">True</property>

-        <property name="invisible_char">●</property>

+        <property name="invisible_char">●</property>

       </object>

       <packing>

         <property name="left_attach">1</property>

         <property name="right_attach">2</property>

         <property name="top_attach">2</property>

         <property name="bottom_attach">3</property>

         <property name="y_options">GTK_FILL</property>

       </packing>

     </child>

     <child>

       <object class="GtkEntry" id="session_properties_name_entry">

         <property name="visible">True</property>

         <property name="can_focus">True</property>

-        <property name="invisible_char">●</property>

+        <property name="invisible_char">●</property>

       </object>

       <packing>

         <property name="left_attach">1</property>

         <property name="right_attach">2</property>

         <property name="y_options">GTK_FILL</property>

       </packing>

     </child>

     <child>

       <object class="GtkLabel" id="label3">

         <property name="visible">True</property>

+        <property name="can_focus">False</property>

         <property name="xalign">0</property>

         <property name="label" translatable="yes">Comm_ent:</property>

         <property name="use_underline">True</property>

         <property name="mnemonic_widget">label2</property>

       </object>

       <packing>

         <property name="top_attach">2</property>

         <property name="bottom_attach">3</property>

         <property name="x_options">GTK_FILL</property>

         <property name="y_options">GTK_FILL</property>

       </packing>

     </child>

     <child>

       <object class="GtkLabel" id="label2">

         <property name="visible">True</property>

+        <property name="can_focus">False</property>

         <property name="xalign">0</property>

         <property name="label" translatable="yes">Co_mmand:</property>

         <property name="use_underline">True</property>

         <property name="mnemonic_widget">session_properties_command_entry</property>

       </object>

       <packing>

         <property name="top_attach">1</property>

         <property name="bottom_attach">2</property>

         <property name="x_options">GTK_FILL</property>

         <property name="y_options">GTK_FILL</property>

       </packing>

     </child>

     <child>

       <object class="GtkLabel" id="label1">

         <property name="visible">True</property>

+        <property name="can_focus">False</property>

         <property name="xalign">0</property>

         <property name="label" translatable="yes">_Name:</property>

         <property name="use_underline">True</property>

         <property name="mnemonic_widget">session_properties_name_entry</property>

       </object>

       <packing>

         <property name="x_options">GTK_FILL</property>

         <property name="y_options">GTK_FILL</property>

       </packing>

     </child>

   </object>

 </interface>

-- 

2.17.0