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

1723 Commits

Author SHA1 Message Date
tux3
f8eb90f74d
Merge branch 'pr1498' into back_in_the_game 2015-04-24 22:34:21 +02:00
kushagra
b4f72b620d fixes action bugs
1) action received gets modified on restart
2) sender's name is written twice if action is sent using offline messaging
3) /me is written when action is sent in groupchat having one peer
4) /me is not saved in last message variable in friendd chat
2015-04-24 22:20:52 +02:00
tux3
110a6ca850
Fix typos in tooltips
transmit -> tranfer
2015-04-24 21:51:25 +02:00
PKEv
137d1ae2d5 Add tooltip in filetransferwidget
It is not clear what they are doing buttons
2015-04-24 21:50:05 +02:00
Yuri
11883bab85 Added Ctrl+Q shortcut. 2015-04-24 21:44:48 +02:00
tux3
5662120c51
Show Tox ID instead of blank names 2015-04-24 21:34:24 +02:00
tux3
42d7a7bcef
Assert profile locks before writing
This fixes the potential edge case where a frozen then unfrozen qTox instance could have its locks delete by a new qTox instance.

We now check that we still own our locks, restoring them if we can, before saving
2015-04-24 21:05:19 +02:00
tux3
694933d24b
Correctly rename and lock imported profiles
Imported profiles are legact 'data' and 'tox_save' files
2015-04-24 20:45:26 +02:00
tux3
05b6f1985d
Allow to start multiple instances with -p
Starting a new instance with the -p option will force it to start a new instance with the given profile instead of bringing an eventual existing instance to the foreground

Two instances can not run with the same profiles, the profile locking code will ensure that. A user who likes to live dangerously could manually delete the lock to force two instances on the same profile, but such an hypothetical user would be asking for it.

If a qTox instance starts and becomes owner of the IPC shared memory on its first try, it considers itself the only running freshly-started instance, and deletes any possibly stale lock before starting up. This should be fine in the vast majority of cases, but if an existing qTox instance freezes for a long enough time to lose ownership of the IPC and a new instance is started without first killing the frozen one, the frozen instance's lock will be deleted as stale by the new one. If the frozen instance subsequentely unfreezes, it will be running on a profile for which it doesn't have a lock, which could cause trouble. This is an intentionaly allowed edge case, the alternative being a stale lock staying forever until removed manually. A potential solution not yet implemented would be to check that the lock is still actually present before attempting any write.
2015-04-24 19:43:39 +02:00
tux3
0baba7abe2
qtox.ini shouldn't overwrite our current profile
If we're running on a given profile, reload the qtox.ini, and it has a diffeent value for the current profile, we don't overwrite our current value with whatever qtox.ini says anymore

It would cause current profile confusions when multiple qTox instances where using different instances but sharing the qtox.ini
2015-04-24 19:35:06 +02:00
tux3
ea417d3688
Update lock when renaming profile 2015-04-24 19:19:01 +02:00
tux3
bbf75aefb9
Profile locking 2015-04-24 18:53:19 +02:00
tux3
13d98da1bc
Correctly separate received actions from messages 2015-04-24 15:57:01 +02:00
Zetok Zalbavar
92f3b6a20f Code style improvements 2015-04-24 15:43:57 +02:00
tux3
66314bc38d
Fix nullptr dereference in IPC::isCurrentOwner
It would only trigger when multiple instances where running in parallel,
with one having enough privilege to block the other from accessing the shared memory (e.g. root)
2015-04-24 15:38:34 +02:00
tux3
9dedd22bb2
Port file transfers to the new API
Parallel, extremely large, and other edge case transfers have not been tested, but the common path should work well.
2015-04-24 15:31:30 +02:00
tux3
e4859efe18
Refactor Core
Refactor Core's file transfer callbacks into their CoreFile class and files

Move all core*.{h|cpp} into a core/ folder
2015-04-24 02:32:09 +02:00
tux3
a70721818e
Cleanup old commented-out code 2015-04-24 01:15:09 +02:00
tux3
4fc6632d78
Fix history-destroying use after free in Core::getSaltFromFile
We returned a shallow copy of the delete[]'d salt buffer

As a result the history consistently failed to decrypt and was removed as corrupted. This is now fixed.
2015-04-24 01:10:42 +02:00
tux3
fff2caa0e1
Fix Core::getSaltFromFile's error checking
tox_get_salt now returns a bool, not an int. So any error condition has to be inveted to check for 0 instead of -1.
2015-04-24 01:08:34 +02:00
tux3
e03d80392a
Fix GUI refresh when creating new profile
Previously the username/status, and the combobox in profileForm weren't refreshing themselves
2015-04-23 23:42:50 +02:00
tux3
3bf338e9ff
Fix profile reloading during switch
That'll get rid of the encryption warnings message boxes and per-user settings not reloading when switching between profiles
2015-04-23 23:01:12 +02:00
tux3
5df7d8a06c
Port profile encryption support to new API
Profile encryption should be fairly stable. History encryption was *NOT* tested yet and as such may not work, cause profile corruption, or invoke nasal daemons.
2015-04-23 22:59:12 +02:00
tux3
2d213b7616
Merge branch 'pr1527' into back_in_the_game 2015-04-20 12:00:53 +02:00
tux3
c82d671efe
Properly initialize tox_options 2015-04-20 11:59:52 +02:00
Zetok Zalbavar
33186e51dc
Some code style fixes 2015-04-20 08:58:06 +01:00
tux3
228398d5de
Initial porting to the new Tox API
Builds and runs, but some features will be missing, may crash with an assert, or silently fail with broken QObject connections

