Merge lp:~daggerstab/stellarium/custom-object-info-gui into lp:stellarium

[Bogdan Marinov]

I've rewritten the feature allowing customization of the information displayed for a selected object that was introduced before the previous release.

Now instead of a separate window it's a tab in the Configuration window.It also works in a different manner than the original feature, though I've kept the same keys in the configuration file.

A possible modification is moving it to the Sky and viewing options window.

I the changes are approved, I'd like to merge them in the trunk myself.

[Alexander Wolf (alexwolf)]

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-06-14 03:22:36 +0000
+++ src/CMakeLists.txt	2012-07-19 16:10:25 +0000
@@ -415,8 +415,6 @@
 		gui/AddRemoveLandscapesDialog.cpp
 		gui/AtmosphereDialog.hpp
 		gui/AtmosphereDialog.cpp
-                gui/CustomInfoDialog.hpp
-                gui/CustomInfoDialog.cpp
 		gui/StelDialog.hpp
 		gui/StelDialog.cpp)
 
@@ -436,7 +434,6 @@
 		gui/ConfigurationDialog.hpp
 		gui/AddRemoveLandscapesDialog.hpp
 		gui/AtmosphereDialog.hpp
-                gui/CustomInfoDialog.hpp
 		gui/StelDialog.hpp)
 
 	################# compiles .ui files ############
@@ -448,7 +445,6 @@
 	gui/searchDialogGui.ui
 	gui/configurationDialog.ui
 	gui/AtmosphereDialog.ui
-        gui/CustomInfoDialog.ui
 	gui/addRemoveLandscapesDialog.ui)
 
 	IF(ENABLE_SCRIPT_CONSOLE)

=== modified file 'src/core/StelObject.hpp'
--- src/core/StelObject.hpp	2012-04-13 16:42:43 +0000
+++ src/core/StelObject.hpp	2012-07-19 16:10:25 +0000
@@ -20,6 +20,7 @@
 #ifndef _STELOBJECT_HPP_
 #define _STELOBJECT_HPP_
 
+#include <QFlags>
 #include <QString>
 #include "VecMath.hpp"
 #include "StelObjectType.hpp"
@@ -38,7 +39,8 @@
 	//! filter results of getInfoString. The precise definition of these should
 	//! be documented in the getInfoString documentation for the derived classes
 	//! for all specifiers which are defined in that derivative.
-	enum InfoStringGroup
+	//! Use InfoStringGroup instead.
+	enum InfoStringGroupFlags
 	{
 		Name          = 0x00000001, //!< An object's name
 		CatalogNumber = 0x00000002, //!< Catalog numbers
@@ -55,11 +57,13 @@
 		HourAngle     = 0x00001000,  //!< The hour angle + DE (of date)
 		AbsoluteMagnitude = 0x00002000  //!< The absolute magnitude
 	};
+	typedef QFlags<InfoStringGroupFlags> InfoStringGroup;
+	Q_FLAGS(InfoStringGroup)
 
 	//! A pre-defined set of specifiers for the getInfoString flags argument to getInfoString
-	static const InfoStringGroup AllInfo = (InfoStringGroup)(Name|CatalogNumber|Magnitude|RaDecJ2000|RaDecOfDate|AltAzi|Distance|Size|Extra1|Extra2|Extra3|HourAngle|AbsoluteMagnitude);
+	static const InfoStringGroupFlags AllInfo = (InfoStringGroupFlags)(Name|CatalogNumber|Magnitude|RaDecJ2000|RaDecOfDate|AltAzi|Distance|Size|Extra1|Extra2|Extra3|HourAngle|AbsoluteMagnitude);
 	//! A pre-defined set of specifiers for the getInfoString flags argument to getInfoString
-	static const InfoStringGroup ShortInfo = (InfoStringGroup)(Name|CatalogNumber|Magnitude|RaDecJ2000);
+	static const InfoStringGroupFlags ShortInfo = (InfoStringGroupFlags)(Name|CatalogNumber|Magnitude|RaDecJ2000);
 
 	virtual ~StelObject() {}
 
@@ -148,4 +152,6 @@
 	void postProcessInfoString(QString& str, const InfoStringGroup& flags) const;
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(StelObject::InfoStringGroup)
+
 #endif // _STELOBJECT_HPP_

=== modified file 'src/core/StelObjectMgr.cpp'
--- src/core/StelObjectMgr.cpp	2012-04-13 16:50:19 +0000
+++ src/core/StelObjectMgr.cpp	2012-07-19 16:10:25 +0000
@@ -32,7 +32,6 @@
 #include <QString>
 #include <QDebug>
 #include <QStringList>
-#include <QSettings>
 
 StelObjectMgr::StelObjectMgr() : searchRadiusPixel(30.f), distanceWeight(1.f)
 {
@@ -245,156 +244,3 @@
 	result.sort();
 	return result;
 }
-
-int StelObjectMgr::getCustomInfoString(void)
-{
-	QSettings* conf = StelApp::getInstance().getSettings();
-
-	bool Name = conf->value("custom_selected_info/flag_show_name", false).toBool();
-	bool CatalogNumber = conf->value("custom_selected_info/flag_show_catalognumber", false).toBool();
-	bool Magnitude = conf->value("custom_selected_info/flag_show_magnitude", false).toBool();
-	bool RaDecJ2000 = conf->value("custom_selected_info/flag_show_radecj2000", false).toBool();
-	bool RaDecOfDate = conf->value("custom_selected_info/flag_show_radecofdate", false).toBool();
-	bool AltAz = conf->value("custom_selected_info/flag_show_altaz", false).toBool();
-	bool Distance = conf->value("custom_selected_info/flag_show_distance", false).toBool();
-	bool Size = conf->value("custom_selected_info/flag_show_size", false).toBool();
-	bool Extra1 = conf->value("custom_selected_info/flag_show_extra1", false).toBool();
-	bool Extra2 = conf->value("custom_selected_info/flag_show_extra2", false).toBool();
-	bool Extra3 = conf->value("custom_selected_info/flag_show_extra3", false).toBool();
-	bool HourAngle = conf->value("custom_selected_info/flag_show_hourangle", false).toBool();
-	bool AbsoluteMagnitude = conf->value("custom_selected_info/flag_show_absolutemagnitude", false).toBool();
-
-	int OctZero = 0x00000000;
-
-	int NameOct;
-	if (Name)
-	{
-		NameOct = StelObject::Name;
-	}
-	else
-	{
-		NameOct = OctZero;
-	}
-
-	int CatalogNumberOct;
-	if (CatalogNumber)
-	{
-		CatalogNumberOct = StelObject::CatalogNumber;
-	}
-	else
-	{
-		CatalogNumberOct = OctZero;
-	}
-
-	int MagnitudeOct;
-	if (Magnitude)
-	{
-		MagnitudeOct = StelObject::Magnitude;
-	}
-	else
-	{
-		MagnitudeOct = OctZero;
-	}
-
-	int RaDecJ2000Oct;
-	if (RaDecJ2000)
-	{
-		RaDecJ2000Oct = StelObject::RaDecJ2000;
-	}
-	else
-	{
-		RaDecJ2000Oct = OctZero;
-	}
-
-	int RaDecOfDateOct;
-	if (RaDecOfDate)
-	{
-		RaDecOfDateOct = StelObject::RaDecOfDate;
-	}
-	else
-	{
-		RaDecOfDateOct = OctZero;
-	}
-
-	int AltAzOct;
-	if (AltAz)
-	{
-		AltAzOct = StelObject::AltAzi;
-	}
-	else
-	{
-		AltAzOct = OctZero;
-	}
-
-	int DistanceOct;
-	if (Distance)
-	{
-		DistanceOct = StelObject::Distance;
-	}
-	else
-	{
-		DistanceOct = OctZero;
-	}
-
-	int SizeOct;
-	if (Size)
-	{
-		SizeOct = StelObject::Size;
-	}
-	else
-	{
-		SizeOct = OctZero;
-	}
-
-	int Extra1Oct;
-	if (Extra1)
-	{
-		Extra1Oct = StelObject::Extra1;
-	}
-	else
-	{
-		Extra1Oct = OctZero;
-	}
-
-	int Extra2Oct;
-	if (Extra2)
-	{
-		Extra2Oct = StelObject::Extra2;
-	}
-	else
-	{
-		Extra2Oct = OctZero;
-	}
-
-	int Extra3Oct;
-	if (Extra3)
-	{
-		Extra3Oct = StelObject::Extra3;
-	}
-	else
-	{
-		Extra3Oct = OctZero;
-	}
-
-	int HourAngleOct;
-	if (HourAngle)
-	{
-		HourAngleOct = StelObject::HourAngle;
-	}
-	else
-	{
-		HourAngleOct = OctZero;
-	}
-
-	int AbsoluteMagnitudeOct;
-	if (AbsoluteMagnitude)
-	{
-		AbsoluteMagnitudeOct = StelObject::AbsoluteMagnitude;
-	}
-	else
-	{
-		AbsoluteMagnitudeOct = OctZero;
-	}
-
-	return (NameOct|CatalogNumberOct|MagnitudeOct|RaDecJ2000Oct|RaDecOfDateOct|AltAzOct|DistanceOct|SizeOct|Extra1Oct|Extra2Oct|Extra3Oct|HourAngleOct|AbsoluteMagnitudeOct);
-}

