Merge lp:~daggerstab/stellarium/satellites-import-gui into lp:stellarium

[Bogdan Marinov]

Simple GUI for adding satellites. Supports both downloading data from the Internet and loading files from the local disk, if Internet updates are disabled.

If this is approved, I'm going to merge it myself. In case I can't, please mark the linked bug as being fixed by that revision when committing the merge.

[Alexander Wolf (alexwolf)]

I think we need add editable blocks for description and groups.

[Bogdan Marinov (daggerstab)]

It's on my TODO list. I don't have time for it now, though. So it's either this (with important bugs fixed, if any), or nothing.

[Alexander Wolf (alexwolf)]

review: Approve

[Matthew Gates (matthew-porpoisehead)]

This is a summary of some issues discussed in the IRC channel:

1. When a new satellite is added, the list in the main Satellites dialog should be re-loaded to the new satellite is shown.

2. The new satellite list should look like the list box in the main Satellites dialog (i.e. same font size and spacing etc.

3. Nice to have: filter-as-you-type searching of the new satellites list.

4. Nice to have: some way to select the newly added satellites in the main satellites dialog list.

review: Needs Fixing (uat)

[lp:~daggerstab/stellarium/satellites-import-gui]

5127. By Bogdan Marinov on 2012-01-09

reload satellite list after adding new satellites

5128. By Bogdan Marinov on 2012-01-09

+ select the newly added satellites after import (but it's not enough?)

5129. By Bogdan Marinov on 2012-01-09

save changes to file after adding or removing satellites

5130. By Bogdan Marinov on 2012-01-09

scroll to the first selected newly added satellite

5131. By Bogdan Marinov on 2012-01-09

+ search for the new satellites list

[Bogdan Marinov (daggerstab)]

1. Fixed.

2. Because of 3., the QListWidget was replaced with a QListView, which has its own default style. Have a look at it.

3. Done.

4. A possible mechanism:
- add a "new" flag to the Satellite object that is not saved to JSON;
- add "new" to Satellites::Visibility and use getSatellites() to get all with that flag;
- add a "[newly added]" group to the drop-down list - it will display the satellites added since Stellarium has been started.

[lp:~daggerstab/stellarium/satellites-import-gui]

5132. By Bogdan Marinov on 2012-01-09

+ check box style for QListView objects

5133. By Bogdan Marinov on 2012-01-10

+ a "newly added" pseudo-group

5134. By Bogdan Marinov on 2012-01-10

+ Spektr-R and Tiangong-1; + scientific.txt to the sources

5135. By Bogdan Marinov on 2012-01-11

fixed link style in Satellites' About tab

Unmerged revisions

=== modified file 'data/gui/nightStyle.css'
--- data/gui/nightStyle.css	2011-11-11 16:14:30 +0000
+++ data/gui/nightStyle.css	2012-01-10 09:14:25 +0000
@@ -524,11 +524,11 @@
 	image: url(:/graphicGui/nv_checkbox-unchecked.png);
 }
 
-QListWidget::indicator::checked {
+QListWidget::indicator:checked, QListView::indicator:checked {
 	image: url(:/graphicGui/nv_checkbox-checked.png);
 }
 
-QListWidget::indicator:unchecked {
+QListWidget::indicator:unchecked, QListView::indicator:unchecked {
 	image: url(:/graphicGui/nv_checkbox-unchecked.png);
 }
 
@@ -791,4 +791,4 @@
 /**** The following are used for Satellites ****/
 QListWidget#satellitesList, QListWidget#sourceList {
 		font-size: 8pt;
-}
\ No newline at end of file
+}

=== modified file 'data/gui/normalStyle.css'
--- data/gui/normalStyle.css	2011-11-11 10:34:13 +0000
+++ data/gui/normalStyle.css	2012-01-10 09:14:25 +0000
@@ -523,11 +523,11 @@
 	image: url(:/graphicGui/checkbox-unchecked.png);
 }
 
-QListWidget::indicator::checked {
+QListWidget::indicator:checked, QListView::indicator:checked {
 	image: url(:/graphicGui/checkbox-checked.png);
 }
 
-QListWidget::indicator:unchecked {
+QListWidget::indicator:unchecked, QListView::indicator:unchecked {
 	image: url(:/graphicGui/checkbox-unchecked.png);
 }
 
@@ -896,4 +896,4 @@
 /**** The following are used for Satellites ****/
 QListWidget#satellitesList, QListWidget#sourceList {
 		font-size: 8pt;
-}
\ No newline at end of file
+}

=== modified file 'plugins/Satellites/CMakeLists.txt'
--- plugins/Satellites/CMakeLists.txt	2011-12-13 03:53:53 +0000
+++ plugins/Satellites/CMakeLists.txt	2012-01-10 09:14:25 +0000
@@ -1,4 +1,4 @@
-SET(SATELLITES_VERSION "0.7.0")
+SET(SATELLITES_VERSION "0.7.1")
 
 SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
 

=== modified file 'plugins/Satellites/ChangeLog'
--- plugins/Satellites/ChangeLog	2011-12-14 10:31:15 +0000
+++ plugins/Satellites/ChangeLog	2012-01-10 09:14:25 +0000
@@ -1,3 +1,8 @@
+0.7.1 [2012-01-08]
+Added basic GUI for adding satellites from TLE lists.
+Added CelesTrak's tle-new.txt to the default sources list to make adding fresh
+satellites easier.
+
 0.7.0 [2011-12-13]
 Use catalog number instead of satellite name as an identifier.
 Save dates as proper JSON strings (before they broke stricter parsers).

