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

845 Commits

Author SHA1 Message Date
agilob
439dde5c8d
+comment 2015-02-26 21:10:35 +00:00
agilob
ed1cd04340 closes tux3/qtox #1289 2015-02-26 21:08:32 +00:00
tux3
1a1debf167
Merge branch 'pr1243' 2015-02-25 15:55:32 +01:00
tux3
e04bd15181
Merge branch 'pr1231' 2015-02-25 15:40:50 +01:00
tux3
fe23af6a09
Don't include appindicator for GTK backend 2015-02-25 11:54:57 +01:00
tux3
94250d4aea
Use Qt systray again on KDE4
Fixes #1277
2015-02-25 11:42:34 +01:00
tux3
5c92c3b89d
Use GTK status icon on Gnome
Instead of Unity, which has less features and is a hack
2015-02-25 11:30:15 +01:00
tux3
559be200ff
Merge branch 'pr1272' 2015-02-25 11:03:01 +01:00
tux3
80c4cb8b45
Merge branch 'pr1267' 2015-02-25 10:41:47 +01:00
tux3
8a83a6114f
Implement GTK systray icon backend
This one is deprecated, but should work much better than any other system tray icon backend we currently have, both in term of supported features and reliability. It justs needs some testing to see where we can enable it now.
2015-02-24 23:27:08 +01:00
agilob
9a3a15c2e7 closes again tux3/qtox #988 2015-02-24 18:39:44 +00:00
TheLastProject
75734c35ac Make default friend request message contain nickname 2015-02-24 14:10:51 +01:00
tux3
bee584bdb1
Only use StatusNotifier on KDE5 2015-02-24 10:19:40 +01:00
agilob
842774ecfc
fix tux3/qtox #891 2015-02-23 23:08:07 +00:00
tux3
3af631ebab
Merge branch 'pr1266' 2015-02-23 23:27:53 +01:00
tux3
d89c722b9c
Only use StatusNotifier on KDE
According to the qtox wiki table, Qt's backend works better on non-kde DEs
2015-02-23 23:25:08 +01:00
tux3
925e32f23a
Fix system tray icon on GNOME classic
There doesn't seem to be a system tray icon at all in GNOME shell ?
2015-02-23 20:06:16 +01:00
tux3
dbc3a5b137
Merge branch 'pr1255' 2015-02-22 23:42:00 +01:00
tux3
c0c04d1575
Start new Material Design android GUI 2015-02-22 23:32:14 +01:00
TheLastProject
0726d0f7e1 Clicking the yellow button on an incoming call answers 2015-02-22 20:44:05 +01:00
TheLastProject
398746a129 Make call tooltips depend on status, grey out vol and mic settings when not in a call 2015-02-22 20:37:00 +01:00
tux3
5ab703eb27
Android: Catch Back key and exit 2015-02-22 19:08:18 +01:00
novist
9523484bfe Reworked IPC class:
* Simpler design
  * Suport for named events
  * Support for checking if events were handled
  * Support for sending events to specific application instance
2015-02-22 16:31:48 +02:00
TheLastProject
695bd74ce5 Use blacklist for executables, explicitly run executables with QProcess to work around KDE4.4 security measure which disallows running executables 2015-02-22 13:21:42 +01:00
tux3
84e613c609
SystemTrayIcon: Log what backend is used 2015-02-22 12:14:31 +01:00
tux3
5e27d64a95
Merge branch 'pr1232' 2015-02-22 11:54:10 +01:00
novist
192f1f7d62 Delayed tray icon creation to timer event.
Added null checks around usage of tray icon object.

This change solves issues/crashes where tray is not immediately available when qTox is started. It is common on linux desktops. While for example lxqt has option to delay application autostart until panel (and thus tray) is available other desktops (like KDE) do not. Adding checks around use of icon object was not enough because application may start a little bit earlier than panel is available. For that reason tray icon creation is delayed to timer event and tried multiple times with delay of one second. Usually after few tries icon creation succeeds and signal is disconnected.

In case tray is not available qTox window is shown. This creates a side effect where starting qTox before tray is available will make application window briefly appear and when tray is available window will be hidden or remain visible as per settings. Window has to be visible if tray is unavailable because otherwise users may end up with qTox running and no way to access it. If application is started and tray is available no window flashing happens and settings are restored as usual.

