This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from d8a34ff Add special ACL for exported directories in Windows client. new 8d4edda src/onmainwindow.cpp: add Cancel standard shortcut to cancel button in login window. new c3fd1f3 src/onmainwindow.cpp: consolidate Resume button enabling state in ONMainWindow::initSelectSessDlg (). new 54149af src/onmainwindow.{cpp,h}: add notice explaining how to resume running sessions. new c1ea418 src/onmainwindow.cpp: add Cancel standard shortcut to cancel button in session selection view. The 4 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 | 10 ++++++++++ src/onmainwindow.cpp | 18 +++++++++++++++--- src/onmainwindow.h | 1 + 3 files changed, 26 insertions(+), 3 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 8d4eddacf38337c02e69f74e2e45ed2a3ac5c2d0 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 22 23:36:10 2021 +0100 src/onmainwindow.cpp: add Cancel standard shortcut to cancel button in login window. Change requested by Max-Planck-Institut für Kolloid- und Grenzflächenforschung Potsdam. --- debian/changelog | 3 +++ src/onmainwindow.cpp | 1 + 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1759461..b7a2b29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -87,6 +87,9 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium automatically use that package any longer and hence will not pull in all library packages automatically. That's not a bad change, since it forces us to spell out the dependencies correctly. + - src/onmainwindow.cpp: add Cancel standard shortcut to cancel button in + login window. Change requested by Max-Planck-Institut für Kolloid- und + Grenzflächenforschung Potsdam. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index f47daf2..e2a5a56 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -12499,6 +12499,7 @@ void ONMainWindow::initPassDlg() setWidgetStyle ( ok ); cancel=new QPushButton ( tr ( "Cancel" ),passForm ); setWidgetStyle ( cancel ); + cancel->setShortcut (QKeySequence::Cancel); ok->hide(); cancel->hide(); -- 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 54149afe804c30dd807526dbe18b537defb05a07 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Nov 27 00:04:49 2021 +0100 src/onmainwindow.{cpp,h}: add notice explaining how to resume running sessions. Change requested by Max-Planck-Institut für Kolloid- und Grenzflächenforschung Potsdam. --- debian/changelog | 3 +++ src/onmainwindow.cpp | 13 ++++++++++++- src/onmainwindow.h | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 95ff248..c44e163 100644 --- a/debian/changelog +++ b/debian/changelog @@ -92,6 +92,9 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium Grenzflächenforschung Potsdam. - src/onmainwindow.cpp: consolidate Resume button enabling state in ONMainWindow::initSelectSessDlg (). + - src/onmainwindow.{cpp,h}: add notice explaining how to resume running + sessions. Change requested by Max-Planck-Institut für Kolloid- und + Grenzflächenforschung Potsdam. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 817c1fc..18b0edd 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -5215,17 +5215,20 @@ void ONMainWindow::slotActivated ( const QModelIndex& index ) { bSusp->setEnabled ( true ); sOk->setEnabled ( false ); + running_label->show (); } else { bSusp->setEnabled ( false ); sOk->setEnabled ( true ); + running_label->hide (); } bTerm->setEnabled ( true ); if ( status==QString::null ) { sOk->setEnabled ( false ); bTerm->setEnabled ( false ); + running_label->hide (); } } else @@ -5482,7 +5485,7 @@ void ONMainWindow::slotRetSuspSess ( bool result, QString output, Qt::DisplayRole ); bSusp->setEnabled ( false ); sOk->setEnabled ( true ); - + running_label->hide (); } } if ( selectSessionDlg->isVisible() ) @@ -12820,6 +12823,10 @@ void ONMainWindow::initSelectSessDlg() selectSessionDlg->setFont ( fnt ); selectSessionLabel=new QLabel ( tr ( "Select session:" ), selectSessionDlg ); + running_label = new QLabel (tr ("<b>Note:</b> the currently selected session " + "is already running.<br />To forcefully " + "resume it, suspend it first."), + selectSessionDlg); sOk=new QPushButton ( tr ( "Resume" ),selectSessionDlg ); setWidgetStyle ( sOk ); sCancel=new QPushButton ( tr ( "Cancel" ),selectSessionDlg ); @@ -12947,6 +12954,7 @@ void ONMainWindow::initSelectSessDlg() bTerm->setEnabled ( false ); bShadow->setEnabled ( false ); selectSessionLabel->hide(); + running_label->hide (); bCancel->setPalette ( pal ); bCancel->hide(); @@ -12969,6 +12977,9 @@ void ONMainWindow::initSelectSessDlg() layout->addWidget ( selectSessionLabel ); layout->addLayout ( filterLay ); layout->addLayout ( tvlay ); + layout->addStretch (); + layout->addWidget (running_label); + layout->addStretch (); layout->addLayout ( blay ); filterLay->addWidget ( desktopFilter ); diff --git a/src/onmainwindow.h b/src/onmainwindow.h index bf47328..f53c229 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -682,6 +682,7 @@ private: QLabel* selectSessionLabel; + QLabel* running_label; SessTreeView* sessTv; QLineEdit* desktopFilter; -- 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 c3fd1f3513f93ae35e5ff51e8726401ecd0c26c2 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 22 23:51:20 2021 +0100 src/onmainwindow.cpp: consolidate Resume button enabling state in ONMainWindow::initSelectSessDlg (). --- debian/changelog | 2 ++ src/onmainwindow.cpp | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b7a2b29..95ff248 100644 --- a/debian/changelog +++ b/debian/changelog @@ -90,6 +90,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - src/onmainwindow.cpp: add Cancel standard shortcut to cancel button in login window. Change requested by Max-Planck-Institut für Kolloid- und Grenzflächenforschung Potsdam. + - src/onmainwindow.cpp: consolidate Resume button enabling state in + ONMainWindow::initSelectSessDlg (). * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index e2a5a56..817c1fc 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -12885,7 +12885,7 @@ void ONMainWindow::initSelectSessDlg() - sOk->setEnabled ( true ); + sOk->setEnabled (false); sCancel->setEnabled ( true ); selectSessionDlg->setEnabled ( true ); setEnabled ( true ); @@ -12943,7 +12943,6 @@ void ONMainWindow::initSelectSessDlg() bSusp->setPalette ( pal ); bTerm->setPalette ( pal ); sessTv->setFrameStyle ( QFrame::StyledPanel|QFrame::Plain ); - sOk->setEnabled ( false ); bSusp->setEnabled ( false ); bTerm->setEnabled ( false ); bShadow->setEnabled ( false ); -- 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 c1ea418aac4b39f4d50a5934d4645e53bdce18a3 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Nov 27 00:10:16 2021 +0100 src/onmainwindow.cpp: add Cancel standard shortcut to cancel button in session selection view. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index c44e163..3f9ad0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -95,6 +95,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - src/onmainwindow.{cpp,h}: add notice explaining how to resume running sessions. Change requested by Max-Planck-Institut für Kolloid- und Grenzflächenforschung Potsdam. + - src/onmainwindow.cpp: add Cancel standard shortcut to cancel button in + session selection view. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 18b0edd..30dc86e 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -12831,6 +12831,7 @@ void ONMainWindow::initSelectSessDlg() setWidgetStyle ( sOk ); sCancel=new QPushButton ( tr ( "Cancel" ),selectSessionDlg ); setWidgetStyle ( sCancel ); + sCancel->setShortcut (QKeySequence::Cancel); bCancel=new QPushButton ( tr ( "Cancel" ),selectSessionDlg ); setWidgetStyle ( bCancel ); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org