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

337 Commits

Author SHA1 Message Date
PKEv
eda57f388d Correct_doubled_nicks_when_copypasting 2015-05-28 00:40:04 +03:00
Zetok Zalbavar
75d3274332
Fix quoting; everything after '>' is a quote
Plenty of people voiced their opinion that everything after '>' should be a
quote. Trying to conform to anything other brings only chaos and makes
situation worse, since it is impossible to catch every exception.

There are already plenty of cases where regexp simply can't work with unicode.

In the future, qTox should have easy to use r-click options for 'Paste text as
 a quote' and 'Copy as a quote', which makes it a must to have quote detection
as simple as possible, to avoid situation where user wants to paste something
as a quote, and suddenly it doesn't seem to work.

Fixes #1059 #1099 #1173
Continuation of #1332
2015-05-25 20:52:51 +01:00
Ansa89
264732bf10 chatmessage.cpp: detectQuotes() simplify conditional statement 2015-05-24 17:16:30 +02:00
Zetok Zalbavar
87e6b038f9
Properly fix quoting in action messages
* Allow quoting in action messages if line number is >1.
* Fix regression introduced by 1244d689f6 where
  '\n' was being trimmed in action messages.
* Add comment about typing notifications placeholder that needs to be fixed.
2015-05-24 15:30:21 +01:00
Zetok Zalbavar
1244d689f6
Don't quote with action messages
Quoting with action messages produces badly looking messages,
where nick is blue coloured, while rest of text that is preceded
by '> ' is green. To avoid that, quoting should not be triggered
in action messages.
2015-05-24 01:56:57 +01:00
tux3
2fc5f781c9
Invert accept and reject FT buttons
People were clicking reject by accident after the chat scrolled up. Now they'll click accept by accident, which can easily be cancelled
2015-05-16 13:45:44 +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
sudden6
1506a9a30e Change log messages to fit new log format 2015-05-11 15:37:56 +02:00
agilob
75fbf192c4 closes tux3/qtox#1561 2015-05-10 11:46:22 +01:00
tux3
b8d57cf43a
Cleanly open/close FT image preview buffer 2015-05-10 02:30:47 +02: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
39fd870ef0
Merge branch 'pr1470' 2015-05-07 19:09:41 +02:00
tux3
542cae85d3
Give appropriately scary name to dangerous function
"isPathWritable" didn't convey really well the meaning of "let's try to open it, wipe everything the hell out, and see if it worked"
2015-04-26 17:39:39 +02:00
tux3
e74e29e4fb
Cleanly cancel broken file transfers 2015-04-25 19:18:46 +02:00
tux3
8b6ef7ab9d
Merge branch 'pr1524' into back_in_the_game
Conflicts:
	src/widget/form/groupchatform.cpp
2015-04-24 23:04:11 +02:00
kushagra
0a7c82c2cf Right clicking anywhere wont unhighlight text, fixes #1517 2015-04-24 22:49:22 +02:00
kushagra
b4f72b620d fixes action bugs
1) action received gets modified on restart
2) sender's name is written twice if action is sent using offline messaging
3) /me is written when action is sent in groupchat having one peer
4) /me is not saved in last message variable in friendd chat
2015-04-24 22:20:52 +02:00
tux3
110a6ca850
Fix typos in tooltips
transmit -> tranfer
2015-04-24 21:51:25 +02:00
PKEv
137d1ae2d5 Add tooltip in filetransferwidget
It is not clear what they are doing buttons
2015-04-24 21:50:05 +02:00
Zetok Zalbavar
92f3b6a20f Code style improvements 2015-04-24 15:43:57 +02:00
tux3
9dedd22bb2
Port file transfers to the new API
Parallel, extremely large, and other edge case transfers have not been tested, but the common path should work well.
2015-04-24 15:31:30 +02:00
tux3
e4859efe18
Refactor Core
Refactor Core's file transfer callbacks into their CoreFile class and files

