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

209 Commits

Author SHA1 Message Date
Dubslow
73e51865e7
Merge branch 'chatlog_merge_v3'
Conflicts:
	src/chatlog/chatlog.h
2015-02-15 05:24:53 -06:00
krepa098
c57cba21ae fix issue #14 2015-02-15 11:58:02 +01:00
Dubslow
4dcfec0151
Merge branch 'chatlog_merge_v3'
"unconfirmed" -> "Waiting to send..."
2015-02-15 04:55:25 -06:00
krepa098
205f950073 refactoring & dark-theme awareness 2015-02-15 10:51:54 +01:00
Dubslow
11d4ec2599 Refactor OfflineMsgEngine, fix potential segfault
(@apprb take note please)
2015-02-13 00:02:52 -06:00
krepa098
f765daf98d reverse history entries as they are no longer reversed in
ChatLog::insertChatlineOnTop
2015-02-12 09:12:14 +01:00
Dubslow
0164b53aba
Fix #1129 2015-02-10 22:43:25 -06:00
krepa098
5506379a97 Merge branch 'master' into chatlog_v3_1 2015-02-07 18:49:06 +01:00
apprb
bf2ebe9220
Offline messaging refactoring: Separated class for this purpose + more reliable resenging 2015-02-08 01:59:10 +09:00
Dubslow
e2fd298d68
chat logs -> chat history, miscellaneous rewordings 2015-02-03 13:56:08 -06:00
krepa098
e67db1575d fixup! Merge branch 'master' into chatlog_v3_1 2015-02-02 14:50:06 +01: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
krepa098
783caf932c revert to "[user] is typing" 2015-01-31 19:22:45 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
a62b1dc7ac
Merge branch 'pr1045' 2015-01-27 21:33:44 +01:00
agilob
fe8f6593c7
arrow up to paste previous message 2015-01-26 00:25:45 +00:00
agilob
4b854f86d1
fixed memory leaks 2015-01-25 23:06:44 +00:00
agilob
a6680916b5
undo double polishing in chatform 2015-01-25 22:28:29 +00:00
agilob
17561a8c3b
closes tux3/qtox#850 2015-01-25 22:19:25 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
0eba4fefca
Change some signal connections to new style 2015-01-25 21:51:21 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
b10edb9baf
CallConfirmWidget: don't overflow to the right 2015-01-25 17:53:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
40478d6bac Show call confirm under video if appropriate 2015-01-25 17:39:26 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
32bf56c7d9 Implement new call confirm widget logic
Works, but does not have any styling at the moment
2015-01-25 17:39:26 +01:00
Dubslow
2d2522626c
Typing notifications disappear automagically
Fixes #984
2015-01-20 01:27:48 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
ef64a0ef4c
Check that dropped files are readable&non-sequential
Fixes #934

No, you're not allowed to send /dev/urandom to your friends. Ever.
2015-01-19 00:22:40 +01:00
krepa098
2914a9883c ChatMessage::createTypingNotification, resized images to 18x18, new
(spinning) notification icon
2015-01-18 12:20:13 +01:00
krepa098
882d19d311 "%user is typing..." -> "%user ..." 2015-01-18 11:54:08 +01:00
krepa098
85568337e3 cleanup 2015-01-11 12:02:24 +01:00
krepa098
f574a43581 FileTransferWidget: fixed autoaccept 2015-01-11 11:57:33 +01:00
krepa098
904627e50a moved typing notifications to ChatLog 2015-01-10 11:57:46 +01:00
krepa098
d9e15fb0ba Merge branch 'master' into chatlog_v3_1
Conflicts:
	src/widget/chatareawidget.cpp
	src/widget/form/chatform.h
	src/widget/form/genericchatform.cpp
