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