From bc3b64570eed6cc2b9cbcd68fd3062c50e5b38f8 Mon Sep 17 00:00:00 2001
From: Vulcalien <vulcalien+github@gmail.com>
Date: Fri, 13 Aug 2021 17:58:48 +0200
Subject: [PATCH] Removed inconsistencies: Text/Font color -> Foreground +
 fixed missing margin

---
 terminatorlib/preferences.glade | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/terminatorlib/preferences.glade b/terminatorlib/preferences.glade
index 16f02c2c..d06a95fe 100644
--- a/terminatorlib/preferences.glade
+++ b/terminatorlib/preferences.glade
@@ -2030,7 +2030,7 @@
                                       <object class="GtkLabel" id="foreground_colorpicker_label">
                                         <property name="visible">True</property>
                                         <property name="can-focus">False</property>
-                                        <property name="label" translatable="yes">_Text color:</property>
+                                        <property name="label" translatable="yes">_Foreground:</property>
                                         <property name="use-underline">True</property>
                                         <property name="justify">center</property>
                                         <property name="mnemonic-widget">foreground_colorbutton</property>
@@ -2045,7 +2045,7 @@
                                       <object class="GtkLabel" id="background_colorpicker_label">
                                         <property name="visible">True</property>
                                         <property name="can-focus">False</property>
-                                        <property name="label" translatable="yes">_Background color:</property>
+                                        <property name="label" translatable="yes">_Background:</property>
                                         <property name="use-underline">True</property>
                                         <property name="justify">center</property>
                                         <property name="mnemonic-widget">background_colorbutton</property>
@@ -2546,8 +2546,8 @@
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="receives-default">False</property>
+                            <property name="halign">start</property>
                             <property name="use-underline">True</property>
-                            <property name="xalign">0.5</property>
                             <property name="active">True</property>
                             <property name="draw-indicator">True</property>
                             <signal name="toggled" handler="on_background_type_toggled" swapped="no"/>
@@ -2565,8 +2565,8 @@
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="receives-default">False</property>
+                            <property name="halign">start</property>
                             <property name="use-underline">True</property>
-                            <property name="xalign">0.5</property>
                             <property name="draw-indicator">True</property>
                             <property name="group">solid_radiobutton</property>
                             <signal name="toggled" handler="on_background_type_toggled" swapped="no"/>
@@ -2583,7 +2583,7 @@
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="receives-default">False</property>
-                            <property name="active">True</property>
+                            <property name="halign">start</property>
                             <property name="draw-indicator">True</property>
                             <property name="group">solid_radiobutton</property>
                           </object>
@@ -3110,16 +3110,17 @@
                         <property name="spacing">18</property>
                         <child>
                           <!-- n-columns=4 n-rows=3 -->
-                          <object class="GtkGrid" id="grid5">
+                          <object class="GtkGrid">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
+                            <property name="halign">start</property>
                             <property name="row-spacing">6</property>
                             <property name="column-spacing">12</property>
                             <child>
                               <object class="GtkLabel" id="label16">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
-                                <property name="label" translatable="yes">Font color:</property>
+                                <property name="label" translatable="yes">Foreground:</property>
                                 <property name="xalign">0</property>
                               </object>
                               <packing>
@@ -3262,7 +3263,7 @@
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="fill">False</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
@@ -3308,9 +3309,10 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkBox" id="box2">
+                              <object class="GtkBox">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
+                                <property name="margin-left">12</property>
                                 <property name="spacing">12</property>
                                 <child>
                                   <object class="GtkLabel" id="font_selector_label1">