=== modified file 'src/core/StelObjectMgr.hpp'
--- src/core/StelObjectMgr.hpp	2012-04-13 16:42:43 +0000
+++ src/core/StelObjectMgr.hpp	2012-07-19 16:10:25 +0000
@@ -126,8 +126,6 @@
 	//! Default to 1.
 	void setDistanceWeight(float newDistanceWeight) {distanceWeight=newDistanceWeight;}
 
-	int getCustomInfoString(void);
-
 signals:
 	//! Indicate that the selected StelObjects has changed.
 	//! @param action define if the user requested that the objects are added to the selection or just replace it

=== modified file 'src/gui/ConfigurationDialog.cpp'
--- src/gui/ConfigurationDialog.cpp	2012-06-29 14:07:11 +0000
+++ src/gui/ConfigurationDialog.cpp	2012-07-19 16:10:25 +0000
@@ -2,6 +2,7 @@
  * Stellarium
  * Copyright (C) 2008 Fabien Chereau
  * Copyright (C) 2012 Timothy Reaves
+ * Copyright (C) 2012 Bogdan Marinov
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -20,7 +21,6 @@
 
 #include "Dialog.hpp"
 #include "ConfigurationDialog.hpp"
-#include "CustomInfoDialog.hpp"
 #include "StelMainGraphicsView.hpp"
 #include "StelMainWindow.hpp"
 #include "ui_configurationDialog.h"
@@ -64,7 +64,6 @@
 ConfigurationDialog::ConfigurationDialog(StelGui* agui) : StelDialog(agui), starCatalogDownloadReply(NULL), currentDownloadFile(NULL), progressBar(NULL), gui(agui)
 {
 	ui = new Ui_configurationDialogForm;
-	customInfoDialog = NULL;
 	hasDownloadedStarCatalog = false;
 	isDownloadingStarCatalog = false;
 	savedProjectionType = StelApp::getInstance().getCore()->getCurrentProjectionType();	
@@ -73,9 +72,7 @@
 ConfigurationDialog::~ConfigurationDialog()
 {
 	delete ui;
-	ui=NULL;
-	delete customInfoDialog;
-	customInfoDialog = NULL;
+	ui = 0;
 }
 
 void ConfigurationDialog::retranslate()
@@ -150,34 +147,30 @@
 	resetStarCatalogControls();
 
 	// Selected object info
-	if (gui->getInfoTextFilters() == (StelObject::InfoStringGroup)0)
+	if (gui->getInfoTextFilters() == StelObject::InfoStringGroup(0))
 	{
 		ui->noSelectedInfoRadio->setChecked(true);
-		ui->pushButtonCustomInfoDialog->setEnabled(false);
 	}
-	else if (gui->getInfoTextFilters() == StelObject::InfoStringGroup(StelObject::ShortInfo))
+	else if (gui->getInfoTextFilters() == StelObject::ShortInfo)
 	{
 		ui->briefSelectedInfoRadio->setChecked(true);	
-		ui->pushButtonCustomInfoDialog->setEnabled(false);
 	}
-	else if (gui->getInfoTextFilters() == StelObject::InfoStringGroup(StelObject::AllInfo))
+	else if (gui->getInfoTextFilters() == StelObject::AllInfo)
 	{
 		ui->allSelectedInfoRadio->setChecked(true);
-		ui->pushButtonCustomInfoDialog->setEnabled(false);
 	}
 	else
 	{
 		ui->customSelectedInfoRadio->setChecked(true);
-		ui->pushButtonCustomInfoDialog->setEnabled(true);
 	}
-
+	updateSelectedInfoCheckBoxes();
+	
 	connect(ui->noSelectedInfoRadio, SIGNAL(released()), this, SLOT(setNoSelectedInfo()));
 	connect(ui->allSelectedInfoRadio, SIGNAL(released()), this, SLOT(setAllSelectedInfo()));
 	connect(ui->briefSelectedInfoRadio, SIGNAL(released()), this, SLOT(setBriefSelectedInfo()));
-	connect(ui->customSelectedInfoRadio, SIGNAL(released()), this, SLOT(setCustomSelectedInfo()));
-
-	connect(ui->pushButtonCustomInfoDialog, SIGNAL(clicked()), this, SLOT(showCustomInfoDialog()));
-
+	connect(ui->buttonGroupDisplayedFields, SIGNAL(buttonClicked(int)),
+	        this, SLOT(setSelectedInfoFromCheckBoxes()));
+	
 	// Navigation tab
 	// Startup time
 	if (core->getStartupTimeMode()=="actual")
@@ -262,8 +255,6 @@
 	connect(ui->pluginConfigureButton, SIGNAL(clicked()), this, SLOT(pluginConfigureCurrentSelection()));
 	populatePluginsList();
 
-
-	connect(ui->stackListWidget, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), this, SLOT(changePage(QListWidgetItem *, QListWidgetItem*)));
 	updateConfigLabels();
 }
 
