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

63 Commits

Author SHA1 Message Date
dubslow
7ce7da0776 properly implement clearing contacts list 2014-10-09 00:58:35 -05:00
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
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
krepa098
23a64ef45f removed broken custom window decoration 2014-10-04 11:03:50 +02:00
dubslow
5f106ab618 add receive actions (no one to test with currently) 2014-10-02 01:01:23 -05: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
7735973d94 remove duplicate code 2014-09-28 12:57:27 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
21d084e258
Compat with toxcore 2014-09-28 10:56:02 +02:00
krepa098
5662aa933f Added MaskablePixmapWidget, improved avatar rendering 2014-09-26 19:13:08 +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
e4e36dc946 initial new settings widget, subforms not started
also "filing" some files under misc
2014-09-15 22:42:41 +02: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
a7c75e63a5 Clean code, improve compilation speed 2014-09-11 15:44:34 +02:00
Dubslow
7aab85251e Merge branch 'master' into profiles
Holy shit first big merge of my career, I'm mildly amazed it even compiles

Conflicts:
	core.cpp
	widget/form/settingsform.cpp
	widget/form/settingsform.h
	widget/widget.cpp
2014-09-05 03:53:00 -05:00
apprb
e76464a320 further GroupWidget and FriendWidget unification: activeFriendWidget and activeGroupWidget pointers replaced by the unified activeChatroomWidget pointer 2014-09-01 23:58:01 +07:00
apprb
fd4c47cba3 Widget code cleanup: removed isFriendWidgetActive and isGroupWidgetActive 2014-08-31 23:49:15 +07:00
Tux3 / Mlkj / !Lev.uXFMLA
76971f5238 Make notifications consistent
Notify of AV and FT requests if we're selected but not active or minimised, and add sound (consistent with how message notifications work)
2014-08-31 18:30:04 +02:00
apprb
a3785f3c27 Widget::updateFriendStatusLights moved to FriendWidget 2014-08-31 22:02:08 +07:00
apprb
11c6dd7bec sort the friendlist by contact Status 2014-08-23 02:12:37 +07:00
krepa098
c9d04748dd put back the not so native window decoration, status panel respects
friendlist width, some tweaks to the layout
2014-08-11 13:56:52 +02:00
krepa098
921b8478f6 removed "the super ugly hack", Widget derives from QMainWindow 2014-08-11 10:00:08 +02:00
Bill Winslow
f9a3192f30 incremental improvements to profiles, more work required 2014-07-23 04:22:09 -05:00
Bill Winslow
8aa451bb5b Merge branch 'master' of https://github.com/tux3/qTox into profiles 2014-07-23 02:50:10 -05:00
Kevin Flynn
88cc57f4bc Fix #142 2014-07-20 11:17:06 -07:00
dubslow
46848d7712 Profiles, with at least a few bugs:
sanitizing file names isn't done, delete fails because of autosaves, and imports segfault for me
2014-07-16 20:00:23 -05:00
dubslow
e3da9badac Basic infrastructure for profiles is in place, now I gotta hook up the UI 2014-07-16 17:43:30 -05:00
Bill Winslow
806b8ea7c3 cleanup 2014-07-11 12:17:37 -04:00
Bill Winslow
26f2f143fa Initial commit for activating the file transfer button
It compiles, but is in fact untested (and requires one small new icon)
2014-07-11 12:05:18 -04:00
Arne Böckmann
a164e7a991 FIX: updated username and status message on editingFinished() instead of textEdited(). I.e. if the user presses return or the widget loses focus. 2014-07-07 19:10:24 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
6ba8be3503 Fix stack smashing, QTimer threading
QTimer CAN NOT be handled from a different thread, we needed to push them to the Core's thread

Allocating a large video frame buffer on the stack is a Bad Idea(tm), this commit fixes a bad buffer overflow

Also improve our QTimer handling during calls, no need to disconnect/reconnect on call start/end, once is enough, and no need to keep them on the stack
2014-07-07 00:12:07 +02:00
Bill Winslow
14a7d298f4 Added GPL header to all source files 2014-07-06 12:19:45 -04:00
Kevin Flynn
46784cc1cc Improved status button 2014-07-05 13:54:27 -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
Kevin Flynn
898a366cdd Fix bug #58, clean up some uneeded code 2014-07-04 23:50:18 -07:00
Tux3 / Mlkj / !Lev.uXFMLA
0a41c0d712 Merge PR57 2014-07-04 16:24:27 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
056cf1d658 Context menu to set status
Closes #62
2014-07-03 19:33:08 +02:00
Kevin Flynn
f1d30cbc14 Fix window resize bug 2014-07-03 10:10:49 -07:00
Arne Böckmann
1d216d0ee3 FIX: const correctness 2014-07-03 09:22:12 +02:00
Kevin Flynn
a34e28518f Added resizable friendList
Not perfect, but a good start. Note that the editable name&status labels
disappeared, QDesigner seems to have turned them into regular QLabels
(no idea why).
2014-07-02 23:43:23 -07:00
Kevin Flynn
fac182596b Fix segfault on friend id copy 2014-07-02 15:27:30 -07:00