Merge lp:~daggerstab/stellarium/comets-asteroids-importer into lp:stellarium

[Bogdan Marinov]

This is the first version (0.0.1) of the Solar System Editor plug-in (formerly the Comets and Asteroids Importer plug-in).

It's not a complete Solar System editor yet - the window that would allow manual editing of all parameters of Solar System objects is not finished yet, so it is hidden in this release. You can open manualImportWindow.ui in QtDesigner for a preview of what it will look like.

In addition to the plug-in itself, the branch contains changes to Stellarium's core (SolarSystem + 2 new classes derived from Planet) that allow better handling of asteroids and comets, including name rendering and visual magnitude calculation.

Feel free to comment on the interface and the texts used in it. :)

[Fabien Chéreau (xalioth)]

At some point Mike Storm worked on an experimental JSON format for solar system objects. I think this was never merged, but it was superior to the old .ini format in that it could reflect natively nesting of objects.

See the mailing list archive thread:

http://sourceforge.net/mailarchive/forum.php?thread_name=c3fc7ff0812080257we37817fq7bb5e9f874c3a7ba%40mail.gmail.com&forum_name=stellarium-pubdevel

[Matthew Gates (matthew-porpoisehead)]

First impressions - really good plugin - I think a lot of people will appreciate this one.

GUI:
1 Not sure if we need the path of the ssystem.ini printed. Perhaps just a "reset" option to delete user copy. I realize this won't if the ssystem.ini is messed up so much the program won't start, but then this message can't be seen, and for sure users won't remember it.

(2) If we don't have to have the big warning and path of user ssystem.ini, maybe we can also dispense with the Copy / Restore thing?

(3) Internet search timer somewhat annoying. It makes user wait for a minute if they /didn't/ find what they were looking for (at which point they will probably want to re-search straight away). Unless we get complaints of overloading from the search server people, I don't think we need the limit, although maybe we should set the user agent to something they can use to throttle us if they want rather than have a generic user agent (assuming we use http to connect).

(4) Maybe the search can just be a tab in the main window rather than a separate tab (if (1) & (2) are accepted, the first tab is not really necessary - just a restore button somewhere.

Just my 2 pence worth!

-

Minor bugs noticed:
- long names of downloaded objects get truncated to 20 characters.

review: Abstain (usage)

[barrykgerdes (barrygastro)]

Hi

I compiled 4786 last night in Widows (4782 was OK). I causes a major lock up. It reaches the stellarium display and
then stops nothing but a total shut down unlocks the computer. As a restart then takes about 7 minutes I have not got very far but I suspect it may be in the config.ini or ssystem.ini files. The log.txt gives no indication

Barry Gerdes
Beaumont Hills Observatory
S 33' 41' 44" E 150' 56' 32"

> To: <email address hidden>
> From: <email address hidden>
> Subject: [Merge] lp:~daggerstab/stellarium/comets-asteroids-importer into lp:stellarium
> Date: Fri, 12 Nov 2010 17:23:10 +0000
>
> Bogdan Marinov has proposed merging lp:~daggerstab/stellarium/comets-asteroids-importer into lp:stellarium.
>
> Requested reviews:
> Stellarium (stellarium)
>
>
> This is the first version (0.0.1) of the Solar System Editor plug-in (formerly the Comets and Asteroids Importer plug-in).
>
> It's not a complete Solar System editor yet - the window that would allow manual editing of all parameters of Solar System objects is not finished yet, so it is hidden in this release. You can open manualImportWindow.ui in QtDesigner for a preview of what it will look like.
>
> In addition to the plug-in itself, the branch contains changes to Stellarium's core (SolarSystem + 2 new classes derived from Planet) that allow better handling of asteroids and comets, including name rendering and visual magnitude calculation.
>
> Feel free to comment on the interface and the texts used in it. :)
> --
> https://code.launchpad.net/~daggerstab/stellarium/comets-asteroids-importer/+merge/40744
> Your team Stellarium is requested to review the proposed merge of lp:~daggerstab/stellarium/comets-asteroids-importer into lp:stellarium.

[lp:~daggerstab/stellarium/comets-asteroids-importer]

4856. By Bogdan Marinov on 2010-11-14

+ support for XEphem format; on-line search now uses it to prevent truncating of object names

4857. By Bogdan Marinov on 2010-11-15

commenting why one orbit function is used and not the other

4858. By Bogdan Marinov on 2010-11-15

improved generation of section/group names; + comments

4859. By Bogdan Marinov on 2010-11-15

+ fallback mechanism for the ssystem.ini file; SolarSystem now skips invalid entries instead of crashing Stellarium

4860. By Bogdan Marinov on 2010-11-15

adding or discarding search results should not reset the timer

4861. By Bogdan Marinov on 2010-11-16

removed search query countdown display;
the import window now remains open after an import

4862. By Bogdan Marinov on 2010-11-16

if the loading of the user ssystem.ini fails, move it

4863. By Bogdan Marinov on 2010-11-16

some additions to translations.h: potentially added asteroids

4864. By Bogdan Marinov on 2010-11-16

+ style for checkbox icons for the QListWidget items

4865. By Bogdan Marinov on 2010-11-16

merged trunk

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2010-11-08 15:26:58 +0000
+++ CMakeLists.txt	2010-11-16 20:00:15 +0000
@@ -136,6 +136,7 @@
 SET(USE_PLUGIN_TEXTUSERINTERFACE 1 CACHE BOOL "Define whether the TextUserInterface plugin should be created.")
 SET(USE_PLUGIN_TIMEZONECONFIGURATION 1 CACHE BOOL "Define whether the TimeZoneConfiguration plugin should be created.")
 SET(USE_PLUGIN_VIRGO 0 CACHE BOOL "Define whether the VirGO plugin should be created.")
+SET(USE_PLUGIN_SOLARSYSTEMEDITOR 1 CACHE BOOL "Define whether the Solar System Editor should be built.")
 
 ########## Static plugins need to define includes and libraries
 ########## for the compilation of Stellarium itself

=== modified file 'Doxyfile.cmake'
--- Doxyfile.cmake	2010-09-03 09:54:30 +0000
+++ Doxyfile.cmake	2010-11-16 20:00:15 +0000
@@ -463,7 +463,7 @@
 # disable (NO) the deprecated list. This list is created by putting
 # \deprecated commands in the documentation.
 
-GENERATE_DEPRECATEDLIST= NO
+GENERATE_DEPRECATEDLIST= YES
 
 # The ENABLED_SECTIONS tag can be used to enable conditional
 # documentation sections, marked by \if sectionname ... \endif.

=== modified file 'data/gui/nightStyle.css'
--- data/gui/nightStyle.css	2010-11-16 19:33:22 +0000
+++ data/gui/nightStyle.css	2010-11-16 20:00:15 +0000
@@ -514,6 +514,14 @@
 	image: url(:/graphicGui/nv_checkbox-unchecked.png);
 }
 