@@ -315,25 +306,58 @@
 void ConfigurationDialog::setNoSelectedInfo(void)
 {
 	gui->setInfoTextFilters(StelObject::InfoStringGroup(0));
-	ui->pushButtonCustomInfoDialog->setEnabled(false);
+	updateSelectedInfoCheckBoxes();
 }
 
 void ConfigurationDialog::setAllSelectedInfo(void)
 {
 	gui->setInfoTextFilters(StelObject::InfoStringGroup(StelObject::AllInfo));
-	ui->pushButtonCustomInfoDialog->setEnabled(false);
+	updateSelectedInfoCheckBoxes();
 }
 
 void ConfigurationDialog::setBriefSelectedInfo(void)
 {
 	gui->setInfoTextFilters(StelObject::InfoStringGroup(StelObject::ShortInfo));
-	ui->pushButtonCustomInfoDialog->setEnabled(false);
+	updateSelectedInfoCheckBoxes();
 }
 
-void ConfigurationDialog::setCustomSelectedInfo(void)
+void ConfigurationDialog::setSelectedInfoFromCheckBoxes()
 {
-	gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString()));
-	ui->pushButtonCustomInfoDialog->setEnabled(true);
+	// As this signal will be called when a checbox is toggled,
+	// change the general mode to Custom.
+	if (!ui->customSelectedInfoRadio->isChecked())
+		ui->customSelectedInfoRadio->setChecked(true);
+	
+	StelObject::InfoStringGroup flags(0);
+	
+	if (ui->checkBoxName->isChecked())
+		flags |= StelObject::Name;
+	if (ui->checkBoxCatalogNumbers->isChecked())
+		flags |= StelObject::CatalogNumber;
+	if (ui->checkBoxVisualMag->isChecked())
+		flags |= StelObject::Magnitude;
+	if (ui->checkBoxAbsoluteMag->isChecked())
+		flags |= StelObject::AbsoluteMagnitude;
+	if (ui->checkBoxRaDecJ2000->isChecked())
+		flags |= StelObject::RaDecJ2000;
+	if (ui->checkBoxRaDecOfDate->isChecked())
+		flags |= StelObject::RaDecOfDate;
+	if (ui->checkBoxHourAngle->isChecked())
+		flags |= StelObject::HourAngle;
+	if (ui->checkBoxAltAz->isChecked())
+		flags |= StelObject::AltAzi;
+	if (ui->checkBoxDistance->isChecked())
+		flags |= StelObject::Distance;
+	if (ui->checkBoxSize->isChecked())
+		flags |= StelObject::Size;
+	if (ui->checkBoxExtra1->isChecked())
+		flags |= StelObject::Extra1;
+	if (ui->checkBoxExtra2->isChecked())
+		flags |= StelObject::Extra2;
+	if (ui->checkBoxExtra3->isChecked())
+		flags |= StelObject::Extra3;
+	
+	gui->setInfoTextFilters(flags);
 }
 
 
@@ -463,14 +487,46 @@
 	langName = StelApp::getInstance().getLocaleMgr().getSkyLanguage();
 	conf->setValue("localization/sky_locale", StelTranslator::nativeNameToIso639_1Code(langName));
 
-	if (gui->getInfoTextFilters() == (StelObject::InfoStringGroup)0)
+	// configuration dialog / selected object info tab
+	const StelObject::InfoStringGroup& flags = gui->getInfoTextFilters();
+	if (flags == StelObject::InfoStringGroup(0))
 		conf->setValue("gui/selected_object_info", "none");
-	else if (gui->getInfoTextFilters() == StelObject::InfoStringGroup(StelObject::ShortInfo))
+	else if (flags == StelObject::InfoStringGroup(StelObject::ShortInfo))
 		conf->setValue("gui/selected_object_info", "short");
-	else if (gui->getInfoTextFilters() == StelObject::InfoStringGroup(StelObject::AllInfo))
+	else if (flags == StelObject::InfoStringGroup(StelObject::AllInfo))
 		conf->setValue("gui/selected_object_info", "all");
 	else
+	{
 		conf->setValue("gui/selected_object_info", "custom");
+		
+		conf->beginGroup("custom_selected_info");
+		conf->setValue("flag_show_name", (bool) (flags & StelObject::Name));
+		conf->setValue("flag_show_catalognumber",
+		               (bool) (flags & StelObject::CatalogNumber));
+		conf->setValue("flag_show_magnitude",
+		               (bool) (flags & StelObject::Magnitude));
+		conf->setValue("flag_show_absolutemagnitude",
+		               (bool) (flags & StelObject::AbsoluteMagnitude));
+		conf->setValue("flag_show_radecj2000",
+		               (bool) (flags & StelObject::RaDecJ2000));
+		conf->setValue("flag_show_radecofdate",
+		               (bool) (flags & StelObject::RaDecOfDate));
+		conf->setValue("flag_show_hourangle",
+		               (bool) (flags & StelObject::HourAngle));
+		conf->setValue("flag_show_altaz",
+		               (bool) (flags &  StelObject::AltAzi));
+		conf->setValue("flag_show_distance",
+		               (bool) (flags & StelObject::Distance));
+		conf->setValue("flag_show_size",
+		               (bool) (flags & StelObject::Size));
+		conf->setValue("flag_show_extra1",
+		               (bool) (flags & StelObject::Extra1));
+		conf->setValue("flag_show_extra2",
+		               (bool) (flags & StelObject::Extra2));
+		conf->setValue("flag_show_extra3",
+		               (bool) (flags & StelObject::Extra3));
+		conf->endGroup();
+	}
 
 	// toolbar auto-hide status
 	conf->setValue("gui/auto_hide_horizontal_toolbar", gui->getAutoHideHorizontalButtonBar());
@@ -710,13 +766,6 @@
 	setStartupTimeMode();
 }
 
-void ConfigurationDialog::changePage(QListWidgetItem *current, QListWidgetItem *previous)
-{
-	if (!current)
-		current = previous;
-	ui->configurationStackedWidget->setCurrentIndex(ui->stackListWidget->row(current));
-}
-
 
 void ConfigurationDialog::resetStarCatalogControls()
 {
@@ -936,10 +985,21 @@
 	resetStarCatalogControls();
 }
 
-void ConfigurationDialog::showCustomInfoDialog()
+void ConfigurationDialog::updateSelectedInfoCheckBoxes()
 {
-	if(customInfoDialog == NULL)
-		customInfoDialog = new CustomInfoDialog();
-
-	customInfoDialog->setVisible(true);
+	const StelObject::InfoStringGroup& flags = gui->getInfoTextFilters();
+	
+	ui->checkBoxName->setChecked(flags & StelObject::Name);
+	ui->checkBoxCatalogNumbers->setChecked(flags & StelObject::CatalogNumber);
+	ui->checkBoxVisualMag->setChecked(flags & StelObject::Magnitude);
+	ui->checkBoxAbsoluteMag->setChecked(flags & StelObject::AbsoluteMagnitude);
+	ui->checkBoxRaDecJ2000->setChecked(flags & StelObject::RaDecJ2000);
+	ui->checkBoxRaDecOfDate->setChecked(flags & StelObject::RaDecOfDate);
+	ui->checkBoxHourAngle->setChecked(flags & StelObject::HourAngle);
+	ui->checkBoxAltAz->setChecked(flags & StelObject::AltAzi);
+	ui->checkBoxDistance->setChecked(flags & StelObject::Distance);
+	ui->checkBoxSize->setChecked(flags & StelObject::Size);
+	ui->checkBoxExtra1->setChecked(flags & StelObject::Extra1);
+	ui->checkBoxExtra2->setChecked(flags & StelObject::Extra2);
+	ui->checkBoxExtra3->setChecked(flags & StelObject::Extra3);
 }

