[X2Go-Commits] [x2goclient] 01/01: Add new cmdline option --hide-foldersharing. If used, all GUI elements related to exporting client-side folders to X2Go sessions get hidden. (Fixes: #514).

git-admin at x2go.org git-admin at x2go.org
Sat Jun 28 23:33:08 CEST 2014


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

x2go pushed a commit to branch master
in repository x2goclient.

commit 0ebe95fc2fa15a61ccbe4b66cb7b225fefd20e14
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Jun 28 23:31:43 2014 +0200

    Add new cmdline option --hide-foldersharing. If used, all GUI elements related to exporting client-side folders to X2Go sessions get hidden. (Fixes: #514).
---
 debian/changelog         |    3 +++
 editconnectiondialog.cpp |    4 ++--
 man/man1/x2goclient.1    |    3 +++
 onmainwindow.cpp         |   13 +++++++++++--
 onmainwindow.h           |    5 +++++
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ff288f4..3fa1904 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ x2goclient (4.0.2.1-0x2go1) UNRELEASED; urgency=low
       For SSHd startup failures provide different messages on Windows
       and non-Windows machines. (Fixes: #235).
       FIXME: add detection code to report SSH daemon startup failures.
+    - Add new cmdline option --hide-foldersharing. If used, all GUI
+      elements related to exporting client-side folders to X2Go sessions
+      get hidden. (Fixes: #514).
   * debian/control:
     + Add dbg:package x2goplugin-dbg.
 
diff --git a/editconnectiondialog.cpp b/editconnectiondialog.cpp
index d2b784d..0769e3b 100644
--- a/editconnectiondialog.cpp
+++ b/editconnectiondialog.cpp
@@ -54,11 +54,11 @@ EditConnectionDialog::EditConnectionDialog ( QString id, QWidget * par,
     otherSet=new SettingsWidget ( id,parent );
     exportDir=new ShareWidget ( id,parent );
 
-
     fr->addTab ( sessSet,tr ( "&Session" ) );
     fr->addTab ( conSet,tr ( "&Connection" ) );
     fr->addTab ( otherSet,tr ( "&Settings" ) );
-    fr->addTab ( exportDir,tr ( "&Shared folders" ) );
+    if (! parent->getHideFolderSharing())
+        fr->addTab ( exportDir,tr ( "&Shared folders" ) );
 
     QPushButton* ok=new QPushButton ( tr ( "&OK" ),this );
     QPushButton* cancel=new QPushButton ( tr ( "&Cancel" ),this );
diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1
index 5338900..5860810 100644
--- a/man/man1/x2goclient.1
+++ b/man/man1/x2goclient.1
@@ -40,6 +40,9 @@ Switch the tray icon to the session's icon on successful session startup/resumpt
 Show tray icon (default: false). This option overrides the global tray icon settings and also forces the tray icon
 to be shown in hidden X2Go Client mode.
 .TP
+\*(T<\fB\-\-hide-foldersharing\fR\*(T>
+Hide all elements in X2Go Client GUI that are related to folder sharing.
+.TP
 \*(T<\fB\-\-client-ssh-port\fR\*(T>
 Local ssh port (for filesystem export, default: 22).
 .TP
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 534e744..d4fef23 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -71,6 +71,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
     startMaximized=false;
     startHidden=false;
     keepTrayIcon=false;
+    hideFolderSharing=false;
     thinMode=false;
     closeDisconnect=false;
     showHaltBtn=false;
@@ -1084,7 +1085,8 @@ void ONMainWindow::trayIconInit()
             appSeparator=trayIconActiveConnectionMenu->addSeparator();
 
 
-            trayIconActiveConnectionMenu->addAction(tr ("Share folder..." ),this, SLOT(slotExportDirectory()));
+            if (!hideFolderSharing)
+                trayIconActiveConnectionMenu->addAction(tr ("Share folder..." ),this, SLOT(slotExportDirectory()));
             trayIconActiveConnectionMenu->addAction(tr("Suspend"),this, SLOT(slotSuspendSessFromSt()));
             trayIconActiveConnectionMenu->addAction(tr("Terminate"),this, SLOT(slotTermSessFromSt()));
             connect (trayIconActiveConnectionMenu, SIGNAL(triggered(QAction*)), this,
@@ -6693,6 +6695,11 @@ bool ONMainWindow::parseParameter ( QString param )
         keepTrayIcon=true;
         return true;
     }
+    if ( param=="--hide-foldersharing" )
+    {
+        hideFolderSharing=true;
+        return true;
+    }
     if ( param=="--pgp-card" )
     {
         usePGPCard=true;
@@ -7296,6 +7303,7 @@ void ONMainWindow::showHelp()
         "--session-conf=<file>\t\t path to alternative session config\n"
         "--tray-icon\t\t\t force to show session trayicon\n"
         "--close-disconnect\t\t close X2Go Client after disconnect\n";
+        "--hide-foldersharing\t\t\t hide all folder sharing related options\n";
 
     qCritical ( "%s",helpMsg.toLocal8Bit().data() );
     if (!startHidden && !haveTerminal)
@@ -11083,7 +11091,8 @@ void ONMainWindow::initStatusDlg()
     {
         sbSusp->show();
         sbTerm->show();
-        sbExp->show();
+        if (! hideFolderSharing )
+            sbExp->show();
     }
 
     X2goSettings st ( "settings" );
diff --git a/onmainwindow.h b/onmainwindow.h
index a7bb3d1..1764993 100644
--- a/onmainwindow.h
+++ b/onmainwindow.h
@@ -492,6 +492,10 @@ public:
     {
         return sessionCfg;
     }
+    bool getHideFolderSharing()
+    {
+        return hideFolderSharing;
+    }
 
     void runApplication(QString exec);
 
@@ -549,6 +553,7 @@ private:
     bool closeDisconnect;
     bool startHidden;
     bool keepTrayIcon;
+    bool hideFolderSharing;
     bool defaultUseSound;
     bool defaultXinerama;
     bool cardStarted;

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


More information about the x2go-commits mailing list