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

334 Commits

Author SHA1 Message Date
Zetok Zalbavar
8fa40d5c4f
Merge pull request #3118
Also "fix" the problem with not signed sudden6's commit.

PKEv (1):
      feat(chatform): add support for non-local file and samba share links
2016-04-14 05:36:07 +01:00
PKEv
47764c0397 feat(chatform): add support for non-local file and samba share links
E.g. links like "file://192.168.1.1/" and "smb://localnode/" are now
supported. Before only links to local files were supported, e.g.
"file:///local/file.txt"
2016-04-14 00:56:21 +03:00
Zetok Zalbavar
48f3fb7dcb
fix(chatform): regression in detecting tox: type IDs
Introduced in d343408749 / #3044.
2016-04-03 13:28:21 +01:00
Zetok Zalbavar
dde56c99ec
Merge pull request #3077
Closes #3075.

Andrew Morgan (1):
      Prevent regex capture from extended past line boundaries.
2016-04-03 13:24:51 +01:00
Andrew Morgan
2a8071da29 Prevent regex capture from extended past line boundaries. 2016-03-29 14:11:35 -04:00
sudden6
0f0113e72f
Merge pull request #2994
Chiitoo (1):
      Chatlog: Adjust whitespace behaviour/handling.
2016-03-26 10:56:27 +01:00
Andrew Morgan
d343408749 Removed uneccessary for loop in markdown and url parsing. 2016-03-23 19:39:10 -04:00
Zetok Zalbavar
66f96019cb
fix: remove unnecessary qDebug call
qTox logs shouldn't contain any info that might include even parts of
user messages/etc.
2016-03-22 10:54:59 +00:00
Andrew Morgan
04ae894fc2 Fixed HTML chars breaking recognition. 2016-03-21 22:31:23 -04:00
Andrew Morgan
68cad0db38 Added codeblock support with ` char.
Parse markdown even if manual newline is added before or after markdown'd text. Ex: Check out my\n*skills*.

Removed extraneous debugging.

Fixed some characters accidently parsing markdown formatting, such as **vv**'

Use enum instead of magic number to check md setting.
2016-03-21 18:41:48 -04:00
tux3
c3caba2e3f
Merge branch 'pr2832'
Markdown support!
2016-03-12 01:34:44 +01:00
Chiitoo
7b8e947acd Chatlog: Adjust whitespace behaviour/handling.
Allow for strings of whitespace characters to be displayed in chat
messages without them being truncated.

Original work by TheSpiritXIII.
2016-03-08 22:19:47 +02:00
Vincas Dargis
857dfbcd4c Open downloaded image with mouse click on thumbnail 2016-02-14 17:20:11 +02:00
Andrew Morgan
0120cfb9fe Fix merge issues 2016-01-30 21:46:19 -08:00
Andrew Morgan
db84074926 Markdown Preference now uses enumeration type instead of integer. 2016-01-30 21:43:58 -08:00
Andrew Morgan
4c51be9a6b Changed rules to keep in line with actual markdown. Although Tox is marketed somewhat as a Skype-replacement, that doesn't mean we have to break compatibility with the rest of the web. 2016-01-29 15:17:41 -08:00
Andrew Morgan
a809897850 Removed leftover debug logging. 2016-01-28 16:57:34 -08:00
Andrew Morgan
a5f9e77a6b Changed asterisk rule to bold instead of italics. Fixed extraneous container in settings. 2016-01-28 15:30:24 -08:00
Andrew Morgan
fd31dd816d Added space detection for markdown #imdeadinside 2016-01-28 15:30:15 -08:00
Andrew Morgan
e15315b618 Added markdown preference chooser to settings which chat abides by.
Don't parse md if only one character is involved.
Prevent things like ~3~ being caught
2016-01-28 15:18:32 -08:00
tux3
e93c350621
Fix margins of file transfer widget
Fixes #1180
2016-01-21 17:11:37 +01:00
tux3
5693d3ee86
Revert "2x faster Text::regenerate"
This reverts commit 24bccb7bdd.
2016-01-21 15:44:38 +01:00
Andrew Morgan
4a1da7099f Added markdown support. Underline, Italics, Strikethrough and Bold supported. 2016-01-21 02:50:51 -08:00
tux3
24bccb7bdd
2x faster Text::regenerate
Hopefully without breaking anything substantial
2016-01-21 07:13:10 +01:00
tux3
f0e29a1d46
Fix #1180: Oversized file transfer bubbles 2016-01-21 05:19:30 +01:00
tux3
c576a1485a
Scan-build cleanup 2016-01-16 02:24:13 +01:00
Andrey S
d69139bf4a Remove extra spaces 2016-01-04 14:02:37 +03:00
Andrey S
8ce16ad399 Fixes #2484 - Error message inside the chat 2016-01-02 00:00:05 +03:00
Nils Fenner
26768de94a
set mouse cursor to I-Beam shape, when hovering over text within chat 2015-12-30 14:45:55 +01:00
Johannes Löthberg
e5baa403e0 Add SVG support to filetransfer preview
Only requires Qt SVG which is already a dependency of qTox.

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2015-12-21 06:02:32 +01:00
agilob
4df5c81f09 use plaintext label for username and status in header 2015-10-23 16:21:05 +02:00
TheNain38
f99c9f127d Fix ACTION messages, status, username HTML parsing 2015-10-03 21:31:41 +02:00
PKev
381e291dac add mail link support
fix #2318
2015-09-29 15:33:26 +03:00
TheNain38
c6c3150803 Display correclty what the user write and open correctly link with 'http://' 2015-09-27 13:58:18 +02:00
PKev
f476b752d1 Added support for local links in messages and correct detect links like "www.123.com" 2015-09-25 01:20:20 +03:00
agilob
78a07dc5d9
Merge remote-tracking branch 'antis81/ngf/fix/virt-overloads' 2015-09-13 22:57:27 +01:00
Nils Fenner
fa6bd18ad7
fix virtual overrides 2015-09-13 23:20:54 +02:00
Nils Fenner
d14e93ef91
fix faulty parented QFileDialog
closes issue #2205
2015-09-13 23:09:21 +02:00
agilob
602143068c
fix opening directory/file in file transfer widger 2015-08-31 13:59:39 +01:00
agilob
db5903c2fe
set one global initial file accept directory for all file transfers 2015-08-30 20:36:39 +01:00
agilob
582db9cb5b
fix uri detection, puts dots between toxcore versions 2015-08-29 23:28:21 +01:00
TheSpiritXIII
b6df8ce34a Circles: Fix sort circles on menus, fix groupchat rename through widget, improve activity sort performance 2015-06-26 10:54:50 +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
tux3
443df45d21
Disable RTTI 2015-06-07 20:24:55 +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
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
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