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

536 Commits

Author SHA1 Message Date
Nils Fenner
f4f77af071
add "play test sound" button, while changing volume 2016-01-23 16:45:25 +01:00
Nils Fenner
6f7df25f4a
initialize gain/volume after initialization of audio in/out device
The gain/volume values are now applied to the settings once, when releasing the slider instead of continuously.
2016-01-23 16:45:25 +01:00
Nils Fenner
719def932b
remove unneeded "setCurrentIndex(-1)", when reading audio in/out device lists
The combo boxes current index is set to the correct value at end of initialization loop.
2016-01-23 16:45:25 +01:00
Nils Fenner
086e35d106
use utf-8 strings for audio device specifiers 2016-01-23 16:45:25 +01:00
Nils Fenner
e1f7e553ab
initialize volume sliders in av-settings ui at the right place 2016-01-23 16:45:25 +01:00
Nils Fenner
7d547b10eb
major changes to audio volume control
* use the ALListener object for master volume control
* initialize audio sources
* audio volumes are now expressed as percentage values between 0 and 1 to the public API
* removed artificial amplification of input samples
* removed invalid audio source generation in group calls
* minor: fixed gain slider max. value to 100 percent
2016-01-23 16:45:25 +01:00
Nils Fenner
1fb4d0d9f3
clean up audio settings ui 2016-01-23 16:45:25 +01:00
Rowen Stipe
df584531c8 Enable OS X Auto-run at login 2016-01-20 05:17:03 -05:00
Nils Fenner
251d53f340
temporary remove audio gain metering 2016-01-17 11:00:52 +01:00
Nils Fenner
0615c7c3c6
reimplement audio in/out subscription concept 2015-12-20 09:45:43 +01:00
Nils Fenner
bb7d2a72b7
privatized audio interface 2015-12-20 09:45:22 +01:00
Nils Fenner
c23cb0043f
implement actual audio in/out subscription management 2015-12-20 09:42:14 +01:00
Nils Fenner
872be36225
un-/subscribe audio in/out in AV-Settings form 2015-12-20 09:40:57 +01:00
Nils Fenner
32bc99fb38
cleanup reinitialization of changed audio in/out 2015-12-20 09:40:57 +01:00
tux3
b5cdfb3dce
Implement new SQLCipher based database and history
qTox will automatically import the old history on startup.

This new database code is much more robust.
It is very resilient and will not corrupt or disappear after a crash or
power failure, unlike the old code.
The on-disk database format is also much more compact now.

