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
Dubslow
0470b5a6af
Potential fix for history issues, both dubslow/qTox#5 and dubslow/qTox#6
2015-01-27 17:25:41 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
a62b1dc7ac
Merge branch 'pr1045'
2015-01-27 21:33:44 +01:00
Dubslow
60e819baee
Hacky fix to cancelling a switch to an encrypted profile closing
...
It's either this or some fairly major refactoring, which is preferable,
but I've got another even bigger refactoring in mind, and fixing this
will be rolled into that.
Closes dubslow/qTox#4
2015-01-27 14:16:28 -06:00
agilob
2f9f57d5a4
adding volButtonDisabled to rsc
2015-01-27 12:15:18 +00:00
krepa098
ebebde1b09
use QSize instead of QSizeF, cleanup
2015-01-27 11:20:35 +01:00
krepa098
cfe4458d37
Moved status messages back to the left
2015-01-27 10:52:23 +01:00
krepa098
ce486eb1b3
FileTransferWidget: visual tweaks
2015-01-27 10:49:18 +01:00
krepa098
57485368cb
fix showEvent calling centerOn
2015-01-27 09:58:08 +01:00
Dubslow
ed22dc9ca5
write settings *after* changing them...
...
closes dubslow/qTox#3
2015-01-26 19:22:38 -06:00
Dubslow
a1239747ac
fix button typo, closes dubslow/qTox#7
2015-01-26 19:12:36 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
d80c1ee8ac
Auto-update: Better resuming support, lockfree-threading
2015-01-27 00:24:42 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
4907661752
Windows updater: Improve reliability
...
And fix a bug that caused the progress to be displayed improperly
2015-01-27 00:23:27 +01:00
krepa098
f509e07c45
make use of EmojiFontPointSize ( fix #1026 )
2015-01-26 23:19:18 +01:00
krepa098
a558733507
ChatLog::selectAll, refactoring of actions (issue #808 )
2015-01-26 19:32:33 +01:00
krepa098
ecf15a6ca3
fix regression: chatlog didn't scroll to bottom on startup
2015-01-26 19:15:29 +01:00
krepa098
0442db2bae
reposition busy notification *after* resize
2015-01-26 19:01:18 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
ac2700fdeb
Fix rounding for non-square CallConfirmWidget
...
Thanks to @krepa098
2015-01-26 18:29:13 +01:00
krepa098
bbd20496fd
specify background brush
2015-01-26 17:12:22 +01:00
Dubslow
03fe9a355f
Merge branch 'pr1052'
2015-01-26 07:25:23 -06:00
Dubslow
e90293b47a
Make compact contact layout dynamically changeable
...
There was some various minor incidental cleanups as well
2015-01-26 07:13:35 -06:00
krepa098
d04e356a0c
cleanup previous commit
2015-01-26 14:06:05 +01:00
krepa098
5be6caca68
[HiDPI] ChatLog: replaced all .png by .svg, FTW custom paintEvent
...
This does not enable HiDPI support!
issue #975
2015-01-26 14:01:42 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
1b2b4a1267
Merge branch 'pr1053'
2015-01-26 14:01:20 +01:00
agilob
2f18b2c72b
fixing problem with +1 lines in msg edit
2015-01-26 12:34:52 +00:00
novist
3a5a94c666
Fixed showing window when clicking tray icon / shortcut and window is minimized
...
Double-clicking tray icon shows window
Middle-clicking tray icon hides window
2015-01-26 12:43:34 +02:00
Dubslow
f7feb8ecbb
Make greentext pickier
...
> must be the first character (i.e. leading whitespace disables greentext)
> must be followed by a "word" character, with an optional space (sorry zetok, but this is much more intuitive)
> followed by two+ spaces doesn't count
Fixes #945
2015-01-26 04:17:52 -06:00
Tux3/Mlkj
fcd58b2c63
Update outdated autoupdate comments
2015-01-26 09:53:43 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
350da58337
Merge branch 'pr1048'
2015-01-26 02:02:12 +01:00
agilob
6989346f41
dont clear msg everytime
2015-01-26 00:51:17 +00:00
agilob
c9e96300b2
added comment to explain this spaghetti
2015-01-26 00:31:54 +00:00
agilob
d3cdebd46f
removed unused code
2015-01-26 00:27:22 +00:00
agilob
fe8f6593c7
arrow up to paste previous message
2015-01-26 00:25:45 +00:00
agilob
4b854f86d1
fixed memory leaks
2015-01-25 23:06:44 +00:00
agilob
a6680916b5
undo double polishing in chatform
2015-01-25 22:28:29 +00:00
agilob
b71eafc8c8
Merge branch 'master' of https://github.com/tux3/qTox into disabling_callbutons
2015-01-25 22:20:43 +00:00
agilob
17561a8c3b
closes tux3/qtox#850
2015-01-25 22:19:25 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
7f01288eb4
Create volButtonDisabled.png
2015-01-25 23:17:55 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
69d5619db0
Don't call auto-updates unstable anymore
2015-01-25 22:51:19 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
bcd3886c2e
Change OS X download link to jenkins
2015-01-25 22:38:57 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
0eba4fefca
Change some signal connections to new style
2015-01-25 21:51:21 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
2c6b457caf
Merge branch 'newcallmockup'
2015-01-25 19:13:17 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
328f75ac6d
Add real buttons for CallConfirmWidget
...
Still sort of placeholders, those are just upscaled buttons extracted from a screeshot, but those will work in the meantime
2015-01-25 19:12:36 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
279debdab9
CallConfirmWidget: track anchor's position
2015-01-25 18:43:30 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
b10edb9baf
CallConfirmWidget: don't overflow to the right
2015-01-25 17:53:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
40478d6bac
Show call confirm under video if appropriate
2015-01-25 17:39:26 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
b13c27202a
Stylized CallConfirmedWidget, placeholder buttons
2015-01-25 17:39:26 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
32bf56c7d9
Implement new call confirm widget logic
...
Works, but does not have any styling at the moment
2015-01-25 17:39:26 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
3f433f1176
Pixel-perfect spacing of chat form buttons
2015-01-25 17:18:20 +01:00
krepa098
a418ae3df6
use html <center> instead of ColumnFormat::Center
2015-01-25 15:59:44 +01:00
