This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 5a41174 add bug closure for #571 (commit: #fe20a0f) new 2da9216 Make X2Go Client aware of the Trinity (TRINITY) desktop environment. (Fixes: #609) new 08c5b56 Remove execute permissions from 16x16 cinnamon.png and trinity.png The 2 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 | 2 ++ icons/16x16/cinnamon.png | Bin 505 -> 505 bytes icons/16x16/trinity.png | Bin 0 -> 748 bytes onmainwindow.cpp | 4 ++++ resources.rcc | 1 + sessionbutton.cpp | 11 +++++++++++ sessionbutton.h | 2 +- sessionwidget.cpp | 1 + sessionwidget.h | 2 +- 9 files changed, 21 insertions(+), 2 deletions(-) mode change 100755 => 100644 icons/16x16/cinnamon.png create mode 100644 icons/16x16/trinity.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 2da9216d8404eca73ea7646aa04f17766dfa179d Author: Mike DePaulo <mikedep333@gmail.com> Date: Thu Oct 2 20:09:51 2014 -0400 Make X2Go Client aware of the Trinity (TRINITY) desktop environment. (Fixes: #609) --- debian/changelog | 2 ++ icons/16x16/trinity.png | Bin 0 -> 748 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 2005df2..095cddf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,8 @@ x2goclient (4.0.3.0-0x2go1) UNRELEASED; urgency=low * New upstream release (4.0.3.0): - Make X2Go Client aware of the Cinnamon (CINNAMON) desktop environment. (Fixes: #571) + - Make X2Go Client aware of the Trinity (TRINITY) desktop environment. + (Fixes: #609) - 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/trinity.png b/icons/16x16/trinity.png new file mode 100755 index 0000000..bd29520 Binary files /dev/null and b/icons/16x16/trinity.png differ diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 0daae0c..e2af8f4 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -6193,6 +6193,10 @@ void ONMainWindow::runCommand() { command="cinnamon-session"; } + else if ( command=="TRINITY" ) + { + command="starttrinity"; + } else if ( command=="RDP" ) { command="rdesktop "; diff --git a/resources.rcc b/resources.rcc index 0001d61..c63e096 100644 --- a/resources.rcc +++ b/resources.rcc @@ -62,6 +62,7 @@ <file>icons/16x16/mate.png</file> <file>icons/16x16/kde.png</file> <file>icons/16x16/cinnamon.png</file> + <file>icons/16x16/trinity.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 a43debc..7cbd0ba 100644 --- a/sessionbutton.cpp +++ b/sessionbutton.cpp @@ -358,6 +358,7 @@ void SessionButton::redraw() cmdBox->addItem ( "MATE" ); cmdBox->addItem ( "UNITY" ); cmdBox->addItem ( "CINNAMON" ); + cmdBox->addItem ( "TRINITY" ); cmdBox->addItem ( tr ( "RDP connection" ) ); cmdBox->addItem ( tr ( "XDMCP" ) ); cmdBox->addItem ( tr ( "Connection to local desktop" ) ); @@ -402,6 +403,11 @@ void SessionButton::redraw() cmdpix.load ( par->iconsPath ( "/16x16/cinnamon.png" ) ); cmdBox->setCurrentIndex ( CINNAMON ); } + else if ( command == "TRINITY" ) + { + cmdpix.load ( par->iconsPath ( "/16x16/trinity.png" ) ); + cmdBox->setCurrentIndex ( TRINITY ); + } else if ( command =="SHADOW" ) { cmdpix.load ( par->iconsPath ( "/16x16/X.png" ) ); @@ -716,6 +722,11 @@ void SessionButton::slot_cmd_change ( const QString& command ) // gear, which is the default start menu icon as of 2.2. pix.load ( par->iconsPath ( "/16x16/cinnamon.png" ) ); } + else if ( command == "TRINITY" ) + { + newRootless=false; + pix.load ( par->iconsPath ( "/16x16/trinity.png" ) ); + } else if ( command ==tr ( "Connection to local desktop" ) ) { newRootless=false; diff --git a/sessionbutton.h b/sessionbutton.h index e932caa..23f8699 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,RDP,XDMCP,SHADOW,PUBLISHED,OTHER,APPLICATION}; + enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,CINNAMON,TRINITY,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 d9327b5..6a4bae4 100644 --- a/sessionwidget.cpp +++ b/sessionwidget.cpp @@ -210,6 +210,7 @@ SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw, sessBox->addItem ( "MATE" ); sessBox->addItem ( "UNITY" ); sessBox->addItem ( "CINNAMON" ); + sessBox->addItem ( "TRINITY" ); 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 4d6dd2e..6a155fa 100644 --- a/sessionwidget.h +++ b/sessionwidget.h @@ -59,7 +59,7 @@ public slots: #endif private: - enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,CINNAMON,RDP,XDMCP,SHADOW,OTHER,APPLICATION,PUBLISHED}; + enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,CINNAMON,TRINITY,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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 08c5b56de4131d8ca7db384cc50a42073a8117e6 Author: Mike DePaulo <mikedep333@gmail.com> Date: Thu Oct 2 20:11:12 2014 -0400 Remove execute permissions from 16x16 cinnamon.png and trinity.png --- icons/16x16/cinnamon.png | Bin 505 -> 505 bytes icons/16x16/trinity.png | Bin 748 -> 748 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/16x16/cinnamon.png b/icons/16x16/cinnamon.png old mode 100755 new mode 100644 diff --git a/icons/16x16/trinity.png b/icons/16x16/trinity.png old mode 100755 new mode 100644 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git