+QListWidget::indicator::checked {
+	image: url(:/graphicGui/nv_checkbox-checked.png);
+}
+
+QListWidget::indicator:unchecked {
+	image: url(:/graphicGui/nv_checkbox-unchecked.png);
+}
+
 /*QCheckBox:disabled {
 	color: rgb(210, 0, 0);
 	font-weight: 500;

=== modified file 'data/gui/normalStyle.css'
--- data/gui/normalStyle.css	2010-11-14 03:12:37 +0000
+++ data/gui/normalStyle.css	2010-11-16 20:00:15 +0000
@@ -513,6 +513,14 @@
 	image: url(:/graphicGui/checkbox-unchecked.png);
 }
 
+QListWidget::indicator::checked {
+	image: url(:/graphicGui/checkbox-checked.png);
+}
+
+QListWidget::indicator:unchecked {
+	image: url(:/graphicGui/checkbox-unchecked.png);
+}
+
 /*QCheckBox:disabled {
 	color: rgb(210, 0, 0);
 	font-weight: 500;

=== modified file 'data/ssystem.ini'
--- data/ssystem.ini	2010-07-16 14:09:25 +0000
+++ data/ssystem.ini	2010-11-16 20:00:15 +0000
@@ -586,8 +586,9 @@
 albedo = 1
 orbit_visualization_period = 365.25
 
-[ceres]
+[1ceres]
 name = Ceres
+minor_planet_number = 1
 parent = Sun
 radius = 470
 oblateness = 0.0
@@ -607,8 +608,9 @@
 orbit_AscendingNode = 80.40696
 orbit_Inclination = 10.58671
 
-[pallas]
+[2pallas]
 name = Pallas
+minor_planet_number = 2
 parent = Sun
 radius = 220
 oblateness = 0.0
@@ -628,8 +630,9 @@
 orbit_AscendingNode = 173.13579
 orbit_Inclination = 34.84182
 
-[juno]
+[3juno]
 name = Juno
+minor_planet_number = 3
 parent = Sun
 radius = 130
 oblateness = 0.0
@@ -649,8 +652,9 @@
 orbit_AscendingNode = 170.12007
 orbit_Inclination = 12.97036
 
-[vesta]
+[4vesta]
 name = Vesta
+minor_planet_number = 4
 parent = Sun
 radius = 280
 oblateness = 0.0
@@ -670,8 +674,9 @@
 orbit_AscendingNode = 103.91841
 orbit_Inclination = 7.13380
 
-[eris]
+[136199eris]
 name = Eris
+minor_planet_number = 136199
 parent = Sun
 radius = 1300
 oblateness = 0.0

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2010-11-08 15:24:12 +0000
+++ plugins/CMakeLists.txt	2010-11-16 20:00:15 +0000
@@ -41,3 +41,6 @@
   SET(VIRGO_PROJECT_PATH "../extmodules/VirGO/" CACHE PATH "The location of the VirGO plugin main directory i.e. the one containing the top level CMakeLists.txt")
   ADD_SUBDIRECTORY( ${VIRGO_PROJECT_PATH} VirGO )
 ENDIF()
+IF (USE_PLUGIN_SOLARSYSTEMEDITOR)
+  ADD_SUBDIRECTORY( SolarSystemEditor )
+ENDIF()

=== added directory 'plugins/SolarSystemEditor'
=== added file 'plugins/SolarSystemEditor/CMakeLists.txt'
--- plugins/SolarSystemEditor/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/SolarSystemEditor/CMakeLists.txt	2010-11-16 20:00:15 +0000
@@ -0,0 +1,19 @@
+
+SET(SOLARSYSTEMEDITOR_MAJOR "0")
+SET(SOLARSYSTEMEDITOR_MINOR "0")
+SET(SOLARSYSTEMEDITOR_PATCH "1")
+SET(SOLARSYSTEMEDITOR_VERSION "${SOLARSYSTEMEDITOR_MAJOR}.${SOLARSYSTEMEDITOR_MINOR}.${SOLARSYSTEMEDITOR_PATCH}")
+
+IF(APPLE)
+	SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
+ElSE(APPLE)
+	SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
+ENDIF(APPLE)
+
+ADD_DEFINITIONS(-DPLUGIN_VERSION="${SOLARSYSTEMEDITOR_VERSION}")
+
+ADD_SUBDIRECTORY( src )
+
+INSTALL(FILES DESTINATION "modules/SolarSystemEditor")
+
+

=== added file 'plugins/SolarSystemEditor/UnpackProvisionalDesignation.pro'
--- plugins/SolarSystemEditor/UnpackProvisionalDesignation.pro	1970-01-01 00:00:00 +0000
+++ plugins/SolarSystemEditor/UnpackProvisionalDesignation.pro	2010-11-16 20:00:15 +0000
@@ -0,0 +1,12 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2010-09-18T15:18:26
+#
+#-------------------------------------------------
+
+TARGET = UnpackProvisionalDesignation
+CONFIG   += qtestlib
+CONFIG   -= app_bundle
+
+
+SOURCES += unpackProvisionalDesignationTest.cpp

=== added directory 'plugins/SolarSystemEditor/src'
=== added file 'plugins/SolarSystemEditor/src/CMakeLists.txt'
--- plugins/SolarSystemEditor/src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/SolarSystemEditor/src/CMakeLists.txt	2010-11-16 20:00:15 +0000
@@ -0,0 +1,76 @@
+
+INCLUDE_DIRECTORIES(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/plugins/SolarSystemEditor/src
+  ${CMAKE_BINARY_DIR}/plugins/SolarSystemEditor/src/gui
+  . gui)
+
+LINK_DIRECTORIES(/src)
+
+SET(SolarSystemEditor_SRCS
+  SolarSystemEditor.hpp
+  SolarSystemEditor.cpp
+  gui/SolarSystemManagerWindow.hpp
+  gui/SolarSystemManagerWindow.cpp
+  gui/MpcImportWindow.hpp
+  gui/MpcImportWindow.cpp
+  gui/ManualImportWindow.hpp
+  gui/ManualImportWindow.cpp
+  )
+
+SET(SolarSystemEditor_UIS
+  gui/solarSystemManagerWindow.ui
+  gui/mpcImportWindow.ui
+  gui/manualImportWindow.ui
+)
+
+QT4_WRAP_UI(SolarSystemEditor_UIS_H ${SolarSystemEditor_UIS})
+
+#SET(SolarSystemEditor_RES ../resources/resources.qrc)
+#QT4_ADD_RESOURCES(SolarSystemEditor_RES_CXX ${SolarSystemEditor_RES})
+
+SET(SolarSystemEditor_MOC_HDRS
+  gui/SolarSystemManagerWindow.hpp
+  gui/MpcImportWindow.hpp
+  gui/ManualImportWindow.hpp
+  SolarSystemEditor.hpp
+  )
+
+QT4_WRAP_CPP(SolarSystemEditor_MOC_SRCS ${SolarSystemEditor_MOC_HDRS})
+
+SET(extLinkerOption ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES})
+
+#Dynamic library
+IF(BUILD_DYNAMIC_PLUGINS)
+ ADD_LIBRARY(SolarSystemEditor MODULE ${SolarSystemEditor_SRCS} ${SolarSystemEditor_MOC_SRCS} ${SolarSystemEditor_RES_CXX} ${SolarSystemEditor_UIS_H})
+
+ IF(APPLE)
+  FIND_LIBRARY(OPENGL_LIBRARY OpenGL)
+  MARK_AS_ADVANCED(OPENGL_LIBRARY)
+  SET_TARGET_PROPERTIES(SolarSystemEditor PROPERTIES LINK_FLAGS "-undefined dynamic_lookup" SUFFIX ".dylib")
+ ENDIF(APPLE)
+
+ IF(WIN32)
+  SET_TARGET_PROPERTIES(SolarSystemEditor PROPERTIES LINK_FLAGS "-enable-runtime-pseudo-reloc -Wl,--allow-multiple-definition" )
+  SET(StelMain stelMain)
+ ELSE(WIN32)
+  SET(StelMain )
+ ENDIF(WIN32)
+
+ TARGET_LINK_LIBRARIES(SolarSystemEditor ${StelMain} ${extLinkerOption})
+
+ INSTALL(TARGETS SolarSystemEditor DESTINATION "modules/SolarSystemEditor")
+ENDIF()
+
+#Static library
+IF(BUILD_STATIC_PLUGINS)
+ ADD_LIBRARY(SolarSystemEditor-static STATIC ${SolarSystemEditor_SRCS} ${SolarSystemEditor_MOC_SRCS} ${SolarSystemEditor_RES_CXX} ${SolarSystemEditor_UIS_H})
+ SET_TARGET_PROPERTIES(SolarSystemEditor-static PROPERTIES OUTPUT_NAME "SolarSystemEditor")
+ TARGET_LINK_LIBRARIES(SolarSystemEditor-static ${extLinkerOption})
+ IF(WIN32)
+	 SET_TARGET_PROPERTIES(SolarSystemEditor-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
+ ELSE()
+	 SET_TARGET_PROPERTIES(SolarSystemEditor-static PROPERTIES COMPILE_FLAGS "-fPIC -DQT_STATICPLUGIN")
+ ENDIF()
+ ADD_DEPENDENCIES(AllStaticPlugins SolarSystemEditor-static)
+ENDIF()

=== added file 'plugins/SolarSystemEditor/src/SolarSystemEditor.cpp'
--- plugins/SolarSystemEditor/src/SolarSystemEditor.cpp	1970-01-01 00:00:00 +0000
+++ plugins/SolarSystemEditor/src/SolarSystemEditor.cpp	2010-11-16 20:00:15 +0000
@@ -0,0 +1,1535 @@
+/*
+ * Solar System editor plug-in for Stellarium
+ * 
+ * Copyright (C) 2010 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include "SolarSystemEditor.hpp"
+#include "SolarSystemManagerWindow.hpp"
+
+#include "StelApp.hpp"
+#include "StelGui.hpp"
+#include "StelGuiItems.hpp"
+#include "StelFileMgr.hpp"
+#include "StelIniParser.hpp"
+#include "StelLocaleMgr.hpp"
+#include "StelModuleMgr.hpp"
+#include "StelObjectMgr.hpp"
+#include "SolarSystem.hpp"
+
+#include <QDate>
+#include <QDebug>
+#include <QDir>
+#include <QFile>
+#include <QSettings>
+#include <QString>
+
+#include <cmath>
+#include <stdexcept>
+
+
+StelModule* SolarSystemEditorStelPluginInterface::getStelModule() const
+{
+	return new SolarSystemEditor();
+}
+
+StelPluginInfo SolarSystemEditorStelPluginInterface::getPluginInfo() const
+{
+	//Q_INIT_RESOURCE(solarSystemEditor);
+	
+	StelPluginInfo info;
+	info.id = "SolarSystemEditor";
+	info.displayedName = "Solar System Editor";
+	info.authors = "Bogdan Marinov";
+	info.contact = "http://stellarium.org";
+	info.description = "An interface for adding asteroids and comets to Stellarium. It can download object lists from the Minor Planet Center's website and perform searches in its online database. Still a work in progress.";
+	return info;
+}
+
+Q_EXPORT_PLUGIN2(SolarSystemEditor, SolarSystemEditorStelPluginInterface)
+
+SolarSystemEditor::SolarSystemEditor()
+{
+	setObjectName("SolarSystemEditor");
+
+	isInitialized = false;
+	mainWindow = NULL;
+	solarSystemConfigurationFile = NULL;
+	solarSystemManager = GETSTELMODULE(SolarSystem);
+
+	//I really hope that the file manager is instantiated before this
+	defaultSolarSystemFilePath	= QFileInfo(StelFileMgr::getInstallationDir() + "/data/ssystem.ini").absoluteFilePath();
+	customSolarSystemFilePath	= QFileInfo(StelFileMgr::getUserDir() + "/data/ssystem.ini").absoluteFilePath();
+}
+
+SolarSystemEditor::~SolarSystemEditor()
+{
+	if (solarSystemConfigurationFile != NULL)
+	{
+		delete solarSystemConfigurationFile;
+	}
+}
+
+void SolarSystemEditor::init()
+{
+	//Get a list of the "default" Solar System objects' names:
+	//TODO: Use it as validation for the loading of the plug-in
+	if (QFile::exists(defaultSolarSystemFilePath))
+	{
+		defaultSsoIdentifiers = listAllLoadedObjectsInFile(defaultSolarSystemFilePath);
+	}
+	else
+	{
+		//TODO: Better error message
+		qDebug() << "Something is horribly wrong:" << StelFileMgr::getInstallationDir();
+		return;
+	}
+
+	try
+	{
+		//Make sure that a user ssystem.ini actually exists
+		if (!cloneSolarSystemConfigurationFile())
+			return;
+
+		mainWindow = new SolarSystemManagerWindow();
+	}
+	catch (std::runtime_error &e)
+	{
+		qWarning() << "init() error: " << e.what();
+		return;
+	}
+
+	isInitialized = true;
+}
+
+void SolarSystemEditor::deinit()
+{
+	//
+}
+
+void SolarSystemEditor::update(double) //deltaTime
+{
+	//
+}
+
+void SolarSystemEditor::draw(StelCore*) //core
+{
+	//
+}
+
+double SolarSystemEditor::getCallOrder(StelModuleActionName) const// actionName
+{
+	return 0.;
+}
+
+bool SolarSystemEditor::configureGui(bool show)
+{
+	//If the plug-in has failed to initialize, disable the button
+	//TODO: Display a message in the window instead.
+	if (!isInitialized)
+		return false;
+
+	if(show)
+	{
+		mainWindow->setVisible(true);
+
+		//Debugging block
+		//if (cloneSolarSystemConfigurationFile())
+		{
+			//Import Encke for a start
+			/*SsoElements SSO = readMpcOneLineCometElements("0002P         2010 08  6.5102  0.336152  0.848265  186.5242  334.5718   11.7843  20100104  11.5  6.0  2P/Encke                                                 MPC 59600");
+			if (!appendToSolarSystemConfigurationFile(SSO))
+				return true;
+			*/
+
+			//Import a list of comets on the desktop. The file is from
+			//http://www.minorplanetcenter.org/iau/Ephemerides/Comets/Soft00Cmt.txt
+			//It seems that some entries in the list don't match the described format
+			/*QList<SsoElements> objectList = readMpcOneLineCometElementsFromFile(StelFileMgr::getDesktopDir() + "/Soft00Cmt.txt");
+			if (!appendToSolarSystemConfigurationFile(objectList))
+				return true;
+			*/
+
+			//Import Cruithne
+			/*SsoElements asteroid = readMpcOneLineMinorPlanetElements("03753   15.6   0.15 K107N 205.95453   43.77037  126.27658   19.80793  0.5149179  0.98898552   0.9977217  3 MPO183459   488  28 1973-2010 0.58 M-h 3Eh MPC        0000           (3753) Cruithne   20100822");
+			if (!appendToSolarSystemConfigurationFile(asteroid))
+				return true;
+			*/
+
+			//Import a list of asteroids. The file is from
+			//http://www.minorplanetcenter.org/iau/Ephemerides/Bright/2010/Soft00Bright.txt
+			/*QList<SsoElements> objectList = readMpcOneLineMinorPlanetElementsFromFile(StelFileMgr::getDesktopDir() + "/Soft00Bright.txt");
+			if (!appendToSolarSystemConfigurationFile(objectList))
+				return true;*/
+
+			//Destroy and re-create the Solal System
+			//solarSystemManager->reloadPlanets();
+		}
+	}
+	return true;
+}
+
+void SolarSystemEditor::updateI18n()
+{
+	//The Solar System MUST be translated before updating the window
+	//TODO: Remove this if/when you merge this module in the Solar System module
+	solarSystemManager->updateI18n();
+
+	if (mainWindow)
+	{
+		mainWindow->languageChanged();
+	}
+}
+
+bool SolarSystemEditor::cloneSolarSystemConfigurationFile()
+{
+	QDir userDataDirectory(StelFileMgr::getUserDir());
+	if (!userDataDirectory.exists())
+	{
+		qDebug() << "Unable to find user data directory:" << userDataDirectory.absolutePath();
+		return false;
+	}
+	if (!userDataDirectory.exists("data") && !userDataDirectory.mkdir("data"))
+	{
+		qDebug() << "Unable to create a \"data\" subdirectory in" << userDataDirectory.absolutePath();
+		return false;
+	}
+
+	if (QFile::exists(customSolarSystemFilePath))
+	{
+		qDebug() << "Using the ssystem.ini file that already exists in the user directory...";
+		return true;
+	}
+
+	if (QFile::exists(defaultSolarSystemFilePath))
+	{
+		qDebug() << "Trying to copy ssystem.ini to" << customSolarSystemFilePath;
+		return QFile::copy(defaultSolarSystemFilePath, customSolarSystemFilePath);
+	}
+	else
+	{
+		qDebug() << "This should be impossible.";
+		return false;
+	}
+}
+
+bool SolarSystemEditor::resetSolarSystemConfigurationFile()
+{
+	if (QFile::exists(customSolarSystemFilePath))
+	{
+		if (!QFile::remove((customSolarSystemFilePath)))
+		{
+			qWarning() << "Unable to delete" << customSolarSystemFilePath
+			         << endl << "Please remove the file manually.";
+			return false;
+		}
+	}
+
+	return cloneSolarSystemConfigurationFile();
+}
+
+void SolarSystemEditor::resetSolarSystemToDefault()
+{
+	if (isInitialized)
+	{
+		if (resetSolarSystemConfigurationFile())
+		{
+			//Deselect all currently selected objects
+			StelObjectMgr * objectManager = GETSTELMODULE(StelObjectMgr);
+			//TODO
+			objectManager->unSelect();
+
+			solarSystemManager->reloadPlanets();
+			emit solarSystemChanged();
+		}
+	}
+}
+
+bool SolarSystemEditor::copySolarSystemConfigurationFileTo(QString filePath)
+{
+	if (QFile::exists(customSolarSystemFilePath))
+	{
+		QFileInfo targetFile(filePath);
+		return QFile::copy(customSolarSystemFilePath, targetFile.absoluteFilePath());
+	}
+	else
+	{
+		return false;
+	}
+}
+
+bool SolarSystemEditor::replaceSolarSystemConfigurationFileWith(QString filePath)
+{
+	if (!QFile::exists(filePath))
+	{
+		//TODO: Message
+		return false;
+	}
+
+	//Is it a valid configuration file?
+	QSettings settings(filePath, QSettings::IniFormat);
+	if (settings.status() != QSettings::NoError)
+	{
+		qWarning() << filePath << "is not a valid configuration file.";
+		return false;
+	}
+
+	//Remove the existingfile
+	if (QFile::exists(customSolarSystemFilePath))
+	{
+		if(!QFile::remove(customSolarSystemFilePath))
+		{
+			//TODO: Message
+			return false;
+		}
+	}
+
+	//Copy the new file
+	//If the copy fails, reset to the default configuration
+	if (QFile::copy(filePath, customSolarSystemFilePath))
+	{
+		solarSystemManager->reloadPlanets();
+		emit solarSystemChanged();
+		return true;
+	}
+	else
+	{
+		//TODO: Message
+		if (cloneSolarSystemConfigurationFile())
+		{
+			solarSystemManager->reloadPlanets();
+			emit solarSystemChanged();
+			return true;
+		}
+		else
+		{
+			//TODO: Message
+			return false;
+		}
+	}
+}
+
+QHash<QString,QString> SolarSystemEditor::listAllLoadedObjectsInFile(QString filePath)
+{
+	if (!QFile::exists(filePath))
+		return QHash<QString,QString>();
+
+	QSettings solarSystem(filePath, QSettings::IniFormat);
+	if (solarSystem.status() != QSettings::NoError)
+		return QHash<QString,QString>();
+
+	QStringList groups = solarSystem.childGroups();
+	QStringList planetNames = solarSystemManager->getAllPlanetEnglishNames();
+	QHash<QString,QString> loadedObjects;
+	foreach (QString group, groups)
+	{
+		QString name = solarSystem.value(group + "/name").toString();
+		if (planetNames.contains(name))
+		{
+			loadedObjects.insert(name, group);
+		}
+	}
+	return loadedObjects;
+}
+
+QHash<QString,QString> SolarSystemEditor::listAllLoadedSsoIdentifiers()
+{
+	if (QFile::exists(customSolarSystemFilePath))
+	{
+		return listAllLoadedObjectsInFile(customSolarSystemFilePath);
+	}
+	else
+	{
+		//TODO: Error message
+		return QHash<QString,QString>();
+	}
+}
+
+bool SolarSystemEditor::removeSsoWithName(QString name)
+{
+	if (name.isEmpty())
+		return false;
+
+	//qDebug() << name;
+	if (defaultSsoIdentifiers.keys().contains(name))
+	{
+		qWarning() << "You can't delete the default Solar System objects for the moment.";
+		return false;
+	}
+
+	//Make sure that the file exists
+	if (!QFile::exists(customSolarSystemFilePath))
+	{
+		qDebug() << "Can't remove" << name << "to ssystem.ini: Unable to find" << customSolarSystemFilePath;
+		return false;
+	}
+
+	//Open the file
+	QSettings settings(customSolarSystemFilePath, QSettings::IniFormat);
+	if (settings.status() != QSettings::NoError)
+	{
+		qDebug() << "Error opening ssystem.ini:" << customSolarSystemFilePath;
+		return false;
+	}
+
+	//Remove the section
+	foreach (QString group, settings.childGroups())
+	{
+		if (settings.value(group + "/name").toString() == name)
+		{
+			settings.remove(group);
+			settings.sync();
+			break;
+		}
+	}
+
+	//Deselect all currently selected objects
+	//TODO: I bet that someone will complains, so: unselect only the removed one
+	GETSTELMODULE(StelObjectMgr)->unSelect();
+
+	//Reload the Solar System
+	solarSystemManager->reloadPlanets();
+	emit solarSystemChanged();
+
+	return true;
+}
+
+//TODO: Strings that have failed to be parsed. The usual source of discrepancies is
+//http://www.minorplanetcenter.org/iau/Ephemerides/Comets/Soft00Cmt.txt
+//It seems that some entries in the list don't match the described format.
+/*
+  "    CJ95O010  1997 03 31.4141  0.906507  0.994945  130.5321  282.6820   89.3193  20100723  -2.0  4.0  C/1995 O1 (Hale-Bopp)                                    MPC 61436" -> minus sign, fixed
+  "    CK09K030  2011 01  9.266   3.90156   1.00000   251.413     0.032   146.680              8.5  4.0  C/2009 K3 (Beshore)                                      MPC 66205" -> lower precision than the spec, fixed
+  "    CK10F040  2010 04  6.109   0.61383   1.00000   120.718   237.294    89.143             13.5  4.0  C/2010 F4 (Machholz)                                     MPC 69906" -> lower precision than the spec, fixed
+  "    CK10M010  2012 02  7.840   2.29869   1.00000   265.318    82.150    78.373              9.0  4.0  C/2010 M1 (Gibbs)                                        MPC 70817" -> lower precision than the spec, fixed
+  "    CK10R010  2011 11 28.457   6.66247   1.00000    96.009   345.949   157.437              6.0  4.0  C/2010 R1 (LINEAR)                                       MPEC 2010-R99" -> lower precision than the spec, fixed
+  "0128P      b  2007 06 13.8064  3.062504  0.320891  210.3319  214.3583    4.3606  20100723   8.5  4.0  128P/Shoemaker-Holt                                      MPC 51822" -> fragment, fixed
+  "0141P      d  2010 05 29.7106  0.757809  0.749215  149.3298  246.0849   12.8032  20100723  12.0 12.0  141P/Machholz                                            MPC 59599" -> fragment, fixed
+*/
+SsoElements SolarSystemEditor::readMpcOneLineCometElements(QString oneLineElements)
+{
+	SsoElements result;
+
+	QRegExp mpcParser("^\\s*(\\d{4})?([A-Z])((?:\\w{6}|\\s{6})?[0a-zA-Z])?\\s+(\\d{4})\\s+(\\d{2})\\s+(\\d{1,2}\\.\\d{3,4})\\s+(\\d{1,2}\\.\\d{5,6})\\s+(\\d\\.\\d{5,6})\\s+(\\d{1,3}\\.\\d{3,4})\\s+(\\d{1,3}\\.\\d{3,4})\\s+(\\d{1,3}\\.\\d{3,4})\\s+(?:(\\d{4})(\\d\\d)(\\d\\d))?\\s+(\\-?\\d{1,2}\\.\\d)\\s+(\\d{1,2}\\.\\d)\\s+(\\S.{1,54}\\S)(?:\\s+(\\S.*))?$");//
+
+	int match = mpcParser.indexIn(oneLineElements);
+	//qDebug() << "RegExp captured:" << match << mpcParser.capturedTexts();
+
+	if (match < 0)
+	{
+		qWarning() << "No match for" << oneLineElements;
+		return result;
+	}
+
+	QString numberString = mpcParser.cap(1).trimmed();
+	//QChar cometType = mpcParser.cap(2).at(0);
+	QString provisionalDesignation = mpcParser.cap(3).trimmed();
+
+	if (numberString.isEmpty() && provisionalDesignation.isEmpty())
+	{
+		qWarning() << "Comet is missing both comet number AND provisional designation.";
+		return result;
+	}
+
+	QString name = mpcParser.cap(17).trimmed();
+
+	//Fragment suffix
+	if (provisionalDesignation.length() == 1)
+	{
+		QChar fragmentIndex = provisionalDesignation.at(0);
+		name.append(' ');
+		name.append(fragmentIndex.toUpper());
+	}
+
+	if (name.isEmpty())
+	{
+		return SsoElements();
+	}
+	result.insert("name", name);
+
+	QString sectionName = convertToGroupName(name);
+	if (sectionName.isEmpty())
+	{
+		return SsoElements();
+	}
+	result.insert("section_name", sectionName);
+
+	//After a name has been determined, insert the essential keys
+	result.insert("parent", "Sun");
+	result.insert("type", "comet");
+	//"comet_orbit" is used for all cases:
+	//"ell_orbit" interprets distances as kilometers, not AUs
+	result.insert("coord_func","comet_orbit");
+
+	result.insert("lighting", false);
+	result.insert("color", "1.0, 1.0, 1.0");
+	result.insert("tex_map", "nomap.png");
+
+	bool ok = false;
+	//TODO: Use this for VALIDATION!
+
+	int year	= mpcParser.cap(4).toInt();
+	int month	= mpcParser.cap(5).toInt();
+	double dayFraction	= mpcParser.cap(6).toDouble(&ok);
+	int day = (int) dayFraction;
+	QDate datePerihelionPassage(year, month, day);
+	int fraction = (int) ((dayFraction - day) * 24 * 60 * 60);
+	int seconds = fraction % 60; fraction /= 60;
+	int minutes = fraction % 60; fraction /= 60;
+	int hours = fraction % 24;
+	//qDebug() << hours << minutes << seconds << fraction;
+	QTime timePerihelionPassage(hours, minutes, seconds, 0);
+	QDateTime dtPerihelionPassage(datePerihelionPassage, timePerihelionPassage, Qt::UTC);
+	double jdPerihelionPassage = StelUtils::qDateTimeToJd(dtPerihelionPassage);
+	result.insert("orbit_TimeAtPericenter", jdPerihelionPassage);
+
+	double perihelionDistance = mpcParser.cap(7).toDouble(&ok);//AU
+	result.insert("orbit_PericenterDistance", perihelionDistance);
+
+	double eccentricity = mpcParser.cap(8).toDouble(&ok);//degrees
+	result.insert("orbit_Eccentricity", eccentricity);
+
+	double argumentOfPerihelion = mpcParser.cap(9).toDouble(&ok);//J2000.0, degrees
+	result.insert("orbit_ArgOfPericenter", argumentOfPerihelion);
+
+	double longitudeOfTheAscendingNode = mpcParser.cap(10).toDouble(&ok);//J2000.0, degrees
+	result.insert("orbit_AscendingNode", longitudeOfTheAscendingNode);
+
+	double inclination = mpcParser.cap(11).toDouble(&ok);
+	result.insert("orbit_Inclination", inclination);
+
+	double absoluteMagnitude = mpcParser.cap(15).toDouble(&ok);
+	result.insert("absolute_magnitude", absoluteMagnitude);
+
+	//This is not the same "slope parameter" as used in asteroids. Better name?
+	double slopeParameter = mpcParser.cap(16).toDouble(&ok);
+	result.insert("slope_parameter", slopeParameter);
+
+	double radius = 5; //Fictitious
+	result.insert("radius", radius);
+	result.insert("albedo", 1);
+
+	return result;
+}
+
+SsoElements SolarSystemEditor::readMpcOneLineMinorPlanetElements(QString oneLineElements)
+{
+	SsoElements result;
+
+	//This time I'll try splitting the line to columns, instead of
+	//using a regular expression.
+	//Using QString::mid() allows parsing it in a random sequence.
+
+	//Length validation
+	if (oneLineElements.isEmpty() ||
+	    oneLineElements.length() > 202 ||
+	    oneLineElements.length() < 152) //The column ends at 160, but is left-aligned
+	{
+		return result;
+	}
+
+	QString column;
+	bool ok = false;
+	//bool isLongForm = (oneLineElements.length() > 160) ? true : false;
+
+	//Minor planet number or provisional designation
+	column = oneLineElements.mid(0, 7).trimmed();
+	if (column.isEmpty())
+	{
+		return result;
+	}
+	int minorPlanetNumber = 0;
+	QString provisionalDesignation;
+	QString name;
+	if (column.toInt(&ok) || ok)
+	{
+		minorPlanetNumber = column.toInt();
+	}
+	else
+	{
+		//See if it is a number, but packed
+		//I hope the format is right (I've seen prefixes only between A and P)
+		QRegExp packedMinorPlanetNumber("^([A-Za-z])(\\d+)$");
+		if (packedMinorPlanetNumber.indexIn(column) == 0)
+		{
+			minorPlanetNumber = packedMinorPlanetNumber.cap(2).toInt(&ok);
+			//TODO: Validation
+			QChar prefix = packedMinorPlanetNumber.cap(1).at(0);
+			if (prefix.isUpper())
+			{
+				minorPlanetNumber += ((10 + prefix.toAscii() - 'A') * 10000);
+			}
+			else
+			{
+				minorPlanetNumber += ((10 + prefix.toAscii() - 'a' + 26) * 10000);
+			}
+		}
+		else
+		{
+			provisionalDesignation = unpackMinorPlanetProvisionalDesignation(column);
+		}
+	}
+
+	if (minorPlanetNumber)
+	{
+		name = QString::number(minorPlanetNumber);
+	}
+	else if(provisionalDesignation.isEmpty())
+	{
+		qDebug() << "readMpcOneLineMinorPlanetElements():"
+		         << column
+		         << "is not a valid number or packed provisional designation";
+		return SsoElements();
+	}
+	else
+	{
+		name = provisionalDesignation;
+	}
+
+	//In case the longer format is used, extract the human-readable name
+	column = oneLineElements.mid(166, 28).trimmed();
+	if (!column.isEmpty())
+	{
+		if (minorPlanetNumber)
+		{
+			QRegExp asteroidName("^\\((\\d+)\\)\\s+(\\S.+)$");
+			if (asteroidName.indexIn(column) == 0)
+			{
+				name = asteroidName.cap(2);
+				result.insert("minor_planet_number", minorPlanetNumber);
+			}
+			else
+			{
+				//Use the whole string, just in case
+				name = column;
+			}
+		}
+		//In the other case, the name is already the provisional designation
+	}
+	if (name.isEmpty())
+	{
+		return SsoElements();
+	}
+	result.insert("name", name);
+
+	//Section name
+	QString sectionName = convertToGroupName(name, minorPlanetNumber);
+	if (sectionName.isEmpty())
+	{
+		return SsoElements();
+	}
+	result.insert("section_name", sectionName);
+
+	//After a name has been determined, insert the essential keys
+	result.insert("parent", "Sun");
+	result.insert("type", "asteroid");
+	//"comet_orbit" is used for all cases:
+	//"ell_orbit" interprets distances as kilometers, not AUs
+	result.insert("coord_func","comet_orbit");
+
+	result.insert("lighting", false);
+	result.insert("color", "1.0, 1.0, 1.0");
+	result.insert("tex_map", "nomap.png");
+
+	//Magnitude and slope parameter
+	column = oneLineElements.mid(8,5).trimmed();
+	double absoluteMagnitude = column.toDouble(&ok);
+	if (!ok)
+		return SsoElements();
+	column = oneLineElements.mid(14,5).trimmed();
+	double slopeParameter = column.toDouble(&ok);
+	if (!ok)
+		return SsoElements();
+	result.insert("absolute_magnitude", absoluteMagnitude);
+	result.insert("slope_parameter", slopeParameter);
+
+	//Orbital parameters
+	column = oneLineElements.mid(37, 9).trimmed();
+	double argumentOfPerihelion = column.toDouble(&ok);//J2000.0, degrees
+	if (!ok)
+		return SsoElements();
+	result.insert("orbit_ArgOfPericenter", argumentOfPerihelion);
+
+	column = oneLineElements.mid(48, 9).trimmed();
+	double longitudeOfTheAscendingNode = column.toDouble(&ok);//J2000.0, degrees
+	if (!ok)
+		return SsoElements();
+	result.insert("orbit_AscendingNode", longitudeOfTheAscendingNode);
+
+	column = oneLineElements.mid(59, 9).trimmed();
+	double inclination = column.toDouble(&ok);//J2000.0, degrees
+	if (!ok)
+		return SsoElements();
+	result.insert("orbit_Inclination", inclination);
+
+	column = oneLineElements.mid(70, 9).trimmed();
+	double eccentricity = column.toDouble(&ok);//degrees
+	if (!ok)
+		return SsoElements();
+	result.insert("orbit_Eccentricity", eccentricity);
+
+	column = oneLineElements.mid(80, 11).trimmed();
+	double meanDailyMotion = column.toDouble(&ok);//degrees per day
+	if (!ok)
+		return SsoElements();
+	result.insert("orbit_MeanMotion", meanDailyMotion);
+
+	column = oneLineElements.mid(92, 11).trimmed();
+	double semiMajorAxis = column.toDouble(&ok);
+	if (!ok)
+		return SsoElements();
+	result.insert("orbit_SemiMajorAxis", semiMajorAxis);
+
+	column = oneLineElements.mid(20, 5).trimmed();//Epoch, in packed form
+	QRegExp packedDateFormat("^([IJK])(\\d\\d)([1-9A-C])([1-9A-V])$");
+	if (packedDateFormat.indexIn(column) != 0)
+	{
+		qDebug() << "readMpcOneLineMinorPlanetElements():"
+		         << column << "is not a date in packed format";
+		return SsoElements();
+	}
+	int year = packedDateFormat.cap(2).toInt();
+	switch (packedDateFormat.cap(1).at(0).toAscii())
+	{
+		case 'I':
+			year += 1800;
+			break;
+		case 'J':
+			year += 1900;
+			break;
+		case 'K':
+		default:
+			year += 2000;
+	}
+	int month = unpackDayOrMonthNumber(packedDateFormat.cap(3).at(0));
+	int day   = unpackDayOrMonthNumber(packedDateFormat.cap(4).at(0));
+	//qDebug() << column << year << month << day;
+	QDate epochDate(year, month, day);
+	if (!epochDate.isValid())
+	{
+		qDebug() << "readMpcOneLineMinorPlanetElements():"
+		         << column << "unpacks to"
+		         << QString("%1-%2-%3").arg(year).arg(month).arg(day)
+				 << "This is not a valid date for an Epoch.";
+		return SsoElements();
+	}
+	int epochJD = epochDate.toJulianDay();
+	result.insert("orbit_Epoch", epochJD);
+
+	column = oneLineElements.mid(26, 9).trimmed();
+	double meanAnomalyAtEpoch = column.toDouble(&ok);//degrees
+	if (!ok)
+		return SsoElements();
+	result.insert("orbit_MeanAnomaly", meanAnomalyAtEpoch);
+
+	//Radius and albedo
+	//Assume albedo of 0.15 and calculate a radius based on the absolute magnitude
+	//as described here: http://www.physics.sfasu.edu/astro/asteroids/sizemagnitude.html
+	double albedo = 0.15; //Assumed
+	double radius = std::ceil((1329 / std::sqrt(albedo)) * std::pow(10, -0.2 * absoluteMagnitude));
+	result.insert("albedo", albedo);
+	result.insert("radius", radius);
+
+	return result;
+}
+
+SsoElements SolarSystemEditor::readXEphemOneLineElements(QString oneLineElements)
+{
+	SsoElements result;
+
+	enum OrbitType {Elliptic, Hyperbolic, Parabolic} orbitType;
+
+	QStringList fields = oneLineElements.split(',');
+	if (fields.isEmpty() || fields.count() < 10 || fields.count() > 14)
+		return result;
+	//qDebug() << fields;
+
+	QString name = fields.at(0).trimmed();
+	if (name.isEmpty() || fields.at(1).isEmpty())
+		return result;
+
+	QChar orbitTypeFlag = fields.at(1).trimmed().at(0);
+	if (orbitTypeFlag == 'e')
+		orbitType = Elliptic;
+	else if(orbitTypeFlag == 'h')
+		orbitType = Hyperbolic;
+	else if (orbitTypeFlag == 'p')
+		orbitType = Parabolic;
+	else
+	{
+		qDebug() << "Unrecognised orbit type:" << orbitTypeFlag;
+		return result;
+	}
+
+	//"comet_orbit" is used for all cases:
+	//"ell_orbit" interprets distances as kilometers, not AUs
+	result.insert("coord_func", "comet_orbit");
+
+	//Type detection and name parsing
+	QString objectType;
+	int minorPlanetNumber = 0;
+	QRegExp cometProvisionalDesignationStart("^[PCDX]/");
+	QRegExp cometDesignationStart("^(\\d)+[PCDX]/");
+	if (cometDesignationStart.indexIn(name) == 0 ||
+		cometProvisionalDesignationStart.indexIn(name) == 0)
+	{
+		objectType = "comet";
+	}
+	else
+	{
+		objectType = "asteroid";
+		QRegExp asteroidProvisionalDesignation("(\\d{4}\\s[A-Z]{2})(\\d*)$");
+		int pdIndex = asteroidProvisionalDesignation.indexIn(name);
+		if (pdIndex != 0)
+		{
+			int spaceIndex = name.indexOf(' ');
+			if (spaceIndex > 0)
+			{
+				QString numberString = name.left(spaceIndex);
+				//qDebug() << numberString;
+				minorPlanetNumber = numberString.toInt();
+				if (minorPlanetNumber)
+					name = name.right(name.length() - spaceIndex - 1);
+				//qDebug() << name;
+			}
+		}
+	}
+	if (name.isEmpty())
+	{
+		return SsoElements();
+	}
+	result.insert("name", name);
+	result.insert("type", objectType);
+	if (minorPlanetNumber)
+		result.insert("minor_planet_number", minorPlanetNumber);
+
+	//Section name
+	QString sectionName = convertToGroupName(name, minorPlanetNumber);
+	if (sectionName.isEmpty())
+	{
+		return SsoElements();
+	}
+	result.insert("section_name", sectionName);
+
+	//After a name has been determined, insert the essential keys
+	result.insert("parent", "Sun");
+
+	result.insert("lighting", false);
+	result.insert("color", "1.0, 1.0, 1.0");
+	result.insert("tex_map", "nomap.png");
+
+	//Orbital elements
+	bool ok;
+	QString field;
+
+	if (orbitType == Elliptic)
+		field = fields.at(2);//Field 3
+	else
+		field = fields.at(3);//Field 4
+	double inclination = field.trimmed().toDouble(&ok);
+	if (!ok)
+		return SsoElements();
+	result.insert("orbit_Inclination", inclination);
+
+	if (orbitType == Elliptic)
+		field = fields.at(3);//Field 4
+	else if (orbitType == Hyperbolic)
+		field = fields.at(4);//Field 5
+	else
+		field = fields.at(6);//Field 7
+	double longitudeOfTheAscendingNode = field.toDouble(&ok);//J2000.0, degrees
+	if (!ok)
+		return SsoElements();
+	result.insert("orbit_AscendingNode", longitudeOfTheAscendingNode);
+
+	if (orbitType == Hyperbolic)
+		field = fields.at(5);//Field 6
+	else
+		field = fields.at(4);//Field 5
+	double argumentOfPerihelion = field.toDouble(&ok);//J2000.0, degrees
+	if (!ok)
+		return SsoElements();
+	result.insert("orbit_ArgOfPericenter", argumentOfPerihelion);
+
+	if (orbitType == Elliptic)
+	{
+		field = fields.at(5);//Field 6
+		double semiMajorAxis = field.toDouble(&ok);
+		if (!ok)
+			return SsoElements();
+		result.insert("orbit_SemiMajorAxis", semiMajorAxis);
+
+		field = fields.at(6);//Field 7
+		double meanDailyMotion = field.toDouble(&ok);//degrees per day
+		if (!ok)
+			return SsoElements();
+		result.insert("orbit_MeanMotion", meanDailyMotion);
+	}
+
+	double eccentricity;
+	if (orbitType == Elliptic)
+		eccentricity = fields.at(7).toDouble(&ok);//Field 8
+	else if (orbitType == Hyperbolic)
+		eccentricity = fields.at(6).toDouble(&ok);//Field 7
+	else
+	{
+		//Parabolic orbit
+		eccentricity = 1.0;
+		ok = true;
+	}
+	if (!ok)
+		return SsoElements();
+	result.insert("orbit_Eccentricity", eccentricity);
+
+	if (orbitType == Elliptic)
+	{
+		double meanAnomalyAtEpoch = fields.at(8).toDouble(&ok);//degrees
+		if (!ok)
+			return SsoElements();
+		result.insert("orbit_MeanAnomaly", meanAnomalyAtEpoch);
+	}
+
+	if (orbitType == Elliptic)
+		field = fields.at(9);//Field 10
+	else
+		field = fields.at(2);//Field 3
+	QStringList dateStrings = field.trimmed().split('/');
+	//TODO: Validation
+	int year	= dateStrings.at(2).toInt();
+	int month	= dateStrings.at(0).toInt();
+	double dayFraction	= dateStrings.at(1).toDouble(&ok);
+	int day = (int) dayFraction;
+	QDate date(year, month, day);
+	int fraction = (int) ((dayFraction - day) * 24 * 60 * 60);
+	int seconds = fraction % 60; fraction /= 60;
+	int minutes = fraction % 60; fraction /= 60;
+	int hours = fraction % 24;
+	//qDebug() << hours << minutes << seconds << fraction;
+	QTime time(hours, minutes, seconds, 0);
+	QDateTime dt(date, time, Qt::UTC);
+	double jd = StelUtils::qDateTimeToJd(dt);
+	if (orbitType == Elliptic)
+		result.insert("orbit_Epoch", jd);
+	else
+		result.insert("orbit_TimeAtPericenter", jd);
+
+	if (orbitType != Elliptic)
+	{
+		if (orbitType == Hyperbolic)
+			field = fields.at(7);//Field 8
+		else
+			field = fields.at(5);//Field 6
+		double perihelionDistance = field.toDouble(&ok);//AU
+		if (!ok)
+			return SsoElements();
+		result.insert("orbit_PericenterDistance", perihelionDistance);
+	}
+
+	//Magnitude
+	if (orbitType == Elliptic)
+		field = fields.at(11);//Field 12
+	else if (orbitType == Hyperbolic)
+		field = fields.at(9);//Field 10
+	else
+		field = fields.at(8);//Field 9
+	QRegExp magnitudePrefix("^([Hg]\\s*)?(\\d.+)");
+	if (magnitudePrefix.indexIn(field) != 0)
+		return SsoElements();
+	field = magnitudePrefix.cap(2);
+	double absoluteMagnitude = field.toDouble(&ok);
+	if (!ok)
+		return SsoElements();
+	result.insert("absolute_magnitude", absoluteMagnitude);
+
+	if (orbitType == Elliptic)
+		field = fields.at(12);//Field 13
+	else if (orbitType == Hyperbolic)
+		field = fields.at(10);//Field 11
+	else
+		field = fields.at(9);//Field 10
+	double slopeParameter = field.toDouble(&ok);
+	if (!ok)
+		return SsoElements();
+	result.insert("slope_parameter", slopeParameter);
+
+	//Radius and albedo
+	double albedo = 0.04;
+	double radius = 5.0;
+	if (objectType == "asteroid")
+	{
+		//Assume albedo of 0.15 and calculate a radius based on the absolute magnitude
+		//http://www.physics.sfasu.edu/astro/asteroids/sizemagnitude.html
+		albedo = 0.15;
+		radius = std::ceil((1329 / std::sqrt(albedo)) * std::pow(10, -0.2 * absoluteMagnitude));
+	}
+	result.insert("albedo", albedo);
+	result.insert("radius", radius);
+
+	return result;
+}
+
+QList<SsoElements> SolarSystemEditor::readMpcOneLineCometElementsFromFile(QString filePath)
+{
+	QList<SsoElements> objectList;
+
+	if (!QFile::exists(filePath))
+	{
+		qDebug() << "Can't find" << filePath;
+		return objectList;
+	}
+
+	QFile mpcElementsFile(filePath);
+	if (mpcElementsFile.open(QFile::ReadOnly | QFile::Text ))//| QFile::Unbuffered
+	{
+		int candidatesCount = 0;
+		int lineCount = 0;
+
+		while(!mpcElementsFile.atEnd())
+		{
+			QString oneLineElements = QString(mpcElementsFile.readLine(200));
+			if(oneLineElements.endsWith('\n'))
+			{
+				oneLineElements.chop(1);
+			}
+			if (oneLineElements.isEmpty())
+			{
+				qDebug() << "Empty line skipped.";
+				continue;
+			}
+			lineCount++;
+
+			SsoElements ssObject = readMpcOneLineCometElements(oneLineElements);
+			if(!ssObject.isEmpty() && !ssObject.value("section_name").toString().isEmpty())
+			{
+				objectList << ssObject;
+				candidatesCount++;
+			}
+		}
+		mpcElementsFile.close();
+		qDebug() << "Done reading comet orbital elements."
+		         << "Recognized" << candidatesCount << "candidate objects"
+		         << "out of" << lineCount << "lines.";
+
+		return objectList;
+	}
+	else
+	{
+		qDebug() << "Unable to open for reading" << filePath;
+		qDebug() << "File error:" << mpcElementsFile.errorString();
+		return objectList;
+	}
+
+	return objectList;
+}
+
+QList<SsoElements> SolarSystemEditor::readMpcOneLineMinorPlanetElementsFromFile(QString filePath)
+{
+	QList<SsoElements> objectList;
+
+	if (!QFile::exists(filePath))
+	{
+		qDebug() << "Can't find" << filePath;
+		return objectList;
+	}
+
+	QFile mpcElementsFile(filePath);
+	if (mpcElementsFile.open(QFile::ReadOnly | QFile::Text ))//| QFile::Unbuffered
+	{
+		int candidatesCount = 0;
+		int lineCount = 0;
+
+		while(!mpcElementsFile.atEnd())
+		{
+			QString oneLineElements = QString(mpcElementsFile.readLine(202 + 2));//Allow for end-of-line characters
+			if(oneLineElements.endsWith('\n'))
+			{
+				oneLineElements.chop(1);
+			}
+			if (oneLineElements.isEmpty())
+			{
+				qDebug() << "Empty line skipped.";
+				continue;
+			}
+			lineCount++;
+
+			SsoElements ssObject = readMpcOneLineMinorPlanetElements(oneLineElements);
+			if(!ssObject.isEmpty() && !ssObject.value("section_name").toString().isEmpty())
+			{
+				objectList << ssObject;
+				candidatesCount++;
+			}
+		}
+		mpcElementsFile.close();
+		qDebug() << "Done reading minor planet orbital elements."
+		         << "Recognized" << candidatesCount << "candidate objects"
+		         << "out of" << lineCount << "lines.";
+
+		return objectList;
+	}
+	else
+	{
+		qDebug() << "Unable to open for reading" << filePath;
+		qDebug() << "File error:" << mpcElementsFile.errorString();
+		return objectList;
+	}
+
+	return objectList;
+}
+
+QList<SsoElements> SolarSystemEditor::readXEphemOneLineElementsFromFile(QString filePath)
+{
+	QList<SsoElements> objectList;
+
+	if (!QFile::exists(filePath))
+	{
+		qDebug() << "Can't find" << filePath;
+		return objectList;
+	}
+
+	QFile xEphemElementsFile(filePath);
+	if (xEphemElementsFile.open(QFile::ReadOnly | QFile::Text ))
+	{
+		int candidatesCount = 0;
+		int lineCount = 0;
+
+		while(!xEphemElementsFile.atEnd())
+		{
+			QString oneLineElements = QString(xEphemElementsFile.readLine());
+			if(oneLineElements.endsWith('\n'))
+			{
+				oneLineElements.chop(1);
+			}
+			if (oneLineElements.isEmpty())
+			{
+				qDebug() << "Empty line skipped.";
+				continue;
+			}
+			if (oneLineElements.startsWith('#'))
+			{
+				qDebug() << "Comment skipped.";
+				continue;
+			}
+			lineCount++;
+
+			SsoElements ssObject = readXEphemOneLineElements(oneLineElements);
+			if(!ssObject.isEmpty() && !ssObject.value("section_name").toString().isEmpty())
+			{
+				objectList << ssObject;
+				candidatesCount++;
+			}
+		}
+		xEphemElementsFile.close();
+		qDebug() << "Done reading minor planet orbital elements."
+				 << "Recognized" << candidatesCount << "candidate objects"
+				 << "out of" << lineCount << "lines.";
+
+		return objectList;
+	}
+	else
+	{
+		qDebug() << "Unable to open for reading" << filePath;
+		qDebug() << "File error:" << xEphemElementsFile.errorString();
+		return objectList;
+	}
+
+	return objectList;
+}
+
+bool SolarSystemEditor::appendToSolarSystemConfigurationFile(QList<SsoElements> objectList)
+{
+	if (objectList.isEmpty())
+	{
+		return false;
+	}
+
+	//Check if the configuration file exists
+	if (!QFile::exists(customSolarSystemFilePath))
+	{
+		qDebug() << "Can't append object data to ssystem.ini: Unable to find" << customSolarSystemFilePath;
+		return false;
+	}
+
+
+	QHash<QString,QString> loadedObjects = listAllLoadedSsoIdentifiers();
+
+	//Remove duplicates (identified by name, not by section name)
+	QSettings * solarSystemSettings = new QSettings(customSolarSystemFilePath, QSettings::IniFormat);
+	if (solarSystemSettings->status() != QSettings::NoError)
+	{
+		qDebug() << "Error opening ssystem.ini:" << customSolarSystemFilePath;
+		return false;
+	}
+	foreach (SsoElements object, objectList)
+	{
+		QString name = object.value("name").toString();
+		if (name.isEmpty())
+			continue;
+
+		QString group = object.value("section_name").toString();
+		if (group.isEmpty())
+			continue;
+
+		if (loadedObjects.contains(name))
+		{
+			solarSystemSettings->remove(loadedObjects.value(name));
+			loadedObjects.remove(name);
+		}
+		else if (solarSystemSettings->childGroups().contains(group))
+		{
+			loadedObjects.remove(solarSystemSettings->value(group + "/name").toString());
+			solarSystemSettings->remove(group);
+		}
+	}
+	solarSystemSettings->sync();
+	delete solarSystemSettings;
+	solarSystemSettings = NULL;
+
+	//Write to file
+	//TODO: The usual validation
+	qDebug() << "Appending to file...";
+	QFile solarSystemConfigurationFile(customSolarSystemFilePath);
+	if(solarSystemConfigurationFile.open(QFile::WriteOnly | QFile::Append | QFile::Text))
+	{
+		QTextStream output (&solarSystemConfigurationFile);
+		bool appendedAtLeastOne = false;
+
+		foreach (SsoElements object, objectList)
+		{
+			if (!object.contains("section_name"))
+				continue;
+
+			QString sectionName = object.value("section_name").toString();
+			if (sectionName.isEmpty())
+				continue;
+			object.remove("section_name");
+
+			QString name = object.value("name").toString();
+			if (name.isEmpty())
+				continue;
+
+			output << endl << QString("[%1]").arg(sectionName) << endl;
+			foreach(QString key, object.keys())
+			{
+				output << QString("%1 = %2").arg(key).arg(object.value(key).toString()) << endl;
+			}
+			output.flush();
+			qDebug() << "Appended successfully" << sectionName;
+			appendedAtLeastOne = true;
+		}
+
+		solarSystemConfigurationFile.close();
+		return appendedAtLeastOne;
+	}
+	else
+	{
+		qDebug() << "Unable to open for writing" << customSolarSystemFilePath;
+		return false;
+	}
+}
+
+bool SolarSystemEditor::appendToSolarSystemConfigurationFile(SsoElements object)
+{
+	if (!object.contains("section_name") || object.value("section_name").toString().isEmpty())
+	{
+		qDebug() << "appendToSolarSystemConfigurationFile(): Invalid object:" << object;
+		return false;
+	}
+
+	QList<SsoElements> list;
+	list << object;
+	return appendToSolarSystemConfigurationFile(list);
+}
+
+bool SolarSystemEditor::updateSolarSystemConfigurationFile(QList<SsoElements> objectList, UpdateFlags flags)
+{
+	if (objectList.isEmpty())
+	{
+		//Empty lists can be added without any problem. :)
+		qWarning() << "updateSolarSystemConfigurationFile(): The source list is empty.";
+		return true;
+	}
+
+	//Check if the configuration file exists
+	if (!QFile::exists(customSolarSystemFilePath))
+	{
+		qDebug() << "Can't update ssystem.ini: Unable to find" << customSolarSystemFilePath;
+		return false;
+	}
+
+	QSettings solarSystem(customSolarSystemFilePath, QSettings::IniFormat);
+	if (solarSystem.status() != QSettings::NoError)
+	{
+		qDebug() << "Error opening ssystem.ini:" << customSolarSystemFilePath;
+		return false;
+	}
+	QStringList existingSections = solarSystem.childGroups();
+	QHash<QString,QString> loadedObjects = listAllLoadedSsoIdentifiers();
+	//TODO: Move to contstructor?
+	QStringList orbitalElementsKeys;
+	orbitalElementsKeys << "coord_func"
+			<< "orbit_ArgOfPericenter"
+			<< "orbit_AscendingNode"
+			<< "orbit_Eccentricity"
+			<< "orbit_Epoch"
+			<< "orbit_Inclination"
+			<< "orbit_LongOfPericenter"
+			<< "orbit_MeanAnomaly"
+			<< "orbit_MeanLongitude"
+			<< "orbit_MeanMotion"
+			<< "orbit_PericenterDistance"
+			<< "orbit_Period"
+			<< "orbit_SemiMajorAxis"
+			<< "orbit_TimeAtPericenter";
+
+	qDebug() << "Updating objects...";
+	foreach (SsoElements object, objectList)
+	{
+		QString name = object.value("name").toString();
+		if (name.isEmpty())
+			continue;
+
+		QString sectionName = object.value("section_name").toString();
+		if (sectionName.isEmpty())
+			continue;
+		object.remove("section_name");
+
+		if (loadedObjects.contains(name))
+		{
+			if (sectionName != loadedObjects.value(name))
+			{
+				//Is this a name conflict between an asteroid and a moon?
+				QString currentParent = solarSystem.value(loadedObjects.value(name) + "/parent").toString();
+				QString newParent = object.value("parent").toString();
+				if (newParent != currentParent)
+				{
+					name.append('*');
+					object.insert("name", name);
+
+					if (!existingSections.contains(sectionName))
+					{
+						solarSystem.beginGroup(sectionName);
+						foreach (QString property, object.keys())
+						{
+							solarSystem.setValue(property, object.value(property));
+						}
+						solarSystem.endGroup();
+					}
+				}
+				else
+				{
+					//If the parent is the same, update that object
+					sectionName = loadedObjects.value(name);
+				}
+			}
+		}
+		else
+		{
+			qDebug() << "Skipping update of" << sectionName << ", as no object with this name exists.";
+			continue;
+		}
+
+		solarSystem.beginGroup(sectionName);
+
+		if (flags.testFlag(UpdateNameAndNumber))
+		{
+			updateSsoProperty(solarSystem, object, "name");
+			updateSsoProperty(solarSystem, object, "minor_planet_number");
+		}
+
+		if (flags.testFlag(UpdateType))
+		{
+			updateSsoProperty(solarSystem, object, "type");
+		}
+
+		if (flags.testFlag(UpdateOrbitalElements))
+		{
+			//Remove all orbital elements first, in case
+			//the new ones use another coordinate function
+			foreach (QString key, orbitalElementsKeys)
+			{
+				solarSystem.remove(key);
+			}
+
+			foreach (QString key, orbitalElementsKeys)
+			{
+				updateSsoProperty(solarSystem, object, key);
+			}
+		}
+
+		if (flags.testFlag(UpdateMagnitudeParameters))
+		{
+			if (object.contains("absolute_magnitude") && object.contains("slope_parameter"))
+			{
+				QString type = solarSystem.value("type").toString();
+				if (type == "asteroid" || type == "comet" )
+				{
+					updateSsoProperty(solarSystem, object, "absolute_magnitude");
+					updateSsoProperty(solarSystem, object, "slope_parameter");
+				}
+				else
+				{
+					//TODO: Do what, log a message?
+				}
+			}
+		}
+
+		solarSystem.endGroup();
+		qDebug() << "Updated successfully" << sectionName;
+	}
+
+	return true;
+}
+
+void SolarSystemEditor::updateSsoProperty(QSettings & settings, SsoElements & properties, QString key)
+{
+	if (properties.contains(key))
+	{
+		settings.setValue(key, properties.value(key));
+	}
+}
+
+QString SolarSystemEditor::convertToGroupName(QString &name, int minorPlanetNumber)
+{
+	//TODO: Should I remove all non-alphanumeric, or only the obviously problematic?
+	QString groupName(name);
+	groupName.remove('\\');
+	groupName.remove('/');
+	groupName.remove('#');
+	groupName.remove(' ');
+	groupName.remove('-');
+	groupName = groupName.toLower();
+
+	//To prevent mix-up between asteroids and satellites:
+	//insert the minor planet number in the section name
+	//(if an asteroid is named, it must be numbered)
+	if (minorPlanetNumber)
+	{
+		groupName.prepend(QString::number(minorPlanetNumber));
+	}
+
+	return groupName;
+}
+
+int SolarSystemEditor::unpackDayOrMonthNumber(QChar digit)
+{
+	//0-9, 0 is an invalid value, but the function is supposed to return 0 on failure.
+	if (digit.isDigit())
+	{
+		return digit.digitValue();
+	}
+
+	if (digit.isUpper())
+	{
+		char letter = digit.toAscii();
+		if (letter < 'A' || letter > 'V')
+			return 0;
+		return (10 + (letter - 'A'));
+	}
+	else
+	{
+		return 0;
+	}
+}
+
+int SolarSystemEditor::unpackYearNumber (QChar prefix, int lastTwoDigits)
+{
+	int year = lastTwoDigits;
+	if (prefix == 'I')
+		year += 1800;
+	else if (prefix == 'J')
+		year += 1900;
+	else if (prefix == 'K')
+		year += 2000;
+	else
+		year = 0; //Error
+
+	return year;
+}
+
+//Can be used both for minor planets and comets with no additional modification,
+//as the regular expression for comets will match only capital letters.
+int SolarSystemEditor::unpackAlphanumericNumber (QChar prefix, int lastDigit)
+{
+	int cycleCount = lastDigit;
+	if (prefix.isDigit())
+		cycleCount += prefix.digitValue() * 10;
+	else if (prefix.isLetter() && prefix.isUpper())
+		cycleCount += (10 + prefix.toAscii() - QChar('A').toAscii()) * 10;
+	else if (prefix.isLetter() && prefix.isLower())
+		cycleCount += (10 + prefix.toAscii() - QChar('a').toAscii()) * 10 + 26*10;
+	else
+		cycleCount = 0; //Error
+
+	return cycleCount;
+}
+
+QString SolarSystemEditor::unpackMinorPlanetProvisionalDesignation (QString packedDesignation)
+{
+	QRegExp packedFormat("^([IJK])(\\d\\d)([A-Z])([\\dA-Za-z])(\\d)([A-Z])$");
+	if (packedFormat.indexIn(packedDesignation) != 0)
+	{
+		QRegExp packedSurveyDesignation("^(PL|T1|T2|T3)S(\\d+)$");
+		if (packedSurveyDesignation.indexIn(packedDesignation) == 0)
+		{
+			int number = packedSurveyDesignation.cap(2).toInt();
+			if (packedSurveyDesignation.cap(1) == "PL")
+			{
+				return QString("%1 P-L").arg(number);
+			}
+			else if (packedSurveyDesignation.cap(1) == "T1")
+			{
+				return QString("%1 T-1").arg(number);
+			}
+			else if (packedSurveyDesignation.cap(1) == "T2")
+			{
+				return QString("%1 T-2").arg(number);
+			}
+			else
+			{
+				return QString("%1 T-3").arg(number);
+			}
+			//TODO: Are there any other surveys?
+		}
+		else
+		{
+			return QString();
+		}
+	}
+
+	//Year
+	QChar yearPrefix = packedFormat.cap(1).at(0);
+	int yearLastTwoDigits = packedFormat.cap(2).toInt();
+	int year = unpackYearNumber(yearPrefix, yearLastTwoDigits);
+
+	//Letters
+	QString halfMonthLetter = packedFormat.cap(3);
+	QString secondLetter = packedFormat.cap(6);
+
+	//Second letter cycle count
+	QChar cycleCountPrefix = packedFormat.cap(4).at(0);
+	int cycleCountLastDigit = packedFormat.cap(5).toInt();
+	int cycleCount = unpackAlphanumericNumber(cycleCountPrefix, cycleCountLastDigit);
+
+	//Assemble the unpacked provisional designation
+	QString result = QString("%1 %2%3").arg(year).arg(halfMonthLetter).arg(secondLetter);
+	if (cycleCount != 0)
+	{
+		result.append(QString::number(cycleCount));
+	}
+
+	return result;
+}

