Mercurial > pidgin3 / file diff

--- a/pidgin/resources/Prefs/prefs.ui	Tue Aug 23 03:44:28 2022 -0500
+++ b/pidgin/resources/Prefs/prefs.ui	Tue Aug 23 04:28:29 2022 -0500
@@ -20,136 +20,92 @@
 
 -->
 <interface>
-  <requires lib="gtk+" version="3.22"/>
+  <requires lib="gtk" version="4.0"/>
   <requires lib="pidgin" version="3.0"/>
   <!-- interface-license-type gplv2 -->
   <!-- interface-name Pidgin -->
   <!-- interface-description Internet Messenger -->
   <!-- interface-copyright Pidgin Developers <devel@pidgin.im> -->
   <template class="PidginPrefsWindow" parent="GtkDialog">
-    <property name="can-focus">False</property>
-    <property name="title" translatable="yes">Preferences</property>
-    <property name="type-hint">dialog</property>
+    <property name="title" translatable="1">Preferences</property>
     <signal name="destroy" handler="delete_prefs" swapped="no"/>
-    <child internal-child="vbox">
+    <child internal-child="content_area">
       <object class="GtkBox">
-        <property name="can-focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
+        <property name="vexpand">1</property>
+        <property name="orientation">horizontal</property>
+        <child>
+          <object class="GtkStackSidebar">
+            <property name="stack">stack</property>
+          </object>
+        </child>
         <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
+          <object class="GtkStack" id="stack">
+            <signal name="notify::visible-child" handler="vv_test_switch_page_cb" object="vv" swapped="no"/>
             <child>
-              <object class="GtkStackSidebar">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="stack">stack</property>
+              <object class="GtkStackPage">
+                <property name="name">conversations</property>
+                <property name="title" translatable="1">Conversations</property>
+                <property name="child">
+                  <object class="PidginConversationPrefs"/>
+                </property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
+            </child>
+            <child>
+              <object class="GtkStackPage">
+                <property name="name">network</property>
+                <property name="title" translatable="1">Network</property>
+                <property name="child">
+                  <object class="PidginNetworkPrefs"/>
+                </property>
+              </object>
             </child>
             <child>
-              <object class="GtkStack" id="stack">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <signal name="notify::visible-child" handler="vv_test_switch_page_cb" object="vv" swapped="no"/>
-                <child>
-                  <object class="PidginConversationPrefs">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                  </object>
-                  <packing>
-                    <property name="name">conversations</property>
-                    <property name="title" translatable="yes">Conversations</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="PidginNetworkPrefs">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                  </object>
-                  <packing>
-                    <property name="name">network</property>
-                    <property name="title" translatable="yes">Network</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="PidginProxyPrefs">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                  </object>
-                  <packing>
-                    <property name="name">proxy</property>
-                    <property name="title" translatable="yes">Proxy</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="PidginAwayPrefs">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                  </object>
-                  <packing>
-                    <property name="name">away</property>
-                    <property name="title" translatable="yes">Status / Idle</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="PidginCredentialPrefs">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                  </object>
-                  <packing>
-                    <property name="name">credentials</property>
-                    <property name="title" translatable="yes">Credentials</property>
-                    <property name="position">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="PidginVVPrefs" id="vv">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                  </object>
-                  <packing>
-                    <property name="name">vv</property>
-                    <property name="title" translatable="yes">Voice/Video</property>
-                    <property name="position">5</property>
-                  </packing>
-                </child>
+              <object class="GtkStackPage">
+                <property name="name">proxy</property>
+                <property name="title" translatable="1">Proxy</property>
+                <property name="child">
+                  <object class="PidginProxyPrefs"/>
+                </property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
+            </child>
+            <child>
+              <object class="GtkStackPage">
+                <property name="name">away</property>
+                <property name="title" translatable="1">Status / Idle</property>
+                <property name="child">
+                  <object class="PidginAwayPrefs"/>
+                </property>
+              </object>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkStackPage">
+                <property name="name">credentials</property>
+                <property name="title" translatable="1">Credentials</property>
+                <property name="child">
+                  <object class="PidginCredentialPrefs"/>
+                </property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkStackPage">
+                <property name="name">vv</property>
+                <property name="title" translatable="1">Voice/Video</property>
+                <property name="child">
+                  <object class="PidginVVPrefs" id="vv"/>
+                </property>
+              </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton">
-        <property name="label" translatable="yes">_Close</property>
-        <property name="visible">True</property>
-        <property name="can-focus">True</property>
-        <property name="receives-default">True</property>
-        <property name="use-underline">True</property>
-        <signal name="clicked" handler="gtk_widget_destroy" object="PidginPrefsWindow" swapped="yes"/>
+        <property name="label" translatable="1">_Close</property>
+        <property name="focusable">1</property>
+        <property name="receives-default">1</property>
+        <property name="use-underline">1</property>
+        <signal name="clicked" handler="gtk_window_destroy" object="PidginPrefsWindow" swapped="yes"/>
       </object>
     </child>
   </template>