1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Commit Graph

2984 Commits

Author SHA1 Message Date
tux3
2bf50f9900
Merge branch 'pr1588' 2015-05-08 00:13:52 +02:00
llya Kowalewski
9d9fa90271 Include: complex -> cstdlib 2015-05-08 01:10:33 +03:00
llya Kowalewski
275f2a97f1 Fixing clang build on OSX
std::abs() is function from <complex>, current HEAD doesn't build on OSX with latest clang because of missing include. This commit fixes the build.
2015-05-08 00:31:42 +03:00
tux3
e79d40e356
Merge branch 'pr1446'
Conflicts:
	src/chatlog/chatlog.cpp
	src/chatlog/content/filetransferwidget.cpp
	src/core.cpp
	src/core/coreencryption.cpp
	src/toxdns.cpp
	src/widget/form/chatform.cpp
	src/widget/form/genericchatform.cpp
	src/widget/friendwidget.cpp
	src/widget/widget.cpp
2015-05-07 22:00:50 +02:00
tux3
19bf083b41
Merge branch 'pr1515' 2015-05-07 21:39:32 +02:00
tux3
89569d34da
Merge branch 'pr1587' 2015-05-07 21:33:52 +02:00
tux3
ad4ef7f53f
Merge branch 'pr1579' 2015-05-07 21:32:57 +02:00
tux3
04d102160f
Merge branch 'pr1577' 2015-05-07 21:30:11 +02:00
tux3
649ea371ee
Merge branch 'pr1576' 2015-05-07 21:25:57 +02:00
tux3
2b106a9c87
Fix fr.ts 2015-05-07 21:25:26 +02:00
tux3
a8d2732447
Merge branch 'pr1575' 2015-05-07 21:21:33 +02:00
qwad1000
a5035b4921 Updated Ukrainian translation 2015-05-07 22:21:19 +03:00
tux3
19d0465efe
Merge branch 'pr1574' 2015-05-07 21:21:04 +02:00
tux3
a61f222411
Merge branch 'pr1573' 2015-05-07 21:17:11 +02:00
tux3
8d3e8992c8
Merge branch 'pr1572' 2015-05-07 21:12:37 +02:00
tux3
74fb407c64
Merge branch 'pr1554' 2015-05-07 21:12:05 +02:00
tux3
edc16f6248
Merge branch 'pr1553' 2015-05-07 21:11:37 +02:00
tux3
77a3d4ddb0
Merge branch 'pr1545' 2015-05-07 21:06:06 +02:00
kushagra
5e5da24ad3 Implemented search of contacts 2015-05-07 20:37:26 +02:00
tux3
9fa9fafe75
Use old Qt connect syntax for QTimer::singleShot
The new syntax is for Qt>=5.4 only, but we need to support back to Qt 5.2
2015-05-07 20:36:11 +02:00
tux3
426fd71745
Merge branch 'pr1510'
The merge conflict resolving was a bit involved, some commits have been ammended with trivial edits.
2015-05-07 20:11:50 +02:00
Stefan Merettig
f14c399297 Screen grabber: Fix flying-flyout bug when resizing window while open 2015-05-07 20:11:32 +02:00
Stefan Merettig
f982938919 Screen grabber: Hide the flyout when the chat form is hidden. 2015-05-07 20:01:02 +02:00
Stefan Merettig
ffa1628f38 Screen grabber: Make sure the flyout is hidden on leave
When the user moved from right to left in moderate speed, the flyout
didn't get the mouse leave event.
2015-05-07 20:00:21 +02:00
Stefan Merettig
0a68cff60c Screen grabber: Hide mid-animation when leaving file button
The flyout is now more responsive and will start collapsing while it's
expanding, when the user leaves the attach file button mid-animation.
2015-05-07 20:00:21 +02:00
Stefan Merettig
f0d524e960 Screen grabber: hide() the flyout at first
I don't remember why I did show() at first, but works fine without, and
fixes the issue of a 1px wide flyout showing up somewhere in the
chatform
2015-05-07 20:00:21 +02:00
Stefan Merettig
f4610c41f9 Screen grabber: Only show flyout if the attach button is enabeld
Fixes the bug that the flyout was shown in group chats.
2015-05-07 20:00:21 +02:00
Stefan Merettig
f032df223f Screen grabber: Fix position of handles with negative selection
When you clicked, and then move towards top-left with the cursor,
and release, the handles were displayed inside the resulting rectangle,
instead of outside.
2015-05-07 20:00:21 +02:00
Stefan Merettig
076609afb9 Screen grabber: Calculate bounding rect, fixes some drawing issues
This commit should fix drawing artifacts occuring when quickly clicking
on the screen while moving the cursor in circles.
2015-05-07 20:00:21 +02:00
Stefan Merettig
db8b70e225 Screen grabber: Show correct tooltip for selected/no-selection states
When the user just clicks somewhere, and thus rejects the selection due
to the previous commit, show the initial 'nothing selected' helper
tooltip again.
2015-05-07 20:00:21 +02:00
Stefan Merettig
96a1cf93d5 Screen grabber: Reject small selections (< 2px width/height)
When the user just clicks, or moves the cursor barely (less than 2px),
auto reject the region and show no selection.
2015-05-07 20:00:20 +02:00
Stefan Merettig
1149ed1f91 Screen grabber: Modified helper tooltip texts
The english texts are now more coherent
2015-05-07 20:00:20 +02:00
Stefan Merettig
be194e6fa8 Screen grabber: Don't wait for the flyout to collapse
The menu is now collapsed in the background half a second after
the user clicked on the screenshot button. This is to let the WM have
some time to open the fullscreen window, which itself is now shown
immediately.
2015-05-07 20:00:20 +02:00
Stefan Merettig
e83aac7af7 Screen grabber: Remove forced redraw
If this doesn't help we'll need to split the screen capture display
into tiles and display those instead, allowing Qt to only draw
a few of them instead of everything.
2015-05-07 20:00:20 +02:00
Stefan Merettig
9539a38f15 Screen grabber: Moving from button -> flyout -> button doesn't collapse 2015-05-07 20:00:20 +02:00
Stefan Merettig
7ab64d5628 Screen grabber: Wait for the flyout to collapse before grabbing
After clicking the "Screenshot" button in the file flyout, the flyout
now collapses and then triggers the screenshot functionality. This adds
a delay of ca. 1/3 seconds between the click and the action.
2015-05-07 20:00:20 +02:00
Stefan Merettig
04dc650596 Screen grabber: Flyout menu for the screenshot button
When hovering over the "attach file" button in the chat form, an
additional button for the screenshot functionality will 'fly out'
to the left, showing a computer monitor as icon. Leaving the attach
file or the take screenshot button will collapse the fly out again.

