This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 3b9d793018d6e9c9ef1fe74fdc9784d1d0765aff Author: Mike DePaulo <mikedep333@gmail.com> Date: Thu Oct 2 21:29:08 2014 -0400 Make X2Go Client aware of the IceWM (ICEWM) window manager. (Fixes: #608) --- debian/changelog | 2 ++ icons/16x16/icewm.png | Bin 0 -> 538 bytes onmainwindow.cpp | 4 ++++ resources.rcc | 1 + sessionbutton.cpp | 11 +++++++++++ sessionbutton.h | 2 +- sessionwidget.cpp | 1 + sessionwidget.h | 2 +- x2goclient.pro | 2 +- 9 files changed, 22 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 174dfcd..9502be0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,8 @@ x2goclient (4.0.3.0-0x2go1) UNRELEASED; urgency=low (Fixes: #609) - Make X2Go Client aware of the Openbox (OPENBOX) window manager. (Fixes: #607) + - Make X2Go Client aware of the IceWM (ICEWM) window manager. + (Fixes: #608) - Windows: Fix not being able to add the server to the known_hosts file when the username has non-English characters. (Fixes: #566) (NOTE: This fix only works when the non-English characters are in the same diff --git a/icons/16x16/icewm.png b/icons/16x16/icewm.png new file mode 100644 index 0000000..195920e Binary files /dev/null and b/icons/16x16/icewm.png differ diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 1d2bd8f..7fe7501 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -6201,6 +6201,10 @@ void ONMainWindow::runCommand() { command="openbox-session"; } + else if ( command=="ICEWM" ) + { + command="icewm-session"; + } else if ( command=="RDP" ) { command="rdesktop "; diff --git a/resources.rcc b/resources.rcc index 54d7c84..6c818ae 100644 --- a/resources.rcc +++ b/resources.rcc @@ -64,6 +64,7 @@ <file>icons/16x16/cinnamon.png</file> <file>icons/16x16/trinity.png</file> <file>icons/16x16/openbox.png</file> + <file>icons/16x16/icewm.png</file> <file>icons/16x16/new_file.png</file> <file>icons/16x16/resolution.png</file> <file>icons/16x16/session.png</file> diff --git a/sessionbutton.cpp b/sessionbutton.cpp index e59d69e..414d860 100644 --- a/sessionbutton.cpp +++ b/sessionbutton.cpp @@ -360,6 +360,7 @@ void SessionButton::redraw() cmdBox->addItem ( "CINNAMON" ); cmdBox->addItem ( "TRINITY" ); cmdBox->addItem ( "OPENBOX" ); + cmdBox->addItem ( "ICEWM" ); cmdBox->addItem ( tr ( "RDP connection" ) ); cmdBox->addItem ( tr ( "XDMCP" ) ); cmdBox->addItem ( tr ( "Connection to local desktop" ) ); @@ -414,6 +415,11 @@ void SessionButton::redraw() cmdpix.load ( par->iconsPath ( "/16x16/openbox.png" ) ); cmdBox->setCurrentIndex ( OPENBOX ); } + else if ( command == "ICEWM" ) + { + cmdpix.load ( par->iconsPath ( "/16x16/icewm.png" ) ); + cmdBox->setCurrentIndex ( ICEWM ); + } else if ( command =="SHADOW" ) { cmdpix.load ( par->iconsPath ( "/16x16/X.png" ) ); @@ -738,6 +744,11 @@ void SessionButton::slot_cmd_change ( const QString& command ) newRootless=false; pix.load ( par->iconsPath ( "/16x16/openbox.png" ) ); } + else if ( command == "ICEWM" ) + { + newRootless=false; + pix.load ( par->iconsPath ( "/16x16/icewm.png" ) ); + } else if ( command ==tr ( "Connection to local desktop" ) ) { newRootless=false; diff --git a/sessionbutton.h b/sessionbutton.h index 30e5474..cf7e52b 100644 --- a/sessionbutton.h +++ b/sessionbutton.h @@ -32,7 +32,7 @@ class SessionButton : public SVGFrame { Q_OBJECT public: - enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,CINNAMON,TRINITY,OPENBOX,RDP,XDMCP,SHADOW,PUBLISHED,OTHER,APPLICATION}; + enum {KDE,GNOME,LXDE,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/sessionwidget.cpp b/sessionwidget.cpp index b77374f..293720d 100644 --- a/sessionwidget.cpp +++ b/sessionwidget.cpp @@ -212,6 +212,7 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw, sessBox->addItem ( "CINNAMON" ); sessBox->addItem ( "TRINITY" ); sessBox->addItem ( "OPENBOX" ); + sessBox->addItem ( "ICEWM" ); sessBox->addItem ( tr ( "Connect to Windows terminal server" ) ); sessBox->addItem ( tr ( "XDMCP" ) ); sessBox->addItem ( tr ( "Connect to local desktop" ) ); diff --git a/sessionwidget.h b/sessionwidget.h index d481028..47bac75 100644 --- a/sessionwidget.h +++ b/sessionwidget.h @@ -59,7 +59,7 @@ public slots: #endif private: - enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,CINNAMON,TRINITY,OPENBOX,RDP,XDMCP,SHADOW,OTHER,APPLICATION,PUBLISHED}; + enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,CINNAMON,TRINITY,OPENBOX,ICEWM,RDP,XDMCP,SHADOW,OTHER,APPLICATION,PUBLISHED}; QLineEdit* sessName; QLineEdit* uname; QLineEdit* server; diff --git a/x2goclient.pro b/x2goclient.pro index e6eee01..7bae04c 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -8,7 +8,7 @@ CONFIG += $$(X2GO_CLIENT_TARGET) CONFIG += $$(X2GO_LINUX_STATIC) -#CONFIG += console +CONFIG += console FORMS += cupsprintsettingsdialog.ui \ cupsprintwidget.ui \ -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git