323 Commits

Author	SHA1	Message	Date
dubslow	6649ae568e	Merge branch 'master' into newsettings ... Conflicts: core.h qtox.pro widget/form/genericchatform.cpp widget/settingsdialog.cpp widget/tool/chataction.cpp widget/widget.cpp widget/widget.h	2014-09-30 04:57:05 -05:00
dubslow	8212a3dad0	Added all current settings except cam test, which segfaults on init...	2014-09-30 04:44:27 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	da8f83943d	Compat with toxcore	2014-09-30 01:18:23 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	c266c317dd	Merge pull request #342 from dubslow/avatarhash ... implement avatar hash caching instead of getting full avatar each time	2014-09-29 20:32:54 +02:00
dubslow	767f164a14	fix file mvs	2014-09-29 13:28:59 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	b96f10b1c1	Merge pull request #344 from apprb/ftrans ... File transfer improvements	2014-09-29 20:28:40 +02:00
krepa098	67ffbfcb6e	fix #334	2014-09-29 20:26:03 +02:00
dubslow	b35b787d2f	Merge branch 'master' of https://github.com/krepa098/qTox into avatarhash	2014-09-29 13:18:17 -05:00
apprb	904de559e5	FileTransferInstance responce on broken filetransfer state	2014-09-30 00:22:19 +07:00
krepa098	25a0a90cf7	fix #334	2014-09-29 10:38:31 +02:00
dubslow	84f56b81a7	fixes #331, remove special chars	2014-09-28 13:09:10 -05:00
dubslow	7735973d94	remove duplicate code	2014-09-28 12:57:27 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	c05497b420	Merge pull request #336 from krepa098/master ... fixes #332, #334 and other visual glitches	2014-09-28 19:21:21 +02:00
apprb	a18070d7c5	Wrap name and date fix	2014-09-28 23:39:26 +07:00
krepa098	87c9bbf1e6	fixes #332, #334 and other visual glitches	2014-09-28 17:30:00 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	aa6fbc9e28	MaskablePixmapWidget should update() on setPixmap ... Fixes our own avatar apparently not changing until qTox restarted	2014-09-28 11:19:58 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	12380bc397	Allow non-png avatars, convert them on the fly	2014-09-28 10:59:49 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	21d084e258	Compat with toxcore	2014-09-28 10:56:02 +02:00
dubslow	eb67f9b3dd	revert special self avatar	2014-09-27 17:19:30 -05:00
dubslow	b1b89ac1f4	minor	2014-09-27 16:44:08 -05:00
dubslow	28d2680fec	conform to standard, fix bug related to nospam in ID	2014-09-27 16:37:39 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	63252d2fc0	Fix merge	2014-09-27 20:22:01 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	1d978f1871	Merge branch 'pr321'	2014-09-27 20:15:01 +02:00
krepa098	9b52d3174d	set clickable to true	2014-09-27 19:13:46 +02:00
krepa098	2b58d45b73	MaskablePixmapWidget: use KeepAspectRatioByExpanding	2014-09-27 19:13:27 +02:00
krepa098	18330f0928	MaskablePixmapWidget: set cursor to PointingHandCursor if clickable	2014-09-27 18:00:13 +02:00
krepa098	bb214b53f7	set profile picture to contact_dark.png	2014-09-27 17:58:56 +02:00
krepa098	76e5876f0a	set default avatar to contact_dark.png, removed active/inactive avatar ... switching	2014-09-27 17:45:38 +02:00
krepa098	5411db5bec	MaskablePixmapWidget: background-color argument	2014-09-27 17:41:17 +02:00
krepa098	de7ade033a	MaskablePixmapWidget: white background, removed circular mask	2014-09-27 16:37:16 +02:00
krepa098	97b5599651	MaskablePixmapWidget: fixed drawing routine	2014-09-27 15:39:17 +02:00
krepa098	4d24bd53f2	fix #308	2014-09-27 13:31:37 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	d684fca868	Fix #322	2014-09-26 21:26:31 +02:00
krepa098	f9df1a1503	ChatAreaWidget: removed frame	2014-09-26 19:16:27 +02:00
krepa098	5662aa933f	Added MaskablePixmapWidget, improved avatar rendering	2014-09-26 19:13:08 +02:00
apprb	5e90955e7d	ChatForm: avatar scale	2014-09-26 19:17:27 +07:00
Tux3 / Mlkj / !Lev.uXFMLA	b305566267	Merge pull request #314 from dubslow/master ... api update	2014-09-25 20:08:43 +02:00
krepa098	ad5a175f7d	drag&drop support	2014-09-25 18:05:07 +02:00
krepa098	458636e6d6	EmoticonsWidget: use HandCursor	2014-09-25 17:20:15 +02:00
dubslow	e32ad72368	slight improvements to avatars	2014-09-25 10:16:36 -05:00
dubslow	be7c39d69a	api update	2014-09-25 09:55:36 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	52d18f9f18	Keep avatar aspect ratio (for real)	2014-09-24 18:40:40 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	81e6d8323a	Keep avatar aspect ratio	2014-09-24 18:32:20 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	c1f24b27ba	Fix self avatar being cropped	2014-09-24 18:25:09 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	ff2994a0fd	Cache avatars	2014-09-24 17:55:54 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	ab3f2e2950	Rescale avatars in the friend widget	2014-09-24 17:42:10 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	3cb1d280bc	Fix avatars resetting after friend clicked on	2014-09-24 17:35:24 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	8de71c19ed	Initial avatars support	2014-09-24 17:28:38 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	7ad6ad2731	Avatar support for ourselves	2014-09-24 16:51:16 +02:00
apprb	06178f00d9	File send error message	2014-09-23 23:52:06 +07:00