aboutsummaryrefslogtreecommitdiff
path: root/main/data
diff options
context:
space:
mode:
authorfiaxh <git@lightrise.org>2019-04-12 16:24:43 +0200
committerfiaxh <git@lightrise.org>2019-04-14 09:46:54 +0200
commitd9e45071d0d3cd5a7a162908267c98c6366038bf (patch)
tree1d68dcd4010b5c057b1d862f9ece8013212c2575 /main/data
parent27fe07c3b41a53a276fb5f6a71c4c97cb0279170 (diff)
downloaddino-d9e45071d0d3cd5a7a162908267c98c6366038bf.tar.gz
dino-d9e45071d0d3cd5a7a162908267c98c6366038bf.zip
Only use UI data for active converations cycling, clean up ConversationSelector
Diffstat (limited to 'main/data')
-rw-r--r--main/data/conversation_selector/view.ui15
-rw-r--r--main/data/unified_main_content.ui9
2 files changed, 8 insertions, 16 deletions
diff --git a/main/data/conversation_selector/view.ui b/main/data/conversation_selector/view.ui
deleted file mode 100644
index c5560ad1..00000000
--- a/main/data/conversation_selector/view.ui
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <template class="DinoUiConversationSelectorView">
- <property name="can_focus">True</property>
- <property name="expand">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolled">
- <property name="expand">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="visible">True</property>
- </object>
- </child>
- </template>
-</interface>
diff --git a/main/data/unified_main_content.ui b/main/data/unified_main_content.ui
index b2f3a891..0fde37e8 100644
--- a/main/data/unified_main_content.ui
+++ b/main/data/unified_main_content.ui
@@ -5,8 +5,15 @@
<property name="orientation">horizontal</property>
<property name="visible">True</property>
<child>
- <object class="DinoUiConversationSelectorView" id="conversation_list">
+ <object class="GtkScrolledWindow" id="scrolled">
+ <property name="expand">True</property>
+ <property name="hscrollbar_policy">never</property>
<property name="visible">True</property>
+ <child>
+ <object class="DinoUiConversationSelectorList" id="conversation_list">
+ <property name="visible">True</property>
+ </object>
+ </child>
</object>
<packing>
<property name="resize">False</property>