2015-01-09 19:41:16 +01:00
krepa098
5399b40874 history: fixed regression 2015-01-05 14:05:01 +01:00
krepa098
77fe3f7256 ChatLog::insertChatlineOnTop: overload taking a list 2015-01-05 10:51:01 +01:00
krepa098
c7fe34c077 history: require markAsSent 2015-01-05 10:02:41 +01:00
krepa098
27e967b67e cleanup 2015-01-04 19:58:14 +01:00
krepa098
6711fd6ee4 history fixes 2015-01-04 19:29:06 +01:00
krepa098
b09805f9bf refactoring 2015-01-04 18:21:35 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
fbc77864aa
Fix some ChatForm debug spam
Don't log an event if it isn't meant for you
2015-01-04 17:59:37 +01:00
krepa098
03ea61079b ChatLine/ChatMessage: use shared_ptr 2015-01-04 13:29:14 +01:00
novist
2a8cbd189d Added typing notification support and enabled by default 2015-01-04 13:21:56 +02:00
krepa098
8a1ea18ed4 fixed history 2015-01-03 14:08:04 +01:00
apprb
64e0116476 honouring aliases in the loaded history
Conflicts:
	src/widget/form/chatform.cpp
2015-01-03 13:10:19 +01:00
krepa098
2828a97d54 styled chatlog, cleanup 2015-01-03 10:21:15 +01:00
krepa098
a0ea0675a7 Merge branch 'master' into chatlog_v3_1
Conflicts:
	qtox.pro
	res.qrc
	src/misc/smileypack.cpp
	src/widget/chatareawidget.cpp
	src/widget/chatareawidget.h
	src/widget/form/chatform.cpp
	src/widget/form/genericchatform.cpp
	src/widget/form/genericchatform.h
	src/widget/form/settings/generalform.cpp
	src/widget/tool/chatactions/messageaction.cpp
	src/widget/tool/chatactions/systemmessageaction.cpp
	src/widget/widget.cpp
