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

164 Commits

Author SHA1 Message Date
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
krepa098
ce486eb1b3 FileTransferWidget: visual tweaks 2015-01-27 10:49:18 +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
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
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
3f433f1176
Pixel-perfect spacing of chat form buttons 2015-01-25 17:18:20 +01:00
saneki
f3c0b7c24c Context menu style fix for chat title 2015-01-19 13:32:34 -06:00
krepa098
bb29536df1 NotificationIcon 2015-01-19 19:04:19 +01:00
krepa098
5429e50bd0 updated error/info.png 2015-01-18 12:30:31 +01:00
krepa098
2914a9883c ChatMessage::createTypingNotification, resized images to 18x18, new
(spinning) notification icon
2015-01-18 12:20:13 +01:00
Dubslow
d74b95a7b7
Merge branches 'pr920', 'pr1001', 'pr1003' and 'pr1005' 2015-01-12 06:01:50 -06:00
Ildar Akhmetgaleev
575247218d Defining link color in chat area css
Fixes #852. Links now visible with white on black system theme.
Defining with a {...}
2015-01-11 22:56:41 +07:00
Ildar Akhmetgaleev
416f1565cc Defining link color in chat area css
Fixes #852. Links now visible with white on black system theme.
2015-01-11 10:52:57 +07:00
krepa098
904627e50a moved typing notifications to ChatLog 2015-01-10 11:57:46 +01:00
krepa098
6c6d0254fc plain svg 2015-01-06 15:12:39 +01:00
krepa098
b82c5835ce error symbol 2015-01-06 14:30:24 +01:00
krepa098
5c684d95dd cleanup 2015-01-06 14:13:31 +01:00
krepa098
ea467152aa filetransferwidget: fixed pause button, ETA, font size, resource usage 2015-01-04 12:04:30 +01:00
krepa098
2828a97d54 styled chatlog, cleanup 2015-01-03 10:21:15 +01:00
krepa098
eecd886745 filetransferwidget layout changes 2015-01-03 10:19:41 +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
Dubslow
0fff9dab3d
Merge branch 'pr943' 2014-12-17 14:44:26 -06:00
Zetok Zalbavar
e5b9e8c59c
Make quote colour more readable 2014-12-17 15:37:07 +00:00
agilob
5861c6daa5
removing fixed size from mic/volume buttons so they align nicely 2014-12-17 12:36:34 +01:00
agilob
8f173af3d7
removing border from contact name linedit 2014-12-15 17:14:17 +01:00
lumirayz
c73b07db72 added a compact layout for the friends list 2014-12-11 13:02:45 +01:00
krepa098
5ae506fe3b filetransferwidget: added open (browse?) button, fixed layout 2014-12-10 10:35:56 +01:00
Gethyn ThomasQuail
9d75444081 Fixed up Emote button and created new images for the Volume and Mic buttons 2014-12-04 10:57:52 -07:00
novist
5f1bf8ce3b Checkboxes in settings grayed out when disabled 2014-11-27 19:46:40 +02:00
novist
d5c593d088 No border for message area (as in mockup) 2014-11-25 19:10:00 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
3d72ed89e4
Call buttons: Use tox red 2014-11-17 21:06:04 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
29a2d30458
Mic button: Less blury, use Tox Red when pressed
Helps with #554 and #795
2014-11-17 21:00:19 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
cb38e82324
Vol button: Less blury, use Tox Red when pressed
Helps with #554 and #795
2014-11-17 20:26:19 +01:00
krepa098
3a567d962e more work on filetransferwidget 2014-11-17 20:08:55 +01:00
krepa098
27cb075dbb hooked up filetransferwidget 2014-11-17 16:05:14 +01:00
krepa098
1cf9fe3474 filetransferwidget: first steps 2014-11-16 20:01:37 +01:00
krepa098
3facab1db4 artwork 2014-11-16 13:01:26 +01:00
krepa098
74bd802863 progress 2014-11-16 12:40:44 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
5bed0c248a
Fix friendlist having a bad gray background
Thanks to toweI for reporting the issue
2014-11-15 23:04:51 +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
211005e8de
Don't 'style' QGroupbot borders in settings 2014-11-13 18:31:21 +01:00
krepa098
3a34678900 progress 2014-11-12 16:45:24 +01:00
agilob
9eea6125d4
fixes unreported bug in styles 2014-11-12 11:42:26 +00:00
agilob
7d255d2a6f
lineedit consistent corners 2014-11-03 10:03:50 +00:00
agilob
fc5cbb173b
status panel, indicate editing 2014-11-03 09:12:21 +00:00
agilob
a3b95e332e
style for qlineedit in status panel 2014-11-02 23:26:23 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
0b489c4dca
Fix #592 2014-11-02 13:02:35 +01:00
Wouters Dorian
50513e0fb4 Made Mute speakers button work 2014-10-28 13:50:30 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
2ba994c73a
Force font size in groupchat header for all DPIs
Fixes #75
2014-10-24 00:18:48 +02:00
agilob
28d1287b18
implemented krepas suggestions about style 2014-10-22 16:27:15 +01:00
agilob
9bc1568c0d Merge remote-tracking branch 'upsteam/master' into style 2014-10-22 16:21:01 +01:00
agilob
df03a0df5a
more styles 2014-10-20 13:26:49 +01:00
dubslow
aa55dcae1e fix bug, fix actions to be like irc, and a disabled feature for future 2014-10-20 06:34:17 -05: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
agilob
41327910a4
fix #457, styles in mainContent for qtextedit, qspinbox and more 2014-10-18 19:56:09 +01:00
krepa098
ad609d9bc6 css tweaks 2014-10-17 09:12:17 +02:00
krepa098
c4529d4062 fixed css, comments, cleanup 2014-10-17 09:09:59 +02:00
krepa098
2913326fb2 fix #416, cleanup 2014-10-17 09:09:59 +02:00
agilob
14ea88c070 style selector
Unfortunately Qt developers removed some old native skins from support, only 3 skins are supported on Linux.
Number of native skins depends on OS and Qt built system.
2014-10-16 15:18:19 +02:00
apprb
339afafa05
magic number removed in FileTransferInstance 2014-10-13 16:43:20 +09:00
agilob
afc77f63db
css styles for mainHead and mainContent in widget.cpp
fixes problems with ugly UI on non-standard system theme.
before: https://i.imgur.com/XJ0mbpi.png
after: https://imgur.com/a/UbgNz
2014-10-07 21:55:20 +02:00
apprb
6e02240b56 relative to system wide default font sizes in css 2014-10-06 23:39:07 +09:00
krepa098
b93343bb99 tweak 2014-10-04 11:03:50 +02:00
krepa098
23a64ef45f removed broken custom window decoration 2014-10-04 11:03:50 +02:00
krepa098
a486f9aa4d statusPanel: css, cleanup 2014-10-04 11:03:50 +02:00
krepa098
300d045dd9 FileTransferInstance: return of the edges 2014-10-04 11:03:50 +02:00
krepa098
2ebc583f29 fixed #372 2014-10-04 11:03:50 +02:00
dubslow
cfa39460bf added sending actions, and tested both ways 2014-10-02 02:00:06 -05:00
dubslow
5f106ab618 add receive actions (no one to test with currently) 2014-10-02 01:01:23 -05:00
dubslow
30f3866772 restore bold names in chat 2014-10-01 23:21:43 -05:00
krepa098
5e328d2404 more styling 2014-10-01 16:45:10 +02:00
krepa098
a4cd2d34db cleanup, applied some of the "Tox User Interface Guidelines" 2014-10-01 16:41:17 +02:00
krepa098
87c9bbf1e6 fixes #332, #334 and other visual glitches 2014-09-28 17:30:00 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
b6ccbfc62f Fix greentext
Thanks to dewbasaur for reporting the bug
2014-09-12 22:51:13 +02:00
apprb
6c5cd7c010 filetransfer: corrected pause/resume behaviour 2014-09-12 01:32:31 +07:00
krepa098
39ba354651 use "white-space: nowrap" for div.date 2014-09-09 18:09:51 +02:00
apprb
f0b34dc40d filetransfer: original buttons positions 2014-09-07 23:14:06 +07:00
apprb
aa2f67c983 code cleanup 2014-09-07 19:17:47 +07:00
apprb
0a1eaac9a4 filetransferinstance should use own pictures 2014-09-07 15:04:42 +07:00
apprb
92b2848916 rewrite 2014-09-07 00:21:47 +07:00
apprb
0fe14953c8 somehow working example 2014-09-07 00:21:47 +07:00
apprb
25ee6a24d9 new chat beginning 2014-09-07 00:21:39 +07:00
apprb
522d570e62 code cleanup 2014-09-05 23:03:26 +07:00
midnight079
5e5bb66409 changed size of micButton and volButton 2014-08-19 21:49:37 +02:00
midnight079
b474ff2c2b realized micButton for calls 2014-08-19 21:49:32 +02:00
midnight079
ca9a9b79cb micButton and volButton were added to chatForm, but micButton for some
reason is blinking
2014-08-19 21:46:59 +02:00
midnight079
fdfbd9b162 added stylesheets for micButton and volButton 2014-08-19 21:46:57 +02:00
midnight079
a75666a072 Added buttons for microphone and volume control 2014-08-19 21:46:55 +02:00
krepa098
8c32699608 style update 2014-08-10 15:20:10 +02:00
krepa098
a3a0ee3923 style update 2014-08-10 15:07:02 +02:00
krepa098
566402a1bf a shiny new widget 2014-08-01 14:32:51 +02:00
Kevin Flynn
f7e462272a Fix friendList mixed horizontal & vertical scroll, improved scrollbar theme on OS X 2014-07-23 19:05:14 -07:00
Kevin Flynn
7949031298 Improve width of editablelabelwidgets used in name and status 2014-07-05 15:41:39 -07:00
Kevin Flynn
c5c0f35f59 Small fixes to status button 2014-07-05 15:03:53 -07:00
Kevin Flynn
46784cc1cc Improved status button 2014-07-05 13:54:27 -07:00
Kevin Flynn
a31304d9e2 Added proper status button
Pixels in status image are shifted slightly, but since this involves
changing the .ui file it's better to merge sooner rather than later.
2014-07-05 12:30:00 -07:00