The database sync option in the advanced settings has been removed,
we know run many database operations asynchronously so performance
should not be a problem anymore, but we always ensure resiliency
in case of abrupt termination, so there is no tradeoff anymore.
2015-12-19 04:17:28 +01:00
tux3
61e3b7f5a0
Mark 'update text' not translatable
Plus some automatic edits Qt Designer decided to make
2015-12-12 23:29:36 +01:00
tux3
d67e6c7449 Improve integrated update code to match the rest
We're doing updates over HTTP until we get a domain name and a cert, but
this is not at all an issue since updates are still signed and checked.
2015-12-10 18:46:07 +01:00
tux3
ef5cb2689c
Merge branch 'pr2580' 2015-12-04 12:01:25 +01:00
tux3
bd1f22963b
Merge branch 'pr2519' 2015-12-04 11:54:08 +01:00
sudden6
bd83db5479 improve formating 2015-11-29 12:23:44 +01:00
sudden6
6d45932eea update ui 2015-11-18 18:58:56 +01:00
sudden6
27f751c2a6 also refresh video devices 2015-11-18 18:56:16 +01:00
Ferit Tunçer
a7440d3681 Turkish Translation by MarmaraGNU<mgnu.org> 2015-11-12 14:41:14 +02:00
TheNain38
2ae4524e33 Change 'minutes' to 'min' and remove translation 2015-11-11 18:24:15 +01:00
TheNain38
1a1e296c86 Allow to scroll on QCheckBox and consistancy 2015-11-09 01:14:33 +01:00
TheNain38
7cdd6e3dd9 Add an event filter so you can't scroll on sliders 2015-11-08 21:20:42 +01:00
tux3
a8746e6857
Cleanup duplicate slider slots in AVForm
See #2528
2015-11-08 13:40:32 +01:00
tux3
b6d752fd4b
Fix second bug in #2528 2015-11-08 13:28:51 +01:00
tux3
9d527e7edd
Fix #2528 2015-11-08 12:36:18 +01:00
tux3
d1565188ac
Fix #2527 2015-11-08 02:28:24 +01:00
tux3
c6220545c9
Fix spurious audio i/o changed signal 2015-11-07 22:24:17 +01:00
Zetok Zalbavar
ad5578e44e
Make list of languages listed vertically in source 2015-11-07 18:49:53 +00:00
tux3
bf8bdaf619
Improve perf of opening/closing AV tab
Should help with #2424
2015-11-07 18:30:09 +01:00
tux3
5c8dc1d7c9
Add None audio I/O devices
Can be changed in the middle of a call without problem
2015-11-07 18:23:10 +01:00
nikolas-n
2da384468d
Added Greek translation 2015-11-07 16:39:33 +01:00
TheNain38
75967ad23d Makes no sense to translate this 2015-11-07 12:19:50 +01:00
tux3
73c7f2bd36
Fix #2512 2015-11-07 01:01:32 +01:00
Nils Fenner
43e8ebd055
Merge pull request #2461 from TheNain38/patch-1 2015-11-06 17:44:20 +01:00
tux3
5b036cca0f
Merge branch 'newav_final_for_realsies'
Implements the new toxav API.
2015-11-06 01:52:40 +01:00
agilob
3675428c65
Simplify hardcoding qt version in settings 2015-11-02 19:44:17 +00:00
agilob
0b6fc751cb
Show compiletime Qt version in aboutsettings 2015-11-02 18:56:30 +00:00
TheNain38
035fbc95b3 Fix #2460 Light Icon setting disabled but should not 2015-10-24 18:55:24 +02:00
tux3
50006a9a32
Faster video device opening 2015-10-24 05:20:49 +02:00
tux3
c0d8703368
Properly signal when we stop sending video
And properly handle toxav happily delivering things out of order,
like firing a video frame callback right after a callback setting the bitrate to 0,
when the peer sent these commands in the right order
2015-10-24 04:26:39 +02:00
tux3
995fc4cdda
Reload audio devices on the fly from settings 2015-10-24 02:59:12 +02:00
tux3
512dc8de2d Implement basic call logic
We can now make New AV calls, but without any audio/video. Just opening a link.
2015-10-23 17:09:53 +02:00
tux3
dbbc702c60 Strip out old AV code 2015-10-23 17:02:01 +02:00
Nils Fenner
33e54b841a
Merge pull request #2415 from antis81:ngf/mic 2015-10-21 22:19:37 +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
932d9b7c9b
Audio: Fix device open only when needed 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
agilob
7117083e86
Merge remote-tracking branch 'origin/new_video_view' 2015-10-18 20:55:01 +01:00
agilob
d875221e53
remove unused code, removed unused checks 2015-10-18 10:18:06 +01:00
Zetok Zalbavar
cedec2ea8d
Fix indentation for Focus window setting 2015-10-17 09:34:33 +01: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
agilob
e0819d8439
generalsetting layout: change indentation method 2015-10-13 19:37:29 +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
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
83bcf2b8ae
fix closing video device after changing tab 2015-10-10 14:26:35 +01:00
agilob
266c0fb989
Merge branch TheSpiritXIII:video 2015-10-10 13:49:30 +01:00
bitok
aff85a7ea6 2257 Fix and Style comboBox fix 2015-10-09 01:31:34 +03:00
Impyy
fbd95b0781 Fixed #2294 - Remember proxy type after retranslation 2015-10-07 19:44:12 +02:00
agilob
c5127e3654
Merge remote-tracking branch 'zetok/audio-win-fix' 2015-10-04 11:01:58 +01:00
TheNain38
32948fb5c4 Add dynamic translation to db write type 2015-09-28 23:26:47 +02:00
Impyy
c49ce6208e Load user status from data file 2015-09-25 20:56:11 +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
aaannndddyyy
9269b0f967 rename two options 2015-09-17 18:25:23 +00: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
TheSpiritXIII
f825985856 Multi-window: Translate all dialogs correctly, don't allow remove friend on dialogs 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
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
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
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
ovalseven8
ba9e89f2ea Update generalsettings.ui
Remove useless HTML.
2015-08-22 17:59:08 +02: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
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
PKEv
8b524e54e2 fix #1977 not link if no GIT_VERSION 2015-07-21 01:03:56 +03: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
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
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
79d335ff4c
Merge branch 'pr1890' 2015-06-26 14:13:03 +02:00
Zetok Zalbavar
81cfe6aa9c
Remove outdated and unmaintained mannol and Pirate translations 2015-06-22 17:28:19 +01:00
tux3
a5d0acaf53
Merge branch 'pr1895' 2015-06-22 13:59:29 +02:00
David Zero
ed1010ab0a Fixed commit hash translation issue
The commit hash is now correctly displayed after switching languages
2015-06-22 01:03:38 -07:00
David Zero
369cbc3258 Updated link to bug report guidelines
The link now points to the "Writing Useful Bug Reports" article on our
wiki
2015-06-20 23:29:52 -07:00
agilob
53b90d085e fix issues with global autoaccept 2015-06-20 13:16:54 +01:00
David Zero
be1efb9e65 Added a proper About page. Closes #1668
The license text was removed from the Advanced section of the settings
menu and placed into its own About section. Users can now also discover
the commit hash of the build they are running through the UI, instead of
having to comb through logs, or use git.
2015-06-20 03:59:46 -07:00
Zetok Zalbavar
c1d7092f9d
Improve explanations about Nospam
Improvemetns thanks to "BIG DESU" and @tsudoko
2015-06-20 01:51:37 +01:00
tux3
36fcb5cb62
Add final/override specifiers
We get more compile time checking, and it's always good for performance to help the compiler
2015-06-08 20:08:24 +02:00
tux3
13bea16292
Add encrypting profile settings serializer
We now use a binary serialized format to save space and allow clean encryption of the user settings.
All the settings can (and should) be edited from the GUI so there is no loss of functionnality.

