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

1710 Commits

Author SHA1 Message Date
apprb
bac485400e
small code unification 2014-12-04 22:07:16 +06:00
apprb
000eb8977d
history: encrypted <-> plain convertion 2014-12-04 21:22:17 +06:00
Dubslow
1d24eb14b4
Fix not setting tox null after cleanup
also reordered functions for super extra safety
2014-12-03 19:10:23 -06:00
Dubslow
7a59e7b853
fix copyright statement, update comment 2014-12-03 18:27:21 -06:00
Dubslow
9a92e6c980 Clarification 2014-12-03 18:14:28 -06:00
dubslow
fc30d342bc Added change pw buttons; encryption is very nearly done.
@apprb there is one question and one TODO that you should look over in privacyform.cpp, as well as a TODO in historykeeper.cpp
Also both the encryption settings box and the pw dialog lineedits should probably be in a QGridLayout... but I don't really want to do that by hand :P
2014-12-03 18:14:28 -06:00
dubslow
4eb3036414 Ah, much cleaner 2014-12-03 18:14:28 -06:00
dubslow
bafca96554 Incremental work, starting to take shape 2014-12-03 18:14:28 -06:00
dubslow
dde410bb9c incremental 2014-12-03 18:10:07 -06:00
dubslow
8985466ed3 core encryption file is basically complete, I need to verify privacy tab 2014-12-03 18:10:07 -06:00
dubslow
4567f8e5c6 move encryption to separate file for sanity 2014-12-03 18:10:07 -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
1ebcad7ad8
Merge branch 'pr889' 2014-12-03 12:38:58 -06:00
Dubslow
8a06598af4
Merge branch 'windows-autoaway-fix'
The current way is in fact broken
2014-12-03 11:54:16 -06:00
apprb
3c15909ffc
correct displaying of the targeted messages 2014-12-03 23:47:07 +06:00
Dubslow
e70cf97056
Merge branch 'pr887' 2014-12-02 22:01:13 -06:00
Dubslow
3943d5213d
deleting a profile now cleans out all personal data 2014-12-02 18:48:50 -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
Dubslow
3f234fb2eb
disabling platform extensions now affects linking, and can be set from cmd line
`qmake DISABLE_PLATFORM_EXT=YES`
2014-12-02 15:03:29 -06:00
novist
a6f3f5f169 Fixed getIdleTime() on windows 2014-12-02 15:33:53 +02:00
Ansa89
7660950133 Italian translation: update 2014-12-02 11:59:59 +01:00
Dubslow
1c78cbc0c9
add a basic platform-disabling define 2014-12-01 18:18:27 -06:00
Dubslow
aae9233dc1
fix os x compiling, update dependencies 2014-12-01 17:01:35 -06:00
Dubslow
4781c8cfbb
Merge branch 'pr862'
Conflicts:
	src/widget/widget.cpp
2014-12-01 15:37:09 -06:00
Dubslow
4adfa986b5
touchup, more appropriate legal message 2014-12-01 15:28:53 -06:00
Dubslow
48e5315cdf clarify systray show-status status 2014-12-01 14:55:35 -06:00
Dubslow
173eda7700
Merge branch 'pr870'
Conflicts:
	src/widget/form/settings/generalform.cpp
2014-12-01 14:47:54 -06:00
Dubslow
3fe91d3563
Merge branch 'pr871' 2014-12-01 14:15:03 -06:00
Dubslow
1340e00f69 re-move idle timer construction before restoreGeometry 2014-12-01 14:04:18 -06:00
Dubslow
9df3fdc2a0 move new functions to a more logical location 2014-12-01 14:04:17 -06:00
novist
0810559bcb Window geometry saved when window is resized Splitter position saved when splitter is moved
Fixed restoring of window geometry when "Start in tray" is unchecked
2014-12-01 14:04:17 -06:00
Dubslow
90e8afa24d
update core api
fixes #882
2014-11-30 09:20:32 -06:00
Zetok Zalbavar
2d0fb3595b
Update Polish translation 2014-11-30 13:22:58 +01:00
Dubslow
840dadafdd
Merge branch 'pr876'
Conflicts:
	res.qrc
2014-11-29 22:41:53 -06:00
Dubslow
ed8d9b782d
Merge branch 'pr874' 2014-11-29 22:32:59 -06:00
Dubslow
6452cfa702
put tr list in "alphabetical" order 2014-11-29 22:32:12 -06:00
Zetok Zalbavar
5d297a78d5
Sort res.qrc and remove some unnecessary spaces 2014-11-29 11:27:36 +00:00
accino
a004fc872f Added Spanish translation 2014-11-28 21:32:48 +01:00
novist
a71e98abbb Switched places platform name and file name 2014-11-28 11:41:45 +02:00
novist
677058eb65 Reorganized platform-dependent code
Auto-away timer check reduced to 1s
2014-11-28 11:41:45 +02:00
novist
8e4f69aa79 Added copyright notices to platform.*
Changed u_int** to uint**
2014-11-28 11:41:45 +02:00
novist
13dd4304c1 Merge pull request #2 from stqism/patch-7
Fixes global autoaway on OS X
2014-11-28 11:41:44 +02:00
novist
99fa5d9e19 Global auto-away 2014-11-28 11:41:44 +02:00
Sean
985c25f77e Can't forget CoreFoundation 2014-11-28 11:41:44 +02:00
Sean
fb375cd07e Link against IOKit 2014-11-28 11:41:44 +02:00
Sean
d69039cb83 Lemmie fix those for you 2014-11-28 11:41:44 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
a560909b6d
Attempt to fix #859 2014-11-27 22:50:06 +01:00