mpcImportWindow.ui   mpcImportWindow.ui 
skipping to change at line 183 skipping to change at line 183
<item> <item>
<widget class="QGroupBox" name="groupBoxSource"> <widget class="QGroupBox" name="groupBoxSource">
<property name="title"> <property name="title">
<string>Select the source</string> <string>Select the source</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_8"> <layout class="QVBoxLayout" name="verticalLayout_8">
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QRadioButton" name="radioButtonFile">
<property name="text">
<string>A file containing a list of objects</string>
</property>
</widget>
</item>
<item>
<widget class="QFrame" name="frameFile">
<layout class="QHBoxLayout" name="horizontalLayoutFile_2">
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLineEdit" name="lineEditFilePath">
<property name="inputMethodHints">
<set>Qt::ImhNone</set>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonBrowse">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButtonURL"> <widget class="QRadioButton" name="radioButtonURL">
<property name="text"> <property name="text">
<string>Download a list of objects from the Internet</stri ng> <string>Download a list of objects from the Internet</stri ng>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QFrame" name="frameURL"> <widget class="QFrame" name="frameURL">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
skipping to change at line 238 skipping to change at line 205
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_9"> <layout class="QVBoxLayout" name="verticalLayout_9">
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="labelSelect">
<property name="text">
<string>Select a source from the list:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBoxBookmarks"/>
</item>
<item>
<widget class="QLabel" name="labelEnter"> <widget class="QLabel" name="labelEnter">
<property name="text"> <property name="text">
<string>Enter a URL:</string> <string>Or enter a URL:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QFrame" name="frameBookmarkURL"> <widget class="QFrame" name="frameBookmarkURL">
<layout class="QHBoxLayout" name="horizontalLayoutBookma rkURL"> <layout class="QHBoxLayout" name="horizontalLayoutBookma rkURL">
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
skipping to change at line 296 skipping to change at line 273
<string>Bookmark title:</string> <string>Bookmark title:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLineEdit" name="lineEditBookmarkTitle" /> <widget class="QLineEdit" name="lineEditBookmarkTitle" />
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
</layout>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButtonFile">
<property name="text">
<string>A file containing a list of objects</string>
</property>
</widget>
</item>
<item>
<widget class="QFrame" name="frameFile">
<layout class="QHBoxLayout" name="horizontalLayoutFile_2">
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="labelSelect"> <widget class="QLineEdit" name="lineEditFilePath">
<property name="text"> <property name="inputMethodHints">
<string>Or select from the list:</string> <set>Qt::ImhNone</set>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="comboBoxBookmarks"/> <widget class="QPushButton" name="pushButtonBrowse">
<property name="text">
<string>...</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pushButtonAcquire"> <widget class="QPushButton" name="pushButtonAcquire">
<property name="text"> <property name="text">
<string>Get orbital elements</string> <string>Get orbital elements</string>
</property> </property>
</widget> </widget>
skipping to change at line 506 skipping to change at line 506
<widget class="QCheckBox" name="checkBoxOnlyOrbitalElements"> <widget class="QCheckBox" name="checkBoxOnlyOrbitalElements">
<property name="text"> <property name="text">
<string>Update only the orbital elements</string> <string>Update only the orbital elements</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QListWidget" name="listWidgetObjects"> <widget class="QLineEdit" name="lineEditSearch">
<property name="styleSheet">
<string notr="true">QLineEdit {
margin: 0px 0px 4px 0px;
padding: 4px;
padding-left: 32px;
background-image: url(:/graphicGui/searchBoxBackground.png);
background-repeat: none;
background-position: center left;
border: none;
}/* Stolen from the #citySearchLineEdit widget. */</string>
</property>
</widget>
</item>
<item>
<widget class="QListView" name="listViewObjects">
<property name="selectionMode"> <property name="selectionMode">
<enum>QAbstractItemView::NoSelection</enum> <enum>QAbstractItemView::NoSelection</enum>
</property> </property>
<item> <property name="uniformItemSizes">
<property name="text"> <bool>true</bool>
<string notr="true">2P/Encke</string> </property>
</property>
<property name="checkState">
<enum>Unchecked</enum>
</property>
<property name="flags">
<set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
</property>
</item>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QFrame" name="frameMarkButtons"> <widget class="QFrame" name="frameMarkButtons">
<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>
skipping to change at line 587 skipping to change at line 594
<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>
<tabstops> <tabstops>
<tabstop>tabWidget</tabstop> <tabstop>tabWidget</tabstop>
<tabstop>radioButtonAsteroids</tabstop> <tabstop>radioButtonAsteroids</tabstop>
<tabstop>radioButtonComets</tabstop> <tabstop>radioButtonComets</tabstop>
<tabstop>radioButtonFile</tabstop>
<tabstop>pushButtonBrowse</tabstop>
<tabstop>lineEditFilePath</tabstop>
<tabstop>radioButtonURL</tabstop> <tabstop>radioButtonURL</tabstop>
<tabstop>comboBoxBookmarks</tabstop>
<tabstop>lineEditURL</tabstop> <tabstop>lineEditURL</tabstop>
<tabstop>pushButtonPasteURL</tabstop> <tabstop>pushButtonPasteURL</tabstop>
<tabstop>checkBoxAddBookmark</tabstop> <tabstop>checkBoxAddBookmark</tabstop>
<tabstop>lineEditBookmarkTitle</tabstop> <tabstop>lineEditBookmarkTitle</tabstop>
<tabstop>comboBoxBookmarks</tabstop> <tabstop>radioButtonFile</tabstop>
<tabstop>lineEditFilePath</tabstop>
<tabstop>pushButtonBrowse</tabstop>
<tabstop>pushButtonAcquire</tabstop> <tabstop>pushButtonAcquire</tabstop>
<tabstop>pushButtonAbortDownload</tabstop> <tabstop>pushButtonAbortDownload</tabstop>
<tabstop>lineEditQuery</tabstop>
<tabstop>pushButtonSendQuery</tabstop>
<tabstop>pushButtonAbortQuery</tabstop>
<tabstop>radioButtonOverwrite</tabstop> <tabstop>radioButtonOverwrite</tabstop>
<tabstop>radioButtonUpdate</tabstop> <tabstop>radioButtonUpdate</tabstop>
<tabstop>checkBoxOnlyOrbitalElements</tabstop> <tabstop>checkBoxOnlyOrbitalElements</tabstop>
<tabstop>listWidgetObjects</tabstop> <tabstop>lineEditSearch</tabstop>
<tabstop>listViewObjects</tabstop>
<tabstop>pushButtonMarkAll</tabstop> <tabstop>pushButtonMarkAll</tabstop>
<tabstop>pushButtonMarkNone</tabstop> <tabstop>pushButtonMarkNone</tabstop>
<tabstop>pushButtonDiscard</tabstop> <tabstop>pushButtonDiscard</tabstop>
<tabstop>pushButtonAdd</tabstop> <tabstop>pushButtonAdd</tabstop>
<tabstop>pushButtonSendQuery</tabstop>
<tabstop>lineEditQuery</tabstop>
<tabstop>pushButtonAbortQuery</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../../../../data/gui/guiRes.qrc"/> <include location="../../../../data/gui/guiRes.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>
<sender>radioButtonFile</sender> <sender>radioButtonFile</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>pushButtonBrowse</receiver> <receiver>pushButtonBrowse</receiver>
<slot>setFocus()</slot> <slot>setFocus()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>121</x> <x>131</x>
<y>156</y> <y>364</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>417</x> <x>468</x>
<y>175</y> <y>397</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection> <connection>
<sender>radioButtonURL</sender> <sender>radioButtonURL</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>lineEditURL</receiver> <receiver>lineEditURL</receiver>
<slot>setFocus()</slot> <slot>setFocus()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>121</x> <x>131</x>
<y>218</y> <y>161</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>110</x> <x>110</x>
<y>267</y> <y>267</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection> <connection>
<sender>radioButtonUpdate</sender> <sender>radioButtonUpdate</sender>
<signal>toggled(bool)</signal> <signal>toggled(bool)</signal>
 End of changes. 17 change blocks. 
64 lines changed or deleted 72 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/