=== modified file 'src/gui/ConfigurationDialog.hpp'
--- src/gui/ConfigurationDialog.hpp	2012-04-13 18:02:25 +0000
+++ src/gui/ConfigurationDialog.hpp	2012-07-19 16:10:25 +0000
@@ -32,7 +32,6 @@
 class QNetworkAccessManager;
 class QListWidgetItem;
 class StelGui;
-class CustomInfoDialog;
 
 class ConfigurationDialog : public StelDialog
 {
@@ -77,7 +76,11 @@
 	void setNoSelectedInfo(void);
 	void setAllSelectedInfo(void);
 	void setBriefSelectedInfo(void);
-	void setCustomSelectedInfo(void);
+	//! Set the selected object info fields from the "Displayed Fields" boxes.
+	//! Called when any of the boxes has been clicked. Sets the
+	//! "selected info" mode to "Custom".
+	void setSelectedInfoFromCheckBoxes();
+	
 	void selectLanguage(const QString& languageCode);
 	void setStartupTimeMode();
 	void setDiskViewport(bool);
@@ -131,16 +134,13 @@
 	#endif
 	void setFixedDateTimeToCurrent();
 
-	void changePage(QListWidgetItem *current, QListWidgetItem *previous);
-
-	void showCustomInfoDialog();
-
 private:
 	StelGui* gui;
 
 	int savedProjectionType;
-
-	CustomInfoDialog* customInfoDialog;
+	
+	//! Set the displayed fields checkboxes from the current displayed fields.
+	void updateSelectedInfoCheckBoxes();
 };
 
 #endif // _CONFIGURATIONDIALOG_HPP_

=== removed file 'src/gui/CustomInfoDialog.cpp'
--- src/gui/CustomInfoDialog.cpp	2012-04-13 18:02:25 +0000
+++ src/gui/CustomInfoDialog.cpp	1970-01-01 00:00:00 +0000
@@ -1,249 +0,0 @@
-/*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
-*/
-
-#include "CustomInfoDialog.hpp"
-#include "ui_CustomInfoDialog.h"
-
-#include "Dialog.hpp"
-#include "StelApp.hpp"
-#include "StelObjectMgr.hpp"
-
-#include <QDebug>
-
-CustomInfoDialog::CustomInfoDialog()
-{
-	ui = new Ui_CustomInfoDialogForm;
-	conf = StelApp::getInstance().getSettings();
-	gui = StelApp::getInstance().getGui();
-}
-
-CustomInfoDialog::~CustomInfoDialog()
-{	
-	delete ui;
-	ui=NULL;
-}
-
-void CustomInfoDialog::retranslate()
-{
-	if (dialog)
-		ui->retranslateUi(dialog);
-}
-
-
-void CustomInfoDialog::createDialogContent()
-{
-	ui->setupUi(dialog);
-
-	//Signals and slots
-	connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate()));
-	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
-
-	//An object's name
-	ui->nameCheckBox->setChecked(getNameCustomInfoFlag());
-	connect(ui->nameCheckBox, SIGNAL(toggled(bool)), this, SLOT(setNameCustomInfoFlag(bool)));
-
-	//Catalog numbers
-	ui->catalogNumberCheckBox->setChecked(getCatalogNumberCustomInfoFlag());
-	connect(ui->catalogNumberCheckBox, SIGNAL(toggled(bool)), this, SLOT(setCatalogNumberCustomInfoFlag(bool)));
-
-	//Magnitude related data
-	ui->magnitudeCheckBox->setChecked(getMagnitudeCustomInfoFlag());
-	connect(ui->magnitudeCheckBox, SIGNAL(toggled(bool)), this, SLOT(setMagnitudeCustomInfoFlag(bool)));
-
-	//The equatorial position (J2000 ref)
-	ui->raDecJ2000CheckBox->setChecked(getRaDecJ2000CustomInfoFlag());
-	connect(ui->raDecJ2000CheckBox, SIGNAL(toggled(bool)), this, SLOT(setRaDecJ2000CustomInfoFlag(bool)));
-
-	//The equatorial position (of date)
-	ui->raDecOfDateCheckBox->setChecked(getRaDecOfDateCustomInfoFlag());
-	connect(ui->raDecOfDateCheckBox, SIGNAL(toggled(bool)), this, SLOT(setRaDecOfDateCustomInfoFlag(bool)));
-
-	//The position (Altitude/Azimuth)
-	ui->altAzCheckBox->setChecked(getAltAzCustomInfoFlag());
-	connect(ui->altAzCheckBox, SIGNAL(toggled(bool)), this, SLOT(setAltAzCustomInfoFlag(bool)));
-
-	//Info about an object's distance
-	ui->distanceCheckBox->setChecked(getDistanceCustomInfoFlag());
-	connect(ui->distanceCheckBox, SIGNAL(toggled(bool)), this, SLOT(setDistanceCustomInfoFlag(bool)));
-
-	//Info about an object's size
-	ui->sizeCheckBox->setChecked(getSizeCustomInfoFlag());
-	connect(ui->sizeCheckBox, SIGNAL(toggled(bool)), this, SLOT(setSizeCustomInfoFlag(bool)));
-
-	//Derived class-specific extra fields
-	ui->extra1CheckBox->setChecked(getExtra1CustomInfoFlag());
-	connect(ui->extra1CheckBox, SIGNAL(toggled(bool)), this, SLOT(setExtra1CustomInfoFlag(bool)));
-
-	//Derived class-specific extra fields
-	ui->extra2CheckBox->setChecked(getExtra2CustomInfoFlag());
-	connect(ui->extra2CheckBox, SIGNAL(toggled(bool)), this, SLOT(setExtra2CustomInfoFlag(bool)));
-
-	//Derived class-specific extra fields
-	ui->extra3CheckBox->setChecked(getExtra3CustomInfoFlag());
-	connect(ui->extra3CheckBox, SIGNAL(toggled(bool)), this, SLOT(setExtra3CustomInfoFlag(bool)));
-
-	//The hour angle + DE (of date)
-	ui->hourAngleCheckBox->setChecked(getHourAngleCustomInfoFlag());
-	connect(ui->hourAngleCheckBox, SIGNAL(toggled(bool)), this, SLOT(setHourAngleCustomInfoFlag(bool)));
-
-	//The absolute magnitude
-	ui->absoluteMagnitudeCheckBox->setChecked(getAbsoluteMagnitudeCustomInfoFlag());
-	connect(ui->absoluteMagnitudeCheckBox, SIGNAL(toggled(bool)), this, SLOT(setAbsoluteMagnitudeCustomInfoFlag(bool)));
-
-}
-
-void CustomInfoDialog::setVisible(bool v)
-{
-	StelDialog::setVisible(v);	
-}
-
-bool CustomInfoDialog::getNameCustomInfoFlag()
-{
-	return conf->value("custom_selected_info/flag_show_name", false).toBool();
-}
-
-void CustomInfoDialog::setNameCustomInfoFlag(bool flag)
-{
-	conf->setValue("custom_selected_info/flag_show_name", flag);
-	gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString()));
-}
-
-bool CustomInfoDialog::getCatalogNumberCustomInfoFlag()
-{
-	return conf->value("custom_selected_info/flag_show_catalognumber", false).toBool();
-}
-
-void CustomInfoDialog::setCatalogNumberCustomInfoFlag(bool flag)
-{
-	conf->setValue("custom_selected_info/flag_show_catalognumber", flag);
-	gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString()));
-}
-
-bool CustomInfoDialog::getMagnitudeCustomInfoFlag()
-{
-	return conf->value("custom_selected_info/flag_show_magnitude", false).toBool();
-}
-
-void CustomInfoDialog::setMagnitudeCustomInfoFlag(bool flag)
-{
-	conf->setValue("custom_selected_info/flag_show_magnitude", flag);
-	gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString()));
-}
-
-bool CustomInfoDialog::getRaDecJ2000CustomInfoFlag()
-{
-	return conf->value("custom_selected_info/flag_show_radecj2000", false).toBool();
-}
-
-void CustomInfoDialog::setRaDecJ2000CustomInfoFlag(bool flag)
-{
-	conf->setValue("custom_selected_info/flag_show_radecj2000", flag);
-	gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString()));
-}
-
-bool CustomInfoDialog::getRaDecOfDateCustomInfoFlag()
-{
-	return conf->value("custom_selected_info/flag_show_radecofdate", false).toBool();
-}
-
-void CustomInfoDialog::setRaDecOfDateCustomInfoFlag(bool flag)
-{
-	conf->setValue("custom_selected_info/flag_show_radecofdate", flag);
-	gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString()));
-}
-
-bool CustomInfoDialog::getAltAzCustomInfoFlag()
-{
-	return conf->value("custom_selected_info/flag_show_altaz", false).toBool();
-}
-
-void CustomInfoDialog::setAltAzCustomInfoFlag(bool flag)
-{
-	conf->setValue("custom_selected_info/flag_show_altaz", flag);
-	gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString()));
-}
-
-bool CustomInfoDialog::getDistanceCustomInfoFlag()
-{
-	return conf->value("custom_selected_info/flag_show_distance", false).toBool();
-}
-
-void CustomInfoDialog::setDistanceCustomInfoFlag(bool flag)
-{
-	conf->setValue("custom_selected_info/flag_show_distance", flag);
-	gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString()));
-}
-
-bool CustomInfoDialog::getSizeCustomInfoFlag()
-{
-	return conf->value("custom_selected_info/flag_show_size", false).toBool();
-}
-
-void CustomInfoDialog::setSizeCustomInfoFlag(bool flag)
-{
-	conf->setValue("custom_selected_info/flag_show_size", flag);
-	gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString()));
-}
-
-bool CustomInfoDialog::getExtra1CustomInfoFlag()
-{
-	return conf->value("custom_selected_info/flag_show_extra1", false).toBool();
-}
-
-void CustomInfoDialog::setExtra1CustomInfoFlag(bool flag)
-{
-	conf->setValue("custom_selected_info/flag_show_extra1", flag);
-	gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString()));
-}
-
-bool CustomInfoDialog::getExtra2CustomInfoFlag()
-{
-	return conf->value("custom_selected_info/flag_show_extra2", false).toBool();
-}
-
-void CustomInfoDialog::setExtra2CustomInfoFlag(bool flag)
-{
-	conf->setValue("custom_selected_info/flag_show_extra2", flag);
-	gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString()));
-}
-
-bool CustomInfoDialog::getExtra3CustomInfoFlag()
-{
-	return conf->value("custom_selected_info/flag_show_extra3", false).toBool();
-}
-
-void CustomInfoDialog::setExtra3CustomInfoFlag(bool flag)
-{
-	conf->setValue("custom_selected_info/flag_show_extra3", flag);
-	gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString()));
-}
-
-bool CustomInfoDialog::getHourAngleCustomInfoFlag()
-{
-	return conf->value("custom_selected_info/flag_show_hourangle", false).toBool();
-}
-
-void CustomInfoDialog::setHourAngleCustomInfoFlag(bool flag)
-{
-	conf->setValue("custom_selected_info/flag_show_hourangle", flag);
-	gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString()));
-}
-
-bool CustomInfoDialog::getAbsoluteMagnitudeCustomInfoFlag()
-{
-	return conf->value("custom_selected_info/flag_show_absolutemagnitude", false).toBool();
-}
-
-void CustomInfoDialog::setAbsoluteMagnitudeCustomInfoFlag(bool flag)
-{
-	conf->setValue("custom_selected_info/flag_show_absolutemagnitude", flag);
-	gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString()));
-}
-

