commit 5f5903ad46c716ce737d1ff00d08308e46c085ce
Author: Christopher Davis <brainblasted disroot org>
Date: Tue Jan 29 18:19:24 2019 -0500
room_settings: Wrap settings in HdyColumn
Allows for the room settings to fit within small sizes.
Related to https://gitlab.gnome.org/GNOME/fractal/issues/377
fractal-gtk/res/ui/room_settings.ui | 1339 ++++++++++++++++++-----------------
1 file changed, 672 insertions(+), 667 deletions(-)
---
diff --git a/fractal-gtk/res/ui/room_settings.ui b/fractal-gtk/res/ui/room_settings.ui
index abaa7982..6dc58b6f 100644
--- a/fractal-gtk/res/ui/room_settings.ui
+++ b/fractal-gtk/res/ui/room_settings.ui
@@ -21,279 +21,210 @@
<property name="can_focus">False</property>
<property name="margin">18</property>
<child>
- <object class="GtkBox">
+ <object class="HdyColumn">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="expand">true</property>
- <property name="orientation">vertical</property>
- <property name="width-request">400</property>
+ <property name="maximum-width">600</property>
+ <property name="linear-growth-width">600</property>
<child>
- <object class="GtkBox" id="room_settings_avatar_box">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="receives_default">False</property>
- <property name="halign">center</property>
- <property name="margin_bottom">18</property>
+ <property name="expand">true</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkButton" id="room_settings_avatar_button">
+ <object class="GtkBox" id="room_settings_avatar_box">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="receives_default">False</property>
<property name="halign">center</property>
<property name="margin_bottom">18</property>
<child>
- <object class="GtkOverlay" id="room_settings_avatar_overlay">
+ <object class="GtkButton" id="room_settings_avatar_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">center</property>
+ <property name="margin_bottom">18</property>
<child>
- <object class="GtkBox" id="room_settings_avatar">
+ <object class="GtkOverlay" id="room_settings_avatar_overlay">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <child>
+ <object class="GtkBox" id="room_settings_avatar">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="index">-1</property>
+ </packing>
+ </child>
+ <child type="overlay">
+ <object class="GtkSpinner" id="room_settings_avatar_spinner">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="active">True</property>
+ <style>
+ <class name="spinner-background"/>
+ </style>
+ </object>
+ <packing>
+ <property name="pass_through">True</property>
+ <property name="index">1</property>
+ </packing>
+ </child>
</object>
- <packing>
- <property name="index">-1</property>
- </packing>
- </child>
- <child type="overlay">
- <object class="GtkSpinner" id="room_settings_avatar_spinner">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="active">True</property>
- <style>
- <class name="spinner-background"/>
- </style>
- </object>
- <packing>
- <property name="pass_through">True</property>
- <property name="index">1</property>
- </packing>
</child>
</object>
</child>
</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="GtkLabel" id="room_settings_room_name">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">center</property>
- <property name="margin_bottom">6</property>
- <property name="label" translatable="yes">Unknown</property>
- <property name="selectable">True</property>
- <style>
- <class name="room-settings-name"/>
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="room_settings_room_name_box">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="margin_bottom">6</property>
- <style>
- <class name="linked"/>
- </style>
<child>
- <object class="GtkEntry" id="room_settings_room_name_entry">
+ <object class="GtkLabel" id="room_settings_room_name">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="placeholder-text" translatable="yes">Add name</property>
+ <property name="halign">center</property>
+ <property name="margin_bottom">6</property>
+ <property name="label" translatable="yes">Unknown</property>
+ <property name="selectable">True</property>
+ <style>
+ <class name="room-settings-name"/>
+ </style>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
<child>
- <object class="GtkButton" id="room_settings_room_name_button">
- <property name="visible">False</property>
- <property name="can_focus">True</property>
+ <object class="GtkBox" id="room_settings_room_name_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="margin_bottom">6</property>
+ <style>
+ <class name="linked"/>
+ </style>
<child>
- <object class="GtkImage">
+ <object class="GtkEntry" id="room_settings_room_name_entry">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">emblem-ok-symbolic</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="placeholder-text" translatable="yes">Add name</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton" id="room_settings_room_name_button">
+ <property name="visible">False</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">emblem-ok-symbolic</property>
+ </object>
+ </child>
</object>
</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>
- <child>
- <object class="GtkLabel" id="room_settings_room_topic">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="selectable">True</property>
- <property name="wrap">True</property>
- <property name="max-width-chars">50</property>
- <property name="halign">center</property>
- <property name="justify">center</property>
- <property name="label" translatable="yes">Add topic</property>
- <property name="margin_bottom">6</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="room_settings_room_topic_box">
- <property name="visible">True</property>
- <property name="can_focus">false</property>
- <property name="hexpand">True</property>
- <property name="margin_top">12</property>
- <property name="margin_bottom">12</property>
- <style>
- <class name="linked"/>
- </style>
<child>
- <object class="GtkEntry" id="room_settings_room_topic_entry">
+ <object class="GtkLabel" id="room_settings_room_topic">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="placeholder-text" translatable="yes">Type in your room
topic</property>
+ <property name="selectable">True</property>
+ <property name="wrap">True</property>
+ <property name="max-width-chars">50</property>
+ <property name="halign">center</property>
+ <property name="justify">center</property>
+ <property name="label" translatable="yes">Add topic</property>
+ <property name="margin_bottom">6</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
</child>
<child>
- <object class="GtkButton" id="room_settings_room_topic_button">
- <property name="visible">False</property>
- <property name="can_focus">True</property>
+ <object class="GtkBox" id="room_settings_room_topic_box">
+ <property name="visible">True</property>
+ <property name="can_focus">false</property>
+ <property name="hexpand">True</property>
+ <property name="margin_top">12</property>
+ <property name="margin_bottom">12</property>
+ <style>
+ <class name="linked"/>
+ </style>
<child>
- <object class="GtkImage">
+ <object class="GtkEntry" id="room_settings_room_topic_entry">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">emblem-ok-symbolic</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="placeholder-text" translatable="yes">Type in your room
topic</property>
</object>
</child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="room_settings_room_description">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="label" translatable="yes">No room description</property>
- <property name="margin_bottom">24</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="room_settings_notification_switch">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_bottom">24</property>
- <child>
- <object class="GtkListBox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <object class="GtkListBoxRow">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="activatable">False</property>
- <property name="selectable">False</property>
+ <object class="GtkButton" id="room_settings_room_topic_button">
+ <property name="visible">False</property>
+ <property name="can_focus">True</property>
<child>
- <object class="GtkBox">
+ <object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">horizontal</property>
- <property name="margin">20</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Notifications</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSwitch">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- <property name="pack_type">end</property>
- </packing>
- </child>
+ <property name="icon_name">emblem-ok-symbolic</property>
</object>
</child>
</object>
</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">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="room_settings_notification_sounds">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">none</property>
- <property name="margin_bottom">24</property>
- <child type="label">
- <object class="GtkLabel">
- <property name="label" translatable="yes">Notification sounds</property>
- <property name="margin-bottom">12</property>
+ <child>
+ <object class="GtkLabel" id="room_settings_room_description">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="label" translatable="yes">No room description</property>
+ <property name="margin_bottom">24</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
</child>
<child>
- <object class="GtkFrame">
+ <object class="GtkFrame" id="room_settings_notification_switch">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
+ <property name="can_focus">False</property>
+ <property name="margin_bottom">24</property>
<child>
<object class="GtkListBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <style>
- <class name="list-with-separator"/>
- </style>
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
+ <property name="activatable">False</property>
<property name="selectable">False</property>
<child>
<object class="GtkBox">
@@ -301,72 +232,146 @@
<property name="can_focus">False</property>
<property name="orientation">horizontal</property>
<property name="margin">20</property>
- <property name="spacing">12</property>
<child>
- <object class="GtkImage">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_name">emblem-ok-symbolic</property>
+ <property name="label"
translatable="yes">Notifications</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
- <property name="pack_type">end</property>
</packing>
</child>
<child>
- <object class="GtkLabel">
+ <object class="GtkSwitch">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">For all
messages</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
+ <property name="pack_type">end</property>
</packing>
</child>
</object>
</child>
</object>
</child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="room_settings_notification_sounds">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">none</property>
+ <property name="margin_bottom">24</property>
+ <child type="label">
+ <object class="GtkLabel">
+ <property name="label" translatable="yes">Notification sounds</property>
+ <property name="margin-bottom">12</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkFrame">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkListBoxRow">
+ <object class="GtkListBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="selectable">false</property>
+ <property name="can_focus">False</property>
+ <style>
+ <class name="list-with-separator"/>
+ </style>
<child>
- <object class="GtkBox">
+ <object class="GtkListBoxRow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">horizontal</property>
- <property name="margin">20</property>
- <property name="spacing">12</property>
+ <property name="can_focus">True</property>
+ <property name="selectable">False</property>
<child>
- <object class="GtkImage">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_name">emblem-ok-symbolic</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin">20</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">emblem-ok-symbolic</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ <property name="pack_type">end</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">For all
messages</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">0</property>
- <property name="pack_type">end</property>
- </packing>
</child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkListBoxRow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="selectable">false</property>
<child>
- <object class="GtkLabel">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Only for
mentions</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin">20</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">emblem-ok-symbolic</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ <property name="pack_type">end</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Only for
mentions</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">1</property>
- </packing>
</child>
</object>
</child>
@@ -375,156 +380,156 @@
</object>
</child>
</object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="room_settings_media">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">none</property>
- <property name="margin_bottom">24</property>
- <child type="label">
- <object class="GtkLabel">
- <property name="label" translatable="yes">Shared Media</property>
- <property name="margin-bottom">12</property>
- <attributes>
- <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
- </attributes>
- </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">7</property>
+ </packing>
</child>
<child>
- <object class="GtkFrame">
+ <object class="GtkFrame" id="room_settings_media">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="shadow_type">in</property>
+ <property name="shadow_type">none</property>
+ <property name="margin_bottom">24</property>
+ <child type="label">
+ <object class="GtkLabel">
+ <property name="label" translatable="yes">Shared Media</property>
+ <property name="margin-bottom">12</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
+ </object>
+ </child>
<child>
- <object class="GtkListBox">
+ <object class="GtkFrame">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <style>
- <class name="list-with-separator"/>
- </style>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkListBoxRow">
+ <object class="GtkListBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="selectable">False</property>
+ <property name="can_focus">False</property>
+ <style>
+ <class name="list-with-separator"/>
+ </style>
<child>
- <object class="GtkBox">
+ <object class="GtkListBoxRow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">horizontal</property>
- <property name="margin">20</property>
- <property name="spacing">12</property>
+ <property name="can_focus">True</property>
+ <property name="selectable">False</property>
<child>
- <object class="GtkImage">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_name">emblem-photos-symbolic</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin">20</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">emblem-photos-symbolic</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">photos</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">0</property>
- </packing>
</child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkListBoxRow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="selectable">False</property>
<child>
- <object class="GtkLabel">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">photos</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin">20</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">folder-videos-symbolic</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">videos</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">1</property>
- </packing>
</child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="GtkListBoxRow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="selectable">False</property>
<child>
- <object class="GtkBox">
+ <object class="GtkListBoxRow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">horizontal</property>
- <property name="margin">20</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkImage">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">folder-videos-symbolic</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">videos</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkListBoxRow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="selectable">false</property>
- <child>
- <object class="GtkBox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">horizontal</property>
- <property name="margin">20</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkImage">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">folder-documents-symbolic</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="selectable">false</property>
<child>
- <object class="GtkLabel">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">documents</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin">20</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="icon_name">folder-documents-symbolic</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">documents</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">1</property>
- </packing>
</child>
</object>
</child>
@@ -533,115 +538,115 @@
</object>
</child>
</object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">8</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="room_settings_history_visibility">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">none</property>
- <property name="margin_bottom">24</property>
- <child type="label">
- <object class="GtkLabel">
- <property name="label" translatable="yes">New members can see</property>
- <property name="margin-bottom">12</property>
- </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">8</property>
+ </packing>
</child>
<child>
- <object class="GtkFrame">
+ <object class="GtkFrame" id="room_settings_history_visibility">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="shadow_type">in</property>
+ <property name="shadow_type">none</property>
+ <property name="margin_bottom">24</property>
+ <child type="label">
+ <object class="GtkLabel">
+ <property name="label" translatable="yes">New members can see</property>
+ <property name="margin-bottom">12</property>
+ </object>
+ </child>
<child>
- <object class="GtkListBox">
+ <object class="GtkFrame">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <style>
- <class name="list-with-separator"/>
- </style>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkListBoxRow">
+ <object class="GtkListBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="selectable">false</property>
+ <property name="can_focus">False</property>
+ <style>
+ <class name="list-with-separator"/>
+ </style>
<child>
- <object class="GtkBox">
+ <object class="GtkListBoxRow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">horizontal</property>
- <property name="margin">20</property>
- <property name="spacing">12</property>
+ <property name="can_focus">True</property>
+ <property name="selectable">false</property>
<child>
- <object class="GtkImage">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_name">emblem-ok-symbolic</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin">20</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">emblem-ok-symbolic</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ <property name="pack_type">end</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">All room
history</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">0</property>
- <property name="pack_type">end</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">All room
history</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="GtkListBoxRow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="selectable">false</property>
<child>
- <object class="GtkBox">
+ <object class="GtkListBoxRow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">horizontal</property>
- <property name="margin">20</property>
- <property name="spacing">12</property>
+ <property name="can_focus">True</property>
+ <property name="selectable">false</property>
<child>
- <object class="GtkImage">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_name">emblem-ok-symbolic</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin">20</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">emblem-ok-symbolic</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ <property name="pack_type">end</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">History after they
were invited</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">0</property>
- <property name="pack_type">end</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">History after they
were invited</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
</child>
@@ -650,156 +655,156 @@
</object>
</child>
</object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">9</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="room_settings_room_visibility">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">none</property>
- <property name="margin_bottom">24</property>
- <child type="label">
- <object class="GtkLabel">
- <property name="label" translatable="yes">Room Visibility</property>
- <property name="margin-bottom">12</property>
- <attributes>
- <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
- </attributes>
- </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">9</property>
+ </packing>
</child>
<child>
- <object class="GtkFrame">
+ <object class="GtkFrame" id="room_settings_room_visibility">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="shadow_type">in</property>
+ <property name="shadow_type">none</property>
+ <property name="margin_bottom">24</property>
+ <child type="label">
+ <object class="GtkLabel">
+ <property name="label" translatable="yes">Room Visibility</property>
+ <property name="margin-bottom">12</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
+ </object>
+ </child>
<child>
- <object class="GtkListBox">
+ <object class="GtkFrame">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <style>
- <class name="list-with-separator"/>
- </style>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkListBoxRow">
+ <object class="GtkListBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="selectable">False</property>
+ <property name="can_focus">False</property>
+ <style>
+ <class name="list-with-separator"/>
+ </style>
<child>
- <object class="GtkBox">
+ <object class="GtkListBoxRow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">horizontal</property>
- <property name="margin">20</property>
- <property name="spacing">12</property>
+ <property name="can_focus">True</property>
+ <property name="selectable">False</property>
<child>
- <object class="GtkSwitch">
- <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">0</property>
- <property name="pack_type">end</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Allow guests</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin">20</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkSwitch">
+ <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">0</property>
+ <property name="pack_type">end</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Allow
guests</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">1</property>
- </packing>
</child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="GtkListBoxRow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="selectable">False</property>
<child>
- <object class="GtkBox">
+ <object class="GtkListBoxRow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">horizontal</property>
- <property name="margin">20</property>
- <property name="spacing">12</property>
+ <property name="can_focus">True</property>
+ <property name="selectable">False</property>
<child>
- <object class="GtkSwitch">
- <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">0</property>
- <property name="pack_type">end</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Allow joining without
invite</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin">20</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkSwitch">
+ <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">0</property>
+ <property name="pack_type">end</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Allow joining
without invite</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">1</property>
- </packing>
</child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="GtkListBoxRow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="selectable">False</property>
<child>
- <object class="GtkBox">
+ <object class="GtkListBoxRow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">horizontal</property>
- <property name="margin">20</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkSwitch">
- <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">0</property>
- <property name="pack_type">end</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="selectable">False</property>
<child>
- <object class="GtkLabel">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Publish in room
directory</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin">20</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkSwitch">
+ <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">0</property>
+ <property name="pack_type">end</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Publish in room
directory</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">1</property>
- </packing>
</child>
</object>
</child>
@@ -808,56 +813,56 @@
</object>
</child>
</object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">10</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="room_settings_join">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">none</property>
- <property name="margin_bottom">24</property>
- <child type="label">
- <object class="GtkLabel">
- <property name="label" translatable="yes">Join addresses</property>
- <property name="margin-bottom">12</property>
- </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">10</property>
+ </packing>
</child>
<child>
- <object class="GtkFrame">
+ <object class="GtkFrame" id="room_settings_join">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="shadow_type">in</property>
+ <property name="shadow_type">none</property>
+ <property name="margin_bottom">24</property>
+ <child type="label">
+ <object class="GtkLabel">
+ <property name="label" translatable="yes">Join addresses</property>
+ <property name="margin-bottom">12</property>
+ </object>
+ </child>
<child>
- <object class="GtkListBox">
+ <object class="GtkFrame">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <style>
- <class name="list-with-separator"/>
- </style>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkListBoxRow">
+ <object class="GtkListBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="selectable">false</property>
+ <property name="can_focus">False</property>
+ <style>
+ <class name="list-with-separator"/>
+ </style>
<child>
- <object class="GtkBox" id="room_settings_addresses">
+ <object class="GtkListBoxRow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">horizontal</property>
- <property name="margin">20</property>
- <property name="spacing">12</property>
+ <property name="can_focus">True</property>
+ <property name="selectable">false</property>
<child>
- <!--REMOVE ME-->
- <object class="GtkEntry">
+ <object class="GtkBox" id="room_settings_addresses">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin">20</property>
+ <property name="spacing">12</property>
+ <child>
+ <!--REMOVE ME-->
+ <object class="GtkEntry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ </object>
+ </child>
</object>
</child>
</object>
@@ -867,74 +872,24 @@
</object>
</child>
</object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">11</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin-bottom">12</property>
- <child>
- <object class="GtkLabel" id="room_settings_member_list_title">
- <property name="visible">True</property>
- <property name="label" translatable="yes">members</property>
- <attributes>
- <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
- </attributes>
- </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">11</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="room_settings_invite">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="action_name">app.room_invite</property>
- <property name="label" translatable="yes">Invite New Member</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">12</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="shadow_type">none</property>
- <property name="margin_bottom">24</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>
+ <property name="margin-bottom">12</property>
<child>
- <object class="GtkSearchEntry" id="room_settings_members_search">
+ <object class="GtkLabel" id="room_settings_member_list_title">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="primary_icon_name">edit-find-symbolic</property>
- <property name="primary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">False</property>
- <property name="placeholder_text" translatable="yes">Search for room
members</property>
+ <property name="label" translatable="yes">members</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -943,24 +898,74 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="room_settings_members_list">
+ <object class="GtkButton" id="room_settings_invite">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="action_name">app.room_invite</property>
+ <property name="label" translatable="yes">Invite New Member</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">12</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="shadow_type">none</property>
+ <property name="margin_bottom">24</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="GtkSearchEntry" id="room_settings_members_search">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="primary_icon_name">edit-find-symbolic</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">False</property>
+ <property name="placeholder_text" translatable="yes">Search for room
members</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="room_settings_members_list">
+ <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>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">13</property>
+ </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">13</property>
- </packing>
</child>
</object>
<packing>