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

1651 Commits

Author SHA1 Message Date
tux3
30c8980d1b
Profile locks are only stale if orphaned
Locks used to become stale after 30s of use, they now only become stale if their parent process dies.
2015-09-03 17:24:33 +02:00
tux3
dde68625ad
Merge branch 'pr2014' 2015-09-03 17:19:13 +02:00
agilob
602143068c
fix opening directory/file in file transfer widger 2015-08-31 13:59:39 +01:00
agilob
8db085c2c0
change logging, typing notification and compact layout to enabled 2015-08-31 11:47:09 +01:00
Zetok Zalbavar
06611d618e
Revert changes from merge of #2092 pull request
That pull request made qTox crash in a number of ways, with no quick fix
available.

Hopefully there will be a way to fix crash, so that this commit could be
reverted, and fix applied.
2015-08-30 21:28:53 +01:00
agilob
db5903c2fe
set one global initial file accept directory for all file transfers 2015-08-30 20:36:39 +01:00
ProMcTagonist
6092a7e8a6 matchy tooltips no linedowns 2015-08-30 12:16:50 -07:00
ProMcTagonist
328726a1cb Compress string 2015-08-30 11:50:01 -07:00
ProMcTagonist
54e4c3c1f8 Fix confusing statement
it sounds like you can press enter to make a new selection
2015-08-30 11:37:21 -07:00
PKEv
44f0ef2043 add Ability to unhide qTox window in screenshot mode
fix #2139
fix #2127
2015-08-30 20:44:33 +03:00
agilob
d6b176d955
Merge remote-tracking branch 'TheSpirit/requests'
merge awaiting friend requests, fix formatting conflict
2015-08-30 14:25:46 +01:00
agilob
582db9cb5b
fix uri detection, puts dots between toxcore versions 2015-08-29 23:28:21 +01:00
agilob
d6a0910fc8
fix uri parsing and tox URI detection, closes #2118 2015-08-29 23:26:05 +01:00
agilob
126ca6337c
hide toxcore version 2015-08-29 22:51:01 +01:00
agilob
0a5d847cf5
better, more flexible about page, versions section 2015-08-29 22:50:21 +01:00
agilob
7b3ddff202
Merge remote-tracking branch 'zetok/settings' 2015-08-28 19:27:10 +01:00
Evstifeev Roman
507c8b9a9d White text on white bg on login screen is invisible
When used dark Qt theme, text color should be set explicitly for explicitly white background.
2015-08-28 20:23:54 +03:00
Zetok Zalbavar
9561660104
Simplyfy advanced settings - DB setting
thanks to @AWeinb for idea, fixes #1514
2015-08-28 11:33:53 +01:00
ovalseven8
67193c9d8a Update generalsettings.ui
to avoid misunderstandings
2015-08-27 13:11:13 +02:00
agilob
b02cf2dbc7
Merge remote-tracking branch 'PKEv/fix_#1977_no_link_if_no_GIT_VERSION'
no link if no GIT_VERSION
2015-08-26 19:53:11 +01:00
agilob
5438099359
Merge remote-tracking branch 'PKEv/exp_func_screenshot'
ability to hide the window during a screenshot (by pressing spacebar)
2015-08-26 19:50:40 +01:00
agilob
78f3044317
Merge remote-tracking branch 'zetok/profile'
Fix 2 minor issues introduced by #1989
2015-08-26 19:45:11 +01:00
Impyy
4fdff0cfde Added toxme.io to the pinned servers list 2015-08-25 13:41:17 +02:00
Zetok Zalbavar
32f9cfccf2
Fix 2 minor issues introduced by #1989
* Add space between ":" and name of profile file
* Fix opening location of profile on UNIX-like
2015-08-24 18:21:37 +01:00
agilob
030a72f561
Merge remote-tracking branch 'PKEv/del_chat_history'
add ability to delete chat history when disabling chat logging
2015-08-24 12:30:40 +01:00
agilob
796e1e04aa
Merge remote-tracking branch 'Impyy/tox3-fix'
fallback to _tox.name lookup
2015-08-24 12:14:03 +01:00
agilob
3b6d245f61 Merge remote-tracking branch 'PKEv/add_profileFileName_in_profilePage'
fix #1951
2015-08-24 12:13:05 +01:00
agilob
a4a52f9cc9
Merge remote-tracking branch 'rku/contact-removal-dialog' 2015-08-24 11:26:37 +01:00
PKEv
7f29940625 fix #2103
ability to hide the window during a screenshot
2015-08-24 01:10:31 +03:00
PKEv
86610f3d7a fix #2089 (copy QR image) 2015-08-23 18:41:49 +03:00
ovalseven8
ba9e89f2ea Update generalsettings.ui
Remove useless HTML.
2015-08-22 17:59:08 +02:00
rku
74d98fd0c2 This dialog solves all confusion that arose from current verification method and is accident-proof. Current method asks if
user also wants to remove chat history. However confused user may not carefully read message and click "no" because he does
not want to remve contact. However in this case contact is in fact removed but history is preserved. It is also open to
possiblity that key smashing deletes contact by accident. This is very inconvenient because tox ids are long and hard to
memorize. If someone removes contact by accident then he would need to find id of that contact in order to contact him/her.
Sometimes this may be difficult.