We're back in the game.
2015-04-19 23:12:44 +02:00
PKEv
55d33fbcc0 correct after CppCheck 2015-04-13 00:49:24 +03:00
Rohil Surana
fb97662b5d Added add friend on window on first start 2015-04-07 14:19:55 +05:30
quatrox
68f098e27d Make qTox build again
Without this #include, qWarning() cannot be streamed to (in Qt 5.4)
2015-04-02 20:56:45 +02:00
Rohil Surana
a5919dc767 Typing indicator shows up once typing is resumed 2015-03-31 02:57:52 +05:30
kushagra
07ba0c9ae0 Removes chat history of friend when removed, fixes #1486 2015-03-29 13:35:39 +05:30
Dubslow
885dc0638a
No more PRs shall be merged until the new_api branch in my repo is merged. Contributions are welcome.
This commit fixes some minor style issues with #1406
2015-03-27 17:36:35 -05:00
Dubslow
72e78ff6cd
Merge branch 'pr1480'
Conflicts:
	src/widget/form/addfriendform.cpp
2015-03-27 17:36:08 -05:00
Dubslow
2e388f03df
Merge branches 'pr1474', 'pr1406', 'pr1463' and 'pr1472' 2015-03-27 17:33:53 -05:00
Dubslow
5d129b471f
Possibly fix an old segfault that may or may not be a problem 2015-03-27 15:01:42 -05:00
Rohil Surana
b98af21456 On add friend clicked pastes Tox Id from clipboard if there is one 2015-03-27 22:13:25 +05:30
PKEv
4f650b3177 System menu translation 2015-03-26 23:02:08 +03:00
Rohil Surana
5a4443b7bb Set focus to toxId Line edit on add friend window 2015-03-26 16:53:20 +05:30
kushagra
b2481fc1d8 proper splitting in friends chat,fixes #1375
what happened was- When message exceeded TOX_MESSAGE_LENGTH, the whole message was inserted in sender's chatlog X times.
if length of message is N,
X = (N/TOX_MESSAGE_LENGTH) + 1

There is no bug in recieving end. Receving end gets X messages (splitted).
In the sample case provided, the message had whitespaces in the end, so the reciever thought the message is empty.
2015-03-26 11:15:05 +05:30
PKEv
9857f5b60b #1402 duplicate of the sender's name
set if interval more 5 minuts, sender name repet
not tested for group chats!!!
2015-03-26 00:31:39 +03:00
Dubslow
bab280a0ea
Change default datetime formats (d/m m/d agnostic), style fixes, removed unnecessary signals 2015-03-25 11:45:58 -05:00
Dubslow
14a565bc3a
Merge branch 'pr1393' 2015-03-25 11:32:05 -05:00
Dubslow
27f58c9ca6
Style fixes 2015-03-25 11:27:33 -05:00
kushagra
86bbe537bc autocomplete will work for : also,fixes #1377 2015-03-23 23:11:28 +05:30
zero-one
0b64235c69 Settings singleton no longer emits signal when groupchat position changes 2015-03-23 03:06:44 -07:00
zero-one
a1e228e60d style fixes to conform to Allman style 2015-03-23 02:38:24 -07:00
zero-one
c15cc60137 Merge branch 'master' into friend_list 2015-03-23 02:35:20 -07:00
zero-one
de8eb5293c Merge branch 'master' into friend_list
Conflicts:
	src/widget/form/settings/generalform.cpp
2015-03-23 02:34:12 -07:00
Dubslow
f55fd40ec6
Merge branches 'pr1452', 'pr1453', 'pr1456' and 'pr1457' 2015-03-22 16:17:00 -05:00
PKEv
72c45a65fa Correct #1448 2015-03-22 23:44:42 +03:00
Jookia
e3bdd6d221 Added option to disable notification sounds. 2015-03-23 07:27:44 +11:00
PKEv
becd923c09 #1441 correct 2015-03-22 02:26:17 +03:00
Dubslow
ff4b431e5e
Fix minor memleak 2015-03-21 15:58:26 -05:00
agilob
5f15bc8b75 iso date 2015-03-21 15:48:43 +00:00
agilob
77e333ab05 long time format 2015-03-21 15:47:09 +00:00
Zetok Zalbavar
f3aa3073b0
Fix coding style and add copyright header
* added copyright header to src/platform/statusnotifier/enums.c
* 'switch(' → 'switch ('
* use Allman style

