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

1997 Commits

Author SHA1 Message Date
Tux3 / Mlkj / !Lev.uXFMLA
69d5619db0
Don't call auto-updates unstable anymore 2015-01-25 22:51:19 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
0eba4fefca
Change some signal connections to new style 2015-01-25 21:51:21 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
328f75ac6d
Add real buttons for CallConfirmWidget
Still sort of placeholders, those are just upscaled buttons extracted from a screeshot, but those will work in the meantime
2015-01-25 19:12:36 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
279debdab9
CallConfirmWidget: track anchor's position 2015-01-25 18:43:30 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
b10edb9baf
CallConfirmWidget: don't overflow to the right 2015-01-25 17:53:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
40478d6bac Show call confirm under video if appropriate 2015-01-25 17:39:26 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
b13c27202a Stylized CallConfirmedWidget, placeholder buttons 2015-01-25 17:39:26 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
32bf56c7d9 Implement new call confirm widget logic
Works, but does not have any styling at the moment
2015-01-25 17:39:26 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
3f433f1176
Pixel-perfect spacing of chat form buttons 2015-01-25 17:18:20 +01:00
krepa098
6719ebebae Added Timestamp class, moved output generation while saving to
GenericChatForm and changed the generated layout
2015-01-25 14:34:36 +01:00
krepa098
6e05782fb7 ChatLog: busy-screen during resize
Gets rid of most ugly hacks
2015-01-25 14:06:06 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
909ade6d5e
Fix #1039
And fix ChatTextEdit's inconsistent behavior of not forwarding backspace key press events while we're at it.
2015-01-24 23:37:43 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
33ac7deee0
Fix #1040 2015-01-24 22:46:11 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
3262326657
Fix #681
When minimized to tray, if a popup is closed, Qt notices that the last window is closed and exits. Tel Tell friend request dialogs to not exit on close
2015-01-24 19:58:16 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
6e1484252a
Fix possible crashes on exit, add debug info 2015-01-24 19:32:15 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
d35ebb22f0
Fix some memory leaks and fix #1038 2015-01-24 15:31:50 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
8876dad457 Save camera video res in settings
Fixes #1033
2015-01-24 02:04:00 +01:00
Dubslow
f6ff421aff
Fix two minor bugs 2015-01-23 08:31:13 -06:00
Dubslow
7fb7ae1fc8
oops, fortunately this wasn't a bug yet... 2015-01-23 08:00:50 -06:00
Dubslow
358a56c555
Confirm decrypt data, various ui/txt tweaks 2015-01-23 07:07:52 -06:00
Dubslow
18e875ef20 Fix bug with initial password dialogs accepting empty passwords 2015-01-23 07:07:31 -06:00
Dubslow
29cc9e1b7d
Merge branch 'encryption' into master
Conflicts:
	src/main.cpp
2015-01-23 01:51:39 -06:00
Dubslow
44ddb8789c
In groupchats, check for sanitized name as well
Fixes #952
2015-01-23 01:35:21 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
aa9d0e06d1
Use Yes/No, not Ok/No when asking questions 2015-01-22 20:21:13 +01:00
Dubslow
908dafd3b8
Simplify regex 2015-01-22 10:20:38 -06:00
Dubslow
34b9236d58
Fix most of the things suhr mentioned
also added colons a buncha places
translation->language
save files in->save to
moved emoticon size after smiley pack
Ignoring the excellent point raised by zer0-One for now
2015-01-22 10:07:20 -06:00
Dubslow
0428b5c87a
Move "Make Tox portable" to advanced settings tab 2015-01-22 09:55:24 -06:00
novist
3bec2751e0 Separate setting to show window on new message (without focusing window)
Setting to always notify on messages in group chats (like normal chats)
Check for mentioned name only triggers if name is not in the middle of other word
2015-01-21 13:54:51 +02:00
novist
eade2969fe General settings UI cleanup 2015-01-21 13:14:08 +02:00
Zetok Zalbavar
4d045950e9
Remove unnecesary word 2015-01-21 06:35:28 +00:00
Dubslow
96fd1e514d
Fix #967 2015-01-20 02:07:56 -06:00
Dubslow
2d2522626c
Typing notifications disappear automagically
Fixes #984
2015-01-20 01:27:48 -06:00
Dubslow
7aa52ff754
Fix profile settings issue from command line, default unencrypt history is Cancel 2015-01-19 22:23:13 -06:00
Dubslow
b1180a2038
Improve dialogs around unencrypting history, per zetok's suggestions 2015-01-19 21:16:28 -06:00
Dubslow
e233c8171f
minor reword
(I meant to apply this with the relevant merge commit, but forgot to "git add"... life is hard)
2015-01-19 19:21:34 -06:00
Dubslow
2805737b8d
Merge branch 'pr1015'
also minor re-reword
2015-01-18 19:55:15 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
ef64a0ef4c
Check that dropped files are readable&non-sequential
Fixes #934

