aboutsummaryrefslogtreecommitdiff
path: root/main/data
diff options
context:
space:
mode:
Diffstat (limited to 'main/data')
-rw-r--r--main/data/gresource.xml1
-rw-r--r--main/data/main_window.ui54
-rw-r--r--main/data/main_window_placeholder.ui5
-rw-r--r--main/data/menu_add.ui15
-rw-r--r--main/data/menu_app.ui10
-rw-r--r--main/data/style.css16
6 files changed, 49 insertions, 52 deletions
diff --git a/main/data/gresource.xml b/main/data/gresource.xml
index 2e38153b..b1dc2c40 100644
--- a/main/data/gresource.xml
+++ b/main/data/gresource.xml
@@ -98,7 +98,6 @@
<file>join_room_dialog2.ui</file>
<file>main_window.ui</file>
<file>main_window_placeholder.ui</file>
- <file>menu_add.ui</file>
<file>menu_app.ui</file>
<file>menu_conversation.ui</file>
<file>menu_encryption.ui</file>
diff --git a/main/data/main_window.ui b/main/data/main_window.ui
index 6ca4e915..8ca1b704 100644
--- a/main/data/main_window.ui
+++ b/main/data/main_window.ui
@@ -2,15 +2,19 @@
<interface>
<requires lib="gtk" version="4.0"/>
<requires lib="libadwaita" version="1.4"/>
- <template class="DinoUiMainWindow" parent="AdwApplicationWindow">
- <child>
- <object class="AdwBreakpoint">
- <condition>max-width: 600sp</condition>
- <setter object="navigation_split_view" property="collapsed">True</setter>
- </object>
- </child>
- <property name="content">
- <object class="GtkStack" id="stack">
+ <template class="DinoUiMainWindow" parent="GtkApplicationWindow">
+ <property name="child">
+ <object class="AdwBreakpointBin">
+ <property name="width-request">360</property>
+ <property name="height-request">320</property>
+ <child>
+ <object class="AdwBreakpoint">
+ <condition>max-width: 600sp</condition>
+ <setter object="navigation_split_view" property="collapsed">True</setter>
+ </object>
+ </child>
+ <property name="child">
+ <object class="GtkStack" id="stack">
<child>
<object class="GtkStackPage">
<property name="name">main</property>
@@ -24,24 +28,21 @@
<property name="child">
<object class="AdwToolbarView">
<child type="top">
- <object class="AdwHeaderBar" id="header_bar">
- <property name="show-title">False</property>
- <property name="hexpand">False</property>
+ <object class="GtkBox">
+ <property name="spacing">6</property>
+ <property name="margin-start">6</property>
+ <property name="margin-end">6</property>
<style>
- <class name="dino-left"/>
+ <class name="toolbar"/>
+ <class name="dino-conversation-list-toolbar"/>
</style>
<child>
- <object class="GtkMenuButton" id="add_button">
- <property name="has-frame">False</property>
- <child>
- <object class="GtkImage">
- <property name="icon-name">dino-list-add-symbolic</property>
- <property name="icon-size">normal</property>
- </object>
- </child>
+ <object class="GtkSearchEntry" id="conversation_search_entry">
+ <property name="hexpand">True</property>
+ <property name="placeholder-text" translatable="yes">Search conversations</property>
</object>
</child>
- <child type="end">
+ <child>
<object class="GtkMenuButton" id="menu_button">
<property name="has-frame">False</property>
<child>
@@ -87,7 +88,7 @@
<property name="width_request">260</property>
<property name="title" translatable="yes">You have no open chats</property>
- <property name="description" translatable="yes">Click + to start a chat or join a channel</property>
+ <property name="description" translatable="yes">Use the menu to start a chat or join a channel</property>
</object>
</property>
</object>
@@ -108,6 +109,11 @@
<object class="AdwToolbarView">
<child type="top">
<object class="AdwHeaderBar" id="conversation_headerbar">
+ <property name="show-start-title-buttons">False</property>
+ <property name="show-end-title-buttons">False</property>
+ <style>
+ <class name="dino-chat-headerbar"/>
+ </style>
<property name="title-widget">
<object class="AdwWindowTitle" id="conversation_window_title" />
</property>
@@ -185,6 +191,8 @@
</property>
</object>
</child>
+ </object>
+ </property>
</object>
</property>
</template>
diff --git a/main/data/main_window_placeholder.ui b/main/data/main_window_placeholder.ui
index 123920fe..b9b72820 100644
--- a/main/data/main_window_placeholder.ui
+++ b/main/data/main_window_placeholder.ui
@@ -8,11 +8,6 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkHeaderBar">
- <property name="show-title-buttons">true</property>
- </object>
- </child>
- <child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<property name="valign">center</property>
diff --git a/main/data/menu_add.ui b/main/data/menu_add.ui
deleted file mode 100644
index c984e081..00000000
--- a/main/data/menu_add.ui
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <menu id="menu_add">
- <section>
- <item>
- <attribute name="action">app.add_chat</attribute>
- <attribute name="label" translatable="yes">Start Conversation</attribute>
- </item>
- <item>
- <attribute name="action">app.add_conference</attribute>
- <attribute name="label" translatable="yes">Join Channel</attribute>
- </item>
- </section>
- </menu>
-</interface>
diff --git a/main/data/menu_app.ui b/main/data/menu_app.ui
index 9b85634d..bbcddb6d 100644
--- a/main/data/menu_app.ui
+++ b/main/data/menu_app.ui
@@ -3,6 +3,16 @@
<menu id="menu_app">
<section>
<item>
+ <attribute name="action">app.add_chat</attribute>
+ <attribute name="label" translatable="yes">Start Conversation</attribute>
+ </item>
+ <item>
+ <attribute name="action">app.add_conference</attribute>
+ <attribute name="label" translatable="yes">Join Channel</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
<attribute name="action">app.preferences</attribute>
<attribute name="label" translatable="yes">Preferences</attribute>
</item>
diff --git a/main/data/style.css b/main/data/style.css
index fc5915fb..64394cae 100644
--- a/main/data/style.css
+++ b/main/data/style.css
@@ -9,18 +9,18 @@ statuspage {
opacity: 0.5;
}
-window.dino-main .dino-header-right {
- background: @theme_base_color;
+window.dino-main headerbar.dino-chat-headerbar {
+ min-height: 44px;
}
-window.dino-main .dino-header-left {
- background: @insensitive_bg_color;
+window.dino-main headerbar.dino-chat-headerbar > windowhandle > box {
+ padding-top: 5px;
+ padding-bottom: 5px;
}
-window.dino-main headerbar.dino-left label.title {
- opacity: 0;
- font-size: 0;
- color: transparent;
+window.dino-main .dino-conversation-list-toolbar {
+ padding-top: 5px;
+ padding-bottom: 5px;
}
window.dino-main .dino-conversation undershoot,
generated by cgit v1.3 (git 2.53.0) at 2026-11-04 08:35:09 +0000