=== removed file 'src/gui/CustomInfoDialog.hpp'
--- src/gui/CustomInfoDialog.hpp	2012-04-13 18:02:25 +0000
+++ src/gui/CustomInfoDialog.hpp	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-/*
- * Stellarium
- * 
- * Copyright (C) 2012 Alexander Wolf
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
-*/
-
-// AW: Methods copied largely from AddRemoveLandscapesDialog
-
-#ifndef _CUSTOMINFODIALOG_HPP_
-#define _CUSTOMINFODIALOG_HPP_
-
-#include <QObject>
-#include <QSettings>
-#include "StelDialog.hpp"
-#include "StelGui.hpp"
-
-class Ui_CustomInfoDialogForm;
-
-//! @class CustomInfoDialog
-class CustomInfoDialog : public StelDialog
-{
-    Q_OBJECT
-
-public:
-    CustomInfoDialog();
-    virtual ~CustomInfoDialog();
-
-public slots:
-        void retranslate();
-	void setVisible(bool);
-
-protected:
-	//! Initialize the dialog widgets and connect the signals/slots.
-	virtual void createDialogContent();
-	Ui_CustomInfoDialogForm *ui;
-
-private slots:
-	bool getNameCustomInfoFlag();
-	void setNameCustomInfoFlag(bool flag);
-
-	bool getCatalogNumberCustomInfoFlag();
-	void setCatalogNumberCustomInfoFlag(bool flag);
-
-	bool getMagnitudeCustomInfoFlag();
-	void setMagnitudeCustomInfoFlag(bool flag);
-
-	bool getRaDecJ2000CustomInfoFlag();
-	void setRaDecJ2000CustomInfoFlag(bool flag);
-
-	bool getRaDecOfDateCustomInfoFlag();
-	void setRaDecOfDateCustomInfoFlag(bool flag);
-
-	bool getAltAzCustomInfoFlag();
-	void setAltAzCustomInfoFlag(bool flag);
-
-	bool getDistanceCustomInfoFlag();
-	void setDistanceCustomInfoFlag(bool flag);
-
-	bool getSizeCustomInfoFlag();
-	void setSizeCustomInfoFlag(bool flag);
-
-	bool getExtra1CustomInfoFlag();
-	void setExtra1CustomInfoFlag(bool flag);
-
-	bool getExtra2CustomInfoFlag();
-	void setExtra2CustomInfoFlag(bool flag);
-
-	bool getExtra3CustomInfoFlag();
-	void setExtra3CustomInfoFlag(bool flag);
-
-	bool getHourAngleCustomInfoFlag();
-	void setHourAngleCustomInfoFlag(bool flag);
-
-	bool getAbsoluteMagnitudeCustomInfoFlag();
-	void setAbsoluteMagnitudeCustomInfoFlag(bool flag);
-
-private:
-	StelGuiBase* gui;
-	QSettings* conf;
-
-};
-
-#endif // _CUSTOMINFODIALOG_HPP_