=== added file 'plugins/SolarSystemEditor/src/SolarSystemEditor.hpp'
--- plugins/SolarSystemEditor/src/SolarSystemEditor.hpp	1970-01-01 00:00:00 +0000
+++ plugins/SolarSystemEditor/src/SolarSystemEditor.hpp	2010-11-16 20:00:15 +0000
@@ -0,0 +1,312 @@
+/*
+ * Solar System editor plug-in for Stellarium
+ * 
+ * Copyright (C) 2010 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef _SOLAR_SYSTEM_EDITOR_HPP_
+#define _SOLAR_SYSTEM_EDITOR_HPP_
+
+#include "StelGui.hpp"
+#include "StelModule.hpp"
+//#include "CAIMainWindow.hpp"
+
+#include <QHash>
+#include <QList>
+#include <QString>
+#include <QVariant>
+
+class SolarSystemManagerWindow;
+class SolarSystem;
+class QSettings;
+
+//! Convenience type for storage of SSO properties in ssystem.ini format.
+//! This is an easy way of storing data in the format used in Stellarium's
+//! solar system configuration file.
+//! What would be key/value pairs in a section in the ssystem.ini file
+//! are key/value pairs in the hash. The section name is stored with key
+//! "section_name".
+//! As it is a hash, key names are not stored alphabetically. This allows
+//! for rapid addition and look-up of values, unlike a real QSettings
+//! object in StelIniFormat.
+//! Also, using this way may allow scripts to define SSOs.
+//! \todo Better name.
+typedef QHash<QString, QVariant> SsoElements;
+
+/*!
+ \class SolarSystemEditor
+ \brief Main class of the Solar System Editor plug-in.
+ \author Bogdan Marinov
+
+ Solar System bodies are identified by their names in Stellarium, but entries
+ in the configuration file are identified by their group (section) names.
+ This makes more difficult the detection of duplicates.
+*/
+class SolarSystemEditor : public StelModule
+{
+	Q_OBJECT
+
+public:
+	SolarSystemEditor();
+	virtual ~SolarSystemEditor();
+	
+	///////////////////////////////////////////////////////////////////////////
+	// Methods inherited from the StelModule class
+	//! called when the plug-in is loaded.
+	//! All initializations should be done here.
+	virtual void init();
+	//! called before the plug-in is un-loaded.
+	//! Useful for stopping processes, unloading textures, etc.
+	virtual void deinit();
+	virtual void update(double deltaTime);
+	//! draws on the view port.
+	//! Dialog windows don't need explicit drawing, it's done automatically.
+	//! If a plug-in draws on the screen, it should be able to respect
+	//! the night vision mode.
+	virtual void draw(StelCore * core);
+	virtual double getCallOrder(StelModuleActionName actionName) const;
+	//! called when the "configure" button in the "Plugins" tab is pressed
+	virtual bool configureGui(bool show);
+	virtual void updateI18n();
+	
+	//! Reads a single comet's orbital elements from a string.
+	//! This function converts a line of comet orbital elements in MPC format
+	//! to a hash in Stellarium's ssystem.ini format.
+	//! The MPC's one-line orbital elements format for comets
+	//! is described on their website:
+	//! http://www.minorplanetcenter.org/iau/info/CometOrbitFormat.html
+	//! \returns an empty hash if there is an error or the source string is not
+	//! a valid line in MPC format.
+	//! \todo Recognise the long form packed designations (to handle fragments)
+	//! \todo Handle better any unusual symbols in section names (URL encoding?)
+	//! \todo Use column cuts intead of a regular expression?
+	SsoElements readMpcOneLineCometElements(QString oneLineElements);
+
+	//! Reads a single minor planet's orbital elements from a string.
+	//! This function converts a line of minor planet orbital elements in
+	//! MPC format to a hash in Stellarium's ssystem.ini format.
+	//! The MPC's one-line orbital elements format for minor planets
+	//! is described on their website:
+	//! http://www.minorplanetcenter.org/iau/info/MPOrbitFormat.html
+	//! \returns an empty hash if there is an error or the source string is not
+	//! a valid line in MPC format.
+	//! \todo Handle better any unusual symbols in section names (URL encoding?)
+	SsoElements readMpcOneLineMinorPlanetElements(QString oneLineElements);
+
+	//! Reads a single object's orbital elements from a string.
+	//! This function converts a line of orbital elements in XEphem format
+	//! to a hash in Stellarium's ssystem.ini format.
+	//! http://www.clearskyinstitute.com/xephem/help/xephem.html#mozTocId468501
+	//! It recognises only the 'e', 'h' and 'p' types of orbits in XEphem's
+	//! format (comets and minor planets). It is used in handling on-line search
+	//! queries to the MPC's Minor Planet and Comet Ephemeris System, as
+	//! using the MPC format causes long object names to be truncated
+	//! due to the fixed width of the columns.
+	//! An object's type (comet or asteroid) is determined based on its name.
+	SsoElements readXEphemOneLineElements(QString oneLineElements);
+
+	//! Reads a list of comet orbital elements from a file.
+	//! This function reads a list of comet orbital elements in MPC's one-line
+	//! format from a file (one comet per line) and converts it to a list of
+	//! hashes in Stellarium's ssystem.ini format.
+	//! Example source file is the list of observable comets on the MPC's site:
+	//! http://www.minorplanetcenter.org/iau/Ephemerides/Comets/Soft00Cmt.txt
+	//! readMpcOneLineCometElements() is used internally to parse each line.
+	QList<SsoElements> readMpcOneLineCometElementsFromFile(QString filePath);
+
+	//! Reads a list of minor planet orbital elements from a file.
+	//! This function reads a list of minor planets orbital elements in MPC's
+	//! one-line format from a file (one comet per line) and converts it to
+	//! a list of hashes in Stellarium's ssystem.ini format.
+	//! Example source file is the list of bright asteroids on the MPC's site:
+	//! http://www.minorplanetcenter.org/iau/Ephemerides/Bright/2010/Soft00Bright.txt
+	//! readMpcOneLineMinorPlanetElements() is used internally to parse each line.
+	QList<SsoElements> readMpcOneLineMinorPlanetElementsFromFile(QString filePath);
+
+	//! Reads a list of Solar System object orbital elements from a file.
+	//! This function reads a list of Solar System object orbital elements in
+	//! XEphem's one-line format (one object per line, comment lines starting
+	//! with # are skipped) and converts it to a list of hashes in Stellarium's
+	//! ssystem.ini format. XEphem's file format is described in its manual:
+	//! http://www.clearskyinstitute.com/xephem/help/xephem.html#mozTocId468501
+	//! Example source file can be any of the lists of objects on the MPC site:
+	//! http://www.minorplanetcenter.org/iau/Ephemerides/Comets/Soft03Cmt.txt
+	//! http://www.minorplanetcenter.org/iau/Ephemerides/Bright/2010/Soft03Bright.txt
+	//! readXEphemOneLineElements() is used internally to parse each line.
+	QList<SsoElements> readXEphemOneLineElementsFromFile(QString filePath);
+
+	//! Adds a new entry at the end of the user solar system configuration file.
+	//! This function writes directly to the file. See the note on why QSettings
+	//! was not used in the description of
+	//! appendToSolarSystemConfigurationFile(QList<SsoElements>)
+	//! Duplicates are removed: If any section in the file matches the
+	//! "section_name" value of the inserted entry, it is removed.
+	bool appendToSolarSystemConfigurationFile(SsoElements object);
+
+	//! Adds new entries at the end of the user solar system configuration file.
+	//! This function writes directly to the file. QSettings was not used, as:
+	//!  - Using QSettings with QSettings::IniFormat causes the list in the
+	//! "color" field (e.g. "1.0, 1.0, 1.0") to be wrapped in double quotation
+	//! marks (Stellarium requires no quotation marks).
+	//!  - Using QSettings with StelIniFormat causes unaccepptable append times
+	//! when the file grows (>~40 entries). This most probably happens because
+	//! StelIniParser uses QMap internally for the entry list. QMap orders its
+	//! keys (in the case of strings - alphabetically) and it has to find
+	//! the appropriate place in the ordering for every new key, which takes
+	//! more and more time as the list grows.
+	//!
+	//! Duplicates are removed: If any section in the file matches the
+	//! "section_name" value of a new entry, it is removed.
+	//! Invalid entries in the list (that don't contain a value for
+	//! "section_name" or it is an empty string) are skipped and the processing
+	//! continues from the next entry.
+	//! \todo Protect the default Solar System configuration?
+	//! \todo At least warn when overwriting old entries?
+	bool appendToSolarSystemConfigurationFile(QList<SsoElements>);
+
+	//! Flags to control the updateSolarSystemConfigurationFile() function.
+	enum UpdateFlag {
+		UpdateNameAndNumber = 0x01,//!< Update the name and minor planet number, if any.
+		UpdateType = 0x02, //!< Update objects that lack the "type" parameter
+		UpdateOrbitalElements = 0x04, //!< Update the orbital elements, including the orbit function.
+		UpdateMagnitudeParameters = 0x08 //!< Update the values in the two parameter system, or add them if they are missing and the type allows.
+	};
+	Q_DECLARE_FLAGS(UpdateFlags, UpdateFlag)
+
+	//! Updates entries in the user solar system configuration file.
+	//! \param objects a list of data for already existing objects (non-existing ones are skipped);
+	//! \param flags flags controlling what is being updated. See UpdateFlag.
+	//! \returns false if the operation has failed completely for some reason.
+	bool updateSolarSystemConfigurationFile(QList<SsoElements> objects, UpdateFlags flags);
+
+	//! Returns the names of the objects listed in the default ssystem.ini.
+	//! The default solar system configuration file is assumed to be the one
+	//! in the installation directory.
+	QHash<QString,QString> getDefaultSsoIdentifiers() {return defaultSsoIdentifiers;}
+
+	//! Lists the objects listed in the current user ssystem.ini.
+	//! As the name suggests, the list is compiled when the function is run.
+	QHash<QString,QString> listAllLoadedSsoIdentifiers();
+
+	//! Removes an object from the user Solar System configuration file.
+	//! Reloads the Solar System on successfull removal.
+	//! \arg name true name of the object ("name" parameter in the configuration file)
+	//! \returns true if the entry has been removed successfully or there is
+	//! no such entry
+	//! \returns false if there was an error
+	bool removeSsoWithName(QString name);
+
+	//!
+	bool copySolarSystemConfigurationFileTo(QString filePath);
+	//!
+	bool replaceSolarSystemConfigurationFileWith(QString filePath);
+
+	//! returns the path
+	QString getCustomSolarSystemFilePath() const {return customSolarSystemFilePath;}
+	
+public slots:
+	//! Resets the Solar System configuration file and reloads the Solar System.
+	//! \todo Return a bool and make the GUI display a message if it was not successful.
+	void resetSolarSystemToDefault();
+
+signals:
+	//TODO: This should be part of SolarSystem::reloadPlanets()
+	void solarSystemChanged();
+
+private:
+	bool isInitialized;
+
+	//! Main window of the module's GUI
+	SolarSystemManagerWindow * mainWindow;
+
+	QSettings * solarSystemConfigurationFile;
+	SolarSystem * solarSystemManager;
+
+	QString customSolarSystemFilePath;
+	QString defaultSolarSystemFilePath;
+
+	//! A hash matching SSO names with the group names used to identify them
+	//! in the configuration file.
+
+	//! The names and group names of all objects in the default ssystem.ini.
+	//! The keys are the names, the values are the group names.
+	//! Initialized in init().
+	QHash<QString,QString> defaultSsoIdentifiers;
+
+	//! Gets the names of the objects listed in a ssystem.ini-formatted file.
+	//! Used internally in readAllCurrentSsoNames() and in init() to initialize
+	//! defaultSsoNames.
+	//! Does not check if the file exists.
+	QHash<QString,QString> listAllLoadedObjectsInFile(QString filePath);
+
+	//! Creates a copy of the default ssystem.ini file in the user data directory.
+	//! \returns true if a file already exists or the copying has been successful
+	bool cloneSolarSystemConfigurationFile();
+
+	//! Replaces the user copy of ssystem.ini with the default one.
+	//! This function simply deletes the file, if it exists, and calls
+	//! cloneSolarSystemConfigurationFile().
+	//! \returns true if the replacement has been successfull.
+	bool resetSolarSystemConfigurationFile();
+
+	//! Converts an alphanumeric digit as used in MPC packed dates to an integer.
+	//! See http://www.minorplanetcenter.org/iau/info/PackedDates.html
+	//! Interprets the digits from 1 to 9 normally, and the capital leters
+	//! from A to V as numbers between 10 and 31.
+	//! \returns 0 if the digit is invalid (0 is also an invalid ordinal number
+	//! for a day or month, so this is not a problem)
+	int unpackDayOrMonthNumber (QChar digit);
+	//! Converts an alphanumeric year number as used in MPC packed dates to an integer.
+	//! See http://www.minorplanetcenter.org/iau/info/PackedDates.html
+	//! Also used in packed provisional designations, see
+	//! http://www.minorplanetcenter.org/iau/info/PackedDes.html
+	int unpackYearNumber (QChar prefix, int lastTwoDigits);
+	//! Converts a two-character number used in MPC packed provisional designations.
+	//! See http://www.minorplanetcenter.org/iau/info/PackedDes.html
+	//! This function is used for both asteroid and comet designations.
+	int unpackAlphanumericNumber (QChar prefix, int lastDigit);
+
+	//TODO: This should be public and static, perhaps?
+	//! Unpacks an MPC packed minor planet provisional designation.
+	//! See http://www.minorplanetcenter.org/iau/info/PackedDes.html
+	//! \returns an empty string if the argument is not a valid packed
+	//! provisional designation.
+	QString unpackMinorPlanetProvisionalDesignation(QString packedDesignation);
+
+	//! Updates a value in a configuration file with a value with the same key in a SsoElements hash.
+	void updateSsoProperty(QSettings& configuration, SsoElements& properties, QString key);
+
+	//! Converts an object name to a key (group) name in a configuration file.
+	QString convertToGroupName(QString& name, int minorPlanetNumber = 0);
+};
+
+
+#include "fixx11h.h"
+#include <QObject>
+#include "StelPluginInterface.hpp"
+
+//! This class is used by Qt to manage a plug-in interface
+class SolarSystemEditorStelPluginInterface : public QObject, public StelPluginInterface
+{
+	Q_OBJECT
+	Q_INTERFACES(StelPluginInterface)
+public:
+	virtual StelModule* getStelModule() const;
+	virtual StelPluginInfo getPluginInfo() const;
+};
+
+#endif //_SOLAR_SYSTEM_EDITOR_HPP_

