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

335 Commits

Author SHA1 Message Date
Zetok Zalbavar
d36c471f4f
Some wording improvements 2015-01-04 20:25:37 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
fbc77864aa
Fix some ChatForm debug spam
Don't log an event if it isn't meant for you
2015-01-04 17:59:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
14ad87069e
Merge branch 'pr979' 2015-01-04 15:18:07 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
10a2213e66
Merge branch 'pr978' 2015-01-04 15:07:36 +01:00
Nokta-strigo
1ec40b74b7 Contacts changing status to offline and having new events are not moved to the bottom of the list. (see issue #740) 2015-01-04 14:54:22 +01:00
novist
4b05c10308 Fixed text copying from chat windows
Tiny formatting fix (space after if)
2015-01-04 13:23:28 +02:00
novist
2a8cbd189d Added typing notification support and enabled by default 2015-01-04 13:21:56 +02:00
Dubslow
f7bef8d5c3
Merge branch 'pr966' 2014-12-31 00:55:59 -06:00
Dubslow
75331af311
Merge branch 'pr965' 2014-12-31 00:50:03 -06:00
apprb
1194df2f78
renaming: Direct Connect -> None 2014-12-30 22:02:26 +06:00
apprb
f8bdaac121
messages splitting fix 2014-12-28 23:32:19 +06:00
apprb
a14da15d79
fix #963 2014-12-28 18:32:25 +06:00
novist
30d9862c4f Removed explanations from tray menu 2014-12-18 20:32:28 +02:00
Dubslow
54e8be75d2
Merge branch 'pr938' 2014-12-17 14:43:34 -06:00
agilob
5861c6daa5
removing fixed size from mic/volume buttons so they align nicely 2014-12-17 12:36:34 +01:00
agilob
f8d870f374
removing spacing from microphone layout 2014-12-17 12:00:41 +01: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
84dea5e12c
Revert "fix #902"
@apprb #932
This reverts commit 13306031e2.
2014-12-13 12:18:43 -06:00
Dubslow
a8b1f60256
Merge branch 'pr923' 2014-12-12 18:40:24 -06:00
Dubslow
cc4cc7d7a8
Merge branch 'pr922' 2014-12-12 18:37:06 -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
apprb
13306031e2
fix #902 2014-12-11 21:33:38 +06: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
Sascha Brendel
17bcd969b2 Update chatform.cpp
Improved that line of code.
Thanks to @dubslow
2014-12-08 20:28:34 +01:00
Lednerb
dfb51d7d29 Added Translation for error message on sending a file. Also included the German Version. 2014-12-08 19:07:51 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
983c0b7e6b
Merge branch 'pr857' 2014-12-06 14:02:24 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
53d7bc9dc1
Push to talk with input msgedit focused 2014-12-06 13:59:19 +01:00
Simon Vermeersch
424af0505e Focus the text input area when clicking on the text area 2014-12-06 13:54:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
324d075cfe
Change push to talk shortcut to CTRL+P 2014-12-06 13:49:04 +01:00
Dubslow
961d5830c3
add fancier tray icons with status, remove relevant option 2014-12-05 17:14:48 -06:00
agilob
561f5f9895
fixing bug #891 2014-12-04 15:51:01 +00:00
apprb
3c15909ffc
correct displaying of the targeted messages 2014-12-03 23:47:07 +06:00
Dubslow
3943d5213d
deleting a profile now cleans out all personal data 2014-12-02 18:48:50 -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
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
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
840dadafdd
Merge branch 'pr876'
Conflicts:
	res.qrc
2014-11-29 22:41:53 -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
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