Show conference offset in conference dialog and prepare display offset.

diff --git a/src/gui/conferenceeditor.cpp b/src/gui/conferenceeditor.cpp
index e1328496c2ab1b1385affa8d41fdbc6a83e64b8f..bd682a5675fb08f680bd83f9dd26860a8596cd97 100644 (file)
--- 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"));
                 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();
     }
         conferenceInfo->setCurrentIndex(0);
         removeBtn->show();
     }

diff --git a/src/gui/conferenceeditor.ui b/src/gui/conferenceeditor.ui
index 3c1c602e1b48d8e06985b9a211250639fccf7866..cad0fb7b1ea50361b02d2924d92df1e5be418413 100644 (file)
--- a/src/gui/conferenceeditor.ui
+++ b/src/gui/conferenceeditor.ui
@@ -14,7 +14,7 @@
    <string>Edit Conferences</string>
   </property>
   <property name="windowIcon">
    <string>Edit Conferences</string>
   </property>
   <property name="windowIcon">

-   <iconset resource="../../data/data.qrc">
+   <iconset>

     <normaloff>:/confclerk.svg</normaloff>:/confclerk.svg</iconset>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_4">
     <normaloff>:/confclerk.svg</normaloff>:/confclerk.svg</iconset>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_4">


@@ -24,7 +24,16 @@
       <item>
        <widget class="QWidget" name="buttons" native="true">
         <layout class="QHBoxLayout" name="horizontalLayout_2">
       <item>
        <widget class="QWidget" name="buttons" native="true">
         <layout class="QHBoxLayout" name="horizontalLayout_2">

-         <property name="margin">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">

           <number>0</number>
          </property>
          <item>
           <number>0</number>
          </property>
          <item>


@@ -39,7 +48,7 @@
             <string notr="true"/>
            </property>
            <property name="icon">
             <string notr="true"/>
            </property>
            <property name="icon">

-            <iconset resource="../icons.qrc">
+            <iconset>

              <normaloff>:/icons/add.png</normaloff>:/icons/add.png</iconset>
            </property>
           </widget>
              <normaloff>:/icons/add.png</normaloff>:/icons/add.png</iconset>
            </property>
           </widget>


@@ -56,7 +65,7 @@
             <string notr="true"/>
            </property>
            <property name="icon">
             <string notr="true"/>
            </property>
            <property name="icon">

-            <iconset resource="../icons.qrc">
+            <iconset>

              <normaloff>:/icons/remove.png</normaloff>:/icons/remove.png</iconset>
            </property>
           </widget>
              <normaloff>:/icons/remove.png</normaloff>:/icons/remove.png</iconset>
            </property>
           </widget>


@@ -156,6 +165,27 @@
              </property>
             </widget>
            </item>
              </property>
             </widget>
            </item>

+           <item row="1" column="1">
+            <widget class="QLabel" name="conferenceWhere">
+             <property name="text">
+              <string>CITY, CAMPUS</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0">
+            <widget class="QLabel" name="label">
+             <property name="font">
+              <font>
+               <weight>75</weight>
+               <italic>true</italic>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="text">
+              <string>UTC offset:</string>
+             </property>
+            </widget>
+           </item>

            <item row="1" column="0">
             <widget class="QLabel" name="label_4">
              <property name="font">
            <item row="1" column="0">
             <widget class="QLabel" name="label_4">
              <property name="font">


@@ -177,13 +207,60 @@
              </property>
             </widget>
            </item>
              </property>
             </widget>
            </item>

-           <item row="1" column="1">
-            <widget class="QLabel" name="conferenceWhere">
+           <item row="2" column="1">
+            <widget class="QLabel" name="conferenceUtcOffset">

              <property name="text">
              <property name="text">

-              <string>CITY, CAMPUS</string>
+              <string>N/A</string>

              </property>
             </widget>
            </item>
              </property>
             </widget>
            </item>

+           <item row="3" column="0">
+            <widget class="QLabel" name="label_5">
+             <property name="font">
+              <font>
+               <weight>75</weight>
+               <italic>true</italic>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="text">
+              <string>Display time shift:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="1">
+            <layout class="QHBoxLayout" name="horizontalLayout">
+             <item>
+              <widget class="QSpinBox" name="conferenceDtsHours">
+               <property name="toolTip">
+                <string>hour</string>
+               </property>
+               <property name="suffix">
+                <string> H</string>
+               </property>
+               <property name="minimum">
+                <number>-14</number>
+               </property>
+               <property name="maximum">
+                <number>14</number>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QSpinBox" name="conferenceDtsMinutes">
+               <property name="toolTip">
+                <string>minutes</string>
+               </property>
+               <property name="suffix">
+                <string> M</string>
+               </property>
+               <property name="maximum">
+                <number>59</number>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>

           </layout>
          </item>
          <item>
           </layout>
          </item>
          <item>


@@ -194,7 +271,7 @@
               <string>Reload from URL</string>
              </property>
              <property name="icon">
               <string>Reload from URL</string>
              </property>
              <property name="icon">

-              <iconset resource="../icons.qrc">
+              <iconset>

                <normaloff>:/icons/reload.png</normaloff>:/icons/reload.png</iconset>
              </property>
             </widget>
                <normaloff>:/icons/reload.png</normaloff>:/icons/reload.png</iconset>
              </property>
             </widget>


@@ -250,9 +327,15 @@
    </item>
   </layout>
  </widget>
    </item>
   </layout>
  </widget>

- <resources>
-  <include location="../../data/data.qrc"/>
-  <include location="../icons.qrc"/>
- </resources>
+ <tabstops>
+  <tabstop>confView</tabstop>
+  <tabstop>addBtn</tabstop>
+  <tabstop>removeBtn</tabstop>
+  <tabstop>conferenceDtsHours</tabstop>
+  <tabstop>conferenceDtsMinutes</tabstop>
+  <tabstop>refreshBtn</tabstop>
+  <tabstop>changeUrl</tabstop>
+ </tabstops>
+ <resources/>

  <connections/>
 </ui>
  <connections/>
 </ui>