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

2096 Commits

Author SHA1 Message Date
krepa098
0af05929f7 fixup! Merge branch 'master' into chatlog_v3_1 2015-02-03 16:15:51 +01:00
krepa098
5c01f1585b change color for precise selection on focus-in/out 2015-02-03 10:33:46 +01:00
krepa098
8d7a32f4ec selection rect: change color on focus-in/out, action cleanup 2015-02-02 18:11:29 +01:00
krepa098
39b2771b8d tweaked ChatLog::getSelectedText 2015-02-02 15:05:27 +01: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
53ba982203 optimizations and tweaks 2015-02-02 11:11:09 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
5bd3cd041d
Windows installer: Fix x64 install path
Program Files instead of Program Files (x86)
2015-02-01 22:30:13 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
aa3134c09f
Merge branch 'pr1082' 2015-02-01 17:33:16 +01:00
Christoffer Sterner
aee04c92e4 Playback audio slider support non-group call 2015-02-01 17:18:45 +01:00
Christoffer Sterner
866c38e7df Add support for playback audio slider setting 2015-02-01 16:58:59 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
58b3e66c6b
Merge branch 'pr1081' 2015-02-01 15:59:19 +01:00
Zetok Zalbavar
32370128df
Update Polish translation 2015-02-01 14:24:02 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
a2ef070f73
Merge branch 'pr1079' 2015-02-01 13:16:07 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
2f8d512a2f
Merge branch 'pr1078' 2015-02-01 13:14:32 +01:00
Zetok Zalbavar
c2eaa3cdb4
Some tweaks for tooltips in settings 2015-02-01 10:56:28 +00:00
Ansa89
81155da0e6 Italian translation: update 2015-02-01 11:28:27 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
d6b34aef78
Update for toxcore API break 2015-02-01 01:25:22 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
4d5b924d0d
Merge branch 'pr1077' 2015-02-01 00:57:08 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
c1f41cd7ec
Merge branch 'pr1070-rebase' 2015-02-01 00:52:59 +01:00
Sascha Brendel
f43f09e568 Updated German translation
Conflicts:
	translations/de.ts
2015-02-01 00:51:11 +01:00
Christoffer Sterner
627768b83a Added sudo to yum install 2015-02-01 00:29:19 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
efef2b2178
Merge branch 'pr1073' 2015-02-01 00:09:20 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
8ccd3bb3bf
Fix spurious quitting when dialog closed and in tray 2015-02-01 00:03:42 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
dc36bf379f
Merge branch 'pr1076' 2015-01-31 23:06:06 +01:00
Christoffer Sterner
0290aea47b Fix keypad enter not sending message
Issue #1068
2015-01-31 22:54:52 +01:00
krepa098
783caf932c revert to "[user] is typing" 2015-01-31 19:22:45 +01:00
krepa098
f15b9da1e1 fix a render artifact 2015-01-31 19:19:13 +01:00
krepa098
f288fe5c1e tweaks 2015-01-31 18:37:20 +01:00
krepa098
740d62ec49 change ChatLine::isVisible to false, rename Text::isVisible to
Text::keepInMemory
2015-01-31 18:12:51 +01:00
krepa098
2206db1406 comparators should be public 2015-01-31 17:50:35 +01:00
krepa098
1d6f3858d9 renamed ChatLine::boundingSceneRect to ChatLine::sceneBoundingRect 2015-01-31 17:49:19 +01:00
krepa098
6a50add547 ChatLineContent: removed boundingSceneRect() 2015-01-31 17:46:25 +01:00
krepa098
5668606159 Speed-up rendering 2015-01-31 17:39:25 +01:00
krepa098
7ec54c972c set ChatLine::isVisible to true 2015-01-31 17:32:41 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
c745bc4513
Merge branch 'pr1070' 2015-01-31 11:51:49 +01:00
Zetok Zalbavar
13bd334d78
Add tooltips in settings
some tooltips changed to be more helpful/reflect reality
2015-01-31 09:53:12 +00:00
Ansa89
58eb8d3ec1 Italian traslation: update 2015-01-31 09:54:57 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
7574569b3d
Fix some systray issues on windows
Fix qTox not hiding when clicking on systray icon due to losing focus when clicking on the system tray

Fix the icon not being properly hidden on exit

Thanks to @toweI for reporting those issues
2015-01-30 13:44:41 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
c32eb98e6c
CppCheck, some video perf improvements 2015-01-30 13:40:04 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
64bd3b7b47
Merge branch 'pr962'
dation.
2015-01-29 19:29:23 +01:00
kushagra
0e0e1fe83c issue 960 2015-01-29 19:22:43 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
33b32bcc33
Allow coloring multi-level quotes
To make >>mahkoh happy
2015-01-29 18:10:59 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
5fd2828dfa
Merge branch 'newsystray'
Fixes #541
Fixes #659
Fixes #807
Fixes #579
2015-01-29 17:46:47 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
da4fbf9ffb
Show systray icon by default on linux too 2015-01-29 17:46:31 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
4cc9f0f824
Fix some SystemTrayIcon issues with Qt backend 2015-01-29 17:44:23 +01:00
Tux3/Mlkj
fe83dd9445 Implement SystemTrayIcon Unity backend
With some limitations and some awful hacks, since appindicators can not differentiate left click, right click and middle click. It's already a massive pain to just get a signal when the menu is shown, without actually knowing what opened it.

I love ubuntu.
2015-01-29 17:33:17 +01:00
Dubslow
56784d2a78
Fix #1064 2015-01-29 10:26:21 -06:00
Tux3/Mlkj
f8e069f053 Fix tr warning in CallConfirmWidget 2015-01-29 14:57:30 +01:00
Tux3/Mlkj
f75e32e1e3 Implement SystemTrayIcon with Qt backend and Unity stub 2015-01-29 14:56:53 +01:00