Index: /trunk/FACT++/gui/FactGui.h
===================================================================
--- /trunk/FACT++/gui/FactGui.h	(revision 10568)
+++ /trunk/FACT++/gui/FactGui.h	(revision 10569)
@@ -623,5 +623,4 @@
 
         DimData(DimInfo *inf) :
-            time(inf->getTimestamp(), inf->getTimestampMillisecs()*1000),
             qos(inf->getQuality()),
             name(inf->getName()),
@@ -630,4 +629,9 @@
             info(inf)
         {
+            // Must be called in exactly this order!
+            const int tsec = inf->getTimestamp();
+            const int tms  = inf->getTimestampMillisecs();
+
+            time = Time(tsec, tms*1000);
         }
 
@@ -752,8 +756,8 @@
         }
 
-        if (space/10000000>static_cast<size_t>(fLoggerSpaceLeft->maximum()))
-            fLoggerSpaceLeft->setValue(fLoggerSpaceLeft->maximum());  // MB
+        if (space/1000000>static_cast<size_t>(fLoggerSpaceLeft->maximum()))
+            fLoggerSpaceLeft->setValue(fLoggerSpaceLeft->maximum());  // GB
         else
-            fLoggerSpaceLeft->setValue(space/10000000);  // MB
+            fLoggerSpaceLeft->setValue(space/1000000);  // MB
     }
 
@@ -1002,10 +1006,10 @@
 
         fTriggerSeqPed->setValue(sdata.fTriggerSeqPed);
-        fTriggerSeqLP1->setValue(sdata.fTriggerSeqLP1);
-        fTriggerSeqLP2->setValue(sdata.fTriggerSeqLP2);
+        fTriggerSeqLPint->setValue(sdata.fTriggerSeqLPint);
+        fTriggerSeqLPext->setValue(sdata.fTriggerSeqLPext);
 
         fEnableTrigger->setChecked(sdata.HasTrigger());
-        fEnableLP1->setChecked(sdata.HasLP1());
-        fEnableLP2->setChecked(sdata.HasLP2());
+        fEnableLPint->setChecked(sdata.HasLPint());
+        fEnableLPext->setChecked(sdata.HasLPext());
         fEnableVeto->setChecked(sdata.HasVeto());
         fEnablePedestal->setChecked(sdata.HasPedestal());
