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

929 Commits

Author SHA1 Message Date
Dubslow
e2fd298d68
chat logs -> chat history, miscellaneous rewordings 2015-02-03 13:56:08 -06:00
krepa098
bc21af4fa2 ChatLog: don't start the resize worker if the width doesn't change 2015-02-03 17:28:42 +01:00
Dubslow
a572ccff27
Merge branch 'encryption' into master
Conflicts:
	src/core.cpp
	src/historykeeper.h
2015-02-03 10:21:59 -06:00
krepa098
e4c52e6118 use QPainter::setClipRect 2015-02-03 16:17:37 +01:00
krepa098
0af05929f7 fixup! Merge branch 'master' into chatlog_v3_1 2015-02-03 16:15:51 +01:00
novist
b7dd4bf829 Tray icon notification of new messages 2015-02-03 12:20:26 +02:00
krepa098
5c01f1585b change color for precise selection on focus-in/out 2015-02-03 10:33:46 +01:00
Dubslow
9c1cbb7a4d
Reword opening password dialog per srkunze's suggestion 2015-02-02 21:31:56 -06:00
Dubslow
625eb3cf5b
Code cleanup 2015-02-02 21:28:20 -06:00
Dubslow
8d999efae7
Fix the previous todo 2015-02-02 17:56:51 -06:00
Dubslow
ca5e9c324d
When enabling history encryption, check for and use previously-ignored encrypted history
Should close dubslow/qTox#5 and close dubslow/qTox#6
Note that the GUI isn't updated with the ignored history, that's a TODO
2015-02-02 17:19:43 -06:00
krepa098
8d7a32f4ec selection rect: change color on focus-in/out, action cleanup 2015-02-02 18:11:29 +01:00
krepa098
39b2771b8d tweaked ChatLog::getSelectedText 2015-02-02 15:05:27 +01:00
krepa098
e67db1575d fixup! Merge branch 'master' into chatlog_v3_1 2015-02-02 14:50:06 +01:00
krepa098
52f220c9e4 Merge branch 'master' into chatlog_v3_1
Conflicts:
	qtox.pro
	res.qrc
	src/widget/form/chatform.cpp
	src/widget/form/chatform.h
	src/widget/form/genericchatform.cpp
	src/widget/tool/chatactions/chataction.h
	src/widget/tool/chatactions/messageaction.cpp
	src/widget/widget.cpp
	ui/chatArea/innerStyle.css
2015-02-02 14:31:44 +01:00
krepa098
53ba982203 optimizations and tweaks 2015-02-02 11:11:09 +01:00
novist
6c477a0a19 Use svg for taskbar/tray icons 2015-02-02 08:07:36 +02:00
Christoffer Sterner
aee04c92e4 Playback audio slider support non-group call 2015-02-01 17:18:45 +01:00
Christoffer Sterner
866c38e7df Add support for playback audio slider setting 2015-02-01 16:58:59 +01:00
Zetok Zalbavar
c2eaa3cdb4
Some tweaks for tooltips in settings 2015-02-01 10:56:28 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
d6b34aef78
Update for toxcore API break 2015-02-01 01:25:22 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
efef2b2178
Merge branch 'pr1073' 2015-02-01 00:09:20 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
8ccd3bb3bf
Fix spurious quitting when dialog closed and in tray 2015-02-01 00:03:42 +01:00
Christoffer Sterner
0290aea47b Fix keypad enter not sending message
Issue #1068
2015-01-31 22:54:52 +01:00
krepa098
783caf932c revert to "[user] is typing" 2015-01-31 19:22:45 +01:00
krepa098
f15b9da1e1 fix a render artifact 2015-01-31 19:19:13 +01:00
krepa098
f288fe5c1e tweaks 2015-01-31 18:37:20 +01:00
krepa098
740d62ec49 change ChatLine::isVisible to false, rename Text::isVisible to
Text::keepInMemory
2015-01-31 18:12:51 +01:00
krepa098
2206db1406 comparators should be public 2015-01-31 17:50:35 +01:00
krepa098
1d6f3858d9 renamed ChatLine::boundingSceneRect to ChatLine::sceneBoundingRect 2015-01-31 17:49:19 +01:00
krepa098
6a50add547 ChatLineContent: removed boundingSceneRect() 2015-01-31 17:46:25 +01:00
krepa098
5668606159 Speed-up rendering 2015-01-31 17:39:25 +01:00
krepa098
7ec54c972c set ChatLine::isVisible to true 2015-01-31 17:32:41 +01:00
Zetok Zalbavar
13bd334d78
Add tooltips in settings
some tooltips changed to be more helpful/reflect reality
2015-01-31 09:53:12 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
7574569b3d
Fix some systray issues on windows
Fix qTox not hiding when clicking on systray icon due to losing focus when clicking on the system tray

Fix the icon not being properly hidden on exit