=== modified file 'plugins/Satellites/resources/satellites.json'
--- plugins/Satellites/resources/satellites.json	2011-12-12 23:12:49 +0000
+++ plugins/Satellites/resources/satellites.json	2012-01-10 09:14:25 +0000
@@ -1,5 +1,5 @@
 {
-	"creator": "Satellites plugin version 0.7.0 (updated)",
+	"creator": "Satellites plugin version 0.7.1 (updated)",
 	"hintColor": [0.4, 0.4, 0.4],
 	"satellites": 
 	{
@@ -7641,6 +7641,16 @@
 			"tle2": "2 37753  55.0113 180.9488 0003255  61.0940 299.0042  2.00564618  2948",
 			"visible": false
 		},
+		"37755": 
+		{
+			"comms": [],
+			"groups": ["scientific"],
+			"name": "SPEKTR-R",
+			"orbitVisible": false,
+			"tle1": "1 37755U 11037A   12004.66875000 -.00012069  00000-0  10000-3 0   228",
+			"tle2": "2 37755  74.6765 307.4457 8148154 317.9596 358.4400  0.11583720   219",
+			"visible": true
+		},
 		"37763": 
 		{
 			"comms": [],
@@ -7690,6 +7700,16 @@
 			"tle1": "1 37779U 11042A   11345.61344730  .00000169  00000-0  10000-3 0   736",
 			"tle2": "2 37779   0.0476 148.6335 0001436  93.6679  96.5562  1.00275394  1304",
 			"visible": false
+		},
+		"37820": 
+		{
+			"comms": [],
+			"groups": ["scientific", "visual"],
+			"name": "TIANGONG 1",
+			"orbitVisible": false,
+			"tle1": "1 37820U 11053A   12009.74723891  .00034896  00000-0  29586-3 0  3619",
+			"tle2": "2 37820  42.7873 297.8111 0008641 198.6555 249.7744 15.68962907 16096",
+			"visible": true
 		}
 	},
 	"shortName": "satellite orbital data"

=== modified file 'plugins/Satellites/src/CMakeLists.txt'
--- plugins/Satellites/src/CMakeLists.txt	2011-02-08 17:20:14 +0000
+++ plugins/Satellites/src/CMakeLists.txt	2012-01-10 09:14:25 +0000
@@ -30,10 +30,13 @@
   Satellites.cpp
   gui/SatellitesDialog.hpp
   gui/SatellitesDialog.cpp
+  gui/SatellitesImportDialog.hpp
+  gui/SatellitesImportDialog.cpp
 )
 
 SET(SatellitesDialog_UIS
   gui/satellitesDialog.ui
+  gui/satellitesImportDialog.ui
 )
 QT4_WRAP_UI(SatellitesDialog_UIS_H ${SatellitesDialog_UIS})
 
@@ -45,6 +48,7 @@
 SET(Satellites_MOC_HDRS
   Satellites.hpp
   gui/SatellitesDialog.hpp
+  gui/SatellitesImportDialog.hpp
 )
 
 # After this call, Satellites_MOC_SRCS = moc_Satellites.cxx

=== modified file 'plugins/Satellites/src/Satellite.cpp'
--- plugins/Satellites/src/Satellite.cpp	2012-01-06 20:06:54 +0000
+++ plugins/Satellites/src/Satellite.cpp	2012-01-10 09:14:25 +0000
@@ -53,7 +53,7 @@
 
 
 Satellite::Satellite(const QString& identifier, const QVariantMap& map)
-		: initialized(false), visible(true), hintColor(0.0,0.0,0.0), lastUpdated(), pSatWrapper(NULL)
+		: initialized(false), visible(true), newlyAdded(false), hintColor(0.0,0.0,0.0), lastUpdated(), pSatWrapper(NULL)
 {
 	// return initialized if the mandatory fields are not present
 	if (identifier.isEmpty())

=== modified file 'plugins/Satellites/src/Satellite.hpp'
--- plugins/Satellites/src/Satellite.hpp	2011-12-28 00:18:26 +0000
+++ plugins/Satellites/src/Satellite.hpp	2012-01-10 09:14:25 +0000
@@ -109,6 +109,9 @@
 	// when the observer location changes we need to
 	void recalculateOrbitLines(void);
 	
+	void setNew() {newlyAdded = true;}
+	bool isNew() const {return newlyAdded;}
+	
 	static QString extractInternationalDesignator(const QString& tle1);
 
 public:
@@ -127,6 +130,7 @@
 	bool initialized;
 	bool visible;
 	bool orbitVisible;  //draw orbit enabled/disabled
+	bool newlyAdded;
 
 	//! Identifier of the satellite, must be unique within the list.
 	//! Currently, the Satellite Catalog Number is used. It is contained in both

=== modified file 'plugins/Satellites/src/Satellites.cpp'
--- plugins/Satellites/src/Satellites.cpp	2011-12-13 03:53:53 +0000
+++ plugins/Satellites/src/Satellites.cpp	2012-01-10 09:14:25 +0000
@@ -409,6 +409,9 @@
 	conf->setValue("tle_url5", "http://celestrak.com/NORAD/elements/amateur.txt");
 	conf->setValue("tle_url6", "http://celestrak.com/NORAD/elements/iridium.txt");
 	conf->setValue("tle_url7", "http://celestrak.com/NORAD/elements/geo.txt");
+	conf->setValue("tle_url8", "http://celestrak.com/NORAD/elements/tle-new.txt");
+	conf->setValue("tle_url9", "http://celestrak.com/NORAD/elements/science.txt");
+	//TODO: Better? See http://doc.qt.nokia.com/4.7/qsettings.html#beginWriteArray --BM
 	conf->setValue("update_frequency_hours", 72);
 	conf->setValue("orbit_line_flag", true);
 	conf->setValue("orbit_line_segments", 90);
@@ -683,7 +686,10 @@
 		{
 			if ((group.isEmpty() || sat->groupIDs.contains(group)) && ! result.contains(sat->id))
 			{
-				if (vis==Both || (vis==Visible && sat->visible) || (vis==NotVisible && !sat->visible))
+				if (vis==Both ||
+				        (vis==Visible && sat->visible) ||
+				        (vis==NotVisible && !sat->visible) ||
+				        (vis==NewlyAdded && sat->isNew()))
 					result.insert(sat->id, sat->name);
 			}
 		}
@@ -701,6 +707,83 @@
 	return SatelliteP();
 }
 
