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

80 Commits

Author SHA1 Message Date
TheLastProject
4edb608777 Add open directory option to completed file transfers 2015-02-17 20:07:25 +01:00
BroncoTc
dff30915a3 edit the three config & source file
manully and same way as commit a004fc872f
2015-02-16 12:43:39 +08:00
Dubslow
4dcfec0151
Merge branch 'chatlog_merge_v3'
"unconfirmed" -> "Waiting to send..."
2015-02-15 04:55:25 -06:00
TheLastProject
30bd358de4 Add Dutch translation 2015-02-11 21:25:26 +01:00
Dubslow
c769c10138
Merge branches 'pr1105', 'pr1121' and 'pr1122' 2015-02-08 13:30:03 -06:00
Joseph Anania III
c1b39f5af1 Split smileys to seperate qrc file and added it to qtox.pro 2015-02-08 11:22:12 -05:00
krepa098
5506379a97 Merge branch 'master' into chatlog_v3_1 2015-02-07 18:49:06 +01:00
Joseph Anania III
4985175a05 added emoticons.xml to res.qrc for the TwitterEmojiSVG theme 2015-02-07 08:58:00 -05:00
Joseph Anania III
3ada849f05 Updated res.qrc file to add TwitterEmojiSVG emoticon files minor fixup to emoticons.xml 2015-02-06 17:03:56 -05:00
novist
8a2cb4e3b9 Fixed busy and invisible taskbar icons
Updated other status icons
Removed duplicate status icons from ui/statusButton
2015-02-06 20:16:01 +02:00
novist
b7dd4bf829 Tray icon notification of new messages 2015-02-03 12:20:26 +02: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
novist
6c477a0a19 Use svg for taskbar/tray icons 2015-02-02 08:07:36 +02:00
agilob
2f9f57d5a4
adding volButtonDisabled to rsc 2015-01-27 12:15:18 +00:00
krepa098
5be6caca68 [HiDPI] ChatLog: replaced all .png by .svg, FTW custom paintEvent
This does not enable HiDPI support!

issue #975
2015-01-26 14:01:42 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
328f75ac6d
Add real buttons for CallConfirmWidget
Still sort of placeholders, those are just upscaled buttons extracted from a screeshot, but those will work in the meantime
2015-01-25 19:12:36 +01:00
krepa098
904627e50a moved typing notifications to ChatLog 2015-01-10 11:57:46 +01:00
minj
97a78d5c14 add lt.ts 2015-01-10 07:27:31 +02: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
Bruno Kühnen Meneguello
2e38a1fdb8 Add Portuguese translation 2015-01-08 10:28:53 -02:00
krepa098
b82c5835ce error symbol 2015-01-06 14:30:24 +01:00
krepa098
5c684d95dd cleanup 2015-01-06 14:13:31 +01:00
krepa098
39bc3d73ec qrc: added missing browse_path.png 2015-01-06 14:02:57 +01:00
krepa098
d88aa965fa fixup merge 2015-01-03 13:13:12 +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
novist
e2bf37c139 Light tray icon option 2014-12-12 12:12:12 +02:00
krepa098
5ae506fe3b filetransferwidget: added open (browse?) button, fixed layout 2014-12-10 10:35:56 +01:00
Dubslow
961d5830c3
add fancier tray icons with status, remove relevant option 2014-12-05 17:14:48 -06:00
Dubslow
840dadafdd
Merge branch 'pr876'
Conflicts:
	res.qrc
2014-11-29 22:41:53 -06:00
Zetok Zalbavar
5d297a78d5
Sort res.qrc and remove some unnecessary spaces 2014-11-29 11:27:36 +00:00
accino
a004fc872f Added Spanish translation 2014-11-28 21:32:48 +01:00
novist
c224517acc Group chat button at the bottom of contact list resized to 16x16 like other buttons 2014-11-26 23:07:43 +01:00
krepa098
27cb075dbb hooked up filetransferwidget 2014-11-17 16:05:14 +01:00
krepa098
1cf9fe3474 filetransferwidget: first steps 2014-11-16 20:01:37 +01:00
krepa098
74bd802863 progress 2014-11-16 12:40:44 +01:00
krepa098
3a34678900 progress 2014-11-12 16:45:24 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
9d5b5d437d
Enable swedish translation 2014-11-05 23:34:35 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
41237a9bbc
Release, enable bulgarian translation 2014-11-04 20:10:35 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
e163ec8259
Embed cylgom and krepa emoticon packs
Thanks to @cylgom and @krepa098

Closes #555, fixes #304
2014-10-29 19:29:35 +01:00
krepa098
2913326fb2 fix #416, cleanup 2014-10-17 09:09:59 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
20f2dac755 Merge pull request #404 from dubslow/ringtone
add ringtone (not well done, but still better than status quo)
2014-10-08 14:18:34 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
7ba9ac69dc
Embed pirate translation 2014-10-08 14:08:52 +02:00
dubslow
54eb425238 add ringtone (not well done, but still better than status quo) 2014-10-07 22:33:55 -05:00
agilob
afc77f63db
css styles for mainHead and mainContent in widget.cpp
fixes problems with ugly UI on non-standard system theme.
before: https://i.imgur.com/XJ0mbpi.png
after: https://imgur.com/a/UbgNz
2014-10-07 21:55:20 +02:00
krepa098
23a64ef45f removed broken custom window decoration 2014-10-04 11:03:50 +02:00
krepa098
a486f9aa4d statusPanel: css, cleanup 2014-10-04 11:03:50 +02:00
krepa098
300d045dd9 FileTransferInstance: return of the edges 2014-10-04 11:03:50 +02:00
krepa098
04f56cc9ec unmessification 2014-10-01 16:41:17 +02:00
Olexandr Nesterenko
12c265aa9b Add Ukrainian translation 2014-09-29 22:05:48 +03:00
krepa098
87c9bbf1e6 fixes #332, #334 and other visual glitches 2014-09-28 17:30:00 +02:00