It can still read the old .ini format, and will seamlessly upgrade to the new format.

Fixes #1810
2015-06-06 20:15:50 +02:00
tux3
de8eb9c693
Fix copyright notice date 2015-06-06 16:07:36 +02:00
tux3
a004c7f791
Update advanced settings copyright notice 2015-06-06 16:02:14 +02:00
Zetok Zalbavar
67e9aeec63
Fix incorrect copyright headers
The qTox Project is not associated with the Tox Project in any way, with the
exception of "qTox" using the Tox Projet's "toxcore" collection of libraries.
In particular, the Tox Projet does not own copyright over the qTox Project's
"qTox" collection of software, source code, and assets.
The qTox Project's assets are under the sole copyright of the qTox
contributors, and no partiular rights are granted to the Tox Project.
2015-06-06 14:51:28 +01:00
tux3
20f254651d
Reorganize files 2015-06-06 01:44:47 +02:00
tux3
15ca7a587f
Dynamic translation
qTox can now retranslate its GUI dynamically, without needing a restart

Fixes #1671

Closes #1672
2015-06-05 21:37:01 +02:00
tux3
ac0beffd0c
Fix #1792 2015-06-05 15:39:01 +02:00
tux3
6bf0317e3e
Translate all GUI, not just Widget 2015-06-05 12:26:04 +02:00
tux3
e3dd2dc9e1
Limit desktop streamins FPS
Otherwise we get overwhelmed and start dropping frames
2015-06-04 23:34:17 +02:00
tux3
2dbf2e54b1 Implement restarting toxcore 2015-06-04 21:34:13 +02:00
tux3
5f94f33117 Use profile password for all encryption 2015-06-04 21:34:13 +02:00
tux3
abf65a5060 Remove deprecated profile management functions 2015-06-04 21:34:12 +02:00
tux3
bc946308c8 Fix double free when switching camera 2015-06-03 02:10:53 +02:00
tux3
8e866b1a5e Remove video post-processing sliders
Since they don't currently do anything
2015-06-03 02:10:53 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
61f331635f Disable the hue/bright/sat/contrast sliders
Since they aren't implemented for now.
2015-06-03 02:10:52 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
27bb71f195 Implement video modesetting for dshow 2015-06-03 02:10:52 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
e5684a4bbf Save video dev name in settings 2015-06-03 02:10:52 +02:00
tux3
d53b426750 Replace OpenCV with FFmpeg 2015-06-03 02:10:52 +02:00
ovitei
52e0dae0d8 added Norwegian Bokmal (nb_NO) translations 2015-05-25 02:15:34 +02:00
tux3
76cbaf18f1
Fix incorrect copyright headers
The qTox Project is not associated with the Tox Project in any ways, with the exception of "qTox" using the Tox Projet's "toxcore" collection of libraries.
In particular, the Tox Projet does not own copyright over the qTox Project's "qTox" collection of software, source code, and assets.
The qTox Project's assets are under the sole copyright of the qTox contributors, and no partiular rights are granted to the Tox Project.
2015-05-12 04:12:53 +02:00
tux3
4a40269698
Implement and enable the audio sliders
It was about time
2015-05-12 01:27:32 +02:00
agilob
904dd333b7 license box in advanced 2015-05-11 22:07:32 +01:00
tux3
a8b89e7d7d
Merge branch 'pr1621'
closes tux3/qtox#768

