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

2032 Commits

Author SHA1 Message Date
agilob
7d8e0644ce remove dependency injection from systemtrayicon
as it was used as experiment only
fix compilation warning about unchecked switch case
2015-10-23 16:21:05 +02:00
agilob
8c4d58f391 fix icon scaling on gnome3 by scaling icons down 2015-10-23 16:21:04 +02:00
agilob
521b55f776 use Qt backend of KDE5
commit fixes problem with usage of GTK3 fallback menu action used on KDE5, probably to a bug in status notifier
- allows using Qt backend on KDE5 and other plasma related env.
- icon in tray menu and tray icon are loaded from svg, their size is not limited to 50px now
- plasma adds extra actionmenu to tray so quit was renamed to exit
- exit action usues system-default icon for quit and system default keyboard shourtcut to close qtox
2015-10-23 16:21:04 +02:00
tux3
b69f8425c6 Fix qTox on OSX, closes #2447 2015-10-23 15:21:47 +02:00
tux3
1f61534841 Merge branch 'pr2343' 2015-10-23 15:20:58 +02:00
Rowen Stipe
e107de12c0 Compile on Mac
This set up added to current master compiles properly on Mac.

Includes pull #2436 fixes suggested by @antis81
2015-10-22 01:57:46 -04:00
Zetok Zalbavar
d2aa9441bf
Merge pull request #2364 from PKEv:fix_write_to_db
fix write to DB
2015-10-22 05:50:25 +01:00
Dmytro Shynkevych
b887072bc4 systemtrayicon: switched to manual memory management for pixmap data 2015-10-21 23:42:14 -04:00
Nils Fenner
33e54b841a
Merge pull request #2415 from antis81:ngf/mic 2015-10-21 22:19:37 +02:00
Nils Fenner
cf8fa7b29c
remove unused include and forward declarations 2015-10-21 22:18:47 +02:00
agilob
4a64790b52
Merge remote-tracking branch 'bitok/Fix2167' 2015-10-21 19:13:10 +01:00
agilob
ecbda91764
Merge remote-tracking branch 'bitok/fix_performance_issues' 2015-10-21 19:12:15 +01:00
agilob
61ef6429e2
Merge remote-tracking branch 'zetok/fix-warning-no-profile' 2015-10-21 19:05:48 +01:00
Zetok Zalbavar
0c34b079a5
Unlock mutex before returning history instance
fix #2428
2015-10-21 13:17:42 +01:00
Nils Fenner
e1c2a80e82
switch colors in mic gain indicator gradient 2015-10-20 23:14:37 +02:00
Nils Fenner
82e1644d67
cleanup Audio::openOutput 2015-10-20 23:14:07 +02:00
Nils Fenner
3eb7b48d1c
cleanup Audio::openInput 2015-10-20 23:12:55 +02:00
Nils Fenner
ab41bf92ba
don't open audio in/out twice 2015-10-20 23:10:14 +02:00
Zetok Zalbavar
c07aee18ad
Merge pull request #2346 from PKEv:save_avatar_in_DB
Save avatar in DB
add import avatars
update delete avatar action
correct import avatar for user without history
add multithreaded
make import run once
2015-10-20 21:01:20 +01:00
Nils Fenner
b7cf4df13f
Get rid of static methods and bugs 2015-10-20 03:46:44 +02:00
Nils Fenner
54547af7cf
warn when trying to start audio thread twice 2015-10-20 03:42:02 +02:00
Nils Fenner
a675725a5e
change wording in docs 2015-10-20 03:41:18 +02:00
Nils Fenner
2bc3798aa0
remove dead & unfinished code 2015-10-19 21:59:47 +02:00
Nils Fenner
c8e003decb
further cleanup 2015-10-18 22:21:08 +02:00
Nils Fenner
8530acf079
fix asserts when (un-)subscribing input 2015-10-18 22:21:08 +02:00
Nils Fenner
59ca97e9b6
move docs to cpp 2015-10-18 22:21:08 +02:00
Nils Fenner
1c205b7c16
the big code cleanup
* Get rid of static vars and methods and move mutexes to right places.
* Use static wrappers for the moment to retain compatibility.
2015-10-18 22:21:08 +02:00
Nils Fenner
2a2cba3cf2
remove outcommented code 2015-10-18 22:21:08 +02:00
Nils Fenner
932d9b7c9b
Audio: Fix device open only when needed 2015-10-18 22:21:08 +02:00
TheSpiritXIII
dc2c6532a5
Audio: Fix unclosed audio when hanging up 2015-10-18 22:21:08 +02:00
TheSpiritXIII
bbbd450b6a
Audio: Only open mic when requested 2015-10-18 22:21:08 +02:00
TheSpiritXIII
868381fe3f
Audio: Don't need this? 2015-10-18 22:21:08 +02:00
TheSpiritXIII
61eb302ff7
Audio: Fix crash when no devices available 2015-10-18 22:21:08 +02:00
TheSpiritXIII
a311b96376
Audio: Open output only when necessary 2015-10-18 22:21:08 +02:00
Nils Fenner
a2a32b61c4
Audio: persistent volume sliders, mic feedback and volume 2015-10-18 22:21:08 +02:00
Nils Fenner
1fc703c281
fix warnings 2015-10-18 22:20:16 +02:00
agilob
7117083e86
Merge remote-tracking branch 'origin/new_video_view' 2015-10-18 20:55:01 +01:00
PKEv
e5a5074f91 make import run once
and rename function
2015-10-18 22:15:49 +03:00
PKEv
20d0eb06f6 add multithreaded 2015-10-18 20:04:37 +03:00
Zetok Zalbavar
d60cfe07b6
Remove an empty line and unneeded slash 2015-10-18 17:04:49 +01:00
PKEv
ec5e9c7350 correct import avatar for user without history 2015-10-18 16:50:00 +03:00
agilob
cde9721600
qunused on event 2015-10-18 10:18:13 +01:00
agilob
ec3ccc7ca3
remove qdebug from audio.cpp:270 2015-10-18 10:18:13 +01:00
agilob
d2e09ead7a
one more line to remove 2015-10-18 10:18:13 +01:00
agilob
d875221e53
remove unused code, removed unused checks 2015-10-18 10:18:06 +01:00
Zetok Zalbavar
60884b6c62
Display correct error message when trying to load non-existent profile
fixes #2412
2015-10-17 22:12:23 +01:00
agilob
7b90ed1abb
Merge remote-tracking branch 'zetok/fix-password-dialog' 2015-10-17 18:17:58 +01:00
Zetok Zalbavar
febb1933d9
Make text about not long enough password disappear if no password given
fixes #2405
2015-10-17 17:54:31 +01:00
Dmytro Shynkevych
e4ebe8b7a7 systemtrayicon: optimized QImage <-> GdkPixbuf conversion
Switched to gdk_pixbuf_new_from_resource() for loading from file
QImages are now stack-allocated, contents copied to GBytes
2015-10-17 12:44:33 -03:00
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
Matthieu Baerts
aaf9b95d97 Autorun:xdg: create autostart dir if needed
After a fresh installation of Ubuntu, 'autostart' dir is not available.
Simply create it with QDir::mkpath() (= mkdir -p).
2015-10-17 16:00:17 +02:00
Zetok Zalbavar
cedec2ea8d
Fix indentation for Focus window setting 2015-10-17 09:34:33 +01:00
Nils Fenner
69380d5159
Merge pull request #2383 from antis81:ngf/fix/ipc 2015-10-16 18:33:30 +02:00
agilob
5ecf9b729b
Merge remote-tracking branch 'antis81/ui/login-dialog' 2015-10-15 18:28:38 +01:00
PKEv
afb3bf35ee update delete avatar action 2015-10-14 23:33:16 +03:00
PKEv
0a11ccbeab add import avatars 2015-10-14 22:16:59 +03:00
PKev
dd975c38eb Save avatar in DB
Partially addresses an issue #1656
2015-10-14 22:16:59 +03:00
Nils Fenner
b32410b962
style login screen completely via css 2015-10-14 21:11:39 +02:00
agilob
919ba8c6d7
remove slash 2015-10-14 07:27:57 +01:00
Zetok Zalbavar
41cba4ae52
Merge pull request #2390 from antis81:ui/login-dialog
set login dialog style via css stylesheet

