remoteSyncDialog.ui   remoteSyncDialog.ui 
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>remoteSyncDialog</class> <class>remoteSyncDialog</class>
<widget class="QWidget" name="remoteSyncDialog"> <widget class="QWidget" name="remoteSyncDialog">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>530</width> <width>634</width>
<height>396</height> <height>685</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Remote Control Configuration</string> <string>Remote Control Configuration</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<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 148 skipping to change at line 148
<number>0</number> <number>0</number>
</property> </property>
<property name="documentMode"> <property name="documentMode">
<bool>false</bool> <bool>false</bool>
</property> </property>
<widget class="QWidget" name="settingsTab"> <widget class="QWidget" name="settingsTab">
<attribute name="title"> <attribute name="title">
<string>Remote Sync</string> <string>Remote Sync</string>
</attribute> </attribute>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<item row="3" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Status:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="statusLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2"> <item row="5" column="0" colspan="2">
<widget class="QGroupBox" name="serverGroupBox"> <widget class="QGroupBox" name="serverGroupBox">
<property name="title"> <property name="title">
<string>Server mode</string> <string>Server mode</string>
</property> </property>
<layout class="QFormLayout" name="formLayout_2"> <layout class="QFormLayout" name="formLayout_2">
<item row="3" column="0" colspan="2"> <item row="3" column="0" colspan="2">
<widget class="QPushButton" name="serverButton"> <widget class="QPushButton" name="serverButton">
<property name="text"> <property name="text">
<string>Start server</string> <string>Start server</string>
skipping to change at line 205 skipping to change at line 219
<number>20180</number> <number>20180</number>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_serverName"> <widget class="QLabel" name="label_serverName">
<property name="text"> <property name="text">
<string>Server Name, IP: </string> <string notr="true">Server Name, IP: </string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="8" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>120</height>
</size>
</property>
</spacer>
</item>
<item row="9" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QPushButton" name="restoreDefaultsButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Restore default settings</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="saveSettingsButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Save settings as default</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Status:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="statusLabel">
<property name="text">
<string>StatusLabel</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2"> <item row="7" column="0" colspan="2">
<widget class="QGroupBox" name="clientGroupBox"> <widget class="QGroupBox" name="clientGroupBox">
<property name="title"> <property name="title">
<string>Client mode</string> <string>Client mode</string>
</property> </property>
<layout class="QFormLayout" name="formLayout_3"> <layout class="QFormLayout" name="formLayout_3">
<item row="4" column="0" colspan="2"> <item row="4" column="0" colspan="2">
<widget class="QPushButton" name="clientButton"> <widget class="QPushButton" name="clientButton">
<property name="text"> <property name="text">
<string>Connect to server</string> <string>Connect to server</string>
skipping to change at line 302 skipping to change at line 259
<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="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>Server host address/name</string> <string>Server host address/name</string>
</property> </property>
<property name="buddy">
<cstring>clientServerHostEdit</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="clientServerHostEdit"> <widget class="QLineEdit" name="clientServerHostEdit">
<property name="text"> <property name="text">
<string>127.0.0.1</string> <string>127.0.0.1</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
<string>Server port</string> <string>Server port</string>
</property> </property>
<property name="buddy">
<cstring>clientServerPortSpinBox</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QSpinBox" name="clientServerPortSpinBox"> <widget class="QSpinBox" name="clientServerPortSpinBox">
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>65535</number> <number>65535</number>
</property> </property>
<property name="value"> <property name="value">
<number>20180</number> <number>20180</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>When connection is lost</string>
</property>
<property name="buddy">
<cstring>comboBoxClientConnectionLost</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="comboBoxClientConnectionLost"
>
<item>
<property name="text">
<string>Do nothing</string>
</property>
</item>
<item>
<property name="text">
<string>Try reconnecting</string>
</property>
</item>
<item>
<property name="text">
<string>Quit</string>
</property>
</item>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>When server quits</string>
</property>
<property name="buddy">
<cstring>comboBoxClientServerQuits</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="comboBoxClientServerQuits"/>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="8" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>120</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="clientSettingsTab">
<attribute name="title">
<string>Client settings</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label_6">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
<strikeout>false</strikeout>
</font>
</property>
<property name="text">
<string>Changes on this page require a re-connection to the serve
r</string>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Settings applied on this client</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="2">
<widget class="QCheckBox" name="checkBoxOptionSelection">
<property name="text">
<string>Selection</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroupSyncOptions</string>
</attribute>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="checkBoxOptionTime">
<property name="text">
<string>Time</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroupSyncOptions</string>
</attribute>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="checkBoxOptionLocation">
<property name="text">
<string>Location</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroupSyncOptions</string>
</attribute>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="checkBoxOptionStelProperty">
<property name="text">
<string>StelProperty</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroupSyncOptions</string>
</attribute>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="checkBoxOptionView">
<property name="text">
<string>View direction</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroupSyncOptions</string>
</attribute>
</widget>
</item>
<item row="1" column="2">
<widget class="QCheckBox" name="checkBoxOptionFov">
<property name="text">
<string>Field of view</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroupSyncOptions</string>
</attribute>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Property filters</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QCheckBox" name="checkBoxExcludeGUIProps">
<property name="text">
<string>Exclude GUI-related properties</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroupSyncOptions</string>
</attribute>
</widget>
</item>
<item row="2" column="0">
<layout class="QGridLayout" name="gridLayoutMoveToGroupbox2">
<item row="1" column="0">
<widget class="QListWidget" name="listWidgetAllProperties">
<property name="toolTip">
<string>These are all available properties.</string>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
</widget>
</item>
<item row="1" column="1">
<layout class="QVBoxLayout" name="verticalLayoutExclusionButto
ns">
<property name="topMargin">
<number>120</number>
</property>
<property name="bottomMargin">
<number>120</number>
</property>
<item>
<widget class="QPushButton" name="pushButtonSelectProperties
">
<property name="text">
<string notr="true">--&gt;</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonDeselectProperti
es">
<property name="text">
<string notr="true">&lt;--</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="2">
<widget class="QListWidget" name="listWidgetSelectedProperties
">
<property name="toolTip">
<string>These are the properties currently excluded from syn
chronisation.</string>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="labelExcluded">
<property name="text">
<string>Excluded Properties</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="labelSynced">
<property name="text">
<string>Synchronized Properties</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Additional excluded properties:</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="aboutTab"> <widget class="QWidget" name="aboutTab">
<attribute name="title"> <attribute name="title">
<string comment="tab in plugin windows">About</string> <string comment="tab in plugin windows">About</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_11"> <layout class="QVBoxLayout" name="verticalLayout_11">
<property name="spacing"> <property name="spacing">
<number>9</number> <number>9</number>
</property> </property>
skipping to change at line 361 skipping to change at line 559
</property> </property>
<property name="openLinks"> <property name="openLinks">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</widget> </widget>
</item> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<item>
<widget class="QPushButton" name="restoreDefaultsButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Restore default settings</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="saveSettingsButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Save settings as default</string>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>BarFrame</class> <class>BarFrame</class>
<extends>QFrame</extends> <extends>QFrame</extends>
<header>Dialog.hpp</header> <header>Dialog.hpp</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>
<connections/> <connections/>
<buttongroups>
<buttongroup name="buttonGroupSyncOptions">
<property name="exclusive">
<bool>false</bool>
</property>
</buttongroup>
</buttongroups>
</ui> </ui>
 End of changes. 10 change blocks. 
60 lines changed or deleted 314 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/