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

90 Commits

Author SHA1 Message Date
Zetok Zalbavar
c8ed535bba
fix(UI): improve unclear message about text being resized in chatform 2017-04-02 18:41:43 +01:00
noavarice
3e2bfdd548 refactor: further improvement of message formatting
Brief list of changes:
-  names of some variables and constants were replaced for reading
   convenience;
-  URL-highlighting method moved to TextFormatter so URL's don't
   conflict with italic text formatting;
-  as I understand, in previous version 'file://' URL does not work
   because of bad regex. I fix this with help of wiki page that
   referenced in comment for old code. Important note: there are two
   equal 'file://' URL syntax: 'file:///...' and 'file://localhost/...'
   and the second one does NOT work in KDE but works in Gnome so that's
   not a bug
Fix #4233
2017-03-06 11:55:54 +03:00
Zetok Zalbavar
80f5de31b3
style: reformat current C++ codebase using clang-format 2017-02-26 11:52:45 +00:00
noavarice
87f219a78f refactor: message text formatting works better now
- tag intersection detected
- variables and constants' names became shorter
2017-02-19 23:53:11 +03:00
noavarice
5047a65e11 refactor: improved HTML-formatting mechanism for text messages
Added class provides text font formatting with HTML font tags
Supported stuff:
  - nested formatting;
  - several text pieces formatted with the same formatting style at the
    one message;
  - styling applies only if non-whitespace symbol follows opening
    formatting symbol and also non-whitespace symbol preceds closing
    symbol;
  - only multiline code font formatting supports new line inside of
    message text.
Also fix #3804
2017-02-19 10:06:26 +03:00
Zetok Zalbavar
d4ac13dbf4
revert: "refactor: Added to include path and exclude it from all includes"
Revert needed, since otherwise there is no way to do automatic sorting
of includes.
Also reverted change to the docs, as leaving it would make incorrect
docs.

In case of conflicts, includes were sorted according to the coding
standards from #3839.

This reverts commit b4a9f04f92.
This reverts commit 5921122960.
2016-12-29 16:10:53 +00:00
Zetok Zalbavar
7b60a5dd36
chore: explicitly mention that copyright belongs to qTox contributors 2016-11-29 11:12:06 +00:00
Diadlo
b4a9f04f92
refactor: Added to include path and exclude it from all includes 2016-11-28 23:28:42 +03:00
Nils Fenner
f00b9008e6
feat(settings): add notification signals for changed settings values
Makes changes to settings application wide transparent. The properties section is optional in theory, but comes in very handy, if we decide to access settings e.g. from within a script context.
2016-08-14 18:08:24 +02:00
sudden6
939c97a0e9
Merge pull request #3441
Andrew Morgan (1):
      feat(textstyle): Change markdown syntax to be more intuitive
2016-07-11 21:52:58 +02:00
Nils Fenner
989b15e656 fix(chat): cleanup chat css base style
fix chat area's inner stylesheet
note: the base font is never a bold font (respects html tags: e.g. <b>bold text</b>)

fix block colors:
* action -> blue
* alert -> red
* quote -> green
2016-07-10 13:43:50 +02:00
Andrew Morgan
32e48a979c
feat(textstyle): Change markdown syntax to be more intuitive
BREAKING CHANGE: Current markdown syntax is unintuitive, and thus we have agreed on switching to @SkyzohKey's implementation. Replaces all instances of Markdown with Text Styling. Closes #3404.
2016-07-07 20:07:22 -07:00
Nils Fenner
67136e29ed
feat(chat): consistent use of the chat font settings
Note: Currently a CSS stylesheet has to be set, resembling the font settings for the HTML document, that is used to render chat messages.
2016-06-30 20:24:00 +02:00
Andrew Morgan
fca5f15532 fix(markdown): Remove spaces from markdown translation
Spaces were being inserted before and after markdown translated code which could potentially change intended meaning and/or presentation of the user's message. I believe these were necessary for dealing with an earlier bug but from my testing they are no longer needed.
2016-06-25 01:59:11 -07:00
tux3
998f0915db
fix(chatform): Markdown after emojis
Fix #3260
2016-05-09 22:07:21 +02:00
Diadlo
446626dabe
refactor(chatmessage): Delete duplicate enum MarkdownType 2016-04-20 13:17:19 +03:00
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
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
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
Andrew Morgan
4a1da7099f Added markdown support. Underline, Italics, Strikethrough and Bold supported. 2016-01-21 02:50:51 -08: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
582db9cb5b
fix uri detection, puts dots between toxcore versions 2015-08-29 23:28:21 +01: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
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
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
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
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