locationDialogGui.ui   locationDialogGui.ui 
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>locationDialogForm</class> <class>locationDialogForm</class>
<widget class="QWidget" name="locationDialogForm"> <widget class="QWidget" name="locationDialogForm">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>700</width> <width>700</width>
<height>460</height> <height>506</height>
</rect> </rect>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true"/>
</property> </property>
<layout class="QVBoxLayout"> <layout class="QVBoxLayout">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
skipping to change at line 396 skipping to change at line 396
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="1" column="2" colspan="2"> <item row="2" column="1" colspan="3">
<spacer name="verticalSpacer"> <widget class="QFrame" name="frame_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1">
<widget class="QFrame" name="frame_4">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="horizontalSpacing"> <item>
<number>6</number> <spacer name="horizontalSpacer">
</property> <property name="orientation">
<item row="0" column="0"> <enum>Qt::Horizontal</enum>
<widget class="QLabel" name="label_5">
<property name="text">
<string>Latitude:</string>
</property> </property>
</widget> <property name="sizeHint" stdset="0">
</item>
<item row="0" column="1">
<widget class="AngleSpinBox" name="latitudeSpinBox">
<property name="minimumSize">
<size> <size>
<width>180</width> <width>40</width>
<height>24</height> <height>20</height>
</size> </size>
</property> </property>
<property name="toolTip"> </spacer>
<string>You can enter values in decimal degrees, or using dm
s format, for example: +1d 12m 8s</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item> </item>
<item row="1" column="0"> <item>
<widget class="QLabel" name="label"> <widget class="QPushButton" name="addLocationToListPushButton"
<property name="text"> >
<string>Longitude:</string> <property name="enabled">
<bool>false</bool>
</property> </property>
</widget>
</item>
<item row="1" column="1">
<widget class="AngleSpinBox" name="longitudeSpinBox">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>140</width> <width>100</width>
<height>24</height> <height>0</height>
</size> </size>
</property> </property>
<property name="toolTip"> <property name="focusPolicy">
<string>You can enter values in decimal degrees, or using dm <enum>Qt::NoFocus</enum>
s format, for example: +1d 12m 8s</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
<string>Altitude:</string> <string>Add to list</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item>
<widget class="QSpinBox" name="altitudeSpinBox"> <widget class="QPushButton" name="deleteLocationFromListPushBu
tton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>60</width>
<height>24</height> <height>0</height>
</size> </size>
</property> </property>
<property name="toolTip"> <property name="focusPolicy">
<string>Enter the altitude in meter</string> <enum>Qt::NoFocus</enum>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="suffix"> <property name="text">
<string> m</string> <string>Delete from list</string>
</property> </property>
<property name="minimum"> </widget>
<number>-2000</number> </item>
<item>
<widget class="QPushButton" name="pushButtonReturnToDefault">
<property name="enabled">
<bool>false</bool>
</property> </property>
<property name="maximum"> <property name="focusPolicy">
<number>200000</number> <enum>Qt::NoFocus</enum>
</property> </property>
<property name="singleStep"> <property name="text">
<number>100</number> <string>Return to default location</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="3"> <item row="0" column="1">
<widget class="QFrame" name="frame_3"> <widget class="QFrame" name="frame_4">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QGridLayout" name="gridLayout_4">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <property name="horizontalSpacing">
<widget class="QPushButton" name="pushButtonReturnToDefault"> <number>6</number>
<property name="enabled"> </property>
<bool>false</bool> <item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="useAsDefaultLocationCheckBox">
<property name="text">
<string>Use current location as default</string>
</property> </property>
<property name="focusPolicy"> </widget>
<enum>Qt::NoFocus</enum> </item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Longitude:</string>
</property> </property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>Return to default location</string> <string>Latitude:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="4" column="0" colspan="2">
<spacer name="horizontalSpacer"> <widget class="QCheckBox" name="useIpQueryCheckBox">
<property name="orientation"> <property name="text">
<enum>Qt::Horizontal</enum> <string>Get location from Network</string>
</property> </property>
<property name="sizeHint" stdset="0"> </widget>
</item>
<item row="1" column="1">
<widget class="AngleSpinBox" name="longitudeSpinBox">
<property name="minimumSize">
<size> <size>
<width>40</width> <width>140</width>
<height>20</height> <height>24</height>
</size> </size>
</property> </property>
</spacer> <property name="toolTip">
</item> <string>You can enter values in decimal degrees, or using dm
<item> s format, for example: +1d 12m 8s</string>
<widget class="QPushButton" name="deleteLocationFromListPushBu
tton">
<property name="enabled">
<bool>false</bool>
</property> </property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSpinBox" name="altitudeSpinBox">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>60</width> <width>100</width>
<height>0</height> <height>24</height>
</size> </size>
</property> </property>
<property name="focusPolicy"> <property name="toolTip">
<enum>Qt::NoFocus</enum> <string>Enter the altitude in meter</string>
</property> </property>
<property name="text"> <property name="alignment">
<string>Delete</string> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="suffix">
<string> m</string>
</property>
<property name="minimum">
<number>-2000</number>
</property>
<property name="maximum">
<number>200000</number>
</property>
<property name="singleStep">
<number>100</number>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="1">
<widget class="QPushButton" name="addLocationToListPushButton" <widget class="AngleSpinBox" name="latitudeSpinBox">
>
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>180</width>
<height>0</height> <height>24</height>
</size> </size>
</property> </property>
<property name="focusPolicy"> <property name="toolTip">
<enum>Qt::NoFocus</enum> <string>You can enter values in decimal degrees, or using dm
s format, for example: +1d 12m 8s</string>
</property> </property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
<string>Add to list</string> <string>Altitude:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="2">
<spacer name="horizontalSpacer_2"> <spacer name="horizontalSpacer_2">
<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 657 skipping to change at line 671
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Name/City:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="cityNameLineEdit">
<property name="placeholderText">
<string>New Location</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Country:</string>
</property>
</widget>
</item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QComboBox" name="countryNameComboBox"> <widget class="QComboBox" name="countryNameComboBox">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
skipping to change at line 706 skipping to change at line 699
</size> </size>
</property> </property>
<property name="editable"> <property name="editable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="insertPolicy"> <property name="insertPolicy">
<enum>QComboBox::NoInsert</enum> <enum>QComboBox::NoInsert</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1">
<widget class="QLineEdit" name="cityNameLineEdit">
<property name="placeholderText">
<string>New Location</string>
</property>
</widget>
</item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>Planet:</string> <string>Planet:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="useCustomTimeZoneCheckBox">
<property name="text">
<string>Use custom time zone</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="timeZoneLabel">
<property name="text">
<string>Time zone:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Name/City:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="timeZoneNameComboBox">
<property name="enabled">
<bool>true</bool>
</property>
<property name="editable">
<bool>true</bool>
</property>
<property name="insertPolicy">
<enum>QComboBox::NoInsert</enum>
</property>
</widget>
</item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QComboBox" name="planetNameComboBox"> <widget class="QComboBox" name="planetNameComboBox">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
skipping to change at line 741 skipping to change at line 775
</size> </size>
</property> </property>
<property name="editable"> <property name="editable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="insertPolicy"> <property name="insertPolicy">
<enum>QComboBox::NoInsert</enum> <enum>QComboBox::NoInsert</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Country:</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="dstCheckBox">
<property name="toolTip">
<string/>
</property>
<property name="text">
<string>Enable daylight saving time</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="3" column="1">
<widget class="QCheckBox" name="useAsDefaultLocationCheckBox">
<property name="text">
<string>Use current location as default</string>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QCheckBox" name="useIpQueryCheckBox">
<property name="text">
<string>Get location from Network</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
 End of changes. 45 change blocks. 
153 lines changed or deleted 190 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/