[X2Go-Commits] [x2goclient] 01/01: Support for sessions folders and commandline options "--session" and "--sessionid".

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 83b3dec0b5ce2d7328b8917fc11761af7c26f13b
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Thu Aug 14 13:44:07 2014 +0200

    Support for sessions folders and commandline options "--session" and "--sessionid".
---
 debian/changelog        |    2 ++
 onmainwindow.cpp        |   11 +++++++++--
 sessionbutton.h         |    4 ----
 sessionmanagedialog.cpp |    4 ++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e974475..cce31b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ x2goclient (4.0.3.0-0x2go1) UNRELEASED; urgency=low
     - Add folder explorer - GUI to management of sessions folders.
     - Support for sessions folders in sessionmanagedialog.
     - Session name autocomplition only for sessions in current folder.
+    - Support for sessions folders and commandline options "--session"
+      and "--sessionid".
 
   [ Mike DePaulo ]
   * New upstream release (4.0.3.0):
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 9ea6817..e544408 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -2154,6 +2154,8 @@ void ONMainWindow::slotReadSessions()
             {
                 if ( sessionExplorer->getSessionsList()->at(i)->id() ==defaultSessionId )
                 {
+                    sessionExplorer->setCurrrentPath(sessionExplorer->getSessionsList()->at(i)->getPath());
+                    sessionExplorer->placeButtons();
                     sfound=true;
                     slotSelectedFromList ( sessionExplorer->getSessionsList()->at(i) );
                     break;
@@ -2162,12 +2164,17 @@ void ONMainWindow::slotReadSessions()
         }
         else
         {
+            QString normalDefaultSName=defaultSessionName.split("/",QString::SkipEmptyParts).join("/");
             for ( int i=0; i<sessionExplorer->getSessionsList()->size(); ++i )
             {
-                if ( sessionExplorer->getSessionsList()->at(i)->name() ==defaultSessionName )
+                QString normalName=(sessionExplorer->getSessionsList()->at(i)->getPath()+"/"+sessionExplorer->getSessionsList()->at(i)->name());
+                normalName=normalName.split("/",QString::SkipEmptyParts).join("/");
+                if ( normalName == normalDefaultSName )
                 {
+                    sessionExplorer->setCurrrentPath(sessionExplorer->getSessionsList()->at(i)->getPath());
+                    sessionExplorer->placeButtons();
                     sfound=true;
-                    uname->setText ( defaultSessionName );
+                    uname->setText ( sessionExplorer->getSessionsList()->at(i)->name() );
                     QTimer::singleShot (
                         100, this,
                         SLOT ( slotUnameEntered() ) );
diff --git a/sessionbutton.h b/sessionbutton.h
index e153438..6a39648 100644
--- a/sessionbutton.h
+++ b/sessionbutton.h
@@ -48,10 +48,6 @@ public:
     {
         return path;
     }
-    QString getName()
-    {
-        return sessName->text();
-    }
     void setPath(QString path)
     {
         this->path=path;
diff --git a/sessionmanagedialog.cpp b/sessionmanagedialog.cpp
index f88245b..fccd168 100644
--- a/sessionmanagedialog.cpp
+++ b/sessionmanagedialog.cpp
@@ -179,9 +179,9 @@ void SessionManageDialog::initFolders(QTreeWidgetItem* parent, QString path)
         if(s->getPath()==path)
         {
             QTreeWidgetItem* it=new QTreeWidgetItem(parent);
-            it->setText(0,s->getName());
+            it->setText(0,s->name());
             it->setIcon(0, QIcon(*(s->sessIcon())));
-            QString normPath=(s->getPath()+"/"+s->getName()).split("/",QString::SkipEmptyParts).join("/");
+            QString normPath=(s->getPath()+"/"+s->name()).split("/",QString::SkipEmptyParts).join("/");
             it->setData(0,Qt::UserRole, normPath+"/");
             it->setData(0, SESSIONROLE, true);
             it->setData(0, SESSIONIDROLE, i);

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git