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

172 Commits

Author SHA1 Message Date
tux3
33a33ef051 Rebase on master 2015-06-26 10:54:49 +02:00
TheSpiritXIII
8e796a1d8b Update renamed friends and groups during search 2015-06-26 10:54:00 +02:00
TheSpiritXIII
167a8971ec Search optimizations and bug fixes, rename focus fix 2015-06-26 10:54:00 +02:00
Daniel Hrabovcak
715ef0ce65 Store circle widgets, fixed related bugs 2015-06-26 10:54:00 +02:00
Daniel Hrabovcak
a0b312dd97 Fixed group and circle illegal chars, inline renaming for friend list widgets, sort circles alphabetically 2015-06-26 10:53:59 +02:00
TheSpiritXIII
b83b5dbe59 Show edge markers for notifications
Add margin for edge notification marker

Fix conventions

Make AdjustingScrollArea not final
2015-06-10 13:20:52 -04:00
tux3
f0f2776050
Fix #1841
This sounds like a bug in GCC, let's try a workaround with parens.
2015-06-09 01:51:44 +02:00
tux3
4eab3dcbb8
Fix #1837
Fix #1839
2015-06-08 21:31:40 +02:00
tux3
36fcb5cb62
Add final/override specifiers
We get more compile time checking, and it's always good for performance to help the compiler
2015-06-08 20:08:24 +02:00
Zetok Zalbavar
67e9aeec63
Fix incorrect copyright headers
The qTox Project is not associated with the Tox Project in any way, with the
exception of "qTox" using the Tox Projet's "toxcore" collection of libraries.
In particular, the Tox Projet does not own copyright over the qTox Project's
"qTox" collection of software, source code, and assets.
The qTox Project's assets are under the sole copyright of the qTox
contributors, and no partiular rights are granted to the Tox Project.
2015-06-06 14:51:28 +01:00
tux3
0a04c48f33
Move adjustingscrollarea.cpp 2015-06-06 02:16:52 +02:00
tux3
20f254651d
Reorganize files 2015-06-06 01:44:47 +02:00
tux3
15ca7a587f
Dynamic translation
qTox can now retranslate its GUI dynamically, without needing a restart

Fixes #1671

Closes #1672
2015-06-05 21:37:01 +02:00
PKEv
64f7e6c63d Correct screenshot 2nd monitor
but only if a second monitor on the right side
2015-05-28 00:23:26 +03:00
marcel
920362349e removed warnings 2015-05-16 14:01:56 +02:00
tux3
76cbaf18f1
Fix incorrect copyright headers
The qTox Project is not associated with the Tox Project in any ways, with the exception of "qTox" using the Tox Projet's "toxcore" collection of libraries.
In particular, the Tox Projet does not own copyright over the qTox Project's "qTox" collection of software, source code, and assets.
The qTox Project's assets are under the sole copyright of the qTox contributors, and no partiular rights are granted to the Tox Project.
2015-05-12 04:12:53 +02:00
tux3
a01e0db7ba
Fix some memory leaks and mismatches 2015-05-09 22:35:58 +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
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
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
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
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
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
krepa098
52f220c9e4 Merge branch 'master' into chatlog_v3_1
Conflicts:
	qtox.pro
	res.qrc
	src/widget/form/chatform.cpp
	src/widget/form/chatform.h
	src/widget/form/genericchatform.cpp
	src/widget/tool/chatactions/chataction.h
	src/widget/tool/chatactions/messageaction.cpp
	src/widget/widget.cpp
	ui/chatArea/innerStyle.css
