This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 5bfc5712f6387705d2a2a38941650c659bfcb887 Author: Mike DePaulo <mikedep333@gmail.com> Date: Thu Oct 2 21:01:24 2014 -0400 Make X2Go Client aware of the Openbox (OPENBOX) window manager. (Fixes: #607) --- debian/changelog | 2 ++ icons/16x16/openbox.png | Bin 0 -> 360 bytes onmainwindow.cpp | 4 ++++ resources.rcc | 1 + sessionbutton.cpp | 11 +++++++++++ sessionbutton.h | 2 +- sessionwidget.cpp | 1 + sessionwidget.h | 2 +- 8 files changed, 21 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 095cddf..174dfcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,6 +49,8 @@ x2goclient (4.0.3.0-0x2go1) UNRELEASED; urgency=low (Fixes: #571) - Make X2Go Client aware of the Trinity (TRINITY) desktop environment. (Fixes: #609) + - Make X2Go Client aware of the Openbox (OPENBOX) window manager. + (Fixes: #607) - 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/openbox.png b/icons/16x16/openbox.png new file mode 100644 index 0000000..ee9bdf6 Binary files /dev/null and b/icons/16x16/openbox.png differ diff --git a/onmainwindow.cpp b/onmainwindow.cpp index e2af8f4..1d2bd8f 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -6197,6 +6197,10 @@ void ONMainWindow::runCommand() { command="starttrinity"; } + else if ( command=="OPENBOX" ) + { + command="openbox-session"; + } else if ( command=="RDP" ) { command="rdesktop "; diff --git a/resources.rcc b/resources.rcc index c63e096..54d7c84 100644 --- a/resources.rcc +++ b/resources.rcc @@ -63,6 +63,7 @@ <file>icons/16x16/kde.png</file> <file>icons/16x16/cinnamon.png</file> <file>icons/16x16/trinity.png</file> + <file>icons/16x16/openbox.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 7cbd0ba..e59d69e 100644 --- a/sessionbutton.cpp +++ b/sessionbutton.cpp @@ -359,6 +359,7 @@ void SessionButton::redraw() cmdBox->addItem ( "UNITY" ); cmdBox->addItem ( "CINNAMON" ); cmdBox->addItem ( "TRINITY" ); + cmdBox->addItem ( "OPENBOX" ); cmdBox->addItem ( tr ( "RDP connection" ) ); cmdBox->addItem ( tr ( "XDMCP" ) ); cmdBox->addItem ( tr ( "Connection to local desktop" ) ); @@ -408,6 +409,11 @@ void SessionButton::redraw() cmdpix.load ( par->iconsPath ( "/16x16/trinity.png" ) ); cmdBox->setCurrentIndex ( TRINITY ); } + else if ( command == "OPENBOX" ) + { + cmdpix.load ( par->iconsPath ( "/16x16/openbox.png" ) ); + cmdBox->setCurrentIndex ( OPENBOX ); + } else if ( command =="SHADOW" ) { cmdpix.load ( par->iconsPath ( "/16x16/X.png" ) ); @@ -727,6 +733,11 @@ void SessionButton::slot_cmd_change ( const QString& command ) newRootless=false; pix.load ( par->iconsPath ( "/16x16/trinity.png" ) ); } + else if ( command == "OPENBOX" ) + { + newRootless=false; + pix.load ( par->iconsPath ( "/16x16/openbox.png" ) ); + } else if ( command ==tr ( "Connection to local desktop" ) ) { newRootless=false; diff --git a/sessionbutton.h b/sessionbutton.h index 23f8699..30e5474 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,RDP,XDMCP,SHADOW,PUBLISHED,OTHER,APPLICATION}; + enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,CINNAMON,TRINITY,OPENBOX,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 6a4bae4..b77374f 100644 --- a/sessionwidget.cpp +++ b/sessionwidget.cpp @@ -211,6 +211,7 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw, sessBox->addItem ( "UNITY" ); sessBox->addItem ( "CINNAMON" ); sessBox->addItem ( "TRINITY" ); + sessBox->addItem ( "OPENBOX" ); 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 6a155fa..d481028 100644 --- a/sessionwidget.h +++ b/sessionwidget.h @@ -59,7 +59,7 @@ public slots: #endif private: - enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,CINNAMON,TRINITY,RDP,XDMCP,SHADOW,OTHER,APPLICATION,PUBLISHED}; + enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,CINNAMON,TRINITY,OPENBOX,RDP,XDMCP,SHADOW,OTHER,APPLICATION,PUBLISHED}; QLineEdit* sessName; QLineEdit* uname; QLineEdit* server; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git