=== removed file 'src/gui/CustomInfoDialog.ui'
--- src/gui/CustomInfoDialog.ui	2012-04-02 16:56:13 +0000
+++ src/gui/CustomInfoDialog.ui	1970-01-01 00:00:00 +0000
@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CustomInfoDialogForm</class>
- <widget class="QWidget" name="CustomInfoDialogForm">  
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="BarFrame" name="TitleBar">
-     <property name="minimumSize">
-      <size>
-       <width>16</width>
-       <height>25</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>25</height>
-      </size>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <layout class="QHBoxLayout">
-      <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>
-        <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="palette">
-         <palette>
-          <active/>
-          <inactive/>
-          <disabled/>
-         </palette>
-        </property>
-        <property name="font">
-         <font/>
-        </property>
-        <property name="text">
-         <string>Selected object information</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QPushButton" name="closeStelWindow">
-        <property name="minimumSize">
-         <size>
-          <width>16</width>
-          <height>16</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>16</width>
-          <height>16</height>
-         </size>
-        </property>
-        <property name="focusPolicy">
-         <enum>Qt::NoFocus</enum>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="customInfoGroupBox">
-     <property name="title">
-      <string>Custom Info Settings</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3">
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QCheckBox" name="nameCheckBox">
-        <property name="toolTip">
-         <string>Display info about an object's name</string>
-        </property>
-        <property name="text">
-         <string>An object's name</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="catalogNumberCheckBox">
-        <property name="toolTip">
-         <string>Display  info about a catalog numbers</string>
-        </property>
-        <property name="text">
-         <string>Catalog numbers</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="magnitudeCheckBox">
-        <property name="toolTip">
-         <string>Display  info about a visual magnitude</string>
-        </property>
-        <property name="text">
-         <string>Visual magnitude</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="absoluteMagnitudeCheckBox">
-        <property name="toolTip">
-         <string>Display  info about an absolute magnitude</string>
-        </property>
-        <property name="text">
-         <string>Absolute magnitude</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="raDecJ2000CheckBox">
-        <property name="toolTip">
-         <string>Display the equatorial position (J2000 ref)</string>
-        </property>
-        <property name="text">
-         <string>The equatorial coordinates (J2000 ref)</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="raDecOfDateCheckBox">
-        <property name="toolTip">
-         <string>Display the equatorial position (of date)</string>
-        </property>
-        <property name="text">
-         <string>The equatorial coordinates (of date)</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="altAzCheckBox">
-        <property name="toolTip">
-         <string>Display the altitude and azimuth position</string>
-        </property>
-        <property name="text">
-         <string>The alt-azimuthal coordinates</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="hourAngleCheckBox">
-        <property name="toolTip">
-         <string>Display the hour angle + DE (of date)</string>
-        </property>
-        <property name="text">
-         <string>The hour angle</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="distanceCheckBox">
-        <property name="toolTip">
-         <string>Display info about an object's distance</string>
-        </property>
-        <property name="text">
-         <string>Object's distance</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="sizeCheckBox">
-        <property name="toolTip">
-         <string>Display info about an object's size</string>
-        </property>
-        <property name="text">
-         <string>Object's size</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="extra1CheckBox">
-        <property name="toolTip">
-         <string>Display a derived class-specific extra fields</string>
-        </property>
-        <property name="text">
-         <string>Additional info (Extra 1)</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="extra2CheckBox">
-        <property name="toolTip">
-         <string>Display a derived class-specific extra fields</string>
-        </property>
-        <property name="text">
-         <string>Additional info (Extra 2)</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="extra3CheckBox">
-        <property name="toolTip">
-         <string>Display a derived class-specific extra fields</string>
-        </property>
-        <property name="text">
-         <string>Additional info (Extra 3)</string>
-        </property>
-       </widget>
-      </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>
- <customwidgets>
-  <customwidget>
-   <class>BarFrame</class>
-   <extends>QFrame</extends>
-   <header>Dialog.hpp</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

