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

1288 Commits

Author SHA1 Message Date
Zetok Zalbavar
0cf70c33ae
Merge pull request #2386 from agilob:settings_reogranize
reorganize generalsettings:
generalsettings form: removed empty label
generalsetting layout: change indentation method
remove slash
Fix indentation for `Focus window` setting
2015-10-17 16:31:29 +01:00
Zetok Zalbavar
cedec2ea8d
Fix indentation for Focus window setting 2015-10-17 09:34:33 +01:00
PKEv
afb3bf35ee update delete avatar action 2015-10-14 23:33:16 +03:00
PKev
dd975c38eb Save avatar in DB
Partially addresses an issue #1656
2015-10-14 22:16:59 +03:00
agilob
919ba8c6d7
remove slash 2015-10-14 07:27:57 +01:00
bitok
d6ff67893f Fix performance issues detected with static analyze 2015-10-13 23:21:20 +03:00
agilob
726ebadaaa
Merge remote-tracking branch 'zetok/password-dialog' 2015-10-13 20:31:01 +01:00
agilob
e0819d8439
generalsetting layout: change indentation method 2015-10-13 19:37:29 +01:00
bitok
b4cc326e78 Fix formulation 2015-10-13 21:24:04 +03:00
bitok
8594dcd6c8 Error display more explicit 2015-10-13 01:32:04 +03:00
agilob
7afeb41b1e
Merge remote-tracking branch 'antis81/ngf/fix/screen-grabber' 2015-10-11 20:27:46 +01:00
agilob
4a4df15662
Merge remote-tracking branch 'Impyy/feature-rm-avatar' 2015-10-11 20:21:36 +01:00
agilob
cf98376587
generalsettings form: removed empty label 2015-10-11 18:51:08 +01:00
agilob
15077ec142
reorganize generalsettings:
* tab order on widgets
* better spacing
* consistent text
* indentation for similar settings
2015-10-11 18:46:35 +01:00
agilob
884547cd34
Video: fix sgefault when disconnecting from video call 2015-10-11 10:46:42 +01:00
agilob
73993e8b5d
update video mode on manual change , closes #2046 2015-10-11 07:58:36 +01:00
agilob
cffac87cbd
nicely close camera when quitting qtox from opened av tab, fixes #2037 2015-10-11 07:50:08 +01:00
agilob
7c6ac40d21
add debugging messages to camerasource, code reformatting to make it more readable and ogranized better 2015-10-11 07:38:44 +01:00
Zetok Zalbavar
04cf6d0133
Make Change password dialog ~consistent with login page password form
Make text about password not matching appear only when passwords don't match.

Change width of dialog window, to make it look better.

