aboutsummaryrefslogtreecommitdiff
path: root/main/data/add_conversation
diff options
context:
space:
mode:
Diffstat (limited to 'main/data/add_conversation')
-rw-r--r--main/data/add_conversation/add_contact_dialog.ui2
-rw-r--r--main/data/add_conversation/add_groupchat_dialog.ui20
-rw-r--r--main/data/add_conversation/conference_details_fragment.ui376
-rw-r--r--main/data/add_conversation/list_row.ui2
-rw-r--r--main/data/add_conversation/select_jid_fragment.ui2
5 files changed, 229 insertions, 173 deletions
diff --git a/main/data/add_conversation/add_contact_dialog.ui b/main/data/add_conversation/add_contact_dialog.ui
index 3e99b2cc..c2077647 100644
--- a/main/data/add_conversation/add_contact_dialog.ui
+++ b/main/data/add_conversation/add_contact_dialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <template class="DinoUiAddConversationChatAddContactDialog">
+ <template class="DinoUiAddContactDialog">
<property name="default_width">300</property>
<property name="modal">True</property>
<child type="titlebar">
diff --git a/main/data/add_conversation/add_groupchat_dialog.ui b/main/data/add_conversation/add_groupchat_dialog.ui
index 1a027200..79c92947 100644
--- a/main/data/add_conversation/add_groupchat_dialog.ui
+++ b/main/data/add_conversation/add_groupchat_dialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <template class="DinoUiAddConversationConferenceAddGroupchatDialog">
+ <template class="DinoUiAddGroupchatDialog">
<property name="default_width">400</property>
<property name="modal">True</property>
<child type="titlebar">
@@ -171,20 +171,6 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="autojoin_checkbutton">
- <property name="active">False</property>
- <property name="label" translatable="yes">Join on startup</property>
- <property name="xalign">0</property>
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
<object class="GtkLabel" id="alias_label">
<property name="label" translatable="yes">Alias</property>
<property name="xalign">1</property>
@@ -192,7 +178,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">6</property>
+ <property name="top_attach">5</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
@@ -206,7 +192,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">6</property>
+ <property name="top_attach">5</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
diff --git a/main/data/add_conversation/conference_details_fragment.ui b/main/data/add_conversation/conference_details_fragment.ui
index 3218e27e..120fbdb6 100644
--- a/main/data/add_conversation/conference_details_fragment.ui
+++ b/main/data/add_conversation/conference_details_fragment.ui
@@ -1,224 +1,294 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <template class="DinoUiAddConversationConferenceConferenceDetailsFragment">
+ <template class="DinoUiConferenceDetailsFragment">
<property name="visible">True</property>
<child>
- <object class="GtkGrid">
- <property name="orientation">vertical</property>
- <property name="margin">20</property>
- <property name="margin_right">40</property>
- <property name="margin_left">40</property>
- <property name="row-spacing">7</property>
- <property name="column-spacing">10</property>
+ <object class="GtkOverlay">
<property name="visible">True</property>
<child>
- <object class="GtkLabel">
- <property name="label" translatable="yes">Account</property>
- <property name="xalign">1</property>
- <property name="visible">True</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkStack" id="accounts_stack">
+ <object class="GtkGrid">
+ <property name="orientation">vertical</property>
+ <property name="margin">20</property>
+ <property name="margin_right">40</property>
+ <property name="margin_left">40</property>
+ <property name="row-spacing">7</property>
+ <property name="column-spacing">10</property>
<property name="visible">True</property>
<child>
- <object class="GtkButton" id="accounts_button">
- <property name="relief">none</property>
+ <object class="GtkLabel">
+ <property name="label" translatable="yes">Account</property>
+ <property name="xalign">1</property>
+ <property name="visible">True</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkStack" id="accounts_stack">
<property name="visible">True</property>
<child>
- <object class="GtkLabel" id="accounts_label">
- <property name="xalign">0</property>
+ <object class="GtkButton" id="accounts_button">
+ <property name="relief">none</property>
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="accounts_label">
+ <property name="xalign">0</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="name">label</property>
+ </packing>
+ </child>
+ <child>
+ <object class="DinoUiAccountComboBox" id="account_combobox">
+ <property name="hexpand">True</property>
+ <property name="width_request">200</property>
<property name="visible">True</property>
</object>
+ <packing>
+ <property name="name">entry</property>
+ </packing>
</child>
</object>
<packing>
- <property name="name">label</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="DinoUiAccountComboBox" id="account_combobox">
- <property name="hexpand">True</property>
- <property name="width_request">200</property>
+ <object class="GtkLabel">
+ <property name="label">JID</property>
+ <property name="xalign">1</property>
<property name="visible">True</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
<packing>
- <property name="name">entry</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="label">JID</property>
- <property name="xalign">1</property>
- <property name="visible">True</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkStack" id="jid_stack">
- <property name="visible">True</property>
<child>
- <object class="GtkButton" id="jid_button">
- <property name="relief">none</property>
+ <object class="GtkStack" id="jid_stack">
<property name="visible">True</property>
<child>
- <object class="GtkLabel" id="jid_label">
- <property name="xalign">0</property>
+ <object class="GtkButton" id="jid_button">
+ <property name="relief">none</property>
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="jid_label">
+ <property name="xalign">0</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="name">label</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="jid_entry">
+ <property name="hexpand">True</property>
+ <property name="width_request">200</property>
<property name="visible">True</property>
</object>
+ <packing>
+ <property name="name">entry</property>
+ </packing>
</child>
</object>
<packing>
- <property name="name">label</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="jid_entry">
- <property name="hexpand">True</property>
- <property name="width_request">200</property>
+ <object class="GtkLabel">
+ <property name="label" translatable="yes">Nick</property>
+ <property name="xalign">1</property>
<property name="visible">True</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
<packing>
- <property name="name">entry</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="label" translatable="yes">Nick</property>
- <property name="xalign">1</property>
- <property name="visible">True</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkStack" id="nick_stack">
- <property name="visible">True</property>
<child>
- <object class="GtkButton" id="nick_button">
- <property name="relief">none</property>
+ <object class="GtkStack" id="nick_stack">
<property name="visible">True</property>
<child>
- <object class="GtkLabel" id="nick_label">
- <property name="xalign">0</property>
+ <object class="GtkButton" id="nick_button">
+ <property name="relief">none</property>
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="nick_label">
+ <property name="xalign">0</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="name">label</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="nick_entry">
+ <property name="hexpand">True</property>
+ <property name="width_request">200</property>
<property name="visible">True</property>
</object>
+ <packing>
+ <property name="name">entry</property>
+ </packing>
</child>
</object>
<packing>
- <property name="name">label</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="nick_entry">
- <property name="hexpand">True</property>
- <property name="width_request">200</property>
- <property name="visible">True</property>
+ <object class="GtkLabel" id="password_text_label">
+ <property name="label" translatable="yes">Password</property>
+ <property name="xalign">1</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
<packing>
- <property name="name">entry</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="label" translatable="yes">Password</property>
- <property name="xalign">1</property>
- <property name="visible">True</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkStack" id="password_stack">
- <property name="visible">True</property>
<child>
- <object class="GtkButton" id="password_button">
- <property name="relief">none</property>
- <property name="visible">True</property>
+ <object class="GtkStack" id="password_stack">
+ <child>
+ <object class="GtkButton" id="password_button">
+ <property name="relief">none</property>
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="password_label">
+ <property name="xalign">0</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="name">label</property>
+ </packing>
+ </child>
<child>
- <object class="GtkLabel" id="password_label">
- <property name="xalign">0</property>
+ <object class="GtkEntry" id="password_entry">
+ <property name="hexpand">True</property>
+ <property name="width_request">200</property>
+ <property name="visibility">False</property>
<property name="visible">True</property>
</object>
+ <packing>
+ <property name="name">entry</property>
+ </packing>
</child>
</object>
<packing>
- <property name="name">label</property>
+ <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>
+ <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="GtkEntry" id="password_entry">
- <property name="hexpand">True</property>
- <property name="width_request">200</property>
- <property name="visibility">False</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="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <object class="GtkLabel" id="notification_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">This is an app-notification. Click the button to dismiss</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="notification_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="relief">none</property>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">window-close-symbolic</property>
+ </object>
+ </child>
+ <style>
+ <class name="image-button"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label_item">
+ <placeholder/>
+ </child>
</object>
- <packing>
- <property name="name">entry</property>
- </packing>
</child>
</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>
diff --git a/main/data/add_conversation/list_row.ui b/main/data/add_conversation/list_row.ui
index 9b662412..b9c3a47b 100644
--- a/main/data/add_conversation/list_row.ui
+++ b/main/data/add_conversation/list_row.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <template class="DinoUiAddConversationListRow" parent="GtkListBoxRow">
+ <template class="DinoUiListRow" parent="GtkListBoxRow">
<property name="visible">True</property>
<child>
<object class="GtkGrid" id="outer_grid">
diff --git a/main/data/add_conversation/select_jid_fragment.ui b/main/data/add_conversation/select_jid_fragment.ui
index 76744ad0..50bc0e36 100644
--- a/main/data/add_conversation/select_jid_fragment.ui
+++ b/main/data/add_conversation/select_jid_fragment.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <template class="DinoUiAddConversationSelectJidFragment">
+ <template class="DinoUiSelectJidFragment">
<property name="height_request">500</property>
<property name="width_request">460</property>
<property name="visible">True</property>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-11 22:26:54 +0000