mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
feat(chatform): Changed mic and vol buttons
This commit is contained in:
Diadlo
Zetok Zalbavar
parent
fd3b7f9450
commit
5381d55e94
10
res.qrc
10
res.qrc
|
|
@ -65,10 +65,7 @@
|
|||
<file>ui/fileTransferWidget/fileTransferWidget.css</file>
|
||||
<file>ui/friendList/friendList.css</file>
|
||||
<file>ui/micButton/micButton.css</file>
|
||||
<file>ui/micButton/micButton.png</file>
|
||||
<file>ui/micButton/micButtonDisabled.png</file>
|
||||
<file>ui/micButton/micButtonHover.png</file>
|
||||
<file>ui/micButton/micButtonPressed.png</file>
|
||||
<file>ui/micButton/micButton.svg</file>
|
||||
<file>ui/msgEdit/msgEdit.css</file>
|
||||
<file>ui/sendButton/sendButton.css</file>
|
||||
<file>ui/sendButton/sendButton.svg</file>
|
||||
|
|
@ -78,10 +75,8 @@
|
|||
<file>ui/statusButton/menu_indicator.svg</file>
|
||||
<file>ui/videoButton/videoButton.css</file>
|
||||
<file>ui/videoButton/videoButton.svg</file>
|
||||
<file>ui/volButton/volButton.png</file>
|
||||
<file>ui/volButton/volButtonHover.png</file>
|
||||
<file>ui/volButton/volButtonPressed.png</file>
|
||||
<file>ui/volButton/volButton.css</file>
|
||||
<file>ui/volButton/volButton.svg</file>
|
||||
<file>ui/window/statusPanel.css</file>
|
||||
<file>ui/window/window.css</file>
|
||||
<file>ui/chatArea/info.svg</file>
|
||||
|
|
@ -97,7 +92,6 @@
|
|||
<file>ui/fileTransferInstance/filetransferWidget.css</file>
|
||||
<file>ui/acceptCall/acceptCall.svg</file>
|
||||
<file>ui/rejectCall/rejectCall.svg</file>
|
||||
<file>ui/volButton/volButtonDisabled.png</file>
|
||||
<file>img/login_logo.svg</file>
|
||||
<file>ui/notificationEdge/notificationEdge.css</file>
|
||||
<file>ui/loginScreen/loginScreen.css</file>
|
||||
|
|
|
|||
|
|
@ -951,6 +951,11 @@ void ChatForm::updateMuteVolButton()
|
|||
volButton->setToolTip(tr("Mute call"));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
volButton->setObjectName("");
|
||||
volButton->setToolTip(tr("Sound can be disabled only during a call"));
|
||||
}
|
||||
|
||||
volButton->setStyleSheet(Style::getStylesheet(QStringLiteral(":/ui/volButton/volButton.css")));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
QAbstractButton
|
||||
{
|
||||
background-color: transparent;
|
||||
background-image: url(":/ui/micButton/micButton.png");
|
||||
background-repeat: none;
|
||||
border-radius: 5px;
|
||||
border: none;
|
||||
background-image: url(":/ui/micButton/micButton.svg");
|
||||
background-repeat: none;
|
||||
background-position: center;
|
||||
}
|
||||
|
||||
QAbstractButton:disabled
|
||||
{
|
||||
background-image: url(":/ui/micButton/micButtonDisabled.png");
|
||||
background-color: #919191;
|
||||
}
|
||||
|
||||
QAbstractButton:focus
|
||||
|
|
@ -16,12 +17,47 @@ QAbstractButton:focus
|
|||
outline: none;
|
||||
}
|
||||
|
||||
QAbstractButton#green
|
||||
{
|
||||
background-color: #6bc260;
|
||||
}
|
||||
|
||||
QAbstractButton#green:hover
|
||||
{
|
||||
background-image: url(":/ui/micButton/micButtonHover.png");
|
||||
background-color: #79c76f;
|
||||
}
|
||||
|
||||
QAbstractButton#green:pressed
|
||||
{
|
||||
background-color: #51b244;
|
||||
}
|
||||
|
||||
QAbstractButton#red
|
||||
{
|
||||
background-image: url(":/ui/micButton/micButtonPressed.png");
|
||||
background-color: #c84e4e;
|
||||
}
|
||||
|
||||
QAbstractButton#red:hover
|
||||
{
|
||||
background-color: #e87474;
|
||||
}
|
||||
|
||||
QAbstractButton#red:pressed
|
||||
{
|
||||
background-color: #df3b3b;
|
||||
}
|
||||
|
||||
QAbstractButton#yellow
|
||||
{
|
||||
background-color: #e6e465;
|
||||
}
|
||||
|
||||
QAbstractButton#yellow:hover
|
||||
{
|
||||
background-color: #e8e774;
|
||||
}
|
||||
|
||||
QAbstractButton#yellow:pressed
|
||||
{
|
||||
background-color: #e3e155;
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 593 B |
89
ui/micButton/micButton.svg
Normal file
89
ui/micButton/micButton.svg
Normal file
|
|
@ -0,0 +1,89 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
id="svg4867"
|
||||
version="1.1"
|
||||
inkscape:version="0.91 r13725"
|
||||
width="27.5"
|
||||
height="22.5"
|
||||
viewBox="0 0 27.5 22.5"
|
||||
sodipodi:docname="micButton.svg">
|
||||
<metadata
|
||||
id="metadata4873">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<defs
|
||||
id="defs4871" />
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1280"
|
||||
inkscape:window-height="963"
|
||||
id="namedview4869"
|
||||
showgrid="false"
|
||||
inkscape:zoom="22.627418"
|
||||
inkscape:cx="13.694084"
|
||||
inkscape:cy="12.845575"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="106"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="svg4867" />
|
||||
<g
|
||||
id="g4144"
|
||||
transform="matrix(0.76,0,0,0.76,3.3064861,2.7057204)">
|
||||
<rect
|
||||
ry="2.6881006"
|
||||
y="1.2870765"
|
||||
x="9.962924"
|
||||
height="13.585805"
|
||||
width="7.5794492"
|
||||
id="rect5419"
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<rect
|
||||
rx="0.33368644"
|
||||
ry="0.65545553"
|
||||
y="19.949682"
|
||||
x="8.5805082"
|
||||
height="1.3109111"
|
||||
width="10.344279"
|
||||
id="rect5423"
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<rect
|
||||
ry="0"
|
||||
rx="0"
|
||||
y="17.113348"
|
||||
x="12.513242"
|
||||
height="3.5990469"
|
||||
width="2.1451259"
|
||||
id="rect5427"
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<path
|
||||
sodipodi:nodetypes="csc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path5431"
|
||||
d="m 7.0765239,9.8278885 c 0,0 -0.9033248,7.8098235 6.4139421,7.8098235 7.317267,0 7.022576,-7.8534036 7.022576,-7.8534036"
|
||||
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 533 B |
Binary file not shown.
|
Before Width: | Height: | Size: 504 B |
Binary file not shown.
|
Before Width: | Height: | Size: 521 B |
|
|
@ -1,14 +1,15 @@
|
|||
QAbstractButton
|
||||
{
|
||||
background-color: transparent;
|
||||
background-image: url(":/ui/volButton/volButton.png");
|
||||
background-repeat: none;
|
||||
border-radius: 5px;
|
||||
border: none;
|
||||
background-image: url(":/ui/volButton/volButton.svg");
|
||||
background-repeat: none;
|
||||
background-position: center;
|
||||
}
|
||||
|
||||
QAbstractButton:disabled
|
||||
{
|
||||
background-image: url(":/ui/volButton/volButtonDisabled.png");
|
||||
background-color: #919191;
|
||||
}
|
||||
|
||||
QAbstractButton:focus
|
||||
|
|
@ -16,12 +17,47 @@ QAbstractButton:focus
|
|||
outline: none;
|
||||
}
|
||||
|
||||
QAbstractButton#green
|
||||
{
|
||||
background-color: #6bc260;
|
||||
}
|
||||
|
||||
QAbstractButton#green:hover
|
||||
{
|
||||
background-image: url(":/ui/volButton/volButtonHover.png");
|
||||
background-color: #79c76f;
|
||||
}
|
||||
|
||||
QAbstractButton#green:pressed
|
||||
{
|
||||
background-color: #51b244;
|
||||
}
|
||||
|
||||
QAbstractButton#red
|
||||
{
|
||||
background-image: url(":/ui/volButton/volButtonPressed.png");
|
||||
background-color: #c84e4e;
|
||||
}
|
||||
|
||||
QAbstractButton#red:hover
|
||||
{
|
||||
background-color: #e87474;
|
||||
}
|
||||
|
||||
QAbstractButton#red:pressed
|
||||
{
|
||||
background-color: #df3b3b;
|
||||
}
|
||||
|
||||
QAbstractButton#yellow
|
||||
{
|
||||
background-color: #e6e465;
|
||||
}
|
||||
|
||||
QAbstractButton#yellow:hover
|
||||
{
|
||||
background-color: #e8e774;
|
||||
}
|
||||
|
||||
QAbstractButton#yellow:pressed
|
||||
{
|
||||
background-color: #e3e155;
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 624 B |
79
ui/volButton/volButton.svg
Normal file
79
ui/volButton/volButton.svg
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
id="svg5872"
|
||||
version="1.1"
|
||||
inkscape:version="0.91 r13725"
|
||||
width="20.625"
|
||||
height="16.875"
|
||||
viewBox="0 0 20.625 16.875"
|
||||
sodipodi:docname="volButton.svg">
|
||||
<metadata
|
||||
id="metadata5878">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<defs
|
||||
id="defs5876" />
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1280"
|
||||
inkscape:window-height="963"
|
||||
id="namedview5874"
|
||||
showgrid="false"
|
||||
inkscape:zoom="22.627417"
|
||||
inkscape:cx="12.49006"
|
||||
inkscape:cy="3.1865007"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="106"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="svg5872" />
|
||||
<rect
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.89999998;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
id="rect6422"
|
||||
width="5.2330775"
|
||||
height="5.5364447"
|
||||
x="1.8454813"
|
||||
y="5.6757092"
|
||||
ry="1.4363106"
|
||||
rx="1.281631" />
|
||||
<path
|
||||
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
|
||||
d="m 13.014741,4.9931342 c 0,0 2.696002,3.0409607 0,7.7105728"
|
||||
id="path6434"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 15.269462,2.9706889 c 0,0 4.044848,4.3654114 0,10.8453631"
|
||||
id="path6438"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
sodipodi:nodetypes="ccccc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path4750"
|
||||
d="M 6.337401,6.1307596 10.26,2.246 l 0,12.586 -4.0174011,-4.384584 z"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 582 B |
Binary file not shown.
|
Before Width: | Height: | Size: 590 B |
Binary file not shown.
|
Before Width: | Height: | Size: 617 B |
Loading…
Reference in New Issue
Block a user