New contact removal confirmation dialog prompts use to enter "YES" in the text boxin order to enable "OK" button so removal
can be accepted. It also has checkbox for history removal. Dialog will work with translations. Russian user would need to
enter "Да" in order to accept removal.
2015-08-22 12:17:04 +03:00
PKEv
31f2a39efe Correct strings 2015-08-21 23:26:14 +03:00
TheSpiritXIII
d21a6d29de Fix request translations and make group button stay down 2015-08-21 12:36:59 -04:00
TheSpiritXIII
2043908e15 Remove dialog for group invites 2015-08-21 10:32:00 -04:00
TheSpiritXIII
997418a9de Store friend requests 2015-08-20 17:58:03 -04:00
Nils Fenner
19278f76c1 Merge pull request #2052 from agilob/1973
Disables maximize button on login window
2015-08-20 23:46:44 +02:00
agilob
6afde9437c
make sure to zero window flag for login window 2015-08-20 22:27:13 +01:00
Zetok Zalbavar
aed6c25fda
Merge pull request #2078 from mvystrcil:master
Added czech translation
2015-08-20 22:14:21 +01:00
agilob
af400ee71c Merge pull request #2041 from zetok/wording
Better wording for accepting / rejecting avatars
2015-08-20 22:00:28 +01:00
agilob
eea7fd1c63 Merge pull request #2045 from TheSpiritXIII/recent
Fix friend list when day changes
2015-08-20 21:59:19 +01:00
Zetok Zalbavar
ff4ebe6bfe
Fix compiling qTox against static Qt 5.5 2015-08-17 00:40:26 +01:00
Martin Vystcil
e89213e01d Added czech translation 2015-08-16 13:10:09 +02:00
agilob
d0d9951eb3 closes #1973 2015-08-03 21:14:29 +01:00
Impyy
b1744ab023 Fixed issue #2048 2015-08-03 16:09:19 +02:00
TheSpiritXIII
e574af7a5e Fix friend list when day changes 2015-07-30 13:24:34 -04:00
Zetok Zalbavar
2088c26028
Better wording for accepting / rejecting avatars 2015-07-28 11:11:58 +01:00
tux3
74b771373d
Merge branch 'pr1953' 2015-07-22 23:33:21 +02:00
PKEv
8b524e54e2 fix #1977 not link if no GIT_VERSION 2015-07-21 01:03:56 +03:00
Drew DeVault
051f42135d Add sr.ht key 2015-07-19 19:53:02 -04:00
Spagy
00efbf9e79 Remove call to ProfileLocker::clearAllLocks()
The call to ProfileLocker::clearAllLocks() was unnecessary and could remove locks from other programs
2015-07-17 15:49:15 +01:00
TheSpiritXIII
b9882c3680 OSX: Remove dead code and make Widget own all their actions 2015-07-17 08:20:47 -04:00
Yuri
0895b89794 Prevent crashed when default video format not found. 2015-07-15 01:46:23 -07:00
tux3
49f7a02cbb
Merge branch 'pr1996' 2015-07-15 03:05:49 +02:00
Jookia
7fab49d665 core: TOX_ERR_NEW_LOAD_BAD_FORMAT is non-fatal.
This fixes errors from save migrations between versions and architectures.
2015-07-12 23:58:40 +10:00
PKev
3b614a17f7 Added indication of the profile folder on the profile page 2015-07-10 14:42:14 +03:00
PKev
0056270710 Add profile file name in profile page
fix #1951
2015-07-10 10:55:51 +03:00
TheSpiritXIII
49071baac7 OSX usable menu bar on login screen 2015-07-09 08:43:19 -04:00
agilob
aa05d71f4b connect signal-slot in profileform 2015-07-09 13:06:23 +01:00
TheSpiritXIII
7bb56bcda9 OSX main menu bar 2015-07-08 14:14:25 -04:00
PKEv
c2b246409f add max size of emoji
fix #1691
max size is calculated  from the possibility of fully display the selection window of emoji and value Qt::AA_UseHighDpiPixmaps.
2015-07-02 21:41:14 +03:00
TheSpiritXIII
bb29b07d70 Fix activity sorting out of bounds, update activity category when changed 2015-07-01 09:10:55 -04:00
PKEv
cd307bd52c Update friendlistwidget.cpp 2015-07-01 14:54:34 +03:00
PKev
efe05a3ca5 fix sorting "by activity" #1948
fix spaces
2015-07-01 14:07:34 +03:00
PKev
4682814442 fix the names in the history
fix #1943 #1787
2015-06-30 16:56:38 +03:00
Daniel Hrabovcak
cd5294c055 Fix OS X compile, change instructions to use brew 2015-06-29 10:31:00 -04:00
tux3
8d1a3b7357
Sleep while waiting for IPC events 2015-06-29 11:39:19 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
3e8fe2db6c
Fix video not loading when A/V tab shown 2015-06-29 11:10:50 +02:00
PKEv
e958f99609 Add way to delete whole history #1871 2015-06-29 00:01:49 +03:00
tux3
4f0a517531
Merge branch 'pr1914' 2015-06-28 18:23:50 +02:00
PKev
6069036324 translate to russian "contacts groups" 2015-06-28 19:15:09 +03:00
tux3
62d298462b
Fix circles doubling when reloaded
We do need to clear before reloading.
2015-06-27 21:32:11 +02:00
tux3
645b1e5566
Fix raciness of encryption API
And make it saner by not having one global password that has to be set before encrypting/decrypting, which is as racy and poorly designed as it gets

