Skip to content

Commit 0580028

Browse files
GatsikGatsik
authored
Merge pull request #1151 from Gatsik/ui-tweak
2 parents ed5ad25 + 50bd8c9 commit 0580028

File tree

80 files changed

+4755
-1027
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+4755
-1027
lines changed

‎res/chat/channel.ui‎

Lines changed: 111 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</sizepolicy>
3939
</property>
4040
<property name="orientation">
41-
<enum>Qt::Horizontal</enum>
41+
<enum>Qt::Orientation::Horizontal</enum>
4242
</property>
4343
<property name="handleWidth">
4444
<number>5</number>
@@ -66,6 +66,99 @@
6666
<property name="bottomMargin">
6767
<number>0</number>
6868
</property>
69+
<item>
70+
<widget class="QFrame" name="searchFrame">
71+
<property name="frameShape">
72+
<enum>QFrame::Shape::StyledPanel</enum>
73+
</property>
74+
<property name="frameShadow">
75+
<enum>QFrame::Shadow::Raised</enum>
76+
</property>
77+
<layout class="QHBoxLayout" name="horizontalLayout_3">
78+
<property name="leftMargin">
79+
<number>6</number>
80+
</property>
81+
<property name="topMargin">
82+
<number>6</number>
83+
</property>
84+
<property name="rightMargin">
85+
<number>6</number>
86+
</property>
87+
<property name="bottomMargin">
88+
<number>0</number>
89+
</property>
90+
<item>
91+
<widget class="QLabel" name="label">
92+
<property name="text">
93+
<string>Search in channel:</string>
94+
</property>
95+
</widget>
96+
</item>
97+
<item>
98+
<widget class="QLineEdit" name="searchEdit">
99+
<property name="minimumSize">
100+
<size>
101+
<width>250</width>
102+
<height>0</height>
103+
</size>
104+
</property>
105+
</widget>
106+
</item>
107+
<item>
108+
<widget class="QPushButton" name="searchChannelButton">
109+
<property name="minimumSize">
110+
<size>
111+
<width>70</width>
112+
<height>0</height>
113+
</size>
114+
</property>
115+
<property name="text">
116+
<string>Search</string>
117+
</property>
118+
</widget>
119+
</item>
120+
<item>
121+
<widget class="QPushButton" name="clearSearchButton">
122+
<property name="minimumSize">
123+
<size>
124+
<width>70</width>
125+
<height>0</height>
126+
</size>
127+
</property>
128+
<property name="text">
129+
<string>Clear</string>
130+
</property>
131+
</widget>
132+
</item>
133+
<item>
134+
<widget class="QLabel" name="searchLabel">
135+
<property name="minimumSize">
136+
<size>
137+
<width>100</width>
138+
<height>0</height>
139+
</size>
140+
</property>
141+
<property name="text">
142+
<string/>
143+
</property>
144+
</widget>
145+
</item>
146+
<item>
147+
<spacer name="horizontalSpacer">
148+
<property name="orientation">
149+
<enum>Qt::Orientation::Horizontal</enum>
150+
</property>
151+
<property name="sizeHint" stdset="0">
152+
<size>
153+
<width>40</width>
154+
<height>20</height>
155+
</size>
156+
</property>
157+
</spacer>
158+
</item>
159+
</layout>
160+
</widget>
161+
</item>
69162
<item>
70163
<widget class="QLabel" name="announceLine">
71164
<property name="sizePolicy">
@@ -83,7 +176,7 @@
83176
<string>Channel's topic</string>
84177
</property>
85178
<property name="alignment">
86-
<set>Qt::AlignCenter</set>
179+
<set>Qt::AlignmentFlag::AlignCenter</set>
87180
</property>
88181
<property name="wordWrap">
89182
<bool>true</bool>
@@ -95,7 +188,7 @@
95188
<bool>true</bool>
96189
</property>
97190
<property name="textInteractionFlags">
98-
<set>Qt::TextBrowserInteraction</set>
191+
<set>Qt::TextInteractionFlag::TextBrowserInteraction</set>
99192
</property>
100193
<property name="WordWrap" stdset="0">
101194
<bool>true</bool>
@@ -117,25 +210,25 @@
117210
</font>
118211
</property>
119212
<property name="focusPolicy">
120-
<enum>Qt::NoFocus</enum>
213+
<enum>Qt::FocusPolicy::NoFocus</enum>
121214
</property>
122215
<property name="verticalScrollBarPolicy">
123-
<enum>Qt::ScrollBarAsNeeded</enum>
216+
<enum>Qt::ScrollBarPolicy::ScrollBarAsNeeded</enum>
124217
</property>
125218
<property name="horizontalScrollBarPolicy">
126-
<enum>Qt::ScrollBarAlwaysOff</enum>
219+
<enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum>
127220
</property>
128221
<property name="autoFormatting">
129-
<set>QTextEdit::AutoNone</set>
222+
<set>QTextEdit::AutoFormattingFlag::AutoNone</set>
130223
</property>
131224
<property name="lineWrapMode">
132-
<enum>QTextEdit::WidgetWidth</enum>
225+
<enum>QTextEdit::LineWrapMode::WidgetWidth</enum>
133226
</property>
134227
<property name="readOnly">
135228
<bool>true</bool>
136229
</property>
137230
<property name="textInteractionFlags">
138-
<set>Qt::TextBrowserInteraction</set>
231+
<set>Qt::TextInteractionFlag::TextBrowserInteraction</set>
139232
</property>
140233
<property name="openExternalLinks">
141234
<bool>false</bool>
@@ -245,25 +338,25 @@
245338
</font>
246339
</property>
247340
<property name="focusPolicy">
248-
<enum>Qt::NoFocus</enum>
341+
<enum>Qt::FocusPolicy::NoFocus</enum>
249342
</property>
250343
<property name="lineWidth">
251344
<number>1</number>
252345
</property>
253346
<property name="verticalScrollBarPolicy">
254-
<enum>Qt::ScrollBarAlwaysOn</enum>
347+
<enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOn</enum>
255348
</property>
256349
<property name="horizontalScrollBarPolicy">
257-
<enum>Qt::ScrollBarAlwaysOff</enum>
350+
<enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum>
258351
</property>
259352
<property name="editTriggers">
260-
<set>QAbstractItemView::NoEditTriggers</set>
353+
<set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
261354
</property>
262355
<property name="selectionMode">
263-
<enum>QAbstractItemView::NoSelection</enum>
356+
<enum>QAbstractItemView::SelectionMode::NoSelection</enum>
264357
</property>
265358
<property name="selectionBehavior">
266-
<enum>QAbstractItemView::SelectRows</enum>
359+
<enum>QAbstractItemView::SelectionBehavior::SelectRows</enum>
267360
</property>
268361
<property name="iconSize">
269362
<size>
@@ -272,13 +365,13 @@
272365
</size>
273366
</property>
274367
<property name="textElideMode">
275-
<enum>Qt::ElideRight</enum>
368+
<enum>Qt::TextElideMode::ElideRight</enum>
276369
</property>
277370
<property name="verticalScrollMode">
278-
<enum>QAbstractItemView::ScrollPerPixel</enum>
371+
<enum>QAbstractItemView::ScrollMode::ScrollPerPixel</enum>
279372
</property>
280373
<property name="horizontalScrollMode">
281-
<enum>QAbstractItemView::ScrollPerItem</enum>
374+
<enum>QAbstractItemView::ScrollMode::ScrollPerItem</enum>
282375
</property>
283376
<property name="uniformItemSizes">
284377
<bool>true</bool>

‎res/chat/chatline.qhtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<tr class="{tags}" width=100%><td class="col_avatar" width=42>{avatar}</td><td class="col_sender" width=100>{sender}</td><td width=100% class="col_text">{text}</td><td class="col_time" width=32>{time}</td></tr>
1+
<tr class="{tags}" width=100%><td class="col_avatar" width=42>{avatar}</td><td class="col_sender" title="{sender}" width=101>{elided_sender}</td><td width=100% class="col_text">{text}</td><td class="col_time" width=32>{time}</td></tr>

0 commit comments

Comments
 (0)