aboutsummaryrefslogtreecommitdiff
path: root/resources
diff options
context:
space:
mode:
authorTheJackiMonster <thejackimonster@gmail.com>2021-11-24 03:18:23 +0100
committerTheJackiMonster <thejackimonster@gmail.com>2021-11-24 03:18:23 +0100
commit5df934d452aaedf319028740987de0e0dcac52d5 (patch)
tree19ea3b7469a7e55e227f6da42c13972e56f66f83 /resources
parent724f7738ed6d60bccabb428c2ae87faba9033b0c (diff)
downloadmessenger-gtk-5df934d452aaedf319028740987de0e0dcac52d5.tar.gz
messenger-gtk-5df934d452aaedf319028740987de0e0dcac52d5.zip
Added invitations for private chats and cleaned up status messages
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/css/style.css2
-rw-r--r--resources/ui/message-sent.ui3
-rw-r--r--resources/ui/message-status.ui140
-rw-r--r--resources/ui/message.ui3
4 files changed, 131 insertions, 17 deletions
diff --git a/resources/css/style.css b/resources/css/style.css
index 743e0c1..a75a5e2 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -58,7 +58,7 @@
58} 58}
59 59
60.message-box.status > .message-content { 60.message-box.status > .message-content {
61 padding: 2px 12px; 61 padding: 2px 4px;
62} 62}
63 63
64.settings-entry { 64.settings-entry {
diff --git a/resources/ui/message-sent.ui b/resources/ui/message-sent.ui
index 6fd9e04..25ac52c 100644
--- a/resources/ui/message-sent.ui
+++ b/resources/ui/message-sent.ui
@@ -59,7 +59,6 @@ Author: Tobias Frisch
59 <object class="GtkLabel" id="text_label"> 59 <object class="GtkLabel" id="text_label">
60 <property name="visible">True</property> 60 <property name="visible">True</property>
61 <property name="can-focus">False</property> 61 <property name="can-focus">False</property>
62 <property name="label" translatable="yes">My evil comment text is awesome! This is coming to the Pinephone which will be extremely awesome and this text may only cut some borders in certain areas!!!</property>
63 <property name="wrap">True</property> 62 <property name="wrap">True</property>
64 <property name="max-width-chars">64</property> 63 <property name="max-width-chars">64</property>
65 <property name="xalign">0</property> 64 <property name="xalign">0</property>
@@ -92,7 +91,6 @@ Author: Tobias Frisch
92 <object class="GtkLabel" id="timestamp_label"> 91 <object class="GtkLabel" id="timestamp_label">
93 <property name="visible">True</property> 92 <property name="visible">True</property>
94 <property name="can-focus">False</property> 93 <property name="can-focus">False</property>
95 <property name="label" translatable="yes">0min</property>
96 <attributes> 94 <attributes>
97 <attribute name="weight" value="light"/> 95 <attribute name="weight" value="light"/>
98 </attributes> 96 </attributes>
@@ -120,7 +118,6 @@ Author: Tobias Frisch
120 <object class="GtkLabel" id="sender_label"> 118 <object class="GtkLabel" id="sender_label">
121 <property name="visible">True</property> 119 <property name="visible">True</property>
122 <property name="can-focus">False</property> 120 <property name="can-focus">False</property>
123 <property name="label" translatable="yes">User</property>
124 <attributes> 121 <attributes>
125 <attribute name="weight" value="semibold"/> 122 <attribute name="weight" value="semibold"/>
126 </attributes> 123 </attributes>
diff --git a/resources/ui/message-status.ui b/resources/ui/message-status.ui
index 54d0d0b..7d5b233 100644
--- a/resources/ui/message-status.ui
+++ b/resources/ui/message-status.ui
@@ -22,7 +22,8 @@ Author: Tobias Frisch
22--> 22-->
23<interface> 23<interface>
24 <requires lib="gtk+" version="3.24"/> 24 <requires lib="gtk+" version="3.24"/>
25 <object class="GtkBox"> 25 <requires lib="libhandy" version="1.2"/>
26 <object class="GtkBox" id="message_box">
26 <property name="visible">True</property> 27 <property name="visible">True</property>
27 <property name="can-focus">False</property> 28 <property name="can-focus">False</property>
28 <child> 29 <child>
@@ -36,17 +37,113 @@ Author: Tobias Frisch
36 <object class="GtkBox"> 37 <object class="GtkBox">
37 <property name="visible">True</property> 38 <property name="visible">True</property>
38 <property name="can-focus">False</property> 39 <property name="can-focus">False</property>
39 <property name="orientation">vertical</property> 40 <property name="spacing">8</property>
40 <child> 41 <child>
41 <object class="GtkLabel" id="status_label"> 42 <object class="GtkButton" id="deny_button">
43 <property name="can-focus">True</property>
44 <property name="receives-default">True</property>
45 <property name="relief">none</property>
46 <child>
47 <object class="GtkImage">
48 <property name="visible">True</property>
49 <property name="can-focus">False</property>
50 <property name="icon-name">edit-delete-symbolic</property>
51 </object>
52 </child>
53 </object>
54 <packing>
55 <property name="expand">False</property>
56 <property name="fill">True</property>
57 <property name="position">0</property>
58 </packing>
59 </child>
60 <child>
61 <object class="GtkBox">
42 <property name="visible">True</property> 62 <property name="visible">True</property>
43 <property name="can-focus">False</property> 63 <property name="can-focus">False</property>
44 <property name="label" translatable="yes">status information</property> 64 <property name="orientation">vertical</property>
65 <child>
66 <object class="GtkLabel" id="text_label">
67 <property name="visible">True</property>
68 <property name="can-focus">False</property>
69 <property name="label" translatable="yes">invited you to a chat</property>
70 <property name="justify">center</property>
71 <property name="wrap">True</property>
72 <property name="xalign">0.5</property>
73 </object>
74 <packing>
75 <property name="expand">True</property>
76 <property name="fill">True</property>
77 <property name="position">0</property>
78 </packing>
79 </child>
80 <child>
81 <object class="GtkBox">
82 <property name="visible">True</property>
83 <property name="can-focus">False</property>
84 <property name="spacing">4</property>
85 <child>
86 <object class="GtkImage" id="read_receipt_image">
87 <property name="can-focus">False</property>
88 <property name="xalign">1</property>
89 <property name="icon-name">emblem-default-symbolic</property>
90 </object>
91 <packing>
92 <property name="expand">False</property>
93 <property name="fill">True</property>
94 <property name="pack-type">end</property>
95 <property name="position">0</property>
96 </packing>
97 </child>
98 <child>
99 <object class="GtkLabel" id="timestamp_label">
100 <property name="can-focus">False</property>
101 <property name="justify">right</property>
102 <property name="xalign">1</property>
103 <attributes>
104 <attribute name="weight" value="light"/>
105 </attributes>
106 </object>
107 <packing>
108 <property name="expand">False</property>
109 <property name="fill">True</property>
110 <property name="pack-type">end</property>
111 <property name="position">1</property>
112 </packing>
113 </child>
114 </object>
115 <packing>
116 <property name="expand">False</property>
117 <property name="fill">True</property>
118 <property name="pack-type">end</property>
119 <property name="position">1</property>
120 </packing>
121 </child>
122 </object>
123 <packing>
124 <property name="expand">True</property>
125 <property name="fill">True</property>
126 <property name="position">1</property>
127 </packing>
128 </child>
129 <child>
130 <object class="GtkButton" id="accept_button">
131 <property name="can-focus">True</property>
132 <property name="receives-default">True</property>
133 <property name="relief">none</property>
134 <child>
135 <object class="GtkImage">
136 <property name="visible">True</property>
137 <property name="can-focus">False</property>
138 <property name="icon-name">emblem-ok-symbolic</property>
139 </object>
140 </child>
45 </object> 141 </object>
46 <packing> 142 <packing>
47 <property name="expand">False</property> 143 <property name="expand">False</property>
48 <property name="fill">True</property> 144 <property name="fill">True</property>
49 <property name="position">0</property> 145 <property name="pack-type">end</property>
146 <property name="position">2</property>
50 </packing> 147 </packing>
51 </child> 148 </child>
52 <style> 149 <style>
@@ -55,13 +152,36 @@ Author: Tobias Frisch
55 </object> 152 </object>
56 </child> 153 </child>
57 <child type="label"> 154 <child type="label">
58 <object class="GtkLabel" id="sender_label"> 155 <object class="GtkBox">
59 <property name="visible">True</property> 156 <property name="visible">True</property>
60 <property name="can-focus">False</property> 157 <property name="can-focus">False</property>
61 <property name="label" translatable="yes">User</property> 158 <property name="spacing">4</property>
62 <attributes> 159 <child>
63 <attribute name="weight" value="semibold"/> 160 <object class="HdyAvatar" id="sender_avatar">
64 </attributes> 161 <property name="can-focus">False</property>
162 <property name="size">24</property>
163 </object>
164 <packing>
165 <property name="expand">False</property>
166 <property name="fill">True</property>
167 <property name="position">0</property>
168 </packing>
169 </child>
170 <child>
171 <object class="GtkLabel" id="sender_label">
172 <property name="visible">True</property>
173 <property name="can-focus">False</property>
174 <property name="xalign">0</property>
175 <attributes>
176 <attribute name="weight" value="semibold"/>
177 </attributes>
178 </object>
179 <packing>
180 <property name="expand">True</property>
181 <property name="fill">True</property>
182 <property name="position">1</property>
183 </packing>
184 </child>
65 </object> 185 </object>
66 </child> 186 </child>
67 <style> 187 <style>
diff --git a/resources/ui/message.ui b/resources/ui/message.ui
index ceb84f4..42bde4d 100644
--- a/resources/ui/message.ui
+++ b/resources/ui/message.ui
@@ -58,7 +58,6 @@ Author: Tobias Frisch
58 <object class="GtkLabel" id="text_label"> 58 <object class="GtkLabel" id="text_label">
59 <property name="visible">True</property> 59 <property name="visible">True</property>
60 <property name="can-focus">False</property> 60 <property name="can-focus">False</property>
61 <property name="label" translatable="yes">My evil comment text is awesome! This is coming to the Pinephone which will be extremely awesome and this text may only cut some borders in certain areas!!!</property>
62 <property name="wrap">True</property> 61 <property name="wrap">True</property>
63 <property name="max-width-chars">64</property> 62 <property name="max-width-chars">64</property>
64 <property name="xalign">0</property> 63 <property name="xalign">0</property>
@@ -90,7 +89,6 @@ Author: Tobias Frisch
90 <object class="GtkLabel" id="timestamp_label"> 89 <object class="GtkLabel" id="timestamp_label">
91 <property name="visible">True</property> 90 <property name="visible">True</property>
92 <property name="can-focus">False</property> 91 <property name="can-focus">False</property>
93 <property name="label" translatable="yes">0min</property>
94 <attributes> 92 <attributes>
95 <attribute name="weight" value="light"/> 93 <attribute name="weight" value="light"/>
96 </attributes> 94 </attributes>
@@ -118,7 +116,6 @@ Author: Tobias Frisch
118 <object class="GtkLabel" id="sender_label"> 116 <object class="GtkLabel" id="sender_label">
119 <property name="visible">True</property> 117 <property name="visible">True</property>
120 <property name="can-focus">False</property> 118 <property name="can-focus">False</property>
121 <property name="label" translatable="yes">User</property>
122 <attributes> 119 <attributes>
123 <attribute name="weight" value="semibold"/> 120 <attribute name="weight" value="semibold"/>
124 </attributes> 121 </attributes>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-12 18:52:57 +0000