mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-08-03 14:25:38 +02:00
misc: update icons
+ microphone + share full screen + share screen area + share file Change-Id: I5395097ff9f4eead173303594d2916f5b2e1d4d9 GitLab: #592
This commit is contained in:
parent
978e8d7935
commit
0ddc74aeb6
11 changed files with 92 additions and 28 deletions
20
resources/icons/laptop_black_24dp.svg
Normal file
20
resources/icons/laptop_black_24dp.svg
Normal file
|
@ -0,0 +1,20 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
|
||||
<g id="Icones_Outline">
|
||||
<g id="Laptop_Black_24dp">
|
||||
<g transform="translate(2.000000, 5.000000)">
|
||||
<g id="Shape">
|
||||
<path d="M17,12H2.8c-0.5,0-0.9-0.2-1.2-0.5C1.2,11.1,1,10.7,1,10.2V1.3c0-0.5,0.2-0.9,0.5-1.2s0.8-0.5,1.2-0.5H17
|
||||
c0.5,0,0.9,0.2,1.2,0.5c0.3,0.3,0.5,0.8,0.5,1.2v8.9c0,0.5-0.2,0.9-0.5,1.2S17.5,12,17,12z M2.8,0.9C2.7,0.9,2.6,1,2.5,1
|
||||
c0,0.1-0.1,0.2-0.1,0.3v8.9c0,0.1,0,0.2,0.1,0.3c0,0,0.1,0.1,0.3,0.1H17c0.1,0,0.2-0.1,0.3-0.1c0.1-0.1,0.1-0.2,0.1-0.3V1.3
|
||||
c0-0.1,0-0.2-0.1-0.3c0,0-0.1-0.1-0.3-0.1C17,0.9,2.8,0.9,2.8,0.9z"/>
|
||||
</g>
|
||||
<g id="Line-2">
|
||||
<path d="M19.5,14.4h-19c-0.4,0-0.7-0.3-0.7-0.7S0.1,13,0.5,13h19c0.4,0,0.7,0.3,0.7,0.7S19.9,14.4,19.5,14.4z"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
After Width: | Height: | Size: 1 KiB |
|
@ -1 +0,0 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 14c1.66 0 2.99-1.34 2.99-3L15 5c0-1.66-1.34-3-3-3S9 3.34 9 5v6c0 1.66 1.34 3 3 3zm5.3-3c0 3-2.54 5.1-5.3 5.1S6.7 14 6.7 11H5c0 3.41 2.72 6.23 6 6.72V21h2v-3.28c3.28-.48 6-3.3 6-6.72h-1.7z" fill="white"/><path d="M0 0h24v24H0z" fill="none"/></svg>
|
Before Width: | Height: | Size: 342 B |
|
@ -1,15 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<title>Micro Off</title>
|
||||
<g id="Icones_Outline" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="Micro-Off" stroke="#000000">
|
||||
<line x1="3" y1="21" x2="21" y2="4" id="Line" stroke-width="1.75" stroke-linecap="round"></line>
|
||||
<g id="noun_recording_1614610" transform="translate(5.000000, 2.000000)" fill-rule="nonzero">
|
||||
<g id="Group">
|
||||
<path d="M6.56527519,0.849075391 C7.49027117,0.849075391 8.32847097,1.2251095 8.93550281,1.83214135 C9.54253466,2.4391732 9.91856877,3.27737299 9.91856877,4.20236897 L9.91856877,4.20236897 L9.91856877,10.2205384 C9.91856877,11.1455335 9.5425343,11.9837335 8.93550214,12.5907656 C8.32847037,13.1977974 7.49027087,13.5738319 6.56527519,13.5738319 C5.64027948,13.5738319 4.8020799,13.1977974 4.19504806,12.5907656 C3.58801587,11.9837334 3.21198134,11.1455335 3.21198134,10.2205384 L3.21198134,10.2205384 L3.21198134,4.20236897 C3.21198134,3.27737302 3.5880155,2.43917324 4.19504738,1.8321414 C4.8020793,1.22510952 5.64027918,0.849075391 6.56527519,0.849075391 Z" id="Path" stroke-width="1.5"></path>
|
||||
<path d="M0.555659536,6.93784593 C0.263494091,6.93333516 -0.00456587154,7.20139238 -5.2430396e-05,7.49355783 L-5.2430396e-05,10.2290732 C-5.2430396e-05,13.673624 2.64524538,16.4924773 6.01816938,16.768711 L6.01816938,18.7006784 L3.82974614,18.7006784 C3.52758781,18.7006784 3.28264033,18.9456177 3.28264033,19.2477842 C3.28264033,19.5499508 3.52758781,19.79489 3.82974614,19.79489 L9.30080425,19.79489 C9.60296258,19.79489 9.84791006,19.5499508 9.84791006,19.2477842 C9.84791006,18.9456177 9.60296258,18.7012802 9.30080425,18.7006784 L7.112381,18.7006784 L7.112381,16.768711 C10.4853047,16.4924773 13.1305918,13.673624 13.1305918,10.2290732 L13.1305918,7.49355783 C13.1346209,7.20451636 12.8725107,6.93866123 12.5834391,6.93866123 C12.2943675,6.93866123 12.0322464,7.20451636 12.0363333,7.49355783 L12.0363333,10.2290732 C12.0363333,13.2695043 9.60570358,15.7001313 6.56527519,15.7001313 C3.52484407,15.7001313 1.09421682,13.2695043 1.09421682,10.2290732 L1.09421682,7.49355783 C1.09870309,7.20709323 0.842124138,6.94237335 0.555659536,6.93784593 Z" id="Path" stroke-width="0.5" fill="#000000"></path>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
Before Width: | Height: | Size: 2.4 KiB |
14
resources/icons/micro_black_24dp.svg
Normal file
14
resources/icons/micro_black_24dp.svg
Normal file
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
|
||||
<g>
|
||||
<path d="M12,16.2c1.1,0,2.1-0.4,2.8-1.2c0.8-0.8,1.2-1.9,1.2-2.8V6c0-1.1-0.4-2.1-1.2-2.8C13.3,1.6,10.7,1.6,9,3C8.4,3.8,8,4.8,8,6
|
||||
v6c0,1.1,0.4,2.1,1.2,2.8C9.9,15.8,10.9,16.2,12,16.2z M9.3,6c0-0.7,0.3-1.3,0.8-1.9c0.5-0.5,1.2-0.8,1.9-0.8s1.3,0.3,1.9,0.8
|
||||
s0.8,1.1,0.8,1.9v6c0,0.7-0.3,1.3-0.8,1.9c-1.1,1.1-2.7,1.1-3.6,0c-0.5-0.5-0.9-1.1-0.9-1.9V6z"/>
|
||||
<path d="M18.7,8.8c-0.3-0.3-0.7-0.3-1.1,0c-0.1,0.1-0.3,0.3-0.3,0.5V12c0,3.1-2.4,5.5-5.5,5.5S6.5,15.1,6.5,12V9.2
|
||||
c0-0.4-0.3-0.7-0.7-0.7l0,0c-0.1,0-0.4,0.1-0.5,0.3c-0.1,0-0.1,0.3-0.1,0.4V12c0,3.5,2.7,6.4,6.2,6.8v1.7H9.2
|
||||
c-0.4,0-0.7,0.3-0.7,0.7c0,0.4,0.3,0.7,0.7,0.7h5.6c0.4,0,0.7-0.3,0.7-0.7c0-0.4-0.3-0.7-0.7-0.7h-2.1v-1.7
|
||||
c3.5-0.4,6.2-3.4,6.2-6.8V9.2C18.8,9.1,18.8,8.9,18.7,8.8z"/>
|
||||
</g>
|
||||
</svg>
|
After Width: | Height: | Size: 1.1 KiB |
19
resources/icons/micro_off_black_24dp.svg
Normal file
19
resources/icons/micro_off_black_24dp.svg
Normal file
|
@ -0,0 +1,19 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
|
||||
<g>
|
||||
<path d="M12,16.1c1.1,0,2.1-0.4,2.8-1.2c0.8-0.8,1.2-1.9,1.2-2.8V6c0-1.1-0.4-2.1-1.2-2.8c-1.5-1.5-4.2-1.5-5.8,0
|
||||
C8.4,3.8,8,4.9,8,6v6.2c0,1.1,0.4,2.1,1.2,2.8C9.9,15.7,10.8,16.1,12,16.1z M9.4,6c0-0.7,0.3-1.3,0.8-1.9c0.5-0.5,1.1-0.8,1.9-0.8
|
||||
c0.7,0,1.3,0.3,1.9,0.8c0.5,0.5,0.8,1.1,0.8,1.9v6.2c0,0.7-0.3,1.3-0.8,1.9c-1.1,1.1-2.7,1.1-3.6,0c-0.5-0.5-0.8-1.1-0.8-1.9
|
||||
C9.4,12.1,9.4,6,9.4,6z"/>
|
||||
<path d="M18.6,8.8c-0.3-0.3-0.7-0.3-1.1,0c0,0.1-0.1,0.3-0.1,0.5v2.8c0,3.1-2.4,5.5-5.5,5.5s-5.5-2.4-5.5-5.5V9.3
|
||||
c0-0.4-0.3-0.7-0.7-0.7l0,0c-0.1-0.1-0.3,0-0.4,0.1C5.1,8.9,5.1,9,5.1,9.3v2.8c0,3.5,2.7,6.4,6.2,6.8v1.7h-2
|
||||
c-0.4,0-0.7,0.3-0.7,0.7c0,0.4,0.3,0.7,0.7,0.7h5.6c0.4,0,0.7-0.3,0.7-0.7c0-0.4-0.3-0.7-0.7-0.7h-2.1V19c3.5-0.4,6.2-3.4,6.2-6.8
|
||||
V9.3C18.9,9,18.9,9,18.6,8.8z"/>
|
||||
</g>
|
||||
<g>
|
||||
<path d="M5.5,21.9c-0.1,0-0.3,0-0.4-0.1c-0.3-0.3-0.4-0.7-0.3-1.1L17.7,2.6c0.3-0.3,0.7-0.4,1.1-0.3C19,2.6,19.1,3,19,3.4L6,21.6
|
||||
C5.9,21.8,5.6,21.9,5.5,21.9z"/>
|
||||
</g>
|
||||
</svg>
|
After Width: | Height: | Size: 1.3 KiB |
28
resources/icons/share_area_black_24dp.svg
Normal file
28
resources/icons/share_area_black_24dp.svg
Normal file
|
@ -0,0 +1,28 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
|
||||
<path d="M19.7,16.4V7.6C21,7.4,22,6.2,22,4.9C22,3.3,20.7,2,19.1,2c-1.4,0-2.5,1-2.8,2.3H7.6C7.4,3,6.2,2,4.9,2C3.3,2,2,3.3,2,4.9
|
||||
c0,1.4,1,2.5,2.3,2.8v8.7C3,16.6,2,17.8,2,19.1C2,20.7,3.3,22,4.9,22c1.4,0,2.5-1,2.8-2.2h8.7c0.3,1.3,1.4,2.2,2.8,2.2
|
||||
c1.6,0,2.9-1.3,2.9-2.9C22,17.8,21,16.6,19.7,16.4z M18.5,11v2.9l-4.7,4.7H11L18.5,11z M5.5,13v-2.9l4.7-4.7H13L5.5,13z M19.1,17.5
|
||||
c0.9,0,1.6,0.7,1.6,1.6c0,0.9-0.7,1.6-1.6,1.6c-0.9,0-1.6-0.7-1.6-1.6C17.5,18.2,18.2,17.5,19.1,17.5z M4.9,17.5
|
||||
c0.9,0,1.6,0.7,1.6,1.6c0,0.9-0.7,1.6-1.6,1.6s-1.6-0.7-1.6-1.6C3.2,18.2,3.9,17.5,4.9,17.5z M5.8,16.8C5.8,16.8,5.8,16.8,5.8,16.8
|
||||
L5.8,16.8L5.8,16.8z M6.3,17C6.3,17,6.3,17,6.3,17L6.3,17L6.3,17z M16.8,5.9L16.8,5.9L16.8,5.9L16.8,5.9z M16.7,6.4L6.4,16.7
|
||||
c0,0-0.1-0.1-0.1-0.1l-0.1,0c0,0-0.1,0-0.2-0.1l-0.3-0.1c-0.1,0-0.1,0-0.2-0.1v-1.6l9.3-9.3h1.6c0,0.1,0,0.2,0.1,0.2
|
||||
c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1l0,0.1c0,0.1,0,0.1,0.1,0.2l0,0.1C16.7,6.3,16.7,6.3,16.7,6.4L16.7,6.4z M18.2,7.2L18.2,7.2
|
||||
L18.2,7.2L18.2,7.2z M7.1,17.9L7.1,17.9L7.1,17.9C7.1,17.9,7.1,17.9,7.1,17.9z M7.2,17.6L17.6,7.3c0,0,0.1,0.1,0.1,0.1l0.1,0
|
||||
c0,0,0.1,0,0.2,0.1l0.3,0.1c0.1,0,0.1,0,0.2,0.1v1.6c0,0,0,0,0,0l-9.3,9.3H7.6c0-0.1,0-0.2-0.1-0.2l0-0.1c0,0,0-0.1,0-0.1l0-0.1
|
||||
c0-0.1,0-0.1-0.1-0.1l0-0.1C7.3,17.7,7.3,17.7,7.2,17.6L7.2,17.6z M19.1,6.5c-0.4,0-0.8-0.2-1.1-0.4L18,6c0,0-0.1-0.1-0.1-0.1
|
||||
c-0.3-0.3-0.4-0.7-0.4-1.1c0-0.9,0.7-1.6,1.6-1.6c0.9,0,1.6,0.7,1.6,1.6C20.8,5.8,20,6.5,19.1,6.5z M16.7,5.7L16.7,5.7
|
||||
C16.7,5.7,16.7,5.7,16.7,5.7L16.7,5.7z M4.9,6.5c-0.9,0-1.6-0.7-1.6-1.6c0-0.9,0.7-1.6,1.6-1.6S6.5,4,6.5,4.9
|
||||
C6.5,5.8,5.8,6.5,4.9,6.5z M6.3,7L6.3,7L6.3,7L6.3,7z M6.1,7.1L6.1,7.1L6.1,7.1L6.1,7.1z M5.9,7.2L5.9,7.2L5.9,7.2L5.9,7.2z
|
||||
M5.7,7.3L5.7,7.3L5.7,7.3C5.7,7.3,5.7,7.3,5.7,7.3z M5.3,7.4L5.3,7.4L5.3,7.4L5.3,7.4z M5.5,8.4V7.6c0.1,0,0.2,0,0.2-0.1l0.1,0
|
||||
c0,0,0.1,0,0.1,0l0.1,0c0.1,0,0.1,0,0.1-0.1l0.1,0c0,0,0.1,0,0.1-0.1l0.1-0.1c0,0,0.1-0.1,0.1-0.1l0.1,0C6.7,7,6.8,6.9,6.9,6.9
|
||||
C6.9,6.8,7,6.7,7,6.7l0.2-0.3c0,0,0.1-0.1,0.1-0.1l0-0.1c0,0,0-0.1,0.1-0.2c0,0,0-0.1,0-0.1l0.1-0.2c0-0.1,0-0.1,0.1-0.2h0.8
|
||||
L5.5,8.4z M6.9,6.4L6.9,6.4L6.9,6.4C6.9,6.4,6.9,6.4,6.9,6.4z M7.3,18.3L7.3,18.3C7.3,18.3,7.3,18.3,7.3,18.3L7.3,18.3z M17.7,17
|
||||
L17.7,17L17.7,17L17.7,17z M18.3,16.7L18.3,16.7L18.3,16.7C18.3,16.7,18.3,16.7,18.3,16.7z M18.5,15.6v0.8c-0.1,0-0.2,0-0.2,0.1
|
||||
c0,0-0.1,0-0.1,0c0,0-0.1,0-0.1,0l-0.1,0c-0.1,0-0.1,0-0.1,0.1l-0.1,0c0,0-0.1,0.1-0.2,0.1l-0.1,0c0,0-0.1,0.1-0.1,0.1l-0.1,0
|
||||
c-0.1,0.1-0.1,0.1-0.2,0.2c-0.1,0.1-0.1,0.1-0.2,0.2l-0.2,0.2l0.2,0.2l-0.3-0.1c0,0-0.1,0.1-0.1,0.1l0,0.1c0,0-0.1,0.1-0.1,0.2
|
||||
l-0.1,0.3c0,0.1,0,0.1-0.1,0.2h-0.8L18.5,15.6z M17.1,17.6L17.1,17.6L17.1,17.6L17.1,17.6z M16.8,18.2L16.8,18.2
|
||||
C16.8,18.2,16.8,18.2,16.8,18.2L16.8,18.2z"/>
|
||||
</svg>
|
After Width: | Height: | Size: 3 KiB |
|
@ -243,7 +243,6 @@ AvAdapter::stopSharing()
|
|||
{
|
||||
auto callId = lrcInstance_->getCurrentCallId();
|
||||
if (!callId.isEmpty()) {
|
||||
lrcInstance_->avModel().switchInputTo(lrcInstance_->avModel().getDefaultDevice(), callId);
|
||||
lrcInstance_->getCurrentCallModel()
|
||||
->requestMediaChange(callId,
|
||||
"video_0",
|
||||
|
|
|
@ -116,11 +116,11 @@ Control {
|
|||
|
||||
Component.onCompleted: {
|
||||
shareModel.append({"Name": JamiStrings.shareScreen,
|
||||
"IconSource": JamiResources.share_screen_black_24dp_svg})
|
||||
"IconSource": JamiResources.laptop_black_24dp_svg})
|
||||
shareModel.append({"Name": JamiStrings.shareScreenArea,
|
||||
"IconSource" : JamiResources.share_screen_black_24dp_svg})
|
||||
"IconSource" : JamiResources.share_area_black_24dp_svg})
|
||||
shareModel.append({"Name": JamiStrings.shareFile,
|
||||
"IconSource" : JamiResources.insert_photo_24dp_svg})
|
||||
"IconSource" : JamiResources.file_black_24dp_svg})
|
||||
}
|
||||
}
|
||||
function accept(index) {
|
||||
|
@ -159,8 +159,8 @@ Control {
|
|||
onTriggered: CallAdapter.muteThisCallToggle(!isAudioMuted)
|
||||
checkable: true
|
||||
icon.source: checked ?
|
||||
JamiResources.mic_off_24dp_svg :
|
||||
JamiResources.mic_24dp_svg
|
||||
JamiResources.micro_off_black_24dp_svg :
|
||||
JamiResources.micro_black_24dp_svg
|
||||
icon.color: checked ? "red" : "white"
|
||||
text: !checked ? JamiStrings.mute : JamiStrings.unmute
|
||||
property var menuAction: audioInputMenuAction
|
||||
|
|
|
@ -114,7 +114,7 @@ ContextMenuAutoLoader {
|
|||
canTrigger: CurrentAccount.videoEnabled_Video && AvAdapter.currentRenderingDeviceType !== Video.DeviceType.DISPLAY
|
||||
&& !isSIP
|
||||
itemName: JamiStrings.shareScreen
|
||||
iconSource: JamiResources.share_screen_black_24dp_svg
|
||||
iconSource: JamiResources.laptop_black_24dp_svg
|
||||
onClicked: {
|
||||
if (AvAdapter.currentRenderingDeviceType !== Video.DeviceType.DISPLAY && AvAdapter.currentRenderingDeviceType !== Video.DeviceType.FILE) {
|
||||
AvAdapter.muteCamera = root.isVideoMuted
|
||||
|
@ -133,7 +133,7 @@ ContextMenuAutoLoader {
|
|||
canTrigger: CurrentAccount.videoEnabled_Video && AvAdapter.currentRenderingDeviceType !== Video.DeviceType.DISPLAY
|
||||
&& !isSIP
|
||||
itemName: JamiStrings.shareScreenArea
|
||||
iconSource: JamiResources.share_screen_black_24dp_svg
|
||||
iconSource: JamiResources.share_area_black_24dp_svg
|
||||
onClicked: {
|
||||
if (AvAdapter.currentRenderingDeviceType !== Video.DeviceType.DISPLAY && AvAdapter.currentRenderingDeviceType !== Video.DeviceType.FILE) {
|
||||
AvAdapter.muteCamera = root.isVideoMuted
|
||||
|
@ -151,7 +151,7 @@ ContextMenuAutoLoader {
|
|||
|
||||
canTrigger: CurrentAccount.videoEnabled_Video && !isSIP
|
||||
itemName: JamiStrings.shareFile
|
||||
iconSource: JamiResources.insert_photo_24dp_svg
|
||||
iconSource: JamiResources.file_black_24dp_svg
|
||||
onClicked: {
|
||||
jamiFileDialog.open()
|
||||
}
|
||||
|
|
|
@ -53,8 +53,8 @@ RowLayout {
|
|||
Layout.preferredHeight: buttonPreferredSize
|
||||
Layout.preferredWidth: buttonPreferredSize
|
||||
source: showModeratorMute ?
|
||||
JamiResources.mic_24dp_svg :
|
||||
JamiResources.mic_off_24dp_svg
|
||||
JamiResources.micro_black_24dp_svg :
|
||||
JamiResources.micro_off_black_24dp_svg
|
||||
onClicked: CallAdapter.muteParticipant(uri, showModeratorMute)
|
||||
toolTipText: showModeratorMute? JamiStrings.muteParticipant
|
||||
: JamiStrings.unmuteParticipant
|
||||
|
|
|
@ -156,7 +156,7 @@ Item {
|
|||
|
||||
visible: participantIsMuted
|
||||
|
||||
source: JamiResources.mic_off_24dp_svg
|
||||
source: JamiResources.micro_off_black_24dp_svg
|
||||
color: JamiTheme.whiteColor
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue