Dubslow
4d56a6fdd8
Merge branch 'pr947'
...
Conflicts:
src/misc/settings.cpp
2015-02-08 13:29:19 -06: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
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
Tux3 / Mlkj / !Lev.uXFMLA
8876dad457
Save camera video res in settings
...
Fixes #1033
2015-01-24 02:04:00 +01:00
Dubslow
29cc9e1b7d
Merge branch 'encryption' into master
...
Conflicts:
src/main.cpp
2015-01-23 01:51:39 -06: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
Dubslow
d74b95a7b7
Merge branches 'pr920', 'pr1001', 'pr1003' and 'pr1005'
2015-01-12 06:01:50 -06: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
apprb
a14da15d79
fix #963
2014-12-28 18:32:25 +06:00
Maximilian Wuttke
e0cb122abe
Merge branch 'filter_audio' of https://github.com/mwuttke97/qTox into filter_audio
...
Added some `#ifdef QTOX_FILTER_AUDIO`s.
Conflicts:
qtox.pro
Conflicts:
src/coreav.cpp
2014-12-14 10:55:38 +01:00
novist
e2bf37c139
Light tray icon option
2014-12-12 12:12:12 +02:00
lumirayz
c73b07db72
added a compact layout for the friends list
2014-12-11 13:02:45 +01:00
Dubslow
7fc7b57934
refactor/fix switching profile with separate settings
2014-12-09 15:43:43 -06:00
Dubslow
e90dfd3083
Move privacy tab settings to per-profile settings file
...
This may lose the current settings in the tab, but currently only keep history is enabled anyways
2014-12-05 21:23:15 -06:00
Dubslow
961d5830c3
add fancier tray icons with status, remove relevant option
2014-12-05 17:14:48 -06:00
Dubslow
aea9eea8a4
move friend information to a separate ini file; fixes #594
2014-12-02 18:26:17 -06:00
Dubslow
4a14155724
move settings to qtox.ini
2014-12-02 16:47:55 -06:00
novist
479644833e
Option for tray icon to display user status
2014-11-27 19:46:36 +02:00
apprb
8f3e1c2ef3
fix #775
2014-11-17 19:11:51 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
2f452b6eff
Add GUI to change theme color
2014-11-15 21:30:20 +01:00
apprb
9d96110e9b
mysql synchronous set
2014-11-14 15:18:55 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
848bf3e240
Fix conflicting declaration struct/class ToxID
2014-11-13 22:39:18 +01:00
Maximilian
11f9cb0cbf
I implemented a new setting, which toggles the visibility of the system tray icon.
...
Background: On Ubuntu 14.04, system trays in Qt5 don't integrate into Unity.
2014-11-13 21:33:11 +01:00
apprb
07ea2e0828
cleanup setting.ini file after a fiend removing
2014-11-12 01:52:19 +09:00
apprb
5d50ea36d0
Faux offline messaging: enable/disable
2014-11-10 22:06:35 +09:00
Kristian Buchman
cbad1c4966
Add the option to open qTox when a message is recived
2014-11-10 10:37:06 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
0054787826
Add an option for auto-updates on Windows
...
With the update server hosted on my laptop...
Fun fact: Updates are really easy to mess up right now. If I forget to update the update server, everyone gets downgraded. Upload a bad file and everyone will crash. Fun stuff.
Upates Are Experimental™ and off by default.
2014-11-10 00:31:29 +01:00
apprb
58eebcb2a6
load/save aliases from the settings file
2014-11-08 01:07:21 +09:00
agilob
c702e18ccf
global autoaccept files
2014-11-05 21:59:29 +00:00
agilob
3dbbbd1caf
autosaveDir, useEmoicons, selectTimestamp added to GUI and settings
2014-11-05 15:20:32 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
12bba9fe68
Don't triple save on exit
2014-11-02 09:00:05 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
434808cd67
Add audio in/out device to settings
2014-10-28 21:21:37 +01:00
apprb
6caa9f1e9f
Merge remote-tracking branch 'upstream/master' into history
...
Conflicts:
qtox.pro
src/widget/form/chatform.cpp
src/widget/form/genericchatform.cpp
src/widget/form/genericchatform.h
src/widget/form/settings/identityform.cpp
src/widget/tool/chatactions/messageaction.cpp
src/widget/tool/chatactions/messageaction.h
src/widget/widget.cpp
2014-10-22 23:05:04 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
50e1ecf46b
Merge branch 'pr482' into HEAD
2014-10-20 20:21:36 +02:00
agilob
6e5068840d
minimize to tray
2014-10-20 14:11:03 +01:00
dubslow
a1ebf905b2
add global file auto accept
2014-10-19 23:25:52 -05:00
agilob
d268360c51
closing to tray, gui and settings
2014-10-19 20:47:06 +01:00
dubslow
e10e0087a4
added auto accept settings
2014-10-17 22:02:13 -05:00
dubslow
4e7a183360
add choose translations (restart required, dynamic changing is lots of work)
2014-10-17 18:06:30 -05:00
dubslow
18d1ee9f1f
Merge branch 'master' into corencryption
...
Conflicts:
src/misc/settings.cpp
src/misc/settings.h
src/widget/widget.h
2014-10-17 03:46:52 -05:00
dubslow
8be4725acd
cleanup "sign in change", since it's unnecessary
2014-10-16 17:52:45 +02:00
agilob
698902a8dc
status changes messages and sign in notifications
...
sign in notifications available only in settings and as a message in chat
2014-10-16 17:47:18 +02:00
agilob
14ea88c070
style selector
...
Unfortunately Qt developers removed some old native skins from support, only 3 skins are supported on Linux.
Number of native skins depends on OS and Qt built system.
2014-10-16 15:18:19 +02:00
dubslow
e3cf2cac20
auto away; needs UI
2014-10-16 04:47:58 -05:00
dubslow
33e0c95ab6
Merge branch 'master' into corencryption
...
Conflicts:
src/core.cpp
2014-10-13 16:07:03 -05:00
dubslow
235d6609b9
Merge branch 'master' into profiles
...
Conflicts:
src/widget/form/settings/identityform.cpp
2014-10-12 04:58:56 -05:00
dubslow
63bb51a089
Merge branch 'master' into corencryption
2014-10-12 04:55:02 -05:00
dubslow
bf75750166
Merge branch 'master' into src
...
Conflicts:
qtox.pro
src/widget/form/settings/avform.h
src/widget/selfcamview.cpp
src/widget/selfcamview.h
src/widget/widget.cpp
widget/selfcamview.h
widget/videosurface.h
2014-10-10 17:21:54 -05:00
dubslow
3ba95d82ae
Move code into src/
2014-10-07 23:26:25 -05:00