fixes points 1 and 2 from issue #2337
2015-10-10 18:58:59 +01:00
Nils Fenner
a6a8f619b2
no need to install an event filter on "this" 2015-10-10 17:55:29 +02:00
Nils Fenner
073d4f0ad3
fix hide/restore qTox windows with space key 2015-10-10 17:54:56 +02:00
Nils Fenner
6e383fa0f1
add methods to hide & restore currently visible qTox windows 2015-10-10 17:45:23 +02:00
Nils Fenner
24aec1dfd3
ScreenshotGrabber::showGrabber isn't a slot 2015-10-10 17:41:04 +02:00
Nils Fenner
75ba20cb06
simplify graphics scene initialization 2015-10-10 17:39:59 +02:00
Nils Fenner
b5493178e7
cleanup includes 2015-10-10 17:34:33 +02:00
bitok
55f5357ce1 Migration to QRegularExpression and text formulation fix 2015-10-10 18:25:24 +03:00
agilob
83bcf2b8ae
fix closing video device after changing tab 2015-10-10 14:26:35 +01:00
bitok
f5bffa0f0c #2167 fix: qTox should check if string in "Add friend" input field is 64 chars long 2015-10-10 16:26:00 +03:00
agilob
266c0fb989
Merge branch TheSpiritXIII:video 2015-10-10 13:49:30 +01:00
tux3
aa303b24b3
Merge branch 'pr2363' 2015-10-10 12:32:19 +02:00
tux3
b0647b0b4b
Merge branch 'pr2361' 2015-10-09 09:42:40 +02:00
tux3
19a1851547
Small startup speed improvement 2015-10-09 02:11:06 +02:00
bitok
aff85a7ea6 2257 Fix and Style comboBox fix 2015-10-09 01:31:34 +03:00
bitok
af7b8b7a25 Merge branch 'master' of https://github.com/tux3/qTox into FriendListLayoutFix 2015-10-08 22:55:42 +03:00
bitok
42e0770991 Fixed FriendListLayout constructor delegation fix 2015-10-08 22:53:46 +03:00
agilob
6e0c0d1210
Merge remote-tracking branch 'PKEv/fix_save_position_when_moving_widget' 2015-10-08 20:39:28 +01:00
agilob
bc6e2287d9
Merge remote-tracking branch 'thenain38/master' 2015-10-08 19:00:08 +01:00
Impyy
fbd95b0781 Fixed #2294 - Remember proxy type after retranslation 2015-10-07 19:44:12 +02:00
tux3
56cccc7492 Fix #2228: Friendlist too wide on first start 2015-10-07 15:28:20 +02:00
agilob
6c26262ba3
Merge remote-tracking branch 'thenain38/fix-HTML-username-status' 2015-10-06 19:01:45 +01:00
agilob
91d9f263ce
Merge remote-tracking branch 'thenain38/dynamic-call-video-mute-unmute-trans' 2015-10-06 18:56:48 +01:00
PKev
0152937eb4 fix: save position when moving widget
fix #2063
2015-10-06 16:13:47 +03:00
Impyy
98c21f3832 Added a context menu to edit/remove the avatar 2015-10-05 22:03:31 +02:00
agilob
eaf44c45d5
Merge remote-tracking branch 'zetok/screenshotname' 2015-10-05 19:48:55 +01:00
Dmytro Shynkevych
88cce4e137 systemtrayicon: fixed multiple small leaks 2015-10-04 19:51:51 -04:00
Dmytro Shynkevych
2982bab991 profileform: fixed leaky toxId field 2015-10-04 18:18:34 -04:00
Dmytro Shynkevych
45a3d7ca30 systemtrayicon: fixed multiple gdk_pixbuf memory leaks
Note: QImages **must** be heap-allocated, their data are used
until the corresponding gdk_pixmap is finalized
2015-10-04 16:58:24 -04:00
Zetok Zalbavar
a13969b9ba
Make screenshot names use ~ISO 8601 (timestamp) instead of random string
Now screenshots will be saved as: `qTox-Screenshot_yyyy-MM-dd HH-mm-ss.zzz`

Since miliseconds are used, it shouldn't cause filename conflicts when
saving screenshots.

