Dubslow
4dcfec0151
Merge branch 'chatlog_merge_v3'
...
"unconfirmed" -> "Waiting to send..."
2015-02-15 04:55:25 -06: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
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
c769c10138
Merge branches 'pr1105', 'pr1121' and 'pr1122'
2015-02-08 13:30:03 -06: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
Joseph Anania III
84c038c24d
Set Emoticon Widget input to 8x8 instead of 5x3 for larger emoticon sets
2015-02-07 16:24:59 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
39170de667
Disable systray icon on KDE 5
...
Hopefully fixes #1116
2015-02-07 19:40:49 +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
Tux3 / Mlkj / !Lev.uXFMLA
4b3add2ee9
Add input method hints to some fields
2015-02-07 13:42:31 +01:00
novist
de6bf6c029
Fixed busy and invisible taskbar icons
...
Updated other status icons
Removed duplicate status icons from ui/statusButton
2015-02-07 12:47:57 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
659a0bf2c4
First draft of the Android GUI
...
Very much not finished and non-functional
2015-02-07 12:46:55 +01:00
Dubslow
830f0ddc13
Cleanup 331baa7447
2015-02-06 14:03:34 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
148f7e6b1b
Fix typo in regexp
2015-02-06 20:56:27 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
333471bd53
Fix #1099
2015-02-06 20:30:43 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
3b9d4eba2e
Assert that Widget isn't used on Android
...
That would cause horrible conflicts and apreciable slowdowns
2015-02-06 19:54:09 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
2e7c73dcb0
Cleanup before returning from main
2015-02-06 19:38:08 +01: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
Tux3 / Mlkj / !Lev.uXFMLA
72bb66334e
Check icon for nullity in Widget
2015-02-05 21:42:10 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
dc5e32a26c
Try to prevent nullptr dereference of icon
2015-02-05 18:29:40 +01:00
Dubslow
82c881ff49
Merge branch 'pr1087'
...
Conflicts:
src/widget/widget.h
2015-02-04 17:45:04 -06:00
Dubslow
b7800b66ca
Tweak re-enabling old history popups
2015-02-04 16:31:09 -06:00
Dubslow
aa122bf246
Implement hack to make closing the history dialog not disable history
...
Also word wrap the extra long text
2015-02-04 16:11:21 -06:00
Dubslow
864d1297e7
More descriptive dialog text
2015-02-03 18:22:05 -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
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
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
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
novist
6c477a0a19
Use svg for taskbar/tray icons
2015-02-02 08:07:36 +02: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
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