closes #2333 #2368 #2367
2015-10-14 01:00:55 +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
Nils Fenner
06ba8a0f6a
set login dialog style via css stylesheet 2015-10-13 19:02:28 +02:00
bitok
8594dcd6c8 Error display more explicit 2015-10-13 01:32:04 +03:00
Nils Fenner
a8725729bf
readd msleep with lowest possible sleep time 2015-10-12 20:28:03 +02:00
Nils Fenner
3f38ba3896
initialize IPC on first call 2015-10-11 23:09:29 +02:00
Nils Fenner
6644622301
fix #2360
The valid result prevents starting a second instance.
2015-10-11 23:08:49 +02:00
Nils Fenner
7cf1f564b0
remove dead code 2015-10-11 23:07:37 +02: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
Nils Fenner
5ddfc2eefe
cleanup inheritance QThread --> QObject and includes
IPC is actually not running in a thread; And if, QThread should not be inherited.
2015-10-11 13:49:22 +02:00
Nils Fenner
42a917fc58
remove obsolete QThread::msleep completely 2015-10-11 13:47:19 +02: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
bitok
23a0f748dd Added clear button for search field #2015 2015-10-11 01:15:30 +03: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
0e9cfd948e
remove menubar and status bar
Signed-off-by: agilob <info@agilob.net>
2015-10-10 13:55:14 +01:00
agilob
266c0fb989
Merge branch TheSpiritXIII:video 2015-10-10 13:49:30 +01:00
TheNain38
2db1d1449f Fixdisplaying Pub key when name empty 2015-10-10 13:25:58 +02:00
tux3
aa303b24b3
Merge branch 'pr2363' 2015-10-10 12:32:19 +02:00
Dmytro Shynkevych
901befb270 cameradevice: fixed a double free
Introduced by c491f79077
2015-10-09 19:10:43 -04:00
PKev
889bd77e23 fix write to DB
fix #2292, please test i don't sure
2015-10-09 14:38:12 +03: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
tux3
59e0692069 Sleep 10ms in IPC wait loop, not 10 SECONDS!
Fixes #2334
2015-10-08 19:54:06 +02: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
Dmytro Shynkevych
c491f79077 cameradevice: fixed a regression
Memory would sometimes not be freed.
Caused by 8776682d44
2015-10-05 21:21:12 -04: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
8776682d44 cameradevice: fixed a major leak: avformat_context not always freed 2015-10-04 17:21:52 -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
Dmytro Shynkevych
c4e07f219c settings: fixed check on an uninitialized value
enableLogging has to be deserialized before
getEnableLogging() in Friends group can be called.
2015-10-04 15:48:17 -04:00
Dmytro Shynkevych
05e84f3838 statusnotifier: fixed pointer type 2015-10-04 15:41:56 -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
Dmytro Shynkevych
fc41cded7f statusnotifier: fixed a memory leak in get_prop()
Replaced get_builder_for_icon_pixmap() with get_icon_pixmap()
returning a plain GVariant. Refactored all usages.
2015-09-29 23:17:47 -04:00
agilob
9cafb31eca
Merge remote-tracking branch 'antis81/ngf/fix/screen-grabber' 2015-09-29 19:36:36 +01:00
agilob
d65f54cc81
Merge remote-tracking branch 'PKEv/add_mail_link_support' 2015-09-29 19:07:10 +01:00
PKEv
b9a9b3f6c5 add 150ms for hiding & restoring window
fix #2290
2015-09-29 20:39:32 +03:00
PKev
381e291dac add mail link support
fix #2318
2015-09-29 15:33:26 +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
tux3
c0e2b91fe8
Fix #2310 caused by #2309 2015-09-27 23:45:02 +02:00
agilob
865b1a915c
Merge remote-tracking branch 'thenain38/url' 2015-09-27 20:48:41 +01:00
TheNain38
879c396efc Added dynamic translation to status and username 2015-09-27 21:36:17 +02:00
TheNain38
c6c3150803 Display correclty what the user write and open correctly link with 'http://' 2015-09-27 13:58:18 +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
agilob
3ceb289020
Merge remote-tracking branch 'PKEv/QRegExp_for_local_file' 2015-09-25 18:46:37 +01: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
PKev
f476b752d1 Added support for local links in messages and correct detect links like "www.123.com" 2015-09-25 01:20:20 +03:00
agilob
45db1dff91
Merge remote-tracking branch 'antis81/ngf/fix/multi-window-buttons' 2015-09-24 19:23:04 +01:00
agilob
dabb346c3a
Merge remote-tracking branch 'PKEv/correct_remove_profile' 2015-09-24 19:06:34 +01:00
Nils Fenner
cf9ed8d580
fix screen grabbing for screenshots 2015-09-24 16:44:07 +02:00
PKEv
ae9b29cfae correct remove profile
fix #2284
2015-09-24 02:00:22 +03: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
agilob
a09d448ec4
Merge remote-tracking branch 'zetok/login' 2015-09-19 01:03:38 +01:00
PKev
9484488c31 restore window after screenshot 2015-09-18 22:45:58 +03:00
Zetok Zalbavar
6998c2c757
Make 'None' and 'Desktop' camera device names translatable
fixes #2252
2015-09-18 19:12:10 +01: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
Zetok Zalbavar
35a15f119e
Reword login window: "Login" → "Load Profile"
thanks to @LittleVulpix suggestion