Thanks to @toweI for reporting those issues
2015-01-30 13:44:41 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
c32eb98e6c
CppCheck, some video perf improvements 2015-01-30 13:40:04 -06:00
kushagra
0e0e1fe83c issue 960 2015-01-29 19:22:43 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
33b32bcc33
Allow coloring multi-level quotes
To make >>mahkoh happy
2015-01-29 18:10:59 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
5fd2828dfa
Merge branch 'newsystray'
Fixes #541
Fixes #659
Fixes #807
Fixes #579
2015-01-29 17:46:47 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
da4fbf9ffb
Show systray icon by default on linux too 2015-01-29 17:46:31 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
4cc9f0f824
Fix some SystemTrayIcon issues with Qt backend 2015-01-29 17:44:23 +01:00
Tux3/Mlkj
fe83dd9445 Implement SystemTrayIcon Unity backend
With some limitations and some awful hacks, since appindicators can not differentiate left click, right click and middle click. It's already a massive pain to just get a signal when the menu is shown, without actually knowing what opened it.

I love ubuntu.
2015-01-29 17:33:17 +01:00
Dubslow
56784d2a78
Fix #1064 2015-01-29 10:26:21 -06:00
Tux3/Mlkj
f8e069f053 Fix tr warning in CallConfirmWidget 2015-01-29 14:57:30 +01:00
Tux3/Mlkj
f75e32e1e3 Implement SystemTrayIcon with Qt backend and Unity stub 2015-01-29 14:56:53 +01:00
Dubslow
b6f79e7365
Merge branch 'pr1061' 2015-01-28 22:44:13 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
19ad3ac7f1
Change -P command line option to -p
Flags should be lowercase by default for consistency
2015-01-28 21:40:09 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
7b7ff9c474
Exit if nonnexistant profile passed to -P 2015-01-28 21:33:41 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
edef42ec69
Use YYYY-MM-DD date format in logs, fixes #1060 2015-01-28 13:43:32 +01:00
Сухарик
568e21f188 fix greentext, take 2 2015-01-28 11:48:16 +03:00
Dubslow
31ac5dbe46
Fix SPE 2015-01-27 18:45:15 -06:00
Dubslow
2dc5cea1d2
Merge branch 'encryption' into master
Conflicts:
	src/autoupdate.cpp
	src/core.cpp
	src/core.h
	src/misc/settings.cpp
	src/widget/widget.cpp