No, you're not allowed to send /dev/urandom to your friends. Ever.
2015-01-19 00:22:40 +01:00
krepa098
2914a9883c ChatMessage::createTypingNotification, resized images to 18x18, new
(spinning) notification icon
2015-01-18 12:20:13 +01:00
krepa098
882d19d311 "%user is typing..." -> "%user ..." 2015-01-18 11:54:08 +01:00
Zetok Zalbavar
a23d2acf21
Re-word 'Compact layout' → 'Compact contact list'
Apparently it can be worded better, to be more self-explanatory for users
2015-01-16 06:36:20 +00:00
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
def43706eb fix incompatibility of MSAA (SampleBuffers) and SingleBuffer mode in VideoSurface 2015-01-14 15:26:02 +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
e5d736e6c0 fix videosurface flipping buffers 2015-01-12 18:07:58 +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
krepa098
0f52bf3f5c moved history loading to FriendWidget::setAsActiveChatroom() 2015-01-07 13:16:09 +01: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
Tux3 / Mlkj / !Lev.uXFMLA
8813d6e4ca
Fix #909 2015-01-05 09:54:03 +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
Tux3 / Mlkj / !Lev.uXFMLA
10a2213e66
Merge branch 'pr978' 2015-01-04 15:07:36 +01:00
Nokta-strigo
1ec40b74b7 Contacts changing status to offline and having new events are not moved to the bottom of the list. (see issue #740) 2015-01-04 14:54:22 +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
b76e9a295d disabled group joined/left messages
Conflicts:
	src/widget/widget.cpp
2015-01-03 10:23:50 +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
Dubslow
75331af311
Merge branch 'pr965' 2014-12-31 00:50:03 -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
novist
30d9862c4f Removed explanations from tray menu 2014-12-18 20:32:28 +02: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
84dea5e12c
Revert "fix #902"
@apprb #932
This reverts commit 13306031e2.
2014-12-13 12:18:43 -06:00
Dubslow
a8b1f60256
Merge branch 'pr923' 2014-12-12 18:40:24 -06:00
Dubslow
cc4cc7d7a8
Merge branch 'pr922' 2014-12-12 18:37:06 -06:00
novist
e2bf37c139 Light tray icon option 2014-12-12 12:12:12 +02:00
lumirayz
f469e1b892 fix more consistency issues 2014-12-11 19:11:21 +01:00
Zetok Zalbavar
e0993a72f6
Style corrections
'if()' → 'if ()'
'for()' → 'for ()'
2014-12-11 18:05:52 +00:00
apprb
13306031e2
fix #902 2014-12-11 21:33:38 +06:00
lumirayz
038b4cedcb make the code style more consistent 2014-12-11 15:31:01 +01:00
lumirayz
c73b07db72 added a compact layout for the friends list 2014-12-11 13:02:45 +01:00
Dubslow
7fc7b57934
refactor/fix switching profile with separate settings 2014-12-09 15:43:43 -06:00
Dubslow
5cb1b6fe8e
check for no systray, fixes #908
cant believe it took this long to figure out ;_;
2014-12-09 14:18:12 -06: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
db2d9321e4
fix change profiles button 2014-12-05 20:58:44 -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
4e1a204bc0
Fix threading issue with startup pw popup
The GUI is slow to update after accepting a password, but a cursory ten minute investigation didn't yield why
I inserted a processEvents() call before ready = true; at the end of Core::start, but that didn't help.
Define the total time between the password dialog disappearing and the UI updating with your own status is T:
Then my debug statement indicated that this processEvents call happened around 1/3T, raising two questions:
1) What the hell is happening between 0 and 1/3 T? Decryption doesn't take that long...
Note that bad passwords are immediately rejected with a new dialog, so I highly doubt it's the decryption cpu time
2) The remaining 2/3rds: processEvents has been called after the avatar and username signals, yet they
don't update in the UI till time T when everything updates after bootstrapping...

