This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from c1ea418 src/onmainwindow.cpp: add Cancel standard shortcut to cancel button in session selection view. new 733eb50 src/onmainwindow.cpp: set word wrapping on running label. new bbcf865 src/onmainwindow.cpp: increase height of session selection dialog in mini mode. new 51b0f4f src/onmainwindow.cpp: increase fixed height of session selection dialog in normal mode and also set as minimum height. new 6b49bcc src/onmainwindow.cpp: unbreak on Qt 4 by emulating QKeySequence::Cancel. 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 | 6 ++++++ src/onmainwindow.cpp | 26 +++++++++++++++++++++++--- 2 files changed, 29 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 733eb50063a94feac02ba6d3d41d2ff0f28eb453 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Nov 27 00:39:21 2021 +0100 src/onmainwindow.cpp: set word wrapping on running label. --- debian/changelog | 1 + src/onmainwindow.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3f9ad0e..e1bb4ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -97,6 +97,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium Grenzflächenforschung Potsdam. - src/onmainwindow.cpp: add Cancel standard shortcut to cancel button in session selection view. + - src/onmainwindow.cpp: set word wrapping on running label. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 30dc86e..be9d8ad 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -12827,6 +12827,7 @@ void ONMainWindow::initSelectSessDlg() "is already running.<br />To forcefully " "resume it, suspend it first."), selectSessionDlg); + running_label->setWordWrap (true); sOk=new QPushButton ( tr ( "Resume" ),selectSessionDlg ); setWidgetStyle ( sOk ); sCancel=new QPushButton ( tr ( "Cancel" ),selectSessionDlg ); -- 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 bbcf865a64dbd6e304ab29687592deac7f69e52c Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Nov 27 00:57:14 2021 +0100 src/onmainwindow.cpp: increase height of session selection dialog in mini mode. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e1bb4ac..0a04d5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -98,6 +98,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - src/onmainwindow.cpp: add Cancel standard shortcut to cancel button in session selection view. - src/onmainwindow.cpp: set word wrapping on running label. + - src/onmainwindow.cpp: increase height of session selection dialog in + mini mode. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index be9d8ad..216feaf 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -12797,7 +12797,7 @@ void ONMainWindow::initSelectSessDlg() if ( !miniMode ) selectSessionDlg->setFixedSize ( selectSessionDlg->sizeHint() ); else - selectSessionDlg->setFixedSize ( 310,180 ); + selectSessionDlg->setFixedSize ( 310,240 ); QPalette pal=selectSessionDlg->palette(); pal.setBrush ( QPalette::Window, QColor ( 255,255,255,0 ) ); pal.setColor ( QPalette::Active, QPalette::WindowText, QPalette::Mid ); -- 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 51b0f4fb6b1ca0de20f09a9867a67413ec427679 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Nov 27 01:31:49 2021 +0100 src/onmainwindow.cpp: increase fixed height of session selection dialog in normal mode and also set as minimum height. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0a04d5c..f09846c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -100,6 +100,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - src/onmainwindow.cpp: set word wrapping on running label. - src/onmainwindow.cpp: increase height of session selection dialog in mini mode. + - src/onmainwindow.cpp: increase fixed height of session selection dialog + in normal mode and also set as minimum height. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 216feaf..97c955d 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -12794,8 +12794,11 @@ void ONMainWindow::initSelectSessDlg() false,bgFrame ); username->addWidget ( selectSessionDlg ); setWidgetStyle ( selectSessionDlg ); - if ( !miniMode ) - selectSessionDlg->setFixedSize ( selectSessionDlg->sizeHint() ); + if ( !miniMode ) { + QSize hint_size = selectSessionDlg->sizeHint (); + selectSessionDlg->setMinimumSize (QSize (hint_size.width (), (hint_size.height () + 100))); + selectSessionDlg->setFixedSize (selectSessionDlg->minimumSize ()); + } else selectSessionDlg->setFixedSize ( 310,240 ); QPalette pal=selectSessionDlg->palette(); -- 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 6b49bcc91ae72ac090c01afa5b6ed8413f4db30b Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Nov 27 01:54:12 2021 +0100 src/onmainwindow.cpp: unbreak on Qt 4 by emulating QKeySequence::Cancel. --- debian/changelog | 1 + src/onmainwindow.cpp | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/debian/changelog b/debian/changelog index f09846c..87822b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -102,6 +102,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium mini mode. - src/onmainwindow.cpp: increase fixed height of session selection dialog in normal mode and also set as minimum height. + - src/onmainwindow.cpp: unbreak on Qt 4 by emulating QKeySequence::Cancel. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 97c955d..640ae65 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -12502,7 +12502,15 @@ void ONMainWindow::initPassDlg() setWidgetStyle ( ok ); cancel=new QPushButton ( tr ( "Cancel" ),passForm ); setWidgetStyle ( cancel ); +#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) cancel->setShortcut (QKeySequence::Cancel); +#else /* QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) */ +#ifdef Q_OS_DARWIN + cancel->setShortCuts (QList<QKeySequence> { Qt::Key_Escape, Qt::CTRL + Qt::Key_Period }); +#else /* defined (Q_OS_DARWIN) */ + cancel->setShortcut (QKeySequence (Qt::Key_Escape)); +#endif /* defined (Q_OS_DARWIN) */ +#endif /* QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) */ ok->hide(); cancel->hide(); @@ -12835,7 +12843,15 @@ void ONMainWindow::initSelectSessDlg() setWidgetStyle ( sOk ); sCancel=new QPushButton ( tr ( "Cancel" ),selectSessionDlg ); setWidgetStyle ( sCancel ); +#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) sCancel->setShortcut (QKeySequence::Cancel); +#else /* QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) */ +#ifdef Q_OS_DARWIN + sCancel->setShortCuts (QList<QKeySequence> { Qt::Key_Escape, Qt::CTRL + Qt::Key_Period }); +#else /* defined (Q_OS_DARWIN) */ + sCancel->setShortcut (QKeySequence (Qt::Key_Escape)); +#endif /* defined (Q_OS_DARWIN) */ +#endif /* QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) */ 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