Change should make it easier for users to navigate through screenshots
chronologically.
2015-10-04 15:10:04 +01:00
TheNain38
05d511bb66 Fix another parsing bug, fix Action message bold
When you are the author of an 'action' message, it is not in bold, but if reloading history it is
2015-10-04 14:36:38 +02:00
agilob
c5127e3654
Merge remote-tracking branch 'zetok/audio-win-fix' 2015-10-04 11:01:58 +01:00
agilob
7521cd4785
Merge remote-tracking branch 'PKEv/fix__switching_contacts_view' 2015-10-04 10:21:56 +01:00
TheNain38
f99c9f127d Fix ACTION messages, status, username HTML parsing 2015-10-03 21:31:41 +02:00
PKEv
164d6a124e Program crashes after switching the display view of contacts, from compact to normal view 2015-10-03 22:30:08 +03:00
agilob
2ec716cb54
Merge remote-tracking branch 'thenain38/fix-dynamic-trans-db' 2015-10-03 18:10:12 +01:00
agilob
a522624b2d
Merge remote-tracking branch 'PKEv/fix_2183_dir_to_Profile' 2015-10-03 17:52:12 +01:00
TheNain38
59e8755637 Dynamic translation of call, video, mute, unmute 2015-10-03 17:41:46 +02:00
Nils Fenner
cfe6462fef
Merge pull request #2324 from antis81:ngf/fix/screen-grabber 2015-10-03 10:22:04 +02:00
Nils Fenner
84a8e2789b
fix position of tooltip in screen grabber
The tooltip is shown centred at top of the screen which currently contains the mouse cursor.
2015-10-03 10:03:14 +02:00
Nils Fenner
80fa36e134
Merge pull request #2323 from dmshynk:fix_memory_leaks 2015-10-01 22:25:07 +02:00
Dmytro Shynkevych
7b1b4655a5 systemtrayicon: image is now stack-allocated 2015-09-30 18:00:25 -04:00
agilob
9cafb31eca
Merge remote-tracking branch 'antis81/ngf/fix/screen-grabber' 2015-09-29 19:36:36 +01:00
PKEv
b9a9b3f6c5 add 150ms for hiding & restoring window
fix #2290
2015-09-29 20:39:32 +03:00
PKEv
bd77a38e5d Fix dir to user profile
fix #2183 (for portable mode)
2015-09-29 10:46:23 +03:00
TheNain38
32948fb5c4 Add dynamic translation to db write type 2015-09-28 23:26:47 +02:00
TheNain38
af472550a4 Better translations with plural and fix something not being translated dynamically 2015-09-28 07:36:24 +02:00
Dmytro Shynkevych
d548b51e1d systemtrayicon: fixed minor memory leak 2015-09-27 23:19:21 -04:00
Dmytro Shynkevych
0de6600c94 contentlayout: items are now properly deallocated on clear 2015-09-27 22:20:16 -04:00
Dmytro Shynkevych
f288be72d9 genericchatroomwidget: fixed memory leak if compact view enabled 2015-09-27 21:06:27 -04:00
tux3
e1509a9f03
Further cleanup Widget::retranslateUi 2015-09-28 00:05:42 +02:00
Nils Fenner
fde63f1592
fix screenshot grabber for windows 2015-09-27 23:57:01 +02:00
tux3
14235c5a19
Refactor code duplication in Widget::retranslateUi 2015-09-27 23:52:10 +02:00
TheNain38
879c396efc Added dynamic translation to status and username 2015-09-27 21:36:17 +02:00
Nils Fenner
dd9f0763b7
fix inheritance of ScreenShotGrabber 2015-09-25 21:47:49 +02:00
Nils Fenner
04219e8c1d
fix positioning of screen grabber window 2015-09-25 21:44:54 +02:00
Impyy
c49ce6208e Load user status from data file 2015-09-25 20:56:11 +02:00
Nils Fenner
7b2610e4fb
resize screen grabber window to pixmap size 2015-09-25 14:25:14 +02:00
Zetok Zalbavar
b2b50c26ce
Fix audio not working on 64-bit windows with non-latin audio device names
properly fixes #816
2015-09-25 08:14:19 +01:00
agilob
45db1dff91
Merge remote-tracking branch 'antis81/ngf/fix/multi-window-buttons' 2015-09-24 19:23:04 +01:00
Nils Fenner
cf9ed8d580
fix screen grabbing for screenshots 2015-09-24 16:44:07 +02:00
Impyy
25ff57ad23 Make the cancel button the default button 2015-09-23 20:04:13 +02:00
Impyy
91e51f8a10 Changed the buttons back to 'Cancel' and 'Remove' 2015-09-23 18:10:55 +02:00
Impyy
3d72a75ed3 Made the 'remove friend dialog' userfriendly 2015-09-23 17:06:57 +02:00
Nils Fenner
41500f2134
fix window buttons in "multi-window" mode 2015-09-23 11:57:50 +02:00
PKev
a14d917703 correct screenshot tooltip
fix #2267
2015-09-22 12:51:46 +03:00
agilob
a53f6f2adf
Merge remote-tracking branch 'PKEv/restor_window_after_screenshot' 2015-09-19 23:03:26 +01:00
PKev
9484488c31 restore window after screenshot 2015-09-18 22:45:58 +03:00
TheNain38
6c526fe5fe More consistent translation strings in groupchatform.cpp
It should not be able to be translated differently as one update when the number of user in the group chat change and the other is when language change, so it should be translated together.
2015-09-18 19:10:37 +02:00
aaannndddyyy
9269b0f967 rename two options 2015-09-17 18:25:23 +00:00
tux3
21ab9088b3
Remove broken 'Copy friend ID' feature 2015-09-15 17:58:46 +02:00
tux3
6229e045f2
Merge branch 'pr2223'
Fixes #659
2015-09-14 19:51:10 +02:00
tux3
cf5fb0397a Remove 'Open Chat' menu action
Apparently, nobody uses it
2015-09-14 19:31:03 +02:00
PKEv
564b32eb7c save alias 2015-09-14 20:10:35 +03:00
agilob
8058d85f75
Merge remote-tracking branch 'zetok/wording2' 2015-09-13 22:59:14 +01:00
Nils Fenner
fa6bd18ad7
fix virtual overrides 2015-09-13 23:20:54 +02:00
tux3
1f81e1f066 Don't reload content dialog if nothing changed
Should fix the zetok's Resizing problem in #1938
2015-09-12 19:07:45 +02:00
TheSpiritXIII
d0e682214b Multi-window: Fix blinking tray icon regression 2015-09-12 19:07:45 +02:00
TheSpiritXIII
16ebb7f3a9 Multi-window: Unminimize requested window 2015-09-12 19:07:45 +02:00
TheSpiritXIII
280737fda8 Multi-window: Fix group chat event flag regression 2015-09-12 19:07:45 +02:00
TheSpiritXIII
828dbf436f Multi-window: Fix compile for non-OS X 2015-09-12 19:07:45 +02:00
TheSpiritXIII
97bdaa5e5f Multi-window: OS X window list, fix OS X translations 2015-09-12 19:07:45 +02:00
TheSpiritXIII
23e7f9326e Multi-window: Fix open group in separate window when already open 2015-09-12 19:07:45 +02:00
TheSpiritXIII
ee627afc87 Multi-window: Fix buttons staying pressed while in separate window mode, make dialogs alert, fix group chat event flags 2015-09-12 19:07:45 +02:00
TheSpiritXIII
4e5c4cb678 Multi-window: Fix circle modified from dialog window, fix groupchat leave warnings, flip dialog window title 2015-09-12 19:07:45 +02:00
TheSpiritXIII
aa9a10fa8b Multiwindow: Fix segfault on quiting groups, remove dead code 2015-09-12 19:07:45 +02:00
TheSpiritXIII
1109e0347e Multi-window: Fix segfault for removing last friend on window friend list 2015-09-12 19:07:45 +02:00
TheSpiritXIII
f825985856 Multi-window: Translate all dialogs correctly, don't allow remove friend on dialogs 2015-09-12 19:07:44 +02:00
TheSpiritXIII
6a5fb9f518 Multi-window: Dispaly own username on detached windows, fix log out while having detached windows 2015-09-12 19:07:44 +02:00
TheSpiritXIII
29c72549a2 Multi-window: Fix segfault on removing groups and friends who are also in active windows 2015-09-12 19:07:44 +02:00
TheSpiritXIII
c5317c6137 Multi-window: Fix dialog null states/geometry 2015-09-12 19:07:44 +02:00
TheSpiritXIII
868099d484 Multi-window: Normalize window size on separate change, notification separate fix, segfault groupchat fix 2015-09-12 19:07:44 +02:00
TheSpiritXIII
014ba45ebb Multi-window: Keep window size, fix segfault, circle integration, changed defaults 2015-09-12 19:07:44 +02:00
TheSpiritXIII
c181df6336 Multi-window: Cycle widgets in opened windows 2015-09-12 19:07:44 +02:00
TheSpiritXIII
730626fc2c Multi-window: Sort window chat list, fix group window bugs 2015-09-12 19:07:44 +02:00
TheSpiritXIII
9867e3b4c5 Multi-window: Allow opening new window when already open, fix drop when already open 2015-09-12 19:07:44 +02:00
TheSpiritXIII
7bcf654c72 Multi-window: Add drag/drop friends to windows, fix call confirm widget 2015-09-12 19:07:44 +02:00
TheSpiritXIII
c684d31d02 Multi-window: Alert window storing chat, add group widgets, update statuses and avatars 2015-09-12 19:07:44 +02:00
TheSpiritXIII
fa3ab02cec Multi-window: Tabbed interface 2015-09-12 19:07:44 +02:00
TheSpiritXIII
22fcc3f7a0 Multi-window capabilities for all chats and menus 2015-09-12 19:07:44 +02:00
Zetok Zalbavar
ccc2dd2ad9
More visually appealing wording for DB writing mode 2015-09-10 16:08:30 +01:00
aaannndddyyy
4fb4ba7617 correct a typo 2015-09-07 20:50:41 +00:00
tux3
8fbc0c8b59
Remove some debug output fluff 2015-09-06 00:11:47 +02:00
tux3
b14bc68702
Merge branch 'pr2172' 2015-09-05 20:36:32 +02:00
Zetok Zalbavar
6f032cca53
Show toxcore version
Even though currently it's listed as 0.0.0, it sill should be shown.

