--- a/pidgin/resources/Accounts/editor.ui Tue Aug 23 02:25:05 2022 -0500
+++ b/pidgin/resources/Accounts/editor.ui Tue Aug 23 02:54:58 2022 -0500
@@ -19,100 +19,60 @@
-->
<interface>
- <requires lib="gtk+" version="3.24"/>
+ <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="PidginAccountEditor" parent="GtkDialog">
- <property name="can-focus">False</property>
- <property name="type-hint">dialog</property>
<signal name="response" handler="pidgin_account_editor_response_cb" 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>
- <child internal-child="action_area">
- <object class="GtkButtonBox">
- <property name="can-focus">False</property>
- <property name="layout-style">end</property>
+ <child>
+ <object class="GtkNotebook" id="notebook">
+ <property name="focusable">1</property>
<child>
- <object class="GtkButton" id="button1">
- <property name="label" translatable="yes">_Cancel</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
- <property name="use-underline">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <object class="GtkNotebookPage">
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button2">
- <property name="label" translatable="yes">_Save</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
- <property name="use-underline">True</property>
+ <property name="child">
+ <object class="PidginProxyOptions" id="proxy_options">
+ <property name="margin-start">12</property>
+ <property name="margin-end">12</property>
+ <property name="margin-top">12</property>
+ <property name="margin-bottom">12</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ </object>
+ </property>
+ <property name="tab">
+ <object class="GtkLabel">
+ <property name="label" translatable="1">_Proxy</property>
+ <property name="use-underline">1</property>
+ </object>
+ </property>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
- <child>
- <object class="GtkNotebook" id="notebook">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <child>
- <object class="PidginProxyOptions" id="proxy_options">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="margin-left">12</property>
- <property name="margin-right">12</property>
- <property name="margin-start">12</property>
- <property name="margin-end">12</property>
- <property name="margin-top">12</property>
- <property name="margin-bottom">12</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes">_Proxy</property>
- <property name="use-underline">True</property>
- </object>
- <packing>
- <property name="position">0</property>
- <property name="tab-fill">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ </object>
+ </child>
+ <child type="action">
+ <object class="GtkButton" id="button1">
+ <property name="label" translatable="1">_Cancel</property>
+ <property name="focusable">1</property>
+ <property name="receives-default">1</property>
+ <property name="use-underline">1</property>
+ </object>
+ </child>
+ <child type="action">
+ <object class="GtkButton" id="button2">
+ <property name="label" translatable="1">_Save</property>
+ <property name="focusable">1</property>
+ <property name="receives-default">1</property>
+ <property name="use-underline">1</property>
</object>
</child>
<action-widgets>