diff options
| author | fiaxh <git@mx.ax.lt> | 2017-12-14 02:01:55 +0100 |
|---|---|---|
| committer | fiaxh <git@mx.ax.lt> | 2017-12-30 13:10:06 +0100 |
| commit | b4bb0912fc328bc44b13e190f59b347eb5d4310a (patch) | |
| tree | a18f680f8349eb758dd54fd44321837bcd228545 /main/data | |
| parent | f25fadde2d6c9492b9cafe2cddbcc7b966942e47 (diff) | |
| download | dino-b4bb0912fc328bc44b13e190f59b347eb5d4310a.tar.gz dino-b4bb0912fc328bc44b13e190f59b347eb5d4310a.zip | |
Show subscription request in conversation summary
Diffstat (limited to 'main/data')
| -rw-r--r-- | main/data/add_conversation/add_contact_dialog.ui | 15 | ||||
| -rw-r--r-- | main/data/contact_details_dialog.ui | 2 | ||||
| -rw-r--r-- | main/data/conversation_summary/view.ui | 57 |
3 files changed, 49 insertions, 25 deletions
diff --git a/main/data/add_conversation/add_contact_dialog.ui b/main/data/add_conversation/add_contact_dialog.ui index abf9d892..6185c5ba 100644 --- a/main/data/add_conversation/add_contact_dialog.ui +++ b/main/data/add_conversation/add_contact_dialog.ui @@ -5,6 +5,7 @@ <property name="modal">True</property> <child type="titlebar"> <object class="GtkHeaderBar"> + <property name="title" translatable="yes">Add Contact</property> <property name="visible">True</property> <child> <object class="GtkButton" id="cancel_button"> @@ -123,20 +124,6 @@ <property name="height">1</property> </packing> </child> - <child> - <object class="GtkCheckButton" id="subscribe_checkbutton"> - <property name="active">True</property> - <property name="label" translatable="yes">Request presence updates</property> - <property name="xalign">0</property> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> </object> </child> </object> diff --git a/main/data/contact_details_dialog.ui b/main/data/contact_details_dialog.ui index 8fa62398..0903b260 100644 --- a/main/data/contact_details_dialog.ui +++ b/main/data/contact_details_dialog.ui @@ -4,7 +4,7 @@ <property name="modal">True</property> <child type="titlebar"> <object class="GtkHeaderBar"> - <property name="title">Conversation Details</property> + <property name="title" translatable="yes">Conversation Details</property> <property name="show_close_button">True</property> <property name="visible">True</property> </object> diff --git a/main/data/conversation_summary/view.ui b/main/data/conversation_summary/view.ui index 9139da56..2bc13752 100644 --- a/main/data/conversation_summary/view.ui +++ b/main/data/conversation_summary/view.ui @@ -10,26 +10,63 @@ <property name="transition_type">crossfade</property> <property name="visible">True</property> <child> - <object class="GtkScrolledWindow" id="scrolled"> - <property name="hscrollbar_policy">never</property> + <object class="GtkOverlay"> <property name="visible">True</property> <child> - <object class="GtkBox"> - <property name="margin">15</property> - <property name="orientation">vertical</property> + <object class="GtkScrolledWindow" id="scrolled"> + <property name="hscrollbar_policy">never</property> <property name="visible">True</property> <child> - <object class="GtkBox" id="main"> - <property name="expand">False</property> + <object class="GtkBox"> + <property name="margin">15</property> <property name="orientation">vertical</property> - <property name="spacing">15</property> <property name="visible">True</property> + <child> + <object class="GtkBox" id="main"> + <property name="expand">False</property> + <property name="orientation">vertical</property> + <property name="spacing">15</property> + <property name="visible">True</property> + </object> + </child> + <child> + <object class="GtkBox" id="filler"> + <property name="expand">True</property> + <property name="visible">True</property> + </object> + </child> </object> </child> + </object> + <packing> + <property name="index">-1</property> + </packing> + </child> + <child type="overlay"> + <object class="GtkRevealer" id="notification_revealer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">start</property> <child> - <object class="GtkBox" id="filler"> - <property name="expand">True</property> + <object class="GtkFrame" id="frame2"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <style> + <class name="app-notification"/> + </style> + <child> + <object class="GtkBox" id="notifications"> + <property name="expand">False</property> + <property name="orientation">vertical</property> + <property name="visible">True</property> + </object> + </child> + <child type="label_item"> + <placeholder/> + </child> </object> </child> </object> |