defineTimeZone.ui   defineTimeZone.ui 
skipping to change at line 164 skipping to change at line 164
<item> <item>
<widget class="QLineEdit" name="lineEditName"/> <widget class="QLineEdit" name="lineEditName"/>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayoutOffset"> <layout class="QHBoxLayout" name="horizontalLayoutOffset">
<item> <item>
<widget class="QLabel" name="labelOffset"> <widget class="QLabel" name="labelOffset">
<property name="text"> <property name="text">
<string>Offset from UTC:</string> <string>Offset from UTC (hours):</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
skipping to change at line 186 skipping to change at line 186
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QDoubleSpinBox" name="doubleSpinBoxOffset"> <widget class="QDoubleSpinBox" name="doubleSpinBoxOffset">
<property name="wrapping"> <property name="wrapping">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="suffix">
<string> hours</string>
</property>
<property name="minimum"> <property name="minimum">
<double>-24.000000000000000</double> <double>-24.000000000000000</double>
</property> </property>
<property name="maximum"> <property name="maximum">
<double>24.000000000000000</double> <double>24.000000000000000</double>
</property> </property>
<property name="singleStep"> <property name="singleStep">
<double>0.250000000000000</double> <double>0.250000000000000</double>
</property> </property>
</widget> </widget>
skipping to change at line 262 skipping to change at line 259
<item> <item>
<widget class="QLineEdit" name="lineEditNameDst"/> <widget class="QLineEdit" name="lineEditNameDst"/>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayoutOffsetDst"> <layout class="QHBoxLayout" name="horizontalLayoutOffsetDst">
<item> <item>
<widget class="QCheckBox" name="checkBoxOffsetDst"> <widget class="QCheckBox" name="checkBoxOffsetDst">
<property name="text"> <property name="text">
<string>DST offset from UTC:</string> <string>DST offset from UTC (hours):</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacerOffsetDst"> <spacer name="horizontalSpacerOffsetDst">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
skipping to change at line 284 skipping to change at line 281
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QDoubleSpinBox" name="doubleSpinBoxOffsetDst" > <widget class="QDoubleSpinBox" name="doubleSpinBoxOffsetDst" >
<property name="wrapping"> <property name="wrapping">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="suffix">
<string> hours</string>
</property>
<property name="minimum"> <property name="minimum">
<double>-24.000000000000000</double> <double>-24.000000000000000</double>
</property> </property>
<property name="maximum"> <property name="maximum">
<double>24.000000000000000</double> <double>24.000000000000000</double>
</property> </property>
<property name="singleStep"> <property name="singleStep">
<double>0.250000000000000</double> <double>0.250000000000000</double>
</property> </property>
</widget> </widget>
skipping to change at line 325 skipping to change at line 319
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QRadioButton" name="radioButtonDstStartDay"> <widget class="QRadioButton" name="radioButtonDstStartDay">
<property name="text"> <property name="text">
<string>Day:</string> <string>Day:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="1" column="5">
<widget class="QComboBox" name="comboBoxDstStartWeek"/>
</item>
<item row="1" column="3">
<widget class="QComboBox" name="comboBoxDstStartDay"/>
</item>
<item row="1" column="4">
<widget class="QComboBox" name="comboBoxDstStartMonth"/> <widget class="QComboBox" name="comboBoxDstStartMonth"/>
</item> </item>
<item row="4" column="0" colspan="2"> <item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="checkBoxDstStartTime"> <widget class="QCheckBox" name="checkBoxDstStartTime">
<property name="text"> <property name="text">
<string>Time of change:</string> <string>Time of change:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="2" colspan="3"> <item row="4" column="2" colspan="4">
<widget class="QTimeEdit" name="timeEditDstStart"> <widget class="QTimeEdit" name="timeEditDstStart">
<property name="wrapping"> <property name="wrapping">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="displayFormat">
<string notr="true">HH:mm:ss</string>
</property>
<property name="time"> <property name="time">
<time> <time>
<hour>2</hour> <hour>2</hour>
<minute>0</minute> <minute>0</minute>
<second>0</second> <second>0</second>
</time> </time>
</property> </property>
<property name="displayFormat">
<string notr="true">HH:mm:ss</string>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="2">
<widget class="QRadioButton" name="radioButtonDstStartDate"> <widget class="QRadioButton" name="radioButtonDstStartDate">
<property name="text"> <property name="text">
<string>Date:</string> <string>Date:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="2" colspan="3"> <item row="2" column="2" colspan="4">
<widget class="QFrame" name="frameDstStartDate"> <widget class="QFrame" name="frameDstStartDate">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QSpinBox" name="spinBoxDstStartDateDay"/> <widget class="QSpinBox" name="spinBoxDstStartDateDay"/>
</item> </item>
<item> <item>
<widget class="QComboBox" name="comboBoxDstStartDateMonth"/ > <widget class="QComboBox" name="comboBoxDstStartDateMonth"/ >
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="3" colspan="2">
<widget class="QComboBox" name="comboBoxDstStartWeek"/>
</item>
<item row="1" column="2">
<widget class="QComboBox" name="comboBoxDstStartDay"/>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBoxDstEnd"> <widget class="QGroupBox" name="groupBoxDstEnd">
<property name="title"> <property name="title">
<string>Daylight saving time end</string> <string>Daylight saving time end</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
skipping to change at line 405 skipping to change at line 399
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QRadioButton" name="radioButtonDstEndDay"> <widget class="QRadioButton" name="radioButtonDstEndDay">
<property name="text"> <property name="text">
<string>Day:</string> <string>Day:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="1" column="5">
<widget class="QComboBox" name="comboBoxDstEndWeek"/>
</item>
<item row="1" column="3">
<widget class="QComboBox" name="comboBoxDstEndDay"/>
</item>
<item row="1" column="4">
<widget class="QComboBox" name="comboBoxDstEndMonth"/> <widget class="QComboBox" name="comboBoxDstEndMonth"/>
</item> </item>
<item row="4" column="0" colspan="2"> <item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="checkBoxDstEndTime"> <widget class="QCheckBox" name="checkBoxDstEndTime">
<property name="text"> <property name="text">
<string>Time of change:</string> <string>Time of change:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="2" colspan="3"> <item row="4" column="2" colspan="4">
<widget class="QTimeEdit" name="timeEditDstEnd"> <widget class="QTimeEdit" name="timeEditDstEnd">
<property name="wrapping"> <property name="wrapping">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="displayFormat">
<string notr="true">HH:mm:ss</string>
</property>
<property name="time"> <property name="time">
<time> <time>
<hour>2</hour> <hour>2</hour>
<minute>0</minute> <minute>0</minute>
<second>0</second> <second>0</second>
</time> </time>
</property> </property>
<property name="displayFormat">
<string notr="true">HH:mm:ss</string>
</property>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="2"> <item row="3" column="0" colspan="2">
<widget class="QRadioButton" name="radioButtonDstEndDate"> <widget class="QRadioButton" name="radioButtonDstEndDate">
<property name="text"> <property name="text">
<string>Date:</string> <string>Date:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2" colspan="3"> <item row="3" column="2" colspan="4">
<widget class="QFrame" name="frameDstEndDate"> <widget class="QFrame" name="frameDstEndDate">
<layout class="QHBoxLayout" name="horizontalLayoutDstEndDate" > <layout class="QHBoxLayout" name="horizontalLayoutDstEndDate" >
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QSpinBox" name="spinBoxDstEndDateDay"/> <widget class="QSpinBox" name="spinBoxDstEndDateDay"/>
</item> </item>
<item> <item>
<widget class="QComboBox" name="comboBoxDstEndDateMonth"/> <widget class="QComboBox" name="comboBoxDstEndDateMonth"/>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="3" colspan="2">
<widget class="QComboBox" name="comboBoxDstEndWeek"/>
</item>
<item row="1" column="2">
<widget class="QComboBox" name="comboBoxDstEndDay"/>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
skipping to change at line 506 skipping to change at line 500
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>lineEditName</tabstop> <tabstop>lineEditName</tabstop>
<tabstop>doubleSpinBoxOffset</tabstop> <tabstop>doubleSpinBoxOffset</tabstop>
<tabstop>checkBoxDst</tabstop> <tabstop>checkBoxDst</tabstop>
<tabstop>lineEditNameDst</tabstop> <tabstop>lineEditNameDst</tabstop>
<tabstop>checkBoxOffsetDst</tabstop> <tabstop>checkBoxOffsetDst</tabstop>
<tabstop>doubleSpinBoxOffsetDst</tabstop> <tabstop>doubleSpinBoxOffsetDst</tabstop>
<tabstop>groupBoxDstStart</tabstop>
<tabstop>radioButtonDstStartDay</tabstop> <tabstop>radioButtonDstStartDay</tabstop>
<tabstop>comboBoxDstStartWeek</tabstop> <tabstop>groupBoxDstStart</tabstop>
<tabstop>comboBoxDstStartDay</tabstop> <tabstop>comboBoxDstStartDay</tabstop>
<tabstop>comboBoxDstStartWeek</tabstop>
<tabstop>comboBoxDstStartMonth</tabstop> <tabstop>comboBoxDstStartMonth</tabstop>
<tabstop>radioButtonDstStartDate</tabstop> <tabstop>radioButtonDstStartDate</tabstop>
<tabstop>spinBoxDstStartDateDay</tabstop> <tabstop>spinBoxDstStartDateDay</tabstop>
<tabstop>comboBoxDstStartDateMonth</tabstop> <tabstop>comboBoxDstStartDateMonth</tabstop>
<tabstop>checkBoxDstStartTime</tabstop> <tabstop>checkBoxDstStartTime</tabstop>
<tabstop>timeEditDstStart</tabstop> <tabstop>timeEditDstStart</tabstop>
<tabstop>groupBoxDstEnd</tabstop> <tabstop>groupBoxDstEnd</tabstop>
<tabstop>radioButtonDstEndDay</tabstop> <tabstop>radioButtonDstEndDay</tabstop>
<tabstop>comboBoxDstEndWeek</tabstop>
<tabstop>comboBoxDstEndDay</tabstop> <tabstop>comboBoxDstEndDay</tabstop>
<tabstop>comboBoxDstEndWeek</tabstop>
<tabstop>comboBoxDstEndMonth</tabstop> <tabstop>comboBoxDstEndMonth</tabstop>
<tabstop>radioButtonDstEndDate</tabstop> <tabstop>radioButtonDstEndDate</tabstop>
<tabstop>spinBoxDstEndDateDay</tabstop> <tabstop>spinBoxDstEndDateDay</tabstop>
<tabstop>comboBoxDstEndDateMonth</tabstop> <tabstop>comboBoxDstEndDateMonth</tabstop>
<tabstop>checkBoxDstEndTime</tabstop> <tabstop>checkBoxDstEndTime</tabstop>
<tabstop>timeEditDstEnd</tabstop> <tabstop>timeEditDstEnd</tabstop>
<tabstop>pushButtonUseDefinition</tabstop> <tabstop>pushButtonUseDefinition</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <connections>
 End of changes. 21 change blocks. 
35 lines changed or deleted 29 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/