=== added directory 'plugins/SolarSystemEditor/src/gui'
=== added file 'plugins/SolarSystemEditor/src/gui/MPCImporterDialogPrototype02.ui'
--- plugins/SolarSystemEditor/src/gui/MPCImporterDialogPrototype02.ui	1970-01-01 00:00:00 +0000
+++ plugins/SolarSystemEditor/src/gui/MPCImporterDialogPrototype02.ui	2010-11-16 20:00:15 +0000
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <author>Bogdan Marinov</author>
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_5">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QStackedWidget" name="stackedWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="page">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
+          <string>Select source</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_2">
+          <item>
+           <widget class="QRadioButton" name="radioButton">
+            <property name="text">
+             <string>Import a single line (one body)</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <item>
+             <widget class="QLineEdit" name="lineEdit"/>
+            </item>
+            <item>
+             <widget class="QPushButton" name="pushButton_3">
+              <property name="text">
+               <string>Paste</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="radioButton_2">
+            <property name="text">
+             <string>Import bodies from a file</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <item>
+             <widget class="QLineEdit" name="lineEdit_2"/>
+            </item>
+            <item>
+             <widget class="QPushButton" name="pushButton_4">
+              <property name="text">
+               <string>Browse</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <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>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="page_2">
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="groupBox_2">
+         <property name="title">
+          <string>Objects found</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_4">
+          <item>
+           <widget class="QLabel" name="label">
+            <property name="text">
+             <string>Mark the objects you wish to be imported.</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QListWidget" name="listWidget">
+            <item>
+             <property name="text">
+              <string notr="true">2P/Encke</string>
+             </property>
+             <property name="checkState">
+              <enum>Unchecked</enum>
+             </property>
+             <property name="flags">
+              <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
+             </property>
+            </item>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <property name="leftMargin">
+      <number>10</number>
+     </property>
+     <property name="rightMargin">
+      <number>10</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="pushButton">
+       <property name="text">
+        <string>Next</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_2">
+       <property name="text">
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

