This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 8ee5979 src/onmainwindow.cpp: supply xinerama option as another parameter to x2goresume-session on session resume. new 0da3f0a src/sessionbutton.cpp: make button non-sensitive in bottom right part if it's editable. Fixes: #1214. new d01d65b res/img/png/: add close-button.png file. new e5ae6b9 {src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: add new option --closebt. Fixes: #1227. new a3f3211 {src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: reformat, whitespace fixes, split out close button slot in a separate function. new 7b3bca1 src/onmainwindow.{cpp,h}: let close button be a member variable. new 3060183 src/onmainwindow.cpp: disable and enable close button during and after connection startup. new 7fcf0c8 src/onmainwindow.cpp: initialize directRDP to false to be able to call slotSuspendSessFromSt () even if no session has previously been started. The 7 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 | 17 +++++++++++++ man/man1/x2goclient.1 | 4 ++++ res/img/png/close-button.png | Bin 0 -> 1069 bytes res/resources.qrc | 1 + src/help.cpp | 1 + src/onmainwindow.cpp | 51 ++++++++++++++++++++++++++++++++++++++- src/onmainwindow.h | 5 ++++ src/sessionbutton.cpp | 55 +++++++++++++++++++++++++++++++++++++++---- 8 files changed, 129 insertions(+), 5 deletions(-) create mode 100644 res/img/png/close-button.png -- Alioth's /home/x2go-admin/maintenancescripts/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 e5ae6b9c174cb10bbdadc27b5b4c1154d7f0aee1 Author: Walid Moghrabi <w.moghrabi@servicemagic.eu> Date: Thu Jan 25 12:24:30 2018 +0100 {src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: add new option --closebt. Fixes: #1227. Adds a close button in the top-left client corner (maybe next to the halt button) that currently just terminates the client. --- debian/changelog | 4 ++++ man/man1/x2goclient.1 | 4 ++++ src/help.cpp | 1 + src/onmainwindow.cpp | 25 +++++++++++++++++++++++++ src/onmainwindow.h | 1 + 5 files changed, 35 insertions(+) diff --git a/debian/changelog b/debian/changelog index 534233b..30e2e0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -64,6 +64,10 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium [ Walid Moghrabi ] * New upstream version (4.1.1.1): - {res/img/png/,res/resources.qrc}: add close-button.png file. + - {src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: add new + option --closebt. Fixes: #1227. Adds a close button in the top-left + client corner (maybe next to the halt button) that currently just + terminates the client. -- X2Go Release Manager <git-admin@x2go.org> Sun, 29 Oct 2017 11:44:44 +0100 diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1 index 2717e6a..1106b2b 100644 --- a/man/man1/x2goclient.1 +++ b/man/man1/x2goclient.1 @@ -191,6 +191,10 @@ new block devices (CD/DVDs, USB sticks, etc.). \*(T<\fB\-\-haltbt\fR\*(T> Show a "Shutdown" button in the top left corner of X2Go Client. When pressed, X2Go Client will create the file $HOME/.halt. An external script has to watch for this file and trigger a thinclient shutdown once it appears. +.TP +\*(T<\fB\-\-closebt\fR\*(T> +Show a "Close" button in the top left corner of X2Go Client when logged in broker/thinclient mode. +When pressed, X2Go Client will be closed and automaticaly restarted if in thinclient mode. .SH PORTABLE OPTIONS X2Go Client can be installed on a USB-Flashdrive as a portable applications. If installed that way, the following diff --git a/src/help.cpp b/src/help.cpp index 0e54df6..6feef1e 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -125,6 +125,7 @@ help::params_t help::build_params () { ADD_OPT ("--ldap-printing", QT_TRANSLATE_NOOP ("Help", "Allows client side printing in LDAP mode.")); ADD_OPT ("--thinclient", QT_TRANSLATE_NOOP ("Help", "Enables thinclient mode. Starts without a window manager.")); ADD_OPT ("--haltbt", QT_TRANSLATE_NOOP ("Help", "Enables shutdown button.")); + ADD_OPT ("--closebt", QT_TRANSLATE_NOOP ("Help", "Enables close button.")); ADD_OPT ("--add-to-known-hosts", QT_TRANSLATE_NOOP ("Help", "Adds RSA key fingerprint to \".ssh/known_hosts\" if authenticity of the server can't be determined.")); ADD_OPT ("--ldap=<host:port:dn>", QT_TRANSLATE_NOOP ("Help", "Starts with LDAP support. Example: --ldap=ldapserver:389:o=organization,c=de")); ADD_OPT ("--ldap1=<host:port>", QT_TRANSLATE_NOOP ("Help", "Defines the first LDAP failover server.")); diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 740a4d8..0dead8c 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -78,6 +78,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) thinMode=false; closeDisconnect=false; showHaltBtn=false; + showCloseBtn=false; defaultUseSound=true; defaultSetKbd=true; extStarted=false; @@ -523,6 +524,25 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) connect(bHalt,SIGNAL(clicked()),this, SLOT(slotShutdownThinClient())); } + if (showCloseBtn) + { + QPushButton* bClose=new QPushButton(bgFrame); + QPixmap p(":/img/png/close-button.png"); + bClose->setIcon(p); + bClose->setFocusPolicy(Qt::NoFocus); + bClose->setFixedSize(32,32); + if (showHaltBtn) + { + bClose->move(40,10); + } + else + { + bClose->move(10,10); + } + bClose->show(); + connect(bClose,SIGNAL(clicked()),this, SLOT(close())); + } + if (brokerMode) { broker=new HttpBrokerClient ( this, &config ); @@ -7444,6 +7464,11 @@ bool ONMainWindow::parseParameter ( QString param ) showHaltBtn=true; return true; } + if (param == "--closebt") + { + showCloseBtn=true; + return true; + } if ( param=="--hide" ) { startHidden=true; diff --git a/src/onmainwindow.h b/src/onmainwindow.h index 0a115bb..c3ce44a 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -796,6 +796,7 @@ private: bool useLdap; bool showToolBar; bool showHaltBtn; + bool showCloseBtn; bool newSession; bool runStartApp; bool ldapOnly; -- Alioth's /home/x2go-admin/maintenancescripts/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 0da3f0a0d2d1f9331c92f5bd68418852cf826761 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jan 25 11:30:19 2018 +0100 src/sessionbutton.cpp: make button non-sensitive in bottom right part if it's editable. Fixes: #1214. --- debian/changelog | 2 ++ src/sessionbutton.cpp | 55 +++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index aaf1979..9a04dbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,6 +54,8 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium X2GO_XINERAMA in accordance with server changes. - src/onmainwindow.cpp: supply xinerama option as another parameter to x2goresume-session on session resume. + - src/sessionbutton.cpp: make button non-sensitive in bottom right part if + it's editable. Fixes: #1214. [ Oleksandr Shneyder ] * New upstream version (4.1.1.1): diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp index 2f6fb95..c3d9e25 100644 --- a/src/sessionbutton.cpp +++ b/src/sessionbutton.cpp @@ -37,6 +37,7 @@ #include <QPainter> #include <QImage> #include <QPixmap> +#include <QPolygon> #include "sessionexplorer.h" @@ -602,11 +603,57 @@ void SessionButton::mousePressEvent ( QMouseEvent * event ) void SessionButton::mouseReleaseEvent ( QMouseEvent * event ) { SVGFrame::mouseReleaseEvent ( event ); - int x=event->x(); - int y=event->y(); loadBg ( ":/img/svg/sessionbut.svg" ); - if ( x>=0 && x< width() && y>=0 && y<height() ) - emit clicked(); + + QPoint click_pos (event->x (), event->y ()); + + QRect sensitive_area (0, 0, width (), height ()); + + bool recognized_click = false; + + /* + * If button is editable, let only the top "half" + * of the button be clickable to trigger an event. + * + * Actually, the area will look something like that: + * ---------------------------- + * | | + * | ----------------------- + * | | + * | | + * | | + * ------ + * + */ + if (editable) { + bool mini_mode = par->retMiniMode (); + + QRect sensitive_area2; + + if (!mini_mode) { + sensitive_area.setHeight (84); + sensitive_area2 = QRect (0, 83, 58, height () - 84); + } + else { + sensitive_area.setHeight (44); + sensitive_area2 = QRect (0, 43, 66, height () - 44); + } + + QPolygon real_sensitive_area; + real_sensitive_area << sensitive_area.topLeft () << sensitive_area.topRight () + << sensitive_area.bottomRight () << sensitive_area2.topRight () + << sensitive_area2.bottomRight () << sensitive_area2.bottomLeft () + << sensitive_area.topLeft (); + + recognized_click = real_sensitive_area.containsPoint (click_pos, Qt::WindingFill); + } + else { + recognized_click = sensitive_area.contains (click_pos); + } + + if (recognized_click) { + emit clicked (); + } } void SessionButton::mouseMoveEvent ( QMouseEvent * event ) -- Alioth's /home/x2go-admin/maintenancescripts/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 d01d65b50ec5014439557f9c7547ff32998ae422 Author: Walid Moghrabi <w.moghrabi@servicemagic.eu> Date: Thu Jan 25 12:20:26 2018 +0100 res/img/png/: add close-button.png file. --- debian/changelog | 4 ++++ res/img/png/close-button.png | Bin 0 -> 1069 bytes res/resources.qrc | 1 + 3 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9a04dbb..534233b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,10 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium * New upstream version (4.1.1.1): - Change echo mode for user input in InteractionDialog. + [ Walid Moghrabi ] + * New upstream version (4.1.1.1): + - {res/img/png/,res/resources.qrc}: add close-button.png file. + -- X2Go Release Manager <git-admin@x2go.org> Sun, 29 Oct 2017 11:44:44 +0100 x2goclient (4.1.1.0-0x2go1) unstable; urgency=medium diff --git a/res/img/png/close-button.png b/res/img/png/close-button.png new file mode 100644 index 0000000..f5b990f Binary files /dev/null and b/res/img/png/close-button.png differ diff --git a/res/resources.qrc b/res/resources.qrc index 478bb55..eaddf61 100644 --- a/res/resources.qrc +++ b/res/resources.qrc @@ -16,6 +16,7 @@ <file>img/png/sess_ico.png</file> <file>img/png/ico_440x180.png</file> <file>img/png/power-button.png</file> + <file>img/png/close-button.png</file> <file>img/icons/128x128/x2go.png</file> <file>img/icons/128x128/folder.png</file> <file>img/icons/128x128/x2gosession.png</file> -- Alioth's /home/x2go-admin/maintenancescripts/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 7b3bca1fa9eb346f280853a9b98880032d89505b Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jan 25 14:14:22 2018 +0100 src/onmainwindow.{cpp,h}: let close button be a member variable. --- debian/changelog | 1 + src/onmainwindow.cpp | 5 ++++- src/onmainwindow.h | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3c65dd0..62d5453 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,7 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium it's editable. Fixes: #1214. - {src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: reformat, whitespace fixes, split out close button slot in a separate function. + - src/onmainwindow.{cpp,h}: let close button be a member variable. [ Oleksandr Shneyder ] * New upstream version (4.1.1.1): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 69ce587..e526c9f 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -197,6 +197,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) gpgAgent=0l; statusLabel=0; gpg=0l; + bClose = NULL; restartResume=false; isPassShown=true; readExportsFrom=QString::null; @@ -526,7 +527,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) if (showCloseBtn) { - QPushButton *bClose = new QPushButton (bgFrame); + bClose = new QPushButton (bgFrame); QPixmap p (":/img/png/close-button.png"); bClose->setIcon (p); bClose->setFocusPolicy (Qt::NoFocus); @@ -1646,6 +1647,8 @@ void ONMainWindow::closeClient() x2goDebug << "libssh finalized."; } + delete (bClose); + x2goInfof(7)<<tr("Finished X2Go Client closing hooks."); } diff --git a/src/onmainwindow.h b/src/onmainwindow.h index 6585fe1..e857a1c 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -684,6 +684,9 @@ private: QPushButton* bCancel; + QPushButton *bClose; + + QLabel* selectSessionLabel; SessTreeView* sessTv; -- Alioth's /home/x2go-admin/maintenancescripts/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 a3f3211c3667067f0efa59f1539849aa8c0d1d56 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jan 25 12:28:35 2018 +0100 {src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: reformat, whitespace fixes, split out close button slot in a separate function. --- debian/changelog | 2 ++ man/man1/x2goclient.1 | 4 ++-- src/onmainwindow.cpp | 26 +++++++++++++++++--------- src/onmainwindow.h | 1 + 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 30e2e0a..3c65dd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,8 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium x2goresume-session on session resume. - src/sessionbutton.cpp: make button non-sensitive in bottom right part if it's editable. Fixes: #1214. + - {src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: reformat, + whitespace fixes, split out close button slot in a separate function. [ Oleksandr Shneyder ] * New upstream version (4.1.1.1): diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1 index 1106b2b..36eec15 100644 --- a/man/man1/x2goclient.1 +++ b/man/man1/x2goclient.1 @@ -193,8 +193,8 @@ Show a "Shutdown" button in the top left corner of X2Go Client. When pressed, X2 $HOME/.halt. An external script has to watch for this file and trigger a thinclient shutdown once it appears. .TP \*(T<\fB\-\-closebt\fR\*(T> -Show a "Close" button in the top left corner of X2Go Client when logged in broker/thinclient mode. -When pressed, X2Go Client will be closed and automaticaly restarted if in thinclient mode. +Show a "Close" button in the top left corner of X2Go Client when logged in broker/thinclient mode. +When pressed, X2Go Client will be closed and automatically restarted if in thinclient mode. .SH PORTABLE OPTIONS X2Go Client can be installed on a USB-Flashdrive as a portable applications. If installed that way, the following diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 0dead8c..69ce587 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -526,21 +526,21 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) if (showCloseBtn) { - QPushButton* bClose=new QPushButton(bgFrame); - QPixmap p(":/img/png/close-button.png"); - bClose->setIcon(p); - bClose->setFocusPolicy(Qt::NoFocus); - bClose->setFixedSize(32,32); + QPushButton *bClose = new QPushButton (bgFrame); + QPixmap p (":/img/png/close-button.png"); + bClose->setIcon (p); + bClose->setFocusPolicy (Qt::NoFocus); + bClose->setFixedSize (32,32); if (showHaltBtn) { - bClose->move(40,10); + bClose->move (40,10); } else { - bClose->move(10,10); + bClose->move (10,10); } - bClose->show(); - connect(bClose,SIGNAL(clicked()),this, SLOT(close())); + bClose->show (); + connect (bClose, SIGNAL (clicked ()), this, SLOT (slotCloseButton ())); } if (brokerMode) @@ -595,6 +595,14 @@ void ONMainWindow::slotShutdownThinClient() file.close(); } +void ONMainWindow::slotCloseButton () { + /* + * Needs a lot more logic here to suspend a session if one + * is running and log out of the broker. + */ + close (); +} + void ONMainWindow::slotSyncX() { diff --git a/src/onmainwindow.h b/src/onmainwindow.h index c3ce44a..6585fe1 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -1058,6 +1058,7 @@ private slots: void slotChangeKbdLayout(const QString& layout); void slotSyncX(); void slotShutdownThinClient(); + void slotCloseButton (); void slotReadApplications(bool result, QString output, int pid ); public slots: -- Alioth's /home/x2go-admin/maintenancescripts/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 7fcf0c8df8930db093ad663ee8cae99d33b36442 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jan 25 14:25:08 2018 +0100 src/onmainwindow.cpp: initialize directRDP to false to be able to call slotSuspendSessFromSt () even if no session has previously been started. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 434d06e..f595175 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,8 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium - src/onmainwindow.{cpp,h}: let close button be a member variable. - src/onmainwindow.cpp: disable and enable close button during and after connection startup. + - src/onmainwindow.cpp: initialize directRDP to false to be able to call + slotSuspendSessFromSt () even if no session has previously been started. [ Oleksandr Shneyder ] * New upstream version (4.1.1.1): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 28762c8..23aaefd 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -140,6 +140,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) systemDisablePA=false; #endif /* defined (Q_OS_DARWIN) || defined (Q_OS_WIN) */ + directRDP = false; // Try to determine the native DPI and use it for the default int dpix = QApplication::desktop()->physicalDpiX(); -- Alioth's /home/x2go-admin/maintenancescripts/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 3060183a78d8b6bd81bec9968c985c38bfd1e5c2 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jan 25 14:16:40 2018 +0100 src/onmainwindow.cpp: disable and enable close button during and after connection startup. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 14 +++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 62d5453..434d06e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -59,6 +59,8 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium - {src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: reformat, whitespace fixes, split out close button slot in a separate function. - src/onmainwindow.{cpp,h}: let close button be a member variable. + - src/onmainwindow.cpp: disable and enable close button during and after + connection startup. [ Oleksandr Shneyder ] * New upstream version (4.1.1.1): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index e526c9f..28762c8 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -540,6 +540,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) { bClose->move (10,10); } + bClose->setEnabled (true); bClose->show (); connect (bClose, SIGNAL (clicked ()), this, SLOT (slotCloseButton ())); } @@ -3061,6 +3062,7 @@ void ONMainWindow::slotSshConnectionError ( QString message, QString lastSession pass->setFocus(); pass->selectAll(); + bClose->setEnabled (true); passForm->setEnabled ( true ); } @@ -3292,6 +3294,7 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa } slotSshUserAuthError ( tr ( "Host key verification failed." ) ); sshConnection=0; + bClose->setEnabled (true); return; } else @@ -3320,6 +3323,7 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa } slotSshUserAuthError ( tr ( "Host key verification failed." ) ); sshConnection=0; + bClose->setEnabled (true); return; } else @@ -3339,6 +3343,7 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa } sshConnection=0; slotSshUserAuthError ( sshMessage ); + bClose->setEnabled (true); return ; case SSH_SERVER_FILE_NOT_FOUND: errMsg=tr ( "Could not find known hosts file. " @@ -3363,6 +3368,7 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa } sshConnection=0; slotSshUserAuthError ( tr ( "Host key verification failed." ) ); + bClose->setEnabled (true); return; } connection->writeKnownHosts(true); @@ -3405,7 +3411,7 @@ void ONMainWindow::slotSshUserAuthError ( QString error ) pass->setFocus(); pass->selectAll(); - + bClose->setEnabled (true); passForm->setEnabled ( true ); } @@ -3434,6 +3440,8 @@ void ONMainWindow::slotSessEnter() return; } + bClose->setEnabled (false); + resumingSession.sessionId=QString::null; resumingSession.server=QString::null; resumingSession.display=QString::null; @@ -5389,6 +5397,7 @@ void ONMainWindow::slotRetResumeSess ( bool result, message,QMessageBox::Ok, QMessageBox::NoButton ); slotShowPassForm(); + bClose->setEnabled (true); return; } @@ -5583,6 +5592,9 @@ void ONMainWindow::slotRetResumeSess ( bool result, } } + + bClose->setEnabled (true); + if ( !useLdap ) { if ( brokerMode ) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org