Dubslow
c769c10138
Merge branches 'pr1105', 'pr1121' and 'pr1122'
2015-02-08 13:30:03 -06:00
Dubslow
4d56a6fdd8
Merge branch 'pr947'
...
Conflicts:
src/misc/settings.cpp
2015-02-08 13:29:19 -06:00
Joseph Anania III
6c21fab806
Set TwitteEmojiSVG as the default emoticon theme
2015-02-07 17:22:45 -05:00
krepa098
5506379a97
Merge branch 'master' into chatlog_v3_1
2015-02-07 18:49:06 +01: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
Dubslow
a572ccff27
Merge branch 'encryption' into master
...
Conflicts:
src/core.cpp
src/historykeeper.h
2015-02-03 10:21:59 -06:00
krepa098
52f220c9e4
Merge branch 'master' into chatlog_v3_1
...
Conflicts:
qtox.pro
res.qrc
src/widget/form/chatform.cpp
src/widget/form/chatform.h
src/widget/form/genericchatform.cpp
src/widget/tool/chatactions/chataction.h
src/widget/tool/chatactions/messageaction.cpp
src/widget/widget.cpp
ui/chatArea/innerStyle.css
2015-02-02 14:31:44 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
d6b34aef78
Update for toxcore API break
2015-02-01 01:25:22 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
c32eb98e6c
CppCheck, some video perf improvements
2015-01-30 13:40:04 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
da4fbf9ffb
Show systray icon by default on linux too
2015-01-29 17:46:31 +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
krepa098
f509e07c45
make use of EmojiFontPointSize ( fix #1026 )
2015-01-26 23:19:18 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
801554bbd8
Fix #1037
2015-01-24 21:46:53 +01: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
f645faff51
Ignore empty history files on start
...
This fixes an esoteric issue of enabling chat log encryption and then restarting before adding any messages
2015-01-19 21:49:41 -06:00
Dubslow
d74b95a7b7
Merge branches 'pr920', 'pr1001', 'pr1003' and 'pr1005'
2015-01-12 06:01:50 -06:00
krepa098
d9e15fb0ba
Merge branch 'master' into chatlog_v3_1
...
Conflicts:
src/widget/chatareawidget.cpp
src/widget/form/chatform.h
src/widget/form/genericchatform.cpp
2015-01-09 19:41:16 +01: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
novist
2a8cbd189d
Added typing notification support and enabled by default
2015-01-04 13:21:56 +02:00
krepa098
a0ea0675a7
Merge branch 'master' into chatlog_v3_1
...
Conflicts:
qtox.pro
res.qrc
src/misc/smileypack.cpp
src/widget/chatareawidget.cpp
src/widget/chatareawidget.h
src/widget/form/chatform.cpp
src/widget/form/genericchatform.cpp
src/widget/form/genericchatform.h
src/widget/form/settings/generalform.cpp
src/widget/tool/chatactions/messageaction.cpp
src/widget/tool/chatactions/systemmessageaction.cpp
src/widget/widget.cpp
2015-01-03 10:17:53 +01:00
apprb
1719c72f67
tiny polishing
2014-12-28 19:04:32 +06:00
apprb
a14da15d79
fix #963
2014-12-28 18:32:25 +06:00
Dubslow
fc749880eb
minor style tweaks
2014-12-16 18:05:13 -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
Dubslow
a8b1f60256
Merge branch 'pr923'
2014-12-12 18:40:24 -06:00
novist
e2bf37c139
Light tray icon option
2014-12-12 12:12:12 +02:00
Zetok Zalbavar
e0993a72f6
Style corrections
...
'if()' → 'if ()'
'for()' → 'for ()'
2014-12-11 18:05:52 +00:00
lumirayz
038b4cedcb
make the code style more consistent
2014-12-11 15:31:01 +01:00
lumirayz
c73b07db72
added a compact layout for the friends list
2014-12-11 13:02:45 +01:00
Dubslow
0e21a8d497
check for non-existent file
2014-12-09 17:44:20 -06: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
apprb
000eb8977d
history: encrypted <-> plain convertion
2014-12-04 21:22:17 +06:00
apprb
eb0b33be32
Fixes
2014-12-03 18:07:34 -06:00
apprb
a432a16e01
encrypted history: class constructor: refacroring
2014-12-03 18:01:31 -06:00
apprb
a9fb75b5ed
proper encrypted history loading
2014-12-03 18:01:31 -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
Maximilian
0660d2974f
The showSystemTrayIcon's default value is false for linux else it is false.
2014-11-17 17:35:20 +01:00
apprb
8f3e1c2ef3
fix #775
2014-11-17 19:11:51 +09:00
krepa098
4ea21c2d19
(c)
2014-11-16 12:58:43 +01:00
krepa098
fd1063eb2c
bye bye base64 emoticons
2014-11-16 12:52:53 +01:00
krepa098
74bd802863
progress
2014-11-16 12:40:44 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
2f452b6eff
Add GUI to change theme color
2014-11-15 21:30:20 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
b0e6f1168c
Prepare for theme colors support
2014-11-15 18:29:41 +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
krepa098
808f8b1cc5
progress
2014-11-13 18:27:32 +01:00
dubslow
d87cf99d8f
minor tweaks to autoaway, one new debug message
2014-11-13 00:20:41 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
7bca831066
Build our Settings after our QApplication, fixes crash on startup
...
Thanks to @stqism for reporting the crash
This is why global static variables are evil
2014-11-11 23:21:16 +01:00
apprb
07ea2e0828
cleanup setting.ini file after a fiend removing
2014-11-12 01:52:19 +09:00
apprb
58893266e8
fix #697 (Setting alias isn't persistent for some contacts)
2014-11-12 01:29:00 +09:00
dubslow
def9e3791a
default faux offline on, fix #696
2014-11-10 16:45:09 -06: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
Tux3 / Mlkj / !Lev.uXFMLA
965254d151
Teach the AutoUpdater to read a flist
...
We can now read the list of files in an update, along with the install path, file size, and signature
Everything, metadata and files, is signed with ed25519, but not encrypted
2014-11-09 17:55:38 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
c05752d5a2
Use Fusion by default if available
...
Only on first run, if you explicitely choose no style or another style, we don't change that. Fallback to no style if fusion isn't available.
2014-11-09 01:10:06 +01:00
apprb
58eebcb2a6
load/save aliases from the settings file
2014-11-08 01:07:21 +09:00
agilob
d9a3f1a5e2
cleaning in settings.cpp filetransferinstance.cpp and friendwidget.cpp, global autoaccept, per friend and qmenunu simplificated
2014-11-05 22:34:28 +00: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
2ac1a33cb5
Merge branch 'pr608'
2014-11-02 23:41:07 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
c39e0608f4
Fix possible heap corruption in CUserId()
...
If the size of the userId is larger than TOX_CLIENT_ID_SIZE, then we used to memcpy more than we allocated
2014-11-02 23:39:28 +01:00
agilob
4f52fa2cff
default smiley pack is cylgom
2014-11-02 21:13:17 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
e17672acd8
Add tooltip for emoticons, fix #597
2014-11-02 12:58:18 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
330ea59618
Fix #96 with a flow layout for groupchat user list
2014-11-02 10:41:58 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
12bba9fe68
Don't triple save on exit
2014-11-02 09:00:05 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
fd67a375ea
Fix #591
2014-11-01 15:02:43 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
da3374c4aa
Windows: Save data in %APPDATA%/tox/ as per the STS
...
Fixes #585
2014-10-30 21:38:21 +01:00
agilob
c079641fc1
prevent duplicating emoticons on the list
2014-10-29 20:24:56 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
e163ec8259
Embed cylgom and krepa emoticon packs
...
Thanks to @cylgom and @krepa098
Closes #555 , fixes #304
2014-10-29 19:29:35 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
434808cd67
Add audio in/out device to settings
2014-10-28 21:21:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
edca806af1
Rescale smileys smoothly, fix #501
2014-10-26 21:12:39 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
80e648a5a2
Force smiley size to match text size
...
Fixes #501
2014-10-23 22:39:03 +02:00
apprb
277605ff17
cleanup
2014-10-22 23:14:42 +09: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
apprb
5c0370eaed
Tox datafile/encrypted history: different passwords
2014-10-22 22:36:36 +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
Tux3 / Mlkj / !Lev.uXFMLA
b6d581a462
Merge branch 'pr488'
2014-10-20 14:13:27 +02:00
dubslow
30e2afcc92
add alerts on user mention (could use some tweaking, but is plenty fine for now)
2014-10-20 06:05:45 -05: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
apprb
dfd5b6411a
Tox datafile encryption: check
2014-10-19 23:59:58 +09:00
apprb
eaa315eddb
various fixes
2014-10-19 17:48:10 +09:00
apprb
1a37c1c421
History: almost correct handling encrypted history load/save
...
Things are left to do:
1. load/save encrypted tox datafile
2. incorrect passwords processing (ask to retype, wipe everything, etc.)
3. reencryp history log with new password
2014-10-19 02:38:47 +09:00
dubslow
43ac1dfd0d
add ui for auto accept; fixes #182 and #280
2014-10-17 22:59:59 -05: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
apprb
177b27882b
Merge branch 'history_fx' into history
...
Conflicts:
src/misc/db/encrypteddb.cpp
src/misc/db/encrypteddb.h
2014-10-17 22:14:27 +09:00
apprb
1ce4820aa4
clenup
2014-10-17 21:33:00 +09:00
dubslow
81003b8523
encrypted db uses core encryption
2014-10-17 04:26:31 -05:00