Fixes #1917 's immediate symtoms, which some potential for other regressions due to the mess that is encrypted persistence currently
2015-06-27 21:14:35 +02:00
tux3
636faac4db
Fix #1919 2015-06-27 19:27:01 +02:00
tux3
9e55c77849
Better freeing of CameraSource 2015-06-26 19:04:53 +02:00
tux3
2ab55568f2
Make the video code a singleton, fix multithreading bugs
There can now only be one CameraSource running.

Video frames are decoded in their own thread, and then converted by users in the user's threads.
The CameraSource API is entirely thread-safe and controls the video decoding thread.

The video device only stays open as long as there are users subscribed to the CameraSource.

We use a dangerous combination of spinlocks and memory fences to keep things synchronized.
2015-06-26 18:34:48 +02:00
tux3
5e4abcb775
Refactor a strange return-early condition 2015-06-26 14:15:27 +02:00
tux3
79d335ff4c
Merge branch 'pr1890' 2015-06-26 14:13:03 +02:00
TheSpiritXIII
d2c0301103 Circles: Fix circle color on theme change, remove debugging stuff
Conflicts:
	res.qrc
2015-06-26 13:38:51 +02:00
TheSpiritXIII
b6df8ce34a Circles: Fix sort circles on menus, fix groupchat rename through widget, improve activity sort performance 2015-06-26 10:54:50 +02:00
TheSpiritXIII
484a9ea87e Circles: Fix crash when creating in category where it's not visible 2015-06-26 10:54:50 +02:00
TheSpiritXIII
7f7ab9a1bc Circles: Fix quick switch crash, remove circle crash 2015-06-26 10:54:50 +02:00
TheSpiritXIII
5c80d06ee9 Circles: Add while searching 2015-06-26 10:54:49 +02:00
TheSpiritXIII
8357095d8a Circles: Sort numbers at end, too 2015-06-26 10:54:49 +02:00
TheSpiritXIII
79424de10a Circles: Use history for activity, fix search 2015-06-26 10:54:49 +02:00
TheSpiritXIII
d9d6f20bf7 Circles: Fix convention, crash and activity cycling 2015-06-26 10:54:49 +02:00
TheSpiritXIII
858b005567 Circles: Fix memory leaks and extraneous saving 2015-06-26 10:54:49 +02:00
TheSpiritXIII
9dd277623a Fix circles: Fix rename on creation and graphical bug 2015-06-26 10:54:49 +02:00
TheSpiritXIII
c662c0aa92 Update activity on friendship, fix category friend removing (circles and activity) 2015-06-26 10:54:49 +02:00
TheSpiritXIII
e233d7d1c6 Allow circles to be created while sorted by activity 2015-06-26 10:54:49 +02:00
TheSpiritXIII
4ee38e7c69 Update activity on AV and files 2015-06-26 10:54:49 +02:00
TheSpiritXIII
ecdf863c02 Recent list selectable from drop list, bug fixes 2015-06-26 10:54:49 +02:00
TheSpiritXIII
c24a508c38 Switch between recent and alphabetical layouts 2015-06-26 10:54:49 +02:00
TheSpiritXIII
15f10c2f34 Recent list (right click empty list to test) 2015-06-26 10:54:49 +02:00
TheSpiritXIII
62873e9d71 Fix circle related rebase bugs 2015-06-26 10:54:49 +02:00
tux3
3a30a038ef Fix color of circle names 2015-06-26 10:54:49 +02:00
tux3
33a33ef051 Rebase on master 2015-06-26 10:54:49 +02:00
TheSpiritXIII
cc9edf6f90 Minor code cleanup for circles and related 2015-06-26 10:54:00 +02:00
TheSpiritXIII
8e796a1d8b Update renamed friends and groups during search 2015-06-26 10:54:00 +02:00
TheSpiritXIII
167a8971ec Search optimizations and bug fixes, rename focus fix 2015-06-26 10:54:00 +02:00