[Xfce4-commits] <xfce4-settings:master> Update glade-file and icons for minimal dialog

[Nick Schermer]

Updating branch refs/heads/master
         to 6575a0c1c9726c30d0cb39f307d597a323762423 (commit)
       from 2f7699c7ee4db05fa35daf65ac41f5a01336ebc7 (commit)

commit 6575a0c1c9726c30d0cb39f307d597a323762423
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Thu Oct 4 11:16:41 2012 +0200

    Update glade-file and icons for minimal dialog

 dialogs/display-settings/display1.png              |  Bin 0 -> 7527 bytes
 dialogs/display-settings/display2.png              |  Bin 0 -> 7654 bytes
 dialogs/display-settings/extend-left.png           |  Bin 5867 -> 0 bytes
 .../display-settings/minimal-display-dialog.glade  |   71 +++++++++++++-------
 4 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/dialogs/display-settings/display1.png b/dialogs/display-settings/display1.png
new file mode 100644
index 0000000..793022f
Binary files /dev/null and b/dialogs/display-settings/display1.png differ
diff --git a/dialogs/display-settings/display2.png b/dialogs/display-settings/display2.png
new file mode 100644
index 0000000..64bbd39
Binary files /dev/null and b/dialogs/display-settings/display2.png differ
diff --git a/dialogs/display-settings/extend-left.png b/dialogs/display-settings/extend-left.png
deleted file mode 100644
index 5e0dbd5..0000000
Binary files a/dialogs/display-settings/extend-left.png and /dev/null differ
diff --git a/dialogs/display-settings/minimal-display-dialog.glade b/dialogs/display-settings/minimal-display-dialog.glade
index b5cb4b1..6e6b1d9 100644
--- a/dialogs/display-settings/minimal-display-dialog.glade
+++ b/dialogs/display-settings/minimal-display-dialog.glade
@@ -13,18 +13,18 @@
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="border_width">12</property>
-        <property name="spacing">12</property>
+        <property name="border_width">6</property>
+        <property name="spacing">6</property>
         <child>
           <object class="GtkTable" id="table1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="n_rows">2</property>
-            <property name="n_columns">3</property>
-            <property name="column_spacing">48</property>
+            <property name="n_columns">4</property>
+            <property name="column_spacing">24</property>
             <property name="row_spacing">3</property>
             <child>
-              <object class="GtkToggleButton" id="extend_left">
+              <object class="GtkToggleButton" id="display1">
                 <property name="width_request">128</property>
                 <property name="height_request">128</property>
                 <property name="visible">True</property>
@@ -35,7 +35,7 @@
                   <object class="GtkImage" id="image1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="pixbuf">extend-left.png</property>
+                    <property name="pixbuf">display1.png</property>
                   </object>
                 </child>
               </object>
@@ -94,7 +94,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Extend to the left</property>
+                <property name="label" translatable="yes">Only Display 1</property>
               </object>
               <packing>
                 <property name="top_attach">1</property>
@@ -133,6 +133,44 @@
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkToggleButton" id="display2">
+                <property name="width_request">128</property>
+                <property name="height_request">128</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <child>
+                  <object class="GtkImage" id="image4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="pixbuf">display2.png</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="right_attach">4</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Only Display 2</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="right_attach">4</property>
+                <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>
           </object>
           <packing>
             <property name="expand">True</property>
@@ -145,21 +183,6 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkCheckButton" id="presentation_mode">
-                <property name="label" translatable="yes">Presentation Mode</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</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="GtkButton" id="advanced_button">
                 <property name="label" translatable="yes">Advanced</property>
                 <property name="visible">True</property>
@@ -170,7 +193,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -185,7 +208,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>