Commit graph

549 commits

Author SHA1 Message Date
trilene
55fb00c67b Merge remote-tracking branch 'upstream/master' into screenshare-x11 2021-02-25 12:10:12 -05:00
trilene
402bd565cb Add screen sharing window preview 2021-02-25 12:00:55 -05:00
Nicolas Werner
8846a2a013
Fix potential issue with modifiers and edit shortcuts 2021-02-25 14:54:50 +01:00
Nicolas Werner
345dc1e61f
Fix text input restoring after edits 2021-02-25 00:50:17 +01:00
Nicolas Werner
f6b5b24d64
Allow editing via up and down arrows 2021-02-24 23:51:05 +01:00
trilene
efe240d609 Allow choice of single window when sharing screen 2021-02-24 17:07:01 -05:00
Jedi18
68c999e5f4 remove old quick switcher 2021-02-24 19:50:36 +05:30
Jedi18
0ce7f78446 added margins and ui changes for quickswitcher and completer 2021-02-24 19:32:13 +05:30
Jedi18
096f37df1f fix row content centering 2021-02-24 13:38:01 +05:30
Jedi18
ebb35e5cb1 fix matrixtextfield color and quickswitcher font size 2021-02-23 22:07:45 +05:30
Jedi18
97c2505619 add matrix text field 2021-02-23 21:36:21 +05:30
Nicolas Werner
7560972cac
Fix qml formatting 2021-02-23 05:24:34 +01:00
DeepBlueV7.X
736ba5e2e8
Merge pull request #488 from Nheko-Reborn/scroll-view-thingy
Use Scrollview again
2021-02-22 22:14:31 +00:00
Nicolas Werner
78ecffb45b Use scrollview again for input 2021-02-22 23:13:38 +01:00
Nicolas Werner
af9b66dd3e Linkify topic in room settings and use non-deprecated MessageDialog 2021-02-22 21:37:32 +01:00
Jedi18
ee232c5c60 fix timeline focus 2021-02-23 00:46:40 +05:30
Jedi18
b1dec6f6ac enter key now works, fix room highlighting and add overlay 2021-02-23 00:18:31 +05:30
Jedi18
3f4ad1dd8b selecting room in quickswitcher now works, added completionSelected signal 2021-02-22 23:08:42 +05:30
trilene
70c77cdc44 Display screen sharing content locally 2021-02-21 16:30:10 -05:00
Jedi18
0922a8e4c7 add room alias delegate, fix some quickswitcher ui problems 2021-02-22 00:01:50 +05:30
Jedi18
32d419d14f add quick switcher qml file and moved completerFor from inputbar to timeline view class 2021-02-21 23:10:21 +05:30
trilene
c461c0aac0 Require GStreamer 1.18 for voip support 2021-02-20 17:14:22 -05:00
trilene
8ccd2abc6a Screen sharing (X11): support picture-in-picture 2021-02-20 11:26:53 -05:00
Nicolas Werner
8351cc4180 Fix miscalculation of padding in timeline 2021-02-20 02:53:14 +01:00
DeepBlueV7.X
99efe2f06b
Merge pull request #479 from Jedi18/add_rooms_model_completer
Add rooms completion model
2021-02-19 14:03:42 +00:00
trilene
3b26cf4ba3 Screen sharing (X11): add hide mouse cursor option 2021-02-18 16:53:30 -05:00
trilene
8df10eeeca Support desktop screen sharing on X11 2021-02-18 15:55:29 -05:00
Jedi18
f76f7b7f8a fixed roomsettings spacing and toggle button right align bug 2021-02-16 22:22:55 +05:30
Jedi18
8c4f0a070e change togglebutton size, set textarea color to colors.text 2021-02-16 11:52:03 +05:30
Jedi18
19dbbb2c6c add rooms model, add room delegate for completer 2021-02-16 00:50:28 +05:30
Jedi18
b5e351ab02 Replace rowlayouts with gridlayout and fix room settings initializer list 2021-02-14 11:26:10 +05:30
Akhil Nair
8400540428
Merge branch 'master' into room_settings_qml 2021-02-14 00:04:27 -05:00
Nicolas Werner
734fb7e286 Add double tap to reply feature
Does not always work, since Text steals focus...