=== modified file 'src/gui/SkyGui.cpp'
--- src/gui/SkyGui.cpp	2012-04-13 16:50:19 +0000
+++ src/gui/SkyGui.cpp	2012-07-19 16:10:25 +0000
@@ -49,7 +49,36 @@
 	}
 	else if (objectInfo == "custom")
 	{
-		infoTextFilters = StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString());
+		infoTextFilters = StelObject::InfoStringGroup(0);
+		
+		conf->beginGroup("custom_selected_info");
+		if (conf->value("flag_show_name", false).toBool())
+			infoTextFilters |= StelObject::Name;
+		if (conf->value("flag_show_catalognumber", false).toBool())
+			infoTextFilters |= StelObject::CatalogNumber;
+		if (conf->value("flag_show_magnitude", false).toBool())
+			infoTextFilters |= StelObject::Magnitude;
+		if (conf->value("flag_show_absolutemagnitude", false).toBool())
+			infoTextFilters |= StelObject::AbsoluteMagnitude;
+		if (conf->value("flag_show_radecj2000", false).toBool())
+			infoTextFilters |= StelObject::RaDecJ2000;
+		if (conf->value("flag_show_radecofdate", false).toBool())
+			infoTextFilters |= StelObject::RaDecOfDate;
+		if (conf->value("flag_show_hourangle", false).toBool())
+			infoTextFilters |= StelObject::HourAngle;
+		if (conf->value("flag_show_altaz", false).toBool())
+			infoTextFilters |= StelObject::AltAzi;
+		if (conf->value("flag_show_distance", false).toBool())
+			infoTextFilters |= StelObject::Distance;
+		if (conf->value("flag_show_size", false).toBool())
+			infoTextFilters |= StelObject::Size;
+		if (conf->value("flag_show_extra1", false).toBool())
+			infoTextFilters |= StelObject::Extra1;
+		if (conf->value("flag_show_extra2", false).toBool())
+			infoTextFilters |= StelObject::Extra2;
+		if (conf->value("flag_show_extra3", false).toBool())
+			infoTextFilters |= StelObject::Extra3;
+		conf->endGroup();
 	}
 	else
 	{

=== modified file 'src/gui/SkyGui.hpp'
--- src/gui/SkyGui.hpp	2012-02-19 00:21:59 +0000
+++ src/gui/SkyGui.hpp	2012-07-19 16:10:25 +0000
@@ -38,6 +38,8 @@
 class InfoPanel : public QGraphicsTextItem
 {
 	public:
+		//! Reads "gui/selected_object_info", etc from the configuration file.
+		//! @todo Bad idea to read from the configuration file in a constructor? --BM
 		InfoPanel(QGraphicsItem* parent);
 		void setInfoTextFilters(const StelObject::InfoStringGroup& aflags) {infoTextFilters=aflags;}
 		const StelObject::InfoStringGroup& getInfoTextFilters(void) const {return infoTextFilters;}

=== modified file 'src/gui/configurationDialog.ui'
--- src/gui/configurationDialog.ui	2012-06-29 14:07:11 +0000
+++ src/gui/configurationDialog.ui	2012-07-19 16:10:25 +0000
@@ -6,13 +6,10 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>428</width>
-    <height>463</height>
+    <width>525</width>
+    <height>465</height>
    </rect>
   </property>
-  <property name="styleSheet">
-   <string notr="true"/>
-  </property>
   <layout class="QVBoxLayout">
    <property name="spacing">
     <number>0</number>
@@ -132,9 +129,6 @@
       </property>
       <item row="1" column="0">
        <widget class="QStackedWidget" name="configurationStackedWidget">
-        <property name="currentIndex">
-         <number>1</number>
-        </property>
         <widget class="QWidget" name="page">
          <layout class="QVBoxLayout" name="verticalLayout_10">
           <property name="spacing">
@@ -145,18 +139,6 @@
           </property>
           <item>
            <widget class="QGroupBox" name="groupBox_2">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>0</height>
-             </size>
-            </property>
             <property name="title">
              <string>Program language</string>
             </property>
@@ -190,106 +172,7 @@
            </widget>
           </item>
           <item>
-           <widget class="QGroupBox" name="groupBox_4">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <weight>50</weight>
-              <bold>false</bold>
-              <kerning>true</kerning>
-             </font>
-            </property>
-            <property name="title">
-             <string>Selected object information</string>
-            </property>
-            <layout class="QVBoxLayout" name="verticalLayout_5">
-             <property name="margin">
-              <number>0</number>
-             </property>
-             <item>
-              <layout class="QHBoxLayout" name="horizontalLayout_13">
-               <item>
-                <widget class="QRadioButton" name="allSelectedInfoRadio">
-                 <property name="toolTip">
-                  <string>Display all information available</string>
-                 </property>
-                 <property name="text">
-                  <string>All available</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QRadioButton" name="briefSelectedInfoRadio">
-                 <property name="toolTip">
-                  <string>Display less information</string>
-                 </property>
-                 <property name="text">
-                  <string>Short</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <layout class="QHBoxLayout" name="horizontalLayout_14">
-               <item>
-                <layout class="QHBoxLayout" name="horizontalLayout_16">
-                 <item>
-                  <widget class="QRadioButton" name="customSelectedInfoRadio">
-                   <property name="toolTip">
-                    <string>Display user settings information</string>
-                   </property>
-                   <property name="text">
-                    <string>Customized</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QPushButton" name="pushButtonCustomInfoDialog">
-                   <property name="enabled">
-                    <bool>true</bool>
-                   </property>
-                   <property name="text">
-                    <string notr="true">...</string>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-               <item>
-                <widget class="QRadioButton" name="noSelectedInfoRadio">
-                 <property name="toolTip">
-                  <string>Display no information</string>
-                 </property>
-                 <property name="text">
-                  <string>None</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item>
            <widget class="QGroupBox" name="groupBox_6">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <weight>50</weight>
-              <bold>false</bold>
-             </font>
-            </property>
             <property name="title">
              <string>Default options</string>
             </property>
@@ -405,6 +288,243 @@
           </item>
          </layout>
         </widget>
+        <widget class="QWidget" name="pageSelectedObjectInfo">
+         <layout class="QVBoxLayout" name="verticalLayout_2">
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QGroupBox" name="groupBox_4">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="title">
+             <string>Selected object information</string>
+            </property>
+            <layout class="QVBoxLayout" name="verticalLayout_5">
+             <property name="margin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="QRadioButton" name="allSelectedInfoRadio">
+               <property name="toolTip">
+                <string>Display all information available</string>
+               </property>
+               <property name="text">
+                <string>All available</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QRadioButton" name="briefSelectedInfoRadio">
+               <property name="toolTip">
+                <string>Display less information</string>
+               </property>
+               <property name="text">
+                <string>Short</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QRadioButton" name="noSelectedInfoRadio">
+               <property name="toolTip">
+                <string>Display no information</string>
+               </property>
+               <property name="text">
+                <string>None</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QRadioButton" name="customSelectedInfoRadio">
+               <property name="toolTip">
+                <string>Display user settings information</string>
+               </property>
+               <property name="text">
+                <string>Customized</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <widget class="QGroupBox" name="groupBoxDisplayedFields">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="title">
+             <string>Displayed fields</string>
+            </property>
+            <layout class="QGridLayout" name="gridLayoutDisplayedFields">
+             <property name="margin">
+              <number>0</number>
+             </property>
+             <item row="0" column="1">
+              <widget class="QCheckBox" name="checkBoxVisualMag">
+               <property name="text">
+                <string>Visual magnitude</string>
+               </property>
+               <attribute name="buttonGroup">
+                <string notr="true">buttonGroupDisplayedFields</string>
+               </attribute>
+              </widget>
+             </item>
+             <item row="6" column="0">
+              <widget class="QCheckBox" name="checkBoxExtra1">
+               <property name="toolTip">
+                <string>Spectral class, nebula type, etc.</string>
+               </property>
+               <property name="text">
+                <string>Additional information 1</string>
+               </property>
+               <attribute name="buttonGroup">
+                <string notr="true">buttonGroupDisplayedFields</string>
+               </attribute>
+              </widget>
+             </item>
+             <item row="7" column="0" colspan="2">
+              <widget class="QCheckBox" name="checkBoxExtra3">
+               <property name="text">
+                <string>Additional information 3</string>
+               </property>
+               <attribute name="buttonGroup">
+                <string notr="true">buttonGroupDisplayedFields</string>
+               </attribute>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QCheckBox" name="checkBoxCatalogNumbers">
+               <property name="text">
+                <string>Catalog number(s)</string>
+               </property>
+               <attribute name="buttonGroup">
+                <string notr="true">buttonGroupDisplayedFields</string>
+               </attribute>
+              </widget>
+             </item>
+             <item row="0" column="0">
+              <widget class="QCheckBox" name="checkBoxName">
+               <property name="text">
+                <string>Name</string>
+               </property>
+               <attribute name="buttonGroup">
+                <string notr="true">buttonGroupDisplayedFields</string>
+               </attribute>
+              </widget>
+             </item>
+             <item row="6" column="1">
+              <widget class="QCheckBox" name="checkBoxExtra2">
+               <property name="toolTip">
+                <string/>
+               </property>
+               <property name="text">
+                <string>Additional information 2</string>
+               </property>
+               <attribute name="buttonGroup">
+                <string notr="true">buttonGroupDisplayedFields</string>
+               </attribute>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QCheckBox" name="checkBoxAbsoluteMag">
+               <property name="text">
+                <string>Absolute magnitude</string>
+               </property>
+               <attribute name="buttonGroup">
+                <string notr="true">buttonGroupDisplayedFields</string>
+               </attribute>
+              </widget>
+             </item>
+             <item row="4" column="1">
+              <widget class="QCheckBox" name="checkBoxAltAz">
+               <property name="toolTip">
+                <string>Horizontal coordinates</string>
+               </property>
+               <property name="text">
+                <string>Altitude/Azimuth</string>
+               </property>
+               <attribute name="buttonGroup">
+                <string notr="true">buttonGroupDisplayedFields</string>
+               </attribute>
+              </widget>
+             </item>
+             <item row="5" column="1">
+              <widget class="QCheckBox" name="checkBoxSize">
+               <property name="toolTip">
+                <string>Angular or physical size</string>
+               </property>
+               <property name="text">
+                <string>Size</string>
+               </property>
+               <attribute name="buttonGroup">
+                <string notr="true">buttonGroupDisplayedFields</string>
+               </attribute>
+              </widget>
+             </item>
+             <item row="3" column="0" colspan="2">
+              <widget class="QCheckBox" name="checkBoxRaDecOfDate">
+               <property name="toolTip">
+                <string>Geocentric equatorial coordinates, equinox of date</string>
+               </property>
+               <property name="text">
+                <string>Right ascension/Declination (of date)</string>
+               </property>
+               <attribute name="buttonGroup">
+                <string notr="true">buttonGroupDisplayedFields</string>
+               </attribute>
+              </widget>
+             </item>
+             <item row="5" column="0">
+              <widget class="QCheckBox" name="checkBoxDistance">
+               <property name="text">
+                <string>Distance</string>
+               </property>
+               <attribute name="buttonGroup">
+                <string notr="true">buttonGroupDisplayedFields</string>
+               </attribute>
+              </widget>
+             </item>
+             <item row="2" column="0" colspan="2">
+              <widget class="QCheckBox" name="checkBoxRaDecJ2000">
+               <property name="toolTip">
+                <string>Geocentric equatorial coordinates, equinox of J2000.0</string>
+               </property>
+               <property name="text">
+                <string>Right ascension/Declination (J2000)</string>
+               </property>
+               <attribute name="buttonGroup">
+                <string notr="true">buttonGroupDisplayedFields</string>
+               </attribute>
+              </widget>
+             </item>
+             <item row="4" column="0">
+              <widget class="QCheckBox" name="checkBoxHourAngle">
+               <property name="toolTip">
+                <string>Topocentric equatorial coordinates</string>
+               </property>
+               <property name="text">
+                <string>Hour angle/Declination</string>
+               </property>
+               <attribute name="buttonGroup">
+                <string notr="true">buttonGroupDisplayedFields</string>
+               </attribute>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+         </layout>
+        </widget>
         <widget class="QWidget" name="page_2">
          <layout class="QVBoxLayout" name="verticalLayout_11">
           <property name="spacing">
@@ -1131,6 +1251,18 @@
         </item>
         <item>
          <property name="text">
+          <string>Information</string>
+         </property>
+         <property name="toolTip">
+          <string>Selected object information</string>
+         </property>
+         <property name="icon">
+          <iconset resource="../../data/gui/guiRes.qrc">
+           <normaloff>:/graphicGui/tabicon-info.png</normaloff>:/graphicGui/tabicon-info.png</iconset>
+         </property>
+        </item>
+        <item>
+         <property name="text">
           <string>Navigation</string>
          </property>
          <property name="icon">
@@ -1183,8 +1315,84 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>programLanguageComboBox</tabstop>
+  <tabstop>setViewingOptionAsDefaultPushButton</tabstop>
+  <tabstop>restoreDefaultsButton</tabstop>
+  <tabstop>allSelectedInfoRadio</tabstop>
+  <tabstop>briefSelectedInfoRadio</tabstop>
+  <tabstop>noSelectedInfoRadio</tabstop>
+  <tabstop>customSelectedInfoRadio</tabstop>
+  <tabstop>checkBoxName</tabstop>
+  <tabstop>checkBoxCatalogNumbers</tabstop>
+  <tabstop>checkBoxVisualMag</tabstop>
+  <tabstop>checkBoxAbsoluteMag</tabstop>
+  <tabstop>checkBoxRaDecJ2000</tabstop>
+  <tabstop>checkBoxRaDecOfDate</tabstop>
+  <tabstop>checkBoxHourAngle</tabstop>
+  <tabstop>checkBoxAltAz</tabstop>
+  <tabstop>checkBoxDistance</tabstop>
+  <tabstop>checkBoxSize</tabstop>
+  <tabstop>checkBoxExtra1</tabstop>
+  <tabstop>checkBoxExtra2</tabstop>
+  <tabstop>checkBoxExtra3</tabstop>
+  <tabstop>enableKeysNavigationCheckBox</tabstop>
+  <tabstop>enableMouseNavigationCheckBox</tabstop>
+  <tabstop>systemTimeRadio</tabstop>
+  <tabstop>todayRadio</tabstop>
+  <tabstop>todayTimeSpinBox</tabstop>
+  <tabstop>fixedTimeRadio</tabstop>
+  <tabstop>fixedDateTimeEdit</tabstop>
+  <tabstop>fixedDateTimeCurrentButton</tabstop>
+  <tabstop>mouseTimeoutCheckbox</tabstop>
+  <tabstop>mouseTimeoutSpinBox</tabstop>
+  <tabstop>showFlipButtonsCheckbox</tabstop>
+  <tabstop>showNebulaBgButtonCheckbox</tabstop>
+  <tabstop>sphericMirrorCheckbox</tabstop>
+  <tabstop>diskViewportCheckbox</tabstop>
+  <tabstop>gravityLabelCheckbox</tabstop>
+  <tabstop>selectSingleConstellationButton</tabstop>
+  <tabstop>autoZoomResetsDirectionCheckbox</tabstop>
+  <tabstop>screenshotBrowseButton</tabstop>
+  <tabstop>screenshotDirEdit</tabstop>
+  <tabstop>invertScreenShotColorsCheckBox</tabstop>
+  <tabstop>getStarsButton</tabstop>
+  <tabstop>downloadRetryButton</tabstop>
+  <tabstop>downloadCancelButton</tabstop>
+  <tabstop>scriptInfoBrowser</tabstop>
+  <tabstop>runScriptButton</tabstop>
+  <tabstop>stopScriptButton</tabstop>
+  <tabstop>closeWindowAtScriptRunCheckbox</tabstop>
+  <tabstop>pluginsInfoBrowser</tabstop>
+  <tabstop>pluginLoadAtStartupCheckBox</tabstop>
+  <tabstop>pluginConfigureButton</tabstop>
+ </tabstops>
  <resources>
   <include location="../../data/gui/guiRes.qrc"/>
  </resources>
- <connections/>
+ <connections>
+  <connection>
+   <sender>stackListWidget</sender>
+   <signal>currentRowChanged(int)</signal>
+   <receiver>configurationStackedWidget</receiver>
+   <slot>setCurrentIndex(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>237</x>
+     <y>62</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>237</x>
+     <y>281</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+ <buttongroups>
+  <buttongroup name="buttonGroupDisplayedFields">
+   <property name="exclusive">
+    <bool>false</bool>
+   </property>
+  </buttongroup>
+ </buttongroups>
 </ui>