[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.0-24-g130088a

X2Go dev team git-admin at x2go.org
Fri Jun 7 22:02:25 CEST 2013


The branch, master has been updated
       via  130088ae6f2151265b955230b74c537e03e93dfc (commit)
      from  5bcfbeba7660328543370bcbd4b72bc33add5238 (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 -----------------------------------------------------------------
commit 130088ae6f2151265b955230b74c537e03e93dfc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jun 7 22:02:21 2013 +0200

    Show session name in notification bubbles.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    1 +
 onmainwindow.cpp |   19 +++++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1274d75..35fdcae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low
       method when in broker mode. (Fixes: #226).
     - Fix segmentation fault that started occurring since the custom trayIcon
       patch was applied. Segfault only occurred if the tray icon was not used.
+    - Show session name in notification bubbles.
 
   [ Ezra Bühler ]
   * New upstream version (4.0.1.1):
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 68e7e4a..c2fdeea 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -3929,9 +3929,6 @@ void ONMainWindow::startNewSession()
     sshConnection->executeCommand ( cmd, this, SLOT ( slotRetResumeSess ( bool,
                                     QString,int ) ) );
     passForm->hide();
-
-    //change the trayicon picture
-    setTrayIconToSessionIcon(tr("Creating new session..."));
 }
 
 
@@ -4172,10 +4169,6 @@ void ONMainWindow::resumeSession ( const x2goSession& s )
                                     int ) ));
     resumingSession=s;
     passForm->hide();
-
-    //change the trayicon picture
-    setTrayIconToSessionIcon(tr("Restoring session..."));
-
 }
 
 /**
@@ -4207,8 +4200,10 @@ void ONMainWindow::setTrayIconToSessionIcon(QString info) {
         QString imagePath = st->setting()->value(sid + "/icon", (QVariant) QString(":icons/128x128/x2go.png")).toString();
         trayIcon->setIcon(QIcon (imagePath));
 
+        QString name=st->setting()->value ( sid +"/name").toString() ;
+
         //send a information notification about the connection is done
-        trayIcon->showMessage(tr("X2Go"), tr ("Established connection\n") + info, QSystemTrayIcon::Information, 15000);
+        trayIcon->showMessage("X2Go - " + name, info, QSystemTrayIcon::Information, 15000);
     }
 
 }
@@ -4836,6 +4831,10 @@ void ONMainWindow::slotRetResumeSess ( bool result,
                                "0|"+
                                resumingSession.fsPort;
         }
+
+        //change the trayicon picture
+        setTrayIconToSessionIcon(tr("New session started") + ":" + resumingSession.sessionId);
+
     }
     else
     {
@@ -4867,6 +4866,10 @@ void ONMainWindow::slotRetResumeSess ( bool result,
         }
         if (resumingSession.published)
             readApplications();
+
+        //change the trayicon picture
+        setTrayIconToSessionIcon(tr("Session resumed") + ": " + resumingSession.sessionId);
+
     }
     if ( !useLdap )
     {


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