----
for / if / while / switch () {
 ↓
for / if / while / switch ()
{
----

----
for / if / while ()
{
    1_line;
}
 ↓
for / if / while ()
    1_line;

----

----
for / if / while ()
    1_line;
line_out_of_loop;
 ↓
for / if / while ()
    1_line;

line_out_of_loop;
----
2015-03-21 08:59:28 +00:00
Zetok Zalbavar
f95291af3e
Some style fixes
"if(" → "if ("
"for(" → "for ("
"while(" → "while ("
2015-03-20 18:38:10 +00:00
agilob
a873bb571f
generalsettings: time and date format from qlocale 2015-03-20 08:17:18 +00:00
Dubslow
9079b334b9
Merge branches 'pr1433', 'pr1435', 'pr1436', 'pr1438' and 'pr1439' 2015-03-19 23:02:02 -05:00
PKEv
eabff1b8e4 Correct hearder file for windows 2015-03-20 00:13:56 +03:00
PKEv
e940459596 Correct for Maximized window 2015-03-19 22:41:31 +03:00
Dubslow
44662310da
Merge branches 'pr1429' and 'pr1431' 2015-03-19 11:03:37 -05:00
sudden6
df785e6608 Add some error handling in attempt to fix #1240
This should prevent the application from crashing, but there is still no
way to tell there is no webcam attached.
2015-03-19 13:30:19 +01:00
novist
a8cd541cb5 IPC improvements
* Removed waitUntilProcessed() because waitUntilAccepted() fits the job. They were nearly identical too so decreased code duplication
* Global events are set as processed only by instance that accepts them. Solves issue where global event would be consumed by first instance that saw it even if that instance ignored that event
* Fixed bug where running qtox instance would not properly exit after sending window activation event that was accepted by already running instance
2015-03-19 12:06:05 +02:00
kushagra
cb8d892724 fixed display of contact_dark.svg 2015-03-18 21:21:58 +05:30
Dubslow
6a43aa8680
Merge branches 'pr1419', 'pr1420', 'pr1421' and 'pr1424' 2015-03-18 08:21:19 -05:00
kushagra
41dc562b64 fixes #1091 2015-03-18 14:15:51 +05:30
kushagra
dc7cd7c027 fixes #1412 2015-03-18 12:40:23 +05:30
TheLastProject
6164426b13 Oops, forgot about groups 2015-03-18 00:51:22 +01:00
TheLastProject
ebf4af830d Fix #1204 2015-03-18 00:45:57 +01:00
isn0gud
de423571eb
add friend on enter key pressed #1404 2015-03-17 13:23:34 -05:00
Dubslow
99e8d71fca
Merge branch 'pr1400', with style fixes @agilob
Conflicts:
	src/widget/form/profileform.cpp
2015-03-17 13:18:47 -05:00
Dubslow
9d5b77aa61
Fix qr label wordwrap 2015-03-17 11:14:16 -05:00
Dubslow
42fe29e83d
Merge branch 'pr1397' 2015-03-16 17:53:00 -05:00
sudden6
0c4cc87ed0 fix #1394 2015-03-16 17:46:56 -05:00
Dubslow
fc720f570d
Merge branch 'pr1392' 2015-03-16 17:37:38 -05:00
Dubslow
4087778b88
Merge branch 'pr1378' 2015-03-16 16:47:12 -05:00
Dubslow
e96211199d
Check for writability for Qr saves 2015-03-16 16:41:59 -05:00
Dubslow
ad09980ce7
Less agressive tooltip 2015-03-16 16:15:34 -05:00
Dubslow
b908852e3b
Cleanup QR PR
Fix coding style, #include "" -> #include <>
Remove tooltip
Move "tox:" addition out of qr-related code

Conflicts:
	src/misc/qrwidget.cpp
2015-03-16 15:41:39 -05:00
Dubslow
01a4cdd07e
Merge branch 'pr1351' 2015-03-16 14:56:01 -05:00
agilob
f72a5b0d85
rm qrcodewindow 2015-03-16 19:38:05 +00:00
zero-one
21a7152316 Merge branch 'master' into friend_list
Conflicts:
	src/widget/form/settings/generalform.cpp
2015-03-16 11:10:28 -07:00
agilob
209f8a19ba
disable css interitance in setpassworddialog 2015-03-16 18:03:14 +00:00
Dubslow
3da818e35a
Merge branches 'pr1344' and 'pr1403' 2015-03-16 12:56:26 -05:00
kushagra
de8f4a60ad Resize notification only if theres lot of text 2015-03-16 12:07:19 +05:30
agilob
b60cfef749
closes tux3/qtox #1399
disabling scrolling on comboboxes in all settings forms
2015-03-15 20:29:23 +00:00
agilob
42133a3d00
copy image to clipboard 2015-03-15 18:53:10 +00:00
agilob
9d99007e2c
qrcode always visible, button to save 2015-03-15 15:45:28 +00:00
agilob
e4c51e2a29
text in the label dateformat 2015-03-14 20:22:28 +00:00
agilob
4cf62bdefa
closes tux3/qtox#1368 - settings to change dateformat 2015-03-14 20:15:56 +00:00
PKEv
e3946b4435 #1379 correct 2015-03-14 23:06:33 +03:00
tux3
ac9b327fe7
Merge branch 'pr1391' 2015-03-14 19:51:58 +01:00
tux3
2547029140
Merge branch 'pr1390' 2015-03-14 19:51:17 +01:00
tux3
c5a8a17e21
Merge branch 'pr1389' 2015-03-14 19:49:04 +01:00
tux3
48dd053d07
Merge branch 'pr1388' 2015-03-14 19:48:05 +01:00
Flakebi
3aca73e4b5 Align file bubbles better 2015-03-14 18:57:07 +01:00
Flakebi
ae9cf96631 Rename dialog buttons 2015-03-14 18:44:26 +01:00
Flakebi
b73c8bcce6 Add askQuestion with custom buttons 2015-03-14 18:44:26 +01:00
agilob
3ec5d30f35
UI fixes in general form:
disable light tray icon if system tray icon disabled (didn't work for
some reason)

disable emoticons combobox if emoticons disabled globally

prevent comoboxes and spinboxes stealing mouse scroll event while
scrolling in generalform, prevents from accidential language/timestamp
format/theme/skin changes while scrolling in the widget

disable passing CSS to qfiledialog in general form, qfiledialog will use
default system theme instead of not fully written from qwidget

fixed tab order in generalsettings
2015-03-14 17:01:59 +00:00
Flakebi
63150ab022 Reset activeChatroomWidget when switching to addFriendForm 2015-03-14 17:16:32 +01:00
Flakebi
53589df799 Disable call buttons in a lonely groupchat 2015-03-14 17:04:06 +01:00
Davor
200ae23de3 Update generalform.cpp 2015-03-14 16:34:12 +01:00
agilob
a501620d92
fixing conflict 2015-03-14 11:36:38 +00:00
Zetok Zalbavar
9ed4b3fb7d
Add missing comment for #1367 2015-03-14 08:12:42 +00:00
novist
c6312fd196 PNG images replaced with SVG
Closes #1050
2015-03-13 20:30:54 +02:00
Dubslow
b6175ac96f
Mark which peers are playing, styling is open to suggestions
closes #757
2015-03-13 01:04:37 -05:00
Dubslow
407ffef1b9
Merge branch 'pr1370' 2015-03-11 22:33:30 -05:00
Dubslow
6e751eaf83
Attempted fix for #1352 2015-03-11 22:02:10 -05:00
Dubslow
50c1e09a5c
Autofocus name edit in profileform
fixes #1364
2015-03-11 22:00:54 -05:00
Dubslow
561682645d
Slightly better error message 2015-03-11 21:37:26 -05:00
Dubslow
21780b9d31
remove duplicate code 2015-03-11 21:17:52 -05:00
Dubslow
e9babcee07
Filter audio checkbox has effect mid-call 2015-03-11 21:13:18 -05:00
zero-one
8b1de8e3f0 grammar correction 2015-03-11 17:50:28 -07:00
zero-one
2d186109c8 Adds a configuration option allowing users to choose whether they want
groupchats placed at the top of the friends list, or below the online
contacts.

-A checkbox was added to generalsettings.ui
-FriendListWidget's constructor was changed so that the friends list can
be initialized with the appropriate layout arrangement
2015-03-11 17:41:18 -07:00
zero-one
4a875ce8f5 Merges Away, Busy, and Online friend list layouts into a single layout.
Also comments out the debug output in
FriendListWidget::getFriendLayout() because hitting the default return
statement is no longer anomalous behavior.
2015-03-11 17:30:01 -07:00
zero-one
fdb4fef374 Adds functionality for sorting FriendWidgets alphabetically in the
friends list. Widgets are sorted upon being added to the friends list in
the first place, and re-sorted if a user changes their name, or if a
user is given an alias.

-Friend now inherits from QObject
-Friend objects now emit a signal when their display name is changed
-FriendListWidget::moveWidget() is now a slot
2015-03-11 17:23:22 -07:00
Dubslow
2f2e51fb6a
Merge branch 'master' of ssh://github.com/krepa098/qTox 2015-03-11 17:44:16 -05:00
novist
5554412a72 Window icon is set same as tray icon
Removed use of "qtox" theme icon as it is no longer relevant
2015-03-11 20:07:35 +02:00
Dubslow
4f0798bde7
Rename widget/form/settings/identitysettings.ui to widget/form/profileform.ui 2015-03-11 10:15:53 -05:00
Dubslow
d09a61e692
Merge branches 'pr1363', 'pr1365', 'pr1366' and 'pr1367' 2015-03-11 10:10:29 -05:00
Flakebi
804cd4f88a Inline funtion calls 2015-03-11 16:01:24 +01:00
agilob
1abef6c0c6
prevent segfault ;_; repaint only after changing alias 2015-03-11 11:20:27 +00:00
agilob
b489e7f712
probably closes tux3/qtox#1330 2015-03-11 11:12:08 +00:00
novist
95649f2476 Support for theming qTox tray and window icons
This patch adds ability to override qTox window and tray icons with ones from user's desktop theme. Some people prefer keeping tray icons consistent to achieve best looks.

Following theme icons used:
* qtox: general window icon which is also used in taskbar
* qtox-online, qtox-offline, qtox-busy, qtox-away, qtox-invisible, qtox-event: tray icons

If theme icon is not available then default built-in icon will be used.
2015-03-11 13:01:10 +02:00
Flakebi
4920f2a2d4 Allow writing messages in a lonely groupchat 2015-03-11 03:21:35 +01:00
Dubslow
fb63232318
Tidying new profile form
Fixing up Widget code for simplicity and consistency, add picture to form heading
2015-03-10 21:01:13 -05:00
Dubslow
114ddd8c50 Merge branch '1012-enhancement-quick-tox-id-access' of https://github.com/ovidiusabou/qTox into master 2015-03-10 17:34:51 -05:00
Dubslow
2ea3d73756
Merge branches 'pr1355' and 'pr1357' 2015-03-08 17:37:53 -05:00
Shane McKee
03329d8171
Issue #1119 fixed OS X fullscreen bug 2015-03-08 17:33:55 -05:00
TheLastProject
b659612bd4 Use QImage scaling and base64 encoding for sharper previews 2015-03-08 21:01:34 +01:00
kushagra
38f5c4f2dc solves issue 1309 2015-03-08 22:30:57 +05:30
agilob
fd374fa7c4
allow saving qrcode as file (src only, no UI) 2015-03-08 14:20:15 +00:00
agilob
8eb1a6fdb1 tox URI and updated install.md 2015-03-07 20:29:39 +00:00
agilob
4b1c5e80e9
qrcode support by html tooltip 2015-03-07 12:40:45 +00:00
tux3
bd12381bea
Merge branch 'pr1349' 2015-03-06 23:58:34 +01:00
TheLastProject
829415eed9 Fix yet another regression by using padding-less bigger icons 2015-03-06 18:00:54 +01:00
Domen Skamlic
af319bfa82 Added Slovenian translation. 2015-03-06 17:35:09 +01:00
tux3
68afc8f623 Change OpenCV error mode
Should help with #1240
2015-03-06 00:35:46 +01:00
Ovidiu Sabou
69678c011b Silence warning 2015-03-05 20:39:26 +02:00
Ovidiu Sabou
1444b851a2 Refresh the profile list when the new id is available in the core
The status set signal (when getting online) seems to correspond with the availability of the new profile in the list
2015-03-05 20:35:19 +02:00
Dubslow
dd3087fc3d
Merge branch 'pr1341' 2015-03-05 12:20:30 -06:00
Sean
7fb6acdafc Fixes some OS X installer bugs 2015-03-05 10:16:59 -08:00
Ovidiu Sabou
e8465c73dd Fix a crash bug when closing the application 2015-03-05 20:09:58 +02:00
tux3
641fc8c776
Catch OpenCV errors
Should help with #1240
2015-03-04 22:13:42 +01:00
tux3
96d39f6565
Merge branch 'pr1331' 2015-03-04 21:31:25 +01:00
Sean
dddf5b73d4 Political correctness 2015-03-04 12:29:12 -08:00
Ovidiu Sabou
98fb61525b Merge branch 'master' into 1012-enhancement-quick-tox-id-access
Conflicts:
	src/widget/widget.h
2015-03-04 21:43:46 +02:00
Ovidiu Sabou
c3dd285864 Set a header to be consistent and to have the profile page remain open when switching profiles 2015-03-04 21:35:34 +02:00
tux3
50601b4049
Merge branch 'pr1303' 2015-03-04 20:11:53 +01:00
tux3
cca1425b43
Merge branch 'pr1336' 2015-03-04 20:02:01 +01:00
tux3
a96dbf6973
Merge branch 'pr1327' 2015-03-04 19:54:46 +01:00
Sean
f19b6230ed High DPI scaling
High DPI scaling

Update qtox.pro

Oh right not everyone uses Qt5.4

Why did I use the web ui
2015-03-04 19:52:50 +01:00
tux3
17042c1aff
Merge branch 'pr1244' 2015-03-04 19:29:49 +01:00
TheLastProject
3c602ec0d6 Fix images with spaces or other non-HTML characters breaking the preview 2015-03-04 17:32:45 +01:00
Sean
f51cd63cff Almost forgot mv is harmful
Note that this is required because Qt applications cannot run under setuid(0) as qtox_sudo sets

.

Fix quitting
2015-03-04 08:26:16 -08:00
Sean
fbd0cc59b6 OS X applications folder support 2015-03-04 08:26:16 -08:00
Ovidiu Sabou
75f5901aec Refresh the available profiles when the profile page is shown. Fix regression for #1012
I carelessly removed perfectly good code from the present() method and this commit brings that back
2015-03-04 00:04:16 +02:00
Ovidiu Sabou
b155830e4c Move the identity settings tab into its own dedicated profile page
Make the page directly accessible from the main screen by clicking the avatar or the username. Changing the avatar or the username are now possible only from the profile page
2015-03-03 22:29:01 +02:00
baloo79
9494f63841 Update generalform.cpp (for Hungarian translation) 2015-03-03 20:13:15 +01:00
krepa098
00af059a4f use QUrl::fromLocalFile (fix #1305) 2015-03-01 10:43:43 +01:00
krepa098
4852a7efa5 Text: Tooltips (issue #1238) 2015-03-01 10:34:20 +01:00
Dubslow
75a0e8ac2e
Merge branch 'pr1275'
Conflicts:
	src/widget/form/genericchatform.cpp
2015-02-28 12:20:40 -06:00
TheLastProject
9dc52c1eb9 Add image preview on mouseover 2015-02-28 17:14:58 +01:00
agilob
8ceacdd519
clearing chatarea 2015-02-27 18:25:27 +00:00
agilob
2ec1bd0977
keyboard shortcut to change current chat 2015-02-27 17:56:47 +00:00
agilob
7a6b8ab256 qlabels will not support richtext, plaintext only
removes support for HTML, QML, JS and CSS in username/status labels

this commit closes #1298(bug) #1295(bug) and #1224(feature request)
2015-02-27 14:05:03 +00:00
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
bc412c9c7b
Fix missing include for toxme 2015-02-25 13:16:45 +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
ae877ccd6d Implement deleting a toxme address 2015-02-25 00:40:44 +01:00
tux3
1883b4e25e Implementing creating a toxme address 2015-02-25 00:40:44 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
217ca20085 Start implementing toxme.se support 2015-02-25 00:37:21 +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
6cef2a9349
Wait longer before trying new bootstrap nodes
It was really just spam, let's wait thrice as long to stay reasonnable. I remember a long time ago some people couldn't connect because we were spamming too much bootstrap nodes
2015-02-22 19:12:10 +01:00
tux3
5ab703eb27
Android: Catch Back key and exit 2015-02-22 19:08:18 +01:00
tux3
ecd8210162
Fix warning when !QTOX_PLATFORM_EXT 2015-02-22 17:24:01 +01:00
novist
41fd5ab558 Allow only main (IPC owner) instance to save global settings 2015-02-22 16:33:15 +02:00
novist
886ee3ff10 Fixes #840 2015-02-22 16:31:54 +02: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
49295c8c48
Merge branch 'statusnotifier' 2015-02-22 01:46:43 +01: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
d01737572a
Fix warnings in statusnotifier 2015-02-22 01:21:20 +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
tux3
3e661e9b03
Bootstrap from more nodes until we're connected 2015-02-21 22:44:22 +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
244d6daca8
Change windows update host 2015-02-20 03:30:22 +01:00
tux3
059321d642
Fix warnings when ALC_LOOPBACK_CAPTURE_SAMPLES not defined 2015-02-20 01:55:43 +01:00
tux3
302ede28b3
Install 64bit updates on Win64, not 32bit
Yes, that sounds like a thing we migth want to do...

Fixes #1227, fixes #1072
2015-02-19 22:46:39 +01:00
tux3
9c807f2da8 Fix #1104 2015-02-19 21:32:29 +01:00
TheLastProject
5b6e2d5ecc Remove unused variable 2015-02-19 20:41:21 +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
Dubslow
9ca8cdfeea
Fix build issue with older OpenALs 2015-02-18 11:17:06 -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
9350547f47
Merge branch 'pr1217' 2015-02-18 01:53:12 -06:00
Dubslow
15917d1a01
Add experimental echo cancellation to qTox
It compiles with modified OpenAL (unchanged logic otherwise), but effectiveness needs testing (like uTox)
2015-02-18 01:10:40 -06:00
Serg
0e3093bab4 fix missed math include 2015-02-18 11:02:09 +05:00
Dubslow
1c3bcd000c
Major bug: audio filtering never actually worked
We filtered the audio after it was already processed by core, i.e. it was never used
@mwuttke97 @tux3 @Dubslow pls
2015-02-17 23:20:31 -06:00
Dubslow
ec6bed5a99
Fix #1169 2015-02-17 21:07:56 -06:00
Dubslow
68c3d3ed07
Single line copy/pasted text 2015-02-17 20:44:23 -06:00
TheLastProject
af89e823c6 Clean up code 2015-02-18 00:30:50 +01:00
TheLastProject
4edb608777 Add open directory option to completed file transfers 2015-02-17 20:07:25 +01: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
krepa098
c631fff602 fix issue #1161 round 2!
Fight!
2015-02-16 15:28:57 +01:00
krepa098
e454671ebd use QString::toHtmlEscaped 2015-02-16 15:22:29 +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
bcc3ad7038
Fix #1182 2015-02-15 18:56:11 -06: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
krepa098
a930b398d4 fix issue #1163 2015-02-15 19:48:16 +01:00
krepa098
3095583ea9 fix issue #1168 2015-02-15 17:21:00 +01:00
krepa098
ec85434c6c try fix #1165
Checkmark doing nothing on Windows
2015-02-15 17:15:44 +01:00
krepa098
9bbd7a5c94 fix issue #1161 2015-02-15 14:25:49 +01:00
Dubslow
73e51865e7
Merge branch 'chatlog_merge_v3'
Conflicts:
	src/chatlog/chatlog.h
2015-02-15 05:24:53 -06:00
Dubslow
cda1a02829
Fix #1154 2015-02-15 05:16:20 -06:00
Dubslow
b17b915dfc
Fix clang warnings
It complained about row being used uninitialized, though it was a spurious warning
2015-02-15 05:15:46 -06:00
Dubslow
e2ca10977f
Fix compile error 2015-02-15 04:59:26 -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
4831e0c18b FTW: Always show the checkmark after a successful transfer 2015-02-15 11:53:32 +01:00
Dubslow
2fa34ac7e4
Remove QMarginsF, reduce to Qt 5.2 2015-02-15 04:53:26 -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
krepa098
74ea0773ee Text: color property 2015-02-15 10:45:07 +01:00
krepa098
2a37473781 replaced QMarginsF by QMargins 2015-02-15 10:19:38 +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
krepa098
c800672ff2 display "unconfirmed" on new file transfer requests 2015-02-14 12:29:42 +01:00
krepa098
108d2725e6 FTW: 1px spacing instead of 2px 2015-02-14 12:21:03 +01:00
krepa098
9499909f8b finished work on FTW
hopefully
2015-02-14 12:14:09 +01:00
Zetok Zalbavar
e4e6401182
Rename 'Start automatically' → 'Autostart' 2015-02-14 07:39:28 +00:00
krepa098
faaa147a83 mockup (WIP) 2015-02-13 16:46:59 +01:00
Chloe
484fb2e89c Update widget.cpp
Added support for dynamically generating supported format list.
2015-02-13 09:23:21 -05:00
Dubslow
fd60674664
Minor cleanup 2015-02-13 00:03:13 -06:00
Dubslow
11d4ec2599 Refactor OfflineMsgEngine, fix potential segfault
(@apprb take note please)
2015-02-13 00:02:52 -06:00
krepa098
936a34faf1 do not trigger repaint if invisible 2015-02-12 11:32:13 +01:00
krepa098
f765daf98d reverse history entries as they are no longer reversed in
ChatLog::insertChatlineOnTop
2015-02-12 09:12:14 +01:00
krepa098
7d2f515df9 fix crash in Text::hoverMoveEvent 2015-02-12 09:02:49 +01:00
Dubslow
4055cbe956
Minor translation things in the ui files 2015-02-11 14:52:42 -06:00
krepa098
0b56916b9f Text anchors: use PointingHandCursor 2015-02-11 17:03:38 +01:00
krepa098
788d57c815 copy/paste changed format (issue #11) 2015-02-11 16:37:02 +01:00
krepa098
5f31921cf4 fix issue #10 2015-02-11 16:32:42 +01:00
tux3
919080b80d
Case sensitive includes on windows
The WINAPI may not be case-sensitive, but cross compilers running on Linux are
2015-02-11 13:46:16 +01: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
krepa098
697460ca36 revised issue #6 2015-02-10 14:36:53 +01:00
krepa098
69fde0d8b0 refactoring 2015-02-10 14:30:49 +01: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
krepa098
990a7f4734 ownership (again) 2015-02-09 17:48:54 +01:00
krepa098
3f6e68db95 tweaked layout calculation 2015-02-09 17:45:48 +01: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
535757670b copy: handle pending messages 2015-02-08 12:20:27 +01:00
apprb
1b430b33cc
fix #513 2015-02-08 20:15:11 +09:00
krepa098
e86b03b4f7 add copy to selection buffer (middle mouse-button issue #6) 2015-02-08 10:32:52 +01:00
krepa098
5ec3a2db85 Fix ownership problem (issue #8) 2015-02-08 10:11:55 +01:00
Joseph Anania III
6c21fab806 Set TwitteEmojiSVG as the default emoticon theme 2015-02-07 17:22:45 -05:00
krepa098
624b73edc7 clear previous id on action (issue #7) 2015-02-07 22:55:42 +01:00
krepa098
2dc79a80bc add timestamp to copied text (issue #4) 2015-02-07 22:40:24 +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
a2cf91cb36 Text: documentLayout()->update() 2015-02-07 18:52:00 +01:00
krepa098
794c23a81a Merge branch 'master' into chatlog_v3_1 2015-02-07 18:49:38 +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
krepa098
2ac86b58e0 do not change clipboard content if selected text is null 2015-02-07 17:39:56 +01:00
krepa098
719481b040 fix actions not triggering reliably + ctrl+insert shortcut on linux 2015-02-07 17:37:04 +01:00
krepa098
887f021323 FTW: Slightly increased height 2015-02-07 14:38:56 +01:00
krepa098
a8acb05c52 FTW: Don't fire an animation if start- and endcolor are the same 2015-02-07 14:38:12 +01:00
krepa098
d008b53c6f FTW: Use KeepAspectRatioByExpanding 2015-02-07 14:33:45 +01:00
krepa098
6b605fbdc3 FTW: Replaced QPropertyAnimation by QVariantAnimation 2015-02-07 14:02:40 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
4b3add2ee9
Add input method hints to some fields 2015-02-07 13:42:31 +01:00
Zetok Zalbavar
dedf9c3c92 Change warning message to less confusing one
Previous message without context causes confusion about security of Tox
2015-02-07 12:47:57 +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
krepa098
b9dcb3bd9b cleanup 2015-02-06 16:12:24 +01:00
krepa098
f525fa83f3 Spinner: fade in 2015-02-06 14:04:15 +01:00
krepa098
3c349e29ad cleanup 2015-02-06 14:04:15 +01:00
krepa098
c2ddc91d58 faster, synchronized spinners 2015-02-06 14:04:15 +01: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
krepa098
1e2f801dfe Spinner: lowered rotational speed 2015-02-05 10:13:37 +01:00
krepa098
f5cf9677ae FTW: don't display "Location not writable" if path is empty 2015-02-05 09:59:47 +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
krepa098
5e4e56778b FTW: color animation 2015-02-04 17:21:56 +01:00
krepa098
633ca9c3ac cleanup 2015-02-04 15:36:45 +01:00
krepa098
6cf3f9e1c2 fix bbox calculation 2015-02-04 15:36:26 +01:00
krepa098
09291bad52 fix crash on exit 2015-02-04 09:52:55 +01:00
Dubslow
864d1297e7
More descriptive dialog text 2015-02-03 18:22:05 -06:00
krepa098
7321127794 set the correct wrap mode 2015-02-03 22:06:31 +01:00
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
krepa098
9df5200fc9 update typing notification on resize 2015-01-18 12:15:02 +01:00
krepa098
882d19d311 "%user is typing..." -> "%user ..." 2015-01-18 11:54:08 +01:00
krepa098
b4f53944cc FileTransferWidget: calculate mean 2015-01-18 11:51:48 +01:00
krepa098
4d5470710a createChatInfoMessage: increase icon size from 16 to 20 px 2015-01-17 12:09:13 +01:00
krepa098
ee902ee1b0 don't forget to reposition the typingNotification on insertChatline* 2015-01-17 11:35:09 +01:00
krepa098
e85ff58223 refactoring 2015-01-17 11:31:57 +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
826d60c876
fix bug with "use other password"
It's more trouble than it's worth to shallow copy; changed to deep copy with STL
2015-01-15 21:41:10 -06:00
krepa098
b4fa8323af refactoring, reverted ChatLog::getVisibleRect 2015-01-15 11:48:41 +01:00
krepa098
1ae3999576 FileTransferWidget::acceptTransfer: Regression - check whether the path
is NOT writable
2015-01-15 10:14:26 +01: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
krepa098
a0693c2fc9 tweaked ChatLog::getSelectedText
*Actions are copied as "*name action*"
*SystemInfoMessages are not copied
2015-01-14 20:31:40 +01:00
krepa098
3478a5c794 refactoring 2015-01-14 20:13:41 +01:00
krepa098
13746f5c38 More pleasant multi-line selection, refactoring 2015-01-14 20:10:17 +01:00
krepa098
3be99ae663 comments 2015-01-14 18:22:42 +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
krepa098
437282b80c Don't stick to bottom if the user scrolls while the worker is still
running
2015-01-14 11:27:52 +01:00
krepa098
4930b32641 fixed chatlog not scrolling to bottom after resize 2015-01-14 10:56:44 +01:00
krepa098
bde32d2171 cleanup 2015-01-14 10:34:52 +01:00
krepa098
fb0c372c81 cleanup 2015-01-13 23:59:38 +01:00
krepa098
29fc6ab03f FileTransferWidget: use baseName instead of completeBaseName + tweaked
autoAccept
2015-01-13 21:52:19 +01:00
Zetok Zalbavar
a45b72701f
Small spelling fix 2015-01-13 15:55:06 +00: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
62b4b83106 tweaked FileTransferWidget min size 2015-01-11 12:04:35 +01: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
3bb52e5538 tweaks, colorize the blue * in /me 2015-01-10 22:21: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
krepa098
95dca34865 cleanup 2015-01-09 15:50:23 +01:00
krepa098
ed65261e37 Text: copy image keys 2015-01-09 15:50:13 +01:00
krepa098
d21a00e8d5 cleanup 2015-01-09 15:48:58 +01:00
Bruno Kühnen Meneguello
2e38a1fdb8 Add Portuguese translation 2015-01-08 10:28:53 -02:00
novist
313f666a2b Including only required opencv headers. Workaround for opencv bug where partial builds would lack certain headers but opencv.hpp includes them anyway resulting in a build error. 2015-01-08 13:59:05 +02:00
novist
cfcf16252f Fixed warning in timer_win.cpp 2015-01-08 13:59:05 +02:00
krepa098
39d2bbb341 towards better scrolling
Experimental changes!
Known bug: Scrolling gets extremly slow while the cursor is inside
qTox's main window.
Cause: Unknown.
2015-01-07 15:03:02 +01:00
krepa098
0f52bf3f5c moved history loading to FriendWidget::setAsActiveChatroom() 2015-01-07 13:16:09 +01:00
krepa098
debe6903a3 faster scrolling, more cheating 2015-01-07 13:05:28 +01:00
krepa098
1274c213d0 Revert "[test] use BspTreeIndex (might be slower?)"
This reverts commit b92d4f3d2f.
2015-01-06 20:22:30 +01:00
krepa098
1bf0898121 optimized ChatLog::getContentFromPos 2015-01-06 17:47:57 +01:00
krepa098
b92d4f3d2f [test] use BspTreeIndex (might be slower?) 2015-01-06 15:38:05 +01:00
agilob
cbfe94d6a2
closes tux3/qtox#988 2015-01-06 14:36:03 +00:00
krepa098
e2d7dd815b [test] use std::vector rather than QVector
might be faster because std::vector doesn't do implicit sharing
2015-01-06 15:10:37 +01:00
krepa098
0a6bd85308 speed up ChatLine::moveBy 2015-01-06 14:58:50 +01:00
krepa098
b82c5835ce error symbol 2015-01-06 14:30:24 +01:00
krepa098
e365b0eb2d FileTransferWidget: limit browse to pics and archives 2015-01-06 13:58:42 +01:00
krepa098
9793ebd094 renamed deltaRepos to deltaY 2015-01-06 10:37:07 +01:00
krepa098
af575c09e6 cache innerStyle as it gets used frequently 2015-01-06 10:28:15 +01:00
krepa098
82746dc050 fixed first message not getting displayed properly 2015-01-06 10:27:03 +01: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
Dubslow
a0bf23f3ff
Merge branch 'pr973' 2015-01-05 20:28:24 -06:00
apprb
017c59bd82
more userfriendly history load dialog 2015-01-05 20:37:10 +06:00
krepa098
4f01f5ec0e refactoring 2015-01-05 14:06:14 +01:00
krepa098
5399b40874 history: fixed regression 2015-01-05 14:05:01 +01:00
krepa098
960ebecc4e hopefully less noticeably partial updates 2015-01-05 10:59:56 +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
56e9f6f1be
Better checks before applying update
Check that each file was downloaded and that the size matches. We don't check the signatures inside qTox so as not to freeze the GUI during startup. The updater will check the signatures anyway

We now try to restart update downloads if we detect that it was interrupted
2015-01-05 09:54:56 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
8813d6e4ca
Fix #909 2015-01-05 09:54:03 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
5b7e57751c
Filter outgoing audio, not incoming
Reverts bad previous commit
2015-01-05 09:18:11 +01:00
Zetok Zalbavar
d36c471f4f
Some wording improvements 2015-01-04 20:25:37 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
c3505d0939
Ask user to fallback to tox1 if needed
With a warning, tox1 is insecure

Fixes #907

Fixes #886
2015-01-04 21:02:24 +01:00
krepa098
bc97948be7 changed output of ChatLog::toPlainText 2015-01-04 20:24:56 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
9991c38342
Fix some audio bugs
Including a fix for a 7 years old OpenAL-soft bug with ALSA (disabled by default)

I love alsa
2015-01-04 20:24:11 +01: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
12a1fa1549 ChatLog: insertChatlineAtBottom, refactoring 2015-01-04 19:28:27 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
86d0558c71
Conform with toxav API change 2015-01-04 18:53:02 +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
37ea7c359c
Thread safe, encapsulated audio 2015-01-04 17:55:39 +01:00
krepa098
a74b9ce11c ChatLog: Autoscroll while selecting 2015-01-04 15:18:23 +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
ea467152aa filetransferwidget: fixed pause button, ETA, font size, resource usage 2015-01-04 12:04:30 +01:00
zero-one
672cd42065 Merge remote-tracking branch 'upstream/master' into alphabetize 2015-01-04 01:30:11 -08:00
zero-one
7569003e87 Alphabetizes groupchat user list (fixes #701) 2015-01-04 01:26:53 -08:00
Tux3 / Mlkj / !Lev.uXFMLA
d042c2f346
Filter incoming audio, not sent audio 2015-01-04 02:04:07 +01:00
krepa098
f630583e59 cleanup 2015-01-03 21:20:51 +01:00
krepa098
b3507152eb fixed eliding (ie. invisible nicknames) 2015-01-03 21:19:28 +01:00
krepa098
64f7f7c45e use resolveToxID 2015-01-03 20:38:06 +01:00
krepa098
d04a79a599 ChatLine: cell spacing 2015-01-03 20:37:40 +01:00
krepa098
99a230ccf5 cleanup 2015-01-03 19:06:10 +01:00
krepa098
698fcb70f0 check "use emoticons" 2015-01-03 19:05:38 +01:00
krepa098
a0a56e32a0 fix no visible line case 2015-01-03 15:32:12 +01:00
krepa098
2938702c1e refactoring, fixes 2015-01-03 15:03:33 +01:00
krepa098
8a1ea18ed4 fixed history 2015-01-03 14:08:04 +01:00
krepa098
d7f5068fbf quoting support, toHtmlChars, fixes 2015-01-03 13:52:56 +01:00
krepa098
f3d5b4bb57 fixed anchors 2015-01-03 13:20:53 +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