+QStringList Satellites::getAllIDs()
+{
+	QStringList result;
+	foreach(const SatelliteP& sat, satellites)
+	{
+		if (sat->initialized)
+			result.append(sat->id);
+	}
+	return result;
+}
+
+void Satellites::add(const TleDataList& newSatellites)
+{
+	int numAdded = 0;
+	QVariantList defaultHintColorMap;
+	defaultHintColorMap << defaultHintColor[0] << defaultHintColor[1] 
+	                    << defaultHintColor[2];
+	
+	foreach (const TleData& tleSet, newSatellites)
+	{
+		//TODO: Duplicates check? --BM
+		
+		if (tleSet.id.isEmpty() ||
+		    tleSet.name.isEmpty() ||
+		    tleSet.first.isEmpty() ||
+		    tleSet.second.isEmpty())
+			continue;
+		
+		QVariantMap satProperties;
+		satProperties.insert("name", tleSet.name);
+		satProperties.insert("tle1", tleSet.first);
+		satProperties.insert("tle2", tleSet.second);
+		satProperties.insert("hintColor", defaultHintColorMap);
+		//TODO: Decide if newly added satellites are visible by default --BM
+		satProperties.insert("visible", true);
+		satProperties.insert("orbitVisible", false);
+		
+		SatelliteP sat(new Satellite(tleSet.id, satProperties));
+		if (sat->initialized)
+		{
+			qDebug() << "Satellites: added" << tleSet.id << tleSet.name;
+			satellites.append(sat);
+			sat->setNew();
+			numAdded++;
+		}
+	}
+	qDebug() << "Satellites: "
+	         << newSatellites.count() << "satellites proposed for addition, "
+	         << numAdded << " added, "
+	         << satellites.count() << " total after the operation.";
+}
+
+void Satellites::remove(const QStringList& idList)
+{
+	StelObjectMgr* objMgr = GETSTELMODULE(StelObjectMgr);
+	int numRemoved = 0;
+	for (int i = 0; i < satellites.size(); i++)
+	{
+		const SatelliteP& sat = satellites.at(i);
+		if (idList.contains(sat->id))
+		{
+			QList<StelObjectP> selected = objMgr->getSelectedObject("Satellite");
+			if (selected.contains(sat.staticCast<StelObject>()))
+				objMgr->unSelect();
+			
+			qDebug() << "Satellite removed:" << sat->id << sat->name;
+			satellites.removeAt(i);
+			i--; //Compensate for the change in the array's indexing
+			numRemoved++;
+		}
+	}
+	qDebug() << "Satellites: "
+	         << idList.count() << "satellites proposed for removal, "
+	         << numRemoved << " removed, "
+	         << satellites.count() << " remain.";
+}
+
 int Satellites::getSecondsToUpdate(void)
 {
 	QDateTime nextUpdate = lastUpdate.addSecs(updateFrequencyHours * 3600);
@@ -874,10 +957,8 @@
 
 void Satellites::updateFromFiles(QStringList paths, bool deleteFiles)
 {
-	// define a map of new TLE data - the key is the satellite designation
-	QMap< QString, QPair<QString, QString> > newTLE;
-	//TODO: Ugly hack, think of something better: --BM
-	QHash<QString, QString> nameFromId;
+	// Container for the new data. 
+	TleDataHash newTleSets;
 
 	if (progressBar)
 	{
@@ -891,52 +972,7 @@
 		QFile tleFile(tleFilePath);
 		if (tleFile.open(QIODevice::ReadOnly|QIODevice::Text))
 		{
-			int lineNumber = 0;
-			QString lastId, lastName;
-			QPair<QString, QString> tleLines;
-			
-			while (!tleFile.atEnd())
-			{
-				QString line = QString(tleFile.readLine()).trimmed();
-				if (line.length() < 65) // this is title line
-				{
-					// New entry in the list, so prepare all fields
-					lastId.clear();
-					lastName = line;
-					lastName.replace(QRegExp("\\s*\\[([^\\]])*\\]\\s*$"),"");  // remove things in square brackets
-					//TODO: We need to think of some kind of ecaping these 
-					//characters in the JSON parser. --BM
-					
-					tleLines.first = QString();
-					tleLines.second = QString();
-				}
-				else
-				{
-					if (QRegExp("^1 .*").exactMatch(line))
-						tleLines.first = line;
-					else if (QRegExp("^2 .*").exactMatch(line))
-					{
-						tleLines.second = line;
-						// The Satellite Catalog Number is the second number
-						// on the second line.
-						lastId = line.split(' ').at(1).trimmed();
-						if (lastId.isEmpty())
-							continue;
-						
-						// This is the second line and there will be no more,
-						// so if everything is OK, save the elements.
-						if (!lastName.isEmpty() &&
-						    !tleLines.first.isEmpty())
-						{
-							newTLE[lastId] = tleLines;
-							nameFromId[lastId] = lastName;
-						}
-						//TODO: Error warnings? --BM
-					}
-					else
-						qDebug() << "Satellites::updateFromFiles(): unprocessed line " << lineNumber <<  " in file " << tleFilePath;
-				}
-			}
+			parseTleFile(tleFile, newTleSets);
 			tleFile.close();
 
 			if (deleteFiles)
@@ -956,20 +992,18 @@
 	{
 		totalSats++;
 		QString id = sat->id;
-		if (newTLE.contains(id))
+		if (newTleSets.contains(id))
 		{
-			// If it's in the new list, the name should also be there.
-			QString name = nameFromId.value(id);
-			
-			if (sat->tleElements.first  != newTLE[id].first ||
-			    sat->tleElements.second != newTLE[id].second ||
-			    sat->name != name)
+			TleData newTle = newTleSets.value(id);
+			if (sat->tleElements.first  != newTle.first ||
+			    sat->tleElements.second != newTle.second ||
+			    sat->name != newTle.name)
 			{
 				// We have updated TLE elements for this satellite
-				sat->setNewTleElements(newTLE[id].first, newTLE[id].second);
+				sat->setNewTleElements(newTle.first, newTle.second);
 				
 				// Update the name if it has been changed in the source list
-				sat->name = name;
+				sat->name = newTle.name;
 
 				// we reset this to "now" when we started the update.
 				sat->lastUpdated = lastUpdate;
@@ -995,7 +1029,7 @@
 	progressBar = NULL;
 
 	qDebug() << "Satellites: updated" << numUpdated << "/" << totalSats
-		 << "satellites.  Update URLs contained" << newTLE.size() << "objects. "
+		 << "satellites.  Update URLs contained" << newTleSets.size() << "objects. "
 		 << "There were" << numMissing << "satellies missing from the update URLs";
 
 	if (numUpdated==0)
@@ -1007,6 +1041,58 @@
 	emit(tleUpdateComplete(numUpdated, totalSats, numMissing));
 }
 
+void Satellites::parseTleFile(QFile& openFile, TleDataHash& tleList)
+{
+	if (!openFile.isOpen() || !openFile.isReadable())
+		return;
+	
+	// Code mostly re-used from updateFromFiles()
+	int lineNumber = 0;
+	TleData lastData;
+	
+	while (!openFile.atEnd())
+	{
+		QString line = QString(openFile.readLine()).trimmed();
+		if (line.length() < 65) // this is title line
+		{
+			// New entry in the list, so reset all fields
+			lastData = TleData();
+			
+			//TODO: We need to think of some kind of ecaping these 
+			//characters in the JSON parser. --BM
+			line.replace(QRegExp("\\s*\\[([^\\]])*\\]\\s*$"),"");  // remove things in square brackets
+			lastData.name = line;
+		}
+		else
+		{
+			if (QRegExp("^1 .*").exactMatch(line))
+				lastData.first = line;
+			else if (QRegExp("^2 .*").exactMatch(line))
+			{
+				lastData.second = line;
+				// The Satellite Catalog Number is the second number
+				// on the second line.
+				QString id = line.split(' ').at(1).trimmed();
+				if (id.isEmpty())
+					continue;
+				lastData.id = id;
+				
+				// This is the second line and there will be no more,
+				// so if everything is OK, save the elements.
+				if (!lastData.name.isEmpty() &&
+				    !lastData.first.isEmpty())
+				{
+					//TODO: This overwrites duplicates. Display warning? --BM
+					tleList.insert(id, lastData);
+				}
+				//TODO: Error warnings? --BM
+			}
+			else
+				qDebug() << "Satellites: unprocessed line " << lineNumber <<  " in file " << openFile.fileName();
+		}
+	}
+}
+
 void Satellites::update(double deltaTime)
 {
 	if (StelApp::getInstance().getCore()->getCurrentLocation().planetName != earth->getEnglishName() || (!hintFader && hintFader.getInterstate() <= 0.))

=== modified file 'plugins/Satellites/src/Satellites.hpp'
--- plugins/Satellites/src/Satellites.hpp	2011-12-12 23:12:49 +0000
+++ plugins/Satellites/src/Satellites.hpp	2012-01-10 09:14:25 +0000
@@ -42,6 +42,20 @@
 
 typedef QSharedPointer<Satellite> SatelliteP;
 
+//! Data structure containing unvalidated TLE set as read from a TLE list file.
+struct TleData
+{
+	//! NORAD catalog number, as extracted from the TLE set.
+	QString id;
+	//! Human readable name, as extracted from the TLE title line.
+	QString name;
+	QString first;
+	QString second;
+};
+
+typedef QList<TleData> TleDataList;
+typedef QHash<QString, TleData> TleDataHash ;
+
 //! @class Satellites
 //! Satellites in low Earth orbit require different orbital calculations from planets, the moon
 //! and so on.  This plugin implements the SGP4/SDP4 algorithms in Stellarium, allowing accurate
@@ -65,7 +79,8 @@
 	{
 		Visible,
 		NotVisible,
-		Both
+		Both,
+		NewlyAdded
 	};
 
 	Satellites();
@@ -130,6 +145,17 @@
 
 	//! get a satellite object by identifier
 	SatelliteP getByID(const QString& id);
+	
+	//! Returns a list of all satellite IDs.
+	QStringList getAllIDs();
+	
+	//! Add the given satellites.
+	//! The changes are not saved to file.
+	void add(const TleDataList& newSatellites);
+	
+	//! Remove the selected satellites.
+	//! The changes are not saved to file.
+	void remove(const QStringList& idList);
 
 	//! get whether or not the plugin will try to update TLE data from the internet
 	//! @return true if updates are set to be done, false otherwise
@@ -171,6 +197,13 @@
 	//! @param deleteFiles if set, the update files are deleted after
 	//!        they are used, else they are left alone
 	void updateFromFiles(QStringList paths, bool deleteFiles=false);
+	
+	//! Reads a TLE list from a file to the supplied hash.
+	//! If an entry with the same ID exists in the given hash, its contents
+	//! are overwritten with the new values.
+	//! \param openFile a reference to an \b open file.
+	//! \param tleList a hash with satellite IDs (catalog numbers) as keys.
+	static void parseTleFile(QFile& openFile, TleDataHash& tleList);
 
 signals:
 	//! emitted when the update status changes, e.g. when 

=== modified file 'plugins/Satellites/src/gui/SatellitesDialog.cpp'
--- plugins/Satellites/src/gui/SatellitesDialog.cpp	2011-12-13 03:53:53 +0000
+++ plugins/Satellites/src/gui/SatellitesDialog.cpp	2012-01-10 09:14:25 +0000
@@ -27,6 +27,7 @@
 #include "StelApp.hpp"
 #include "ui_satellitesDialog.h"
 #include "SatellitesDialog.hpp"
+#include "SatellitesImportDialog.hpp"
 #include "Satellites.hpp"
 #include "StelModuleMgr.hpp"
 #include "StelObjectMgr.hpp"
@@ -37,7 +38,7 @@
 #include "StelFileMgr.hpp"
 #include "StelTranslator.hpp"
 
-SatellitesDialog::SatellitesDialog() : updateTimer(NULL)
+SatellitesDialog::SatellitesDialog() : updateTimer(NULL), importWindow(0)
 {
 	ui = new Ui_satellitesDialog;
 }
@@ -50,6 +51,13 @@
 		delete updateTimer;
 		updateTimer = NULL;
 	}
+	
+	if (importWindow)
+	{
+		delete importWindow;
+		importWindow = 0;
+	}
+	
 	delete ui;
 }
 
@@ -115,9 +123,16 @@
 	        this,
 	        SLOT(updateSelectedSatelliteInfo(QListWidgetItem*,QListWidgetItem*)));
 	connect(ui->satellitesList, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(satelliteDoubleClick(QListWidgetItem*)));
-	connect(ui->groupsCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(groupFilterChanged(int)));
+	connect(ui->groupsCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(listSatelliteGroup(int)));
 	connect(ui->saveSatellitesButton, SIGNAL(clicked()), this, SLOT(saveSatellites()));
+	connect(ui->removeSatellitesButton, SIGNAL(clicked()), this, SLOT(removeSatellites()));
 	connectSatelliteGuiForm();
+	
+	importWindow = new SatellitesImportDialog();
+	connect(ui->addSatellitesButton, SIGNAL(clicked()),
+	        importWindow, SLOT(setVisible()));
+	connect(importWindow, SIGNAL(satellitesAccepted(TleDataList)),
+	        this, SLOT(addSatellites(TleDataList)));
 
 	// Sources tab
 	connect(ui->sourceList, SIGNAL(currentTextChanged(const QString&)), ui->sourceEdit, SLOT(setText(const QString&)));
@@ -135,7 +150,7 @@
 
 }
 
-void SatellitesDialog::groupFilterChanged(int index)
+void SatellitesDialog::listSatelliteGroup(int index)
 {
 	QVariantList prevMultiSelection;
 	foreach (QListWidgetItem* i, ui->satellitesList->selectedItems())
@@ -153,6 +168,8 @@
 		satellites = plugin->getSatellites(QString(), Satellites::Visible);
 	else if (selectedGroup == "notvisible")
 		satellites = plugin->getSatellites(QString(), Satellites::NotVisible);
+	else if (selectedGroup == "newlyadded")
+		satellites = plugin->getSatellites(QString(), Satellites::NewlyAdded);
 	else
 		satellites = plugin->getSatellites(ui->groupsCombo->currentText());
 	
@@ -190,6 +207,11 @@
 	}
 }
 
+void SatellitesDialog::reloadSatellitesList()
+{
+	listSatelliteGroup(ui->groupsCombo->currentIndex());
+}
+
 void SatellitesDialog::updateSelectedSatelliteInfo(QListWidgetItem* curItem,
                                                    QListWidgetItem* prevItem)
 {
@@ -430,6 +452,7 @@
 	ui->groupsCombo->addItems(GETSTELMODULE(Satellites)->getGroups());
 	// BM: The wording has been changed to prevent confusion with the visibility
 	// status of the actual satellites. I'll leave further changes to Matthew.:)
+	ui->groupsCombo->insertItem(0, q_("[all newly added]"), QVariant("newlyadded"));
 	ui->groupsCombo->insertItem(0, q_("[all not displayed]"), QVariant("notvisible"));
 	ui->groupsCombo->insertItem(0, q_("[all displayed]"), QVariant("visible"));
 	ui->groupsCombo->insertItem(0, q_("[all]"), QVariant("all"));
@@ -440,26 +463,78 @@
 	GETSTELMODULE(Satellites)->saveSettingsToConfig();
 }
 
-void SatellitesDialog::visibleCheckChanged(int state)
-{
-	foreach (QListWidgetItem* i, ui->satellitesList->selectedItems())
-	{
-		QString id = i->data(Qt::UserRole).toString();
-		SatelliteP sat = GETSTELMODULE(Satellites)->getByID(id);
-		sat->visible = (state==Qt::Checked);
-	}
-	groupFilterChanged(ui->groupsCombo->currentIndex());
-}
-
-void SatellitesDialog::orbitCheckChanged(int state)
-{
-	foreach (QListWidgetItem* i, ui->satellitesList->selectedItems())
-	{
-		QString id = i->data(Qt::UserRole).toString();
-		SatelliteP sat = GETSTELMODULE(Satellites)->getByID(id);
-		sat->orbitVisible = (state==Qt::Checked);
-	}
-	groupFilterChanged(ui->groupsCombo->currentIndex());
+void SatellitesDialog::addSatellites(const TleDataList& newSatellites)
+{
+	GETSTELMODULE(Satellites)->add(newSatellites);
+	saveSatellites();
+	
+	// Trigger re-loading the list to display the new satellites
+	int index = ui->groupsCombo->findData(QVariant("newlyadded"));
+	if (ui->groupsCombo->currentIndex() == index)
+		listSatelliteGroup(index);
+	else
+		ui->groupsCombo->setCurrentIndex(index); //Triggers the same operation
+	
+	// Select the satellites that were added just now
+	QListWidget* list = ui->satellitesList;
+	list->clearSelection();
+	int firstAddedIndex = -1;
+	QSet<QString> newIds;
+	foreach (const TleData& sat, newSatellites)
+		newIds.insert(sat.id);
+	for (int i = 0; i < list->count(); i++)
+	{
+		QString id = list->item(i)->data(Qt::UserRole).toString();
+		if (newIds.remove(id))
+		{
+			list->item(i)->setSelected(true);
+			if (firstAddedIndex < 0)
+				firstAddedIndex = i;
+		}
+	}
+	if (firstAddedIndex >= 0)
+		list->scrollToItem(list->item(firstAddedIndex),
+		                   QAbstractItemView::PositionAtTop);
+	else
+		list->setCurrentRow(0);
+}
+
+void SatellitesDialog::removeSatellites()
+{
+	QStringList idList;
+	foreach (QListWidgetItem* i, ui->satellitesList->selectedItems())
+	{
+		QString id = i->data(Qt::UserRole).toString();
+		idList.append(id);
+	}
+	if (!idList.isEmpty())
+	{
+		GETSTELMODULE(Satellites)->remove(idList);
+		reloadSatellitesList();
+		saveSatellites();
+	}
+}
+
+void SatellitesDialog::setDisplayFlag(bool display)
+{
+	foreach (QListWidgetItem* i, ui->satellitesList->selectedItems())
+	{
+		QString id = i->data(Qt::UserRole).toString();
+		SatelliteP sat = GETSTELMODULE(Satellites)->getByID(id);
+		sat->visible = display;
+	}
+	reloadSatellitesList();
+}
+
+void SatellitesDialog::setOrbitFlag(bool display)
+{
+	foreach (QListWidgetItem* i, ui->satellitesList->selectedItems())
+	{
+		QString id = i->data(Qt::UserRole).toString();
+		SatelliteP sat = GETSTELMODULE(Satellites)->getByID(id);
+		sat->orbitVisible = display;
+	}
+	reloadSatellitesList();
 }
 
 void SatellitesDialog::satelliteDoubleClick(QListWidgetItem* item)
@@ -503,12 +578,12 @@
 {
 	// make sure we don't connect more than once
 	disconnectSatelliteGuiForm();
-	connect(ui->visibleCheckbox, SIGNAL(stateChanged(int)), this, SLOT(visibleCheckChanged(int)));
-	connect(ui->orbitCheckbox, SIGNAL(stateChanged(int)), this, SLOT(orbitCheckChanged(int)));
+	connect(ui->visibleCheckbox, SIGNAL(clicked(bool)), this, SLOT(setDisplayFlag(bool)));
+	connect(ui->orbitCheckbox, SIGNAL(clicked(bool)), this, SLOT(setOrbitFlag(bool)));
 }
 
 void SatellitesDialog::disconnectSatelliteGuiForm(void)
 {
-	disconnect(ui->visibleCheckbox, SIGNAL(stateChanged(int)), this, SLOT(visibleCheckChanged(int)));
-	disconnect(ui->orbitCheckbox, SIGNAL(stateChanged(int)), this, SLOT(orbitCheckChanged(int)));
+	disconnect(ui->visibleCheckbox, SIGNAL(clicked(bool)), this, SLOT(setDisplayFlag(bool)));
+	disconnect(ui->orbitCheckbox, SIGNAL(clicked(bool)), this, SLOT(setOrbitFlag(bool)));
 }

=== modified file 'plugins/Satellites/src/gui/SatellitesDialog.hpp'
--- plugins/Satellites/src/gui/SatellitesDialog.hpp	2011-12-12 23:12:49 +0000
+++ plugins/Satellites/src/gui/SatellitesDialog.hpp	2012-01-10 09:14:25 +0000
@@ -27,6 +27,7 @@
 
 class Ui_satellitesDialog;
 class QTimer;
+class SatellitesImportDialog;
 
 class SatellitesDialog : public StelDialog
 {
@@ -45,7 +46,9 @@
 	void refreshUpdateValues(void);
 
 private slots:
-	void groupFilterChanged(int index);
+	void listSatelliteGroup(int index);
+	//! Reloads the satellites list with the currently selected group.
+	void reloadSatellitesList();
 	void updateSelectedSatelliteInfo(QListWidgetItem* cur, QListWidgetItem* prev);
 	void saveSatellites(void);
 	void setUpdateValues(int hours);
@@ -58,8 +61,10 @@
 	void addSourceRow(void);
 	void restoreDefaults(void);
 	void saveSettings(void);
-	void visibleCheckChanged(int state);
-	void orbitCheckChanged(int state);
+	void addSatellites(const TleDataList& newSatellites);
+	void removeSatellites();
+	void setDisplayFlag(bool display);
+	void setOrbitFlag(bool display);
 	void satelliteDoubleClick(QListWidgetItem* item);
 	void setOrbitParams(void);
 	void updateTLEs(void);
@@ -74,6 +79,8 @@
 	void updateGuiFromSettings(void);
 	void populateGroupsList();
 	QTimer* updateTimer;
+	
+	SatellitesImportDialog* importWindow;
 };
 
 #endif // _SATELLITESDIALOG_HPP_

=== added file 'plugins/Satellites/src/gui/SatellitesImportDialog.cpp'
--- plugins/Satellites/src/gui/SatellitesImportDialog.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Satellites/src/gui/SatellitesImportDialog.cpp	2012-01-10 09:14:25 +0000
@@ -0,0 +1,360 @@
+/*
+ * Stellarium Satellites Plug-in: satellites import feature
+ * Copyright (C) 2012 Bogdan Marinov
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#include "SatellitesImportDialog.hpp"
+#include "ui_satellitesImportDialog.h"
+
+#include "StelApp.hpp"
+#include "StelMainGraphicsView.hpp" //for the QFileDialog? Why?
+#include "StelModuleMgr.hpp" // for the GETSTELMODULE macro :(
+
+#include <QDesktopServices>
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QNetworkReply>
+#include <QSortFilterProxyModel>
+#include <QStandardItemModel>
+#include <QTemporaryFile>
+
+SatellitesImportDialog::SatellitesImportDialog() :
+    downloadMgr(0),
+    progressBar(0)
+{
+	ui = new Ui_satellitesImportDialog;
+	newSatellitesModel = new QStandardItemModel(this);
+}
+
+SatellitesImportDialog::~SatellitesImportDialog()
+{
+	delete ui;
+	
+	// Do I need to explicitly delete this?
+	if (progressBar)
+	{
+		delete progressBar;
+		progressBar = 0;
+	}
+	
+	if (newSatellitesModel)
+	{
+		newSatellitesModel->clear();
+		delete newSatellitesModel;
+		newSatellitesModel = 0;
+	}
+}
+
+void SatellitesImportDialog::languageChanged()
+{
+	if (dialog)
+	{
+		ui->retranslateUi(dialog);
+	}
+}
+
+void SatellitesImportDialog::setVisible(bool visible)
+{
+	StelDialog::setVisible(visible);
+	if (!isGettingData)
+		getData();
+}
+
+void SatellitesImportDialog::createDialogContent()
+{
+	ui->setupUi(dialog);
+	
+	connect(ui->closeStelWindow, SIGNAL(clicked()),
+	        this, SLOT(close()));
+
+	connect(ui->pushButtonGetData, SIGNAL(clicked()),
+	        this, SLOT(getData()));
+	connect(ui->pushButtonAbort, SIGNAL(clicked()),
+	        this, SLOT(abortDownloads()));
+	connect(ui->pushButtonAdd, SIGNAL(clicked()),
+	        this, SLOT(acceptNewSatellites()));
+	connect(ui->pushButtonDiscard, SIGNAL(clicked()),
+	        this, SLOT(discardNewSatellites()));
+	
+	QSortFilterProxyModel * filterProxyModel = new QSortFilterProxyModel(this);
+	filterProxyModel->setSourceModel(newSatellitesModel);
+	filterProxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
+	ui->listView->setModel(filterProxyModel);
+	connect(ui->lineEditSearch, SIGNAL(textChanged(const QString&)),
+	        filterProxyModel, SLOT(setFilterFixedString(const QString&)));
+	
+	reset();
+}
+
+void SatellitesImportDialog::getData()
+{
+	if (isGettingData)
+		return;
+	isGettingData = true;
+	
+	if (!downloadMgr)
+	{
+		downloadMgr = StelApp::getInstance().getNetworkAccessManager();
+		connect(downloadMgr, SIGNAL(finished(QNetworkReply*)),
+		        this, SLOT(receiveDownload(QNetworkReply*)));
+	}
+	Satellites* satMgr = GETSTELMODULE(Satellites);
+	
+	if (satMgr->getUpdatesEnabled())
+	{
+		sourceUrls = satMgr->getTleSources();
+		qDeleteAll(sourceFiles);
+		sourceFiles.clear();
+		numberDownloadsComplete = 0;
+		
+		// Reusing some code from Satellites::updateTLEs()
+		if (progressBar == 0)
+			progressBar = StelApp::getInstance().getGui()->addProgressBar();
+		progressBar->setValue(0);
+		progressBar->setMaximum(sourceUrls.size());
+		progressBar->setVisible(true);
+		progressBar->setFormat("TLE download %v/%m");
+		
+		ui->pushButtonGetData->setVisible(false);
+		ui->pushButtonAbort->setVisible(true);
+		ui->groupBoxWorking->setTitle("Downloading data...");
+		displayMessage("Stellarium is downloading satellite data from the update sources. Please wait...");
+		
+		for (int i = 0; i < sourceUrls.size(); i++)
+		{
+			QUrl url(sourceUrls.at(i));
+			QNetworkReply* reply = downloadMgr->get(QNetworkRequest(url));
+			activeDownloads.append(reply);
+		}
+	}
+	else
+	{
+		QStringList sourceFilePaths;
+		QString homeDirPath = QDesktopServices::storageLocation(QDesktopServices::HomeLocation);
+		sourceFilePaths = QFileDialog::getOpenFileNames(
+		                      &StelMainGraphicsView::getInstance(),
+		                      "Select TLE source file(s)...",
+		                      homeDirPath, "*.*");
+		if (sourceFilePaths.isEmpty())
+			return;
+		foreach (QString filePath, sourceFilePaths)
+		{
+			QFileInfo fileInfo(filePath);
+			if (fileInfo.exists() && fileInfo.isReadable())
+			{
+				QFile* file = new QFile(filePath);
+				sourceFiles.append(file);
+			}
+		}
+		ui->pushButtonGetData->setVisible(false);
+		ui->pushButtonAbort->setVisible(false);
+		ui->groupBoxWorking->setTitle("Processing data...");
+		displayMessage("Processing data...");
+		populateList();
+	}
+}
+
+void SatellitesImportDialog::receiveDownload(QNetworkReply* networkReply)
+{
+	Q_ASSERT(networkReply);
+	
+	// First, check if this one is one of ours
+	QString url = networkReply->request().url().toString();
+	if (!activeDownloads.contains(networkReply))
+	{
+		qDebug() << "Satellites: Received URL not in the source list:" << url;
+		return;
+	}
+	
+	// An error is a completed download, isn't it?
+	activeDownloads.removeAll(networkReply);
+	numberDownloadsComplete++;
+	if (progressBar)
+		progressBar->setValue(numberDownloadsComplete);
+	
+	// Then, see if there was an error...
+	if (networkReply->error() != QNetworkReply::NoError)
+	{
+		qWarning() << "Satellites: failed to download" << url 
+		           << networkReply->errorString();
+		return;
+	}
+	
+	QTemporaryFile* tmpFile = new QTemporaryFile();
+	if (tmpFile->open())
+	{
+		tmpFile->write(networkReply->readAll());
+		tmpFile->close();
+		sourceFiles.append(tmpFile);
+	}
+	else
+	{
+		qWarning() << "Satellites: could not save to file" << url;
+	}
+	
+	if (numberDownloadsComplete >= sourceUrls.count())
+	{
+		if (progressBar)
+		{
+			delete progressBar;
+			progressBar = 0;
+		}
+		
+		if (sourceFiles.isEmpty())
+		{
+			reset();
+			displayMessage("No data could be downloaded. Try again later.");
+		}
+		else
+		{
+			ui->pushButtonAbort->setVisible(false);
+			ui->groupBoxWorking->setTitle("Processing data...");
+			displayMessage("Processing data...");
+			populateList();
+		}
+	}
+	
+	networkReply->deleteLater();
+}
+
+void SatellitesImportDialog::abortDownloads()
+{
+	for (int i = 0; i < activeDownloads.count(); i++)
+	{
+		activeDownloads[i]->abort();
+		activeDownloads[i]->deleteLater();
+	}
+	reset();
+	displayMessage("Download aborted.");
+}
+
+void SatellitesImportDialog::acceptNewSatellites()
+{
+	TleDataList satellitesToAdd;
+	for (int row = 0; row < newSatellitesModel->rowCount(); row++)
+	{
+		QStandardItem* item = newSatellitesModel->item(row);
+		if (item->checkState() == Qt::Checked)
+		{
+			QString id = item->data(Qt::UserRole).toString();
+			satellitesToAdd.append(newSatellites.value(id));
+		}
+	}
+	emit satellitesAccepted(satellitesToAdd);
+	reset();
+	close();
+}
+
+void SatellitesImportDialog::discardNewSatellites()
+{
+	reset();
+	close();
+}
+
+void SatellitesImportDialog::reset()
+{
+	// Assuming that everything that needs to be stopped is stopped
+	isGettingData = false;
+	ui->stackedWidget->setCurrentIndex(0);
+	ui->pushButtonGetData->setVisible(true);
+	ui->pushButtonAbort->setVisible(false);
+	ui->labelMessage->setVisible(false);
+	ui->labelMessage->clear();
+	ui->groupBoxWorking->setTitle("Get data");
+	newSatellitesModel->clear();
+	ui->lineEditSearch->clear();
+	
+	newSatellites.clear();
+	sourceUrls.clear();
+	
+	qDeleteAll(activeDownloads);
+	activeDownloads.clear();
+	
+	qDeleteAll(sourceFiles);
+	sourceFiles.clear();
+	
+	numberDownloadsComplete = 0;
+	if (progressBar)
+	{
+		delete progressBar;
+		progressBar = 0;
+	}
+}
+
+void SatellitesImportDialog::populateList()
+{
+	newSatellites.clear();
+	newSatellitesModel->clear();
+	Satellites* satMgr = GETSTELMODULE(Satellites);
+	
+	// Load ALL two-line element sets...
+	for (int f = 0; f < sourceFiles.count(); f++)
+	{
+		bool open = false;
+		QTemporaryFile* tempFile = dynamic_cast<QTemporaryFile*>(sourceFiles[f]);
+		if (tempFile)
+			open = tempFile->open();
+		else
+			open = sourceFiles[f]->open(QFile::ReadOnly);
+		if (open)
+		{
+			satMgr->parseTleFile(*sourceFiles[f], newSatellites);
+			sourceFiles[f]->close();
+		}
+		else
+		{
+			qDebug() << "Satellites: cannot open file"
+			         << sourceFiles[f]->fileName();
+		}
+	}
+	// Clear the disk...
+	qDeleteAll(sourceFiles);
+	sourceFiles.clear();
+	
+	QStringList existingIDs = satMgr->getAllIDs();
+	QHashIterator<QString,TleData> i(newSatellites);
+	while (i.hasNext())
+	{
+		i.next();
+		
+		// Skip duplicates
+		if (existingIDs.contains(i.key()))
+			continue;
+		
+		TleData tle = i.value();
+		QStandardItem* newItem = new QStandardItem(tle.name);
+		newItem->setFlags(Qt::ItemIsEnabled | Qt::ItemIsUserCheckable);
+		newItem->setCheckState(Qt::Unchecked);
+		newItem->setData(tle.id, Qt::UserRole);
+		QString text = QString("Catalog Number: %1").arg(tle.id);
+		newItem->setToolTip(text);
+		newSatellitesModel->appendRow(newItem);
+	}
+	existingIDs.clear();
+	newSatellitesModel->sort(0);
+	ui->listView->scrollToTop();
+	ui->stackedWidget->setCurrentIndex(1);
+}
+
+void SatellitesImportDialog::displayMessage(const QString& message)
+{
+	if (message.isEmpty())
+		return;
+	
+	ui->labelMessage->setText(message);
+	ui->labelMessage->setVisible(true);
+}

=== added file 'plugins/Satellites/src/gui/SatellitesImportDialog.hpp'
--- plugins/Satellites/src/gui/SatellitesImportDialog.hpp	1970-01-01 00:00:00 +0000
+++ plugins/Satellites/src/gui/SatellitesImportDialog.hpp	2012-01-10 09:14:25 +0000
@@ -0,0 +1,73 @@
+/*
+ * Stellarium Satellites Plug-in: satellites import feature
+ * Copyright (C) 2012 Bogdan Marinov
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#ifndef IMPORTSATELLITESWINDOW_HPP
+#define IMPORTSATELLITESWINDOW_HPP
+
+#include "StelDialog.hpp"
+#include "Satellites.hpp"
+
+class Ui_satellitesImportDialog;
+class QStandardItemModel;
+class QTemporaryFile;
+class QNetworkReply;
+
+class SatellitesImportDialog : public StelDialog
+{
+	Q_OBJECT
+	
+public:
+	SatellitesImportDialog();
+	~SatellitesImportDialog();
+	
+signals:
+	void satellitesAccepted(const TleDataList& newSatellites);
+	
+public slots:
+	void languageChanged();
+	void setVisible(bool visible = true);
+	
+private slots:
+	void getData();
+	void receiveDownload(QNetworkReply* networkReply);
+	void abortDownloads();
+	void acceptNewSatellites();
+	void discardNewSatellites();
+	
+private:
+	void createDialogContent();
+	Ui_satellitesImportDialog* ui;
+	
+	void reset();
+	void populateList();
+	void displayMessage(const QString& message);
+	
+	TleDataHash newSatellites;
+	bool isGettingData;
+	int numberDownloadsComplete;
+	QNetworkAccessManager* downloadMgr;
+	QList<QNetworkReply*> activeDownloads;
+	QStringList sourceUrls;
+	QList<QFile*> sourceFiles;
+	QProgressBar* progressBar;
+	
+	QStandardItemModel* newSatellitesModel;
+};
+
+#endif // IMPORTSATELLITESWINDOW_HPP

=== modified file 'plugins/Satellites/src/gui/satellitesDialog.ui'
--- plugins/Satellites/src/gui/satellitesDialog.ui	2012-01-07 09:15:06 +0000
+++ plugins/Satellites/src/gui/satellitesDialog.ui	2012-01-10 09:14:25 +0000
@@ -383,7 +383,7 @@
         </spacer>
        </item>
        <item>
-        <widget class="QFrame" name="">
+        <widget class="QFrame" name="frame">
          <layout class="QHBoxLayout" name="horizontalLayout_7">
           <property name="leftMargin">
            <number>9</number>
@@ -641,6 +641,40 @@
             </spacer>
            </item>
            <item>
+            <widget class="QPushButton" name="removeSatellitesButton">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="toolTip">
+              <string>Remove the selected satellites</string>
+             </property>
+             <property name="icon">
+              <iconset resource="../../resources/Satellites.qrc">
+               <normaloff>:/satellites/bt_delete.png</normaloff>:/satellites/bt_delete.png</iconset>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="addSatellitesButton">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="toolTip">
+              <string>Add more satellites</string>
+             </property>
+             <property name="icon">
+              <iconset resource="../../resources/Satellites.qrc">
+               <normaloff>:/satellites/bt_add.png</normaloff>:/satellites/bt_add.png</iconset>
+             </property>
+            </widget>
+           </item>
+           <item>
             <widget class="QPushButton" name="commsButton">
              <property name="enabled">
               <bool>false</bool>
@@ -807,6 +841,8 @@
   <tabstop>descriptionTextEdit</tabstop>
   <tabstop>groupsTextEdit</tabstop>
   <tabstop>tleTextEdit</tabstop>
+  <tabstop>removeSatellitesButton</tabstop>
+  <tabstop>addSatellitesButton</tabstop>
   <tabstop>commsButton</tabstop>
   <tabstop>saveSatellitesButton</tabstop>
   <tabstop>sourceList</tabstop>

=== added file 'plugins/Satellites/src/gui/satellitesImportDialog.ui'
--- plugins/Satellites/src/gui/satellitesImportDialog.ui	1970-01-01 00:00:00 +0000
+++ plugins/Satellites/src/gui/satellitesImportDialog.ui	2012-01-10 09:14:25 +0000
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>satellitesImportDialog</class>
+ <widget class="QWidget" name="satellitesImportDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayoutMain">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="BarFrame" name="TitleBar">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>25</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+     <property name="autoFillBackground">
+      <bool>false</bool>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <layout class="QHBoxLayout" name="_2">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>4</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <spacer name="leftSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLabel" name="stelWindowTitle">
+        <property name="text">
+         <string notr="true" extracomment="The title of the window will be set during runtime">More Satellites</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="rightSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="closeStelWindow">
+        <property name="minimumSize">
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QStackedWidget" name="stackedWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="pageStart">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="groupBoxWorking">
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="labelMessage">
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="pushButtonGetData">
+            <property name="text">
+             <string>Get data from update sources</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="pushButtonAbort">
+            <property name="text">
+             <string>Abort download</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="pageResults">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="groupBoxResults">
+         <property name="title">
+          <string>New satellites</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout">
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <item row="2" column="0">
+           <widget class="QPushButton" name="pushButtonAdd">
+            <property name="text">
+             <string>Add</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QPushButton" name="pushButtonDiscard">
+            <property name="text">
+             <string>Discard</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" colspan="2">
+           <widget class="QListView" name="listView">
+            <property name="uniformItemSizes">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0" colspan="2">
+           <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>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>BarFrame</class>
+   <extends>QFrame</extends>
+   <header>Dialog.hpp</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>pushButtonGetData</tabstop>
+  <tabstop>pushButtonAbort</tabstop>
+  <tabstop>listView</tabstop>
+  <tabstop>pushButtonAdd</tabstop>
+  <tabstop>pushButtonDiscard</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>