[X2Go-Commits] x2goclient.git - build-main (branch) updated: 4.0.1.0-42-g468be3a
X2Go dev team
git-admin at x2go.org
Wed Sep 11 12:06:56 CEST 2013
The branch, build-main has been updated
via 468be3aa8d457ec4bc429e76f4c26f4bbf27f0d0 (commit)
from 76560c573b75e35a4ceb37e8b441d96747a688c1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
icons/16x16/mate.png | Bin 0 -> 774 bytes
onmainwindow.cpp | 4 ++++
resources.rcc | 1 +
sessionbutton.cpp | 16 ++++++++++++++++
sessionbutton.h | 2 +-
sessionwidget.cpp | 1 +
sessionwidget.h | 2 +-
8 files changed, 25 insertions(+), 2 deletions(-)
create mode 100644 icons/16x16/mate.png
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e23849e..475caf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low
X2Go Session Broker after a session has been suspended or terminated.
(Fixes: #179).
- Enable full access desktop sharing across user accounts. (Fixes: #222).
+ - Make X2Go Client aware of the MATE desktop environment.
[ Heinrich Schuchardt ]
* New upstream version (4.0.1.1):
diff --git a/icons/16x16/mate.png b/icons/16x16/mate.png
new file mode 100644
index 0000000..0a34149
Binary files /dev/null and b/icons/16x16/mate.png differ
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index e1af9c6..8399b04 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -6031,6 +6031,10 @@ void ONMainWindow::runCommand()
{
command="xfce4-session";
}
+ else if ( command=="MATE" )
+ {
+ command="mate-session";
+ }
else if ( command=="LXDE" )
{
command="startlxde";
diff --git a/resources.rcc b/resources.rcc
index 50782f8..cc74d72 100644
--- a/resources.rcc
+++ b/resources.rcc
@@ -56,6 +56,7 @@
<file>icons/16x16/gnome.png</file>
<file>icons/16x16/unity.png</file>
<file>icons/16x16/xfce.png</file>
+ <file>icons/16x16/mate.png</file>
<file>icons/16x16/kde.png</file>
<file>icons/16x16/new_file.png</file>
<file>icons/16x16/resolution.png</file>
diff --git a/sessionbutton.cpp b/sessionbutton.cpp
index 65351bc..5204093 100644
--- a/sessionbutton.cpp
+++ b/sessionbutton.cpp
@@ -344,6 +344,7 @@ void SessionButton::redraw()
cmdBox->addItem ( "GNOME" );
cmdBox->addItem ( "LXDE" );
cmdBox->addItem ( "XFCE" );
+ cmdBox->addItem ( "MATE" );
cmdBox->addItem ( "UNITY" );
cmdBox->addItem ( tr ( "RDP connection" ) );
cmdBox->addItem ( tr ( "XDMCP" ) );
@@ -374,6 +375,11 @@ void SessionButton::redraw()
cmdpix.load ( par->iconsPath ( "/16x16/xfce.png" ) );
cmdBox->setCurrentIndex ( XFCE );
}
+ else if ( command == "MATE" )
+ {
+ cmdpix.load ( par->iconsPath ( "/16x16/mate.png" ) );
+ cmdBox->setCurrentIndex ( MATE );
+ }
else if ( command =="LXDE" )
{
cmdpix.load ( par->iconsPath ( "/16x16/lxde.png" ) );
@@ -682,6 +688,11 @@ void SessionButton::slot_cmd_change ( const QString& command )
newRootless=false;
pix.load ( par->iconsPath ( "/16x16/xfce.png" ) );
}
+ else if ( command == "MATE" )
+ {
+ newRootless=false;
+ pix.load ( par->iconsPath ( "/16x16/mate.png" ) );
+ }
else if ( command ==tr ( "Connection to local desktop" ) )
{
newRootless=false;
@@ -730,6 +741,11 @@ void SessionButton::slot_cmd_change ( const QString& command )
cmd="XFCE";
newRootless=false;
}
+ if ( command=="mate-session" )
+ {
+ cmd="MATE";
+ newRootless=false;
+ }
if (command== tr("Published applications"))
{
published=true;
diff --git a/sessionbutton.h b/sessionbutton.h
index bef550b..1cb5b14 100644
--- a/sessionbutton.h
+++ b/sessionbutton.h
@@ -32,7 +32,7 @@ class SessionButton : public SVGFrame
{
Q_OBJECT
public:
- enum {KDE,GNOME,LXDE,XFCE,UNITY,RDP,XDMCP,SHADOW,PUBLISHED,OTHER,APPLICATION};
+ enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,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 c78eb0c..62b7ea4 100644
--- a/sessionwidget.cpp
+++ b/sessionwidget.cpp
@@ -188,6 +188,7 @@ SessionWidget::SessionWidget ( QString id, ONMainWindow * mw,
sessBox->addItem ( "GNOME" );
sessBox->addItem ( "LXDE" );
sessBox->addItem ( "XFCE" );
+ sessBox->addItem ( "MATE" );
sessBox->addItem ( "UNITY" );
sessBox->addItem ( tr ( "Connect to Windows terminal server" ) );
sessBox->addItem ( tr ( "XDMCP" ) );
diff --git a/sessionwidget.h b/sessionwidget.h
index fe2240a..b8e7b1f 100644
--- a/sessionwidget.h
+++ b/sessionwidget.h
@@ -57,7 +57,7 @@ public slots:
#endif
private:
- enum {KDE,GNOME,LXDE,XFCE,UNITY,RDP,XDMCP,SHADOW,OTHER,APPLICATION,PUBLISHED};
+ enum {KDE,GNOME,LXDE,XFCE,MATE,UNITY,RDP,XDMCP,SHADOW,OTHER,APPLICATION,PUBLISHED};
QLineEdit* sessName;
QLineEdit* uname;
QLineEdit* server;
hooks/post-receive
--
x2goclient.git (X2Go Client)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).
More information about the x2go-commits
mailing list