393 Commits

Author	SHA1	Message	Date
Dubslow	33dfb88962	Merge branches 'pr990', 'pr1008', 'pr1009' and 'pr1011'	2015-01-15 01:48:11 -06:00
Dubslow	1ab9bb77e6	Fix OS X bug with overlapping buttons ... Fixes #910	2015-01-15 01:45:42 -06:00
derMart	4540fb09aa	fix resetting AVForm resolution combobox index to get change signal always fired during init	2015-01-14 23:44:38 +01:00
derMart	c018165497	fix missing showEvent in AVForm	2015-01-14 15:27:57 +01:00
derMart	290f6d4697	refactoring audio device initialization in av setting to prevent opening devices twice	2015-01-12 18:08:25 +01:00
derMart	7d11e9192c	0x0 resolution removed ... better camera initializing in av settings	2015-01-12 18:08:14 +01:00
derMart	3a107e33c8	fix utf8 audio device specifier names on windows	2015-01-12 18:07:30 +01:00
Dubslow	d74b95a7b7	Merge branches 'pr920', 'pr1001', 'pr1003' and 'pr1005'	2015-01-12 06:01:50 -06:00
krepa098	85568337e3	cleanup	2015-01-11 12:02:24 +01:00
krepa098	f574a43581	FileTransferWidget: fixed autoaccept	2015-01-11 11:57:33 +01:00
krepa098	904627e50a	moved typing notifications to ChatLog	2015-01-10 11:57:46 +01:00
minj	97a78d5c14	add lt.ts	2015-01-10 07:27:31 +02:00
krepa098	d9e15fb0ba	Merge branch 'master' into chatlog_v3_1 ... Conflicts: src/widget/chatareawidget.cpp src/widget/form/chatform.h src/widget/form/genericchatform.cpp	2015-01-09 19:41:16 +01:00
Bruno Kühnen Meneguello	2e38a1fdb8	Add Portuguese translation	2015-01-08 10:28:53 -02:00
agilob	cbfe94d6a2	closes tux3/qtox#988	2015-01-06 14:36:03 +00:00
krepa098	f7be91c6d0	change previousId on action	2015-01-06 10:05:01 +01:00
Dubslow	139cd3f4a6	Merge branch 'encryption' into master ... Conflicts: src/core.cpp src/misc/settings.cpp src/widget/widget.cpp src/widget/widget.h	2015-01-05 20:55:47 -06:00
apprb	017c59bd82	more userfriendly history load dialog	2015-01-05 20:37:10 +06:00
krepa098	5399b40874	history: fixed regression	2015-01-05 14:05:01 +01:00
krepa098	77fe3f7256	ChatLog::insertChatlineOnTop: overload taking a list	2015-01-05 10:51:01 +01:00
krepa098	c7fe34c077	history: require markAsSent	2015-01-05 10:02:41 +01:00
Zetok Zalbavar	d36c471f4f	Some wording improvements	2015-01-04 20:25:37 +00:00
krepa098	27e967b67e	cleanup	2015-01-04 19:58:14 +01:00
krepa098	6711fd6ee4	history fixes	2015-01-04 19:29:06 +01:00
krepa098	b09805f9bf	refactoring	2015-01-04 18:21:35 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	fbc77864aa	Fix some ChatForm debug spam ... Don't log an event if it isn't meant for you	2015-01-04 17:59:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	14ad87069e	Merge branch 'pr979'	2015-01-04 15:18:07 +01:00
krepa098	64024c77a6	Moved the context menu to GenericChatForm	2015-01-04 14:21:05 +01:00
krepa098	f4c6bc3452	cleanup	2015-01-04 13:33:11 +01:00
krepa098	03ea61079b	ChatLine/ChatMessage: use shared_ptr	2015-01-04 13:29:14 +01:00
novist	4b05c10308	Fixed text copying from chat windows ... Tiny formatting fix (space after if)	2015-01-04 13:23:28 +02:00
novist	2a8cbd189d	Added typing notification support and enabled by default	2015-01-04 13:21:56 +02:00
krepa098	64f7f7c45e	use resolveToxID	2015-01-03 20:38:06 +01:00
krepa098	8a1ea18ed4	fixed history	2015-01-03 14:08:04 +01:00
krepa098	d88aa965fa	fixup merge	2015-01-03 13:13:12 +01:00
apprb	64e0116476	honouring aliases in the loaded history ... Conflicts: src/widget/form/chatform.cpp	2015-01-03 13:10:19 +01:00
krepa098	2828a97d54	styled chatlog, cleanup	2015-01-03 10:21:15 +01:00
krepa098	b0c3b4032f	chatlog: save chat log	2015-01-03 10:20:40 +01:00
krepa098	a0ea0675a7	Merge branch 'master' into chatlog_v3_1 ... Conflicts: qtox.pro res.qrc src/misc/smileypack.cpp src/widget/chatareawidget.cpp src/widget/chatareawidget.h src/widget/form/chatform.cpp src/widget/form/genericchatform.cpp src/widget/form/genericchatform.h src/widget/form/settings/generalform.cpp src/widget/tool/chatactions/messageaction.cpp src/widget/tool/chatactions/systemmessageaction.cpp src/widget/widget.cpp	2015-01-03 10:17:53 +01:00
krepa098	f1f42fc237	innerStyle, groupchats	2014-12-31 13:42:06 +01:00
Dubslow	f7bef8d5c3	Merge branch 'pr966'	2014-12-31 00:55:59 -06:00
apprb	1194df2f78	renaming: Direct Connect -> None	2014-12-30 22:02:26 +06:00
apprb	f8bdaac121	messages splitting fix	2014-12-28 23:32:19 +06:00
apprb	a14da15d79	fix #963	2014-12-28 18:32:25 +06:00
Dubslow	54e8be75d2	Merge branch 'pr938'	2014-12-17 14:43:34 -06:00
agilob	5861c6daa5	removing fixed size from mic/volume buttons so they align nicely	2014-12-17 12:36:34 +01:00
agilob	f8d870f374	removing spacing from microphone layout	2014-12-17 12:00:41 +01:00
Dubslow	fc749880eb	minor style tweaks	2014-12-16 18:05:13 -06:00
Maximilian Wuttke	e0cb122abe	Merge branch 'filter_audio' of https://github.com/mwuttke97/qTox into filter_audio ... Added some `#ifdef QTOX_FILTER_AUDIO`s. Conflicts: qtox.pro Conflicts: src/coreav.cpp	2014-12-14 10:55:38 +01:00
krepa098	3190530686	filling the gaps	2014-12-13 21:11:03 +01:00
Dubslow	a8b1f60256	Merge branch 'pr923'	2014-12-12 18:40:24 -06:00
novist	e2bf37c139	Light tray icon option	2014-12-12 12:12:12 +02:00
Zetok Zalbavar	e0993a72f6	Style corrections ... 'if()' → 'if ()' 'for()' → 'for ()'	2014-12-11 18:05:52 +00:00
lumirayz	c73b07db72	added a compact layout for the friends list	2014-12-11 13:02:45 +01:00
Sascha Brendel	17bcd969b2	Update chatform.cpp ... Improved that line of code. Thanks to @dubslow	2014-12-08 20:28:34 +01:00
Lednerb	dfb51d7d29	Added Translation for error message on sending a file. Also included the German Version.	2014-12-08 19:07:51 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	983c0b7e6b	Merge branch 'pr857'	2014-12-06 14:02:24 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	53d7bc9dc1	Push to talk with input msgedit focused	2014-12-06 13:59:19 +01:00
Simon Vermeersch	424af0505e	Focus the text input area when clicking on the text area	2014-12-06 13:54:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	324d075cfe	Change push to talk shortcut to CTRL+P	2014-12-06 13:49:04 +01:00
apprb	c0303e7a0f	password strength meter	2014-12-06 12:27:54 +06:00
Dubslow	7c7c603045	word wrap the privacy tab string	2014-12-05 21:24:03 -06:00
Dubslow	67027814e5	tweak to popup questions	2014-12-05 19:56:33 -06:00
Dubslow	2e6b0f7b2b	remove files that I shouldn't have added in the first place	2014-12-05 19:17:02 -06:00
Dubslow	961d5830c3	add fancier tray icons with status, remove relevant option	2014-12-05 17:14:48 -06:00
Dubslow	7f12c267e1	turns out the password code saving Configuration was useless anyways ... would have avoided the bug I just "fixed"	2014-12-04 13:35:34 -06:00
apprb	4c85f92e7d	plain db encryption	2014-12-04 23:44:45 +06:00
Dubslow	dccb0a9951	finishing touches	2014-12-04 10:55:14 -06:00
apprb	bac485400e	small code unification	2014-12-04 22:07:16 +06:00
agilob	561f5f9895	fixing bug #891	2014-12-04 15:51:01 +00:00
apprb	000eb8977d	history: encrypted <-> plain convertion	2014-12-04 21:22:17 +06:00
Dubslow	9a92e6c980	Clarification	2014-12-03 18:14:28 -06:00
dubslow	fc30d342bc	Added change pw buttons; encryption is very nearly done. ... @apprb there is one question and one TODO that you should look over in privacyform.cpp, as well as a TODO in historykeeper.cpp Also both the encryption settings box and the pw dialog lineedits should probably be in a QGridLayout... but I don't really want to do that by hand :P	2014-12-03 18:14:28 -06:00
dubslow	4eb3036414	Ah, much cleaner	2014-12-03 18:14:28 -06:00
dubslow	bafca96554	Incremental work, starting to take shape	2014-12-03 18:14:28 -06:00
dubslow	dde410bb9c	incremental	2014-12-03 18:10:07 -06:00
apprb	a9fb75b5ed	proper encrypted history loading	2014-12-03 18:01:31 -06:00
apprb	3c15909ffc	correct displaying of the targeted messages	2014-12-03 23:47:07 +06:00
Dubslow	3943d5213d	deleting a profile now cleans out all personal data	2014-12-02 18:48:50 -06:00
Dubslow	1c78cbc0c9	add a basic platform-disabling define	2014-12-01 18:18:27 -06:00
Dubslow	4781c8cfbb	Merge branch 'pr862' ... Conflicts: src/widget/widget.cpp	2014-12-01 15:37:09 -06:00
Dubslow	48e5315cdf	clarify systray show-status status	2014-12-01 14:55:35 -06:00
Dubslow	173eda7700	Merge branch 'pr870' ... Conflicts: src/widget/form/settings/generalform.cpp	2014-12-01 14:47:54 -06:00
Dubslow	840dadafdd	Merge branch 'pr876' ... Conflicts: res.qrc	2014-11-29 22:41:53 -06:00
Dubslow	6452cfa702	put tr list in "alphabetical" order	2014-11-29 22:32:12 -06:00
Zetok Zalbavar	5d297a78d5	Sort res.qrc and remove some unnecessary spaces	2014-11-29 11:27:36 +00:00
accino	a004fc872f	Added Spanish translation	2014-11-28 21:32:48 +01:00
novist	99fa5d9e19	Global auto-away	2014-11-28 11:41:44 +02:00
dubslow	bc381a8459	warn on can't read file, fixes #860	2014-11-27 15:00:04 -06:00
Maximilian	e989379535	Refactored system tray settings in generalform	2014-11-27 19:46:40 +02:00
novist	479644833e	Option for tray icon to display user status	2014-11-27 19:46:36 +02:00
Carsten Brandt	b1b1c468e3	adjusted translation messages ... as discusses here: https://github.com/tux3/qTox/pull/848#discussion_r20851990	2014-11-25 21:39:21 +01:00
apprb	465da29a43	minor fixes in ChatAction's creation/processing	2014-11-25 01:58:57 +09:00
apprb	ba4d877b89	rescan audio devices button	2014-11-25 01:17:34 +09:00
apprb	56ea1f1e66	using ToxID in groupchats	2014-11-24 00:58:53 +09:00
apprb	f59a67f08a	Group class refactoring	2014-11-24 00:58:53 +09:00
apprb	85718fa637	auto-update audio devices list on tab show	2014-11-24 00:58:53 +09:00
nachfuellbar	64b3cdf139	Update generalform.cpp ... Fixed typo	2014-11-21 20:23:31 +01:00
apprb	451d0c7999	check incoming data from DB	2014-11-19 22:46:50 +09:00
Tux3 / Mlkj / !Lev.uXFMLA	e8234dec89	Merge branch 'pr804'	2014-11-18 23:23:34 +01:00
dubslow	d68788c644	add group title menu option, other half of closes #780 ... also truncate all group titles to max len	2014-11-18 05:00:09 -06:00
dubslow	845216fa2f	set aliases from chat form (half of #780)	2014-11-17 20:15:44 -06:00
Tux3 / Mlkj / !Lev.uXFMLA	6eaf8f272e	Silence potentially uninitialized warning ... Turns out the warning is wrong, but let's initialize anyways	2014-11-18 02:12:19 +01:00
krepa098	3a567d962e	more work on filetransferwidget	2014-11-17 20:08:55 +01:00
krepa098	27cb075dbb	hooked up filetransferwidget	2014-11-17 16:05:14 +01:00
apprb	8f3e1c2ef3	fix #775	2014-11-17 19:11:51 +09:00
dubslow	e8964b178d	Extra tooltip and word from the un-picked commit	2014-11-16 20:31:46 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	366f98f264	Fix #635	2014-11-16 20:18:00 +01:00
krepa098	1cf9fe3474	filetransferwidget: first steps	2014-11-16 20:01:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	c1f2e9a71d	Refactor audio out of code, better resource management ... Fixes #739 and fixes #777	2014-11-16 19:04:45 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	014b39e7d0	Merge branch 'pr774'	2014-11-16 17:04:33 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	20ba8e6192	Allow to change i/o audio devices without restart ... Still needs to restart the calls for now Fixes #713	2014-11-16 16:41:30 +01:00
apprb	664c762625	using ToxID instead of bare QString + proper alias using during widget creation	2014-11-17 00:17:46 +09:00
dubslow	e6c08ad208	fix title editing issue, reported by "whoever"	2014-11-16 15:17:36 +01:00
krepa098	4ca45fd4f9	progress	2014-11-16 13:13:39 +01:00
krepa098	fd1063eb2c	bye bye base64 emoticons	2014-11-16 12:52:53 +01:00
krepa098	74bd802863	progress	2014-11-16 12:40:44 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	007a10346d	Rewrite horrible type casting pointer magic with shifts ... Why would you generate that random number byte by byte, anyway ?	2014-11-15 23:26:30 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	1f0e14c18e	Merge branch 'pr761'	2014-11-15 21:33:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	49a1d9ec07	Merge branch 'colors'	2014-11-15 21:30:41 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	2f452b6eff	Add GUI to change theme color	2014-11-15 21:30:20 +01:00
Yavor Stefanov	7eca6b7b24	VA buttons tooltip clarifications	2014-11-15 19:43:10 +02:00
Yavor Stefanov	bee6c95650	mic tooltip clarification	2014-11-15 19:35:36 +02:00
apprb	2c22968480	improved usability	2014-11-16 02:16:56 +09:00
apprb	c541291aac	Nospam id part edit	2014-11-16 01:11:00 +09:00
Zetok Zalbavar	1d2c0e1cac	Make sql tuning strings translatable	2014-11-15 10:07:55 +00:00
Tux3 / Mlkj / !Lev.uXFMLA	ed76d1621e	Fix #752	2014-11-14 22:44:09 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	c4f9baf04b	Merge branch 'pr750'	2014-11-14 18:32:03 +01:00
dubslow	71c34b9d69	group title support	2014-11-14 18:23:54 +01:00
apprb	08f523b8ff	AdvancedSettings tab introduced	2014-11-15 01:18:17 +09:00
Tux3 / Mlkj / !Lev.uXFMLA	635b8f2c02	Merge branch 'pr742'	2014-11-13 21:57:58 +01:00
Maximilian	11f9cb0cbf	I implemented a new setting, which toggles the visibility of the system tray icon. ... Background: On Ubuntu 14.04, system trays in Qt5 don't integrate into Unity.	2014-11-13 21:33:11 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	5eeae0e142	Fix push to talk even when text edit focused	2014-11-13 20:32:09 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	d5ab03d03d	Listen for push-to-talk shortcut on more widgets	2014-11-13 19:25:45 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	0c393e717a	Add simple push to talk with P ... Fixes #734	2014-11-13 19:20:06 +01:00
krepa098	808f8b1cc5	progress	2014-11-13 18:27:32 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	eac712e68a	Add GUI for audio groupchats	2014-11-13 13:14:27 +01:00
krepa098	3a34678900	progress	2014-11-12 16:45:24 +01:00
apprb	ec2e19e4bb	split message fix	2014-11-12 22:13:46 +09:00
krepa098	de52bad1db	initial commit	2014-11-12 14:11:25 +01:00
dubslow	4b6b26c553	more robust exporting, fixes #716	2014-11-11 16:06:15 -06:00
dubslow	b3e7114e84	respond to copying id, fixes #537	2014-11-10 17:20:10 -06:00
apprb	5d50ea36d0	Faux offline messaging: enable/disable	2014-11-10 22:06:35 +09:00
apprb	cee1bcc8d1	faux offline messaging	2014-11-10 20:49:42 +09:00
apprb	a6b95e7b4f	group messages	2014-11-10 20:49:42 +09:00
apprb	44fb8a360e	displaying undelivered messages in chat area	2014-11-10 20:49:42 +09:00
apprb	977649f686	ChatAction refactoring	2014-11-10 20:49:42 +09:00
apprb	f7a855aa20	store delivering status in the DB	2014-11-10 20:49:41 +09:00
dubslow	f2cc486744	UI things	2014-11-10 10:37:41 +01:00
dubslow	f2d358f222	switch to relevant chat room when minimized ... fixes #688, except that for me it doesn't actually unminimize	2014-11-10 10:37:07 +01:00