This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 6cf765e change search string for pcsc_scan. new e62ad22 misc: update version to 4.1.2.0. new f0a3ab4 res/img/svg: add new lxqt.svg icon file (really helix.svg). new 746e449 res/img/icons/*x*: add new rasterized lxqt.png files in different sizes. new f931d5f res/qresources.qrc: add new lxqt files. new cb365f8 src/{onmainwindow.cpp,session{button,widget}.{cpp,h}}: add support for LXQt. Fixes: #1263. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: VERSION | 2 +- debian/changelog | 15 +- man/man1/x2goclient.1 | 2 +- res/img/icons/128x128/lxqt.png | Bin 0 -> 4919 bytes res/img/icons/16x16/lxqt.png | Bin 0 -> 771 bytes res/img/icons/22x22/lxqt.png | Bin 0 -> 966 bytes res/img/icons/32x32/lxqt.png | Bin 0 -> 1377 bytes res/img/icons/48x48/lxqt.png | Bin 0 -> 1910 bytes res/img/icons/64x64/lxqt.png | Bin 0 -> 2521 bytes res/img/svg/lxqt.svg | 212 ++++++++++++++++++++++++++ res/resources.qrc | 6 + src/onmainwindow.cpp | 4 + src/sessionbutton.cpp | 16 ++ src/sessionbutton.h | 2 +- src/sessionwidget.cpp | 6 + src/sessionwidget.h | 2 +- src/version.h | 2 +- x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc | 10 +- x2goclient.spec | 2 +- 19 files changed, 267 insertions(+), 14 deletions(-) create mode 100644 res/img/icons/128x128/lxqt.png create mode 100644 res/img/icons/16x16/lxqt.png create mode 100644 res/img/icons/22x22/lxqt.png create mode 100644 res/img/icons/32x32/lxqt.png create mode 100644 res/img/icons/48x48/lxqt.png create mode 100644 res/img/icons/64x64/lxqt.png create mode 100644 res/img/svg/lxqt.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 e62ad2250c2556a5fb48a1b436f6f37f610c72a1 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Mar 3 01:08:42 2018 +0100 misc: update version to 4.1.2.0. --- VERSION | 2 +- debian/changelog | 10 +++++++--- man/man1/x2goclient.1 | 2 +- src/version.h | 2 +- x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc | 10 +++++----- x2goclient.spec | 2 +- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/VERSION b/VERSION index 7a96213..92efd39 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.1.2 +4.1.2.0 diff --git a/debian/changelog b/debian/changelog index a00635b..9f0a590 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ -x2goclient (4.1.1.2-0x2go1) UNRELEASED; urgency=medium +x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium [ Mike DePaulo ] - * New upstream version (4.1.1.2): + * New upstream version (4.1.2.0): - src/sshmasterconnection.cpp: Do not attempt to perform Interaction with SSH Server (e.g. for changing expired password) when using GSSAPI/Kerberos because the interaction code does not support it yet. @@ -13,10 +13,14 @@ x2goclient (4.1.1.2-0x2go1) UNRELEASED; urgency=medium x2goclient was copied/extracted to a folder where users could write. [ Oleksandr Shneyder ] - * New upstream version (4.1.1.2): + * New upstream version (4.1.2.0): - don't start gpg agent for PGP card authentication. Use system agent instead. - change search string for pcsc_scan. + [ Mihai Moldovan ] + * New upstream version (4.1.2.0): + - misc: update version to 4.1.2.0. + -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 22:01:32 +0100 x2goclient (4.1.1.1-0x2go1) unstable; urgency=medium diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1 index f3a905c..91c7595 100644 --- a/man/man1/x2goclient.1 +++ b/man/man1/x2goclient.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goclient 1 "Feb 2018" "Version 4.1.1.2" "X2Go Client (Qt4)" +.TH x2goclient 1 "Mar 2018" "Version 4.1.2.0" "X2Go Client (Qt4)" .SH NAME x2goclient \- Client application to launch server-side X2Go sessions. .SH SYNOPSIS diff --git a/src/version.h b/src/version.h index 921ec89..a788b52 100644 --- a/src/version.h +++ b/src/version.h @@ -19,6 +19,6 @@ #ifndef VERSION_H #define VERSION_H -#define VERSION "4.1.1.2" +#define VERSION "4.1.2.0" #endif /* !defined (VERSION_H) */ diff --git a/x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc b/x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc index e671341..c037281 100644 --- a/x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc +++ b/x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 4.1.1.2 - PRODUCTVERSION 4.1.1.2 + FILEVERSION 4.1.2.0 + PRODUCTVERSION 4.1.2.0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "4, 1, 1, 2\0" + VALUE "FileVersion", "4, 1, 2, 0\0" VALUE "InternalName", "x2goplugin\0" VALUE "LegalCopyright", "Copyright � 2010-2018 X2Go Project\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 4.1.1.2\0" - VALUE "ProductVersion", "4, 1, 1, 2\0" + VALUE "ProductName", "X2GoClient Plug-in 4.1.2.0\0" + VALUE "ProductVersion", "4, 1, 2, 0\0" END END BLOCK "VarFileInfo" diff --git a/x2goclient.spec b/x2goclient.spec index 0fbe047..248720b 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -1,5 +1,5 @@ Name: x2goclient -Version: 4.1.1.2 +Version: 4.1.2.0 Release: 0.0x2go1%{?dist} Summary: X2Go Client application (Qt4) -- 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 f0a3ab411d7f8485877a87287983119d2dae853f Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Mar 3 02:54:05 2018 +0100 res/img/svg: add new lxqt.svg icon file (really helix.svg). --- debian/changelog | 1 + res/img/svg/lxqt.svg | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 213 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9f0a590..b771065 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * New upstream version (4.1.2.0): - misc: update version to 4.1.2.0. + - res/img/svg: add new lxqt.svg icon file (really helix.svg). -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 22:01:32 +0100 diff --git a/res/img/svg/lxqt.svg b/res/img/svg/lxqt.svg new file mode 100644 index 0000000..90d73cc --- /dev/null +++ b/res/img/svg/lxqt.svg @@ -0,0 +1,212 @@ +<?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="48" + height="48" + id="svg2" + version="1.1" + inkscape:version="0.48.4 r9939" + sodipodi:docname="lxqt_icon_base_48.svg" + inkscape:export-filename="./lxqt_icon_48.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + style="enable-background:new"> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="17.291667" + inkscape:cx="24" + inkscape:cy="23.508434" + inkscape:document-units="px" + inkscape:current-layer="layer2" + showgrid="true" + borderlayer="true" + inkscape:showpageshadow="false" + inkscape:snap-bbox="true" + inkscape:snap-page="true" + inkscape:window-width="1920" + inkscape:window-height="1029" + inkscape:window-x="0" + inkscape:window-y="-3" + inkscape:window-maximized="1" + showguides="true" + inkscape:object-paths="false" + inkscape:object-nodes="true" + inkscape:snap-nodes="true" + inkscape:guide-bbox="true" + inkscape:bbox-paths="false" + inkscape:snap-bbox-edge-midpoints="false" + inkscape:snap-smooth-nodes="false" + inkscape:bbox-nodes="true" + inkscape:snap-global="true" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:snap-grids="true"> + <inkscape:grid + type="xygrid" + id="grid3064" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" + originx="0px" + originy="0px" /> + </sodipodi:namedview> + <title + id="title4078">LXQt</title> + <defs + id="defs4"> + <inkscape:path-effect + effect="spiro" + id="path-effect3250-6" + is_visible="true" /> + <inkscape:path-effect + is_visible="true" + id="path-effect3252-9" + effect="spiro" /> + <inkscape:path-effect + effect="spiro" + id="path-effect3254-3" + is_visible="true" /> + <inkscape:path-effect + effect="spiro" + id="path-effect3260-0" + is_visible="true" /> + </defs> + <metadata + id="metadata7"> + <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>LXQt</dc:title> + <dc:creator> + <cc:Agent> + <dc:title>Giacomo Barazzetti</dc:title> + </cc:Agent> + </dc:creator> + <cc:license + rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/by-sa/3.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Notice" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Attribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#ShareAlike" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Logo" + transform="translate(-575.98291,-747.48535)" + style="display:inline" + sodipodi:insensitive="true"> + <flowRoot + xml:space="preserve" + id="flowRoot3012" + style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:FontAwesome;-inkscape-font-specification:FontAwesome" + transform="translate(-249.22717,-823.47169)"><flowRegion + id="flowRegion3014"><rect + id="rect3016" + width="213" + height="137" + x="927" + y="1114" /></flowRegion><flowPara + id="flowPara3018" /></flowRoot> <g + id="g3156" + transform="matrix(0.5,0,0,0.5,362.48291,357.98535)"> + <rect + y="885" + x="427" + height="64" + width="64" + id="rect3020" + style="fill:#0192d3;fill-opacity:1;fill-rule:nonzero;stroke:none" /> + <rect + style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="rect3790" + width="64" + height="64" + x="493" + y="885" /> + </g> + <g + id="g3015" + transform="matrix(1.4999887,0,0,1.4999887,-287.98458,-397.73385)"> + <path + style="fill:#000000;fill-opacity:1;stroke:none" + d="m 590.02939,773.13729 c -0.81437,-0.7694 -1.38897,-1.7891 -1.62526,-2.88425 -0.2363,-1.09514 -0.13329,-2.26104 0.29137,-3.29779 0.42466,-1.03675 1.16915,-1.9399 2.10581,-2.55459 0.93666,-0.61469 2.06149,-0.93829 3.1816,-0.91531 1.05715,0.0217 2.1062,0.35108 2.986,0.9376 0.87979,0.58651 1.58736,1.42815 2.014,2.39563 l 9,2.00001 -10.82845,0 c -0.60283,-0.99501 -1.64039,-1.71583 -2.7832,-1.93359 -0.78578,-0.14973 -1.61441,-0.0668 -2.35494,0.23565 -0.74053,0.30246 -1.39027,0.8233 [...] + id="path3149-8" + inkscape:connector-curvature="0" + sodipodi:nodetypes="czccczc" + inkscape:path-effect="#path-effect3250-6" + inkscape:original-d="m 590.02939,773.13729 c 0,0 1.33345,-9.70978 3.95352,-9.65194 2.62008,0.0578 5,3.33323 5,3.33323 l 9,2.00001 -10.82845,0 c 0,0 -0.78008,-1.64818 -2.7832,-1.93359 -2.00313,-0.28541 -4.34187,6.25228 -4.34187,6.25229 z" /> + <g + id="g3159-3" + transform="matrix(0.12018167,0,0,0.1200873,457.60196,570.49248)"> + <path + sodipodi:nodetypes="ccscscc" + inkscape:connector-curvature="0" + inkscape:original-d="m 1109.8277,1715.3593 -108.1695,-91.6 c 0,0 -32.05931,23.0006 -16.64152,41.6364 21.44112,25.9164 60.00362,58.6556 60.00362,58.6556 0,0 -15.3698,-10.3696 -32.8222,-34.8525 -5.5412,-7.7734 6.1015,-23.8031 6.1015,-23.8031 z" + inkscape:path-effect="#path-effect3252-9" + id="path3151-3" + d="m 1109.8277,1715.3593 -108.1695,-91.6 c -10.65928,11.0168 -16.77082,26.3076 -16.64152,41.6364 0.13113,15.5453 6.68678,30.9394 17.80352,41.8064 11.1168,10.867 26.6558,17.0713 42.2001,16.8492 -8.5449,-1.178 -16.646,-5.3565 -22.5596,-11.6359 -5.9137,-6.2794 -9.5989,-14.6165 -10.2626,-23.2166 -0.6416,-8.3148 1.5391,-16.8222 6.1015,-23.8031 l 91.5281,49.9636" + style="fill:#0192d3;fill-opacity:1;stroke:none" /> + <path + style="fill:#0192d3;fill-opacity:1;stroke:none" + d="m 1101.507,1740.3412 -108.16958,-33.3091 c -2.89063,11.0071 -2.00508,22.969 2.47486,33.4305 4.47992,10.4614 12.52632,19.3569 22.48732,24.8604 7.6018,4.2 16.2773,6.4373 24.9622,6.4373 8.6849,0 17.3604,-2.2373 24.9622,-6.4373 -6.9916,0.631 -14.1373,-0.5277 -20.5712,-3.3359 -6.4339,-2.8081 -12.1424,-7.2597 -16.4338,-12.8153 -4.9547,-6.4144 -7.9929,-14.2903 -8.6296,-22.3704 l 78.9176,13.5398" + id="path3153-6" + inkscape:path-effect="#path-effect3254-3" + inkscape:original-d="m 1101.507,1740.3412 -108.16958,-33.3091 c 0,0 9.50158,49.2208 24.96218,58.2909 21.5007,12.6135 49.9244,0 49.9244,0 0,0 -18.6455,-3.5249 -37.005,-16.1512 -5.8293,-4.009 -8.6296,-22.3704 -8.6296,-22.3704 z" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccscscc" /> + </g> + <path + inkscape:original-d="m 596.02149,772.15231 c -0.20578,0.41295 -0.92889,1.71142 -1.03858,2.33304 -0.55403,3.13948 2.50023,6.81369 2.03855,9.42993 -0.46167,2.61625 -2.52725,3.03066 -6.03855,4.57007 -1.67769,0.73552 -2.94139,-0.78949 -5,-1 -1.12654,1.57378 0.0386,8 0.0386,8 0,0 0.85977,-3.1376 2,-3.9785 3.4633,0.44857 5.7433,0.50326 7.9614,-1.0215 3.60545,-2.40175 4.0386,-3.82719 4.0386,-6.82937 0,-3.00218 -4.015,-7.43791 -4.015,-11.04053 0,-0.15414 0.007,-0.31997 0.015,-0.4635 z" + inkscape:path-effect="#path-effect3260-0" + sodipodi:nodetypes="ccssccccsscc" + inkscape:connector-curvature="0" + id="path3155-5" + d="m 596.02149,772.15231 c -0.55774,0.65831 -0.92265,1.47805 -1.03858,2.33304 -0.10946,0.8073 -1.2e-4,1.6321 0.21372,2.41822 0.21385,0.78612 0.53033,1.53985 0.84297,2.29217 0.31263,0.75231 0.62335,1.50891 0.8249,2.29827 0.20154,0.78936 0.29157,1.61778 0.15696,2.42127 -0.22515,1.34391 -1.08188,2.53858 -2.20014,3.31722 -1.11826,0.77865 -2.47867,1.16405 -3.83841,1.25285 -1.71571,0.11205 -3.45936,-0.23668 -5,-1 l 0.0386,8 2,-3.9785 c 2.64226,0.77198 5.59962,0.39253 7.9614,-1.0215 1. [...] + style="fill:#0192d3;fill-opacity:1;stroke:none" /> + </g> + <flowRoot + xml:space="preserve" + id="flowRoot3012-8" + style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:FontAwesome;-inkscape-font-specification:FontAwesome" + transform="translate(-167.24424,-710.91942)"><flowRegion + id="flowRegion3014-8"><rect + id="rect3016-2" + width="213" + height="137" + x="927" + y="1114" /></flowRegion><flowPara + id="flowPara3018-1" /></flowRoot> </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 f931d5f70bebf5c3aa3cc984b9a5f35a7aa9fc12 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Mar 3 03:04:37 2018 +0100 res/qresources.qrc: add new lxqt files. --- debian/changelog | 1 + res/resources.qrc | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 90541e3..88e8de8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium - misc: update version to 4.1.2.0. - res/img/svg: add new lxqt.svg icon file (really helix.svg). - res/img/icons/*x*: add new rasterized lxqt.png files in different sizes. + - res/qresources.qrc: add new lxqt files. -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 22:01:32 +0100 diff --git a/res/resources.qrc b/res/resources.qrc index c59f74d..7c62e21 100644 --- a/res/resources.qrc +++ b/res/resources.qrc @@ -11,6 +11,7 @@ <file>img/svg/folder_grey.svg</file> <file>img/svg/sessionbut_grey.svg</file> <file>img/svg/hamburger.svg</file> + <file>img/svg/lxqt.svg</file> <file>img/png/ico.png</file> <file>img/png/ico_mini.png</file> <file>img/png/sess_ico.png</file> @@ -22,12 +23,14 @@ <file>img/icons/128x128/x2gosession.png</file> <file>img/icons/128x128/create_file.png</file> <file>img/icons/128x128/lxde.png</file> + <file>img/icons/128x128/lxqt.png</file> <file>img/icons/128x128/preferences.png</file> <file>img/icons/128x128/rdp.png</file> <file>img/icons/64x64/audio.png</file> <file>img/icons/64x64/personal.png</file> <file>img/icons/64x64/create_file.png</file> <file>img/icons/64x64/lxde.png</file> + <file>img/icons/64x64/lxqt.png</file> <file>img/icons/64x64/preferences.png</file> <file>img/icons/64x64/rdp.png</file> <file>img/icons/32x32/edit.png</file> @@ -37,6 +40,7 @@ <file>img/icons/32x32/new_file.png</file> <file>img/icons/32x32/create_file.png</file> <file>img/icons/32x32/lxde.png</file> + <file>img/icons/32x32/lxqt.png</file> <file>img/icons/32x32/preferences.png</file> <file>img/icons/32x32/rdp.png</file> <file>img/icons/32x32/reconnect.png</file> @@ -75,6 +79,7 @@ <file>img/icons/16x16/X.png</file> <file>img/icons/16x16/create_file.png</file> <file>img/icons/16x16/lxde.png</file> + <file>img/icons/16x16/lxqt.png</file> <file>img/icons/16x16/preferences.png</file> <file>img/icons/16x16/rdp.png</file> <file>img/icons/22x22/applications-development.png</file> @@ -88,6 +93,7 @@ <file>img/icons/22x22/applications-system.png</file> <file>img/icons/22x22/applications-utilities.png</file> <file>img/icons/22x22/preferences-system.png</file> + <file>img/icons/22x22/lxqt.png</file> <file>txt/packs</file> <file>txt/encodings</file> <file>i18n/x2goclient_da.qm</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 746e44935ec9571728cb3376387b2548bf328cfd Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Mar 3 03:03:48 2018 +0100 res/img/icons/*x*: add new rasterized lxqt.png files in different sizes. --- debian/changelog | 1 + res/img/icons/128x128/lxqt.png | Bin 0 -> 4919 bytes res/img/icons/16x16/lxqt.png | Bin 0 -> 771 bytes res/img/icons/22x22/lxqt.png | Bin 0 -> 966 bytes res/img/icons/32x32/lxqt.png | Bin 0 -> 1377 bytes res/img/icons/48x48/lxqt.png | Bin 0 -> 1910 bytes res/img/icons/64x64/lxqt.png | Bin 0 -> 2521 bytes 7 files changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index b771065..90541e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium * New upstream version (4.1.2.0): - misc: update version to 4.1.2.0. - res/img/svg: add new lxqt.svg icon file (really helix.svg). + - res/img/icons/*x*: add new rasterized lxqt.png files in different sizes. -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 22:01:32 +0100 diff --git a/res/img/icons/128x128/lxqt.png b/res/img/icons/128x128/lxqt.png new file mode 100644 index 0000000..9e84d53 Binary files /dev/null and b/res/img/icons/128x128/lxqt.png differ diff --git a/res/img/icons/16x16/lxqt.png b/res/img/icons/16x16/lxqt.png new file mode 100644 index 0000000..661c65d Binary files /dev/null and b/res/img/icons/16x16/lxqt.png differ diff --git a/res/img/icons/22x22/lxqt.png b/res/img/icons/22x22/lxqt.png new file mode 100644 index 0000000..2950f9c Binary files /dev/null and b/res/img/icons/22x22/lxqt.png differ diff --git a/res/img/icons/32x32/lxqt.png b/res/img/icons/32x32/lxqt.png new file mode 100644 index 0000000..adc5d58 Binary files /dev/null and b/res/img/icons/32x32/lxqt.png differ diff --git a/res/img/icons/48x48/lxqt.png b/res/img/icons/48x48/lxqt.png new file mode 100644 index 0000000..c28fea5 Binary files /dev/null and b/res/img/icons/48x48/lxqt.png differ diff --git a/res/img/icons/64x64/lxqt.png b/res/img/icons/64x64/lxqt.png new file mode 100644 index 0000000..034c611 Binary files /dev/null and b/res/img/icons/64x64/lxqt.png differ -- 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 cb365f8f5254373ec1bddb86222c12a9d325e721 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Mar 3 03:09:06 2018 +0100 src/{onmainwindow.cpp,session{button,widget}.{cpp,h}}: add support for LXQt. Fixes: #1263. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 4 ++++ src/sessionbutton.cpp | 16 ++++++++++++++++ src/sessionbutton.h | 2 +- src/sessionwidget.cpp | 6 ++++++ src/sessionwidget.h | 2 +- 6 files changed, 30 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 88e8de8..e42b685 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium - res/img/svg: add new lxqt.svg icon file (really helix.svg). - res/img/icons/*x*: add new rasterized lxqt.png files in different sizes. - res/qresources.qrc: add new lxqt files. + - src/{onmainwindow.cpp,session{button,widget}.{cpp,h}}: add support for + LXQt. Fixes: #1263. -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 22:01:32 +0100 diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 2bf2223..892b904 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -7066,6 +7066,10 @@ void ONMainWindow::SlotRunCommand(bool, QString output, int) { command="startlxde"; } + else if (command == "LXQt") + { + command = "startlxqt"; + } // Note that there are multiple possible Cinnamon commands that the server // may call. else if ( command=="CINNAMON" ) diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp index c3d9e25..f9bf371 100644 --- a/src/sessionbutton.cpp +++ b/src/sessionbutton.cpp @@ -376,6 +376,7 @@ void SessionButton::redraw() cmdBox->addItem ( "KDE" ); cmdBox->addItem ( "GNOME" ); cmdBox->addItem ( "LXDE" ); + cmdBox->addItem ("LXQt"); cmdBox->addItem ( "XFCE" ); cmdBox->addItem ( "MATE" ); cmdBox->addItem ( "UNITY" ); @@ -422,6 +423,11 @@ void SessionButton::redraw() cmdpix.load ( par->iconsPath ( "/16x16/lxde.png" ) ); cmdBox->setCurrentIndex ( LXDE ); } + else if (command == "LXQt") + { + cmdpix.load (par->iconsPath ("/16x16/lxqt.png")); + cmdBox->setCurrentIndex (LXQt); + } else if ( command == "CINNAMON" ) { cmdpix.load ( par->iconsPath ( "/16x16/cinnamon.png" ) ); @@ -791,6 +797,11 @@ void SessionButton::slot_cmd_change ( const QString& command ) newRootless=false; pix.load ( par->iconsPath ( "/16x16/lxde.png" ) ); } + else if (command == "LXQt") + { + newRootless = false; + pix.load (par->iconsPath ("/16x16/lxqt.png")); + } else if ( command =="UNITY" ) { newRootless=false; @@ -866,6 +877,11 @@ void SessionButton::slot_cmd_change ( const QString& command ) cmd="LXDE"; newRootless=false; } + if (command == "LXQt") + { + cmd = "LXQt"; + newRootless = false; + } if ( command=="unity" ) { cmd="UNITY"; diff --git a/src/sessionbutton.h b/src/sessionbutton.h index 8e86c8b..fd9101a 100644 --- a/src/sessionbutton.h +++ b/src/sessionbutton.h @@ -32,7 +32,7 @@ class SessionButton : public SVGFrame { Q_OBJECT public: - enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,CINNAMON,TRINITY,OPENBOX,ICEWM,RDP,XDMCP,SHADOW,PUBLISHED,OTHER,APPLICATION}; + enum {KDE,GNOME,LXDE, LXQt, XFCE,MATE,UNITY,CINNAMON,TRINITY,OPENBOX,ICEWM,RDP,XDMCP,SHADOW,PUBLISHED,OTHER,APPLICATION}; SessionButton ( ONMainWindow* mw, QWidget* parent,QString id ); ~SessionButton(); QString id() { diff --git a/src/sessionwidget.cpp b/src/sessionwidget.cpp index 766d3cc..97e310e 100644 --- a/src/sessionwidget.cpp +++ b/src/sessionwidget.cpp @@ -214,6 +214,7 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw, sessBox->addItem ( "KDE" ); sessBox->addItem ( "GNOME" ); sessBox->addItem ( "LXDE" ); + sessBox->addItem ("LXQt"); sessBox->addItem ( "XFCE" ); sessBox->addItem ( "MATE" ); sessBox->addItem ( "UNITY" ); @@ -743,6 +744,11 @@ void SessionWidget::readConfig() sessBox->setCurrentIndex ( LXDE ); cmd->setEnabled ( false ); } + else if (command == "LXQt") + { + sessBox->setCurrentIndex (LXQt); + cmd->setEnabled (false); + } else if ( command=="UNITY" ) { sessBox->setCurrentIndex ( UNITY ); diff --git a/src/sessionwidget.h b/src/sessionwidget.h index 5eda2a1..e30e00e 100644 --- a/src/sessionwidget.h +++ b/src/sessionwidget.h @@ -59,7 +59,7 @@ public slots: #endif private: - enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,CINNAMON,TRINITY,OPENBOX,ICEWM,RDP,XDMCP,SHADOW,OTHER,APPLICATION,PUBLISHED}; + enum {KDE,GNOME,LXDE, LXQt, XFCE,MATE,UNITY,CINNAMON,TRINITY,OPENBOX,ICEWM,RDP,XDMCP,SHADOW,OTHER,APPLICATION,PUBLISHED}; QLineEdit* sessName; QLineEdit* uname; QLineEdit* server; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org