This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 0b71505 Show session path in session button in Favorite and Running views. new c29e3db Improve synchronisation in broker mode. new 2537043 Fix loading HTTP icon in pass dialog in broker mode. The 2 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 | 2 ++ src/onmainwindow.cpp | 65 +++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 61 insertions(+), 6 deletions(-) -- 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 c29e3db05cbb1c7e6782d380c4560391382dea78 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Fri Nov 5 09:35:15 2021 -0600 Improve synchronisation in broker mode. --- debian/changelog | 1 + src/onmainwindow.cpp | 38 +++++++++++++++++++++++++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 175e5e6..5d10ed9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - Improve view modes in broker mode. - Set toolTip with detailed information for session button. - Show session path in session button in Favorite and Running views. + - Improve synchronisation in broker mode. [ Ryan Schmidt ] * New upstream version (4.1.2.3): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 349bc20..cee1e15 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -3261,6 +3261,10 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa activateWindow(); raise(); } + if(brokerMode && config.brokerSyncTimeout && !(brokerSyncTimer->isActive())) + { + brokerSyncTimer->start(); + } QString errMsg; switch ( error ) { @@ -3395,10 +3399,11 @@ void ONMainWindow::slotSshUserAuthError ( QString error ) slotShowPassForm(); pass->setFocus(); pass->selectAll(); - - - passForm->setEnabled ( true ); + if(brokerMode && config.brokerSyncTimeout && !(brokerSyncTimer->isActive())) + { + brokerSyncTimer->start(); + } } void ONMainWindow::slotSessEnter() @@ -3803,6 +3808,21 @@ bool ONMainWindow::startSession ( const QString& sid, CONTYPE conType ) host=suspendTerminateHostFromBroker; sshPort=config.sshport; x2goDebug<<"Server: "<<host; + if(host.indexOf("No servers available")!=-1) + { + x2goDebug<<"There are no available X2Go servers for this connection"; + QMessageBox::critical (0l,tr("Error"), + tr ("There are no available X2Go Servers for this connection. Please try again later or choose another session."), QMessageBox::Ok, + QMessageBox::NoButton); + + setEnabled(true); + passForm->setEnabled(true); + if(config.brokerSyncTimeout && !(brokerSyncTimer->isActive())) + { + brokerSyncTimer->start(); + } + return false; + } } else if (embedMode) { @@ -5450,6 +5470,13 @@ void ONMainWindow::slotRetSuspSess ( bool result, QString output, { slotResumeSess(); } + else + { + if(brokerMode && config.brokerSyncTimeout && !(brokerSyncTimer->isActive())) + { + brokerSyncTimer->start(); + } + } } @@ -5546,6 +5573,11 @@ void ONMainWindow::slotRetTermSess ( bool result, QString output, } if ( selectSessionDlg->isVisible() ) selectSessionDlg->setEnabled ( true ); + if(brokerMode && config.brokerSyncTimeout && !(brokerSyncTimer->isActive())) + { + brokerSyncTimer->start(); + } + } void ONMainWindow::slotRetResumeSess ( bool result, -- 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 25370435b9da31f6c8b66dd0e7e5426c92011867 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Fri Nov 5 09:53:15 2021 -0600 Fix loading HTTP icon in pass dialog in broker mode. --- debian/changelog | 1 + src/onmainwindow.cpp | 27 ++++++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5d10ed9..5b3a966 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - Set toolTip with detailed information for session button. - Show session path in session button in Favorite and Running views. - Improve synchronisation in broker mode. + - Fix loading HTTP icon in pass dialog in broker mode. [ Ryan Schmidt ] * New upstream version (4.1.2.3): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index cee1e15..c580f34 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -2857,11 +2857,31 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) command=transAppName ( command ); login->setText ( userName ); x2goDebug << "Creating QPixmap with session icon: '" << sessIcon << "'."; - QPixmap pix ( sessIcon ); + QPixmap* pix; + + if (!brokerMode || sessIcon == iconsPath("/128x128/x2gosession.png")) + pix=new QPixmap( sessIcon ); + else + { + pix=new QPixmap; + if(sessIcon.indexOf("file://")!=-1) + { + //load icon from file URL + pix->load(sessIcon.replace("file://","")); + } + else + pix->loadFromData(QByteArray::fromBase64(sessIcon.toLatin1())); + if(pix->isNull()) + { + //loading icon has failed, load default icon + pix->load(iconsPath("/128x128/x2gosession.png")); + } + } + if ( !miniMode ) { fotoLabel->setPixmap ( - pix.scaled ( 64,64, + pix->scaled ( 64,64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation ) ); fotoLabel->setFixedSize ( 64,64 ); @@ -2869,12 +2889,13 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) else { fotoLabel->setPixmap ( - pix.scaled ( 48,48, + pix->scaled ( 48,48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation ) ); fotoLabel->setFixedSize ( 48,48 ); } + delete pix; if(currentKey.length()<=0) { currentKey=findSshKeyForServer(userName, server, sshPort); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org