2015-02-02 14:31:44 +01:00
Christoffer Sterner
0290aea47b Fix keypad enter not sending message
Issue #1068
2015-01-31 22:54:52 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
c32eb98e6c
CppCheck, some video perf improvements 2015-01-30 13:40:04 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
33b32bcc33
Allow coloring multi-level quotes
To make >>mahkoh happy
2015-01-29 18:10:59 +01:00
Сухарик
568e21f188 fix greentext, take 2 2015-01-28 11:48:16 +03:00
Tux3 / Mlkj / !Lev.uXFMLA
1b2b4a1267
Merge branch 'pr1053' 2015-01-26 14:01:20 +01:00
agilob
2f18b2c72b
fixing problem with +1 lines in msg edit 2015-01-26 12:34:52 +00:00
Dubslow
f7feb8ecbb
Make greentext pickier
> must be the first character (i.e. leading whitespace disables greentext)
> must be followed by a "word" character, with an optional space (sorry zetok, but this is much more intuitive)
> followed by two+ spaces doesn't count
Fixes #945
2015-01-26 04:17:52 -06:00
agilob
6989346f41
dont clear msg everytime 2015-01-26 00:51:17 +00:00
agilob
c9e96300b2
added comment to explain this spaghetti 2015-01-26 00:31:54 +00:00
agilob
d3cdebd46f
removed unused code 2015-01-26 00:27:22 +00:00
agilob
fe8f6593c7
arrow up to paste previous message 2015-01-26 00:25:45 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
909ade6d5e
Fix #1039
And fix ChatTextEdit's inconsistent behavior of not forwarding backspace key press events while we're at it.
2015-01-24 23:37:43 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
3262326657
Fix #681
When minimized to tray, if a popup is closed, Qt notices that the last window is closed and exits. Tel Tell friend request dialogs to not exit on close
2015-01-24 19:58:16 +01:00
Dubslow
84dea5e12c
Revert "fix #902"
@apprb #932
This reverts commit 13306031e2.
2014-12-13 12:18:43 -06:00
Dubslow
cc4cc7d7a8
Merge branch 'pr922' 2014-12-12 18:37:06 -06:00
Zetok Zalbavar
e0993a72f6
Style corrections
'if()' → 'if ()'
'for()' → 'for ()'
2014-12-11 18:05:52 +00:00
apprb
13306031e2
fix #902 2014-12-11 21:33:38 +06:00
dubslow
c270166daa fix #811 2014-11-19 22:31:46 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
bb48852d87
Fix tox: url highlighting breaking the :tox: smiley
Fixes #772
2014-11-16 13:50:45 +01:00
krepa098
de52bad1db initial commit 2014-11-12 14:11:25 +01:00
apprb
cee1bcc8d1
faux offline messaging 2014-11-10 20:49:42 +09:00
apprb
44fb8a360e
displaying undelivered messages in chat area 2014-11-10 20:49:42 +09:00
apprb
977649f686
ChatAction refactoring 2014-11-10 20:49:42 +09:00
agilob
23d14553ae
tox:id 2014-11-06 16:55:10 +00:00
agilob
a10f04eb27
highight tox:// in chat 2014-11-06 16:38:33 +00:00
agilob
3f7adb066c
disabling emoitcons 2014-11-06 13:55:12 +00:00
dubslow
f8fa37e4a9 fix #624 2014-11-04 14:32:38 -06:00
Olexandr Nesterenko
6047ffe9e7 add localized strings 2014-10-29 12:13:32 +02:00
apprb
77d65a3cad
QSharedPointer<ChatAction> instead ChatAction* 2014-10-27 00:04:39 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
f1601f389f
Merge branch 'pr423' 2014-10-23 18:47:35 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
93ea674e07
Fix #503 2014-10-22 21:23:37 +02:00
apprb
6caa9f1e9f
Merge remote-tracking branch 'upstream/master' into history
Conflicts:
	qtox.pro
	src/widget/form/chatform.cpp
	src/widget/form/genericchatform.cpp
	src/widget/form/genericchatform.h
	src/widget/form/settings/identityform.cpp
	src/widget/tool/chatactions/messageaction.cpp
	src/widget/tool/chatactions/messageaction.h
	src/widget/widget.cpp
2014-10-22 23:05:04 +09:00
dubslow
aa55dcae1e fix bug, fix actions to be like irc, and a disabled feature for future 2014-10-20 06:34:17 -05:00
dubslow
30e2afcc92 add alerts on user mention (could use some tweaking, but is plenty fine for now) 2014-10-20 06:05:45 -05:00
dubslow
5b85f79055 tab completion for groupchats (fixes #486) 2014-10-20 05:01:22 -05:00
apprb
fc9f8a16f3
Merge branch 'master' into history
Conflicts:
	qtox.pro
	src/widget/form/chatform.cpp
	src/widget/form/settings/privacyform.cpp
2014-10-12 19:24:05 +09:00
dubslow
3ba95d82ae Move code into src/ 2014-10-07 23:26:25 -05:00