changeset
Replace GtkAlignment by margin-start in prefs
Mon, 23 May 2022 20:29:05 -0500
- author
- Elliott Sales de Andrade <quantum.analyst@gmail.com>
- date
- Mon, 23 May 2022 20:29:05 -0500
- changeset 41400
- 60d97d8acaf0
- parent 41399
- 8dbb0f9596bb
- child 41402
- 4f7076b8234a
Replace GtkAlignment by margin-start in prefs
It doesn't exist in GTK4, and everything uses a single Box/Stack child that can take a margin instead.
Testing Done:
Compiled and opened prefs.
Reviewed at https://reviews.imfreedom.org/r/1467/
--- a/pidgin/resources/Prefs/away.ui Mon May 23 20:27:22 2022 -0500 +++ b/pidgin/resources/Prefs/away.ui Mon May 23 20:29:05 2022 -0500 @@ -84,54 +84,25 @@ <property name="can-focus">False</property> <property name="title" translatable="yes">Idle</property> <child> - <object class="GtkAlignment"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="left-padding">12</property> + <property name="margin-start">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkBox"> + <object class="GtkLabel" id="label12"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label12"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">_Report idle time:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">idle_reporting.combo</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="idle_reporting.combo"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="model">idle_reporting.store</property> - <child> - <object class="GtkCellRendererText"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="label" translatable="yes">_Report idle time:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">idle_reporting.combo</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -140,37 +111,15 @@ </packing> </child> <child> - <object class="GtkBox"> + <object class="GtkComboBox" id="idle_reporting.combo"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="spacing">6</property> + <property name="model">idle_reporting.store</property> <child> - <object class="GtkLabel" id="label13"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">_Minutes before becoming idle:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">mins_before_away</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="mins_before_away"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="adjustment">mins_before_adjustment</property> - <property name="numeric">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> </object> <packing> @@ -179,37 +128,82 @@ <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="idle_hbox"> + <object class="GtkLabel" id="label13"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkCheckButton" id="away_when_idle"> - <property name="label" translatable="yes">Change to this status when _idle:</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="use-underline">True</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> + <property name="label" translatable="yes">_Minutes before becoming idle:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">mins_before_away</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="mins_before_away"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="adjustment">mins_before_adjustment</property> + <property name="numeric">True</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="idle_hbox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkCheckButton" id="away_when_idle"> + <property name="label" translatable="yes">Change to this status when _idle:</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> </child> @@ -226,53 +220,24 @@ <property name="can-focus">False</property> <property name="title" translatable="yes">Away</property> <child> - <object class="GtkAlignment"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="left-padding">12</property> + <property name="margin-start">12</property> + <property name="orientation">vertical</property> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox"> + <object class="GtkLabel" id="label14"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label14"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">_Auto-reply:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">auto_reply.combo</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="auto_reply.combo"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="model">auto_reply.store</property> - <child> - <object class="GtkCellRendererText"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="label" translatable="yes">_Auto-reply:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">auto_reply.combo</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -280,7 +245,30 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="GtkComboBox" id="auto_reply.combo"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="model">auto_reply.store</property> + <child> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> </object> </child> @@ -297,24 +285,39 @@ <property name="can-focus">False</property> <property name="title" translatable="yes">Status at Startup</property> <child> - <object class="GtkAlignment"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="left-padding">12</property> + <property name="margin-start">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox"> + <object class="GtkCheckButton" id="startup_current_status"> + <property name="label" translatable="yes">Use status from last _exit at startup</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="startup_hbox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkCheckButton" id="startup_current_status"> - <property name="label" translatable="yes">Use status from last _exit at startup</property> + <object class="GtkLabel" id="startup_label"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Status to a_pply at startup:</property> <property name="use-underline">True</property> - <property name="draw-indicator">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -323,35 +326,14 @@ </packing> </child> <child> - <object class="GtkBox" id="startup_hbox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="startup_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Status to a_pply at startup:</property> - <property name="use-underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> + <placeholder/> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child>
--- a/pidgin/resources/Prefs/conversation.ui Mon May 23 20:27:22 2022 -0500 +++ b/pidgin/resources/Prefs/conversation.ui Mon May 23 20:29:05 2022 -0500 @@ -48,24 +48,81 @@ <property name="can-focus">False</property> <property name="title" translatable="yes">Conversations</property> <child> - <object class="GtkAlignment"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="left-padding">12</property> + <property name="margin-start">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkCheckButton" id="show_incoming_formatting"> + <property name="label" translatable="yes">Show _formatting on incoming messages</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="im.send_typing"> + <property name="label" translatable="yes">_Notify buddies that you are typing to them</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="use_smooth_scrolling"> + <property name="label" translatable="yes">Use smooth-scrolling</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="win32.blink_im"> + <property name="label" translatable="yes">F_lash window when IMs are received</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkCheckButton" id="show_incoming_formatting"> - <property name="label" translatable="yes">Show _formatting on incoming messages</property> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="use-underline">True</property> - <property name="draw-indicator">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Minimum input area height in lines:</property> </object> <packing> <property name="expand">False</property> @@ -74,13 +131,12 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="im.send_typing"> - <property name="label" translatable="yes">_Notify buddies that you are typing to them</property> + <object class="GtkSpinButton" id="minimum_entry_lines"> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="use-underline">True</property> - <property name="draw-indicator">True</property> + <property name="input-purpose">digits</property> + <property name="adjustment">minimum_entry_lines.adjustment</property> + <property name="numeric">True</property> </object> <packing> <property name="expand">False</property> @@ -88,74 +144,12 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkCheckButton" id="use_smooth_scrolling"> - <property name="label" translatable="yes">Use smooth-scrolling</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="win32.blink_im"> - <property name="label" translatable="yes">F_lash window when IMs are received</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="use-underline">True</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Minimum input area height in lines:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="minimum_entry_lines"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="input-purpose">digits</property> - <property name="adjustment">minimum_entry_lines.adjustment</property> - <property name="numeric">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> </child> </object> </child> @@ -172,67 +166,61 @@ <property name="can-focus">False</property> <property name="title" translatable="yes">Default Formatting</property> <child> - <object class="GtkAlignment"> + <object class="GtkBox" id="sample_box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="left-padding">12</property> + <property name="margin-start">12</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="sample_box"> + <object class="TalkatuEditor"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="orientation">vertical</property> - <child> - <object class="TalkatuEditor"> + <child internal-child="send_button"> + <object class="GtkButton"> + <property name="can-focus">False</property> + <property name="receives-default">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child internal-child="toolbar"> + <object class="TalkatuToolbar"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="orientation">vertical</property> - <child internal-child="send_button"> - <object class="GtkButton"> - <property name="can-focus">False</property> - <property name="receives-default">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child internal-child="toolbar"> - <object class="TalkatuToolbar"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child internal-child="input"> - <object class="TalkatuInput" id="format_view"> - <property name="width-request">450</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="wrap-mode">word</property> - <property name="buffer">format_buffer</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child internal-child="input"> + <object class="TalkatuInput" id="format_view"> + <property name="width-request">450</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="wrap-mode">word</property> + <property name="buffer">format_buffer</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> </object> </child>
--- a/pidgin/resources/Prefs/network.ui Mon May 23 20:27:22 2022 -0500 +++ b/pidgin/resources/Prefs/network.ui Mon May 23 20:29:05 2022 -0500 @@ -53,49 +53,24 @@ <property name="can-focus">False</property> <property name="title" translatable="yes">IP Address</property> <child> - <object class="GtkAlignment"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="left-padding">12</property> + <property name="margin-start">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkBox"> + <object class="GtkLabel" id="label8"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label8"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">ST_UN server:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">stun_server</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="stun_server"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="placeholder-text" translatable="yes">Example: stunserver.org</property> - <property name="input-purpose">url</property> - <signal name="focus-out-event" handler="network_stun_server_changed_cb" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="label" translatable="yes">ST_UN server:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">stun_server</property> </object> <packing> <property name="expand">False</property> @@ -104,14 +79,67 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="auto_ip"> - <property name="label" translatable="yes">Use _automatically detected IP address</property> + <object class="GtkEntry" id="stun_server"> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="receives-default">False</property> + <property name="placeholder-text" translatable="yes">Example: stunserver.org</property> + <property name="input-purpose">url</property> + <signal name="focus-out-event" handler="network_stun_server_changed_cb" swapped="no"/> + </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">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="auto_ip"> + <property name="label" translatable="yes">Use _automatically detected IP address</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + <signal name="toggled" handler="auto_ip_button_clicked_cb" after="yes" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="public_ip_hbox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label9"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Public _IP:</property> <property name="use-underline">True</property> - <property name="draw-indicator">True</property> - <signal name="toggled" handler="auto_ip_button_clicked_cb" after="yes" swapped="no"/> + <property name="mnemonic-widget">public_ip</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="public_ip"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <signal name="changed" handler="network_ip_changed" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -119,46 +147,12 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkBox" id="public_ip_hbox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label9"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Public _IP:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">public_ip</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="public_ip"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <signal name="changed" handler="network_ip_changed" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> </child> @@ -175,19 +169,35 @@ <property name="can-focus">False</property> <property name="title" translatable="yes">Ports</property> <child> - <object class="GtkAlignment"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="left-padding">12</property> + <property name="margin-start">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkCheckButton" id="map_ports"> + <property name="label" translatable="yes">_Enable automatic router port forwarding</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkCheckButton" id="map_ports"> - <property name="label" translatable="yes">_Enable automatic router port forwarding</property> + <object class="GtkCheckButton" id="ports_range_use"> + <property name="label" translatable="yes">_Manually specify range of ports to listen on:</property> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> @@ -201,18 +211,16 @@ </packing> </child> <child> - <object class="GtkBox"> + <object class="GtkBox" id="ports_range_hbox"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkCheckButton" id="ports_range_use"> - <property name="label" translatable="yes">_Manually specify range of ports to listen on:</property> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">_Start:</property> <property name="use-underline">True</property> - <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -221,65 +229,12 @@ </packing> </child> <child> - <object class="GtkBox" id="ports_range_hbox"> + <object class="GtkSpinButton" id="ports_range_start"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">_Start:</property> - <property name="use-underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="ports_range_start"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="text" translatable="yes">0</property> - <property name="adjustment">ports_range_start.adjustment</property> - <property name="numeric">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">_End:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">ports_range_end</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="ports_range_end"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="text" translatable="yes">0</property> - <property name="adjustment">ports_range_end.adjustment</property> - <property name="numeric">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> + <property name="can-focus">True</property> + <property name="text" translatable="yes">0</property> + <property name="adjustment">ports_range_start.adjustment</property> + <property name="numeric">True</property> </object> <packing> <property name="expand">False</property> @@ -287,6 +242,34 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">_End:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">ports_range_end</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="ports_range_end"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="text" translatable="yes">0</property> + <property name="adjustment">ports_range_end.adjustment</property> + <property name="numeric">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -295,6 +278,11 @@ </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> @@ -311,102 +299,25 @@ <property name="can-focus">False</property> <property name="title" translatable="yes">Relay Server (TURN)</property> <child> - <object class="GtkAlignment"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="left-padding">12</property> + <property name="margin-start">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkBox"> + <object class="GtkLabel" id="label10"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label10"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">_TURN server:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">turn_server</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="turn_server"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <signal name="focus-out-event" handler="network_turn_server_changed_cb" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">_UDP Port:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">turn_port_udp</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="turn_port_udp"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="adjustment">turn_port_udp.adjustment</property> - <property name="numeric">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">T_CP Port:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">turn_port_tcp</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="turn_port_tcp"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="adjustment">turn_port_tcp.adjustment</property> - <property name="numeric">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> + <property name="label" translatable="yes">_TURN server:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">turn_server</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -415,64 +326,10 @@ </packing> </child> <child> - <object class="GtkBox"> + <object class="GtkEntry" id="turn_server"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label11"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Use_rname:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">turn_username</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="turn_username"> - <property name="visible">True</property> - <property name="can-focus">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Pass_word:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">turn_password</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="turn_password"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="visibility">False</property> - <property name="invisible-char">●</property> - <property name="input-purpose">password</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> + <property name="can-focus">True</property> + <signal name="focus-out-event" handler="network_turn_server_changed_cb" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -480,7 +337,132 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">_UDP Port:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">turn_port_udp</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="turn_port_udp"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="adjustment">turn_port_udp.adjustment</property> + <property name="numeric">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">T_CP Port:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">turn_port_tcp</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="turn_port_tcp"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="adjustment">turn_port_tcp.adjustment</property> + <property name="numeric">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label11"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Use_rname:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">turn_username</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="turn_username"> + <property name="visible">True</property> + <property name="can-focus">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Pass_word:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">turn_password</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="turn_password"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="visibility">False</property> + <property name="invisible-char">●</property> + <property name="input-purpose">password</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child>
--- a/pidgin/resources/Prefs/proxy.ui Mon May 23 20:27:22 2022 -0500 +++ b/pidgin/resources/Prefs/proxy.ui Mon May 23 20:29:05 2022 -0500 @@ -72,28 +72,44 @@ <property name="can-focus">False</property> <property name="title" translatable="yes">Proxy Server</property> <child> - <object class="GtkAlignment"> + <object class="GtkStack" id="stack"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="left-padding">12</property> + <property name="margin-start">12</property> + <property name="hhomogeneous">False</property> + <property name="vhomogeneous">False</property> <child> - <object class="GtkStack" id="stack"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="hhomogeneous">False</property> - <property name="vhomogeneous">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Proxy preferences are configured in GNOME preferences</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel"> + <object class="GtkLabel" id="gnome_not_found"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes">Proxy preferences are configured in GNOME preferences</property> - <property name="xalign">0</property> + <property name="label" translatable="yes">Proxy configuration program was not found.</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="expand">False</property> @@ -102,39 +118,82 @@ </packing> </child> <child> - <object class="GtkBox"> + <object class="GtkButton" id="gnome_program"> + <property name="label" translatable="yes">Configure _Proxy</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="proxy_button_clicked_cb" object="PidginProxyPrefs" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="name">gnome</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkCheckButton" id="socks4_remotedns"> + <property name="label" translatable="yes">Use remote _DNS with SOCKS4 proxies</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="spacing">6</property> + <property name="label" translatable="yes">Proxy t_ype:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">type.combo</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="type.combo"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="model">type.store</property> <child> - <object class="GtkLabel" id="gnome_not_found"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Proxy configuration program was not found.</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="gnome_program"> - <property name="label" translatable="yes">Configure _Proxy</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="proxy_button_clicked_cb" object="PidginProxyPrefs" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> </object> <packing> @@ -145,221 +204,156 @@ </child> </object> <packing> - <property name="name">gnome</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkBox"> + <!-- n-columns=4 n-rows=3 --> + <object class="GtkGrid" id="options"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="row-spacing">10</property> + <property name="column-spacing">5</property> <child> - <object class="GtkCheckButton" id="socks4_remotedns"> - <property name="label" translatable="yes">Use remote _DNS with SOCKS4 proxies</property> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">_Host:</property> <property name="use-underline">True</property> - <property name="draw-indicator">True</property> + <property name="mnemonic-widget">host</property> + <property name="xalign">1</property> + <accessibility> + <relation type="label-for" target="host"/> + </accessibility> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkBox"> + <object class="GtkEntry" id="host"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <signal name="changed" handler="proxy_print_option" object="PidginProxyPrefs" swapped="no"/> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Proxy t_ype:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">type.combo</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="type.combo"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="model">type.store</property> - <child> - <object class="GtkCellRendererText"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="label" translatable="yes">P_ort:</property> + <property name="use-underline">True</property> + <property name="xalign">1</property> + <accessibility> + <relation type="label-for" target="port"/> + </accessibility> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left-attach">2</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="port"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="text" translatable="yes">0</property> + <property name="adjustment">port.adjustment</property> + <property name="numeric">True</property> + <signal name="changed" handler="proxy_print_option" object="PidginProxyPrefs" swapped="no"/> + </object> + <packing> + <property name="left-attach">3</property> + <property name="top-attach">0</property> </packing> </child> <child> - <!-- n-columns=4 n-rows=3 --> - <object class="GtkGrid" id="options"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">User_name:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">username</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="username"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <signal name="changed" handler="proxy_print_option" object="PidginProxyPrefs" swapped="no"/> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="row-spacing">10</property> - <property name="column-spacing">5</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">_Host:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">host</property> - <property name="xalign">1</property> - <accessibility> - <relation type="label-for" target="host"/> - </accessibility> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="host"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <signal name="changed" handler="proxy_print_option" object="PidginProxyPrefs" swapped="no"/> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">P_ort:</property> - <property name="use-underline">True</property> - <property name="xalign">1</property> - <accessibility> - <relation type="label-for" target="port"/> - </accessibility> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="port"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="text" translatable="yes">0</property> - <property name="adjustment">port.adjustment</property> - <property name="numeric">True</property> - <signal name="changed" handler="proxy_print_option" object="PidginProxyPrefs" swapped="no"/> - </object> - <packing> - <property name="left-attach">3</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">User_name:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">username</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="username"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <signal name="changed" handler="proxy_print_option" object="PidginProxyPrefs" swapped="no"/> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Pa_ssword:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">password</property> - <property name="xalign">1</property> - <accessibility> - <relation type="label-for" target="password"/> - </accessibility> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="password"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="visibility">False</property> - <property name="invisible-char">●</property> - <property name="input-purpose">password</property> - <signal name="changed" handler="proxy_print_option" object="PidginProxyPrefs" swapped="no"/> - </object> - <packing> - <property name="left-attach">3</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> + <property name="label" translatable="yes">Pa_ssword:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">password</property> + <property name="xalign">1</property> + <accessibility> + <relation type="label-for" target="password"/> + </accessibility> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="left-attach">2</property> + <property name="top-attach">1</property> </packing> </child> + <child> + <object class="GtkEntry" id="password"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="visibility">False</property> + <property name="invisible-char">●</property> + <property name="input-purpose">password</property> + <signal name="changed" handler="proxy_print_option" object="PidginProxyPrefs" swapped="no"/> + </object> + <packing> + <property name="left-attach">3</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> - <property name="name">nongnome</property> - <property name="position">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> + <packing> + <property name="name">nongnome</property> + <property name="position">1</property> + </packing> </child> </object> </child>
--- a/pidgin/resources/Prefs/vv.ui Mon May 23 20:27:22 2022 -0500 +++ b/pidgin/resources/Prefs/vv.ui Mon May 23 20:29:05 2022 -0500 @@ -76,78 +76,148 @@ <property name="can-focus">False</property> <property name="title" translatable="yes">Audio</property> <child> - <object class="GtkAlignment"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="left-padding">12</property> + <property name="margin-start">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkFrame"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="Device for Audio Input">Device</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="voice.input.combo"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="id-column">1</property> + <property name="model">voice.input.store</property> + <child> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="Input for Audio">Input</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="Device for Audio Output">Device</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="voice.output.combo"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="id-column">1</property> + <property name="model">voice.output.store</property> + <child> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="Output for Audio">Output</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkFrame"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label-xalign">0</property> - <property name="shadow-type">none</property> - <child> - <object class="GtkAlignment"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="left-padding">12</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="Device for Audio Input">Device</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="voice.input.combo"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="id-column">1</property> - <property name="model">voice.input.store</property> - <child> - <object class="GtkCellRendererText"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="Input for Audio">Input</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> + <property name="label" translatable="yes">Volume:</property> </object> <packing> <property name="expand">False</property> @@ -156,65 +226,31 @@ </packing> </child> <child> - <object class="GtkFrame"> + <object class="GtkVolumeButton" id="voice.volume"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label-xalign">0</property> - <property name="shadow-type">none</property> - <child> - <object class="GtkAlignment"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="left-padding">12</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="Device for Audio Output">Device</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="voice.output.combo"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="id-column">1</property> - <property name="model">voice.output.store</property> - <child> - <object class="GtkCellRendererText"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="relief">none</property> + <property name="orientation">vertical</property> + <property name="adjustment">adjustment2</property> + <signal name="value-changed" handler="volume_changed_cb" swapped="no"/> + <child internal-child="plus_button"> + <object class="GtkButton"> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="relief">none</property> </object> </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="Output for Audio">Output</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <child internal-child="minus_button"> + <object class="GtkButton"> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="relief">none</property> </object> </child> </object> @@ -224,121 +260,67 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Volume:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVolumeButton" id="voice.volume"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="focus-on-click">False</property> - <property name="receives-default">True</property> - <property name="relief">none</property> - <property name="orientation">vertical</property> - <property name="adjustment">adjustment2</property> - <signal name="value-changed" handler="volume_changed_cb" swapped="no"/> - <child internal-child="plus_button"> - <object class="GtkButton"> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="relief">none</property> - </object> - </child> - <child internal-child="minus_button"> - <object class="GtkButton"> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="relief">none</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="voice.threshold_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Silence threshold:</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkScale" id="voice.threshold"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="adjustment">adjustment1</property> - <property name="round-digits">0</property> - <property name="digits">0</property> - <property name="draw-value">False</property> - <signal name="value-changed" handler="threshold_value_changed_cb" object="PidginVVPrefs" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkToggleButton" id="voice.test"> - <property name="label" translatable="yes">Test Audio</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="toggled" handler="toggle_voice_test_cb" object="PidginVVPrefs" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="GtkProgressBar" id="voice.level"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">6</property> - </packing> - </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="voice.threshold_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Silence threshold:</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkScale" id="voice.threshold"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="adjustment">adjustment1</property> + <property name="round-digits">0</property> + <property name="digits">0</property> + <property name="draw-value">False</property> + <signal name="value-changed" handler="threshold_value_changed_cb" object="PidginVVPrefs" swapped="no"/> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkToggleButton" id="voice.test"> + <property name="label" translatable="yes">Test Audio</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <signal name="toggled" handler="toggle_voice_test_cb" object="PidginVVPrefs" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkProgressBar" id="voice.level"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> </child> </object> </child> @@ -355,186 +337,168 @@ <property name="can-focus">False</property> <property name="title" translatable="yes">Video</property> <child> - <object class="GtkAlignment"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="left-padding">12</property> + <property name="margin-start">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox"> + <object class="GtkFrame"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <object class="GtkFrame"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label-xalign">0</property> - <property name="shadow-type">none</property> + <property name="margin-start">12</property> + <property name="spacing">6</property> <child> - <object class="GtkAlignment"> + <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="left-padding">12</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="Device for Video Input">Device</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="video.input.combo"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="id-column">1</property> - <property name="model">video.input.store</property> - <child> - <object class="GtkCellRendererText"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> + <property name="label" translatable="yes" context="Device for Video Input">Device</property> + <property name="xalign">0</property> </object> - </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="Input for Video">Input</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkFrame"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label-xalign">0</property> - <property name="shadow-type">none</property> <child> - <object class="GtkAlignment"> + <object class="GtkComboBox" id="video.input.combo"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="left-padding">12</property> + <property name="id-column">1</property> + <property name="model">video.input.store</property> <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="Device for Video Output">Device</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="video.output.combo"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="id-column">1</property> - <property name="model">video.output.store</property> - <child> - <object class="GtkCellRendererText"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> - <child type="label"> - <object class="GtkLabel"> + </object> + </child> + <child type="label"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="Input for Video">Input</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="Device for Video Output">Device</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="video.output.combo"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="Output for Video">Output</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <property name="id-column">1</property> + <property name="model">video.output.store</property> + <child> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> - <child> - <object class="GtkAspectFrame" id="video.frame"> + <child type="label"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label-xalign">0</property> - <property name="shadow-type">none</property> - <property name="ratio">1.33</property> - <child> - <placeholder/> - </child> + <property name="label" translatable="yes" context="Output for Video">Output</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkToggleButton" id="video.test"> - <property name="label" translatable="yes">Test Video</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="toggled" handler="toggle_video_test_cb" object="PidginVVPrefs" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkAspectFrame" id="video.frame"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> + <property name="ratio">1.33</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkToggleButton" id="video.test"> + <property name="label" translatable="yes">Test Video</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <signal name="toggled" handler="toggle_video_test_cb" object="PidginVVPrefs" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> </child> </object> </child>
