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

379 Commits

Author SHA1 Message Date
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
6aa974c764 Merge pull request #395 from apprb/chat
Reduction of CPU usage on new message insert
2014-10-07 19:58:18 +02:00
apprb
57c7734c48 bug in file transfer widget displaying fix 2014-10-07 19:20:53 +09:00
apprb
1fdc98873b reimplemented insert chat line function: every line in own table 2014-10-07 14:49:24 +07:00
apprb
f5c6194656 Introduced "Connection Settings" group in GeneralSettings widget 2014-10-07 09:24:52 +07:00
apprb
ddf7a7edfd added "Use Proxy" checkbox 2014-10-07 09:24:29 +07: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
dc73d5658a add tooltip 2014-10-06 10:04:27 -05:00
dubslow
d093679d03 Add proxy support 2014-10-06 10:04:17 -05:00
dubslow
b9a666159a reduce space between chat lines 2014-10-06 09:58:48 -05:00
dubslow
d42f9d3166 Revert "reduce font size and space between chat lines", use #386
This reverts commit 200c6d30e9.
2014-10-06 09:57:50 -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
200c6d30e9 reduce font size and space between chat lines 2014-10-06 03:21:47 -05:00
dubslow
9e2195c03c simplify groupchat names, fix #379, more simplification is possible 2014-10-06 01:46:30 -05:00
apprb
35aeca5dd0 cosmetic fixes 2014-10-06 03:02:12 +09:00
apprb
866f986d04 small fixes 2014-10-06 01:30:31 +09:00
apprb
0c2bf63b1a add missed files 2014-10-06 01:17:20 +09:00
apprb
8fa9457305 base refactoring 2014-10-06 01:17:01 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
525552a6ac Merge pull request #380 from krepa098/master
More visual tweaks and fixes
2014-10-05 18:14:36 +02:00
krepa098
51f24115d7 GenericChatForm: use correct fontmetrics 2014-10-05 17:34:34 +02:00
krepa098
8e664b5ff7 MaskablePixmapWidget::getPixmap: return the masked pixmap 2014-10-05 14:36:07 +02:00
krepa098
b487fddf99 cleanup 2014-10-05 14:22:58 +02:00
krepa098
7100fb707b fixed regression (#334) 2014-10-05 14:22:28 +02:00
Zetok Zalbavar
ba42c934a3
Change indicator for action messages 2014-10-04 20:40:14 +01:00
krepa098
67a7f99d71 fixed wrong group status image 2014-10-04 11:08:14 +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
226c0f2cf1 GenericChatroomWidget: use QFrame instead of QWidget as base class
(fixes invisible background)
2014-10-01 18:53:31 +02:00
krepa098
f99825580a AutoFillBackground 2014-10-01 18:20:13 +02:00
krepa098
e0e20d3ae7 AdjustingScrollArea: removed event filter 2014-10-01 17:22:51 +02:00
krepa098
8db22973e9 fixed merge 2014-10-01 17:03:59 +02:00
krepa098
a159b80801 removed workaround 2014-10-01 16:45:10 +02:00
krepa098
5e328d2404 more styling 2014-10-01 16:45:10 +02:00
krepa098
04f56cc9ec unmessification 2014-10-01 16:41:17 +02:00
krepa098
214e428b7e cleanup, use qss instead of QPalette 2014-10-01 16:41:17 +02:00
krepa098
a4cd2d34db cleanup, applied some of the "Tox User Interface Guidelines" 2014-10-01 16:41:17 +02:00
krepa098
c260a7a100 MaskablePixmapWidget: auto-detect a suitable background color 2014-10-01 16:41:17 +02:00
dubslow
8d9d53b9e9
fix double free 2014-09-30 22:55:07 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
dd96df9940 Fix performance regression, revert part of 87c9bbf1e6 2014-09-30 22:46:24 +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
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