GNOME.org
 

[gnome-calculator/wip-gtk4-port] Use GtkBox instead of HBox and VBox

commit a75809c8a923d5db3eb39a7f22cebf1afb9113b9
Author: Robert Roth <robert roth off gmail com>
Date:   Mon Oct 4 16:43:44 2021 +0300

    Use GtkBox instead of HBox and VBox

 src/ui/buttons-advanced.ui    |  8 ++++++--
 src/ui/buttons-financial.ui   | 31 +++++++++++++++++++++----------
 src/ui/buttons-programming.ui | 25 ++++++++++++++++++-------
 3 files changed, 45 insertions(+), 19 deletions(-)
---
diff --git a/src/ui/buttons-advanced.ui b/src/ui/buttons-advanced.ui
index 1c03dcd8..e83d4c4d 100644
--- a/src/ui/buttons-advanced.ui
+++ b/src/ui/buttons-advanced.ui
@@ -1052,11 +1052,13 @@
               </object>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox20">
+              <object class="GtkBox" id="hbox20">
+                <property name="orientation">horizontal</property>
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkLabel" id="label23">
                     <property name="visible">True</property>
+                    <property name="hexpand">true</property>
                     <property name="label" translatable="yes" comments="The label on the memory 
button">x</property>
                     <attributes>
                       <attribute name="style" value="italic"/>
@@ -1101,10 +1103,12 @@
               </object>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox2">
+              <object class="GtkBox" id="hbox2">
                 <property name="visible">True</property>
+                <property name="orientation">horizontal</property>
                 <child>
                   <object class="GtkLabel" id="label5">
+                    <property name="hexpand">true</property>
                     <property name="visible">True</property>
                     <property name="label">f(x)</property>
                   </object>
diff --git a/src/ui/buttons-financial.ui b/src/ui/buttons-financial.ui
index 4c779ad9..e9df8b78 100644
--- a/src/ui/buttons-financial.ui
+++ b/src/ui/buttons-financial.ui
@@ -9,9 +9,10 @@
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
@@ -192,9 +193,10 @@
     <property name="resizable">False</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="GtkHButtonBox" id="dialog-action_area2">
             <property name="visible">True</property>
@@ -375,9 +377,10 @@
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox3">
+      <object class="GtkBox" id="dialog-vbox3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area3">
             <property name="visible">True</property>
@@ -558,9 +561,10 @@
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox10">
+      <object class="GtkBox" id="dialog-vbox10">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area10">
             <property name="visible">True</property>
@@ -710,9 +714,10 @@
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox4">
+      <object class="GtkBox" id="dialog-vbox4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area4">
             <property name="visible">True</property>
@@ -894,9 +899,10 @@
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox5">
+      <object class="GtkBox" id="dialog-vbox5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area5">
             <property name="visible">True</property>
@@ -1078,9 +1084,10 @@
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox6">
+      <object class="GtkBox" id="dialog-vbox6">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area6">
             <property name="visible">True</property>
@@ -1262,9 +1269,10 @@
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox7">
+      <object class="GtkBox" id="dialog-vbox7">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area7">
             <property name="visible">True</property>
@@ -1446,9 +1454,10 @@
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox8">
+      <object class="GtkBox" id="dialog-vbox8">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area8">
             <property name="visible">True</property>
@@ -1661,9 +1670,10 @@
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox9">
+      <object class="GtkBox" id="dialog-vbox9">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area9">
             <property name="visible">True</property>
@@ -2367,6 +2377,7 @@
                 <child>
                   <object class="GtkLabel" id="label23">
                     <property name="visible">True</property>
+                    <property name="hexpand">true</property>
                     <property name="label" translatable="yes" comments="The label on the memory 
button">x</property>
                     <attributes>
                       <attribute name="style" value="italic"/>
diff --git a/src/ui/buttons-programming.ui b/src/ui/buttons-programming.ui
index f4b390cd..0d642853 100644
--- a/src/ui/buttons-programming.ui
+++ b/src/ui/buttons-programming.ui
@@ -2,8 +2,9 @@
 <interface>
   <!-- interface-naming-policy toplevel-contextual -->
   <requires lib="gtk+" version="3.16"/>
-  <object class="GtkVBox" id="button_panel">
+  <object class="GtkBox" id="button_panel">
     <property name="visible">True</property>
+    <property name="orientation">vertical</property>
     <child>
       <object class="GtkBox" id="hbox1">
         <property name="visible">True</property>
@@ -2030,13 +2031,15 @@
               </object>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox11">
+              <object class="GtkBox" id="hbox11">
                 <property name="visible">True</property>
                 <property name="spacing">3</property>
+                <property name="orientation">horizontal</property>
                 <child>
                   <object class="GtkLabel" id="label7">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="hexpand">true</property>
                     <property name="label">&lt;&lt;</property>
                   </object>
                   <packing>
@@ -2076,13 +2079,15 @@
               </object>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox10">
+              <object class="GtkBox" id="hbox10">
                 <property name="visible">True</property>
                 <property name="spacing">3</property>
+                <property name="orientation">horizontal</property>
                 <child>
                   <object class="GtkLabel" id="label6">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="hexpand">true</property>
                     <property name="label">&gt;&gt;</property>
                   </object>
                   <packing>
@@ -2490,12 +2495,14 @@
               </object>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox20">
+              <object class="GtkBox" id="hbox20">
                 <property name="visible">True</property>
                 <property name="spacing">3</property>
+                <property name="orientation">horizontal</property>
                 <child>
                   <object class="GtkLabel" id="label23">
                     <property name="visible">True</property>
+                    <property name="hexpand">true</property>
                     <property name="label" translatable="yes" comments="The label on the memory 
button">x</property>
                   </object>
                   <packing>
@@ -2532,14 +2539,16 @@
             <property name="receives_default">True</property>
             <property name="tooltip_text" translatable="yes">Change word size</property>
             <child>
-              <object class="GtkHBox" id="hbox2">
+              <object class="GtkBox" id="hbox2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">3</property>
+                <property name="orientation">horizontal</property>
                 <child>
                   <object class="GtkLabel" id="word_size_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="hexpand">true</property>
                     <property name="label">64-bit</property>
                   </object>
                   <packing>
@@ -2598,11 +2607,13 @@
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox3">
+      <object class="GtkBox" id="dialog-vbox3">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkHBox" id="hbox21">
+          <object class="GtkBox" id="hbox21">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <property name="border_width">5</property>
             <child>
               <object class="GtkLabel" id="label39">
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]