added values to slides in av settings, converted slot to qt5 style
audio sliders are disabled, they don't change anything anyway
2015-05-11 21:38:56 +02:00
agilob
3f11eab454 closes tux3/qtox#768
added values to slides in av settings, converted slot to qt5 style
audio sliders are disabled
2015-05-11 20:15:32 +01:00
agilob
826d21d21f closes tux3/qtox#1354
more signals/slots were converted to qt5 style
2015-05-11 19:14:09 +01:00
sudden6
1506a9a30e Change log messages to fit new log format 2015-05-11 15:37:56 +02:00
Ilya Kowalewski
a8de72570f Fixing smiley alignment and wrong copyright years 2015-05-11 02:01:09 +03:00
Ilya Kowalewski
4ff2d339a0 Resolves issues reported in PR before and some BEAST features:
+ Works great on little boxes
+ Fixed the bug spotted by @zetok
+ Smiles are centered under the smiles combo box
+ Namings for layouts
2015-05-11 01:41:52 +03:00
Ilya Kowalewski
6c8b130a25 Redesign draft for settings pane and proper UX for Mac 2015-05-11 00:41:34 +03:00
tux3
67e09de085
Save memory with lazy loading
Load the setting's cameria preview opengl context lazily and destroy it when done. Only preallocte Core's video buffer if we have any calls active, free up when all calls are done
2015-05-10 00:05:30 +02:00
tux3
ad4ef7f53f
Merge branch 'pr1579' 2015-05-07 21:32:57 +02:00
Mario Preksavec
4eeabbbe85 Unhide faux offline messaging checkbox 2015-05-04 19:27:40 +02:00
Mario Preksavec
220fea66a0 Make dropdown menus look better on high dpi 2015-05-04 02:12:02 +02:00
Zetok Zalbavar
92f3b6a20f Code style improvements 2015-04-24 15:43:57 +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
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
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
Jookia
e3bdd6d221 Added option to disable notification sounds. 2015-03-23 07:27:44 +11: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
agilob
a873bb571f
generalsettings: time and date format from qlocale 2015-03-20 08:17:18 +00: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
42fe29e83d
Merge branch 'pr1397' 2015-03-16 17:53:00 -05:00
sudden6
0c4cc87ed0 fix #1394 2015-03-16 17:46:56 -05: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
agilob
b60cfef749
closes tux3/qtox #1399
disabling scrolling on comboboxes in all settings forms
2015-03-15 20:29:23 +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
tux3
48dd053d07
Merge branch 'pr1388' 2015-03-14 19:48:05 +01:00
Flakebi
ae9cf96631 Rename dialog 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
Davor
200ae23de3 Update generalform.cpp 2015-03-14 16:34:12 +01: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
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
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
Domen Skamlic
af319bfa82 Added Slovenian translation. 2015-03-06 17:35:09 +01: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
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
TheLastProject
7202b18079 Make askQuestion more flexible, defaulting to Yes/No 2015-02-20 16:36:35 +01:00
Dubslow
9946a4642e
Merge branch 'pr1194'
Reduced merge that drops the unnecessary changes
2015-02-16 18:07:56 -06:00
Zetok Zalbavar
c0df870c62
Update toolTip for Compact contact list
Restart should not be a requirement anymore
2015-02-16 10:59:01 +00:00
BroncoTc
51799dc857 add spaces between language names 2015-02-16 18:36:51 +08:00
BroncoTc
dff30915a3 edit the three config & source file
manully and same way as commit a004fc872f
2015-02-16 12:43:39 +08:00
Dubslow
03168a02d2
Merge branches 'pr1134', 'pr1157' and 'pr1171' 2015-02-15 17:36:45 -06:00
Dubslow
4dcfec0151
Merge branch 'chatlog_merge_v3'
"unconfirmed" -> "Waiting to send..."
2015-02-15 04:55:25 -06:00
Dubslow
c3d61f8dfe
Make Dutch selectable translation 2015-02-14 18:10:45 -06:00
Dubslow
eeb8c10bc3
Fix #1158 2015-02-14 17:26:21 -06:00
Zetok Zalbavar
e4e6401182
Rename 'Start automatically' → 'Autostart' 2015-02-14 07:39:28 +00:00
Dubslow
4055cbe956
Minor translation things in the ui files 2015-02-11 14:52:42 -06:00
Dubslow
3fc778ae3d
Fix #1131 2015-02-10 22:51:57 -06:00
Urras
3312331723 Fixed OS X build 2015-02-09 10:07:01 -05:00
Dubslow
4d56a6fdd8
Merge branch 'pr947'
Conflicts:
	src/misc/settings.cpp
