tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add detection of Android TV devices with a proper icon

Browse source 
Android app :  https://phabricator.kde.org/D12803

Test Plan: Tested with an Android TV device (Nvidia Shield)

Reviewers: #kde_connect, nicolasfella

Reviewed By: #kde_connect, nicolasfella

Subscribers: kdeconnect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D12802
This commit is contained in:
Yoann Laissus 2018-05-10 13:12:42 +02:00
parent 4d8863bacc
commit c6ebdbe89b
9 changed files with 350 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/device.cpp
View file

@ -393,6 +393,7 @@ Device::DeviceType Device::str2type(const QString& deviceType) {
if (deviceType == QLatin1String("laptop")) return Laptop;
if (deviceType == QLatin1String("smartphone") || deviceType == QLatin1String("phone")) return Phone;
if (deviceType == QLatin1String("tablet")) return Tablet;
if (deviceType == QLatin1String("tv")) return Tv;
return Unknown;
}
@ -401,6 +402,7 @@ QString Device::type2str(Device::DeviceType deviceType) {
if (deviceType == Laptop) return QStringLiteral("laptop");
if (deviceType == Phone) return QStringLiteral("smartphone");
if (deviceType == Tablet) return QStringLiteral("tablet");
if (deviceType == Tv) return QStringLiteral("tv");
return QStringLiteral("unknown");
}

1
core/device.h
View file

@ -55,6 +55,7 @@ public:
Laptop,
Phone,
Tablet,
Tv,
};
/**

BIN
icon/32-status-tvconnected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
icon/32-status-tvdisconnected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 210 B

BIN
icon/32-status-tvtrusted.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 961 B

6
icon/CMakeLists.txt
View file

@ -24,6 +24,9 @@ ICONS
32-status-tabletconnected.png
32-status-tabletdisconnected.png
32-status-tablettrusted.png
32-status-tvconnected.png
32-status-tvdisconnected.png
32-status-tvtrusted.png
sc-status-laptopconnected.svg
sc-status-laptopdisconnected.svg
sc-status-laptoptrusted.svg
@ -33,6 +36,9 @@ ICONS
sc-status-tabletconnected.svg
sc-status-tabletdisconnected.svg
sc-status-tablettrusted.svg
sc-status-tvconnected.svg
sc-status-tvdisconnected.svg
sc-status-tvtrusted.svg
DESTINATION
${ICON_INSTALL_DIR}
)

124
icon/sc-status-tvconnected.svg Normal file
View file

@ -0,0 +1,124 @@
<?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"
width="32"
height="32"
id="svg3049"
version="1.1"
inkscape:version="0.92.2 2405546, 2018-03-11"
sodipodi:docname="sc-status-tvconnected.svg"
inkscape:export-filename="/home/uri/.kde/share/icons/NITRUX-KDE/16x16/actions/view-right-new.png"
inkscape:export-xdpi="30"
inkscape:export-ydpi="30">
<defs
id="defs3051" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="32"
inkscape:cx="7.2372219"
inkscape:cy="7.3557982"
inkscape:document-units="px"
inkscape:current-layer="layer2"
showgrid="true"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="3840"
inkscape:window-height="2035"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:showpageshadow="false"
borderlayer="true"
inkscape:object-nodes="true"
inkscape:snap-bbox="true"
inkscape:bbox-nodes="true"
inkscape:snap-smooth-nodes="true"
inkscape:snap-nodes="true"
inkscape:snap-others="false"
inkscape:snap-bbox-edge-midpoints="false"
inkscape:snap-bbox-midpoints="true">
<sodipodi:guide
position="-4.4335937e-06,16"
orientation="16,0"
id="guide4077"
inkscape:locked="false" />
<sodipodi:guide
position="-4.4335937e-06,4.4921876e-07"
orientation="0,16"
id="guide4079"
inkscape:locked="false" />
<inkscape:grid
type="xygrid"
id="grid4085"
originx="-3.0000089"
originy="-3.0000291" />
</sodipodi:namedview>
<metadata
id="metadata3054">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Layer 1">
<circle
transform="translate(-424.71429,-512.79071)"
style="display:inline;color:#000000;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2ecc71;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="circle4164"
cx="440.71429"
cy="528.79071"
r="13.999971" />
</g>
<g
inkscape:label="Capa 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-424.71429,-512.79071)"
style="display:inline">
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Oxygen;-inkscape-font-specification:Oxygen;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="433.71429"
y="550.04071"
id="text4196"><tspan
sodipodi:role="line"
id="tspan4198"
x="433.71429"
y="550.04071"
style="font-size:12.5px;line-height:1.25"> </tspan></text>
<path
inkscape:connector-curvature="0"
id="path4153"
d="m 440.71715,514.79074 a 14.000017,14.000017 0 0 0 -14,14 14.000017,14.000017 0 0 0 14,14 14.000017,14.000017 0 0 0 14,-14 14.000017,14.000017 0 0 0 -14,-14 z m 0,1 a 12.999987,12.999987 0 0 1 13,13 12.999987,12.999987 0 0 1 -13,13 12.999987,12.999987 0 0 1 -13,-13 12.999987,12.999987 0 0 1 13,-13 z"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<path
inkscape:connector-curvature="0"
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
d="m 431.71428,521.79074 v 12 h 1 7 v 1 h -3 v 1 h 8 v -1 h -3 v -1 l 7,-4e-5 h 1 v -12 h -1 l -16,4e-5 z m 1,1 16,-4e-5 v 10 l -16,4e-5 z"
class="ColorScheme-Text"
id="path4" />
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 5.2 KiB

106
icon/sc-status-tvdisconnected.svg Normal file
View file

@ -0,0 +1,106 @@
<?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"
width="32"
height="32"
id="svg3049"
version="1.1"
inkscape:version="0.92.2 2405546, 2018-03-11"
sodipodi:docname="sc-status-tvdisconnected.svg"
inkscape:export-filename="/home/uri/.kde/share/icons/NITRUX-KDE/16x16/actions/view-right-new.png"
inkscape:export-xdpi="30"
inkscape:export-ydpi="30">
<defs
id="defs3051" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="32"
inkscape:cx="7.9559719"
inkscape:cy="7.3557982"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="3840"
inkscape:window-height="2035"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:showpageshadow="false"
borderlayer="true"
inkscape:object-nodes="true"
inkscape:snap-bbox="true"
inkscape:bbox-nodes="true"
inkscape:snap-smooth-nodes="true"
inkscape:snap-nodes="true"
inkscape:snap-others="false"
inkscape:snap-bbox-edge-midpoints="false"
inkscape:snap-bbox-midpoints="true">
<sodipodi:guide
position="-4.4335937e-06,16"
orientation="16,0"
id="guide4077"
inkscape:locked="false" />
<sodipodi:guide
position="-4.4335937e-06,4.4921876e-07"
orientation="0,16"
id="guide4079"
inkscape:locked="false" />
<inkscape:grid
type="xygrid"
id="grid4085"
originx="-3.0000089"
originy="-3.0000291" />
</sodipodi:namedview>
<metadata
id="metadata3054">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Capa 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-424.71429,-512.79071)">
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Oxygen;-inkscape-font-specification:Oxygen;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="433.71429"
y="550.04071"
id="text4196"><tspan
sodipodi:role="line"
id="tspan4198"
x="433.71429"
y="550.04071"
style="font-size:12.5px;line-height:1.25"> </tspan></text>
<path
inkscape:connector-curvature="0"
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
d="m 431.71428,521.79074 v 12 h 1 7 v 1 h -3 v 1 h 8 v -1 h -3 v -1 l 7,-4e-5 h 1 v -12 h -1 l -16,4e-5 z m 1,1 16,-4e-5 v 10 l -16,4e-5 z"
class="ColorScheme-Text"
id="path4" />
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

111
icon/sc-status-tvtrusted.svg Normal file
View file

@ -0,0 +1,111 @@
<?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"
width="32"
height="32"
id="svg3049"
version="1.1"
inkscape:version="0.92.2 2405546, 2018-03-11"
sodipodi:docname="sc-status-tvtrusted.svg"
inkscape:export-filename="/home/uri/.kde/share/icons/NITRUX-KDE/16x16/actions/view-right-new.png"
inkscape:export-xdpi="30"
inkscape:export-ydpi="30">
<defs
id="defs3051" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="32"
inkscape:cx="7.9559719"
inkscape:cy="7.3557982"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="3840"
inkscape:window-height="2035"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:showpageshadow="false"
borderlayer="true"
inkscape:object-nodes="true"
inkscape:snap-bbox="true"
inkscape:bbox-nodes="true"
inkscape:snap-smooth-nodes="true"
inkscape:snap-nodes="true"
inkscape:snap-others="false"
inkscape:snap-bbox-edge-midpoints="false"
inkscape:snap-bbox-midpoints="true">
<sodipodi:guide
position="-4.4335937e-06,16"
orientation="16,0"
id="guide4077"
inkscape:locked="false" />
<sodipodi:guide
position="-4.4335937e-06,4.4921876e-07"
orientation="0,16"
id="guide4079"
inkscape:locked="false" />
<inkscape:grid
type="xygrid"
id="grid4085"
originx="-3.0000089"
originy="-3.0000291" />
</sodipodi:namedview>
<metadata
id="metadata3054">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Capa 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-424.71429,-512.79071)">
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Oxygen;-inkscape-font-specification:Oxygen;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="433.71429"
y="550.04071"
id="text4196"><tspan
sodipodi:role="line"
id="tspan4198"
x="433.71429"
y="550.04071"
style="font-size:12.5px;line-height:1.25"> </tspan></text>
<path
inkscape:connector-curvature="0"
id="path4153"
d="m 440.71715,514.79074 a 14.000017,14.000017 0 0 0 -14,14 14.000017,14.000017 0 0 0 14,14 14.000017,14.000017 0 0 0 14,-14 14.000017,14.000017 0 0 0 -14,-14 z m 0,1 a 12.999987,12.999987 0 0 1 13,13 12.999987,12.999987 0 0 1 -13,13 12.999987,12.999987 0 0 1 -13,-13 12.999987,12.999987 0 0 1 13,-13 z"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<path
inkscape:connector-curvature="0"
style="fill:#4d4d4d;fill-opacity:1;stroke:none"
d="m 431.71428,521.79074 v 12 h 1 7 v 1 h -3 v 1 h 8 v -1 h -3 v -1 l 7,-4e-5 h 1 v -12 h -1 l -16,4e-5 z m 1,1 16,-4e-5 v 10 l -16,4e-5 z"
class="ColorScheme-Text"
id="path4" />
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 4.4 KiB