From 7dc1b1c073c17334b4d357000d4d66ebea8dd59f Mon Sep 17 00:00:00 2001 From: Philipp Spitzer Date: Wed, 21 Jul 2021 23:49:56 +0200 Subject: [PATCH] Show conference offset in conference dialog and prepare display offset. --- src/gui/conferenceeditor.cpp | 5 ++ src/gui/conferenceeditor.ui | 107 +++++++++++++++++++++++++++++++---- 2 files changed, 100 insertions(+), 12 deletions(-) diff --git a/src/gui/conferenceeditor.cpp b/src/gui/conferenceeditor.cpp index e132849..bd682a5 100644 --- a/src/gui/conferenceeditor.cpp +++ b/src/gui/conferenceeditor.cpp @@ -94,6 +94,11 @@ void ConferenceEditor::itemSelected(const QModelIndex& current, const QModelInde conf.start().toString("yyyy-MM-dd") + " - " + conf.end().toString("yyyy-MM-dd")); + if (conf.hasUtcOffset()) { + conferenceUtcOffset->setText(QString::number(conf.utcOffset()) + " min"); + } else { + conferenceUtcOffset->setText("N/A"); + } conferenceInfo->setCurrentIndex(0); removeBtn->show(); } diff --git a/src/gui/conferenceeditor.ui b/src/gui/conferenceeditor.ui index 3c1c602..cad0fb7 100644 --- a/src/gui/conferenceeditor.ui +++ b/src/gui/conferenceeditor.ui @@ -14,7 +14,7 @@ Edit Conferences - + :/confclerk.svg:/confclerk.svg @@ -24,7 +24,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -39,7 +48,7 @@ - + :/icons/add.png:/icons/add.png @@ -56,7 +65,7 @@ - + :/icons/remove.png:/icons/remove.png @@ -156,6 +165,27 @@ + + + + CITY, CAMPUS + + + + + + + + 75 + true + true + + + + UTC offset: + + + @@ -177,13 +207,60 @@ - - + + - CITY, CAMPUS + N/A + + + + + 75 + true + true + + + + Display time shift: + + + + + + + + + hour + + + H + + + -14 + + + 14 + + + + + + + minutes + + + M + + + 59 + + + + + @@ -194,7 +271,7 @@ Reload from URL - + :/icons/reload.png:/icons/reload.png @@ -250,9 +327,15 @@ - - - - + + confView + addBtn + removeBtn + conferenceDtsHours + conferenceDtsMinutes + refreshBtn + changeUrl + + -- 2.39.5