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

227 Commits

Author SHA1 Message Date
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