2015-02-08 13:29:19 -06:00
krepa098
5506379a97 Merge branch 'master' into chatlog_v3_1 2015-02-07 18:49:06 +01:00
Dubslow
830f0ddc13
Cleanup 331baa7447 2015-02-06 14:03:34 -06:00
tux3/mlkj
331baa7447 Use GUI instead of Widget for common GUI tasks 2015-02-06 19:01:36 +01:00
novist
ff693807af Autorun on OS startup 2015-02-06 18:10:54 +02:00
tux3/mlkj
46bba3f2f1 Initial Android support
We create a GUI class to abstract common GUI needs (showing a message box, asking a question, ...) from the actual GUI backend.

We also create a Nexus class to manage the startup and lifetime of our main systems (Core, GUI, ...) instead of delegating that to Widget.

Eventually, Widget will only be in charge of the Desktop GUI and AndroidGUI of the mobile GUI. Nexus will overview the system and GUI will provide a clean platform-independant interface.
2015-02-06 12:28:49 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
2225fcaf9d
Initial android support 2015-02-06 01:27:07 +01:00
Dubslow
b7800b66ca
Tweak re-enabling old history popups 2015-02-04 16:31:09 -06:00
Dubslow
e2fd298d68
chat logs -> chat history, miscellaneous rewordings 2015-02-03 13:56:08 -06:00
Dubslow
a572ccff27
Merge branch 'encryption' into master
Conflicts:
	src/core.cpp
	src/historykeeper.h
2015-02-03 10:21:59 -06:00
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