2015-01-03 10:17:53 +01:00
krepa098
f1f42fc237 innerStyle, groupchats 2014-12-31 13:42:06 +01:00
apprb
f8bdaac121
messages splitting fix 2014-12-28 23:32:19 +06:00
krepa098
3190530686 filling the gaps 2014-12-13 21:11:03 +01:00
Zetok Zalbavar
e0993a72f6
Style corrections
'if()' → 'if ()'
'for()' → 'for ()'
2014-12-11 18:05:52 +00:00
Sascha Brendel
17bcd969b2 Update chatform.cpp
Improved that line of code.
Thanks to @dubslow
2014-12-08 20:28:34 +01:00
Lednerb
dfb51d7d29 Added Translation for error message on sending a file. Also included the German Version. 2014-12-08 19:07:51 +01:00
agilob
561f5f9895
fixing bug #891 2014-12-04 15:51:01 +00:00
dubslow
bc381a8459
warn on can't read file, fixes #860 2014-11-27 15:00:04 -06:00
Carsten Brandt
b1b1c468e3 adjusted translation messages
as discusses here: https://github.com/tux3/qTox/pull/848#discussion_r20851990
2014-11-25 21:39:21 +01:00
apprb
465da29a43
minor fixes in ChatAction's creation/processing 2014-11-25 01:58:57 +09:00
apprb
451d0c7999
check incoming data from DB 2014-11-19 22:46:50 +09:00
dubslow
845216fa2f set aliases from chat form (half of #780) 2014-11-17 20:15:44 -06:00
krepa098
3a567d962e more work on filetransferwidget 2014-11-17 20:08:55 +01:00
krepa098
27cb075dbb hooked up filetransferwidget 2014-11-17 16:05:14 +01:00
apprb
8f3e1c2ef3
fix #775 2014-11-17 19:11:51 +09:00
krepa098
1cf9fe3474 filetransferwidget: first steps 2014-11-16 20:01:37 +01:00
apprb
664c762625
using ToxID instead of bare QString + proper alias using during widget creation 2014-11-17 00:17:46 +09:00
krepa098
4ca45fd4f9 progress 2014-11-16 13:13:39 +01:00
krepa098
808f8b1cc5 progress 2014-11-13 18:27:32 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
eac712e68a
Add GUI for audio groupchats 2014-11-13 13:14:27 +01:00
krepa098
3a34678900 progress 2014-11-12 16:45:24 +01:00
apprb
ec2e19e4bb
split message fix 2014-11-12 22:13:46 +09:00
krepa098
de52bad1db initial commit 2014-11-12 14:11:25 +01:00
apprb
5d50ea36d0
Faux offline messaging: enable/disable 2014-11-10 22:06:35 +09:00
apprb
cee1bcc8d1
faux offline messaging 2014-11-10 20:49:42 +09:00
apprb
a6b95e7b4f
group messages 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
apprb
f7a855aa20
store delivering status in the DB 2014-11-10 20:49:41 +09:00
dubslow
f2d358f222 switch to relevant chat room when minimized
fixes #688, except that for me it doesn't actually unminimize
2014-11-10 10:37:07 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
3d9cc86e30
Show the date for each new day when loading history 2014-11-09 00:08:28 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
a158aed643
Autoload last week of history on startup
Only if keeping history is enabled, of course
2014-11-08 22:43:33 +01:00
apprb
b316f6e13f
only public key is necessary 2014-11-07 23:56:14 +09:00
apprb
59748886de
struct Friend refactoring 2014-11-07 23:56:14 +09:00
agilob
c702e18ccf
global autoaccept files 2014-11-05 21:59:29 +00:00
agilob
a07c83466c
another unused opration 2014-11-05 12:14:39 +00:00
agilob
954d53f64a
more pl translations
* removed unused code
* notification about rejected call(not tested)
* notification about cancelled call
2014-11-05 12:02:38 +00:00
agilob
770d7b00a8
nulling timer 2014-11-03 17:01:02 +00:00
agilob
b386e4f08f
call duration 2014-11-03 01:51:56 +00:00
agilob
755a5677a2
Call notifications 2014-11-02 21:07:41 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
98f15af670
Use Tox IDs internally as message author ID
Instead of names. Fixes #603

Groupchats still use names internally, since there's currently no way to get a chat member's public key throught the toxcore API
2014-11-02 18:36:27 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
a908e036ce
Fix #600 2014-11-02 12:47:42 +01:00
X-NicON
fb5ed1c6b7 more strings for translation 2014-10-29 22:08:02 +03:00
Wouters Dorian
50513e0fb4 Made Mute speakers button work 2014-10-28 13:50:30 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
8da7b48f3c
Merge branch 'pr544' 2014-10-26 16:25:07 +01:00
apprb
77d65a3cad
QSharedPointer<ChatAction> instead ChatAction* 2014-10-27 00:04:39 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
7b70fd0008
Fix crash if call failed to start 2014-10-25 11:29:25 +02:00
apprb
8300f42e02
Reducing memory consumption: no reason to store all displayed ChatActions in memory 2014-10-25 01:25:28 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
1dc77a5d32
Fix chat head style for high DPI
Fixes #75
2014-10-23 21:53:45 +02:00
apprb
277605ff17
cleanup 2014-10-22 23:14:42 +09: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
Tux3 / Mlkj / !Lev.uXFMLA
b6d581a462
Merge branch 'pr488' 2014-10-20 14:13:27 +02:00
dubslow
995e86aad9 ADD FORGOTTEN FILES WHY DO THESE THINGS HAPPEN (and fix outbound actions) 2014-10-20 06:53:17 -05:00
dubslow
a1ebf905b2 add global file auto accept 2014-10-19 23:25:52 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
9ba1d4cf41
Fix ChatForm::onAvMediaChange not checking callId/friendId
May help with #458
2014-10-19 11:32:48 +02:00
dubslow
6e15bcb8d8 actually auto accept 2014-10-17 23:53:29 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
26eb08aa00
Merge branch 'pr452' 2014-10-17 21:00:24 +02:00
dubslow
35f95ea501 fix #438 2014-10-17 07:36:10 -05:00
krepa098
bd07666275 fixes, cleanup 2014-10-17 09:11:39 +02:00
krepa098
2913326fb2 fix #416, cleanup 2014-10-17 09:09:59 +02:00
krepa098
f2b730cdb9 NetVideoSource, YUV shader, fixes 2014-10-17 09:09:59 +02:00
apprb
e3d5853ca3
no reason to keep action flag in the logfile 2014-10-14 23:36:32 +09:00
apprb
ec3d8146c6
correct action saving into the logfile 2014-10-14 22:43:03 +09:00
apprb
14a71a0f3f
precise timestamps keeping 2014-10-14 14:49:27 +09: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