telescopeConfigurationDialog.ui   telescopeConfigurationDialog.ui 
skipping to change at line 216 skipping to change at line 216
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>A telescope controlled by an external application, either at this computer or at a remote machine.</string> <string>A telescope controlled by an external application, either at this computer or at a remote machine.</string>
</property> </property>
<property name="text"> <property name="text">
<string>External software or a remote computer</string> <string>External software or a remote computer</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QRadioButton" name="radioButtonTelescopeRTS2">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>24</height>
</size>
</property>
<property name="toolTip">
<string>Telescope which is accessible through RTS2(.org) JSON API<
/string>
</property>
<property name="text">
<string>RTS2 telescope</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButtonTelescopeVirtual"> <widget class="QRadioButton" name="radioButtonTelescopeVirtual">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
skipping to change at line 246 skipping to change at line 268
</item> </item>
<item> <item>
<widget class="QScrollArea" name="scrollArea"> <widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable"> <property name="widgetResizable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<widget class="QWidget" name="scrollAreaWidgetContents"> <widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>-283</y>
<width>549</width> <width>547</width>
<height>520</height> <height>603</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayoutScrollArea"> <layout class="QVBoxLayout" name="verticalLayoutScrollArea">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
skipping to change at line 567 skipping to change at line 589
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBoxConnectionSettings"> <widget class="QGroupBox" name="groupBoxConnectionSettings">
<property name="title"> <property name="title">
<string>Connection settings</string> <string>Connection settings</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayoutConnectionSettings">
<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 row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="labelHost"> <widget class="QLabel" name="labelHost">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>Host:</string> <string>Host:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLineEdit" name="lineEditHostName"> <widget class="QLineEdit" name="lineEditHostName">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>true</bool>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Host name or IPv4 address of the machine that hosts th e telescope server</string> <string>Host name or IPv4 address of the machine that hosts th e telescope server</string>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">localhost</string> <string notr="true">localhost</string>
</property> </property>
<property name="maxLength"> <property name="maxLength">
<number>255</number> <number>255</number>
</property> </property>
skipping to change at line 643 skipping to change at line 665
</property> </property>
<property name="text"> <property name="text">
<string>TCP port:</string> <string>TCP port:</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBoxRTS2Settings">
<property name="title">
<string>RTS2 telescope settings</string>
</property>
<layout class="QGridLayout" name="gridLayoutRTS2Settings">
<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 row="0" column="0">
<widget class="QLabel" name="labelRTS2Host">
<property name="text">
<string>URL:</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="labelRTS2Username">
<property name="text">
<string>Username:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="labelRTS2Password">
<property name="text">
<string>Password:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLineEdit" name="lineEditRTS2Username">
<property name="toolTip">
<string>RTS2 username</string>
</property>
<property name="text">
<string notr="true"/>
</property>
<property name="maxLength">
<number>50</number>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="lineEditRTS2Password">
<property name="toolTip">
<string>RTS2 password</string>
</property>
<property name="text">
<string notr="true"/>
</property>
<property name="maxLength">
<number>50</number>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QLineEdit" name="lineEditRTS2Url">
<property name="toolTip">
<string>URL of the machine that hosts the RTS2 JSON (httpd) se
rver</string>
</property>
<property name="text">
<string notr="true">localhost</string>
</property>
<property name="maxLength">
<number>255</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBoxUserInterface"> <widget class="QGroupBox" name="groupBoxUserInterface">
<property name="title"> <property name="title">
<string>User interface settings</string> <string>User interface settings</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayoutUserInterface"> <layout class="QVBoxLayout" name="verticalLayoutUserInterface">
<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>
 End of changes. 6 change blocks. 
6 lines changed or deleted 114 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/