Oh well, like I said, only a cursory investigation
2014-12-05 18:23:13 -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
dubslow
8985466ed3 core encryption file is basically complete, I need to verify privacy tab 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
4adfa986b5
touchup, more appropriate legal message 2014-12-01 15:28:53 -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
1340e00f69 re-move idle timer construction before restoreGeometry 2014-12-01 14:04:18 -06:00
Dubslow
9df3fdc2a0 move new functions to a more logical location 2014-12-01 14:04:17 -06:00
novist
0810559bcb Window geometry saved when window is resized Splitter position saved when splitter is moved
Fixed restoring of window geometry when "Start in tray" is unchecked
2014-12-01 14:04:17 -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
677058eb65 Reorganized platform-dependent code
Auto-away timer check reduced to 1s
2014-11-28 11:41:45 +02:00
novist
8e4f69aa79 Added copyright notices to platform.*
Changed u_int** to uint**
2014-11-28 11:41:45 +02: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
Tux3 / Mlkj / !Lev.uXFMLA
4c379640b8
Merge branch 'pr854' 2014-11-25 20:00:27 +01:00
novist
beae534d66 Starting client activates existing instance if such exists 2014-11-25 19:11:05 +02: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
41d799b251
GroupWidget: menu reordering 2014-11-24 00:58:53 +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
apprb
92c330b7bd
GroupList refactoring 2014-11-24 00:58:53 +09:00
nachfuellbar
64b3cdf139 Update generalform.cpp
Fixed typo
2014-11-21 20:23:31 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
f8063fc809
Fix idleTimer use before construction 2014-11-20 00:22:44 +01:00
dubslow
c270166daa fix #811 2014-11-19 22:31:46 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
ec20eef3e3
Merge branch 'pr815' 2014-11-19 22:28:54 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
599c246ec7
Move group audio playing to Audio singletong/thread
This is a bit of a quick fix for a new bug, as but part of cleaning up the audio code and moving it to the Audio singleton
2014-11-19 22:26:04 +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
6831778371 fix bug (which is actually why aliasing was menu'd in the first place) 2014-11-17 21:22:40 -06:00
dubslow
845216fa2f set aliases from chat form (half of #780) 2014-11-17 20:15:44 -06:00
dubslow
d533c4089d remember status when disconnected (should help with #715) 2014-11-17 19:40:36 -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
Tux3 / Mlkj / !Lev.uXFMLA
cd31812dac
Widget: Don't delete icon, it's a child 2014-11-17 22:49:35 +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
Maximilian
52255eb332 similar bug, when closing the window... 2014-11-16 15:22:53 +01:00
Maximilian
b97e66d589 Minor bug fix:
The main window, will never be visible, when the user unchecked 'Show system try' and checked 'Start in tray'.
2014-11-16 15:22:44 +01:00
dubslow
e6c08ad208 fix title editing issue, reported by "whoever" 2014-11-16 15:17:36 +01:00
dubslow
40addf9155 "overhaul" window title, fix #753 2014-11-16 15:17:22 +01:00
dubslow
02e29d6600 auto away done right (fixes #751) 2014-11-16 15:17:02 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
bb48852d87
Fix tox: url highlighting breaking the :tox: smiley
Fixes #772
2014-11-16 13:50:45 +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
3de63c0061
Fix #767 2014-11-15 23:17: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
Tux3 / Mlkj / !Lev.uXFMLA
b0e6f1168c
Prepare for theme colors support 2014-11-15 18:29:41 +01: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
b8031498db
Fix CroppingLabel emitting textChanged twice 2014-11-14 20:12:23 +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
dubslow
d566f5f9b3
minor autoaway tweak 2014-11-13 23:56:22 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
ee2507f8e0
Fix conflicting declarations struct/class vpx_image 2014-11-13 22:40:10 +01: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
12431c3047
Better debug output for groupchat not found 2014-11-13 19:43:32 +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
dubslow
d87cf99d8f
minor tweaks to autoaway, one new debug message 2014-11-13 00:20:41 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
4bb91143d7
Fix use after free of groupchat invites
Fixes #728, fixes #706, fixes #394
2014-11-13 00:13:11 +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
3dd15f0a5f fix minor switching bug introduced by 07ea2e 2014-11-11 17:00:24 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
76a8affcdc
Fix #719 2014-11-11 23:27:30 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
7bca831066
Build our Settings after our QApplication, fixes crash on startup
Thanks to @stqism for reporting the crash

This is why global static variables are evil
2014-11-11 23:21:16 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
57bcda7cd9
Merge branch 'pr721' 2014-11-11 23:13:08 +01:00
dubslow
4b6b26c553 more robust exporting, fixes #716 2014-11-11 16:06:15 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
8fceb4b78b
Accept and default to AV groupchats
We don't send or play any audio yet, though
2014-11-11 16:05:01 +01: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
apprb
694cd90ee4
read receipt infrastructure 2014-11-10 20:49:38 +09:00
dubslow
37a5c637f5 properly unminimize 2014-11-10 10:37:41 +01: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
Kristian Buchman
cbad1c4966 Add the option to open qTox when a message is recived 2014-11-10 10:37:06 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
fbbffc0806
Merge branch 'pr686' 2014-11-10 01:17:35 +01:00
saneki
d74d060e99 Formatting, tr() for UI strings 2014-11-09 18:04:35 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
55939e9563
Merge branch 'autoupdate' 2014-11-10 00:34:33 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
0054787826
Add an option for auto-updates on Windows
With the update server hosted on my laptop...

Fun fact: Updates are really easy to mess up right now. If I forget to update the update server, everyone gets downgraded. Upload a bad file and everyone will crash. Fun stuff.

Upates Are Experimental™ and off by default.
2014-11-10 00:31:29 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
45e20187cc
Download and applying updates, qtox-updater
The auto-updater is essentially done, except for the GUI. For now this is only an API.
The API works, but the tools to manage the update server would need some love
2014-11-09 23:24:39 +01:00
saneki
55bb6ac367 Additional error info for failedToAddFriend, checks if friend is added already 2014-11-09 13:23:43 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
965254d151
Teach the AutoUpdater to read a flist
We can now read the list of files in an update, along with the install path, file size, and signature

Everything, metadata and files, is signed with ed25519, but not encrypted
2014-11-09 17:55:38 +01:00
Zetok Zalbavar
45848066a2
Minor touch-up
Add '*.orig' to .gitignore
Add '.' to string
2014-11-09 12:27:08 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
c30c1c6022
Don't notify the same status change twice
Fixes #676
2014-11-09 02:02:00 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
3d9cc86e30
Show the date for each new day when loading history 2014-11-09 00:08:28 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
18cf3a806b
Don't free actions owned by the system tray menu
Thanks to mannol for reporting the issue
2014-11-08 23:14:22 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
a158aed643
Autoload last week of history on startup
Only if keeping history is enabled, of course
2014-11-08 22:43:33 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
4959d8833a
Fix #674 2014-11-08 17:47:13 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
741c9771ea
Remove dead assignement, useless include 2014-11-08 16:31:12 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
e1b95105bc
Fix #671 2014-11-08 14:46:57 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
1c952f280a
Fix #670 2014-11-08 14:07:51 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
5e906d1767
Merge branch 'pr664' 2014-11-07 23:19:27 +01:00
dubslow
b707ce2c91 remove incorrect line 2014-11-07 16:17:23 -06:00
dubslow
3d073bcd9a Same mistake every time... 2014-11-07 16:06:37 -06:00
dubslow
7a20254dd1 handle tox save files, also fix IdentForm bug 2014-11-07 15:45:21 -06:00
apprb
9947a34465
main window title proper updating 2014-11-08 01:50:39 +09:00
apprb
c1ef9115d0
Alias: remove unnecessary symbols + size limit 2014-11-08 01:40:22 +09:00
apprb
58eebcb2a6
load/save aliases from the settings file 2014-11-08 01:07:21 +09:00
apprb
af8df8e707
possiblity to setup alias 2014-11-07 23:56:15 +09:00
apprb
b316f6e13f
only public key is necessary 2014-11-07 23:56:14 +09:00
apprb
59748886de
struct Friend refactoring 2014-11-07 23:56:14 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
f29305bb01
Warn user if we try to use DNS with a SOCKS5 proxy
Ask if we really want to do a DNS request, without the proxy

Fixes #627
2014-11-06 23:50:36 +01:00
agilob
23d14553ae
tox:id 2014-11-06 16:55:10 +00:00
agilob
a10f04eb27
highight tox:// in chat 2014-11-06 16:38:33 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
186ce73455
Tox URI: Handle nonstandard tox:// URI scheme as well 2014-11-06 15:26:48 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
c26bec3982
Merge branch 'pr646' 2014-11-06 15:22:01 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
a035cc5576
Implement IPC, Tox URI, refactor Tox DNS 2014-11-06 15:12:10 +01:00
agilob
3f7adb066c
disabling emoitcons 2014-11-06 13:55:12 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
85aca2ca40
Fix typo 2014-11-06 00:13:33 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
aa98222e11
Merge branch 'pr634' 2014-11-05 23:56:38 +01:00
agilob
31f8a4308e
window titles 2014-11-05 22:47:52 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
9d5b5d437d
Enable swedish translation 2014-11-05 23:34:35 +01:00
agilob
d9a3f1a5e2
cleaning in settings.cpp filetransferinstance.cpp and friendwidget.cpp, global autoaccept, per friend and qmenunu simplificated 2014-11-05 22:34:28 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
0b6a4a6481
Implement tox3 support, keep tox1 as silent fallback 2014-11-05 23:27:51 +01:00
agilob
c702e18ccf
global autoaccept files 2014-11-05 21:59:29 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
de3befe116
Fix compilation warning 2014-11-05 22:46:24 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
d158d27fc5
Check Tox DNS protocol version, reject if not tox1
We only support tox1 for now, and soon we should tox3
2014-11-05 20:48:46 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
7372fe5314
Merge branch 'pr630' 2014-11-05 17:43:02 +01:00
agilob
9a5c5484ba
autoaccept: unused code 2014-11-05 15:52:05 +00:00
agilob
b9a3341e95
autosavedir: keep previous directory in case of cancelling 2014-11-05 15:49:55 +00:00
agilob
3dbbbd1caf
autosaveDir, useEmoicons, selectTimestamp added to GUI and settings 2014-11-05 15:20:32 +00:00
agilob
a07c83466c
another unused opration 2014-11-05 12:14:39 +00:00
agilob
954d53f64a
more pl translations
* removed unused code
* notification about rejected call(not tested)
* notification about cancelled call
2014-11-05 12:02:38 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
866a8a147e
Merge branch 'pr625' 2014-11-04 21:45:21 +01:00
dubslow
f8fa37e4a9 fix #624 2014-11-04 14:32:38 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
df64c9e933
Put translations in alphabetical order 2014-11-04 21:05:30 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
710ba48d30
Bulgarian translation: 'българин' -> 'Български' 2014-11-04 21:03:01 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
41237a9bbc
Release, enable bulgarian translation 2014-11-04 20:10:35 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
36017a124f
Merge branch 'pr612' 2014-11-03 23:21:11 +01:00
agilob
770d7b00a8
nulling timer 2014-11-03 17:01:02 +00:00
agilob
b386e4f08f
call duration 2014-11-03 01:51:56 +00:00
agilob
a3b95e332e
style for qlineedit in status panel 2014-11-02 23:26:23 +00:00
agilob
755a5677a2
Call notifications 2014-11-02 21:07:41 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
98f15af670
Use Tox IDs internally as message author ID
Instead of names. Fixes #603

Groupchats still use names internally, since there's currently no way to get a chat member's public key throught the toxcore API
2014-11-02 18:36:27 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
5bdbc3d6d0
Don't try to load the 'en' translation
It's the default, not a translation
2014-11-02 14:24:06 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
4453bbe266
Fix #602 2014-11-02 13:38:00 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
a908e036ce
Fix #600 2014-11-02 12:47:42 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
77edbb668e
Fix #599 2014-11-02 12:24:14 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
b68134aaa7
Fix spacing of chat form head, fixes #598 2014-11-02 12:13:15 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
330ea59618
Fix #96 with a flow layout for groupchat user list 2014-11-02 10:41:58 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
2ea99eb635
Fix #459 2014-11-02 09:45:44 +01:00
apprb
99507465be
proper sending/receiving group actions 2014-11-01 22:00:43 +09:00
dubslow
19e0ef4641 remove a couple of debug statements 2014-11-01 00:30:04 -05:00
X-NicON
f6896819b8 Removed untranslatable strings 2014-10-31 21:24:28 +03:00
Tux3 / Mlkj / !Lev.uXFMLA
aabb656733
Jump to Add Friend form when quitting groupchat
Fixes part of #579
2014-10-30 10:44:26 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
b1c5dbafcc
Rename variable to match displayed text 2014-10-29 22:01:05 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
b193aa8623
Merge branch 'pr575' 2014-10-29 21:46:36 +01:00
agilob
2fc9f12d80
style selector is translatable now - made right 2014-10-29 20:46:10 +00:00
agilob
3f4550951c
network setting unification s/disable/enable/ UDP 2014-10-29 20:27:46 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
4330d7e058
Merge branch 'pr569' 2014-10-29 20:10:26 +01:00
X-NicON
fb5ed1c6b7 more strings for translation 2014-10-29 22:08:02 +03:00
Tux3 / Mlkj / !Lev.uXFMLA
c15e303d31
Merge branch 'pr565' 2014-10-29 17:38:28 +01:00
apprb
36d4998eb8
Setting forms: similar outlook and inner structure 2014-10-29 23:23:48 +09:00
Olexandr Nesterenko
6047ffe9e7 add localized strings 2014-10-29 12:13:32 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
434808cd67
Add audio in/out device to settings 2014-10-28 21:21:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
8501f3e543
Add audio in/out device list (stubs)
Clicking through the list currently has no effect
2014-10-28 20:47:20 +01:00
Wouters Dorian
50513e0fb4 Made Mute speakers button work 2014-10-28 13:50:30 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
f9df6fc8f6
Fix small memory leaks
Mostly to make valgrind happy
2014-10-28 00:01:02 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
32c3302462
Merge branch 'pr545' 2014-10-26 17:08:36 +01:00
krepa098
4aef811e44 format shader code 2014-10-26 17:08:35 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
8da7b48f3c
Merge branch 'pr544' 2014-10-26 16:25:07 +01:00
apprb
77d65a3cad
QSharedPointer<ChatAction> instead ChatAction* 2014-10-27 00:04:39 +09:00
krepa098
0d84087000 fix error: vector size mismatch for arithmetic operator 2014-10-26 09:54:57 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
7b70fd0008
Fix crash if call failed to start 2014-10-25 11:29:25 +02:00
dubslow
8153a3e8c3 add reconnect button for connection settings
some ui guru should make it not stretch to width
2014-10-24 12:35:01 -05:00
dubslow
576fd7269e disable switching buttons during calls
fixes #436, fixes #500
(well, "fixes" by preventing users from doing dumb things)
2014-10-24 12:33:46 -05:00
apprb
8300f42e02
Reducing memory consumption: no reason to store all displayed ChatActions in memory 2014-10-25 01:25:28 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
57a995117f
Merge branch 'pr523' 2014-10-24 17:21:04 +02:00
krepa098
f05e2ba9c9 refactoring 2014-10-24 16:04:47 +02:00
krepa098
15851604cd moved video stuff to src/video 2014-10-24 16:02:55 +02:00
krepa098
c5dfb33999 non-blocking cam communication, fixed CameraWorker::probeResolutions ...
called from wrong thread, try fix #408 and #495
2014-10-24 16:02:07 +02:00
dubslow
7260fdd38d fixed encryption, major testing required 2014-10-24 06:35:30 -05:00
Zetok Zalbavar
2297739dd5
Change file sending button tooltip to indicate ability to select and send multiple files 2014-10-24 08:43:13 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
2ba994c73a
Force font size in groupchat header for all DPIs
Fixes #75
2014-10-24 00:18:48 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
8dcf5ef6f3
Add tooltips to chat buttons
Fixes #516
2014-10-24 00:00:30 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
87f1ae2ccb
Disable history encryption again
For some reason it didn't work the first time, thanks @agilob for reporting that
2014-10-23 23:01:50 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
fa44956010
Disable encryption options for the moment 2014-10-23 22:11:37 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
1dc77a5d32
Fix chat head style for high DPI
Fixes #75
2014-10-23 21:53:45 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
5fae61c4e8
Don't show msgboxes outside of the GUI thread
Fixes #511
2014-10-23 20:39:28 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
f1601f389f
Merge branch 'pr423' 2014-10-23 18:47:35 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
5d69887b6d
Merge branch 'pr475' 2014-10-23 18:35:14 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
93ea674e07
Fix #503 2014-10-22 21:23:37 +02:00
agilob
bb9f7b8b63
minimum size for camera preview 160x120 2014-10-22 17:11:55 +01:00
agilob
575e57cd00
profile settings in scrollarea 2014-10-22 17:09:59 +01:00
agilob
5eec74c032
scrollbar in generalsettings 2014-10-22 16:57:41 +01:00
agilob
28d1287b18
implemented krepas suggestions about style 2014-10-22 16:27:15 +01:00
agilob
9bc1568c0d Merge remote-tracking branch 'upsteam/master' into style 2014-10-22 16:21:01 +01:00
apprb
277605ff17
cleanup 2014-10-22 23:14:42 +09:00
apprb
6caa9f1e9f
Merge remote-tracking branch 'upstream/master' into history
Conflicts:
	qtox.pro
	src/widget/form/chatform.cpp
	src/widget/form/genericchatform.cpp
	src/widget/form/genericchatform.h
	src/widget/form/settings/identityform.cpp
	src/widget/tool/chatactions/messageaction.cpp
	src/widget/tool/chatactions/messageaction.h
	src/widget/widget.cpp
2014-10-22 23:05:04 +09:00
apprb
5c0370eaed
Tox datafile/encrypted history: different passwords 2014-10-22 22:36:36 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
590ca8dc5a
Merge branch 'pr492' into HEAD 2014-10-20 20:21:41 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
50e1ecf46b
Merge branch 'pr482' into HEAD 2014-10-20 20:21:36 +02:00
agilob
7ad723a656
tryicon is made in widget.cpp now 2014-10-20 19:09:35 +01:00
agilob
68309ef55e a/v setting tab redesign 2014-10-20 14:54:27 +01:00
agilob
6e5068840d minimize to tray 2014-10-20 14:11:03 +01:00
agilob
df03a0df5a
more styles 2014-10-20 13:26:49 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
b6d581a462
Merge branch 'pr488' 2014-10-20 14:13:27 +02:00
dubslow
995e86aad9 ADD FORGOTTEN FILES WHY DO THESE THINGS HAPPEN (and fix outbound actions) 2014-10-20 06:53:17 -05:00
dubslow
aa55dcae1e fix bug, fix actions to be like irc, and a disabled feature for future 2014-10-20 06:34:17 -05:00
dubslow
30e2afcc92 add alerts on user mention (could use some tweaking, but is plenty fine for now) 2014-10-20 06:05:45 -05:00
dubslow
5b85f79055 tab completion for groupchats (fixes #486) 2014-10-20 05:01:22 -05:00
dubslow
a1ebf905b2 add global file auto accept 2014-10-19 23:25:52 -05:00
dubslow
6b8ddab84b fix #484 (took me a while to figure out lol) 2014-10-19 23:07:24 -05:00
dubslow
c1cef51d56 check for existing profile (fixes #466) 2014-10-19 22:36:39 -05:00
dubslow
eaf01aadc3 added new profiles, default name/status (fixes #465 and fixes #460) 2014-10-19 22:07:51 -05:00
agilob
d268360c51
closing to tray, gui and settings 2014-10-19 20:47:06 +01:00
apprb
dfd5b6411a
Tox datafile encryption: check 2014-10-19 23:59:58 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
9ba1d4cf41
Fix ChatForm::onAvMediaChange not checking callId/friendId
May help with #458
2014-10-19 11:32:48 +02:00
apprb
f413f14055
warn user about old encrypted history 2014-10-19 18:02:15 +09:00
apprb
eaa315eddb
various fixes 2014-10-19 17:48:10 +09:00
apprb
6febde3167
Load encrypted history log/tox datafile 2014-10-19 16:35:11 +09:00
apprb
1a37c1c421
History: almost correct handling encrypted history load/save
Things are left to do:
 1. load/save encrypted tox datafile
 2. incorrect passwords processing (ask to retype, wipe everything, etc.)
 3. reencryp history log with new password
2014-10-19 02:38:47 +09:00
Yuri
dc8ef40fba Added forgotten 'include math.h' 2014-10-18 10:30:55 -07:00
agilob
f8f5a3ca29
all form are translatable now
changed type of main tabs to pointers to fix that
2014-10-18 15:54:52 +01:00
dubslow
6e15bcb8d8 actually auto accept 2014-10-17 23:53:29 -05:00
dubslow
43ac1dfd0d add ui for auto accept; fixes #182 and #280 2014-10-17 22:59:59 -05:00
dubslow
ee0f94a890 fix #461, cleanup 2014-10-17 20:15:26 -05:00
dubslow
4e7a183360 add choose translations (restart required, dynamic changing is lots of work) 2014-10-17 18:06:30 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
26eb08aa00
Merge branch 'pr452' 2014-10-17 21:00:24 +02:00
agilob
2cbae5265b
max value in autoAway time, tooltip for spinbox 2014-10-17 17:57:02 +01:00
Zetok Zalbavar
c42b31fb45
Remove redundancy from settings tabs 2014-10-17 16:27:28 +01:00
krepa098
8ccadaad26 avsettings.ui layout changes 2014-10-17 16:18:34 +02:00
apprb
177b27882b
Merge branch 'history_fx' into history
Conflicts:
	src/misc/db/encrypteddb.cpp
	src/misc/db/encrypteddb.h
2014-10-17 22:14:27 +09:00
dubslow
35f95ea501 fix #438 2014-10-17 07:36:10 -05:00
apprb
1ce4820aa4
clenup 2014-10-17 21:33:00 +09:00
dubslow
9207dfc888 ui tweaks 2014-10-17 07:11:26 -05:00
dubslow
041ed3b998 Merge branch 'corencryption' into history, remove file encryption, store key instead of hash
(I forgot to commit the merge before starting work...)

Conflicts:
	qtox.pro
2014-10-17 04:13:42 -05:00
dubslow
41365ce057 Merge branch 'master' into history
Conflicts:
	src/widget/form/genericchatform.h
	src/widget/widget.cpp
2014-10-17 03:56:59 -05:00
dubslow
18d1ee9f1f Merge branch 'master' into corencryption
Conflicts:
	src/misc/settings.cpp
	src/misc/settings.h
	src/widget/widget.h
2014-10-17 03:46:52 -05:00
dubslow
3e8557466c fix #445 2014-10-17 03:02:19 -05:00
krepa098
4582706243 EmoticonsWidget: Do not close on misclick (#393) 2014-10-17 09:11:39 +02:00
krepa098
6b39184915 allow drag&drop on GroupWidget 2014-10-17 09:11:39 +02:00
krepa098
5ae2afb5c6 moved src/widget/camera.* to src/camera.* 2014-10-17 09:11:39 +02:00
krepa098
bd07666275 fixes, cleanup 2014-10-17 09:11:39 +02:00
krepa098
6e61da68e4 Settings: use QTabWidget, IdentityForm: cleanup 2014-10-17 09:11:38 +02:00
krepa098
87132389aa fixed infinite recursion under certain conditions 2014-10-17 09:09:59 +02:00
krepa098
c4529d4062 fixed css, comments, cleanup 2014-10-17 09:09:59 +02:00
krepa098
e8416a98a2 fixed compilation error + warning 2014-10-17 09:09:59 +02:00
krepa098
2913326fb2 fix #416, cleanup 2014-10-17 09:09:59 +02:00
krepa098
118b67a970 cleanup 2014-10-17 09:09:59 +02:00
krepa098
f2b730cdb9 NetVideoSource, YUV shader, fixes 2014-10-17 09:09:59 +02:00
krepa098
8b8a541826 simplified VideoSource, interface, BRG->YUV conversion changes + more 2014-10-17 09:09:59 +02:00
krepa098
1d4055858f VideoSurface: aspect ratio 2014-10-17 09:09:59 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
2a401a7e3b
Merge branch 'pr447' 2014-10-16 20:57:36 +02:00
agilob
ca08015528
s/min/minutes/ 2014-10-16 19:52:13 +01:00
agilob
f854d0e90f
set idle timer in widget.cpp 2014-10-16 19:48:45 +01:00
agilob
db6b488515
UI for autoaway 2014-10-16 18:49:50 +01:00
agilob
6bda375a7e
fixes regression sent by apprb 2014-10-16 18:24:16 +01:00
agilob
815314330e Merge branch 'master' of https://github.com/tux3/qTox into style 2014-10-16 17:17:41 +01:00
agilob
5538167a46
fix for #442 2014-10-16 17:17:25 +01:00
dubslow
8be4725acd cleanup "sign in change", since it's unnecessary 2014-10-16 17:52:45 +02:00
agilob
8788931f36 number of messages is more reliable then activities 2014-10-16 17:47:19 +02:00
agilob
fea3fa3ac7 renamed function 2014-10-16 17:47:18 +02:00
agilob
698902a8dc status changes messages and sign in notifications
sign in notifications available only in settings and as a message in chat
2014-10-16 17:47:18 +02:00
agilob
14ea88c070 style selector
Unfortunately Qt developers removed some old native skins from support, only 3 skins are supported on Linux.
Number of native skins depends on OS and Qt built system.
2014-10-16 15:18:19 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
d96ef1a970
Merge branch 'pr419' 2014-10-16 14:05:05 +02:00
dubslow
e3cf2cac20 auto away; needs UI 2014-10-16 04:47:58 -05:00
dubslow
c1572abedf more details 2014-10-15 11:38:16 -05:00
dubslow
34bb83aca7 Merge branch 'thread' into corencryption 2014-10-15 10:51:24 -05:00
dubslow
63671ae3ff I learned some things: improve thread safety 2014-10-14 21:06:44 -05:00
dubslow
a0ca379c1b fix #436 2014-10-14 20:04:53 -05:00
apprb
e3d5853ca3
no reason to keep action flag in the logfile 2014-10-14 23:36:32 +09:00
apprb
ec3d8146c6
correct action saving into the logfile 2014-10-14 22:43:03 +09:00
apprb
14a71a0f3f
precise timestamps keeping 2014-10-14 14:49:27 +09:00
krepa098
cbf8d610c8 fixed #425 2014-10-13 16:35:57 -05:00
dubslow
68de366738 fix #431, fix export cancels, and more debug prints 2014-10-13 16:17:42 -05:00
dubslow
33e0c95ab6 Merge branch 'master' into corencryption
Conflicts:
	src/core.cpp
2014-10-13 16:07:03 -05:00
agilob
db5c115a91
removed duplicated emoticons 2014-10-13 19:50:54 +01:00
apprb
fc9f8a16f3
Merge branch 'master' into history
Conflicts:
	qtox.pro
	src/widget/form/chatform.cpp
	src/widget/form/settings/privacyform.cpp
2014-10-12 19:24:05 +09:00
agilob
45c60a17c0 Merge remote-tracking branch 'upsteam/master' into emoticon-preview 2014-10-12 11:12:10 +01:00
agilob
5abf693611 Merge remote-tracking branch 'upsteam/master' into style 2014-10-12 11:08:10 +01:00
dubslow
235d6609b9 Merge branch 'master' into profiles
Conflicts:
	src/widget/form/settings/identityform.cpp
2014-10-12 04:58:56 -05:00
dubslow
63bb51a089 Merge branch 'master' into corencryption 2014-10-12 04:55:02 -05:00
dubslow
bf75750166 Merge branch 'master' into src
Conflicts:
	qtox.pro
	src/widget/form/settings/avform.h
	src/widget/selfcamview.cpp
	src/widget/selfcamview.h
	src/widget/widget.cpp
	widget/selfcamview.h
	widget/videosurface.h
2014-10-10 17:21:54 -05:00
dubslow
3ba95d82ae Move code into src/ 2014-10-07 23:26:25 -05:00