[gbrainy/gbrainy3] Remove legacy widgets from Custom game dlg box

From: Jordi Mas <jmas src gnome org>
To: commits-list gnome org
Cc:
Subject: [gbrainy/gbrainy3] Remove legacy widgets from Custom game dlg box
Date: Sun, 14 Dec 2014 15:33:15 +0000 (UTC)
commit db290f0ba8ba8681800fce8d4be0c4890887f64a
Author: Jordi Mas <jmas softcatala org>
Date:   Sun Dec 14 10:33:07 2014 -0500

    Remove legacy widgets from Custom game dlg box

 src/Clients/Classical/Dialogs/CustomGameDialog.cs  |    1 +
 .../Classical/Dialogs/ui/CustomGameDialog.ui       |  133 ++++++++++++--------
 src/Clients/Classical/gbrainy.cs                   |    2 +-
 3 files changed, 80 insertions(+), 56 deletions(-)
---
diff --git a/src/Clients/Classical/Dialogs/CustomGameDialog.cs 
b/src/Clients/Classical/Dialogs/CustomGameDialog.cs
index eadb99c..efec106 100644
--- a/src/Clients/Classical/Dialogs/CustomGameDialog.cs
+++ b/src/Clients/Classical/Dialogs/CustomGameDialog.cs
@@ -55,6 +55,7 @@ namespace gbrainy.Clients.Classical.Dialogs
 
                        drawing_area = new GameDrawingArea ();
                        drawing_area.UseSolutionArea = false;
+                        drawing_area.SetSizeRequest (preview_vbox.WidthRequest, preview_vbox.HeightRequest);
                        preview_vbox.Add (drawing_area);
                        drawing_area.Visible = true;
                        treeview.HeadersClickable = true;
diff --git a/src/Clients/Classical/Dialogs/ui/CustomGameDialog.ui 
b/src/Clients/Classical/Dialogs/ui/CustomGameDialog.ui
index 36ec7ea..c63f630 100644
--- a/src/Clients/Classical/Dialogs/ui/CustomGameDialog.ui
+++ b/src/Clients/Classical/Dialogs/ui/CustomGameDialog.ui
@@ -1,48 +1,105 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
-  <!-- interface-naming-policy toplevel-contextual -->
+  <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="customgame">
     <property name="width_request">840</property>
     <property name="height_request">550</property>
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="border_width">7</property>
     <property name="title" translatable="yes">Custom Game</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox2">
+      <object class="GtkBox" id="dialog-vbox2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area2">
+            <property name="width_request">0</property>
+            <property name="height_request">0</property>
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="cancelbutton1">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</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="okbutton">
+                <property name="label" translatable="yes">_Start</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="OnOK" swapped="no"/>
+              </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="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
-          <object class="GtkHBox" id="all_hbox">
+          <object class="GtkBox" id="all_hbox">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">5</property>
             <property name="spacing">12</property>
             <child>
-              <object class="GtkVBox" id="gamelist_container">
+              <object class="GtkBox" id="gamelist_container">
+                <property name="height_request">500</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkScrolledWindow" id="tree_scrolledwindow">
-                    <property name="width_request">360</property>
+                    <property name="width_request">380</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
                     <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTreeView" id="treeview">
                         <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="GtkHButtonBox" id="selection_hbuttonbox">
+                  <object class="GtkButtonBox" id="selection_hbuttonbox">
                     <property name="height_request">35</property>
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="SelectAll">
                         <property name="label" translatable="yes">Select All</property>
@@ -51,7 +108,7 @@
                         <property name="can_default">True</property>
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <signal name="clicked" handler="OnSelectAll"/>
+                        <signal name="clicked" handler="OnSelectAll" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -67,7 +124,7 @@
                         <property name="can_default">True</property>
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <signal name="clicked" handler="OnUnSelectAll"/>
+                        <signal name="clicked" handler="OnUnSelectAll" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -78,73 +135,39 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="preview_vbox">
+              <object class="GtkBox" id="preview_vbox">
+                <property name="width_request">500</property>
+                <property name="height_request">500</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <placeholder/>
                 </child>
               </object>
               <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area2">
-            <property name="width_request">0</property>
-            <property name="height_request">0</property>
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="cancelbutton1">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</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="okbutton">
-                <property name="label" translatable="yes">_Start</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <signal name="clicked" handler="OnOK"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
diff --git a/src/Clients/Classical/gbrainy.cs b/src/Clients/Classical/gbrainy.cs
index 67df124..8aefd68 100644
--- a/src/Clients/Classical/gbrainy.cs
+++ b/src/Clients/Classical/gbrainy.cs
@@ -148,7 +148,7 @@ namespace gbrainy.Clients.Classical
 
                        drawing_area = new GameDrawingArea ();
                        drawing_area.Drawable = session;
-            drawing_area.SetSizeRequest (drawing_vbox.WidthRequest, drawing_vbox.HeightRequest);
+                        drawing_area.SetSizeRequest (drawing_vbox.WidthRequest, drawing_vbox.HeightRequest);
                        GameSensitiveUI ();
 
                        EventBox eb = new EventBox (); // Provides a window for drawing area windowless widget
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]