2015-01-27 18:29:39 -06:00
Dubslow
0470b5a6af
Potential fix for history issues, both dubslow/qTox#5 and dubslow/qTox#6 2015-01-27 17:25:41 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
a62b1dc7ac
Merge branch 'pr1045' 2015-01-27 21:33:44 +01:00
Dubslow
60e819baee
Hacky fix to cancelling a switch to an encrypted profile closing
It's either this or some fairly major refactoring, which is preferable,
but I've got another even bigger refactoring in mind, and fixing this
will be rolled into that.
Closes dubslow/qTox#4
2015-01-27 14:16:28 -06:00
krepa098
ebebde1b09 use QSize instead of QSizeF, cleanup 2015-01-27 11:20:35 +01:00
krepa098
cfe4458d37 Moved status messages back to the left 2015-01-27 10:52:23 +01:00
krepa098
ce486eb1b3 FileTransferWidget: visual tweaks 2015-01-27 10:49:18 +01:00
krepa098
57485368cb fix showEvent calling centerOn 2015-01-27 09:58:08 +01:00
Dubslow
ed22dc9ca5
write settings *after* changing them...
closes dubslow/qTox#3
2015-01-26 19:22:38 -06:00
Dubslow
a1239747ac
fix button typo, closes dubslow/qTox#7 2015-01-26 19:12:36 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
d80c1ee8ac
Auto-update: Better resuming support, lockfree-threading 2015-01-27 00:24:42 +01:00
krepa098
f509e07c45 make use of EmojiFontPointSize (fix #1026) 2015-01-26 23:19:18 +01:00
krepa098
a558733507 ChatLog::selectAll, refactoring of actions (issue #808) 2015-01-26 19:32:33 +01:00
krepa098
ecf15a6ca3 fix regression: chatlog didn't scroll to bottom on startup 2015-01-26 19:15:29 +01:00
krepa098
0442db2bae reposition busy notification *after* resize 2015-01-26 19:01:18 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
ac2700fdeb
Fix rounding for non-square CallConfirmWidget
Thanks to @krepa098
2015-01-26 18:29:13 +01:00
krepa098
bbd20496fd specify background brush 2015-01-26 17:12:22 +01:00
Dubslow
03fe9a355f
Merge branch 'pr1052' 2015-01-26 07:25:23 -06:00
Dubslow
e90293b47a
Make compact contact layout dynamically changeable
There was some various minor incidental cleanups as well
2015-01-26 07:13:35 -06:00
krepa098
5be6caca68 [HiDPI] ChatLog: replaced all .png by .svg, FTW custom paintEvent
This does not enable HiDPI support!

issue #975
2015-01-26 14:01:42 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
1b2b4a1267
Merge branch 'pr1053' 2015-01-26 14:01:20 +01:00
agilob
2f18b2c72b
fixing problem with +1 lines in msg edit 2015-01-26 12:34:52 +00:00
novist
3a5a94c666 Fixed showing window when clicking tray icon / shortcut and window is minimized
Double-clicking tray icon shows window
Middle-clicking tray icon hides window
2015-01-26 12:43:34 +02:00
Dubslow
f7feb8ecbb
Make greentext pickier
> must be the first character (i.e. leading whitespace disables greentext)
> must be followed by a "word" character, with an optional space (sorry zetok, but this is much more intuitive)
> followed by two+ spaces doesn't count
Fixes #945
2015-01-26 04:17:52 -06:00
Tux3/Mlkj
fcd58b2c63
Update outdated autoupdate comments 2015-01-26 09:53:43 +01:00
agilob
6989346f41
dont clear msg everytime 2015-01-26 00:51:17 +00:00
agilob
c9e96300b2
added comment to explain this spaghetti 2015-01-26 00:31:54 +00:00
agilob
d3cdebd46f
removed unused code 2015-01-26 00:27:22 +00:00
agilob
fe8f6593c7
arrow up to paste previous message 2015-01-26 00:25:45 +00:00
agilob
4b854f86d1
fixed memory leaks 2015-01-25 23:06:44 +00:00
agilob
a6680916b5
undo double polishing in chatform 2015-01-25 22:28:29 +00:00
agilob
b71eafc8c8 Merge branch 'master' of https://github.com/tux3/qTox into disabling_callbutons 2015-01-25 22:20:43 +00:00
agilob
17561a8c3b
closes tux3/qtox#850 2015-01-25 22:19:25 +00:00
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
a418ae3df6 use html <center> instead of ColumnFormat::Center 2015-01-25 15:59:44 +01:00
krepa098
cae965e750 ChatMessage::createChatInfoMessage: use toHtmlChars 2015-01-25 15:53:13 +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
801554bbd8
Fix #1037 2015-01-24 21:46:53 +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
9b9b6bae99
Prevent possible deadlock on exit 2015-01-24 19:48:23 +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
c31192abee
Fix threading issue while widget's killing itself 2015-01-23 08:58:33 -06:00
Dubslow
f6ff421aff
Fix two minor bugs 2015-01-23 08:31:13 -06:00
Dubslow
7552fc0ceb
Fix the segfault fix 2015-01-23 08:18:46 -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
dea2ccf0b7 Fix segfault, minor cleanup 2015-01-23 07:07:15 -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
krepa098
9cb7ba06ed cleanup 2015-01-21 15:58:43 +01: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
krepa098
ad39251166 typo 2015-01-20 11:51:34 +01:00
krepa098
d0bd6e9dca show 2 decimals starting from MiB 2015-01-20 11:08:40 +01:00
krepa098
2fa2fc1df5 fix divide by zero 2015-01-20 11:07:40 +01:00
krepa098
13e0a8a292 cleanup 2015-01-20 10:55:51 +01:00
Dubslow
b245fe034a
Merge branch 'pr949' 2015-01-20 03:48:37 -06:00
krepa098
5d5a0903f7 renamed get/setRowIndex to get/setRow 2015-01-20 10:31:50 +01:00
Dubslow
f0c3ca1c9e
check -P option for invalid profiles
closes #977
2015-01-20 02:24:25 -06: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
5ea6e412f8
Slightly more useful initial password dialogs 2015-01-19 21:59:27 -06:00
Dubslow
f645faff51
Ignore empty history files on start
This fixes an esoteric issue of enabling chat log encryption and then restarting before adding any messages
2015-01-19 21:49:41 -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
krepa098
bb29536df1 NotificationIcon 2015-01-19 19:04:19 +01:00
krepa098
b5b6ae99c0 Text: extractSanitizedText, hookup double-click selection 2015-01-19 17:56:37 +01:00
krepa098
1fd456833c Merge pull request #3 from dubslow/chatlog_v3_1
minor code cleanup
2015-01-19 15:25:22 +01:00
krepa098
34c7c7250b double-click selection 2015-01-19 15:19:54 +01:00
krepa098
a6e3fc671e removed selectAll() 2015-01-19 15:07:15 +01:00
krepa098
85764d5973 Text: Do not rely on QTextCursor for selection 2015-01-19 15:04:11 +01:00
krepa098
f17ffdc491 cleanup 2015-01-19 11:14:53 +01:00
krepa098
2c8e7c638d nice! 2015-01-19 10:08:43 +01:00
krepa098
691a8b0b71 fixed potential null deref. & memory leak 2015-01-19 10:07:51 +01: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
Dubslow
44921db440
minor code cleanup 2015-01-18 13:57:51 -06:00
krepa098
2914a9883c ChatMessage::createTypingNotification, resized images to 18x18, new
(spinning) notification icon
2015-01-18 12:20:13 +01:00
krepa098
16812633cb extended spinner class 2015-01-18 12:17:21 +01:00