krepa098
|
b76e9a295d
|
disabled group joined/left messages
Conflicts:
src/widget/widget.cpp
|
2015-01-03 10:23:50 +01: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 |
|
krepa098
|
f1f42fc237
|
innerStyle, groupchats
|
2014-12-31 13:42:06 +01:00 |
|
novist
|
30d9862c4f
|
Removed explanations from tray menu
|
2014-12-18 20:32:28 +02:00 |
|
krepa098
|
3190530686
|
filling the gaps
|
2014-12-13 21:11:03 +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 |
|
Dubslow
|
5cb1b6fe8e
|
check for no systray, fixes #908
cant believe it took this long to figure out ;_;
|
2014-12-09 14:18:12 -06:00 |
|
Dubslow
|
961d5830c3
|
add fancier tray icons with status, remove relevant option
|
2014-12-05 17:14:48 -06:00 |
|
apprb
|
3c15909ffc
|
correct displaying of the targeted messages
|
2014-12-03 23:47:07 +06:00 |
|
Dubslow
|
1c78cbc0c9
|
add a basic platform-disabling define
|
2014-12-01 18:18:27 -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
|
173eda7700
|
Merge branch 'pr870'
Conflicts:
src/widget/form/settings/generalform.cpp
|
2014-12-01 14:47:54 -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 |
|
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
|
99fa5d9e19
|
Global auto-away
|
2014-11-28 11:41:44 +02:00 |
|
novist
|
479644833e
|
Option for tray icon to display user status
|
2014-11-27 19:46:36 +02:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
4c379640b8
|
Merge branch 'pr854'
|
2014-11-25 20:00:27 +01:00 |
|
novist
|
beae534d66
|
Starting client activates existing instance if such exists
|
2014-11-25 19:11:05 +02:00 |
|
apprb
|
56ea1f1e66
|
using ToxID in groupchats
|
2014-11-24 00:58:53 +09:00 |
|
apprb
|
f59a67f08a
|
Group class refactoring
|
2014-11-24 00:58:53 +09:00 |
|
apprb
|
92c330b7bd
|
GroupList refactoring
|
2014-11-24 00:58:53 +09:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
f8063fc809
|
Fix idleTimer use before construction
|
2014-11-20 00:22:44 +01:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
599c246ec7
|
Move group audio playing to Audio singletong/thread
This is a bit of a quick fix for a new bug, as but part of cleaning up the audio code and moving it to the Audio singleton
|
2014-11-19 22:26:04 +01:00 |
|
dubslow
|
845216fa2f
|
set aliases from chat form (half of #780)
|
2014-11-17 20:15:44 -06:00 |
|
dubslow
|
d533c4089d
|
remember status when disconnected (should help with #715)
|
2014-11-17 19:40:36 -06:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
cd31812dac
|
Widget: Don't delete icon, it's a child
|
2014-11-17 22:49:35 +01:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
c1f2e9a71d
|
Refactor audio out of code, better resource management
Fixes #739 and fixes #777
|
2014-11-16 19:04:45 +01:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
014b39e7d0
|
Merge branch 'pr774'
|
2014-11-16 17:04:33 +01:00 |
|
apprb
|
664c762625
|
using ToxID instead of bare QString + proper alias using during widget creation
|
2014-11-17 00:17:46 +09:00 |
|
Maximilian
|
52255eb332
|
similar bug, when closing the window...
|
2014-11-16 15:22:53 +01:00 |
|
Maximilian
|
b97e66d589
|
Minor bug fix:
The main window, will never be visible, when the user unchecked 'Show system try' and checked 'Start in tray'.
|
2014-11-16 15:22:44 +01:00 |
|
dubslow
|
40addf9155
|
"overhaul" window title, fix #753
|
2014-11-16 15:17:22 +01:00 |
|
dubslow
|
02e29d6600
|
auto away done right (fixes #751)
|
2014-11-16 15:17:02 +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 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
b8031498db
|
Fix CroppingLabel emitting textChanged twice
|
2014-11-14 20:12:23 +01:00 |
|
dubslow
|
71c34b9d69
|
group title support
|
2014-11-14 18:23:54 +01:00 |
|
dubslow
|
d566f5f9b3
|
minor autoaway tweak
|
2014-11-13 23:56:22 +01:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
635b8f2c02
|
Merge branch 'pr742'
|
2014-11-13 21:57:58 +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 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
12431c3047
|
Better debug output for groupchat not found
|
2014-11-13 19:43:32 +01:00 |
|
krepa098
|
808f8b1cc5
|
progress
|
2014-11-13 18:27:32 +01:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
eac712e68a
|
Add GUI for audio groupchats
|
2014-11-13 13:14:27 +01:00 |
|