@@ -1355,5 +1359,6 @@
     {
         // Initialize the time-stamp (what a weird workaround...)
-        getInfo()->getTimestamp();
+        if (getInfo())
+            getInfo()->getTimestamp();
 
         if (getInfo()==&fDimDNS)
Index: /trunk/FACT++/gui/design.ui
===================================================================
--- /trunk/FACT++/gui/design.ui	(revision 10568)
+++ /trunk/FACT++/gui/design.ui	(revision 10569)
@@ -52,5 +52,5 @@
       </property>
       <property name="currentIndex">
-       <number>1</number>
+       <number>0</number>
       </property>
       <property name="documentMode">
@@ -583,85 +583,5 @@
                   <number>0</number>
                  </property>
-                 <item row="1" column="0">
-                  <widget class="QCheckBox" name="fEnableTrigger">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                     <horstretch>0</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                   <property name="text">
-                    <string/>
-                   </property>
-                   <property name="checked">
-                    <bool>false</bool>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="1" column="1">
-                  <widget class="QCheckBox" name="fEnableExt1">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                     <horstretch>0</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                   <property name="text">
-                    <string/>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="1" column="2">
-                  <widget class="QCheckBox" name="fEnableExt2">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                     <horstretch>0</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                   <property name="text">
-                    <string/>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="1" column="3">
-                  <widget class="QCheckBox" name="fEnableTimeMarker">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                     <horstretch>0</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                   <property name="text">
-                    <string/>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="1" column="5">
-                  <widget class="QCheckBox" name="fEnableVeto">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                     <horstretch>0</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                   <property name="maximumSize">
-                    <size>
-                     <width>16777215</width>
-                     <height>16777215</height>
-                    </size>
-                   </property>
-                   <property name="baseSize">
-                    <size>
-                     <width>0</width>
-                     <height>0</height>
-                    </size>
-                   </property>
-                   <property name="text">
-                    <string/>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="0">
+                 <item row="0" column="1">
                   <widget class="QLabel" name="label_23">
                    <property name="text">
@@ -673,5 +593,5 @@
                   </widget>
                  </item>
-                 <item row="0" column="1">
+                 <item row="0" column="2">
                   <widget class="QLabel" name="label_29">
                    <property name="text">
@@ -683,5 +603,5 @@
                   </widget>
                  </item>
-                 <item row="0" column="2">
+                 <item row="0" column="3">
                   <widget class="QLabel" name="label_30">
                    <property name="text">
@@ -693,5 +613,5 @@
                   </widget>
                  </item>
-                 <item row="0" column="3">
+                 <item row="0" column="4">
                   <widget class="QLabel" name="label_28">
                    <property name="text">
@@ -703,5 +623,5 @@
                   </widget>
                  </item>
-                 <item row="1" column="4">
+                 <item row="1" column="5">
                   <spacer name="horizontalSpacer_30">
                    <property name="orientation">
@@ -719,5 +639,5 @@
                   </spacer>
                  </item>
-                 <item row="0" column="5">
+                 <item row="0" column="6">
                   <widget class="QLabel" name="label_27">
                    <property name="text">
@@ -728,4 +648,128 @@
                    </property>
                   </widget>
+                 </item>
+                 <item row="1" column="6">
+                  <layout class="QHBoxLayout" name="horizontalLayout_20">
+                   <item>
+                    <widget class="QCheckBox" name="fEnableVeto">
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="maximumSize">
+                      <size>
+                       <width>21</width>
+                       <height>16777215</height>
+                      </size>
+                     </property>
+                     <property name="baseSize">
+                      <size>
+                       <width>0</width>
+                       <height>0</height>
+                      </size>
+                     </property>
+                     <property name="text">
+                      <string/>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                 <item row="1" column="4">
+                  <layout class="QHBoxLayout" name="horizontalLayout_19">
+                   <item>
+                    <widget class="QCheckBox" name="fEnableTimeMarker">
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="maximumSize">
+                      <size>
+                       <width>21</width>
+                       <height>16777215</height>
+                      </size>
+                     </property>
+                     <property name="text">
+                      <string/>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                 <item row="1" column="3">
+                  <layout class="QHBoxLayout" name="horizontalLayout_18">
+                   <item>
+                    <widget class="QCheckBox" name="fEnableExt2">
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="maximumSize">
+                      <size>
+                       <width>21</width>
+                       <height>16777215</height>
+                      </size>
+                     </property>
+                     <property name="text">
+                      <string/>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                 <item row="1" column="2">
+                  <layout class="QHBoxLayout" name="horizontalLayout_17">
+                   <item>
+                    <widget class="QCheckBox" name="fEnableExt1">
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="maximumSize">
+                      <size>
+                       <width>21</width>
+                       <height>16777215</height>
+                      </size>
+                     </property>
+                     <property name="text">
+                      <string/>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                 <item row="1" column="1">
+                  <layout class="QHBoxLayout" name="horizontalLayout_16">
+                   <item>
+                    <widget class="QCheckBox" name="fEnableTrigger">
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="maximumSize">
+                      <size>
+                       <width>21</width>
+                       <height>16777215</height>
+                      </size>
+                     </property>
+                     <property name="text">
+                      <string/>
+                     </property>
+                     <property name="checked">
+                      <bool>false</bool>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
                  </item>
                 </layout>
@@ -786,5 +830,5 @@
                  </item>
                  <item row="4" column="3">
-                  <widget class="QSpinBox" name="fTriggerSeqLP1">
+                  <widget class="QSpinBox" name="fTriggerSeqLPint">
                    <property name="enabled">
                     <bool>false</bool>
@@ -805,5 +849,5 @@
                  </item>
                  <item row="4" column="5">
-                  <widget class="QSpinBox" name="fTriggerSeqLP2">
+                  <widget class="QSpinBox" name="fTriggerSeqLPext">
                    <property name="enabled">
                     <bool>false</bool>
@@ -836,15 +880,5 @@
                   <widget class="QLabel" name="label_38">
                    <property name="text">
-                    <string>LP2</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignBottom|Qt::AlignHCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="2" column="3">
-                  <widget class="QLabel" name="label_36">
-                   <property name="text">
-                    <string>LP1</string>
+                    <string>LPext</string>
                    </property>
                    <property name="alignment">
@@ -866,23 +900,9 @@
                       </sizepolicy>
                      </property>
-                     <property name="text">
-                      <string/>
-                     </property>
-                    </widget>
-                   </item>
-                  </layout>
-                 </item>
-                 <item row="3" column="3">
-                  <layout class="QHBoxLayout" name="horizontalLayout_12">
-                   <property name="rightMargin">
-                    <number>0</number>
-                   </property>
-                   <item>
-                    <widget class="QCheckBox" name="fEnableLP1">
-                     <property name="sizePolicy">
-                      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                       <horstretch>0</horstretch>
-                       <verstretch>0</verstretch>
-                      </sizepolicy>
+                     <property name="maximumSize">
+                      <size>
+                       <width>21</width>
+                       <height>16777215</height>
+                      </size>
                      </property>
                      <property name="text">
@@ -893,11 +913,11 @@
                   </layout>
                  </item>
-                 <item row="3" column="5">
-                  <layout class="QHBoxLayout" name="horizontalLayout_13">
+                 <item row="3" column="3">
+                  <layout class="QHBoxLayout" name="horizontalLayout_12">
                    <property name="rightMargin">
                     <number>0</number>
                    </property>
                    <item>
-                    <widget class="QCheckBox" name="fEnableLP2">
+                    <widget class="QCheckBox" name="fEnableLPint">
                      <property name="sizePolicy">
                       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -905,4 +925,10 @@
                        <verstretch>0</verstretch>
                       </sizepolicy>
+                     </property>
+                     <property name="maximumSize">
+                      <size>
+                       <width>21</width>
+                       <height>16777215</height>
+                      </size>
                      </property>
                      <property name="text">
@@ -912,4 +938,40 @@
                    </item>
                   </layout>
+                 </item>
+                 <item row="3" column="5">
+                  <layout class="QHBoxLayout" name="horizontalLayout_13">
+                   <property name="rightMargin">
+                    <number>0</number>
+                   </property>
+                   <item>
+                    <widget class="QCheckBox" name="fEnableLPext">
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="maximumSize">
+                      <size>
+                       <width>21</width>
+                       <height>16777215</height>
+                      </size>
+                     </property>
+                     <property name="text">
+                      <string/>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                 <item row="2" column="3">
+                  <widget class="QLabel" name="label_36">
+                   <property name="text">
+                    <string>LPint</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignBottom|Qt::AlignHCenter</set>
+                   </property>
+                  </widget>
                  </item>
                 </layout>
@@ -3522,5 +3584,5 @@
    <property name="minimumSize">
     <size>
-     <width>200</width>
+     <width>223</width>
      <height>291</height>
     </size>
@@ -4435,7 +4497,7 @@
   </connection>
   <connection>
-   <sender>fEnableLP1</sender>
+   <sender>fEnableLPint</sender>
    <signal>toggled(bool)</signal>
-   <receiver>fTriggerSeqLP1</receiver>
+   <receiver>fTriggerSeqLPint</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
@@ -4451,7 +4513,7 @@
   </connection>
   <connection>
-   <sender>fEnableLP2</sender>
+   <sender>fEnableLPext</sender>
    <signal>toggled(bool)</signal>
-   <receiver>fTriggerSeqLP2</receiver>
+   <receiver>fTriggerSeqLPext</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>