Bug: Moving the mouse over the fly out and then back again to the
attach button collapses the fly out. Will sort this out later.

Also used the opportunity to rename headers from hpp -> h extension
I added earlier.
2015-05-07 20:00:20 +02:00
Stefan Merettig
c6d5b4cc55 WIP: KSnapshot-like screenshot grabber
WIP of a screenshot grabber accessible from the chat form to allow
users to easily send a part of a screenshot
2015-05-07 19:55:28 +02:00
tux3
4e1dd74269
Make tool buttons inactive when showing profile 2015-05-07 19:47:18 +02:00
tux3
8d91997ae5
Merge branch 'pr1500' 2015-05-07 19:43:20 +02:00
Rohil Surana
084b6c9300 Added tool menu active button indicator.
Disable active button to remove repainting of ui each time it is pressed.
2015-05-07 19:39:46 +02:00
tux3
479f5eeead
Merge branch 'pr1482' 2015-05-07 19:20:33 +02:00
PKEv
91c192487a Add_www_link_possibility 2015-05-07 19:17:09 +02:00
PKEv
d697e06b56 fix drag and drop in chat history (windows) 2015-05-07 19:13:49 +02:00
tux3
39fd870ef0
Merge branch 'pr1470' 2015-05-07 19:09:41 +02:00
tux3
9cdff0a21a
Merge branch 'pr1460' 2015-05-07 19:05:13 +02:00
tux3
821b01a90b
Merge branch 'pr1454' 2015-05-07 19:02:57 +02:00
Jookia
1d58f476f7 Add keyboard bindings for cycling contacts.
I've moved the key bindings in the main widget instead of the chat form given it
doesn't seem to be the chat form's responsibility to handle switching between
conversations it shouldn't know about in the first place. I've also included new
shortcuts to provide a more familiar feel to most people.

All in all this provides Ctrl+Tab and Ctrl+Shift+Tab for cycling as well as
Ctrl+PgUp and Ctrl+PgDown for cycling. This mimics common application behaviour.
2015-05-07 19:02:18 +02:00
Jookia
f6a2925331 Tabs with modifiers are passed up from chat boxes.
In Qt chat boxes filter out events related to text editing, including tabs.
Unfortunately tabs with modifiers like those used to cycle through contacts are
being filtered despite not being used for anything.

This fixes the keybind for cycling forward through contacts (Ctrl+Tab).
2015-05-07 18:46:08 +02:00
Jookia
59a8ea13e7 Implemented cycling through contacts.
I've implemented this by having the contacts list container return all contact
widgets in the order they appear each time it's time to cycle. It's perhaps
inefficient but given cycling isn't done often I don't see a need to optimize.

This code does make the assumption that the friends list isn't empty, which I'd
guess would be the case if there's an active conversation.
2015-05-07 18:46:08 +02:00