=== added file 'plugins/SolarSystemEditor/src/gui/ManualImportWindow.cpp'
--- plugins/SolarSystemEditor/src/gui/ManualImportWindow.cpp	1970-01-01 00:00:00 +0000
+++ plugins/SolarSystemEditor/src/gui/ManualImportWindow.cpp	2010-11-16 20:00:15 +0000
@@ -0,0 +1,257 @@
+/*
+ * Solar System editor plug-in for Stellarium
+ *
+ * Copyright (C) 2010 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include "SolarSystemEditor.hpp"
+
+#include "ManualImportWindow.hpp"
+#include "ui_manualImportWindow.h"
+
+#include <QColor>
+#include <QColorDialog>
+#include <QFileDialog>
+#include <QImageReader>
+
+#include "StelApp.hpp"
+#include "StelFileMgr.hpp"
+#include "StelModuleMgr.hpp"
+
+
+ManualImportWindow::ManualImportWindow()
+{
+	ui = new Ui_manualImportWindow();
+	ssoManager = GETSTELMODULE(SolarSystemEditor);
+}
+
+ManualImportWindow::~ManualImportWindow()
+{
+	delete ui;
+}
+
+void ManualImportWindow::createDialogContent()
+{
+	ui->setupUi(dialog);
+
+	//Signals
+	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
+
+	connect(ui->lineEditColor, SIGNAL(textChanged(QString)), this, SLOT(parseColorString(QString)));
+	connect(ui->pushButtonSelectColor, SIGNAL(clicked()), this, SLOT(selectColor()));
+
+	connect(ui->pushButtonSelectTexture, SIGNAL(clicked()), this, SLOT(selectPlanetTextureFile()));
+	connect(ui->pushButtonSelectRingTexture, SIGNAL(clicked()), this, SLOT(selectRingTextureFile()));
+
+	ui->labelLongitudeOfTheAscendingNode->setText(QString("Longitude of the ascending node %1:").arg(QChar(0x03A9)));//Capital omega
+	ui->radioButtonArgumentOfPeriapsis->setText(QString("Argument of periapsis %1:").arg(QChar(0x3C9)));//Lowercase omega
+	ui->radioButtonLongitudeOfPeriapsis->setText(QString("Longitude of periapsis %1:").arg(QChar(0x3D6)));
+
+	//TODO: Move to "set defaults" function
+	ui->lineEditColor->setText("1.0, 1.0, 1.0");
+	ui->lineEditTexture->setText("nomap.png");
+	ui->lineEditRingTexture->setText("saturn_rings_radial.png");
+}
+
+void ManualImportWindow::languageChanged()
+{
+	if (dialog)
+		ui->retranslateUi(dialog);
+}
+
+void ManualImportWindow::selectColor()
+{
+	QColor color = QColorDialog::getColor(objectColor);
+	objectColor =  color;
+	ui->lineEditColor->setText(QString("%1, %2, %3").arg(color.redF()).arg(color.greenF()).arg(color.blueF()));
+	setColorButtonColor(color);
+}
+
+void ManualImportWindow::parseColorString(QString colorCode)
+{
+	QStringList colorComponents = colorCode.split(QChar(','));
+	int count = colorComponents.count();
+	if (count < 3 || count > 4)
+		return;
+
+	bool ok;
+	double red = colorComponents.at(0).toDouble(&ok);
+	if (!ok || red < 0.0 || red > 1.0)
+		return;
+	double green = colorComponents.at(1).toDouble(&ok);
+	if (!ok || green < 0.0 || green > 1.0)
+		return;
+	double blue = colorComponents.at(2).toDouble(&ok);
+	if (!ok || blue < 0.0 || blue > 1.0)
+		return;
+
+	QColor color;
+	color.setRedF(red);
+	color.setGreenF(green);
+	color.setBlueF(blue);
+
+	if (count == 4)
+	{
+		double alpha = colorComponents.at(3).toDouble(&ok);
+		if (!ok || alpha < 0.0 || alpha > 1.0)
+			return;
+		color.setAlphaF(alpha);
+	}
+
+	objectColor = color;
+	setColorButtonColor(color);
+}
+
+void ManualImportWindow::setColorButtonColor(QColor newColor)
+{
+	qDebug() << "setColorButtonColor()";
+	QPixmap pixmap(16, 16);
+	pixmap.fill(newColor);
+	ui->pushButtonSelectColor->setIcon(QIcon(pixmap));
+}
+
+void ManualImportWindow::toggleCometOrbit(bool)
+{
+	//
+}
+
+void ManualImportWindow::toggleEllipticOrbit(bool)
+{
+	//
+}
+
+void ManualImportWindow::toggleObjectSpecificOrbit(bool)
+{
+	//
+}
+
+void ManualImportWindow::toggleMeanMotionOrPeriod(bool)
+{
+	//
+}
+
+void ManualImportWindow::selectPlanetTextureFile()
+{
+	selectTextureFile(ui->lineEditTexture);
+}
+
+void ManualImportWindow::selectRingTextureFile()
+{
+	selectTextureFile(ui->lineEditRingTexture);
+}
+
+void ManualImportWindow::selectTextureFile(QLineEdit * filePathLineEdit)
+{
+	//Find out the parent directory of the last selected file.
+	//Open the textures directory if no file have been selected.
+	QString texturesDirectoryPath;
+	QString currentFileName = filePathLineEdit->text();
+	if (currentFileName.isEmpty())
+	{
+		try
+		{
+			texturesDirectoryPath = StelFileMgr::findFile("textures", StelFileMgr::Directory);
+		}
+		catch (std::runtime_error &e)
+		{
+			qDebug() << e.what();
+			return;
+		}
+	}
+	else
+	{
+		QString currentFilePath;
+		try
+		{
+			currentFilePath = StelFileMgr::findFile("textures/" + currentFileName, StelFileMgr::File);
+		}
+		catch (std::runtime_error &e)
+		{
+			qDebug() << e.what();
+			filePathLineEdit->clear();
+			return;
+		}
+		if (currentFilePath.isEmpty())
+		{
+			filePathLineEdit->clear();
+			return;
+		}
+		QFileInfo currentFileInfo(currentFilePath);
+		texturesDirectoryPath = currentFileInfo.canonicalPath();
+	}
+
+	//Select an existing file
+	QStringList supportedFormats;
+	foreach (QByteArray format, QImageReader::supportedImageFormats())
+	{
+		supportedFormats.append(QString("*.%1").arg(QString(format)));//It's a wee bit long...
+	}
+	QString fileFilter = QString("Texture files (%1)").arg(supportedFormats.join(" "));
+	QString newFilePath = QFileDialog::getOpenFileName(0, QString(), texturesDirectoryPath, fileFilter);
+
+	//Is the file in one of the two "textures" directories?
+	if (newFilePath.isEmpty())
+		return;
+	QFileInfo newFileInfo(newFilePath);
+	QDir newFileParentDirectory = newFileInfo.dir();
+	if (newFileParentDirectory.dirName() != "textures")
+		return;
+	QDir installedTexturesDirectory(StelFileMgr::getInstallationDir() + "/textures");
+	QDir userTexturesDirectory(StelFileMgr::getUserDir() + "/textures");
+	if (newFileParentDirectory != installedTexturesDirectory && newFileParentDirectory != userTexturesDirectory)
+		return;
+
+	if (verifyTextureFile(newFileInfo.canonicalFilePath()))
+		filePathLineEdit->setText(newFileInfo.fileName());
+}
+
+bool ManualImportWindow::verifyTextureFile(QString filePath)
+{
+	//TODO: Absolute path? File exists?
+
+	QPixmap texture(filePath);
+
+	if (texture.isNull())
+	{
+		qDebug() << "File doesn't exist or is not an accepted texure format:"
+				<< filePath;
+		return false;
+	}
+
+	if (!verifyPowerOfTwo(texture.height()))
+	{
+		qDebug() << "Invalid texure height:" << texture.height()
+				<< "for file" << filePath;
+		return false;
+	}
+	if (!verifyPowerOfTwo(texture.width()))
+	{
+		qDebug() << "Invalid texture width:" << texture.width()
+				<< "for file" << filePath;
+		return false;
+	}
+
+	return true;
+}
+
+bool ManualImportWindow::verifyPowerOfTwo(int value)
+{
+	if (value > 0 && (value & (value-1)) == 0)
+		return true;
+	else
+		return false;
+}

=== added file 'plugins/SolarSystemEditor/src/gui/ManualImportWindow.hpp'
--- plugins/SolarSystemEditor/src/gui/ManualImportWindow.hpp	1970-01-01 00:00:00 +0000
+++ plugins/SolarSystemEditor/src/gui/ManualImportWindow.hpp	2010-11-16 20:00:15 +0000
@@ -0,0 +1,79 @@
+/*
+ * Solar System editor plug-in for Stellarium
+ *
+ * Copyright (C) 2010 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef _MANUAL_IMPORT_WINDOW_
+#define _MANUAL_IMPORT_WINDOW_
+
+#include <QObject>
+#include "StelDialog.hpp"
+
+#include "SolarSystemEditor.hpp"
+
+#include <QColor>
+
+class Ui_manualImportWindow;
+class QLineEdit;
+
+/*! \brief Window for manual entry of Solar System object properties.
+  \author Bogdan Marinov
+*/
+class ManualImportWindow : public StelDialog
+{
+	Q_OBJECT
+public:
+	ManualImportWindow();
+	virtual ~ManualImportWindow();
+	void languageChanged();
+
+private slots:
+	//TODO: Object type
+
+	void selectColor();
+	void parseColorString(QString);
+
+	void toggleCometOrbit(bool);
+	void toggleEllipticOrbit(bool);
+	void toggleObjectSpecificOrbit(bool);
+
+	void toggleMeanMotionOrPeriod(bool);
+
+	void selectPlanetTextureFile();
+	void selectRingTextureFile();
+	//TODO: Parse input in the line edits? (Otherwise, leave them read-only.)
+
+private:
+	SolarSystemEditor * ssoManager;
+
+	QColor objectColor;
+
+	void setColorButtonColor(QColor newColor);
+
+	void selectTextureFile(QLineEdit * filePathLineEdit);
+	//! Check if a file is a valid graphics file with OpenGL texture dimensions.
+	//! OpenGL accepts only dimentions that are powers of 2 (512, 1024, etc.)
+	bool verifyTextureFile(QString filePath);
+	bool verifyPowerOfTwo(int value);
+
+protected:
+	virtual void createDialogContent();
+	Ui_manualImportWindow * ui;
+};
+
+#endif //_MANUAL_IMPORT_WINDOW_

