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

2305 Commits

Author SHA1 Message Date
BroncoTc
dff30915a3 edit the three config & source file
manully and same way as commit a004fc872f
2015-02-16 12:43:39 +08:00
BroncoTc
ce7e5705ce Add Chinese translation
Maybe cause problem when merge, git diff can't recongnize this file
(editted by gedit,Sublime Text,Notepad++)
2015-02-16 12:34:27 +08:00
Dubslow
bcc3ad7038
Fix #1182 2015-02-15 18:56:11 -06:00
Dubslow
03168a02d2
Merge branches 'pr1134', 'pr1157' and 'pr1171' 2015-02-15 17:36:45 -06:00
Dubslow
07b87616a2
Refactor image filter as discussed 2015-02-15 17:35:27 -06:00
Dubslow
dcf87f7475
Ask before joining group
Fixes #1101, closes #1177
2015-02-15 17:25:27 -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
Joseph Anania III
d0dfa1febb Added initial :name: emoticon support and compatiblity with cylgom pack for TwitterEmojiSVG and artwork fixes 2015-02-15 10:57:01 -05: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
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
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
Dubslow
c3d61f8dfe
Make Dutch selectable translation 2015-02-14 18:10:45 -06:00
Dubslow
eeb8c10bc3
Fix #1158 2015-02-14 17:26:21 -06: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
Zetok Zalbavar
e4e6401182
Rename 'Start automatically' → 'Autostart' 2015-02-14 07:39:28 +00:00
krepa098
459e3f43bd Revert "FTW: circular buttons [feedback wanted]"
This reverts commit 21eb9172d4.
2015-02-13 16:47:38 +01:00
krepa098
faaa147a83 mockup (WIP) 2015-02-13 16:46:59 +01:00
Chloe
484fb2e89c Update widget.cpp
Added support for dynamically generating supported format list.
2015-02-13 09:23:21 -05:00
Dubslow
08c78ec4cf
Merge branch 'pr1149' 2015-02-13 01:02:39 -06:00
Dubslow
fd60674664
Minor cleanup 2015-02-13 00:03:13 -06:00
Dubslow
11d4ec2599 Refactor OfflineMsgEngine, fix potential segfault
(@apprb take note please)
2015-02-13 00:02:52 -06:00
Zetok Zalbavar
9b5faa322f
Add qtopengl as dependency in INSTALL.md
fix  #1141
2015-02-13 05:19:38 +00:00
Dubslow
eff76fd491
Merge branches 'pr1136', 'pr1138', 'pr1142' and 'pr1144' 2015-02-12 23:00:06 -06:00
Zetok Zalbavar
9cd6c24da0
Update Polish translation
thanks to Ashley and michiru for help
2015-02-12 21:06:24 +00:00
Ansa89
092cfd55ed Italian translation: update 2015-02-12 18:48:09 +01:00
Bruno Kühnen Meneguello
ff25f9ed72 Updated portuguese translation 2015-02-12 13:47:07 -02:00
krepa098
936a34faf1 do not trigger repaint if invisible 2015-02-12 11:32:13 +01:00
krepa098
f765daf98d reverse history entries as they are no longer reversed in
ChatLog::insertChatlineOnTop
2015-02-12 09:12:14 +01:00
krepa098
7d2f515df9 fix crash in Text::hoverMoveEvent 2015-02-12 09:02:49 +01:00
Dubslow
4055cbe956
Minor translation things in the ui files 2015-02-11 14:52:42 -06:00
TheLastProject
30bd358de4 Add Dutch translation 2015-02-11 21:25:26 +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
tux3
919080b80d
Case sensitive includes on windows
The WINAPI may not be case-sensitive, but cross compilers running on Linux are
2015-02-11 13:46:16 +01:00
Dubslow
3fc778ae3d
Fix #1131 2015-02-10 22:51:57 -06:00