From 821fa4822d76b5efbb970b076048aa70993615f8 Mon Sep 17 00:00:00 2001 From: "Tux3 / Mlkj / !Lev.uXFMLA" Date: Sat, 28 Jun 2014 23:59:11 +0200 Subject: [PATCH] Revert "Revert "Skinned scrollbars and other small improvements"" --- img/contact list icons/contact_dark.png | Bin 549 -> 744 bytes ui/chatArea/chatArea.css | 74 ++++++++++++++++++++++ ui/chatArea/scrollBarArrows.xcf | Bin 0 -> 3062 bytes ui/chatArea/scrollBarDownArrow.png | Bin 0 -> 233 bytes ui/chatArea/scrollBarDownArrowHover.png | Bin 0 -> 228 bytes ui/chatArea/scrollBarDownArrowPressed.png | Bin 0 -> 228 bytes ui/chatArea/scrollBarHandle.png | Bin 0 -> 327 bytes ui/chatArea/scrollBarUpArrow.png | Bin 0 -> 236 bytes ui/chatArea/scrollBarUpArrowHover.png | Bin 0 -> 217 bytes ui/chatArea/scrollBarUpArrowPressed.png | Bin 0 -> 217 bytes widget/form/chatform.cpp | 27 ++++++-- widget/form/groupchatform.cpp | 31 ++++++++- 12 files changed, 127 insertions(+), 5 deletions(-) create mode 100644 ui/chatArea/chatArea.css create mode 100644 ui/chatArea/scrollBarArrows.xcf create mode 100644 ui/chatArea/scrollBarDownArrow.png create mode 100644 ui/chatArea/scrollBarDownArrowHover.png create mode 100644 ui/chatArea/scrollBarDownArrowPressed.png create mode 100644 ui/chatArea/scrollBarHandle.png create mode 100644 ui/chatArea/scrollBarUpArrow.png create mode 100644 ui/chatArea/scrollBarUpArrowHover.png create mode 100644 ui/chatArea/scrollBarUpArrowPressed.png diff --git a/img/contact list icons/contact_dark.png b/img/contact list icons/contact_dark.png index be08811bce0b5b8fe650c629ad0ad21d9bf54a63..584a4669e5fc03f8021187a32de68d72dceeb8ca 100644 GIT binary patch delta 673 zcmV;S0$%;41n32jQ-2&300kN;$RfV|H++8mk!#{!O1HD z!6jfvU8Kd97BZDWD0C2yPR@=uWiAB7!=aF+Wa>~_Xe~(6%^OOWfT%b)MH~X5K{9+d zDLJb760P3blJC9u%l~`d`|=n>G+o!r-EOx&9*+S4@pv42dw+XB^ZESmD0!GDz{khO zdb{18yS~4_kE5fb&>s*Ae0O(8R8@s-+kt-D+uOLfxPT~%)VypMrD31|VB0oSRfVqW zWt#6dn#1ny?w@|YAG&sv$pjxCAE&RcufLX7tm}GtQB8xa-ELD=2ZFoZZXHV+EjAE5 zZJA|^7R%y4S$`mSYin!i#I)Eza3Yad8cd6&Hu}NA0U?A$f-($)=jUf;r5a~4naFCx z#8AQ6Y&J4DObit)NfILnLTIQU2#_Rc^}8AXip3(5$t2Y;nM|TsEPm~8@&5jvJUl$0 z)9K7z=XoB-$HzE1IbpsOJhkiVYtrd-;2#8do=2rpVShGq^R!wmt<`F2Ye}vs3K2z- z$g&)|k!4vXq9_tYQAp&iHVh-BX7@!b8`dBvOXm)6bh(TtIQ&$FE1~j-g6v>%gaj~9v(6a!G>X^YPDK#9&~E4 zSPbcO8h<-GI{<*uXav(V;d$P|7>?s`b#?WR^6!2JP16FQ0N{BZ-rwINofXTnplMpq zFO>BkB!5l6+Dy}g|G>?_&1Q4$E$C;kQ?-uctR3t)&P+860B>(^8yk71EY>iL)L<~! z7C+pHK{K!{ zA;hUD3jTOJ003aISiokp`8XbrpD;!VAx?1|BLFlij$;%;oPP#|rfG_v=e>p2@;ndI zG{wP^wt>FF2T87LudeOA)7nC7nNmBtk3~`Nu7@^xwcz@f=~5=I7L3^as!U!jcs`$Z z2AjNE@N&8A4DRE7p3HHqCt7*BCk6o6?RM6OZR0V54~K&_xQnN;_WOP7HmkM6RG#PP z`@RwC`#$D*K7Sk-0DyCjK@hx!20?(F^VZOr?E%i`Gv01DczplQM`kPw1NlGxw1lyVh@;jcTqTrS3q)S4fKVTe-7RV!$gWk@M)93WkC z_3fW1rI=+I8k4?*)^c4JqbNeg7&68%iXwDfSL>ma>Q$5fZSRm$dp8f#SkPLH14jrM z9jqABrfp2UUauzuE7o(8r-Ig!Qm&k`EblOJm1TK%`aEI#Jbj(2swM|lRR!NER?Vc| S#} QWidget > QWidget { + background: transparent; +} + +QScrollBar:vertical { + background: white; + width: 10px; + margin: 12px 0 12px 0; +} + +QScrollBar::handle:vertical { + background: #d1d1d1; + min-height: 20px; +} + +QScrollBar::handle:vertical:hover { + background: #e3e3e3; +} + +QScrollBar::handle:vertical:pressed { + background: #b1b1b1; +} + +QScrollBar::add-line:vertical { + background: url("ui/chatArea/scrollBarDownArrow.png") center; + height: 10px; + subcontrol-position: bottom; + subcontrol-origin: margin; +} + +QScrollBar::add-line:vertical:hover { + background: url("ui/chatArea/scrollBarDownArrowHover.png") center; +} + +QScrollBar::add-line:vertical:pressed { + background: url("ui/chatArea/scrollBarDownArrowPressed.png") center; +} + +QScrollBar::sub-line:vertical { + background: url("ui/chatArea/scrollBarUpArrow.png") center; + height: 10px; + subcontrol-position: top; + subcontrol-origin: margin; +} + +QScrollBar::sub-line:vertical:hover { + background: url("ui/chatArea/scrollBarUpArrowHover.png") center; +} + +QScrollBar::sub-line:vertical:pressed { + background: url("ui/chatArea/scrollBarUpArrowPressed.png") center; + +} + +QScrollBar:QScrollBar::down-arrow:vertical { + width: 10; + height: 10px; + background: white; +} + +QScrollBar:QScrollBar::up-arrow:vertical { + width: 10px; + height: 10px; + background: white; +} + +QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { + background: none; +} \ No newline at end of file diff --git a/ui/chatArea/scrollBarArrows.xcf b/ui/chatArea/scrollBarArrows.xcf new file mode 100644 index 0000000000000000000000000000000000000000..0e3279deed5a1fb129c325d837116fc360a77420 GIT binary patch literal 3062 zcmd5;%}&%%6h8fD7>UZLD-*kL0VZRHxH7{6aHsE}fuU2H4AaRJ6yihZPIo>-AAyZ4 z64IBj@8Ce|_qDgAjTkq;aFToPch0@1z4v_W*ZRT!#621e-C;2D1h%Le@k2CCL)SrD z*!n8M2782NqV>?8D9m+_vHmH>2R<&_4feNvuj@~PU4#Vlnyf?z$0N^;!cnlhy0|j* z2jM83x+}%do%%c5ZtrEUuq(itnp#Eb&K0TEy!&s!)T3y!JqX6WyH?!`!Q-ofD%L$5 z2M2C29_)D$^TXjV@(wOH$n3vEWu%$PIw;e=i5No>t1n{zM0vlX_IuSV#)=5mwS72o zCsQwqyrPsgLM(rdwxBSVwG_r6q=9Q_yi|qTHGHpzmumPvFt1yg15o8x)bl#Z^tTFB zTgF=beKV$y>FY8};y4jYwAhj?iS;;3#1JDk=$Z61v0{y$9bY7ZK9hJko=2u3+Lj|) zV#{nZ&o@zmS(4}6Z?>N6dA5%8WT!-@*mbs%oB3=*ocHjcfSubMIQ4SiCRrUj`fNlo>%BsC?e zsYwr{rX)4BQ;>>2lXN+qN9K)@Y8*~jjk`dj&W)62{ZgPtqxHKPvpEME4Ls>uVu_WQ zz=k-94y;Kl$t1DaEhBP$t8R>nrQPt;_Pj*?1{5u5Z188soQkg7spwYg+wRJ)54D&Kj((81Z62z4>rph7CG!~v9k z8cI>2tcAkjyO2O}w+x=WDo*hMEEv7i%)9WCJ?9=vYrRvT+A_4V^`RMSh4ecVK4_p& z3CSnqk$jda2|iQuSt=;_Ovxv;6@1Pi^XB-p$R`VO7ntPljj}fWU<<1;*9ioB{An-{yUtbD$i^Rl3f6)E literal 0 HcmV?d00001 diff --git a/ui/chatArea/scrollBarDownArrow.png b/ui/chatArea/scrollBarDownArrow.png new file mode 100644 index 0000000000000000000000000000000000000000..0650e79441c562eb5e6aa406194ce542042b1c5f GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u_bxCyDx`7I;J! zGca%qgD@k*tT_@uLG}_)Usv{fY%;=HdUrO7Z37CGdAc};NL+61HRL)Jr!-jKR<_RRKhSr7msrAs{cQ{z{xV$Sz7Tv#ErtDnm{r-UW|X?;&s literal 0 HcmV?d00001 diff --git a/ui/chatArea/scrollBarDownArrowHover.png b/ui/chatArea/scrollBarDownArrowHover.png new file mode 100644 index 0000000000000000000000000000000000000000..54ae2cf6a77adb083ee4da15fc8ae72f78ed103d GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u_bxCyDx`7I;J! zGca%qgD@k*tT_@uLG}_)Usv{fY%(J3%I#@ti9n%3PZ!4!iOa418+n@@1X!NOZ`r7O zLqRxLcu5JnA%_q5?T*REnVuY<{Ptd^pLhf4u_bxCyDx`7I;J! zGca%qgD@k*tT_@uLG}_)Usv{fY%;<|vJWfY{{#vZdb&7lYjWQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#9-EAi3FjK?Z>B&Y$r9Iy66gHf+|;}h2Ir#G#FEq$ zh4Rdj3J z5S4KDeN}?;%S5{iOxnw~e)`IC|JB5wvS-dq1Si&68b1A2xVrdMkG+@0!xmvbi-#{O zI<_?b^p+3KcaZJOW?tnHGjj=_M*5+kAaS?*D|8Fkro~^7z2UiwX%7RliHfm!zxpen P(-}Nn{an^LB{Ts58mx2D literal 0 HcmV?d00001 diff --git a/ui/chatArea/scrollBarUpArrow.png b/ui/chatArea/scrollBarUpArrow.png new file mode 100644 index 0000000000000000000000000000000000000000..fcf1b9fad5cafe881f601f9ebc38533774020bd6 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u_bxCyDx`7I;J! zGca%qgD@k*tT_@uLG}_)Usv{fY%;={=99m?-3k<{^mK6yk+|I2@5ps1fX5}iO5yk- zYwazzG5uG$%2sAnDVb~5Fvs7|JM^JVg7qDrf!iF_z@yDI+f$?)Ed7)>ya_vP_CTO8 zcw=tsTIP3|AGy{{+P6&pfTrmDN#_{Ew#h|k{pUT9JHL+cxYtMBm8RwU8MODmluCGH bf0;crQs+Q)-SQtmM=*H0`njxgN@xNAf4u_bxCyDx`7I;J! zGca%qgD@k*tT_@uLG}_)Usv{fY%(HjW}g>)J`EH~^K@|xk+|I2w^OjefQLn#|Lcqf z0j32O%gX{wih3t>oafI`I-B|2ZGvLv+Bi?&y0(FR&)ZT#kKVsxs%Nj2 zJ<`>d3VwS3i;$}Bfe1nO-LbtB%>)-rHes~Be}<3ak1*elLdBLhVIuZG8yP%Z{an^L HB{Ts5F40GZ literal 0 HcmV?d00001 diff --git a/ui/chatArea/scrollBarUpArrowPressed.png b/ui/chatArea/scrollBarUpArrowPressed.png new file mode 100644 index 0000000000000000000000000000000000000000..401f903ce3ac95fb265deb836d9e9a8e7d096b53 GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u_bxCyDx`7I;J! zGca%qgD@k*tT_@uLG}_)Usv{fY%;=z3X^O;Xaj}PJY5_^Brdo1?G$V<;9(Kx|2m^V zfN6on@-pq~%&ikU&hzIeoy~miHbF6S@|LHS{+?SbZJeiXUE9FE=WVH=NAF)T)w9>i z9_eaJ1wXz2MMzcmK!l+C?%3XmW`YYQn=o46Kf}lIN0{&FHW|A#j~Zj3jSQZyelF{r G5}E*N97U)A literal 0 HcmV?d00001 diff --git a/widget/form/chatform.cpp b/widget/form/chatform.cpp index fe9b904ec..4ed5f7efb 100644 --- a/widget/form/chatform.cpp +++ b/widget/form/chatform.cpp @@ -29,15 +29,38 @@ ChatForm::ChatForm(Friend* chatFriend) avatar->setPixmap(*chatFriend->widget->avatar.pixmap()); chatAreaWidget->setLayout(mainChatLayout); + QString chatAreaStylesheet = ""; + try + { + QFile f("ui/chatArea/chatArea.css"); + f.open(QFile::ReadOnly | QFile::Text); + QTextStream chatAreaStylesheetStream(&f); + chatAreaStylesheet = chatAreaStylesheetStream.readAll(); + } + catch (int e) {} + chatArea->setStyleSheet(chatAreaStylesheet); chatArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); chatArea->setWidgetResizable(true); chatArea->setContextMenuPolicy(Qt::CustomContextMenu); + chatArea->setFrameStyle(QFrame::NoFrame); + mainChatLayout->setColumnStretch(1,1); mainChatLayout->setSpacing(10); footButtonsSmall->setSpacing(2); + QString msgEditStylesheet = ""; + try + { + QFile f("ui/msgEdit/msgEdit.css"); + f.open(QFile::ReadOnly | QFile::Text); + QTextStream msgEditStylesheetStream(&f); + msgEditStylesheet = msgEditStylesheetStream.readAll(); + } + catch (int e) {} + msgEdit->setStyleSheet(msgEditStylesheet); msgEdit->setFixedHeight(50); + msgEdit->setFrameStyle(QFrame::NoFrame); QString sendButtonStylesheet = ""; try @@ -50,10 +73,6 @@ ChatForm::ChatForm(Friend* chatFriend) catch (int e) {} sendButton->setStyleSheet(sendButtonStylesheet); - QPalette toxgreen; - toxgreen.setColor(QPalette::Button, QColor(107,194,96)); // Tox Green - - QString fileButtonStylesheet = ""; try { diff --git a/widget/form/groupchatform.cpp b/widget/form/groupchatform.cpp index 236c9fce6..27d7aa99c 100644 --- a/widget/form/groupchatform.cpp +++ b/widget/form/groupchatform.cpp @@ -39,9 +39,39 @@ GroupChatForm::GroupChatForm(Group* chatGroup) namesList->setFont(small); chatAreaWidget->setLayout(mainChatLayout); + QString chatAreaStylesheet = ""; + try + { + QFile f("ui/chatArea/chatArea.css"); + f.open(QFile::ReadOnly | QFile::Text); + QTextStream chatAreaStylesheetStream(&f); + chatAreaStylesheet = chatAreaStylesheetStream.readAll(); + } + catch (int e) {} + chatArea->setStyleSheet(chatAreaStylesheet); chatArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); chatArea->setWidgetResizable(true); chatArea->setContextMenuPolicy(Qt::CustomContextMenu); + chatArea->setFrameStyle(QFrame::NoFrame); + + mainChatLayout->setColumnStretch(1,1); + mainChatLayout->setSpacing(10); + + + QString msgEditStylesheet = ""; + try + { + QFile f("ui/msgEdit/msgEdit.css"); + f.open(QFile::ReadOnly | QFile::Text); + QTextStream msgEditStylesheetStream(&f); + msgEditStylesheet = msgEditStylesheetStream.readAll(); + } + catch (int e) {} + msgEdit->setObjectName("group"); + msgEdit->setStyleSheet(msgEditStylesheet); + msgEdit->setFixedHeight(50); + msgEdit->setFrameStyle(QFrame::NoFrame); + mainChatLayout->setColumnStretch(1,1); mainChatLayout->setHorizontalSpacing(10); @@ -56,7 +86,6 @@ GroupChatForm::GroupChatForm(Group* chatGroup) catch (int e) {} sendButton->setStyleSheet(sendButtonStylesheet); - msgEdit->setFixedHeight(50); sendButton->setFixedSize(50, 50); main->setLayout(mainLayout);