relates to #414
2021-02-14 01:56:46 +01:00
Nicolas Werner
d43607d01c Fix hover handling in the timeline 2021-02-14 01:28:28 +01:00
Nicolas Werner
0d61f4bff1 Improve scroll to message a bit by using a ScrollView 2021-02-13 23:53:30 +01:00
Jedi18
1a406f79e6 replaced with togglebutton using qtquickcontrols2 2021-02-13 23:59:42 +05:30
Jedi18
4996ae27a0 added togglebutton styling 2021-02-13 21:49:21 +05:30
Jedi18
6540352123 fix roomsetting layout 2021-02-13 20:46:40 +05:30
Jedi18
f3596aed55 added room topic 2021-02-13 19:08:52 +05:30
Nicolas Werner
7ddcab3902 Mark messages as read, when Nheko gets focused
fixes #235
2021-02-13 01:41:09 +01:00
Nicolas Werner
e2fc676c77 Revert keeping whitespace in html, it breaks lists 2021-02-12 18:22:41 +01:00
Jedi18
35aa0126ac added changing of name through edit modal, removed old roomsettings 2021-02-12 12:48:12 +05:30
Jedi18
f044e2d2a1 fix avatar update on timeline sync 2021-02-11 23:50:45 +05:30
Jedi18
a7d7d18e92 shifted room avatar changing 2021-02-11 23:39:11 +05:30
Jedi18
473b14ed0f added roomversion, roomid etc 2021-02-11 21:23:33 +05:30
Jedi18
7401bd13b2 added notifications and encryption for the new roomsettings 2021-02-11 19:54:09 +05:30
Nicolas Werner
2a5e20dc6f Fix cancel edit order on Escape key 2021-02-10 18:00:52 +01:00
Jedi18
b70f37194f ui almost looks the same, midway between transition from old room settings to new room settings 2021-02-10 21:22:42 +05:30
Nicolas Werner
2606568376 Fix messages sometimes not being rendered, when they are too large 2021-02-10 15:24:00 +01:00
Nicolas Werner
6a2e8a6952 Try to avoid QTBUG-89568 2021-02-10 14:38:41 +01:00
Nicolas Werner
a62276c289 Fix UI allowing edits of foreign messages in some cases 2021-02-10 14:32:16 +01:00
Nicolas Werner
29c89b1b9e Abort -> Cancel 2021-02-10 14:11:55 +01:00
Nicolas Werner
6e2ae1d812 Add edit shortcuts and fix some focus stuff 2021-02-09 20:22:53 +01:00
Nicolas Werner
9b7d33e847 Implement message editing
The UI still looks ugly, but I have no good idea atm.