fixes #1898
2015-09-18 08:07:58 +01: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
54fc35e714
Fix group name changes not displaying 2015-09-14 20:25:16 +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
346c2c64db
Merge remote-tracking branch 'zetok/wording' 2015-09-13 22:59:50 +01:00
agilob
8058d85f75
Merge remote-tracking branch 'zetok/wording2' 2015-09-13 22:59:14 +01:00
agilob
78a07dc5d9
Merge remote-tracking branch 'antis81/ngf/fix/virt-overloads' 2015-09-13 22:57:27 +01:00
Nils Fenner
fa6bd18ad7
fix virtual overrides 2015-09-13 23:20:54 +02:00
Nils Fenner
d14e93ef91
fix faulty parented QFileDialog
closes issue #2205
2015-09-13 23:09:21 +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
Zetok Zalbavar
7449e0efcd
Change wording "tox{1,3}" → "toxdns{1,3}"
Should help avoid confusion about security of Tox protocol.
2015-09-10 13:09:01 +01:00
Zetok Zalbavar
2409827582
Merge pull request #2192 from ovalseven8:patch-5
Replace char in file
2015-09-08 14:27:52 +01:00
ovalseven8
2a8354a52e Replace char in file
- Qt Linguist had problems with it
- Additionally, improved readability
2015-09-08 15:14:00 +02:00
aaannndddyyy
4fb4ba7617 correct a typo 2015-09-07 20:50:41 +00:00
tux3
5f16c5c1da
Don't save settings a billion times on startup 2015-09-06 00:17:41 +02: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
tux3
0596210099
Merge branch 'pr2150' 2015-09-05 19:30:47 +02:00
tux3
54c837a03e
Fix portable mode settings loading
Fixes partially #1883, avatars still don't carry over.
2015-09-05 19:20:18 +02:00
Zetok Zalbavar
7796421f73
Improve wording of login page: "Create Account" → "Create Profile"
This should improve situation with misunderstandings, and add more
consistency.
2015-09-04 14:03:24 +01: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
tux3
05fece4fab
Remove unused clearAllLocks function 2015-09-03 17:25:09 +02:00
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