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

153 Commits

Author SHA1 Message Date
dubslow
2181313d37 add startup profile detection 2014-10-09 00:40:05 -05:00
dubslow
1bacd2da7a Merge branch 'master' into profiles... yikes
Conflicts:
	core.cpp
	core.h
	misc/settings.cpp
	misc/settings.h
	widget/form/settings/generalform.h
	widget/form/settingsform.cpp
	widget/widget.cpp
	widget/widget.h
2014-10-08 20:25:26 -05: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
Tux3 / Mlkj / !Lev.uXFMLA
3de960b2aa Merge pull request #385 from dubslow/master
Simplify groupchat names
2014-10-06 20:28:53 +02:00
dubslow
d093679d03 Add proxy support 2014-10-06 10:04:17 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
a85372a5c0 Merge pull request #381 from apprb/newsettings_v2
Newsettings v2
2014-10-06 13:29:44 +02:00
dubslow
9e2195c03c simplify groupchat names, fix #379, more simplification is possible 2014-10-06 01:46:30 -05:00
apprb
8fa9457305 base refactoring 2014-10-06 01:17:01 +09:00
krepa098
b487fddf99 cleanup 2014-10-05 14:22:58 +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
dubslow
8aba636c63 fix groupchat issue 2014-10-02 18:53:44 -05:00
dubslow
cfa39460bf added sending actions, and tested both ways 2014-10-02 02:00:06 -05:00
dubslow
5f106ab618 add receive actions (no one to test with currently) 2014-10-02 01:01:23 -05:00
krepa098
a4cd2d34db cleanup, applied some of the "Tox User Interface Guidelines" 2014-10-01 16:41:17 +02:00
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
dubslow
767f164a14 fix file mvs 2014-09-29 13:28:59 -05: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
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
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
bb214b53f7 set profile picture to contact_dark.png 2014-09-27 17:58:56 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
d684fca868 Fix #322 2014-09-26 21:26:31 +02:00
krepa098
5662aa933f Added MaskablePixmapWidget, improved avatar rendering 2014-09-26 19:13:08 +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
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
1551614070 Error messages in the case of message sending problems 2014-09-23 23:38:27 +07:00
dubslow
6c365c2260 Merge branch 'newsettings' of https://github.com/tux3/qTox into newsettings
Conflicts:
	res.qrc
	widget/widget.cpp
2014-09-16 12:10:52 -05:00
dubslow
e4e36dc946 initial new settings widget, subforms not started
also "filing" some files under misc
2014-09-15 22:42:41 +02:00
dubslow
55437df210 initial new settings widget, subforms not started
also "filing" some files under misc
2014-09-13 03:32:24 -05:00
Dubslow
d16b6cd283 Merge commit '5a005a1aafe96061301a4e113cb5450770009b88' into profiles
Conflicts:
	core.cpp
	widget/form/settingsform.cpp
	widget/form/settingsform.h
2014-09-12 13:53:29 -05:00
Marcel
1b2855e05b use settings dialog in widget 2014-09-12 15:46:34 +02:00
Marcel
c3a8cd01f3 removed settingsform, removed selfcamview from widget 2014-09-12 15:35:48 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
6440ef8310 Make group <unknown> name translatable 2014-09-11 18:05:02 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
a7c75e63a5 Clean code, improve compilation speed 2014-09-11 15:44:34 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
e91846e821 Fix #205 2014-09-11 13:40:44 +02:00