This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from abdb4d5 add bug closure for #580 (commit: 5e48b9c) new fe20a0f Make X2Go Client aware of the Cinnamon (CINNAMON) desktop environment. The 1 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: debian/changelog | 1 + icons/16x16/cinnamon.png | Bin 0 -> 505 bytes onmainwindow.cpp | 6 ++++++ resources.rcc | 1 + sessionbutton.cpp | 18 ++++++++++++++++++ sessionbutton.h | 2 +- sessionwidget.cpp | 1 + sessionwidget.h | 2 +- 8 files changed, 29 insertions(+), 2 deletions(-) create mode 100755 icons/16x16/cinnamon.png -- Alioth's /srv/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 fe20a0f00190cf5880de31a53a102310a91a52d6 Author: Mike DePaulo <mikedep333@gmail.com> Date: Thu Oct 2 09:09:34 2014 -0400 Make X2Go Client aware of the Cinnamon (CINNAMON) desktop environment. --- debian/changelog | 1 + icons/16x16/cinnamon.png | Bin 0 -> 505 bytes onmainwindow.cpp | 6 ++++++ resources.rcc | 1 + sessionbutton.cpp | 18 ++++++++++++++++++ sessionbutton.h | 2 +- sessionwidget.cpp | 1 + sessionwidget.h | 2 +- 8 files changed, 29 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 33708d5..3ce94db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,7 @@ x2goclient (4.0.3.0-0x2go1) UNRELEASED; urgency=low [ Mike DePaulo ] * New upstream release (4.0.3.0): + - Make X2Go Client aware of the Cinnamon (CINNAMON) desktop environment. - 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/cinnamon.png b/icons/16x16/cinnamon.png new file mode 100755 index 0000000..282d371 Binary files /dev/null and b/icons/16x16/cinnamon.png differ diff --git a/onmainwindow.cpp b/onmainwindow.cpp index b792f06..0daae0c 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -6187,6 +6187,12 @@ void ONMainWindow::runCommand() { command="startlxde"; } + // Note that there are multiple possible Cinnamon commands that the server + // may call. + else if ( command=="CINNAMON" ) + { + command="cinnamon-session"; + } else if ( command=="RDP" ) { command="rdesktop "; diff --git a/resources.rcc b/resources.rcc index 8bed6c3..0001d61 100644 --- a/resources.rcc +++ b/resources.rcc @@ -61,6 +61,7 @@ <file>icons/16x16/xfce.png</file> <file>icons/16x16/mate.png</file> <file>icons/16x16/kde.png</file> + <file>icons/16x16/cinnamon.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 3091b11..a43debc 100644 --- a/sessionbutton.cpp +++ b/sessionbutton.cpp @@ -357,6 +357,7 @@ void SessionButton::redraw() cmdBox->addItem ( "XFCE" ); cmdBox->addItem ( "MATE" ); cmdBox->addItem ( "UNITY" ); + cmdBox->addItem ( "CINNAMON" ); cmdBox->addItem ( tr ( "RDP connection" ) ); cmdBox->addItem ( tr ( "XDMCP" ) ); cmdBox->addItem ( tr ( "Connection to local desktop" ) ); @@ -396,6 +397,11 @@ void SessionButton::redraw() cmdpix.load ( par->iconsPath ( "/16x16/lxde.png" ) ); cmdBox->setCurrentIndex ( LXDE ); } + else if ( command == "CINNAMON" ) + { + cmdpix.load ( par->iconsPath ( "/16x16/cinnamon.png" ) ); + cmdBox->setCurrentIndex ( CINNAMON ); + } else if ( command =="SHADOW" ) { cmdpix.load ( par->iconsPath ( "/16x16/X.png" ) ); @@ -703,6 +709,13 @@ void SessionButton::slot_cmd_change ( const QString& command ) newRootless=false; pix.load ( par->iconsPath ( "/16x16/mate.png" ) ); } + else if ( command == "CINNAMON" ) + { + newRootless=false; + // As of 2014-10-01, Cinnamon does not have a logo. This icon is the + // gear, which is the default start menu icon as of 2.2. + pix.load ( par->iconsPath ( "/16x16/cinnamon.png" ) ); + } else if ( command ==tr ( "Connection to local desktop" ) ) { newRootless=false; @@ -756,6 +769,11 @@ void SessionButton::slot_cmd_change ( const QString& command ) cmd="MATE"; newRootless=false; } + if ( command=="cinnamon-session" ) + { + cmd="CINNAMON"; + newRootless=false; + } if (command== tr("Published applications")) { published=true; diff --git a/sessionbutton.h b/sessionbutton.h index 6a39648..e932caa 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,RDP,XDMCP,SHADOW,PUBLISHED,OTHER,APPLICATION}; + enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,CINNAMON,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 668676c..d9327b5 100644 --- a/sessionwidget.cpp +++ b/sessionwidget.cpp @@ -209,6 +209,7 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw, sessBox->addItem ( "XFCE" ); sessBox->addItem ( "MATE" ); sessBox->addItem ( "UNITY" ); + sessBox->addItem ( "CINNAMON" ); 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 94ef4e3..4d6dd2e 100644 --- a/sessionwidget.h +++ b/sessionwidget.h @@ -59,7 +59,7 @@ public slots: #endif private: - enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,RDP,XDMCP,SHADOW,OTHER,APPLICATION,PUBLISHED}; + enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,CINNAMON,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
-
git-admin＠x2go.org