[gnome-chess/mcatanzaro/gtk4] progress

[Michael Catanzaro <mcatanzaro src gnome org>]

commit e21eea1f91edad5dd5a00c5f2ff14854cfd1fa8c
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Wed Dec 23 20:29:06 2020 -0600

    progress

 data/preferences.ui  | 16 ++++++++++++----
 src/gnome-chess.vala |  7 ++++---
 2 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/data/preferences.ui b/data/preferences.ui
index 1917817..3400541 100644
--- a/data/preferences.ui
+++ b/data/preferences.ui
@@ -219,8 +219,12 @@
                 <property name="child">
                   <object class="GtkGrid">
                     <property name="can-focus">0</property>
-                    <property name="column-spacing">5</property>
-                    <property name="row-spacing">5</property>
+                    <property name="column-spacing">6</property>
+                    <property name="row-spacing">6</property>
+                    <property name="margin-start">18</property>
+                    <property name="margin-end">18</property>
+                    <property name="margin-top">18</property>
+                    <property name="margin-bottom">18</property>
                     <child>
                       <object class="GtkLabel">
                         <property name="can-focus">0</property>
@@ -498,8 +502,12 @@
                 <property name="child">
                   <object class="GtkGrid">
                     <property name="can-focus">0</property>
-                    <property name="column-spacing">5</property>
-                    <property name="row-spacing">5</property>
+                    <property name="column-spacing">6</property>
+                    <property name="row-spacing">6</property>
+                    <property name="margin-start">18</property>
+                    <property name="margin-end">18</property>
+                    <property name="margin-top">18</property>
+                    <property name="margin-bottom">18</property>
                     <child>
                       <object class="GtkLabel">
                         <property name="can-focus">0</property>
diff --git a/src/gnome-chess.vala b/src/gnome-chess.vala
index 4e281ca..3e5d593 100644
--- a/src/gnome-chess.vala
+++ b/src/gnome-chess.vala
@@ -1886,6 +1886,7 @@ Copyright © 2015–2016 Sahil Sareen""";
 
         preferences_dialog = (Dialog) preferences_builder.get_object ("preferences");
         preferences_dialog.transient_for = window;
+        preferences_dialog.modal = true;
 
         settings.bind ("show-numbering", preferences_builder.get_object ("show_numbering_check"),
                        "active", SettingsBindFlags.DEFAULT);
@@ -1895,6 +1896,9 @@ Copyright © 2015–2016 Sahil Sareen""";
         side_combo = (ComboBox) preferences_builder.get_object ("side_combo");
         side_combo.set_active (settings.get_enum ("play-as"));
 
+        difficulty_combo = (ComboBox) preferences_builder.get_object ("difficulty_combo");
+        set_combo (difficulty_combo, 1, settings.get_string ("difficulty"));
+
         var ai_combo = (ComboBox) preferences_builder.get_object ("opponent_combo");
         var ai_model = (Gtk.ListStore) ai_combo.model;
         var opponent_name = settings.get_string ("opponent");
@@ -1914,9 +1918,6 @@ Copyright © 2015–2016 Sahil Sareen""";
             settings.set_string ("opponent", "human");
         }
 
-        difficulty_combo = (ComboBox) preferences_builder.get_object ("difficulty_combo");
-        set_combo (difficulty_combo, 1, settings.get_string ("difficulty"));
-
         duration_combo = (ComboBox) preferences_builder.get_object ("duration_combo");
         clock_type_combo = (ComboBox) preferences_builder.get_object ("clock_type_combo");
         duration_adjustment = (Adjustment) preferences_builder.get_object ("duration_adjustment");