fixes #134
2021-02-09 20:22:53 +01:00
Nicolas Werner
00fd4eecec Display edits correctly 2021-02-09 20:22:49 +01:00
Jedi18
37679ac57e added room settings qml 2021-02-09 23:11:39 +05:30
DeepBlueV7.X
23a9306383
Merge pull request #459 from Jedi18/minor_fixes
Fix emoji related issues
2021-02-09 16:25:37 +01:00
trilene
974c336c5e make lint 2021-02-07 13:58:32 -05:00
Jedi18
4aefac08a4 focus message input on adding emoji/reacting to a message 2021-02-05 22:42:08 +05:30
Jedi18
f02342fe22 close emoji autocompleter if space typed after : issue #433 and adds default option for emoji font family settings 2021-02-05 21:52:49 +05:30
DeepBlueV7.X
a7150b5666
Merge branch 'master' into avatar_username_feature 2021-02-03 03:17:28 +01:00
Nicolas Werner
3433cc3be7 Cleanup privacy screen, no more grabImage 2021-02-03 03:14:43 +01:00
Loren Burkholder
5109dc5e0f Fix QML layout warnings 2021-02-02 19:30:03 -05:00
Nicolas Werner
aeec1e12fc Merge branch 'master' into 'privacy_screen'
# Conflicts:
#   resources/qml/TimelineView.qml
2021-02-02 13:00:53 -05:00
Joseph Donofry
2a858d84e2
Update format script again 2021-02-02 11:50:57 -05:00
Joseph Donofry
2bfd44755e
Try to fix format script and fix linting 2021-02-02 11:37:10 -05:00
Jedi18
cd3f719e43 add loading indicator 2021-02-02 17:24:08 +05:30
Jedi18
d535cc5e75 add error message and update avatars on avatar change in timeline and user profile dialog 2021-02-02 13:30:47 +05:30
Loren Burkholder
1c3e113d4e Allow drag/drop of files on whole timeline 2021-02-01 20:44:47 -05:00
Joseph Donofry
1127aa7c91
Small UX fixes 2021-02-01 18:57:59 -05:00
Joseph Donofry
53c653a228
Merge remote-tracking branch 'nheko-im/master' into privacy_screen 2021-02-01 18:42:38 -05:00
Joseph Donofry
d59910a8f2
Remove redundant import and fix visible warning 2021-02-01 18:42:18 -05:00
DeepBlueV7.X
2b7bd09ad3
Merge pull request #431 from Jedi18/avatar_username_feature
Username editing (room specific and global)
2021-02-01 19:14:57 +01:00
Jedi18
c3e02240bf update room and global avatar through user profile 2021-02-01 22:13:04 +05:30
Jedi18
0ebb2947ef focus and select text on clicking edit button 2021-01-30 14:08:02 +05:30
Loren Burkholder
58dc79074c Close user profile dialog on Esc 2021-01-29 18:29:38 -05:00
Loren Burkholder
cd998d1c35 Center user info dialog on the screen 2021-01-29 18:16:50 -05:00
Jedi18
e09e587796 shifted isUsernameEditingAllowed to qml from c++ 2021-01-29 12:06:38 +05:30
Jedi18
9b5a287d14 made requeste changes 2021-01-29 11:55:24 +05:30
Jedi18
b3f29f592b Changed edit method from double clicking to an edit button 2021-01-28 23:35:02 +05:30
Jedi18
87490c29cd Username can be edited by double clicking on text, added global user profile menu action in user info widget 2021-01-28 20:03:50 +05:30
Nicolas Werner
73244afdb8 Fix username completion deleting characters before it
fixes #421
2021-01-27 20:26:54 +01:00
Nicolas Werner
54cc77de0e Only select elements in completer when mouse is moved 2021-01-27 19:36:53 +01:00
Nicolas Werner
d1280af2e4 Autoclose completer when space is pressed and no suggestion available 2021-01-27 19:19:21 +01:00
Jedi18
5e3f513655 update room specific username from userprofile 2021-01-27 11:03:08 +05:30
Joseph Donofry
bfeb766a91
Implement Privacy Screen
* Add handles for window focus gained / focus lossed and connect to timer
* Clean up some of the PrivacyScreen.qml code
* Connect settings to PrivacyScreen visibility
2021-01-26 17:23:28 -05:00
Joseph Donofry
cb93ac3402
Fix formatting 2021-01-26 00:03:09 -05:00
Joseph Donofry
0794f0a3fd
Initial commit for privacy screen
Missing window focus event and knowing when room is encryption
2021-01-25 23:46:55 -05:00
Loren Burkholder
bc7cf9ef39 Get category switching working 2021-01-25 21:40:27 -05:00
Nicolas Werner
e5d2e2b728 Remove test log message 2021-01-25 16:19:28 +01:00
Nicolas Werner
2165eb8cb8 Focus input area on room switch and reply change again
fixes #412
fixes #413
2021-01-25 16:17:14 +01:00
rnhmjoj
c569ab24bc
Add "open in external program" action 2021-01-24 01:50:23 +01:00
DeepBlueV7.X
049278bc35
Merge pull request #395 from LorenDB/master
A few small things
2021-01-23 02:40:22 +01:00
Loren Burkholder
cd426d8f75 Use colors.mid for Completer border 2021-01-22 20:38:09 -05:00
Loren Burkholder
7e374a205c Fix UserProfile's behavior in dark theme 2021-01-22 19:18:56 -05:00
Nicolas Werner
97340bed13 Fix font tags showing up in playable media messages 2021-01-23 00:49:28 +01:00
Loren Burkholder
b1f8397499 Add border to Completer to distinguish it from the window 2021-01-21 19:05:34 -05:00
Nicolas Werner
6f17e2ff6e Fix flickable direction for MessageInput 2021-01-20 00:47:34 +01:00
Nicolas Werner
32a20a5f8c Simplify section handling a bit 2021-01-19 23:58:40 +01:00
trilene
150046233b Fix typo 2021-01-18 21:49:27 -05:00
Nicolas Werner
15750872de Fix completer opening in wrong place after warning fix 2021-01-19 03:31:00 +01:00
Nicolas Werner
d11978ac1b Fix qml warnings 2021-01-19 03:25:56 +01:00
Nicolas Werner
bcfa683468 Improve hover stuff, needs HoverHandler for a proper fix 2021-01-18 21:58:38 +01:00
Nicolas Werner
6a0de004a2 Fix placeholderTextColor not supported below Qt 5.12 2021-01-18 13:44:26 +01:00
Nicolas Werner
fcc1358e6b Fix more anchors.centerIn 2021-01-18 12:43:27 +01:00
Nicolas Werner
724e6436ee Remove unused stuff in profile 2021-01-18 00:53:07 +01:00
DeepBlueV7.X
20885dd66a
Merge pull request #378 from LorenDB/readReceipts
Display read receipts when read indicator is clicked
2021-01-17 23:55:58 +01:00
Nicolas Werner
07e71e6eae Fix crash with ScrollView 2021-01-17 04:05:02 +01:00
Loren Burkholder
93b492e9e6 Only use a pointing hand if there is something to click on 2021-01-16 19:55:50 -05:00
Loren Burkholder
6f6d962ab9 Fix warning messages about null image path 2021-01-16 11:52:58 -05:00
Loren Burkholder
b46cd339a1 Fix tooltips 2021-01-16 11:41:37 -05:00
Loren Burkholder
8f7ca298bc
Simplify source URL construction
Co-authored-by: DeepBlueV7.X <nicolas.werner@hotmail.de>
2021-01-16 10:19:26 -05:00
Loren Burkholder
7671927fa4 Remove unnecessary properties; simplify hover code 2021-01-16 10:16:27 -05:00
Loren Burkholder
139ab146bb Use an ImageButton for the StatusIndicator
Incidentally, this allows ImageButtons to not change color.
2021-01-16 10:02:55 -05:00
Nicolas Werner
42b08257ec Make read markers a bit less confusing 2021-01-16 13:54:56 +01:00
Loren Burkholder
f520f8ce16 Display read receipts when read indicator is clicked 2021-01-15 20:46:43 -05:00
Nicolas Werner
ca54de0b50 Update translations 2021-01-15 13:57:19 +01:00
DeepBlueV7.X
061e4c1b09
Merge pull request #374 from trilene/master
Add call invite screen for mobile
2021-01-15 01:36:50 +01:00
trilene
dfe2f7dc57 Finesse mobile call invite screen 2021-01-13 16:00:41 -05:00
trilene
a85823b68a Add call invite screen for mobile 2021-01-12 14:22:52 -05:00
Nicolas Werner
14cb3bfe10 Don't use centerIn on popup on Qt < 5.12 2021-01-12 15:55:36 +01:00
Nicolas Werner
826a5cfb14 Use minimum required versions for qml imports 2021-01-12 15:04:31 +01:00
Nicolas Werner
6090d00251 Revert "Update QtQuick versions to match Qt 5.10"
This reverts commit 74e32dd96b.
2021-01-12 15:03:39 +01:00
Nicolas Werner
31881e14d9 Make it easier to understand, what button to click for verification from profile 2021-01-12 15:00:59 +01:00
Nicolas Werner
81762119b9 Make device verification request dialogs easier to understand. 2021-01-12 15:00:59 +01:00
Joseph Donofry
74e32dd96b
Update QtQuick versions to match Qt 5.10 2021-01-11 22:17:00 -05:00
Joseph Donofry
9be466754e
Add ripple to completer 2021-01-11 20:22:40 -05:00
Joseph Donofry
9a604d3821
Clean up Avatar click event handling 2021-01-11 20:02:39 -05:00
Joseph Donofry
3ff8b3ad8c
Merge master and fix conflicts 2021-01-11 17:51:39 -05:00
Joseph Donofry
1bc2db4bdf
Add Ripple effects to qml buttons and avatar 2021-01-11 17:50:26 -05:00
trilene
cf8a47503f Fix device discovery under GStreamer 1.16 2021-01-07 09:48:25 -05:00
trilene
2bd8a386e2 Color and icon button spacing fixes 2021-01-07 14:04:54 +01:00
trilene
2984d71971 Fix Qml control colors 2021-01-07 14:04:54 +01:00
trilene
4123e6aff1 Fix previous commit 2021-01-07 14:04:54 +01:00
trilene
1c4a86e502 Set Label text color explicitly 2021-01-07 14:04:54 +01:00
trilene
13a280df13 Finesse PlaceCall dialog 2021-01-07 14:04:54 +01:00
trilene
6427687d20 Add missing translation marks 2021-01-07 14:04:54 +01:00
trilene
87d2074c81 Add devices dialog to CallInviteBar 2021-01-07 14:04:54 +01:00
trilene
055c6f7248 Add device combos to PlaceCall dialog 2021-01-07 14:04:54 +01:00
trilene
d315d02ee6 Use Layout margins 2021-01-07 14:04:54 +01:00
trilene
07ac7b7e85 Port PlaceCall dialog to Qml 2021-01-07 14:04:50 +01:00
trilene
459c59901e Fix one-way video calls 2021-01-07 14:04:21 +01:00
trilene
7124024977 Make call invites less intrusive 2021-01-07 14:04:21 +01:00
trilene
ac410f46f2 Move call-related properties to CallManager 2021-01-07 14:04:21 +01:00
Nicolas Werner
5ca043ad87 Fix user status that got lost at some point 2021-01-04 15:14:40 +01:00
Nicolas Werner
97688763f6 Background color for code and don't collapse space in timeline 2020-12-14 02:21:58 +01:00
Nicolas Werner
703950273b Don't overflow room name 2020-12-13 16:05:48 +01:00
DeepBlueV7.X
95667edb14
Merge pull request #347 from kamathmanu/avatarFullViewSupport
Add support for viewing avatar images in full size
2020-11-30 21:25:42 +01:00
kamathmanu
d4cece2f4d
Update resources/qml/Avatar.qml
Co-authored-by: DeepBlueV7.X <nicolas.werner@hotmail.de>
2020-11-30 14:58:50 -05:00
kamathmanu
a48c6353bf
Update resources/qml/Avatar.qml
Co-authored-by: DeepBlueV7.X <nicolas.werner@hotmail.de>
2020-11-30 14:58:37 -05:00