=== added file 'plugins/SolarSystemEditor/src/gui/MpcImportWindow.cpp'
--- plugins/SolarSystemEditor/src/gui/MpcImportWindow.cpp	1970-01-01 00:00:00 +0000
+++ plugins/SolarSystemEditor/src/gui/MpcImportWindow.cpp	2010-11-16 20:00:15 +0000
@@ -0,0 +1,958 @@
+/*
+ * Solar System editor plug-in for Stellarium
+ *
+ * Copyright (C) 2010 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include "SolarSystemEditor.hpp"
+
+#include "MpcImportWindow.hpp"
+#include "ui_mpcImportWindow.h"
+
+#include "StelApp.hpp"
+#include "StelFileMgr.hpp"
+#include "StelJsonParser.hpp"
+#include "StelModuleMgr.hpp"
+#include "SolarSystem.hpp"
+
+#include <QApplication>
+#include <QClipboard>
+#include <QFileDialog>
+#include <QHash>
+#include <QList>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QString>
+#include <QTemporaryFile>
+#include <QTimer>
+#include <QUrl>
+
+MpcImportWindow::MpcImportWindow()
+{
+	ui = new Ui_mpcImportWindow();
+	ssoManager = GETSTELMODULE(SolarSystemEditor);
+
+	networkManager = StelApp::getInstance().getNetworkAccessManager();
+
+	downloadReply = NULL;
+	queryReply = NULL;
+	downloadProgressBar = NULL;
+	queryProgressBar = NULL;
+
+	countdownTimer = new QTimer(this);
+
+	QHash<QString,QString> asteroidBookmarks;
+	QHash<QString,QString> cometBookmarks;
+	bookmarks.insert(MpcComets, cometBookmarks);
+	bookmarks.insert(MpcMinorPlanets, asteroidBookmarks);
+}
+
+MpcImportWindow::~MpcImportWindow()
+{
+	delete ui;
+	delete countdownTimer;
+	if (downloadReply)
+		downloadReply->deleteLater();
+	if (queryReply)
+		queryReply->deleteLater();
+	if (downloadProgressBar)
+		downloadProgressBar->deleteLater();
+	if (queryProgressBar)
+		queryProgressBar->deleteLater();
+}
+
+void MpcImportWindow::createDialogContent()
+{
+	ui->setupUi(dialog);
+
+	//Signals
+	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
+
+	connect(ui->pushButtonAcquire, SIGNAL(clicked()), this, SLOT(acquireObjectData()));
+	connect(ui->pushButtonAbortDownload, SIGNAL(clicked()), this, SLOT(abortDownload()));
+	connect(ui->pushButtonAdd, SIGNAL(clicked()), this, SLOT(addObjects()));
+	connect(ui->pushButtonDiscard, SIGNAL(clicked()), this, SLOT(discardObjects()));
+
+	connect(ui->pushButtonBrowse, SIGNAL(clicked()), this, SLOT(selectFile()));
+	connect(ui->pushButtonPasteURL, SIGNAL(clicked()), this, SLOT(pasteClipboardURL()));
+	connect(ui->comboBoxBookmarks, SIGNAL(currentIndexChanged(QString)), this, SLOT(bookmarkSelected(QString)));
+
+	//connect(ui->radioButtonSingle, SIGNAL(toggled(bool)), ui->frameSingle, SLOT(setVisible(bool)));
+	connect(ui->radioButtonFile, SIGNAL(toggled(bool)), ui->frameFile, SLOT(setVisible(bool)));
+	connect(ui->radioButtonURL, SIGNAL(toggled(bool)), ui->frameURL, SLOT(setVisible(bool)));
+
+	connect(ui->radioButtonAsteroids, SIGNAL(toggled(bool)), this, SLOT(switchImportType(bool)));
+	connect(ui->radioButtonComets, SIGNAL(toggled(bool)), this, SLOT(switchImportType(bool)));
+
+	connect(ui->pushButtonMarkAll, SIGNAL(clicked()), this, SLOT(markAll()));
+	connect(ui->pushButtonMarkNone, SIGNAL(clicked()), this, SLOT(unmarkAll()));
+
+	connect(ui->pushButtonSendQuery, SIGNAL(clicked()), this, SLOT(sendQuery()));
+	connect(ui->pushButtonAbortQuery, SIGNAL(clicked()), this, SLOT(abortQuery()));
+	connect(ui->lineEditQuery, SIGNAL(textEdited(QString)), this, SLOT(resetNotFound()));
+	//connect(ui->lineEditQuery, SIGNAL(editingFinished()), this, SLOT(sendQuery()));
+	connect(countdownTimer, SIGNAL(timeout()), this, SLOT(updateCountdown()));
+
+	loadBookmarks();
+
+	resetCountdown();
+	resetDialog();
+}
+
+void MpcImportWindow::resetDialog()
+{
+	ui->stackedWidget->setCurrentIndex(0);
+
+	//ui->tabWidget->setCurrentIndex(0);
+	ui->groupBoxType->setVisible(true);
+	ui->radioButtonAsteroids->setChecked(true);
+
+	ui->radioButtonFile->setChecked(true);
+	ui->frameURL->setVisible(false);
+
+	ui->lineEditFilePath->clear();
+	ui->lineEditQuery->clear();
+	ui->lineEditURL->setText("http://");
+	ui->checkBoxAddBookmark->setChecked(false);
+	ui->frameBookmarkTitle->setVisible(false);
+	ui->comboBoxBookmarks->setCurrentIndex(0);
+
+	ui->radioButtonUpdate->setChecked(true);
+	ui->checkBoxOnlyOrbitalElements->setChecked(true);
+
+	//TODO: Is this the right place?
+	ui->pushButtonAbortQuery->setVisible(false);
+	ui->pushButtonAbortDownload->setVisible(false);
+
+	//Resetting the dialog should not reset the timer
+	//resetCountdown();
+	resetNotFound();
+	enableInterface(true);
+}
+
+void MpcImportWindow::populateBookmarksList()
+{
+	ui->comboBoxBookmarks->clear();
+	ui->comboBoxBookmarks->addItem("Select bookmark...");
+	QStringList bookmarkTitles(bookmarks.value(importType).keys());
+	bookmarkTitles.sort();
+	ui->comboBoxBookmarks->addItems(bookmarkTitles);
+}
+
+void MpcImportWindow::languageChanged()
+{
+	if (dialog)
+		ui->retranslateUi(dialog);
+}
+
+void MpcImportWindow::acquireObjectData()
+{
+	if (ui->radioButtonFile->isChecked())
+	{
+		QString filePath = ui->lineEditFilePath->text();
+		if (filePath.isEmpty())
+			return;
+
+		QList<SsoElements> objects = readElementsFromFile(importType, filePath);
+		if (objects.isEmpty())
+			return;
+
+		//Temporary, until the slot/socket mechanism is ready
+		populateCandidateObjects(objects);
+		ui->stackedWidget->setCurrentIndex(1);
+	}
+	else if (ui->radioButtonURL->isChecked())
+	{
+		QString url = ui->lineEditURL->text();
+		if (url.isEmpty())
+			return;
+		startDownload(url);
+	}
+	//close();
+}
+
+void MpcImportWindow::addObjects()
+{
+	disconnect(ssoManager, SIGNAL(solarSystemChanged()), this, SLOT(resetDialog()));
+
+	QList<QString> checkedObjectsNames;
+
+	//Extract the marked objects
+	while (ui->listWidgetObjects->count() > 0)
+	{
+		QListWidgetItem * item = ui->listWidgetObjects->takeItem(0);
+		if (item->checkState() == Qt::Checked)
+		{
+			checkedObjectsNames.append(item->text());
+		}
+		delete item;
+	}
+	//qDebug() << "Checked:" << checkedObjectsNames;
+
+	QList<SsoElements> approvedForAddition;
+	for (int i = 0; i < candidatesForAddition.count(); i++)
+	{
+		QString name = candidatesForAddition.at(i).value("name").toString();
+		if (checkedObjectsNames.contains(name))
+			approvedForAddition.append(candidatesForAddition.at(i));
+	}
+
+	bool overwrite = ui->radioButtonOverwrite->isChecked();
+	QList<SsoElements> approvedForUpdate;
+	for (int j = 0; j < candidatesForUpdate.count(); j++)
+	{
+		QString name = candidatesForUpdate.at(j).value("name").toString();
+		if (checkedObjectsNames.contains(name))
+		{
+			if (overwrite)
+			{
+				approvedForAddition.append(candidatesForUpdate.at(j));
+			}
+			else
+			{
+				approvedForUpdate.append(candidatesForUpdate.at(j));
+			}
+		}
+	}
+
+	//Write to file
+	ssoManager->appendToSolarSystemConfigurationFile(approvedForAddition);
+
+	if (ui->radioButtonUpdate->isChecked())
+	{
+		SolarSystemEditor::UpdateFlags flags(SolarSystemEditor::UpdateNameAndNumber | SolarSystemEditor::UpdateOrbitalElements);
+		if (!ui->checkBoxOnlyOrbitalElements->isChecked())
+		{
+			flags |= SolarSystemEditor::UpdateType;
+			flags |= SolarSystemEditor::UpdateMagnitudeParameters;
+		}
+
+		ssoManager->updateSolarSystemConfigurationFile(approvedForUpdate, flags);
+	}
+
+	//Refresh the Solar System
+	GETSTELMODULE(SolarSystem)->reloadPlanets();
+
+	resetDialog();
+	emit objectsImported();
+}
+
+void MpcImportWindow::discardObjects()
+{
+	resetDialog();
+}
+
+void MpcImportWindow::pasteClipboardURL()
+{
+	ui->lineEditURL->setText(QApplication::clipboard()->text());
+}
+
+void MpcImportWindow::selectFile()
+{
+	QString filePath = QFileDialog::getOpenFileName(NULL, "Select a text file", StelFileMgr::getDesktopDir());
+	ui->lineEditFilePath->setText(filePath);
+}
+
+void MpcImportWindow::bookmarkSelected(QString bookmarkTitle)
+{
+	if (bookmarkTitle.isEmpty() || bookmarkTitle == "Select bookmark...")
+	{
+		ui->lineEditURL->clear();
+		return;
+	}
+	QString bookmarkUrl = bookmarks.value(importType).value(bookmarkTitle);
+	ui->lineEditURL->setText(bookmarkUrl);
+}
+
+void MpcImportWindow::populateCandidateObjects(QList<SsoElements> objects)
+{
+	candidatesForAddition.clear();
+
+	//Get a list of the current objects
+	QHash<QString,QString> defaultSsoIdentifiers = ssoManager->getDefaultSsoIdentifiers();
+	QHash<QString,QString> loadedSsoIdentifiers = ssoManager->listAllLoadedSsoIdentifiers();
+
+	//Separating the objects into visual groups in the list
+	int newDefaultSsoIndex = 0;
+	int newLoadedSsoIndex = 0;
+	int newNovelSsoIndex = 0;
+	int insertionIndex = 0;
+
+	QListWidget * list = ui->listWidgetObjects;
+	list->clear();
+	foreach (SsoElements object, objects)
+	{
+		QString name = object.value("name").toString();
+		if (name.isEmpty())
+			continue;
+
+		QString group = object.value("section_name").toString();
+		if (group.isEmpty())
+			continue;
+
+		//Prevent name conflicts between asteroids and moons
+		if (loadedSsoIdentifiers.contains(name))
+		{
+			if (loadedSsoIdentifiers.value(name) != group)
+			{
+				name.append('*');
+				object.insert("name", name);
+			}
+		}
+
+		QListWidgetItem * item = new QListWidgetItem();
+		item->setText(name);
+		item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
+		item->setCheckState(Qt::Unchecked);
+
+		if (defaultSsoIdentifiers.contains(name))
+		{
+			//Duplicate of a default solar system object
+			QFont itemFont(item->font());
+			itemFont.setBold(true);
+			item->setFont(itemFont);
+
+			candidatesForUpdate.append(object);
+
+			insertionIndex = newDefaultSsoIndex;
+			newDefaultSsoIndex++;
+			newLoadedSsoIndex++;
+			newNovelSsoIndex++;
+		}
+		else if (loadedSsoIdentifiers.contains(name))
+		{
+			//Duplicate of another existing object
+			QFont itemFont(item->font());
+			itemFont.setItalic(true);
+			item->setFont(itemFont);
+
+			candidatesForUpdate.append(object);
+
+			insertionIndex = newLoadedSsoIndex;
+			newLoadedSsoIndex++;
+			newNovelSsoIndex++;
+		}
+		else
+		{
+			candidatesForAddition.append(object);
+
+			insertionIndex = newNovelSsoIndex;
+			newNovelSsoIndex++;
+		}
+
+		list->insertItem(insertionIndex, item);
+	}
+
+	//Select the first item
+	if (list->count() > 0)
+		list->setCurrentRow(0);
+}
+
+void MpcImportWindow::enableInterface(bool enable)
+{
+	ui->groupBoxType->setVisible(enable);
+
+	ui->frameFile->setEnabled(enable);
+	ui->frameURL->setEnabled(enable);
+
+	ui->radioButtonFile->setEnabled(enable);
+	ui->radioButtonURL->setEnabled(enable);
+
+	ui->pushButtonAcquire->setEnabled(enable);
+}
+
+SsoElements MpcImportWindow::readElementsFromString (QString elements)
+{
+	Q_ASSERT(ssoManager);
+
+	switch (importType)
+	{
+	case MpcComets:
+		return ssoManager->readMpcOneLineCometElements(elements);
+	case MpcMinorPlanets:
+	default:
+		return ssoManager->readMpcOneLineMinorPlanetElements(elements);
+	}
+}
+
+QList<SsoElements> MpcImportWindow::readElementsFromFile(ImportType type, QString filePath)
+{
+	Q_ASSERT(ssoManager);
+
+	switch (type)
+	{
+	case MpcComets:
+		return ssoManager->readMpcOneLineCometElementsFromFile(filePath);
+	case MpcMinorPlanets:
+	default:
+		return ssoManager->readMpcOneLineMinorPlanetElementsFromFile(filePath);
+	}
+}
+
+void MpcImportWindow::switchImportType(bool)
+{
+	if (ui->radioButtonAsteroids->isChecked())
+	{
+		importType = MpcMinorPlanets;
+	}
+	else
+	{
+		importType = MpcComets;
+	}
+
+	populateBookmarksList();
+
+	//Clear the fields
+	//ui->lineEditSingle->clear();
+	ui->lineEditFilePath->clear();
+	ui->lineEditURL->clear();
+
+	//If one of the options is selected, show the rest of the dialog
+	ui->groupBoxSource->setVisible(true);
+}
+
+void MpcImportWindow::markAll()
+{
+	QListWidget * const list = ui->listWidgetObjects;
+	int rowCount = list->count();
+	if (rowCount < 1)
+		return;
+
+	for (int row = 0; row < rowCount; row++)
+	{
+		QListWidgetItem * item = list->item(row);
+		if (item)
+		{
+			item->setCheckState(Qt::Checked);
+		}
+	}
+}
+
+void MpcImportWindow::unmarkAll()
+{
+	QListWidget * const list = ui->listWidgetObjects;
+	int rowCount = list->count();
+	if (rowCount < 1)
+		return;
+
+	for (int row = 0; row < rowCount; row++)
+	{
+		QListWidgetItem * item = list->item(row);
+		if (item)
+		{
+			item->setCheckState(Qt::Unchecked);
+		}
+	}
+}
+
+void MpcImportWindow::updateDownloadProgress(qint64 bytesReceived, qint64 bytesTotal)
+{
+	if (downloadProgressBar == NULL)
+		return;
+
+	int currentValue = 0;
+	int endValue = 0;
+
+	if (bytesTotal > -1 && bytesReceived <= bytesTotal)
+	{
+		//Round to the greatest possible derived unit
+		while (bytesTotal > 1024)
+		{
+			bytesReceived = std::floor(bytesReceived / 1024);
+			bytesTotal    = std::floor(bytesTotal / 1024);
+		}
+		currentValue = bytesReceived;
+		endValue = bytesTotal;
+	}
+
+	downloadProgressBar->setValue(currentValue);
+	downloadProgressBar->setMaximum(endValue);
+}
+
+void MpcImportWindow::updateQueryProgress(qint64, qint64)
+{
+	if (queryProgressBar == NULL)
+		return;
+
+	//Just show activity
+	queryProgressBar->setValue(0);
+	queryProgressBar->setMaximum(0);
+}
+
+void MpcImportWindow::startDownload(QString urlString)
+{
+	if (downloadReply)
+	{
+		//There's already an operation in progress?
+		//TODO
+		return;
+	}
+
+	QUrl url(urlString);
+	if (!url.isValid() || url.isRelative() || url.scheme() != "http")
+	{
+		qWarning() << "Invalid URL:" << urlString;
+		return;
+	}
+	//qDebug() << url.toString();
+
+	//TODO: Interface changes!
+
+	downloadProgressBar = StelApp::getInstance().getGui()->addProgressBar();
+	downloadProgressBar->setValue(0);
+	downloadProgressBar->setMaximum(0);
+	//downloadProgressBar->setFormat("%v/%m");
+	downloadProgressBar->setVisible(true);
+
+	//TODO: Better handling of the interface
+	//dialog->setVisible(false);
+	enableInterface(false);
+	ui->pushButtonAbortDownload->setVisible(true);
+
+	connect(networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(downloadComplete(QNetworkReply*)));
+	downloadReply = networkManager->get(QNetworkRequest(url));
+	connect(downloadReply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(updateDownloadProgress(qint64,qint64)));
+}
+
+void MpcImportWindow::abortDownload()
+{
+	if (downloadReply == NULL || downloadReply->isFinished())
+		return;
+
+	qDebug() << "Aborting download...";
+
+	disconnect(networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(downloadComplete(QNetworkReply*)));
+	deleteDownloadProgressBar();
+
+	downloadReply->abort();
+	downloadReply->deleteLater();
+	downloadReply = NULL;
+
+	enableInterface(true);
+	ui->pushButtonAbortDownload->setVisible(false);
+}
+
+void MpcImportWindow::downloadComplete(QNetworkReply *reply)
+{
+	disconnect(networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(downloadComplete(QNetworkReply*)));
+	deleteDownloadProgressBar();
+	ui->pushButtonAbortDownload->setVisible(false);
+
+	/*
+	qDebug() << "reply->isOpen():" << reply->isOpen()
+		<< "reply->isReadable():" << reply->isReadable()
+		<< "reply->isFinished():" << reply->isFinished();
+	*/
+
+	if(reply->error())
+	{
+		qWarning() << "Download error: While downloading"
+		           << reply->url().toString()
+				   << "the following error occured:"
+				   << reply->errorString();
+		enableInterface(true);
+		reply->deleteLater();
+		downloadReply = NULL;
+		return;
+	}
+
+	QList<SsoElements> objects;
+	QTemporaryFile file;
+	if (file.open())
+	{
+		file.write(reply->readAll());
+		file.close();
+		objects = readElementsFromFile(importType, file.fileName());
+	}
+	else
+	{
+		qWarning() << "Unable to open a temporary file. Aborting operation.";
+	}
+
+	if (objects.isEmpty())
+	{
+		qWarning() << "No objects found in the file downloaded from"
+		           << reply->url().toString();
+	}
+	else
+	{
+		//The request has been successful: add the URL to bookmarks?
+		if (ui->checkBoxAddBookmark->isChecked())
+		{
+			QString url = reply->url().toString();
+			QString title = ui->lineEditBookmarkTitle->text().trimmed();
+			//If no title has been entered, use the URL as a title
+			if (title.isEmpty())
+				title = url;
+			if (!bookmarks.value(importType).values().contains(url))
+			{
+				bookmarks[importType].insert(title, url);
+				populateBookmarksList();
+				saveBookmarks();
+			}
+		}
+	}
+
+	reply->deleteLater();
+	downloadReply = NULL;
+
+	//Temporary, until the slot/socket mechanism is ready
+	populateCandidateObjects(objects);
+	ui->stackedWidget->setCurrentIndex(1);
+	//As this window is persistent, if the Solar System is changed
+	//while there is a list, it should be reset.
+	connect(ssoManager, SIGNAL(solarSystemChanged()), this, SLOT(resetDialog()));
+}
+
+void MpcImportWindow::deleteDownloadProgressBar()
+{
+	disconnect(this, SLOT(updateDownloadProgress(qint64,qint64)));
+
+	if (downloadProgressBar)
+	{
+		downloadProgressBar->setVisible(false);
+		downloadProgressBar->deleteLater();
+		downloadProgressBar = NULL;
+	}
+}
+
+void MpcImportWindow::sendQuery()
+{
+	if (queryReply != NULL)
+		return;
+
+	QString query = ui->lineEditQuery->text().trimmed();
+	if (query.isEmpty())
+		return;
+
+	//Progress bar
+	queryProgressBar = StelApp::getInstance().getGui()->addProgressBar();
+	queryProgressBar->setValue(0);
+	queryProgressBar->setMaximum(0);
+	queryProgressBar->setFormat("Searching...");
+	queryProgressBar->setVisible(true);
+
+	//TODO: Better handling of the interface
+	enableInterface(false);
+	ui->labelQueryMessage->setVisible(false);
+
+	QUrl url;
+	url.addQueryItem("ty","e");//Type: ephemerides
+	url.addQueryItem("TextArea", query);//Object name query
+	//url.addQueryItem("e", "-1");//Elements format: MPC 1-line
+	url.addQueryItem("e", "3");//Elements format: XEphem
+	//Yes, all of the rest are necessary
+	url.addQueryItem("d","");
+	url.addQueryItem("l","");
+	url.addQueryItem("i","");
+	url.addQueryItem("u","d");
+	url.addQueryItem("uto", "0");
+	url.addQueryItem("c", "");
+	url.addQueryItem("long", "");
+	url.addQueryItem("lat", "");
+	url.addQueryItem("alt", "");
+	url.addQueryItem("raty", "a");
+	url.addQueryItem("s", "t");
+	url.addQueryItem("m", "m");
+	url.addQueryItem("adir", "S");
+	url.addQueryItem("oed", "");
+	url.addQueryItem("resoc", "");
+	url.addQueryItem("tit", "");
+	url.addQueryItem("bu", "");
+	url.addQueryItem("ch", "c");
+	url.addQueryItem("ce", "f");
+	url.addQueryItem("js", "f");
+
+	QNetworkRequest request(QUrl("http://scully.cfa.harvard.edu/~cgi/MPEph2"));
+	request.setHeader(QNetworkRequest::ContentTypeHeader,"application/x-www-form-urlencoded");//Is this really necessary?
+	request.setHeader(QNetworkRequest::ContentLengthHeader, url.encodedQuery().length());
+
+	startCountdown();
+	ui->pushButtonAbortQuery->setVisible(true);
+	connect(networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(queryComplete(QNetworkReply*)));
+	queryReply = networkManager->post(request, url.encodedQuery());
+	connect(queryReply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(updateQueryProgress(qint64,qint64)));
+}
+
+void MpcImportWindow::abortQuery()
+{
+	if (queryReply == NULL)
+		return;
+
+	disconnect(networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(queryComplete(QNetworkReply*)));
+	deleteQueryProgressBar();
+
+	queryReply->abort();
+	queryReply->deleteLater();
+	queryReply = NULL;
+
+	//resetCountdown();
+	enableInterface(true);
+	ui->pushButtonAbortQuery->setVisible(false);
+}
+
+void MpcImportWindow::queryComplete(QNetworkReply *reply)
+{
+	disconnect(networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(queryComplete(QNetworkReply*)));
+	deleteQueryProgressBar();
+
+	//Hide the abort button - a reply has been received
+	ui->pushButtonAbortQuery->setVisible(false);
+
+	if (reply->error())
+	{
+		qWarning() << "Download error: While trying to access"
+		           << reply->url().toString()
+		           << "the following error occured:"
+		           << reply->errorString();
+		ui->labelQueryMessage->setText(reply->errorString());//TODO: Decide if this is a good idea
+		ui->labelQueryMessage->setVisible(true);
+		enableInterface(true);
+
+		reply->deleteLater();
+		queryReply = NULL;
+		return;
+	}
+
+	if (reply->header(QNetworkRequest::ContentTypeHeader) != "text/ascii" ||
+	    reply->rawHeader(QByteArray("Content-disposition")) != "attachment; filename=elements.txt")
+	{
+		ui->labelQueryMessage->setText("Object not found.");
+		ui->labelQueryMessage->setVisible(true);
+		enableInterface(true);
+	}
+	else
+	{
+		QList<SsoElements> objects;
+		QTemporaryFile file;
+		if (file.open())
+		{
+			file.write(reply->readAll());
+			file.close();
+
+			/*
+			//Try to read it as a comet first?
+			objects = readElementsFromFile(MpcComets, file.fileName());
+			if (objects.isEmpty())
+				objects = readElementsFromFile(MpcMinorPlanets, file.fileName());
+			*/
+			objects = ssoManager->readXEphemOneLineElementsFromFile(file.fileName());
+		}
+		else
+		{
+			qWarning() << "Unable to open a temporary file. Aborting operation.";
+		}
+
+		if (objects.isEmpty())
+		{
+			qWarning() << "No objects found in the file downloaded from"
+					   << reply->url().toString();
+		}
+		else
+		{
+			//The request has been successful: add the URL to bookmarks?
+			if (ui->checkBoxAddBookmark->isChecked())
+			{
+				QString url = reply->url().toString();
+				if (!bookmarks.value(importType).values().contains(url))
+				{
+					//Use the URL as a title for now
+					bookmarks[importType].insert(url, url);
+				}
+			}
+
+			//Temporary, until the slot/socket mechanism is ready
+			populateCandidateObjects(objects);
+			ui->stackedWidget->setCurrentIndex(1);
+		}
+	}
+
+	reply->deleteLater();
+	queryReply = NULL;
+}
+
+void MpcImportWindow::deleteQueryProgressBar()
+{
+	disconnect(this, SLOT(updateQueryProgress(qint64,qint64)));
+	if (queryProgressBar)
+	{
+		queryProgressBar->setVisible(false);
+		queryProgressBar->deleteLater();
+		queryProgressBar = NULL;
+	}
+}
+
+void MpcImportWindow::startCountdown()
+{
+	if (!countdownTimer->isActive())
+		countdownTimer->start(1000);//1 second
+
+	//Disable the interface
+	ui->lineEditQuery->setEnabled(false);
+	ui->pushButtonSendQuery->setEnabled(false);
+}
+
+void MpcImportWindow::resetCountdown()
+{
+	//Stop the timer
+	if (countdownTimer->isActive())
+	{
+		countdownTimer->stop();
+
+		//If the query is still active, kill it
+		if (queryReply != NULL && queryReply->isRunning())
+		{
+			abortQuery();
+			ui->labelQueryMessage->setText("The query timed out. You can try again, now or later.");
+			ui->labelQueryMessage->setVisible(true);
+		}
+	}
+
+	//Reset the counter
+	countdown = 60;
+
+	//Enable the interface
+	ui->lineEditQuery->setEnabled(true);
+	ui->pushButtonSendQuery->setEnabled(true);
+}
+
+void MpcImportWindow::updateCountdown()
+{
+	--countdown;
+	if (countdown < 0)
+	{
+		resetCountdown();
+	}
+	//If there has been an answer
+	else if (countdown > 50 && queryReply == NULL)
+	{
+		resetCountdown();
+	}
+}
+
+void MpcImportWindow::resetNotFound()
+{
+	ui->labelQueryMessage->setVisible(false);
+}
+
+void MpcImportWindow::loadBookmarks()
+{
+	bookmarks[MpcComets].clear();
+	bookmarks[MpcMinorPlanets].clear();
+
+	QString bookmarksFilePath(StelFileMgr::getUserDir() + "/modules/SolarSystemEditor/bookmarks.json");
+	if (StelFileMgr::isReadable(bookmarksFilePath))
+	{
+		QFile bookmarksFile(bookmarksFilePath);
+		if (bookmarksFile.open(QFile::ReadOnly | QFile::Text))
+		{
+			QVariantMap jsonRoot = StelJsonParser::parse(bookmarksFile.readAll()).toMap();
+
+			loadBookmarksGroup(jsonRoot.value("mpcMinorPlanets").toMap(), bookmarks[MpcMinorPlanets]);
+			loadBookmarksGroup(jsonRoot.value("mpcComets").toMap(), bookmarks[MpcComets]);
+
+			bookmarksFile.close();
+
+			//If nothing was read, continue
+			if (!bookmarks.value(MpcComets).isEmpty() && !bookmarks[MpcMinorPlanets].isEmpty())
+				return;
+		}
+	}
+
+	qDebug() << "Bookmarks file can't be read. Hard-coded bookmarks will be used.";
+
+	//Initialize with hard-coded values
+	bookmarks[MpcMinorPlanets].insert("MPC's list of bright minor planets at opposition", "http://www.minorplanetcenter.org/iau/Ephemerides/Bright/2010/Soft00Bright.txt");
+	bookmarks[MpcMinorPlanets].insert("MPCORB: near-Earth asteroids (NEAs)", "http://www.minorplanetcenter.org/iau/MPCORB/NEA.txt");
+	bookmarks[MpcMinorPlanets].insert("MPCORB: potentially hazardous asteroids (PHAs)", "http://www.minorplanetcenter.org/iau/MPCORB/PHA.txt");
+	bookmarks[MpcComets].insert("MPC's list of observable comets", "http://www.minorplanetcenter.org/iau/Ephemerides/Comets/Soft00Cmt.txt");
+
+	//Try to save them to a file
+	saveBookmarks();
+}
+
+void MpcImportWindow::loadBookmarksGroup(QVariantMap source, Bookmarks & bookmarkGroup)
+{
+	if (source.isEmpty())
+		return;
+
+	foreach (QString title, source.keys())
+	{
+		QString url = source.value(title).toString();
+		if (!url.isEmpty())
+			bookmarkGroup.insert(title, url);
+	}
+}
+
+void MpcImportWindow::saveBookmarks()
+{
+	try
+	{
+		StelFileMgr::makeSureDirExistsAndIsWritable(StelFileMgr::getUserDir() + "/modules/SolarSystemEditor");
+
+		QVariantMap jsonRoot;
+
+		QString bookmarksFilePath(StelFileMgr::getUserDir() + "/modules/SolarSystemEditor/bookmarks.json");
+
+		//If the file exists, load it first
+		if (StelFileMgr::isReadable(bookmarksFilePath))
+		{
+			QFile bookmarksFile(bookmarksFilePath);
+			if (bookmarksFile.open(QFile::ReadOnly | QFile::Text))
+			{
+				jsonRoot = StelJsonParser::parse(bookmarksFile.readAll()).toMap();
+				bookmarksFile.close();
+			}
+		}
+
+		QFile bookmarksFile(bookmarksFilePath);
+		if (bookmarksFile.open(QFile::WriteOnly | QFile::Truncate | QFile::Text))
+		{
+			QVariantMap minorPlanetsObject;
+			saveBookmarksGroup(bookmarks[MpcMinorPlanets], minorPlanetsObject);
+			//qDebug() << minorPlanetsObject.keys();
+			jsonRoot.insert("mpcMinorPlanets", minorPlanetsObject);
+
+			QVariantMap cometsObject;
+			saveBookmarksGroup(bookmarks[MpcComets], cometsObject);
+			jsonRoot.insert("mpcComets", cometsObject);
+
+			StelJsonParser::write(jsonRoot, &bookmarksFile);
+			bookmarksFile.close();
+
+			qDebug() << "Bookmarks file saved to" << bookmarksFilePath;
+			return;
+		}
+		else
+		{
+			qDebug() << "Unable to write bookmarks file to" << bookmarksFilePath;
+		}
+	}
+	catch (std::exception & e)
+	{
+		qDebug() << "Unable to save bookmarks file:" << e.what();
+	}
+}
+
+void MpcImportWindow::saveBookmarksGroup(Bookmarks & bookmarkGroup, QVariantMap & output)
+{
+	foreach (QString title, bookmarkGroup.keys())
+	{
+		output.insert(title, bookmarkGroup.value(title));
+	}
+}

