[fractal] server_chooser: Remove GtkAlignment
- From: Daniel Garcia Moreno <danigm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [fractal] server_chooser: Remove GtkAlignment
- Date: Fri, 6 Nov 2020 08:31:42 +0000 (UTC)
commit 18176d8617432bd3f6ab452e076c586c34078c7a
Author: Christopher Davis <brainblasted disroot org>
Date: Sat Oct 31 14:00:53 2020 -0700
server_chooser: Remove GtkAlignment
GtkAlignment isn't needed (and is gone in GTK4),
as all of it's functions have been moved to
individual widgets.
fractal-gtk/res/ui/server_chooser_menu.ui | 318 +++++++++++++-----------------
1 file changed, 138 insertions(+), 180 deletions(-)
---
diff --git a/fractal-gtk/res/ui/server_chooser_menu.ui b/fractal-gtk/res/ui/server_chooser_menu.ui
index 9aefa966..39f4a74f 100644
--- a/fractal-gtk/res/ui/server_chooser_menu.ui
+++ b/fractal-gtk/res/ui/server_chooser_menu.ui
@@ -14,25 +14,53 @@
<object class="GtkPopover" id="server_chooser_popover">
<property name="can_focus">False</property>
<child>
- <object class="GtkAlignment">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">18</property>
- <property name="bottom_padding">18</property>
- <property name="left_padding">18</property>
- <property name="right_padding">18</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <property name="margin_top">18</property>
+ <property name="margin_bottom">18</property>
+ <property name="margin_start">18</property>
+ <property name="margin_end">18</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Show rooms from:</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">12</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel">
+ <object class="GtkRadioButton" id="default_matrix_server_radio">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Show rooms from:</property>
- <property name="xalign">0</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Default Matrix Server</property>
+ <property name="xalign">0</property>
+ <property name="margin_start">6</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -41,66 +69,15 @@
</packing>
</child>
<child>
- <object class="GtkBox">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkRadioButton" id="default_matrix_server_radio">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <child>
- <object class="GtkAlignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">6</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Default Matrix Server</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">30</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Your homeserver</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="foreground" value="#88888a8a8585"/>
- </attributes>
- </object>
- </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">Your homeserver</property>
+ <property name="xalign">0</property>
+ <property name="margin_start">30</property>
+ <attributes>
+ <attribute name="foreground" value="#88888a8a8585"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -108,148 +85,129 @@
<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">
+ <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="GtkRadioButton" id="other_protocol_radio">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">default_matrix_server_radio</property>
<child>
- <object class="GtkRadioButton" id="other_protocol_radio">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">default_matrix_server_radio</property>
- <child>
- <object class="GtkAlignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">6</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Other Protocol</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">30</property>
- <child>
- <object class="GtkComboBox" id="protocol_combo">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">False</property>
- <property name="model">protocol_model</property>
- <property name="active_id">desc</property>
- <child>
- <object class="GtkCellRendererText" id="desc"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
+ <property name="label" translatable="yes">Other Protocol</property>
+ <property name="xalign">0</property>
+ <property name="margin_start">6</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</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>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox">
+ <object class="GtkComboBox" id="protocol_combo">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="model">protocol_model</property>
+ <property name="active_id">desc</property>
+ <property name="margin_start">30</property>
<child>
- <object class="GtkRadioButton" id="other_homeserver_radio">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">default_matrix_server_radio</property>
- <child>
- <object class="GtkAlignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">6</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Other Homeserver</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
+ <object class="GtkCellRendererText" id="desc"/>
+ <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">2</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="GtkRadioButton" id="other_homeserver_radio">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">default_matrix_server_radio</property>
<child>
- <object class="GtkAlignment">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">30</property>
- <child>
- <object class="GtkEntry" id="other_homeserver_url_entry">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="buffer">other_homeserver_url</property>
- <property name="width_chars">24</property>
- <property name="placeholder_text" translatable="yes">Homeserver URL</property>
- </object>
- </child>
+ <property name="label" translatable="yes">Other Homeserver</property>
+ <property name="xalign">0</property>
+ <property name="margin_start">6</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</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">3</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="other_homeserver_url_entry">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="buffer">other_homeserver_url</property>
+ <property name="width_chars">24</property>
+ <property name="placeholder_text" translatable="yes">Homeserver URL</property>
+ <property name="margin_start">30</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">3</property>
+ </packing>
</child>
</object>
</child>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]