This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 82beb12 src/onmainwindow.cpp: unbreak more and make sure that the code actually works on older systems. new 95c3c7f src/onmainwindow.cpp: fix session creation date/time display. new bd4ea00 src/onmainwindow.cpp: convert server-reported time to human readable time in Qt's standard format in session list view. 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 | 6 ++++++ src/onmainwindow.cpp | 11 +++++------ 2 files changed, 11 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 bd4ea00e72a3385c3f00a6246956e809c2841908 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 28 05:00:37 2021 +0100 src/onmainwindow.cpp: convert server-reported time to human readable time in Qt's standard format in session list view. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ceb63e0..ec6f587 100644 --- a/debian/changelog +++ b/debian/changelog @@ -112,6 +112,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium returned by the server was changed to an ISO-date-formatted one in 2011, but that change was not carried over to the client. We've had silly dates for more than 10 years and nobody noticed. Go figure. + - src/onmainwindow.cpp: convert server-reported time to human readable + time in Qt's standard format in session list view. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 2a7b2a2..bf6bc26 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -5094,7 +5094,8 @@ void ONMainWindow::selectSession ( QStringList& sessions ) item= new QStandardItem ( type ); model->setItem ( row,S_TYPE,item ); - item= new QStandardItem ( s.crTime ); + QString formatted_time = QDateTime::fromString (s.crTime, Qt::ISODate).toString (); + item = new QStandardItem (formatted_time); model->setItem ( row,S_CRTIME,item ); item= new QStandardItem ( s.server ); model->setItem ( row,S_SERVER,item ); -- 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 95c3c7f2258eb6e14285101c8b506973ba6b84d4 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 28 04:52:08 2021 +0100 src/onmainwindow.cpp: fix session creation date/time display. The data returned by the server was changed to an ISO-date-formatted one in 2011, but that change was not carried over to the client. We've had silly dates for more than 10 years and nobody noticed. Go figure. --- debian/changelog | 4 ++++ src/onmainwindow.cpp | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 48542ed..ceb63e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -108,6 +108,10 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium old Qt4 SIGNAL/SLOT syntax and making sure to drop parameters on both sides, so that the default slot parameter is used, which animates the button for 150 ms. + - src/onmainwindow.cpp: fix session creation date/time display. The data + returned by the server was changed to an ISO-date-formatted one in 2011, + but that change was not carried over to the client. We've had silly + dates for more than 10 years and nobody noticed. Go figure. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 5d51c1c..2a7b2a2 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -3725,7 +3725,7 @@ void ONMainWindow::startDirectRDP() resumingSession.sessionId += "_stRRDP_dp24"; resumingSession.display="RDP"; resumingSession.command="RDP"; - resumingSession.crTime=QDateTime::currentDateTime().toString("dd.MM.yy HH:mm:ss"); + resumingSession.crTime=QDateTime::currentDateTime().toString(Qt::ISODate); showSessionStatus(); if(brokerMode) { @@ -5777,7 +5777,7 @@ void ONMainWindow::slotRetResumeSess ( bool result, } resumingSession.server=host; resumingSession.crTime=QDateTime::currentDateTime().toString ( - "dd.MM.yy HH:mm:ss" ); + Qt::ISODate ); if ( managedMode ) { //replace session data for future resuming @@ -7169,9 +7169,7 @@ void ONMainWindow::setStatStatus ( QString status ) statusLabel->setText ( QString::null ); if ( resumingSession.sessionId!=QString::null ) { - QString f="dd.MM.yy HH:mm:ss"; - QDateTime dt=QDateTime::fromString ( resumingSession.crTime,f ); - dt=dt.addYears ( 100 ); + QDateTime dt=QDateTime::fromString ( resumingSession.crTime, Qt::ISODate ); tstr=dt.toString(); } if ( !embedMode || !proxyWinEmbedded ) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org