=== added file 'plugins/SolarSystemEditor/src/gui/MpcImportWindow.hpp'
--- plugins/SolarSystemEditor/src/gui/MpcImportWindow.hpp	1970-01-01 00:00:00 +0000
+++ plugins/SolarSystemEditor/src/gui/MpcImportWindow.hpp	2010-11-16 20:00:15 +0000
@@ -0,0 +1,135 @@
+/*
+ * Solar System editor plug-in for Stellarium
+ *
+ * Copyright (C) 2010 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef _MPC_IMPORT_WINDOW_
+#define _MPC_IMPORT_WINDOW_
+
+#include <QObject>
+#include "StelDialog.hpp"
+
+#include "SolarSystemEditor.hpp"
+
+class Ui_mpcImportWindow;
+class QNetworkAccessManager;
+class QNetworkReply;
+class QProgressBar;
+
+/*! \brief Window for importing orbital elements from various sources.
+  \author Bogdan Marinov
+*/
+class MpcImportWindow : public StelDialog
+{
+	Q_OBJECT
+public:
+	enum ImportType {
+	                 MpcComets,
+	                 MpcMinorPlanets
+	                 };
+
+	MpcImportWindow();
+	virtual ~MpcImportWindow();
+	void languageChanged();
+
+signals:
+	void objectsImported();
+
+private slots:
+	//Radio buttons for type
+	void switchImportType(bool checked);
+
+	//File
+	void selectFile();
+
+	//Download
+	void pasteClipboardURL();
+	void bookmarkSelected(QString);
+
+	//Buttons for the list tab
+	void acquireObjectData();
+	void abortDownload();
+
+	//Online search
+	void sendQuery();
+	void abortQuery();
+	void updateCountdown();
+	void resetNotFound();
+
+	//Network
+	void updateDownloadProgress(qint64 bytesReceived, qint64 bytesTotal);
+	void updateQueryProgress(qint64 bytesReceived, qint64 bytesTotal);
+	void downloadComplete(QNetworkReply * reply);
+	void queryComplete(QNetworkReply * reply);
+
+	//! Marks (checks) all items in the results lists
+	void markAll();
+	//! Unmarks (unchecks) all items in the results lists
+	void unmarkAll();
+	void addObjects();
+	void discardObjects();
+
+	//! resets the dialog to the state it should be in immediately after createDialogContent();.
+	void resetDialog();
+
+private:
+	SolarSystemEditor * ssoManager;
+	QList<SsoElements> candidatesForAddition;
+	QList<SsoElements> candidatesForUpdate;
+
+	ImportType importType;
+
+	//! wrapper for the single object function to allow multiple formats.
+	SsoElements readElementsFromString(QString elements);
+	//! wrapper for the file function to allow multiple formats
+	QList<SsoElements> readElementsFromFile(ImportType type, QString filePath);
+
+	void populateBookmarksList();
+	//void populateCandidateObjects();
+	void populateCandidateObjects(QList<SsoElements>);
+	void enableInterface(bool enable);
+
+	//Downloading
+	QNetworkAccessManager * networkManager;
+	QNetworkReply * downloadReply;
+	QNetworkReply * queryReply;
+	QProgressBar * downloadProgressBar;
+	QProgressBar * queryProgressBar;
+	void startDownload(QString url);
+	void deleteDownloadProgressBar();
+	void deleteQueryProgressBar();
+
+	typedef QHash<QString,QString> Bookmarks;
+	QHash<ImportType, Bookmarks> bookmarks;
+	void loadBookmarks();
+	void loadBookmarksGroup(QVariantMap source, Bookmarks & bookmarkGroup);
+	void saveBookmarks();
+	void saveBookmarksGroup(Bookmarks & bookmarkGroup, QVariantMap & output);
+
+	//Online search
+	int countdown;
+	QTimer * countdownTimer;
+	void startCountdown();
+	void resetCountdown();
+
+protected:
+	virtual void createDialogContent();
+	Ui_mpcImportWindow * ui;
+};
+
+#endif //_MPC_IMPORT_WINDOW_

=== added file 'plugins/SolarSystemEditor/src/gui/SolarSystemManagerWindow.cpp'
--- plugins/SolarSystemEditor/src/gui/SolarSystemManagerWindow.cpp	1970-01-01 00:00:00 +0000
+++ plugins/SolarSystemEditor/src/gui/SolarSystemManagerWindow.cpp	2010-11-16 20:00:15 +0000
@@ -0,0 +1,170 @@
+/*
+ * Solar System editor plug-in for Stellarium
+ *
+ * Copyright (C) 2010 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include "SolarSystemEditor.hpp"
+
+#include "SolarSystemManagerWindow.hpp"
+#include "ui_solarSystemManagerWindow.h"
+
+#include "MpcImportWindow.hpp"
+#include "ManualImportWindow.hpp"
+
+#include "StelApp.hpp"
+#include "StelFileMgr.hpp"
+#include "StelModuleMgr.hpp"
+#include "Planet.hpp"
+#include "SolarSystem.hpp"
+
+#include <QFileDialog>
+
+SolarSystemManagerWindow::SolarSystemManagerWindow()
+{
+	ui = new Ui_solarSystemManagerWindow();
+	mpcImportWindow = new MpcImportWindow();
+	manualImportWindow = NULL;
+
+	ssoManager = GETSTELMODULE(SolarSystemEditor);
+}
+
+SolarSystemManagerWindow::~SolarSystemManagerWindow()
+{
+	delete ui;
+
+	if (mpcImportWindow)
+		delete mpcImportWindow;
+	if (manualImportWindow)
+		delete manualImportWindow;
+}
+
+void SolarSystemManagerWindow::createDialogContent()
+{
+	ui->setupUi(dialog);
+
+	//Signals
+	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
+	connect(ui->pushButtonCopyFile, SIGNAL(clicked()), this, SLOT(copyConfiguration()));
+	connect(ui->pushButtonReplaceFile, SIGNAL(clicked()), this, SLOT(replaceConfiguration()));
+	connect(ui->pushButtonRemove, SIGNAL(clicked()), this, SLOT(removeObject()));
+	connect(ui->pushButtonImportMPC, SIGNAL(clicked()), this, SLOT(newImportMPC()));
+	connect(ui->pushButtonManual, SIGNAL(clicked()), this, SLOT(newImportManual()));
+
+	connect(ssoManager, SIGNAL(solarSystemChanged()), this, SLOT(populateSolarSystemList()));
+	connect(ui->pushButtonReset, SIGNAL(clicked()), ssoManager, SLOT(resetSolarSystemToDefault()));
+
+	ui->labelVersion->setText(QString("Version %1").arg(PLUGIN_VERSION));
+	//Remove the "Data Import" tab
+	//TODO: (temporary, until the ManualImportWindow is finished)
+	ui->tabWidget->removeTab(2);
+
+	Q_ASSERT(mpcImportWindow);
+	//Rebuild the list if any planets have been imported
+	connect(mpcImportWindow, SIGNAL(objectsImported()), this, SLOT(populateSolarSystemList()));
+
+	ui->lineEditUserFilePath->setText(ssoManager->getCustomSolarSystemFilePath());
+	populateSolarSystemList();
+}
+
+void SolarSystemManagerWindow::languageChanged()
+{
+	if (dialog)
+	{
+		ui->retranslateUi(dialog);
+		populateSolarSystemList();
+		ui->labelVersion->setText(QString("Version %1").arg(PLUGIN_VERSION));
+	}
+
+	if (mpcImportWindow)
+		mpcImportWindow->languageChanged();
+}
+
+void SolarSystemManagerWindow::newImportMPC()
+{
+	Q_ASSERT(mpcImportWindow);
+
+	mpcImportWindow->setVisible(true);
+}
+
+void SolarSystemManagerWindow::newImportManual()
+{
+	if (manualImportWindow == NULL)
+	{
+		manualImportWindow = new ManualImportWindow();
+		connect(manualImportWindow, SIGNAL(visibleChanged(bool)), this, SLOT(resetImportManual(bool)));
+	}
+
+	manualImportWindow->setVisible(true);
+}
+
+void SolarSystemManagerWindow::resetImportManual(bool show)
+{
+	//If the window is being displayed, do nothing
+	if (show)
+		return;
+
+	if (manualImportWindow)
+	{
+		//TODO:Move this out of here!
+		//Reload the list, in case there are new objects
+		populateSolarSystemList();
+
+		delete manualImportWindow;
+		manualImportWindow = NULL;
+
+		//This window is in the background, bring it to the foreground
+		dialog->setVisible(true);
+	}
+}
+
+void SolarSystemManagerWindow::populateSolarSystemList()
+{
+	unlocalizedNames.clear();
+	foreach (const PlanetP & object, GETSTELMODULE(SolarSystem)->getAllPlanets())
+	{
+		unlocalizedNames.insert(object->getNameI18n(), object->getEnglishName());
+	}
+
+	ui->listWidgetObjects->clear();
+	ui->listWidgetObjects->addItems(unlocalizedNames.keys());
+	//No explicit sorting is necessary: sortingEnabled is set in the .ui
+}
+
+void SolarSystemManagerWindow::removeObject()
+{
+	if(ui->listWidgetObjects->currentItem())
+	{
+		QString ssoI18nName = ui->listWidgetObjects->currentItem()->text();
+		QString ssoEnglishName = unlocalizedNames.value(ssoI18nName);
+		//qDebug() << ssoId;
+		//TODO: Ask for confirmation first?
+		ssoManager->removeSsoWithName(ssoEnglishName);
+	}
+}
+
+void SolarSystemManagerWindow::copyConfiguration()
+{
+	QString filePath = QFileDialog::getSaveFileName(0, "Save the Solar System configuration file as...", StelFileMgr::getDesktopDir());
+	ssoManager->copySolarSystemConfigurationFileTo(filePath);
+}
+
+void SolarSystemManagerWindow::replaceConfiguration()
+{
+	QString filePath = QFileDialog::getOpenFileName(0, "Select a file to replace the Solar System configuration file", StelFileMgr::getDesktopDir(), QString("Configration files (*.ini)"));
+	ssoManager->replaceSolarSystemConfigurationFileWith(filePath);
+}

=== added file 'plugins/SolarSystemEditor/src/gui/SolarSystemManagerWindow.hpp'
--- plugins/SolarSystemEditor/src/gui/SolarSystemManagerWindow.hpp	1970-01-01 00:00:00 +0000
+++ plugins/SolarSystemEditor/src/gui/SolarSystemManagerWindow.hpp	2010-11-16 20:00:15 +0000
@@ -0,0 +1,73 @@
+/*
+ * Solar System editor plug-in for Stellarium
+ *
+ * Copyright (C) 2010 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef _SOLAR_SYSTEM_MANAGER_WINDOW_
+#define _SOLAR_SYSTEM_MANAGER_WINDOW_
+
+#include <QObject>
+#include "StelDialog.hpp"
+
+#include <QHash>
+#include <QString>
+
+class SolarSystemEditor;
+
+class Ui_solarSystemManagerWindow;
+class MpcImportWindow;
+class ManualImportWindow;
+
+/*! \brief Main window for handling Solar System objects.
+  \author Bogdan Marinov
+*/
+class SolarSystemManagerWindow : public StelDialog
+{
+	Q_OBJECT
+public:
+	SolarSystemManagerWindow();
+	virtual ~SolarSystemManagerWindow();
+	void languageChanged();
+
+protected:
+	virtual void createDialogContent();
+	Ui_solarSystemManagerWindow * ui;
+
+private slots:
+	//! \todo Find a way to suggest a default file name (select directory instead of file?)
+	void copyConfiguration();
+	void replaceConfiguration();
+
+	void populateSolarSystemList();
+	void removeObject();
+
+	void newImportMPC();
+
+	void newImportManual();
+	void resetImportManual(bool);
+
+private:
+	MpcImportWindow* mpcImportWindow;
+	ManualImportWindow * manualImportWindow;
+
+	SolarSystemEditor * ssoManager;
+
+	QHash<QString,QString> unlocalizedNames;
+};
+
+#endif //_SOLAR_SYSTEM_MANAGER_WINDOW_

