Commit adf30467 authored by Philipp Hörist's avatar Philipp Hörist

GroupChatControl: Harmonize Information and Settings page

parent acec7725
Pipeline #6481 passed with stages
in 3 minutes and 55 seconds
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.2 --> <!-- Generated with glade 3.36.0 -->
<interface> <interface>
<requires lib="gtk+" version="3.22"/> <requires lib="gtk+" version="3.22"/>
<object class="GtkBox" id="drop_area"> <object class="GtkBox" id="drop_area">
...@@ -1294,7 +1294,6 @@ ...@@ -1294,7 +1294,6 @@
<object class="GtkGrid" id="info_grid"> <object class="GtkGrid" id="info_grid">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">center</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
...@@ -1325,11 +1324,41 @@ ...@@ -1325,11 +1324,41 @@
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">1</property> <property name="top_attach">2</property>
</packing> </packing>
</child> </child>
<child> <child>
<placeholder/> <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Information</property>
<style>
<class name="bold16"/>
</style>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="info_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
<style>
<class name="margin-18"/>
</style>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child> </child>
<style> <style>
<class name="margin-18"/> <class name="margin-18"/>
...@@ -1955,9 +1984,7 @@ ...@@ -1955,9 +1984,7 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="border_width">18</property>
<property name="row_spacing">12</property> <property name="row_spacing">12</property>
<property name="column_spacing">12</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -2024,7 +2051,7 @@ ...@@ -2024,7 +2051,7 @@
<placeholder/> <placeholder/>
</child> </child>
<style> <style>
<class name="padding-18"/> <class name="margin-18"/>
</style> </style>
</object> </object>
</child> </child>
...@@ -2039,6 +2066,9 @@ ...@@ -2039,6 +2066,9 @@
<property name="top_attach">1</property> <property name="top_attach">1</property>
</packing> </packing>
</child> </child>
<style>
<class name="margin-18"/>
</style>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
......
...@@ -174,7 +174,7 @@ def __init__(self, parent_win, contact, muc_data, acct): ...@@ -174,7 +174,7 @@ def __init__(self, parent_win, contact, muc_data, acct):
# MUC Info # MUC Info
self._subject_data = None self._subject_data = None
self._muc_info_box = GroupChatInfoScrolled(self.account, {'width': 600}) self._muc_info_box = GroupChatInfoScrolled(self.account, {'width': 600})
self.xml.info_grid.attach(self._muc_info_box, 0, 0, 1, 1) self.xml.info_box.add(self._muc_info_box)
# Groupchat settings # Groupchat settings
self._groupchat_settings_box = GroupChatSettings( self._groupchat_settings_box = GroupChatSettings(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment