This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit e68f675a0cce8cf7e9001a0914b298e04239b660 Author: Ulrich Sibiller <uli42@gmx.de> Date: Wed Nov 30 21:59:21 2022 +0100 res/img/icons: drop Maemo support, remove hildon subdirectory. --- debian/changelog | 1 + res/img/icons/hildon/x2goclient_26.png | Bin 1235 -> 0 bytes res/img/icons/hildon/x2goclient_40.png | Bin 1860 -> 0 bytes res/img/icons/hildon/x2goclient_64.png | Bin 2826 -> 0 bytes res/img/icons/hildon/x2goclient_hildon.svg | 174 ----------------------------- 5 files changed, 1 insertion(+), 174 deletions(-) diff --git a/debian/changelog b/debian/changelog index 06b9f65..de09fa4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -195,6 +195,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium [ Ulrich Sibiller ] * New upstream version (4.1.2.3): - desktop/x2goclient.desktop: drop Maemo support. + - res/img/icons: drop Maemo support, remove hildon subdirectory. -- X2Go Release Manager <git-admin@x2go.org> Thu, 13 Feb 2020 12:31:20 +0100 diff --git a/res/img/icons/hildon/x2goclient_26.png b/res/img/icons/hildon/x2goclient_26.png deleted file mode 100644 index 37dead2..0000000 Binary files a/res/img/icons/hildon/x2goclient_26.png and /dev/null differ diff --git a/res/img/icons/hildon/x2goclient_40.png b/res/img/icons/hildon/x2goclient_40.png deleted file mode 100644 index 2bdcfd0..0000000 Binary files a/res/img/icons/hildon/x2goclient_40.png and /dev/null differ diff --git a/res/img/icons/hildon/x2goclient_64.png b/res/img/icons/hildon/x2goclient_64.png deleted file mode 100644 index 68ee719..0000000 Binary files a/res/img/icons/hildon/x2goclient_64.png and /dev/null differ diff --git a/res/img/icons/hildon/x2goclient_hildon.svg b/res/img/icons/hildon/x2goclient_hildon.svg deleted file mode 100644 index 1dda20f..0000000 --- a/res/img/icons/hildon/x2goclient_hildon.svg +++ /dev/null @@ -1,174 +0,0 @@ -<?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="128" - height="128" - id="svg2581" - sodipodi:version="0.32" - inkscape:version="0.46" - sodipodi:docbase="/home/admin/prog/X2GO-2/x2goclient" - sodipodi:docname="x2go_hildon.svg" - version="1.0" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/h1/Desktop/x2go_hildon_64.png" - inkscape:export-xdpi="45" - inkscape:export-ydpi="45"> - <defs - id="defs2583"> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 46.062992 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="92.125984 : 46.062992 : 1" - inkscape:persp3d-origin="46.062992 : 30.708661 : 1" - id="perspective27" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="5.8125" - inkscape:cx="64" - inkscape:cy="64" - inkscape:document-units="px" - inkscape:current-layer="layer1" - inkscape:window-width="1270" - inkscape:window-height="949" - inkscape:window-x="0" - inkscape:window-y="0" - showgrid="false" /> - <metadata - id="metadata2586"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Ebene 1" - inkscape:groupmode="layer" - id="layer1"> - <rect - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect2400" - width="128" - height="128" - x="0" - y="0.17204301" - ry="9.9784946" /> - <g - style="fill:#4d4d4d;fill-rule:evenodd" - id="_208969008" - transform="matrix(6.6338773,0,0,6.6338773,-1182.5304,-1645.9379)"> - <path - style="fill:#4d4d4d" - d="M 191.842,256.126 L 193.8467,252.2349 C 193.9868,251.8578 194.0516,251.5883 194.0516,251.4482 C 194.0516,251.211 193.9761,251.0386 193.836,250.9416 C 193.6851,250.8338 193.4264,250.7799 193.0599,250.7799 L 193.0599,250.4242 L 196.3905,250.4242 L 196.3905,250.7799 C 195.9378,250.7799 195.6036,250.8769 195.3773,251.0709 C 195.1509,251.2649 194.8383,251.7931 194.4072,252.6338 L 192.1977,256.9236 L 194.9785,263.1966 C 195.2587,263.7894 195.5066,264.1989 195.733,264.4253 C 195.948 [...] - class="fil4" - id="_209413168" /> - <polygon - style="fill:#4d4d4d" - points="179.314,250.52 185.945,250.339 185.945,250.702 179.314,250.52 " - class="fil4" - id="_209583128" /> - <polygon - style="fill:#4d4d4d" - points="179.314,251.425 185.945,251.243 185.945,251.492 186.724,251.505 186.777,251.507 186.827,251.512 186.872,251.517 186.914,251.524 186.953,251.532 186.988,251.541 187.02,251.55 187.048,251.56 187.074,251.571 187.097,251.581 187.118,251.592 187.137,251.603 187.154,251.615 187.169,251.627 187.178,251.635 187.184,251.64 179.314,251.425 " - class="fil4" - id="_209423624" /> - <polygon - style="fill:#4d4d4d" - points="179.314,252.329 187.498,252.105 187.529,252.163 187.572,252.245 187.616,252.333 187.661,252.426 187.707,252.524 187.723,252.56 179.314,252.329 " - class="fil4" - id="_208944912" /> - <polygon - style="fill:#4d4d4d" - points="179.314,253.234 187.916,252.998 188.124,253.475 179.314,253.234 " - class="fil4" - id="_209380624" /> - <polygon - style="fill:#4d4d4d" - points="179.314,254.138 188.306,253.892 188.525,254.391 179.314,254.138 " - class="fil4" - id="_209438256" /> - <polygon - style="fill:#4d4d4d" - points="179.314,255.043 188.697,254.786 188.925,255.306 179.314,255.043 " - class="fil4" - id="_209597128" /> - <polygon - style="fill:#4d4d4d" - points="179.314,255.947 189.088,255.679 189.325,256.221 179.314,255.947 " - class="fil4" - id="_209596936" /> - <polygon - style="fill:#4d4d4d" - points="179.314,256.851 189.479,256.573 189.725,257.137 179.314,256.851 " - class="fil4" - id="_209588560" /> - <polygon - style="fill:#4d4d4d" - points="179.314,257.756 189.87,257.467 190.094,257.979 190.058,258.05 179.314,257.756 " - class="fil4" - id="_209560832" /> - <polygon - style="fill:#4d4d4d" - points="179.314,258.66 189.896,258.37 189.607,258.942 179.314,258.66 " - class="fil4" - id="_209558944" /> - <polygon - style="fill:#4d4d4d" - points="179.314,259.565 189.432,259.288 189.155,259.834 179.314,259.565 " - class="fil4" - id="_209559488" /> - <polygon - style="fill:#4d4d4d" - points="179.314,260.469 188.968,260.205 188.704,260.727 179.314,260.469 " - class="fil4" - id="_209558344" /> - <polygon - style="fill:#4d4d4d" - points="179.314,261.374 188.504,261.122 188.253,261.619 179.314,261.374 " - class="fil4" - id="_209557016" /> - <polygon - style="fill:#4d4d4d" - points="179.314,264.991 185.945,264.81 185.945,265.173 179.314,264.991 " - class="fil4" - id="_209557776" /> - <polygon - style="fill:#4d4d4d" - points="179.314,264.087 187.02,263.876 187.006,263.89 186.984,263.911 186.965,263.928 186.948,263.942 186.93,263.955 186.913,263.966 186.897,263.977 186.88,263.986 186.863,263.995 186.846,264.002 186.829,264.009 186.812,264.015 186.794,264.02 186.775,264.025 186.756,264.029 186.736,264.032 186.714,264.034 186.692,264.035 185.945,264.051 185.945,264.269 179.314,264.087 " - class="fil4" - id="_209553608" /> - <polygon - style="fill:#4d4d4d" - points="179.314,263.183 187.576,262.956 187.455,263.196 187.414,263.277 187.378,263.348 187.348,263.403 179.314,263.183 " - class="fil4" - id="_209553416" /> - <polygon - style="fill:#4d4d4d" - points="179.314,262.278 188.04,262.039 187.801,262.511 179.314,262.278 " - class="fil4" - id="_209552080" /> - <path - style="fill:#4d4d4d" - d="M 179.613,248.111 L 196.1945,248.111 C 196.9407,248.111 197.5512,248.7215 197.5512,249.4677 L 197.5512,266.0492 C 197.5512,266.7954 196.9407,267.4059 196.1945,267.4059 L 179.613,267.4059 C 178.8668,267.4059 178.2563,266.7954 178.2563,266.0492 L 178.2563,249.4677 C 178.2563,248.7215 178.8668,248.111 179.613,248.111 z M 179.7637,248.4125 L 196.0438,248.4125 C 196.7071,248.4125 197.2497,248.9551 197.2497,249.6184 L 197.2497,265.8985 C 197.2497,266.5618 196.7071,267.1044 196.0438 [...] - class="fil4" - id="_208969032" /> - </g> - </g> -</svg> -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit fbf1576ed386359b9463147e61c2d4ace9752a09 Author: Ulrich Sibiller <uli42@gmx.de> Date: Wed Nov 30 22:00:43 2022 +0100 res/img/svg: drop Maemo support, remove bg_hildon.svg. --- debian/changelog | 1 + res/img/svg/bg_hildon.svg | 404 ---------------------------------------------- 2 files changed, 1 insertion(+), 404 deletions(-) diff --git a/debian/changelog b/debian/changelog index de09fa4..c757650 100644 --- a/debian/changelog +++ b/debian/changelog @@ -196,6 +196,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium * New upstream version (4.1.2.3): - desktop/x2goclient.desktop: drop Maemo support. - res/img/icons: drop Maemo support, remove hildon subdirectory. + - res/img/svg: drop Maemo support, remove bg_hildon.svg. -- X2Go Release Manager <git-admin@x2go.org> Thu, 13 Feb 2020 12:31:20 +0100 diff --git a/res/img/svg/bg_hildon.svg b/res/img/svg/bg_hildon.svg deleted file mode 100644 index 3550df2..0000000 --- a/res/img/svg/bg_hildon.svg +++ /dev/null @@ -1,404 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Creator: CorelDRAW --> -<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:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xml:space="preserve" - width="1024" - height="768" - style="fill-rule:evenodd" - viewBox="0 0 361.244 270.933" - id="svg2" - sodipodi:version="0.32" - inkscape:version="0.46" - sodipodi:docname="bg_hildon2.svg" - sodipodi:docbase="/home/admin/prog/X2GO-2/x2goclient/svg" - version="1.0" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata51"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview - inkscape:window-height="949" - inkscape:window-width="1270" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - inkscape:zoom="0.96875" - inkscape:cx="512" - inkscape:cy="384" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:current-layer="svg2" - showgrid="true"><inkscape:grid - type="xygrid" - id="grid2662" - visible="true" - enabled="true" - dotted="true" /></sodipodi:namedview> - <defs - id="defs4"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 135.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="361.04999 : 135.5 : 1" - inkscape:persp3d-origin="180.52499 : 90.333333 : 1" - id="perspective28" /><linearGradient - inkscape:collect="always" - id="linearGradient2802"><stop - style="stop-color:white;stop-opacity:1;" - offset="0" - id="stop2804" /><stop - style="stop-color:white;stop-opacity:0;" - offset="1" - id="stop2806" /></linearGradient><linearGradient - id="linearGradient2852"><stop - style="stop-color:white;stop-opacity:1;" - offset="0" - id="stop2854" /><stop - style="stop-color:#69f;stop-opacity:0;" - offset="1" - id="stop2856" /></linearGradient><linearGradient - id="linearGradient2844"><stop - style="stop-color:#deeaed;stop-opacity:1;" - offset="0" - id="stop2846" /><stop - style="stop-color:white;stop-opacity:1;" - offset="1" - id="stop2848" /></linearGradient><linearGradient - inkscape:collect="always" - id="linearGradient1948"><stop - style="stop-color:#69f;stop-opacity:1;" - offset="0" - id="stop1950" /><stop - style="stop-color:#69f;stop-opacity:0;" - offset="1" - id="stop1952" /></linearGradient> - <style - type="text/css" - id="style6"> - - .fil1 {fill:#6699FF} - .fil0 {fill:white} - .fil2 {fill:#6E707F} - .fil4 {fill:white} - .fil3 {fill:url(#id0)} - - </style> - <linearGradient - id="id0" - gradientUnits="userSpaceOnUse" - x1="202.494" - y1="135.464" - x2="207.00999" - y2="135.464"> - <stop - offset="0" - style="stop-color:black" - id="stop9" /> - <stop - offset="1" - style="stop-color:#6E707F" - id="stop11" /> - </linearGradient> - - <metadata - id="CorelCorpID_0Corel-Layer" /> - - - - - - - - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 46.062992 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="92.125984 : 46.062992 : 1" - inkscape:persp3d-origin="46.062992 : 30.708661 : 1" - id="perspective2513" /><linearGradient - gradientUnits="userSpaceOnUse" - y2="135.46651" - x2="8.6010475" - y1="135.46651" - x1="4.3005238" - id="linearGradient4855" - xlink:href="#linearGradient4849" - inkscape:collect="always" /><linearGradient - gradientUnits="userSpaceOnUse" - y2="144.4976" - x2="162.5598" - y1="-45.155499" - x1="18.062202" - id="linearGradient3339" - xlink:href="#linearGradient3333" - inkscape:collect="always" /><linearGradient - gradientTransform="matrix(2.9166667,0,0,1,-146.75538,31.608847)" - gradientUnits="userSpaceOnUse" - y2="121.91985" - x2="96.761787" - y1="121.91985" - x1="50.316132" - id="linearGradient3241" - xlink:href="#linearGradient3235" - inkscape:collect="always" /><linearGradient - gradientTransform="matrix(1,0,0,1.0470449,0,-6.8968197)" - gradientUnits="userSpaceOnUse" - y2="135.96677" - x2="65.034927" - y1="135.96677" - x1="0" - id="linearGradient3183" - xlink:href="#linearGradient3177" - inkscape:collect="always" /><linearGradient - gradientTransform="matrix(1.0000171,0,0,1.0000148,0,-4.0000546e-3)" - gradientUnits="userSpaceOnUse" - y2="120.54888" - x2="133.85397" - y1="-49.590809" - x1="278.59366" - id="linearGradient2630" - xlink:href="#linearGradient2802" - inkscape:collect="always" /><linearGradient - gradientUnits="userSpaceOnUse" - y2="207.717" - x2="107.64762" - y1="268.11078" - x1="107.24445" - id="linearGradient2628" - xlink:href="#linearGradient1948" - inkscape:collect="always" /> - - - - - - - - <metadata - id="metadata2626" /> - - <linearGradient - y2="135.464" - x2="207.00999" - y1="135.464" - x1="202.494" - gradientUnits="userSpaceOnUse" - id="linearGradient2620"> - <stop - id="stop2622" - style="stop-color:black" - offset="0" /> - <stop - id="stop2624" - style="stop-color:#6E707F" - offset="1" /> - </linearGradient> - <style - id="style2618" - type="text/css"> - - .fil1 {fill:#6699FF} - .fil0 {fill:white} - .fil2 {fill:#6E707F} - .fil4 {fill:white} - .fil3 {fill:url(#id0)} - - </style> - <linearGradient - id="linearGradient2606"><stop - id="stop2608" - offset="0" - style="stop-color:#deeaed;stop-opacity:1;" /><stop - id="stop2610" - offset="1" - style="stop-color:white;stop-opacity:1;" /></linearGradient><linearGradient - id="linearGradient2600"><stop - id="stop2602" - offset="0" - style="stop-color:white;stop-opacity:1;" /><stop - id="stop2604" - offset="1" - style="stop-color:#69f;stop-opacity:0;" /></linearGradient><inkscape:perspective - id="perspective2592" - inkscape:persp3d-origin="180.52499 : 90.333333 : 1" - inkscape:vp_z="361.04999 : 135.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 135.5 : 1" - sodipodi:type="inkscape:persp3d" /><linearGradient - id="linearGradient3177" - inkscape:collect="always"><stop - id="stop3179" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /><stop - id="stop3181" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient - id="linearGradient3235" - inkscape:collect="always"><stop - id="stop3237" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /><stop - id="stop3239" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient - id="linearGradient3333" - inkscape:collect="always"><stop - id="stop3335" - offset="0" - style="stop-color:#241f1c;stop-opacity:1;" /><stop - id="stop3337" - offset="1" - style="stop-color:#241f1c;stop-opacity:0;" /></linearGradient><pattern - inkscape:collect="always" - patternUnits="userSpaceOnUse" - width="30.066020" - height="5.1805778" - id="Wavywhite" - inkscape:stockid="Wavy white"><path - style="fill:white;stroke:none;" - d="M 7.597,0.061 C 5.079,-0.187 2.656,0.302 -0.01,1.788 L -0.01,3.061 C 2.773,1.431 5.173,1.052 7.472,1.280 C 9.770,1.508 11.969,2.361 14.253,3.218 C 18.820,4.931 23.804,6.676 30.066,3.061 L 30.062,1.788 C 23.622,5.497 19.246,3.770 14.691,2.061 C 12.413,1.207 10.115,0.311 7.597,0.061 z " - id="path4539" /></pattern><pattern - patternTransform="matrix(1.0895522,0,0,1.0923077,-3.8512144,-24.413743)" - id="pattern4837" - xlink:href="#Wavywhite" - inkscape:collect="always" /><linearGradient - id="linearGradient4849" - inkscape:collect="always"><stop - id="stop4851" - offset="0" - style="stop-color:#000000;stop-opacity:1;" /><stop - id="stop4853" - offset="1" - style="stop-color:#000000;stop-opacity:0;" /></linearGradient></defs> - -<g - style="fill-rule:evenodd" - id="g2637" - transform="matrix(0.9999999,0,0,0.75,1.1985799e-5,33.866609)"><rect - class="fil0" - x="-1.19858e-05" - y="-45.155499" - width="361.24399" - height="361.24399" - id="rect15" - style="fill:#246ed8;fill-opacity:1" /><rect - y="-45.155499" - x="1.1936351e-17" - height="361.24399" - width="4.3005238" - id="rect4845" - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /><rect - y="-45.155499" - x="4.3005238" - height="361.24399" - width="4.3005238" - id="rect4847" - style="opacity:1;fill:url(#linearGradient4855);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /><path - id="_209413168" - transform="matrix(0.8601048,0,0,0.8601048,0,-45.1555)" - d="M 420,73.59375 L 370.5,93.625 L 373.09375,100 C 379.49518,97.412175 384.39526,96.53839 387.8125,97.40625 C 390.9628,98.156671 393.53027,100.71466 395.25,104.96875 C 396.26575,107.48139 397.08799,112.77888 397.375,120.53125 L 390.5625,204.46875 L 332.625,146.71875 C 328.33582,142.60825 325.32895,138.4354 323.6875,134.375 C 320.32776,126.06411 324.51584,119.64255 336,115 L 333.40625,108.625 L 258.875,138.75 L 261.4375,145.125 C 268.96901,142.08033 275.57757,141.65299 281.28125,143. [...] - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" /><polygon - transform="matrix(15.022925,-6.0731257,6.2359213,15.425628,-4143.281,-2655.1065)" - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" - points="179.314,250.52 185.945,250.339 185.945,250.702 179.314,250.52 " - class="fil4" - id="_209583128" /><polygon - transform="matrix(15.022925,-6.0731257,6.2359213,15.425628,-4143.281,-2655.1065)" - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" - points="179.314,251.425 185.945,251.243 185.945,251.492 186.724,251.505 186.777,251.507 186.827,251.512 186.872,251.517 186.914,251.524 186.953,251.532 186.988,251.541 187.02,251.55 187.048,251.56 187.074,251.571 187.097,251.581 187.118,251.592 187.137,251.603 187.154,251.615 187.169,251.627 187.178,251.635 187.184,251.64 179.314,251.425 " - class="fil4" - id="_209423624" /><polygon - transform="matrix(15.022925,-6.0731257,6.2359213,15.425628,-4143.281,-2655.1065)" - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" - points="179.314,252.329 187.498,252.105 187.529,252.163 187.572,252.245 187.616,252.333 187.661,252.426 187.707,252.524 187.723,252.56 179.314,252.329 " - class="fil4" - id="_208944912" /><polygon - transform="matrix(15.022925,-6.0731257,6.2359213,15.425628,-4143.281,-2655.1065)" - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" - points="179.314,253.234 187.916,252.998 188.124,253.475 179.314,253.234 " - class="fil4" - id="_209380624" /><polygon - transform="matrix(15.022925,-6.0731257,6.2359213,15.425628,-4143.281,-2655.1065)" - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" - points="179.314,254.138 188.306,253.892 188.525,254.391 179.314,254.138 " - class="fil4" - id="_209438256" /><polygon - transform="matrix(15.022925,-6.0731257,6.2359213,15.425628,-4143.281,-2655.1065)" - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" - points="179.314,255.043 188.697,254.786 188.925,255.306 179.314,255.043 " - class="fil4" - id="_209597128" /><polygon - transform="matrix(15.022925,-6.0731257,6.2359213,15.425628,-4143.281,-2655.1065)" - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" - points="179.314,255.947 189.088,255.679 189.325,256.221 179.314,255.947 " - class="fil4" - id="_209596936" /><polygon - transform="matrix(15.022925,-6.0731257,6.2359213,15.425628,-4143.281,-2655.1065)" - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" - points="179.314,256.851 189.479,256.573 189.725,257.137 179.314,256.851 " - class="fil4" - id="_209588560" /><polygon - transform="matrix(15.022925,-6.0731257,6.2359213,15.425628,-4143.281,-2655.1065)" - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" - points="179.314,257.756 189.87,257.467 190.094,257.979 190.058,258.05 179.314,257.756 " - class="fil4" - id="_209560832" /><polygon - transform="matrix(15.022925,-6.0731257,6.2359213,15.425628,-4143.281,-2655.1065)" - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" - points="179.314,258.66 189.896,258.37 189.607,258.942 179.314,258.66 " - class="fil4" - id="_209558944" /><polygon - transform="matrix(15.022925,-6.0731257,6.2359213,15.425628,-4143.281,-2655.1065)" - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" - points="179.314,259.565 189.432,259.288 189.155,259.834 179.314,259.565 " - class="fil4" - id="_209559488" /><polygon - transform="matrix(15.022925,-6.0731257,6.2359213,15.425628,-4143.281,-2655.1065)" - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" - points="179.314,260.469 188.968,260.205 188.704,260.727 179.314,260.469 " - class="fil4" - id="_209558344" /><polygon - transform="matrix(15.022925,-6.0731257,6.2359213,15.425628,-4143.281,-2655.1065)" - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" - points="179.314,261.374 188.504,261.122 188.253,261.619 179.314,261.374 " - class="fil4" - id="_209557016" /><path - id="_209557776" - transform="matrix(0.8601048,0,0,0.8601048,0,-45.1555)" - d="M 350.53125,401.875 L 309.0625,420 L 321.90625,420 L 353.15625,408.375 L 350.53125,401.875 z" - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" /><path - id="_209553608" - transform="matrix(0.8601048,0,0,0.8601048,0,-45.1555)" - d="M 362.53125,377.53125 L 265.40625,420 L 271.71875,420 L 346.59375,392.15625 L 345.03125,388.25 L 357.96875,382.6875 L 358.34375,382.5 L 358.71875,382.3125 L 359.03125,382.125 L 359.34375,381.90625 L 359.625,381.6875 L 359.90625,381.46875 L 360.15625,381.25 L 360.40625,381 L 360.65625,380.75 L 360.875,380.46875 L 361.125,380.1875 L 361.3125,379.875 L 361.53125,379.5625 L 361.75,379.21875 L 361.9375,378.84375 L 362.15625,378.40625 L 362.375,377.875 L 362.53125,377.53125 z" - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" /><polygon - transform="matrix(15.022925,-6.0731257,6.2359213,15.425628,-4143.281,-2655.1065)" - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" - points="179.314,263.183 187.576,262.956 187.455,263.196 187.414,263.277 187.378,263.348 187.348,263.403 179.314,263.183 " - class="fil4" - id="_209553416" /><polygon - transform="matrix(15.022925,-6.0731257,6.2359213,15.425628,-4143.281,-2655.1065)" - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" - points="179.314,262.278 188.04,262.039 187.801,262.511 179.314,262.278 " - class="fil4" - id="_209552080" /><path - id="_208969032" - transform="matrix(0.8601048,0,0,0.8601048,0,-45.1555)" - d="M 417.21875,28.1875 C 414.29375,28.254543 411.31981,28.847438 408.46875,30 L 118.875,147.09375 C 105.84158,152.36261 99.589912,167.61721 105,181 L 201.625,420 L 207.75,420 L 111.34375,181.5625 C 106.5347,169.66648 112.10205,156.121 123.6875,151.4375 L 408.03125,36.46875 C 411.94168,34.887931 416.07455,34.533239 420,35.1875 L 420,28.28125 C 419.06926,28.198089 418.1586,28.165957 417.21875,28.1875 z" - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" /><path - style="opacity:0.27156552;fill:#ffffff;fill-rule:evenodd" - d="M 350.53125,401.875 L 309.0625,420 L 321.90625,420 L 353.15625,408.375 L 350.53125,401.875 z" - transform="matrix(0.8601048,0,0,0.8601048,0,-45.1555)" - id="path3356" /></g></svg> \ No newline at end of file -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 54e530d9d192a106c9449efa16717adcd3dbb307 Author: Ulrich Sibiller <uli42@gmx.de> Date: Wed Nov 30 23:29:10 2022 +0100 src/{{InteractionDialog,configdialog,connectionwidget,editconnectiondialog,folderbutton,mediawidget,ongetpass,onmainwindow,printprocess,printwidget,sessionbutton,sessionmanagedialog,sessionwidget,settingswidget,sharewidget}.cpp,x2goclientconfig.h}: drop Maemo support. --- debian/changelog | 5 ++ src/InteractionDialog.cpp | 4 -- src/configdialog.cpp | 17 ------- src/connectionwidget.cpp | 23 --------- src/editconnectiondialog.cpp | 24 --------- src/folderbutton.cpp | 4 -- src/mediawidget.cpp | 6 --- src/ongetpass.cpp | 2 - src/onmainwindow.cpp | 119 ++----------------------------------------- src/printprocess.cpp | 15 +----- src/printwidget.cpp | 32 ++++-------- src/sessionbutton.cpp | 20 +------- src/sessionmanagedialog.cpp | 12 ++--- src/sessionwidget.cpp | 42 --------------- src/settingswidget.cpp | 23 --------- src/sharewidget.cpp | 8 --- src/x2goclientconfig.h | 4 -- 17 files changed, 28 insertions(+), 332 deletions(-) diff --git a/debian/changelog b/debian/changelog index 46d5fd8..bf44e46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -198,6 +198,11 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - res/img/icons: drop Maemo support, remove hildon subdirectory. - res/img/svg: drop Maemo support, remove bg_hildon.svg. - res/resources.qrc: drop Maemo support, remove bg_hildon.svg entry. + - src/{{InteractionDialog,configdialog,connectionwidget, + editconnectiondialog,folderbutton,mediawidget,ongetpass, + onmainwindow,printprocess,printwidget,sessionbutton, + sessionmanagedialog,sessionwidget,settingswidget, + sharewidget}.cpp,x2goclientconfig.h}: drop Maemo support. -- X2Go Release Manager <git-admin@x2go.org> Thu, 13 Feb 2020 12:31:20 +0100 diff --git a/src/InteractionDialog.cpp b/src/InteractionDialog.cpp index 2440f41..03deacc 100644 --- a/src/InteractionDialog.cpp +++ b/src/InteractionDialog.cpp @@ -62,11 +62,7 @@ InteractionDialog::InteractionDialog(ONMainWindow* mainw, QWidget* parent): SVGF QFont fnt=this->font(); if ( mw->retMiniMode() ) -#ifdef Q_WS_HILDON - fnt.setPointSize ( 10 ); -#else fnt.setPointSize ( 9 ); -#endif this->setFont ( fnt ); this->hide(); diff --git a/src/configdialog.cpp b/src/configdialog.cpp index 2db355b..a50d236 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -308,23 +308,6 @@ ConfigDialog::ConfigDialog ( QWidget * parent, Qt::WindowFlags f ) "/32x32/edit_settings.png" ) ) ); setWindowTitle ( tr ( "Settings" ) ); -#ifdef Q_WS_HILDON - QFont fnt=font(); - fnt.setPointSize ( 10 ); - setFont ( fnt ); - QSize sz=ok->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() /1.5 ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - ok->setFixedSize ( sz ); - sz=cancel->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - cancel->setFixedSize ( sz ); - clientSshPort->setFixedHeight ( - int ( clientSshPort->sizeHint().height() *1.5 ) ); - defaults->hide(); -#endif - pwid=new PrintWidget ( this ); tabWidg->addTab ( pwid,tr ( "Printing" ) ); diff --git a/src/connectionwidget.cpp b/src/connectionwidget.cpp index d04bd39..92ec121 100644 --- a/src/connectionwidget.cpp +++ b/src/connectionwidget.cpp @@ -35,14 +35,8 @@ ConnectionWidget::ConnectionWidget ( QString id, ONMainWindow * mw, : ConfigWidget ( id,mw,parent,f ) { QVBoxLayout *connLay=new QVBoxLayout ( this ); -#ifndef Q_WS_HILDON QGroupBox* netSpd=new QGroupBox ( tr ( "&Connection speed" ),this ); QVBoxLayout *spdLay=new QVBoxLayout ( netSpd ); -#else - QFrame* netSpd=this ; - QVBoxLayout *spdLay=new QVBoxLayout (); - spdLay->addWidget ( new QLabel ( tr ( "Connection speed:" ),netSpd ) ); -#endif spd=new QSlider ( Qt::Horizontal,netSpd ); spd->setMinimum ( 0 ); spd->setMaximum ( 4 ); @@ -70,28 +64,16 @@ ConnectionWidget::ConnectionWidget ( QString id, ONMainWindow * mw, slideLay->insertSpacing ( 0,fm.width ( "MODEM" ) /2 ); slideLay->addSpacing ( fm.width ( "LAN" ) /2 ); -#ifndef Q_WS_HILDON QGroupBox* compr=new QGroupBox ( tr ( "C&ompression" ),this ); QHBoxLayout* comprLay=new QHBoxLayout ( compr ); -#else - QFrame* compr=this; - QHBoxLayout* comprLay=new QHBoxLayout (); -#endif packMethode = new QComboBox ( this ); quali= new QSpinBox ( this ); quali->setRange ( 0,9 ); -#ifdef Q_WS_HILDON - quali->setFixedHeight ( int ( quali->sizeHint().height() *1.5 ) ); -#endif QVBoxLayout* colLay=new QVBoxLayout(); QVBoxLayout* cowLay=new QVBoxLayout(); QHBoxLayout* spbl=new QHBoxLayout(); -#ifndef Q_WS_HILDON colLay->addWidget ( new QLabel ( tr ( "Method:" ),compr ) ); -#else - colLay->addWidget ( new QLabel ( tr ( "Compression method:" ),compr ) ); -#endif colLay->addWidget ( qualiLabel=new QLabel ( tr ( "Image quality:" ), compr ) ); cowLay->addWidget ( packMethode ); @@ -100,13 +82,8 @@ ConnectionWidget::ConnectionWidget ( QString id, ONMainWindow * mw, cowLay->addLayout ( spbl ); comprLay->addLayout ( colLay ); comprLay->addLayout ( cowLay ); -#ifndef Q_WS_HILDON connLay->addWidget ( netSpd ); connLay->addWidget ( compr ); -#else - connLay->addLayout ( spdLay ); - connLay->addLayout ( comprLay ); -#endif connLay->addStretch(); connect ( packMethode,SIGNAL ( activated ( const QString& ) ),this, diff --git a/src/editconnectiondialog.cpp b/src/editconnectiondialog.cpp index 27296b9..ceca95a 100644 --- a/src/editconnectiondialog.cpp +++ b/src/editconnectiondialog.cpp @@ -34,20 +34,13 @@ EditConnectionDialog::EditConnectionDialog ( bool newSession, QString id, QWidge : QDialog ( par,f ) { QVBoxLayout* ml=new QVBoxLayout ( this ); -#ifdef Q_WS_HILDON - ml->setMargin ( 2 ); -#endif fr=new QTabWidget ( this ); ml->addWidget ( fr ); ONMainWindow* parent= ( ONMainWindow* ) par; QFont fnt=font(); if ( parent->retMiniMode() ) -#ifdef Q_WS_HILDON - fnt.setPointSize ( 10 ); -#else fnt.setPointSize ( 9 ); -#endif setFont ( fnt ); sessSet=new SessionWidget ( newSession, id,parent ); @@ -73,9 +66,6 @@ EditConnectionDialog::EditConnectionDialog ( bool newSession, QString id, QWidge bLay->addWidget ( cancel ); bLay->addWidget ( def ); ml->addLayout ( bLay ); -#ifdef Q_WS_HILDON - bLay->setMargin ( 2 ); -#endif setSizeGripEnabled ( true ); setWindowIcon ( QIcon ( parent->iconsPath ( "/32x32/edit.png" ) ) ); @@ -94,20 +84,6 @@ EditConnectionDialog::EditConnectionDialog ( bool newSession, QString id, QWidge #endif ok->setDefault ( true ); -#ifdef Q_WS_HILDON - QSize sz=ok->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() /1.5 ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - ok->setFixedSize ( sz ); - sz=cancel->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - cancel->setFixedSize ( sz ); - sz=def->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - def->setFixedSize ( sz ); -#endif if ( parent->retMiniMode() ) setContentsMargins ( 3,3,3,3 ); fr->setCurrentIndex ( ind ); diff --git a/src/folderbutton.cpp b/src/folderbutton.cpp index 9f2211f..731aae0 100644 --- a/src/folderbutton.cpp +++ b/src/folderbutton.cpp @@ -52,11 +52,7 @@ FolderButton::FolderButton ( ONMainWindow* mw,QWidget *parent, QString folderPat QFont fnt=font(); if ( mw->retMiniMode() ) -#ifdef Q_WS_HILDON - fnt.setPointSize ( 10 ); -#else fnt.setPointSize ( 9 ); -#endif setFont ( fnt ); setFocusPolicy ( Qt::NoFocus ); bool miniMode=mw->retMiniMode(); diff --git a/src/mediawidget.cpp b/src/mediawidget.cpp index e204bcd..78a91ba 100644 --- a/src/mediawidget.cpp +++ b/src/mediawidget.cpp @@ -38,13 +38,7 @@ MediaWidget::MediaWidget ( QString id, ONMainWindow * mw, QWidget * parent, Qt::WindowFlags f ) : ConfigWidget ( id,mw,parent,f ) { -#ifdef Q_WS_HILDON - QTabWidget* tabSettings=new QTabWidget ( this ); - QFrame* sbgr=new QFrame(); - tabSettings->addTab ( sbgr,tr ( "Sound" ) ); -#else sbgr=new QGroupBox ( tr ( "Sound" ),this ); -#endif QVBoxLayout *sndLay=new QVBoxLayout ( sbgr ); QHBoxLayout* sLay=new QHBoxLayout ( ); QVBoxLayout* sLay_sys=new QVBoxLayout ( ); diff --git a/src/ongetpass.cpp b/src/ongetpass.cpp index 6e8c4ee..8405ad4 100644 --- a/src/ongetpass.cpp +++ b/src/ongetpass.cpp @@ -51,14 +51,12 @@ int x2goMain ( int argc, char *argv[] ) { QApplication app ( argc,argv ); -#ifndef Q_WS_HILDON #ifdef Q_OS_LINUX #if QT_VERSION < 0x050000 app.setStyle ( new QPlastiqueStyle() ); #else app.setStyle ("fusion"); #endif -#endif #endif QStringList args; if ( argc > 1 ) diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index e63dcc5..af473de 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -401,7 +401,6 @@ void ONMainWindow::initUI() setCentralWidget ( fr ); -#ifndef Q_WS_HILDON // See if BGFile is a directory and retrieve an SVG file randomly from within QFileInfo bg_dir(BGFile); @@ -431,9 +430,6 @@ void ONMainWindow::initUI() bgFrame=new SVGFrame ( ( QString ) images_resource_path("/svg/bg.svg"),true,fr ); } } -#else - bgFrame=new SVGFrame ( ( QString ) images_resource_path("/svg/bg_hildon.svg"),true,fr ); -#endif //bgFrame=new SVGFrame((QString)"/home/admin/test.svg",false,fr); QString x2gologopath=images_resource_path("/svg/x2gologo.svg"); @@ -838,12 +834,10 @@ void ONMainWindow::initWidgetsNormal() u->hide(); QFont fnt=u->font(); fnt.setPointSize ( 16 ); -#ifndef Q_WS_HILDON if ( miniMode ) { fnt.setPointSize ( 12 ); } -#endif u->setFont ( fnt ); @@ -978,7 +972,7 @@ void ONMainWindow::initWidgetsNormal() { menu_sess->addAction ( act_new ); menu_sess->addAction ( act_edit ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) if ( !portable ) menu_sess->addAction ( act_sessicon ); #endif @@ -1005,7 +999,7 @@ void ONMainWindow::initWidgetsNormal() { stb->addAction ( act_new ); stb->addAction ( act_edit ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) if ( !portable ) stb->addAction ( act_sessicon ); #endif @@ -6992,18 +6986,6 @@ void ONMainWindow::slotProxyStderr() runCommand(); newSession=false; } -#ifdef Q_WS_HILDON - else - { - if ( !xmodExecuted ) - { - xmodExecuted=true; - QTimer::singleShot ( - 2000, this, - SLOT ( slotExecXmodmap() ) ); - } - } -#endif } if ( reserr.indexOf ( tr ( "Connection timeout, aborting" ) ) !=-1 ) @@ -7448,10 +7430,6 @@ void ONMainWindow::runCommand() QString, int )), true); } -#ifdef Q_WS_HILDON - //wait 5 seconds and execute xkbcomp - QTimer::singleShot ( 5000, this, SLOT ( slotExecXmodmap() ) ); -#endif } @@ -10188,51 +10166,6 @@ void ONMainWindow::addToAppNames ( QString intName, QString transName ) void ONMainWindow::slotExecXmodmap() { -#ifdef Q_WS_HILDON - QString passwd=getCurrentPass(); - QString user=getCurrentUname(); - QString host=resumingSession.server; - QString cmd; - - cmd="(xmodmap -pke ;" - "echo keycode 73= ;" -// "echo clear shift ;" -// "echo clear lock ;" -// "echo clear control ;" -// "echo clear mod1 ;" -// "echo clear mod2 ;" -// "echo clear mod3 ;" -// "echo clear mod4 ;" -// "echo clear mod5 ;" -// "echo add shift = Shift_L ;" - "echo add control = Control_R " -// "echo add mod5 = ISO_Level3_Shift" - ")| DISPLAY=:" - +resumingSession.display+" xmodmap - "; - - x2goDebug<<"Executing xmodmap with cmd: "<<cmd; - - SshProcess* xmodProc; - try - { - xmodProc=new SshProcess ( this,user,host,sshPort, - cmd, - passwd,currentKey,acceptRsa ); - } - catch ( QString message ) - { - return; - } - - if ( cardReady /*|| useSshAgent*/ ) - { - QStringList env=xmodProc->environment(); - env+=sshEnv; - xmodProc->setEnvironment ( env ); - } - xmodProc->setFwX ( true ); - xmodProc->startNormal(); -#endif } void ONMainWindow::check_cmd_status() @@ -10461,9 +10394,7 @@ void ONMainWindow::startX2goMount() QString cuser; -#ifdef Q_WS_HILDON - cuser="user"; -#elif defined (Q_OS_WIN) +#if defined (Q_OS_WIN) cuser=wapiGetUserName(); #else for ( int i=0; i<env.size(); ++i ) @@ -12611,11 +12542,7 @@ void ONMainWindow::initPassDlg() QFont fnt=passForm->font(); if ( miniMode ) -#ifdef Q_WS_HILDON - fnt.setPointSize ( 10 ); -#else fnt.setPointSize ( 9 ); -#endif passForm->setFont ( fnt ); fotoLabel=new QLabel ( passForm ); @@ -12696,19 +12623,8 @@ void ONMainWindow::initPassDlg() -#ifndef Q_WS_HILDON ok->setFixedSize ( ok->sizeHint() ); cancel->setFixedSize ( cancel->sizeHint() ); -#else - QSize sz=cancel->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() /1.5 ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - cancel->setFixedSize ( sz ); - sz=ok->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() /1.5 ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - ok->setFixedSize ( sz ); -#endif QVBoxLayout *layout=new QVBoxLayout ( passForm ); QHBoxLayout *labelLay=new QHBoxLayout(); @@ -12798,11 +12714,7 @@ void ONMainWindow::initStatusDlg() sessionStatusDlg->setFixedSize ( 310,200 ); QFont fnt=sessionStatusDlg->font(); if ( miniMode ) -#ifdef Q_WS_HILDON - fnt.setPointSize ( 10 ); -#else fnt.setPointSize ( 9 ); -#endif sessionStatusDlg->setFont ( fnt ); username->addWidget ( sessionStatusDlg ); QPalette pal=sessionStatusDlg->palette(); @@ -13000,11 +12912,7 @@ void ONMainWindow::initSelectSessDlg() QFont fnt=selectSessionDlg->font(); if ( miniMode ) -#ifdef Q_WS_HILDON - fnt.setPointSize ( 10 ); -#else fnt.setPointSize ( 9 ); -#endif selectSessionDlg->setFont ( fnt ); selectSessionLabel=new QLabel ( tr ( "Select session:" ), selectSessionDlg ); @@ -13057,29 +12965,8 @@ void ONMainWindow::initSelectSessDlg() SLOT ( slotCloseSelectDlg() ) ); selectSessionDlg->show(); -#ifndef Q_WS_HILDON sOk->setFixedSize ( ok->sizeHint() ); sCancel->setFixedSize ( cancel->sizeHint() ); -#else - QSize sz=sCancel->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() /1.5 ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - sCancel->setFixedSize ( sz ); - sz=sOk->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() /1.5 ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - sOk->setFixedSize ( sz ); - sz=bSusp->sizeHint(); - if ( bTerm->sizeHint().width() > sz.width() ) - sz=bTerm->sizeHint(); - if ( bNew->sizeHint().width() > sz.width() ) - sz=bNew->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() /1.5 ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - bSusp->setFixedSize ( sz ); - bTerm->setFixedSize ( sz ); - bNew->setFixedSize ( sz ); -#endif int bmaxw=bNew->size().width(); if ( bSusp->size().width() >bmaxw ) bmaxw=bSusp->size().width(); diff --git a/src/printprocess.cpp b/src/printprocess.cpp index 92e8549..9fa2b02 100644 --- a/src/printprocess.cpp +++ b/src/printprocess.cpp @@ -22,7 +22,7 @@ #include "x2gosettings.h" #include <QDir> #include "printdialog.h" -#if (!defined Q_OS_WIN) && (!defined Q_WS_HILDON) +#if (!defined Q_OS_WIN) #include "cupsprint.h" #else #include "printwidget.h" @@ -123,13 +123,6 @@ bool PrintProcess::loadSettings() winX2goPrinter= st.setting()->value ( "print/defaultprinter", wapiGetDefaultPrinter() ).toString(); -#endif -#ifdef Q_WS_HILDON - pdfOpenCmd="run-standalone.sh dbus-send --print-reply" - " --dest=com.nokia.osso_pdfviewer " - "/com/nokia/osso_pdfviewer " - "com.nokia.osso_pdfviewer.mime_open string:file://"; - viewPdf=true; #endif return true; @@ -142,11 +135,7 @@ void PrintProcess::openPdf() if ( pdfOpen ) { #ifndef Q_OS_WIN -#ifndef Q_WS_HILDON QString cmd=pdfOpenCmd+" \""+pdfFile+"\""; -#else - QString cmd=pdfOpenCmd+"\""+pdfFile+"\""; -#endif x2goDebug<<"Using PDF viewer command: "<<cmd; if ( ! QProcess::startDetached ( cmd ) ) slot_error ( QProcess::FailedToStart ); @@ -178,7 +167,6 @@ void PrintProcess::openPdf() void PrintProcess::print() { -#ifndef Q_WS_HILDON if ( !customPrintCmd ) { #ifndef Q_OS_WIN @@ -194,7 +182,6 @@ void PrintProcess::print() #endif } else -#endif //Q_WS_HILDON { if ( !printPs ) { diff --git a/src/printwidget.cpp b/src/printwidget.cpp index 940c0f1..33a0780 100644 --- a/src/printwidget.cpp +++ b/src/printwidget.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include "printwidget.h" -#if (!defined Q_OS_WIN) && (!defined Q_WS_HILDON) +#if (!defined Q_OS_WIN) #include "cupsprintwidget.h" #endif #include "printercmddialog.h" @@ -34,16 +34,7 @@ PrintWidget::PrintWidget ( QWidget* parent ) ui.rbPrint->setChecked ( true ); ui.gbView->setVisible ( false ); QVBoxLayout* lay= ( QVBoxLayout* ) ui.gbPrint->layout(); -#if (!defined Q_OS_WIN) && (!defined Q_WS_HILDON) - ui.cbWinPrinter->hide(); - ui.lWinPrinter->hide(); - ui.lWinInfo->hide(); - pwid=new CUPSPrintWidget ( ui.gbPrint ); - lay->insertWidget ( 0,pwid ); - connect ( ui.cbPrintCmd,SIGNAL ( toggled ( bool ) ),pwid, - SLOT ( setDisabled ( bool ) ) ); -#else -#ifdef Q_OS_WIN +#if defined (Q_OS_WIN) connect ( ui.cbPrintCmd,SIGNAL ( toggled ( bool ) ),ui.cbWinPrinter, SLOT ( setDisabled ( bool ) ) ); connect ( ui.cbPrintCmd,SIGNAL ( toggled ( bool ) ),ui.lWinPrinter, @@ -70,7 +61,14 @@ PrintWidget::PrintWidget ( QWidget* parent ) rtfm->setWordWrap ( true ); rtfm->setOpenExternalLinks ( true ); lay->insertWidget ( 6,rtfm ); -#endif +#else + ui.cbWinPrinter->hide(); + ui.lWinPrinter->hide(); + ui.lWinInfo->hide(); + pwid=new CUPSPrintWidget ( ui.gbPrint ); + lay->insertWidget ( 0,pwid ); + connect ( ui.cbPrintCmd,SIGNAL ( toggled ( bool ) ),pwid, + SLOT ( setDisabled ( bool ) ) ); #endif connect ( ui.pbPrintCmd,SIGNAL ( clicked() ),this, SLOT ( slot_editPrintCmd() ) ); @@ -85,13 +83,6 @@ PrintWidget::PrintWidget ( QWidget* parent ) ui.label->hide(); ui.leOpenCmd->hide(); #endif -#ifdef Q_WS_HILDON - ui.rbView->setChecked ( true ); - ui.rbPrint->hide(); - ui.rbView->hide(); - ui.label->hide(); - ui.leOpenCmd->hide(); -#endif } @@ -190,8 +181,7 @@ void PrintWidget::saveSettings() #ifdef Q_OS_WIN st.setting()->setValue ( "print/defaultprinter", QVariant ( ui.cbWinPrinter->currentText()) ); -#endif -#if (!defined Q_OS_WIN) && (!defined Q_WS_HILDON) +#else pwid->savePrinter(); #endif } diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp index d0c50fb..a2decf5 100644 --- a/src/sessionbutton.cpp +++ b/src/sessionbutton.cpp @@ -63,11 +63,7 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id ) QFont fnt=font(); if ( mw->retMiniMode() ) -#ifdef Q_WS_HILDON - fnt.setPointSize ( 10 ); -#else fnt.setPointSize ( 9 ); -#endif setFont ( fnt ); setFocusPolicy ( Qt::NoFocus ); bool miniMode=mw->retMiniMode(); @@ -169,7 +165,7 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id ) QIcon ( mw->iconsPath ( "/16x16/edit.png" ) ), tr ( "Session preferences ..." ) ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) act_createIcon=sessMenu->addAction ( QIcon ( mw->iconsPath ( "/16x16/create_file.png" ) ), tr ( @@ -185,7 +181,7 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id ) connect ( act_remove,SIGNAL ( triggered ( bool ) ),this, SLOT ( slotRemove() ) ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) connect ( act_createIcon,SIGNAL ( triggered ( bool ) ),this, SLOT ( slotCreateSessionIcon() ) ); #endif @@ -637,16 +633,12 @@ void SessionButton::redraw() } -#ifndef Q_WS_HILDON geomBox->addItem ( "1440x900" ); geomBox->addItem ( "1280x1024" ); geomBox->addItem ( "1024x768" ); geomBox->addItem ( "800x600" ); -#else - geomBox->addItem ( tr ( "window" ) ); -#endif if ( st->setting()->value ( sid+"/fullscreen", ( QVariant ) false ).toBool() ) { @@ -674,7 +666,6 @@ void SessionButton::redraw() } else { -#ifndef Q_WS_HILDON QString g=QString::number ( st->setting()->value ( sid+"/width" ).toInt() ); g+="x"+QString::number ( st->setting()->value ( @@ -683,10 +674,6 @@ void SessionButton::redraw() if ( geomBox->findText ( g ) ==-1 ) geomBox->addItem ( g ); geomBox->setCurrentIndex ( geomBox->findText ( g ) ); -#else - geom->setText ( tr ( "window" ) ); - geomBox->setCurrentIndex ( 1 ); -#endif } if (directRDP) @@ -1086,9 +1073,6 @@ void SessionButton::slot_geom_change ( const QString& new_g ) else { QString new_geom=new_g; -#ifdef Q_WS_HILDON - new_geom="800x600"; -#endif st.setting()->setValue ( sid+"/fullscreen", ( QVariant ) false ); st.setting()->setValue ( sid+"/multidisp", ( QVariant ) false ); st.setting()->setValue ( sid+"/maxdim", ( QVariant ) false ); diff --git a/src/sessionmanagedialog.cpp b/src/sessionmanagedialog.cpp index 02f749e..3deabdc 100644 --- a/src/sessionmanagedialog.cpp +++ b/src/sessionmanagedialog.cpp @@ -53,7 +53,7 @@ SessionManageDialog::SessionManageDialog ( QWidget * parent, QPushButton* newSession=new QPushButton ( tr ( "&New session" ),fr ); editSession=new QPushButton ( tr ( "&Session preferences" ),fr ); removeSession=new QPushButton ( tr ( "&Delete session" ),fr ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) if ( !ONMainWindow::getPortable() ) createSessionIcon=new QPushButton ( tr ( "&Create session icon on desktop ..." ),fr ); @@ -63,7 +63,7 @@ SessionManageDialog::SessionManageDialog ( QWidget * parent, par->iconsPath ( "/16x16/new_file.png" ) ) ); editSession->setIcon ( QIcon ( par->iconsPath ( "/16x16/edit.png" ) ) ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) if ( !ONMainWindow::getPortable() ) createSessionIcon->setIcon ( QIcon ( par->iconsPath ( "/16x16/create_file.png" ) ) ); @@ -75,7 +75,7 @@ SessionManageDialog::SessionManageDialog ( QWidget * parent, actLay->addWidget ( newSession ); actLay->addWidget ( editSession ); actLay->addWidget ( removeSession ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) if ( !ONMainWindow::getPortable() ) actLay->addWidget ( createSessionIcon ); #endif @@ -97,7 +97,7 @@ SessionManageDialog::SessionManageDialog ( QWidget * parent, connect ( removeSession,SIGNAL ( clicked() ),this,SLOT ( slot_delete() ) ); connect ( editSession,SIGNAL ( clicked() ),this,SLOT ( slot_edit() ) ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) if ( !ONMainWindow::getPortable() ) connect ( createSessionIcon,SIGNAL ( clicked() ), this,SLOT ( slot_createSessionIcon() ) ); @@ -146,7 +146,7 @@ void SessionManageDialog::loadSessions() removeSession->setEnabled ( false ); editSession->setEnabled ( false ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) if ( !ONMainWindow::getPortable() ) createSessionIcon->setEnabled ( false ); #endif @@ -216,7 +216,7 @@ void SessionManageDialog::slot_endisable ( QTreeWidgetItem* item, int col) removeSession->setEnabled ( isSess ); editSession->setEnabled ( isSess ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) if ( !ONMainWindow::getPortable() ) createSessionIcon->setEnabled ( isSess ); #endif diff --git a/src/sessionwidget.cpp b/src/sessionwidget.cpp index bef37e3..1c22942 100644 --- a/src/sessionwidget.cpp +++ b/src/sessionwidget.cpp @@ -43,9 +43,6 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw, : ConfigWidget ( id,mw,parent,f ) { QVBoxLayout* sessLay=new QVBoxLayout ( this ); -#ifdef Q_WS_HILDON - sessLay->setMargin ( 2 ); -#endif this->parent=mw; this->newSession=newSession; @@ -79,11 +76,7 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw, pathLay->addWidget(lPath,1); pathLay->addWidget(pathButton,0); -#ifndef Q_WS_HILDON QGroupBox *sgb=new QGroupBox ( tr ( "&Server" ),this ); -#else - QFrame* sgb=this; -#endif const QString ssh_port_tooltip_text = tr ("Values ranging from <b>0</b> to <b>65535</b> are allowed." "<br />A value of <b>0</b> will either use the port specified in the " "SSH configuration file belonging to a host or shortname, " @@ -104,18 +97,11 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw, #endif key=new QLineEdit ( sgb ); -#ifndef Q_WS_HILDON openKey=new QPushButton ( QIcon ( mainWindow->iconsPath ( "/32x32/file-open.png" ) ), QString::null,sgb ); QVBoxLayout *sgbLay = new QVBoxLayout ( sgb ); -#else - QPushButton* openKey=new QPushButton ( - QIcon ( mainWindow->iconsPath ( "/16x16/file-open.png" ) ), - QString::null,sgb ); - QVBoxLayout *sgbLay = new QVBoxLayout (); -#endif QHBoxLayout *suLay =new QHBoxLayout(); QVBoxLayout *slLay =new QVBoxLayout(); QVBoxLayout *elLay =new QVBoxLayout(); @@ -132,9 +118,6 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw, #endif suLay->addLayout ( slLay ); suLay->addLayout ( elLay ); -#ifdef Q_WS_HILDON - sshPort->setFixedHeight ( int ( sshPort->sizeHint().height() *1.5 ) ); -#endif QHBoxLayout *keyLay =new QHBoxLayout(); lKey=new QLabel ( tr ( "Use RSA/DSA key for ssh connection:" ),sgb ); @@ -199,14 +182,8 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw, proxyLaout->addWidget(cbProxyKrbLogin,5,3,1,3); -#ifndef Q_WS_HILDON QGroupBox *deskSess=new QGroupBox ( tr ( "&Session type" ),this ); QGridLayout* cmdLay=new QGridLayout ( deskSess ); -#else - QFrame* deskSess=this; - QHBoxLayout* cmdLay=new QHBoxLayout (); - cmdLay->addWidget ( new QLabel ( tr ( "Session type:" ),this ) ); -#endif cbKdrive=new QCheckBox(tr("Run in X2GoKDrive (experimental)")); sessBox=new QComboBox ( deskSess ); cmd=new QLineEdit ( deskSess ); @@ -246,7 +223,6 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw, cmdCombo->addItems ( mainWindow->transApplicationsNames() ); cmdCombo->lineEdit()->setText ( tr ( "Path to executable" ) ); cmdCombo->lineEdit()->selectAll(); -#ifndef Q_WS_HILDON sessLay->addLayout ( slay ); sessLay->addLayout ( ilay ); sessLay->addLayout ( pathLay ); @@ -261,24 +237,6 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw, connect(cbDirectRDP,SIGNAL(clicked()), this, SLOT(slot_rdpDirectClicked())); #endif -#else - QVBoxLayout* sHildILay = new QVBoxLayout(); - sHildILay->addLayout ( slay ); - sHildILay->addLayout ( ilay ); - sHildILay->addStretch(); - QHBoxLayout* sHildLay = new QHBoxLayout(); - sHildLay->addLayout ( sHildILay ); - - QFrame* vl=new QFrame; - vl->setLineWidth ( 0 ); - vl->setFrameStyle ( QFrame::VLine|QFrame::Plain ); - sHildLay->addWidget ( vl ); - sHildLay->setSpacing ( 6 ); - sHildLay->addLayout ( sgbLay ); - sessLay->addLayout ( sHildLay ); - sessLay->addStretch(); - sessLay->addLayout ( cmdLay ); -#endif sessLay->addStretch(); connect ( icon,SIGNAL ( clicked() ),this,SLOT ( slot_getIcon() ) ); diff --git a/src/settingswidget.cpp b/src/settingswidget.cpp index 5cca6e6..4c9d91f 100644 --- a/src/settingswidget.cpp +++ b/src/settingswidget.cpp @@ -39,17 +39,9 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw, : ConfigWidget ( id,mw,parent,f ) { multiDisp=(QApplication::desktop()->screenCount()>1); -#ifdef Q_WS_HILDON - QTabWidget* tabSettings=new QTabWidget ( this ); - QFrame* dgb=new QFrame(); - QFrame* kgb=new QFrame(); - tabSettings->addTab ( dgb, tr ( "&Display" ) ); - tabSettings->addTab ( kgb,tr ( "&Keyboard" ) ); -#else QGroupBox *dgb=new QGroupBox ( tr ( "&Display" ),this ); clipGr=new QGroupBox ( tr ( "&Clipboard mode" ),this ); kgb=new QGroupBox ( tr ( "&Keyboard" ),this ); -#endif QVBoxLayout *dbLay = new QVBoxLayout ( dgb ); QVBoxLayout *cbLay=new QVBoxLayout ( clipGr ); QHBoxLayout* sLay=new QHBoxLayout ( ); @@ -60,11 +52,7 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw, QVBoxLayout* setLay=new QVBoxLayout ( this ); QButtonGroup* radio = new QButtonGroup ( dgb ); fs=new QRadioButton ( tr ( "Fullscreen" ),dgb ); -#ifndef Q_WS_HILDON custom=new QRadioButton ( tr ( "Custom" ),dgb ); -#else - custom=new QRadioButton ( tr ( "Window" ),dgb ); -#endif display=new QRadioButton ( tr ( "Use whole display" ),dgb ); cbNoresize=new QCheckBox ( tr ( "Not resizable" ),dgb ); maxRes=new QRadioButton ( tr ( "Maximum available" ),dgb ); @@ -142,12 +130,6 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw, dbLay->addWidget ( dhl ); dbLay->addWidget ( cbXinerama ); -#ifdef Q_WS_HILDON - width->hide(); - height->hide(); - widthLabel->hide(); - heightLabel->hide(); -#endif #ifdef Q_OS_DARWIN kgb->hide(); @@ -197,7 +179,6 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw, kbLay->addWidget ( rbKbdSet); kbLay->addWidget( gbKbdString ); -#ifndef Q_WS_HILDON setLay->addWidget ( dgb ); setLay->addWidget ( clipGr ); setLay->addWidget ( kgb ); @@ -258,10 +239,6 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw, connect (xdmcpParams, SIGNAL(textChanged(QString)), this, SLOT(updateCmdLine())); #endif //CFGCLIENT #endif //Q_OS_LINUX -#else - setLay->addWidget ( tabSettings ); -// cbClientPrint->hide(); -#endif //Q_WS_HILDON setLay->addStretch(); connect ( custom,SIGNAL ( toggled ( bool ) ),width, diff --git a/src/sharewidget.cpp b/src/sharewidget.cpp index bd9e337..76d9aad 100644 --- a/src/sharewidget.cpp +++ b/src/sharewidget.cpp @@ -63,14 +63,6 @@ ShareWidget::ShareWidget ( QString id, ONMainWindow * mw, QPushButton* addDir=new QPushButton ( tr ( "Add" ),egb ); QPushButton* delDir=new QPushButton ( tr ( "Delete" ),egb ); -#ifdef Q_WS_HILDON - QSize sz=addDir->sizeHint(); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - addDir->setFixedSize ( sz ); - sz=delDir->sizeHint(); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - delDir->setFixedSize ( sz ); -#endif QLabel *dirPrompt=new QLabel ( tr ( "Path:" ),egb ); dirPrompt->setFixedSize ( dirPrompt->sizeHint() ); diff --git a/src/x2goclientconfig.h b/src/x2goclientconfig.h index 3bb9aeb..ced8590 100644 --- a/src/x2goclientconfig.h +++ b/src/x2goclientconfig.h @@ -36,8 +36,4 @@ #undef USELDAP #endif -#if defined Q_WS_HILDON -#undef USELDAP -#endif - #endif -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git