=== added file 'plugins/SolarSystemEditor/src/gui/manualImportWindow.ui'
--- plugins/SolarSystemEditor/src/gui/manualImportWindow.ui	1970-01-01 00:00:00 +0000
+++ plugins/SolarSystemEditor/src/gui/manualImportWindow.ui	2010-11-16 20:00:15 +0000
@@ -0,0 +1,890 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>manualImportWindow</class>
+ <widget class="QWidget" name="manualImportWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>600</width>
+    <height>500</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayoutWindow">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item row="0" column="0" colspan="2">
+    <widget class="BarFrame" name="LocationBar">
+     <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">Define an object</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 row="1" column="1">
+    <widget class="QGroupBox" name="groupBoxObjectType">
+     <property name="title">
+      <string>Object type</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayoutObjectType">
+      <property name="margin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QRadioButton" name="radioButtonSolarSystemObject">
+        <property name="text">
+         <string>Solar System object</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="radioButtonMinorPlanet">
+        <property name="text">
+         <string>Minor planet (asteroid)</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="radioButtonComet">
+        <property name="text">
+         <string>Comet</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="radioButtonSatellite">
+        <property name="text">
+         <string>Satellite</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="groupBoxName">
+     <property name="title">
+      <string>Name</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <layout class="QGridLayout" name="gridLayoutName">
+      <property name="margin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="labelName">
+        <property name="text">
+         <string>Name</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="lineEditName"/>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="labelIdentifier">
+        <property name="text">
+         <string>Identifier</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="lineEditIdentifier"/>
+      </item>
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="checkBoxMinorPlanetNumber">
+        <property name="text">
+         <string>Minor planet number</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="lineEditMinorPlanetNumber"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>582</width>
+        <height>1436</height>
+       </rect>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayoutScroll">
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="groupBoxProperties">
+         <property name="title">
+          <string>Properties</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_4">
+          <item row="0" column="0">
+           <widget class="QLabel" name="labelParent">
+            <property name="text">
+             <string>Parent:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="2" colspan="2">
+           <widget class="QComboBox" name="comboBoxParent"/>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="labelRadius">
+            <property name="text">
+             <string>Radius:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="2" colspan="2">
+           <widget class="QLineEdit" name="lineEditRadius"/>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="labelOblateness">
+            <property name="text">
+             <string>Oblateness:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="2" colspan="2">
+           <widget class="QLineEdit" name="lineEditOblateness"/>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="labelAlbedo">
+            <property name="text">
+             <string>Albedo:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="2" colspan="2">
+           <widget class="QLineEdit" name="lineEditAlbedo"/>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="labelColor">
+            <property name="text">
+             <string>Color:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="3">
+           <widget class="QPushButton" name="pushButtonSelectColor"/>
+          </item>
+          <item row="5" column="0" colspan="4">
+           <widget class="QCheckBox" name="checkBoxLighting">
+            <property name="text">
+             <string>Lighting (TODO: More clear name)</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0" colspan="4">
+           <widget class="QCheckBox" name="checkBoxAtmosphere">
+            <property name="text">
+             <string>Atmosphere</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="0" colspan="4">
+           <widget class="QCheckBox" name="checkBoxHidden">
+            <property name="text">
+             <string>Hidden</string>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="0">
+           <widget class="QLabel" name="labelTexture">
+            <property name="text">
+             <string>Texture:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="2">
+           <widget class="QLineEdit" name="lineEditTexture">
+            <property name="readOnly">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="3">
+           <widget class="QPushButton" name="pushButtonSelectTexture">
+            <property name="text">
+             <string>...</string>
+            </property>
+           </widget>
+          </item>
+          <item row="9" column="0" colspan="4">
+           <widget class="QFrame" name="frameMagnitude">
+            <layout class="QGridLayout" name="gridLayoutMagnitude">
+             <property name="margin">
+              <number>0</number>
+             </property>
+             <item row="1" column="0">
+              <widget class="QLabel" name="labelAbsoluteMagnitude">
+               <property name="text">
+                <string>Absolute magnitude:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QLineEdit" name="lineEditAbsoluteMagnitude"/>
+             </item>
+             <item row="1" column="2">
+              <widget class="QLabel" name="labelSlopeParameter">
+               <property name="text">
+                <string>Slope parameter:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="3">
+              <widget class="QLineEdit" name="lineEditSlopeParameter"/>
+             </item>
+             <item row="2" column="0" colspan="4">
+              <widget class="QPushButton" name="pushButtonCalculateRadius">
+               <property name="text">
+                <string>Calculate the object's radius from the absolute magnitude and the current albedo</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="0" colspan="4">
+              <widget class="QLabel" name="labelMagnitudeSystem">
+               <property name="text">
+                <string>H-G two parameter magnitude system for minor planets:</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="4" column="2">
+           <widget class="QLineEdit" name="lineEditColor"/>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBoxOrbitalElements">
+         <property name="title">
+          <string>Orbital elements</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayoutOrbitalElements">
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <item row="0" column="0" colspan="2">
+           <widget class="QLabel" name="labelOrbitType">
+            <property name="text">
+             <string>Orbital function type:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" colspan="2">
+           <widget class="QRadioButton" name="radioButtonCometaryOrbit">
+            <property name="text">
+             <string>Cometary orbit</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0" colspan="2">
+           <widget class="QRadioButton" name="radioButtonEllipticOrbit">
+            <property name="text">
+             <string>Elliptic orbit</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="labelEccentricity">
+            <property name="text">
+             <string>Eccentricity (%1):</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QLineEdit" name="lineEditEccentricity">
+            <property name="text">
+             <string>0</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="labelInclination">
+            <property name="text">
+             <string>Inclination (degrees):</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1">
+           <widget class="QLineEdit" name="lineEditInclination"/>
+          </item>
+          <item row="6" column="0">
+           <widget class="QLabel" name="labelLongitudeOfTheAscendingNode">
+            <property name="text">
+             <string>Longitude of the ascending node %1:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="1">
+           <widget class="QLineEdit" name="lineEditLongitudeOfTheAscendingNode"/>
+          </item>
+          <item row="7" column="0" colspan="2">
+           <widget class="QFrame" name="framePeriapsis">
+            <layout class="QGridLayout" name="gridLayoutPeriapsis">
+             <property name="margin">
+              <number>0</number>
+             </property>
+             <item row="0" column="0">
+              <widget class="QRadioButton" name="radioButtonArgumentOfPeriapsis">
+               <property name="text">
+                <string>Argument of the periapsis %1:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QLineEdit" name="lineEditArgumentOfPeriapsis"/>
+             </item>
+             <item row="1" column="0">
+              <widget class="QRadioButton" name="radioButtonLongitudeOfPeriapsis">
+               <property name="text">
+                <string>Longitude of the periapsis %1:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QLineEdit" name="lineEditLongitudeOfPeriapsis"/>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="8" column="0" colspan="2">
+           <widget class="QFrame" name="frameSemiMajorAxis">
+            <layout class="QGridLayout" name="gridLayoutSemiMajorAxis">
+             <property name="margin">
+              <number>0</number>
+             </property>
+             <item row="0" column="1">
+              <widget class="QLineEdit" name="lineEditSemiMajorAxis"/>
+             </item>
+             <item row="1" column="1">
+              <widget class="QLineEdit" name="lineEditPeriapsisDistance"/>
+             </item>
+             <item row="0" column="0">
+              <widget class="QRadioButton" name="radioButtonSemiMajorAxis">
+               <property name="text">
+                <string>Semi-major axis %1:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QRadioButton" name="radioButtonPeriapsisDistance">
+               <property name="text">
+                <string>Periapsis distance %1:</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="9" column="0" colspan="2">
+           <widget class="QFrame" name="framePeriod">
+            <layout class="QGridLayout" name="gridLayoutPeriod">
+             <property name="margin">
+              <number>0</number>
+             </property>
+             <item row="0" column="0">
+              <widget class="QCheckBox" name="checkBoxPeriod">
+               <property name="text">
+                <string>Period:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QLineEdit" name="lineEditPeriod"/>
+             </item>
+             <item row="1" column="0">
+              <widget class="QCheckBox" name="checkBoxMeanMotion">
+               <property name="text">
+                <string>Mean motion:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QLineEdit" name="lineEditMeanMotion"/>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="10" column="0" colspan="2">
+           <widget class="QFrame" name="frameEpoch">
+            <layout class="QGridLayout" name="gridLayoutEpoch">
+             <property name="margin">
+              <number>0</number>
+             </property>
+             <item row="0" column="1">
+              <widget class="QLineEdit" name="lineEditEpoch"/>
+             </item>
+             <item row="1" column="1" colspan="2">
+              <widget class="QLineEdit" name="lineEditTimeOfPeriapsis"/>
+             </item>
+             <item row="0" column="0">
+              <widget class="QRadioButton" name="radioButtonEpoch">
+               <property name="text">
+                <string>Epoch:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QRadioButton" name="radioButtonTimeOfPeriapsis">
+               <property name="text">
+                <string>Time of periapsis passage:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="2">
+              <widget class="QPushButton" name="pushButtonEpochJ2000">
+               <property name="text">
+                <string>J2000.0</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="11" column="0" colspan="2">
+           <widget class="QFrame" name="frameMeanAnomaly">
+            <layout class="QGridLayout" name="gridLayout_2">
+             <property name="margin">
+              <number>0</number>
+             </property>
+             <item row="1" column="1">
+              <widget class="QLineEdit" name="lineEditMeanAnomaly"/>
+             </item>
+             <item row="2" column="1">
+              <widget class="QLineEdit" name="lineEditMeanLongitude"/>
+             </item>
+             <item row="1" column="0">
+              <widget class="QRadioButton" name="radioButtonMeanAnomaly">
+               <property name="text">
+                <string>Mean anomaly:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0">
+              <widget class="QRadioButton" name="radioButtonMeanLongitude">
+               <property name="text">
+                <string>Mean longitude:</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QRadioButton" name="radioButtonOrbitFunction">
+            <property name="text">
+             <string>Object-specific:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QComboBox" name="comboBoxOrbitFunction"/>
+          </item>
+          <item row="12" column="0">
+           <widget class="QCheckBox" name="checkBoxOrbitVisualizationPeriod">
+            <property name="text">
+             <string>Orbit visualization period:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="12" column="1">
+           <widget class="QLineEdit" name="lineEditOrbitVisualizationPeriod"/>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBoxRotationalElements">
+         <property name="title">
+          <string>Rotational elements</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="checkBoxObliquity">
+            <property name="text">
+             <string>Obliquity:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" colspan="3">
+           <widget class="QLineEdit" name="lineEditObliquity"/>
+          </item>
+          <item row="2" column="0">
+           <widget class="QCheckBox" name="checkBoxNorthPoleRA">
+            <property name="text">
+             <string>North pole right ascension:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1" colspan="3">
+           <widget class="QLineEdit" name="lineEditNorthPoleRA"/>
+          </item>
+          <item row="3" column="0">
+           <widget class="QCheckBox" name="checkBoxNorthPoleDec">
+            <property name="text">
+             <string>North pole declination:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1" colspan="3">
+           <widget class="QLineEdit" name="lineEditNorthPoleDec"/>
+          </item>
+          <item row="4" column="0">
+           <widget class="QCheckBox" name="checkBoxRotationalPeriod">
+            <property name="text">
+             <string>Period (hours):</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1" colspan="3">
+           <widget class="QLineEdit" name="lineEditRotationalPeriod"/>
+          </item>
+          <item row="5" column="0">
+           <widget class="QCheckBox" name="checkBoxPrecessionRate">
+            <property name="text">
+             <string>Precession rate:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1" colspan="3">
+           <widget class="QLineEdit" name="lineEditPrecessionRate"/>
+          </item>
+          <item row="6" column="0">
+           <widget class="QCheckBox" name="checkBoxRotationalEpoch">
+            <property name="text">
+             <string>Epoch:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="1">
+           <widget class="QLineEdit" name="lineEditRotationalEpoch"/>
+          </item>
+          <item row="7" column="0">
+           <widget class="QCheckBox" name="checkBoxOffset">
+            <property name="text">
+             <string>Offset:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="1" colspan="3">
+           <widget class="QLineEdit" name="lineEditOffset"/>
+          </item>
+          <item row="1" column="0" colspan="3">
+           <widget class="QCheckBox" name="checkBoxEquatorAscendingNode">
+            <property name="text">
+             <string>Longitude of the ascending node of the ecliptic on the equator:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="3">
+           <widget class="QPushButton" name="pushButtonRotationalEpochJ2000">
+            <property name="text">
+             <string>J2000.0</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="3">
+           <widget class="QLineEdit" name="lineEditEquatorAscendingNode"/>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBoxRings">
+         <property name="title">
+          <string>Rings</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_3">
+          <item row="0" column="0">
+           <widget class="QLabel" name="labelInnerSize">
+            <property name="text">
+             <string>Inner size:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="labelOuterSize">
+            <property name="text">
+             <string>Outer size:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="labelRingTexture">
+            <property name="text">
+             <string>Texture:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLineEdit" name="lineEditRingTexture">
+            <property name="readOnly">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="2">
+           <widget class="QPushButton" name="pushButtonSelectRingTexture">
+            <property name="text">
+             <string>...</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" colspan="2">
+           <widget class="QLineEdit" name="lineEditRingInnerSize"/>
+          </item>
+          <item row="1" column="1" colspan="2">
+           <widget class="QLineEdit" name="lineEditRingOuterSize"/>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QFrame" name="frameButton">
+     <layout class="QHBoxLayout" name="horizontalLayoutButton">
+      <item>
+       <widget class="QLabel" name="labelErrorMessage">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pushButtonSave">
+        <property name="text">
+         <string>Save</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>BarFrame</class>
+   <extends>QFrame</extends>
+   <header>Dialog.hpp</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>lineEditName</tabstop>
+  <tabstop>lineEditIdentifier</tabstop>
+  <tabstop>checkBoxMinorPlanetNumber</tabstop>
+  <tabstop>lineEditMinorPlanetNumber</tabstop>
+  <tabstop>radioButtonSolarSystemObject</tabstop>
+  <tabstop>radioButtonMinorPlanet</tabstop>
+  <tabstop>radioButtonComet</tabstop>
+  <tabstop>radioButtonSatellite</tabstop>
+  <tabstop>scrollArea</tabstop>
+  <tabstop>comboBoxParent</tabstop>
+  <tabstop>lineEditRadius</tabstop>
+  <tabstop>lineEditOblateness</tabstop>
+  <tabstop>lineEditAlbedo</tabstop>
+  <tabstop>lineEditColor</tabstop>
+  <tabstop>pushButtonSelectColor</tabstop>
+  <tabstop>checkBoxLighting</tabstop>
+  <tabstop>checkBoxAtmosphere</tabstop>
+  <tabstop>checkBoxHidden</tabstop>
+  <tabstop>lineEditTexture</tabstop>
+  <tabstop>pushButtonSelectTexture</tabstop>
+  <tabstop>lineEditAbsoluteMagnitude</tabstop>
+  <tabstop>lineEditSlopeParameter</tabstop>
+  <tabstop>pushButtonCalculateRadius</tabstop>
+  <tabstop>radioButtonCometaryOrbit</tabstop>
+  <tabstop>radioButtonEllipticOrbit</tabstop>
+  <tabstop>radioButtonOrbitFunction</tabstop>
+  <tabstop>comboBoxOrbitFunction</tabstop>
+  <tabstop>lineEditEccentricity</tabstop>
+  <tabstop>lineEditInclination</tabstop>
+  <tabstop>lineEditLongitudeOfTheAscendingNode</tabstop>
+  <tabstop>radioButtonArgumentOfPeriapsis</tabstop>
+  <tabstop>lineEditArgumentOfPeriapsis</tabstop>
+  <tabstop>radioButtonLongitudeOfPeriapsis</tabstop>
+  <tabstop>lineEditLongitudeOfPeriapsis</tabstop>
+  <tabstop>radioButtonSemiMajorAxis</tabstop>
+  <tabstop>lineEditSemiMajorAxis</tabstop>
+  <tabstop>radioButtonPeriapsisDistance</tabstop>
+  <tabstop>lineEditPeriapsisDistance</tabstop>
+  <tabstop>checkBoxPeriod</tabstop>
+  <tabstop>lineEditPeriod</tabstop>
+  <tabstop>checkBoxMeanMotion</tabstop>
+  <tabstop>lineEditMeanMotion</tabstop>
+  <tabstop>radioButtonEpoch</tabstop>
+  <tabstop>lineEditEpoch</tabstop>
+  <tabstop>pushButtonEpochJ2000</tabstop>
+  <tabstop>radioButtonTimeOfPeriapsis</tabstop>
+  <tabstop>lineEditTimeOfPeriapsis</tabstop>
+  <tabstop>radioButtonMeanAnomaly</tabstop>
+  <tabstop>lineEditMeanAnomaly</tabstop>
+  <tabstop>radioButtonMeanLongitude</tabstop>
+  <tabstop>lineEditMeanLongitude</tabstop>
+  <tabstop>checkBoxOrbitVisualizationPeriod</tabstop>
+  <tabstop>lineEditOrbitVisualizationPeriod</tabstop>
+  <tabstop>checkBoxObliquity</tabstop>
+  <tabstop>lineEditObliquity</tabstop>
+  <tabstop>checkBoxEquatorAscendingNode</tabstop>
+  <tabstop>lineEditEquatorAscendingNode</tabstop>
+  <tabstop>checkBoxNorthPoleRA</tabstop>
+  <tabstop>lineEditNorthPoleRA</tabstop>
+  <tabstop>checkBoxNorthPoleDec</tabstop>
+  <tabstop>lineEditNorthPoleDec</tabstop>
+  <tabstop>checkBoxRotationalPeriod</tabstop>
+  <tabstop>lineEditRotationalPeriod</tabstop>
+  <tabstop>checkBoxPrecessionRate</tabstop>
+  <tabstop>lineEditPrecessionRate</tabstop>
+  <tabstop>checkBoxRotationalEpoch</tabstop>
+  <tabstop>lineEditRotationalEpoch</tabstop>
+  <tabstop>pushButtonRotationalEpochJ2000</tabstop>
+  <tabstop>checkBoxOffset</tabstop>
+  <tabstop>lineEditOffset</tabstop>
+  <tabstop>groupBoxRings</tabstop>
+  <tabstop>lineEditRingInnerSize</tabstop>
+  <tabstop>lineEditRingOuterSize</tabstop>
+  <tabstop>lineEditRingTexture</tabstop>
+  <tabstop>pushButtonSelectRingTexture</tabstop>
+  <tabstop>pushButtonSave</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>

=== added file 'plugins/SolarSystemEditor/src/gui/mpcImportWindow.ui'
--- plugins/SolarSystemEditor/src/gui/mpcImportWindow.ui	1970-01-01 00:00:00 +0000
+++ plugins/SolarSystemEditor/src/gui/mpcImportWindow.ui	2010-11-16 20:00:15 +0000
@@ -0,0 +1,679 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <author>Bogdan Marinov</author>
+ <class>mpcImportWindow</class>
+ <widget class="QWidget" name="mpcImportWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>480</width>
+    <height>475</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <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">Import data</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>