Dubslow
4dcfec0151
Merge branch 'chatlog_merge_v3'
...
"unconfirmed" -> "Waiting to send..."
2015-02-15 04:55:25 -06:00
krepa098
2bc7594049
redo layout on Settings::emojiFontChanged
2015-02-15 11:43:01 +01:00
krepa098
205f950073
refactoring & dark-theme awareness
2015-02-15 10:51:54 +01:00
Dubslow
c3d61f8dfe
Make Dutch selectable translation
2015-02-14 18:10:45 -06:00
Dubslow
eeb8c10bc3
Fix #1158
2015-02-14 17:26:21 -06:00
Zetok Zalbavar
e4e6401182
Rename 'Start automatically' → 'Autostart'
2015-02-14 07:39:28 +00:00
Dubslow
11d4ec2599
Refactor OfflineMsgEngine, fix potential segfault
...
(@apprb take note please)
2015-02-13 00:02:52 -06:00
krepa098
f765daf98d
reverse history entries as they are no longer reversed in
...
ChatLog::insertChatlineOnTop
2015-02-12 09:12:14 +01:00
Dubslow
4055cbe956
Minor translation things in the ui files
2015-02-11 14:52:42 -06:00
Dubslow
3fc778ae3d
Fix #1131
2015-02-10 22:51:57 -06:00
Dubslow
0164b53aba
Fix #1129
2015-02-10 22:43:25 -06:00
Urras
3312331723
Fixed OS X build
2015-02-09 10:07:01 -05:00
Dubslow
4d56a6fdd8
Merge branch 'pr947'
...
Conflicts:
src/misc/settings.cpp
2015-02-08 13:29:19 -06:00
krepa098
624b73edc7
clear previous id on action (issue #7 )
2015-02-07 22:55:42 +01:00
krepa098
5506379a97
Merge branch 'master' into chatlog_v3_1
2015-02-07 18:49:06 +01:00
apprb
bf2ebe9220
Offline messaging refactoring: Separated class for this purpose + more reliable resenging
2015-02-08 01:59:10 +09:00
Dubslow
830f0ddc13
Cleanup 331baa7447
2015-02-06 14:03:34 -06:00
tux3/mlkj
331baa7447
Use GUI instead of Widget for common GUI tasks
2015-02-06 19:01:36 +01:00
novist
ff693807af
Autorun on OS startup
2015-02-06 18:10:54 +02:00
tux3/mlkj
46bba3f2f1
Initial Android support
...
We create a GUI class to abstract common GUI needs (showing a message box, asking a question, ...) from the actual GUI backend.
We also create a Nexus class to manage the startup and lifetime of our main systems (Core, GUI, ...) instead of delegating that to Widget.
Eventually, Widget will only be in charge of the Desktop GUI and AndroidGUI of the mobile GUI. Nexus will overview the system and GUI will provide a clean platform-independant interface.
2015-02-06 12:28:49 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
2225fcaf9d
Initial android support
2015-02-06 01:27:07 +01:00
Dubslow
b7800b66ca
Tweak re-enabling old history popups
2015-02-04 16:31:09 -06:00
Dubslow
e2fd298d68
chat logs -> chat history, miscellaneous rewordings
2015-02-03 13:56:08 -06:00
Dubslow
a572ccff27
Merge branch 'encryption' into master
...
Conflicts:
src/core.cpp
src/historykeeper.h
2015-02-03 10:21:59 -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
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
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
krepa098
783caf932c
revert to "[user] is typing"
2015-01-31 19:22:45 +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
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
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
a1239747ac
fix button typo, closes dubslow/qTox#7
2015-01-26 19:12:36 -06: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
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
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
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
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
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
358a56c555
Confirm decrypt data, various ui/txt tweaks
2015-01-23 07:07:52 -06:00
Dubslow
29cc9e1b7d
Merge branch 'encryption' into master
...
Conflicts:
src/main.cpp
2015-01-23 01:51:39 -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
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
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