Closes #2086
2015-09-04 12:11:41 +01:00
agilob
12e8d07a97
revert change history to -7 2015-09-03 17:58:23 +01:00
agilob
31c44b9db0
Merge branch 'master' of github.com:tux3/qTox into default_dir_for_saving 2015-09-03 17:57:23 +01:00
agilob
602143068c
fix opening directory/file in file transfer widger 2015-08-31 13:59:39 +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
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
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
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
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
TheSpiritXIII
7f5a95a599 Video: Cleanup 2015-08-19 19:13:45 -04:00
TheSpiritXIII
7886fdcb69 Video: resizable group avatar, synchronize avatar 2015-08-19 12:42:54 -04:00
TheSpiritXIII
50041a3140 Video: Initial video when call starts 2015-08-18 17:44:34 -04:00
TheSpiritXIII
814bd922ca Video: Group audio view avatars 2015-08-18 13:40:11 -04:00
Martin Vystcil
e89213e01d Added czech translation 2015-08-16 13:10:09 +02:00
TheSpiritXIII
1522d3848c Video: Show avatar, clean ups 2015-08-13 09:31:15 -04:00
TheSpiritXIII
9d12c295be Keep aspect ratio of inner video 2015-08-11 14:01:49 -04:00
agilob
d0d9951eb3 closes #1973 2015-08-03 21:14:29 +01:00
TheSpiritXIII
e574af7a5e Fix friend list when day changes 2015-07-30 13:24:34 -04:00
tux3
74b771373d
Merge branch 'pr1953' 2015-07-22 23:33:21 +02:00
TheSpiritXIII
cd90d8d34b Video: Add collapse/expand button, expand all the way, better self video output location 2015-07-22 14:50:39 -04:00
TheSpiritXIII
4c493b85a0 Video: View self video during video call 2015-07-21 14:38:43 -04:00
PKEv
8b524e54e2 fix #1977 not link if no GIT_VERSION 2015-07-21 01:03:56 +03:00
TheSpiritXIII
1b10672179 Video: Embed video into chat 2015-07-20 17:57:46 -04:00
TheSpiritXIII
b9882c3680 OSX: Remove dead code and make Widget own all their actions 2015-07-17 08:20:47 -04: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
Daniel Hrabovcak
cd5294c055 Fix OS X compile, change instructions to use brew 2015-06-29 10:31:00 -04: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
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
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