Without this patch if qTox started before tray is available window is shown and changing tray icon visibility option crashes application. Thats probably a known issue.
2015-02-22 12:36:12 +02:00
tux3
fa57206620
statusnotifier: Handle middle clicks 2015-02-22 01:43:33 +01:00
tux3
c3700fdfec
Create systray statusnotifier ctor icon properly 2015-02-22 01:36:51 +01:00
tux3
18a9955f43
Prioritize Unity sistray backend over StatusNotifier 2015-02-22 01:28:12 +01:00
tux3
55d78698c2
Fix statusnotifier icon color conversion
We were passing premultiplied ARGB data to GTK, where it expected premultiplied RGBA
2015-02-22 00:56:20 +01:00
tux3
d2f10f624d
Generate statusnotifier context menu icons 2015-02-22 00:54:42 +01:00
tux3
4630129dbf
Create statusnotifier main icon via pixbuf
Instead of creating a temporary file
2015-02-22 00:48:06 +01:00
tux3
a98639bc6f
Initial statusnotifier systray context menu support 2015-02-22 00:47:18 +01:00
tux3
d6fcb9faa2
Start StatusNotifier system tray backend
Can show/hide an icon and react to left clicks for now
2015-02-21 22:55:54 +01:00
TheLastProject
eb8527675c Oops, default for file transfer message should be no 2015-02-20 16:38:09 +01:00
TheLastProject
7202b18079 Make askQuestion more flexible, defaulting to Yes/No 2015-02-20 16:36:35 +01:00
tux3
9c807f2da8 Fix #1104 2015-02-19 21:32:29 +01:00
TheLastProject
48c58322f3 Fix regression showing is typing too often 2015-02-19 20:35:08 +01:00
TheLastProject
718aad2c5a Actually use yes/no question 2015-02-19 20:32:37 +01:00
TheLastProject
ad1852622f Allow user to open all transferred files, but warn for executable files 2015-02-19 20:14:19 +01:00
tux3
41d8e2dd53 Attempt at fixing #1187 2015-02-18 21:22:19 +01:00
dubslow
7c0fa46b42 Merge pull request #1221 from TheLastProject/offlineTypingFix
Hide is typing status when friend disconnects
2015-02-18 11:57:42 -06:00
Joseph Anania III
bfc06df8a5 changed emoticon widget to show 24x24 emoticons 2015-02-18 11:31:40 -05:00
TheLastProject
3116e84095 Hide is typing status when friend disconnects 2015-02-18 14:02:10 +01:00
Dubslow
ec6bed5a99
Fix #1169 2015-02-17 21:07:56 -06:00
Dubslow
9946a4642e
Merge branch 'pr1194'
Reduced merge that drops the unnecessary changes
2015-02-16 18:07:56 -06:00
Dubslow
7edb50ea3e
Merge branches 'pr1185', 'pr1188', 'pr1192', 'pr1193', 'pr1200' and 'krepa' 2015-02-16 18:03:36 -06:00
TheLastProject
ac9904face Turn group invite warning into question. Fixes #1199 2015-02-16 23:53:33 +01:00
krepa098
deb8440c6a fix issue #1181 2015-02-16 18:13:22 +01:00
Zetok Zalbavar
c0df870c62
Update toolTip for Compact contact list
Restart should not be a requirement anymore
2015-02-16 10:59:01 +00:00
BroncoTc
51799dc857 add spaces between language names 2015-02-16 18:36:51 +08:00
BroncoTc
dff30915a3 edit the three config & source file
manully and same way as commit a004fc872f
2015-02-16 12:43:39 +08:00
Dubslow
03168a02d2
Merge branches 'pr1134', 'pr1157' and 'pr1171' 2015-02-15 17:36:45 -06:00
Dubslow
07b87616a2
Refactor image filter as discussed 2015-02-15 17:35:27 -06:00
Dubslow
dcf87f7475
Ask before joining group
Fixes #1101, closes #1177
2015-02-15 17:25:27 -06:00
Dubslow
73e51865e7
Merge branch 'chatlog_merge_v3'
Conflicts:
	src/chatlog/chatlog.h
2015-02-15 05:24:53 -06:00
krepa098
c57cba21ae fix issue #14 2015-02-15 11:58:02 +01:00
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
Chloe
484fb2e89c Update widget.cpp
Added support for dynamically generating supported format list.
2015-02-13 09:23:21 -05: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
Chloe
eb3d5ea27d Update widget.cpp
Selected all normally-available formats (from [here](http://doc.qt.io/qt-5/qpixmap.html), verify they're all _actually_ functional.
2015-02-09 23:09:29 -05:00
Chloe
b2ba58ed61 Avatar Choosing Dialog
Explicitly filtering out images for the avatar selection dialog.
2015-02-09 22:54:31 -05: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
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
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
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
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
Сухарик
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
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
Tux3 / Mlkj / !Lev.uXFMLA
ac2700fdeb
Fix rounding for non-square CallConfirmWidget
Thanks to @krepa098
2015-01-26 18:29:13 +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
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
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
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