Move all core*.{h|cpp} into a core/ folder
2015-04-24 02:32:09 +02:00
PKEv
55d33fbcc0 correct after CppCheck 2015-04-13 00:49:24 +03:00
PKEv
9857f5b60b #1402 duplicate of the sender's name
set if interval more 5 minuts, sender name repet
not tested for group chats!!!
2015-03-26 00:31:39 +03:00
Zetok Zalbavar
f95291af3e
Some style fixes
"if(" → "if ("
"for(" → "for ("
"while(" → "while ("
2015-03-20 18:38:10 +00:00
Dubslow
e96211199d
Check for writability for Qr saves 2015-03-16 16:41:59 -05:00
Dubslow
3da818e35a
Merge branches 'pr1344' and 'pr1403' 2015-03-16 12:56:26 -05:00
kushagra
de8f4a60ad Resize notification only if theres lot of text 2015-03-16 12:07:19 +05:30
Flakebi
3aca73e4b5 Align file bubbles better 2015-03-14 18:57:07 +01:00
Dubslow
2f2e51fb6a
Merge branch 'master' of ssh://github.com/krepa098/qTox 2015-03-11 17:44:16 -05:00
TheLastProject
b659612bd4 Use QImage scaling and base64 encoding for sharper previews 2015-03-08 21:01:34 +01:00
TheLastProject
3c602ec0d6 Fix images with spaces or other non-HTML characters breaking the preview 2015-03-04 17:32:45 +01:00
krepa098
00af059a4f use QUrl::fromLocalFile (fix #1305) 2015-03-01 10:43:43 +01:00
krepa098
4852a7efa5 Text: Tooltips (issue #1238) 2015-03-01 10:34:20 +01:00
TheLastProject
9dc52c1eb9 Add image preview on mouseover 2015-02-28 17:14:58 +01:00
TheLastProject
695bd74ce5 Use blacklist for executables, explicitly run executables with QProcess to work around KDE4.4 security measure which disallows running executables 2015-02-22 13:21:42 +01:00
TheLastProject
5b6e2d5ecc Remove unused variable 2015-02-19 20:41:21 +01:00
TheLastProject
ad1852622f Allow user to open all transferred files, but warn for executable files 2015-02-19 20:14:19 +01:00
Serg
0e3093bab4 fix missed math include 2015-02-18 11:02:09 +05:00
Dubslow
68c3d3ed07
Single line copy/pasted text 2015-02-17 20:44:23 -06:00
TheLastProject
af89e823c6 Clean up code 2015-02-18 00:30:50 +01:00
TheLastProject
4edb608777 Add open directory option to completed file transfers 2015-02-17 20:07:25 +01:00
Dubslow
7edb50ea3e
Merge branches 'pr1185', 'pr1188', 'pr1192', 'pr1193', 'pr1200' and 'krepa' 2015-02-16 18:03:36 -06:00
krepa098
c631fff602 fix issue #1161 round 2!
Fight!
2015-02-16 15:28:57 +01:00
krepa098
e454671ebd use QString::toHtmlEscaped 2015-02-16 15:22:29 +01:00
Dubslow
bcc3ad7038
Fix #1182 2015-02-15 18:56:11 -06:00
krepa098
a930b398d4 fix issue #1163 2015-02-15 19:48:16 +01:00
krepa098
3095583ea9 fix issue #1168 2015-02-15 17:21:00 +01:00
krepa098
ec85434c6c try fix #1165
Checkmark doing nothing on Windows
2015-02-15 17:15:44 +01:00
krepa098
9bbd7a5c94 fix issue #1161 2015-02-15 14:25:49 +01:00
Dubslow
73e51865e7
Merge branch 'chatlog_merge_v3'
Conflicts:
	src/chatlog/chatlog.h
2015-02-15 05:24:53 -06:00
Dubslow
cda1a02829
Fix #1154 2015-02-15 05:16:20 -06:00
Dubslow
b17b915dfc
Fix clang warnings
It complained about row being used uninitialized, though it was a spurious warning
2015-02-15 05:15:46 -06:00
Dubslow
e2ca10977f
Fix compile error 2015-02-15 04:59:26 -06:00
Dubslow
4dcfec0151
Merge branch 'chatlog_merge_v3'
"unconfirmed" -> "Waiting to send..."
2015-02-15 04:55:25 -06:00
krepa098
4831e0c18b FTW: Always show the checkmark after a successful transfer 2015-02-15 11:53:32 +01:00
Dubslow
2fa34ac7e4
Remove QMarginsF, reduce to Qt 5.2 2015-02-15 04:53:26 -06:00
krepa098
2bc7594049 redo layout on Settings::emojiFontChanged 2015-02-15 11:43:01 +01:00
krepa098
205f950073 refactoring & dark-theme awareness 2015-02-15 10:51:54 +01:00
krepa098
74ea0773ee Text: color property 2015-02-15 10:45:07 +01:00
krepa098
2a37473781 replaced QMarginsF by QMargins 2015-02-15 10:19:38 +01:00
krepa098
c800672ff2 display "unconfirmed" on new file transfer requests 2015-02-14 12:29:42 +01:00
krepa098
108d2725e6 FTW: 1px spacing instead of 2px 2015-02-14 12:21:03 +01:00
krepa098
9499909f8b finished work on FTW
hopefully
2015-02-14 12:14:09 +01:00
krepa098
faaa147a83 mockup (WIP) 2015-02-13 16:46:59 +01:00
krepa098
936a34faf1 do not trigger repaint if invisible 2015-02-12 11:32:13 +01:00
krepa098
7d2f515df9 fix crash in Text::hoverMoveEvent 2015-02-12 09:02:49 +01:00
krepa098
0b56916b9f Text anchors: use PointingHandCursor 2015-02-11 17:03:38 +01:00
krepa098
788d57c815 copy/paste changed format (issue #11) 2015-02-11 16:37:02 +01:00
krepa098
5f31921cf4 fix issue #10 2015-02-11 16:32:42 +01:00
krepa098
697460ca36 revised issue #6 2015-02-10 14:36:53 +01:00
krepa098
69fde0d8b0 refactoring 2015-02-10 14:30:49 +01:00
krepa098
990a7f4734 ownership (again) 2015-02-09 17:48:54 +01:00
krepa098
3f6e68db95 tweaked layout calculation 2015-02-09 17:45:48 +01:00
krepa098
535757670b copy: handle pending messages 2015-02-08 12:20:27 +01:00
krepa098
e86b03b4f7 add copy to selection buffer (middle mouse-button issue #6) 2015-02-08 10:32:52 +01:00
krepa098
5ec3a2db85 Fix ownership problem (issue #8) 2015-02-08 10:11:55 +01:00
krepa098
2dc79a80bc add timestamp to copied text (issue #4) 2015-02-07 22:40:24 +01:00
krepa098
a2cf91cb36 Text: documentLayout()->update() 2015-02-07 18:52:00 +01:00
krepa098
5506379a97 Merge branch 'master' into chatlog_v3_1 2015-02-07 18:49:06 +01:00
krepa098
2ac86b58e0 do not change clipboard content if selected text is null 2015-02-07 17:39:56 +01:00
krepa098
719481b040 fix actions not triggering reliably + ctrl+insert shortcut on linux 2015-02-07 17:37:04 +01:00
krepa098
887f021323 FTW: Slightly increased height 2015-02-07 14:38:56 +01:00
krepa098
a8acb05c52 FTW: Don't fire an animation if start- and endcolor are the same 2015-02-07 14:38:12 +01:00
krepa098
d008b53c6f FTW: Use KeepAspectRatioByExpanding 2015-02-07 14:33:45 +01:00
krepa098
6b605fbdc3 FTW: Replaced QPropertyAnimation by QVariantAnimation 2015-02-07 14:02:40 +01:00
krepa098
b9dcb3bd9b cleanup 2015-02-06 16:12:24 +01:00
krepa098
f525fa83f3 Spinner: fade in 2015-02-06 14:04:15 +01:00
krepa098
3c349e29ad cleanup 2015-02-06 14:04:15 +01:00
krepa098
c2ddc91d58 faster, synchronized spinners 2015-02-06 14:04:15 +01:00
krepa098
1e2f801dfe Spinner: lowered rotational speed 2015-02-05 10:13:37 +01:00
krepa098
f5cf9677ae FTW: don't display "Location not writable" if path is empty 2015-02-05 09:59:47 +01:00
krepa098
5e4e56778b FTW: color animation 2015-02-04 17:21:56 +01:00
krepa098
633ca9c3ac cleanup 2015-02-04 15:36:45 +01:00
krepa098
6cf3f9e1c2 fix bbox calculation 2015-02-04 15:36:26 +01:00
krepa098
09291bad52 fix crash on exit 2015-02-04 09:52:55 +01:00
krepa098
7321127794 set the correct wrap mode 2015-02-03 22:06:31 +01:00
krepa098
bc21af4fa2 ChatLog: don't start the resize worker if the width doesn't change 2015-02-03 17:28:42 +01:00
krepa098
e4c52e6118 use QPainter::setClipRect 2015-02-03 16:17:37 +01:00
krepa098
5c01f1585b change color for precise selection on focus-in/out 2015-02-03 10:33:46 +01:00
krepa098
8d7a32f4ec selection rect: change color on focus-in/out, action cleanup 2015-02-02 18:11:29 +01:00
krepa098
39b2771b8d tweaked ChatLog::getSelectedText 2015-02-02 15:05:27 +01:00
krepa098
e67db1575d fixup! Merge branch 'master' into chatlog_v3_1 2015-02-02 14:50:06 +01:00
krepa098
53ba982203 optimizations and tweaks 2015-02-02 11:11:09 +01:00
krepa098
f15b9da1e1 fix a render artifact 2015-01-31 19:19:13 +01:00
krepa098
f288fe5c1e tweaks 2015-01-31 18:37:20 +01:00
krepa098
740d62ec49 change ChatLine::isVisible to false, rename Text::isVisible to
Text::keepInMemory
2015-01-31 18:12:51 +01:00
krepa098
2206db1406 comparators should be public 2015-01-31 17:50:35 +01:00
krepa098
1d6f3858d9 renamed ChatLine::boundingSceneRect to ChatLine::sceneBoundingRect 2015-01-31 17:49:19 +01:00
krepa098
6a50add547 ChatLineContent: removed boundingSceneRect() 2015-01-31 17:46:25 +01:00
krepa098
5668606159 Speed-up rendering 2015-01-31 17:39:25 +01:00
krepa098
7ec54c972c set ChatLine::isVisible to true 2015-01-31 17:32:41 +01:00
krepa098
ebebde1b09 use QSize instead of QSizeF, cleanup 2015-01-27 11:20:35 +01:00
krepa098
cfe4458d37 Moved status messages back to the left 2015-01-27 10:52:23 +01:00
krepa098
ce486eb1b3 FileTransferWidget: visual tweaks 2015-01-27 10:49:18 +01:00
krepa098
57485368cb fix showEvent calling centerOn 2015-01-27 09:58:08 +01:00
krepa098
f509e07c45 make use of EmojiFontPointSize (fix #1026) 2015-01-26 23:19:18 +01:00
krepa098
a558733507 ChatLog::selectAll, refactoring of actions (issue #808) 2015-01-26 19:32:33 +01:00
krepa098
ecf15a6ca3 fix regression: chatlog didn't scroll to bottom on startup 2015-01-26 19:15:29 +01:00
krepa098
0442db2bae reposition busy notification *after* resize 2015-01-26 19:01:18 +01:00
krepa098
bbd20496fd specify background brush 2015-01-26 17:12:22 +01:00
krepa098
5be6caca68 [HiDPI] ChatLog: replaced all .png by .svg, FTW custom paintEvent
This does not enable HiDPI support!

issue #975
2015-01-26 14:01:42 +01:00
krepa098
a418ae3df6 use html <center> instead of ColumnFormat::Center 2015-01-25 15:59:44 +01:00
krepa098
cae965e750 ChatMessage::createChatInfoMessage: use toHtmlChars 2015-01-25 15:53:13 +01:00
krepa098
6719ebebae Added Timestamp class, moved output generation while saving to
GenericChatForm and changed the generated layout
2015-01-25 14:34:36 +01:00
krepa098
6e05782fb7 ChatLog: busy-screen during resize
Gets rid of most ugly hacks
2015-01-25 14:06:06 +01:00
krepa098
9cb7ba06ed cleanup 2015-01-21 15:58:43 +01:00
krepa098
ad39251166 typo 2015-01-20 11:51:34 +01:00
krepa098
d0bd6e9dca show 2 decimals starting from MiB 2015-01-20 11:08:40 +01:00
krepa098
2fa2fc1df5 fix divide by zero 2015-01-20 11:07:40 +01:00
krepa098
13e0a8a292 cleanup 2015-01-20 10:55:51 +01:00
krepa098
5d5a0903f7 renamed get/setRowIndex to get/setRow 2015-01-20 10:31:50 +01:00
krepa098
bb29536df1 NotificationIcon 2015-01-19 19:04:19 +01:00
krepa098
b5b6ae99c0 Text: extractSanitizedText, hookup double-click selection 2015-01-19 17:56:37 +01:00
krepa098
1fd456833c Merge pull request #3 from dubslow/chatlog_v3_1
minor code cleanup
2015-01-19 15:25:22 +01:00
krepa098
34c7c7250b double-click selection 2015-01-19 15:19:54 +01:00
krepa098
a6e3fc671e removed selectAll() 2015-01-19 15:07:15 +01:00
krepa098
85764d5973 Text: Do not rely on QTextCursor for selection 2015-01-19 15:04:11 +01:00
krepa098
f17ffdc491 cleanup 2015-01-19 11:14:53 +01:00
krepa098
2c8e7c638d nice! 2015-01-19 10:08:43 +01:00
krepa098
691a8b0b71 fixed potential null deref. & memory leak 2015-01-19 10:07:51 +01:00
Dubslow
44921db440
minor code cleanup 2015-01-18 13:57:51 -06:00
krepa098
2914a9883c ChatMessage::createTypingNotification, resized images to 18x18, new
(spinning) notification icon
2015-01-18 12:20:13 +01:00
krepa098
16812633cb extended spinner class 2015-01-18 12:17:21 +01:00
krepa098
9df5200fc9 update typing notification on resize 2015-01-18 12:15:02 +01:00
krepa098
b4f53944cc FileTransferWidget: calculate mean 2015-01-18 11:51:48 +01:00
krepa098
4d5470710a createChatInfoMessage: increase icon size from 16 to 20 px 2015-01-17 12:09:13 +01:00
krepa098
ee902ee1b0 don't forget to reposition the typingNotification on insertChatline* 2015-01-17 11:35:09 +01:00
krepa098
e85ff58223 refactoring 2015-01-17 11:31:57 +01:00
krepa098
b4fa8323af refactoring, reverted ChatLog::getVisibleRect 2015-01-15 11:48:41 +01:00