3691 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nils Fenner	6644622301	fix #2360 ... The valid result prevents starting a second instance.	2015-10-11 23:08:49 +02:00
Nils Fenner	7cf1f564b0	remove dead code	2015-10-11 23:07:37 +02:00
agilob	7afeb41b1e	Merge remote-tracking branch 'antis81/ngf/fix/screen-grabber'	2015-10-11 20:27:46 +01:00
agilob	4a4df15662	Merge remote-tracking branch 'Impyy/feature-rm-avatar'	2015-10-11 20:21:36 +01:00
agilob	cf98376587	generalsettings form: removed empty label	2015-10-11 18:51:08 +01:00
agilob	15077ec142	reorganize generalsettings: ... * tab order on widgets * better spacing * consistent text * indentation for similar settings	2015-10-11 18:46:35 +01:00
Nils Fenner	5ddfc2eefe	cleanup inheritance QThread --> QObject and includes ... IPC is actually not running in a thread; And if, QThread should not be inherited.	2015-10-11 13:49:22 +02:00
Nils Fenner	42a917fc58	remove obsolete QThread::msleep completely	2015-10-11 13:47:19 +02:00
agilob	884547cd34	Video: fix sgefault when disconnecting from video call	2015-10-11 10:46:42 +01:00
agilob	73993e8b5d	update video mode on manual change , closes #2046	2015-10-11 07:58:36 +01:00
agilob	cffac87cbd	nicely close camera when quitting qtox from opened av tab, fixes #2037	2015-10-11 07:50:08 +01:00
agilob	7c6ac40d21	add debugging messages to camerasource, code reformatting to make it more readable and ogranized better	2015-10-11 07:38:44 +01:00
Zetok Zalbavar	59b9e01b02	Merge pull request #2376 from BiTOk:Fix2015 ... Added clear button for search field #2015	2015-10-11 00:17:34 +01:00
bitok	23a0f748dd	Added clear button for search field #2015	2015-10-11 01:15:30 +03:00
Zetok Zalbavar	04cf6d0133	Make Change password dialog ~consistent with login page password form ... Make text about password not matching appear only when passwords don't match. Change width of dialog window, to make it look better. fixes points 1 and 2 from issue #2337	2015-10-10 18:58:59 +01:00
Nils Fenner	a6a8f619b2	no need to install an event filter on "this"	2015-10-10 17:55:29 +02:00
Nils Fenner	073d4f0ad3	fix hide/restore qTox windows with space key	2015-10-10 17:54:56 +02:00
Nils Fenner	6e383fa0f1	add methods to hide & restore currently visible qTox windows	2015-10-10 17:45:23 +02:00
Nils Fenner	24aec1dfd3	ScreenshotGrabber::showGrabber isn't a slot	2015-10-10 17:41:04 +02:00
Nils Fenner	75ba20cb06	simplify graphics scene initialization	2015-10-10 17:39:59 +02:00
Nils Fenner	b5493178e7	cleanup includes	2015-10-10 17:34:33 +02:00
agilob	83bcf2b8ae	fix closing video device after changing tab	2015-10-10 14:26:35 +01:00
agilob	0e9cfd948e	remove menubar and status bar ... Signed-off-by: agilob <info@agilob.net>	2015-10-10 13:55:14 +01:00
agilob	266c0fb989	Merge branch TheSpiritXIII:video	2015-10-10 13:49:30 +01:00
agilob	375c34c079	Merge remote-tracking branch 'thenain38/fix-User-display-name-empty'	2015-10-10 12:46:07 +01:00
TheNain38	2db1d1449f	Fixdisplaying Pub key when name empty	2015-10-10 13:25:58 +02:00
tux3	aa303b24b3	Merge branch 'pr2363'	2015-10-10 12:32:19 +02:00
tux3	b0647b0b4b	Merge branch 'pr2361'	2015-10-09 09:42:40 +02:00
tux3	19a1851547	Small startup speed improvement	2015-10-09 02:11:06 +02:00
bitok	aff85a7ea6	2257 Fix and Style comboBox fix	2015-10-09 01:31:34 +03:00
Zetok Zalbavar	e89b7e1c6d	[README.md] inform that osx maintainer is wanted	2015-10-08 22:57:22 +01:00
bitok	af7b8b7a25	Merge branch 'master' of https://github.com/tux3/qTox into FriendListLayoutFix	2015-10-08 22:55:42 +03:00
bitok	42e0770991	Fixed FriendListLayout constructor delegation fix	2015-10-08 22:53:46 +03:00
agilob	6e0c0d1210	Merge remote-tracking branch 'PKEv/fix_save_position_when_moving_widget'	2015-10-08 20:39:28 +01:00
agilob	bc6e2287d9	Merge remote-tracking branch 'thenain38/master'	2015-10-08 19:00:08 +01:00
agilob	de9aba2734	Merge remote-tracking branch 'zetok/fix-emoticon'	2015-10-08 18:55:51 +01:00
tux3	59e0692069	Sleep 10ms in IPC wait loop, not 10 SECONDS! ... Fixes #2334	2015-10-08 19:54:06 +02:00
Zetok Zalbavar	1e5043707f	TwitterEmojiSVG: make only 😊 (1f60a) to be associated with ^_^ ... also change tabs to spaces closes #2358	2015-10-08 15:29:41 +01:00
Zetok Zalbavar	42659aefe8	Merge pull request #2356 from lukasepple:patch-1 ... adds japanese versions of the cat text smiley	2015-10-08 10:46:13 +01:00
tux3	bfc62ab38c	Merge branch 'pr2357'	2015-10-08 11:31:16 +02:00
Impyy	fbd95b0781	Fixed #2294 - Remember proxy type after retranslation	2015-10-07 19:44:12 +02:00
sternenseemann	215282014f	adds japanese versions of the cat text smiley	2015-10-07 18:14:27 +02:00
tux3	3e75fd4dbc	Merge branch 'pr2354'	2015-10-07 17:20:40 +02:00
tux3	56cccc7492	Fix #2228: Friendlist too wide on first start	2015-10-07 15:28:20 +02:00
agilob	6c26262ba3	Merge remote-tracking branch 'thenain38/fix-HTML-username-status'	2015-10-06 19:01:45 +01:00
agilob	91d9f263ce	Merge remote-tracking branch 'thenain38/dynamic-call-video-mute-unmute-trans'	2015-10-06 18:56:48 +01:00
PKev	0152937eb4	fix: save position when moving widget ... fix #2063	2015-10-06 16:13:47 +03:00
Impyy	98c21f3832	Added a context menu to edit/remove the avatar	2015-10-05 22:03:31 +02:00
agilob	eaf44c45d5	Merge remote-tracking branch 'zetok/screenshotname'	2015-10-05 19:48:55 +01:00
agilob	f50f29b05f	Merge remote-tracking branch 'zetok/deprecated'	2015-10-05 18:18:33 +01:00