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

56 Commits

Author SHA1 Message Date
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
krepa098
a245255550 removed avatar_mask_circle.png from qrc 2014-09-27 16:39:54 +02:00
krepa098
5662aa933f Added MaskablePixmapWidget, improved avatar rendering 2014-09-26 19:13:08 +02:00
Joni Martikainen
5445746bab Finnish translation to qTox
Finnish translation to qTox
2014-09-21 23:28:04 +03:00
Tux3 / Mlkj / !Lev.uXFMLA
54ab545434 Embed new translations 2014-09-13 15:03:59 +02:00
Marcel
f3ecf4fa0f added images 2014-09-12 15:50:39 +02:00
apprb
6c5cd7c010 filetransfer: corrected pause/resume behaviour 2014-09-12 01:32:31 +07:00
krepa098
b6848772fc converted notification.wav to notification.pcm (raw audio) fixes #256 2014-09-10 23:21:37 +02:00
apprb
0a1eaac9a4 filetransferinstance should use own pictures 2014-09-07 15:04:42 +07:00
apprb
25ee6a24d9 new chat beginning 2014-09-07 00:21:39 +07:00
apprb
522d570e62 code cleanup 2014-09-05 23:03:26 +07:00
midnight079
ca9a9b79cb micButton and volButton were added to chatForm, but micButton for some
reason is blinking
2014-08-19 21:46:59 +02:00
midnight079
a75666a072 Added buttons for microphone and volume control 2014-08-19 21:46:55 +02:00
krepa098
a3a0ee3923 style update 2014-08-10 15:07:02 +02:00
krepa098
566402a1bf a shiny new widget 2014-08-01 14:32:51 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
46ce9fbeef Enable italian translation 2014-07-07 09:35:25 +02:00
Bill Winslow
14a7d298f4 Added GPL header to all source files 2014-07-06 12:19:45 -04:00
Tux3 / Mlkj / !Lev.uXFMLA
532f3336aa Update translations, enable german 2014-07-06 01:42:39 +02:00
Kevin Flynn
c5c0f35f59 Small fixes to status button 2014-07-05 15:03:53 -07:00
Kevin Flynn
a31304d9e2 Added proper status button
Pixels in status image are shifted slightly, but since this involves
changing the .ui file it's better to merge sooner rather than later.
2014-07-05 12:30:00 -07:00
Flynn
9c7998d38b Improve file transfer dialog 2014-07-04 16:59:11 -07:00
Tux3 / Mlkj / !Lev.uXFMLA
bf35781dd8 Enable russian translation 2014-07-04 15:47:08 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
7c4531cdf9 Enable french translation
On french computers only, obviously
2014-07-04 15:30:47 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
6a57888771 Add Busy status 2014-07-03 20:00:14 +02:00
Kevin Flynn
51fdc59850 Misc fixes 2014-06-30 20:01:01 -07:00