Merge lp:~treaves/stellarium/ocular-sqlite into lp:stellarium

[treaves]

Removed dependency on SQLite, as I have no plans on finishing LogBook (the work in Oculars was done as a prelim to that). There is no migration; users will have to re-create any eyepieces,CCD's, & telescopes. This is unfortunate, but, much easier that a two-release approach of conversion, then removal.

Made all key bindings in the plugin configurable.

[lp:~treaves/stellarium/ocular-sqlite]

4782. By treaves on 2010-10-23

Missed a change I made in CMakeLists.txt. It is now commented out again.

[treaves (treaves)]

review: Approve

[Fabien Chéreau (xalioth)]

ok good.
Fab

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2010-09-03 09:54:30 +0000
+++ CMakeLists.txt	2010-10-23 15:46:40 +0000
@@ -61,7 +61,7 @@
 # SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.5")
 # SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk/")
  # Universal binary
-# SET(CMAKE_OSX_ARCHITECTURES "i386;ppc")
+ #SET(CMAKE_OSX_ARCHITECTURES "x86_64")
 ENDIF()
 
 ########### Check functions ###########

=== modified file 'plugins/Oculars/resources/default_ocular.ini'
--- plugins/Oculars/resources/default_ocular.ini	2010-01-22 17:37:33 +0000
+++ plugins/Oculars/resources/default_ocular.ini	2010-10-23 15:46:40 +0000
@@ -1,5 +1,61 @@
-[options]
-oculars_version = 0.12
-use_max_exit_circle = true
-
-
+[General]
+oculars_version=2
+use_max_exit_circle=true
+ocular_count=5
+ccd_count=1
+telescope_count=2
+
+[bindings]
+toggle_oculars=Ctrl+O
+toggle_config_dialog=Alt+O
+toggle_telrad=Ctrl+B
+next_ocular=Ctrl+]
+prev_ocular=Ctrl+[
+next_ccd=Shift+Ctrl+]
+prev_ccd=Shift+Ctrl+[
+next_telescope=Shift+]
+prev_telescope=Shift+[
+toggle_crosshair=Alt+C
+
+[ocular]
+0\name=Ocular 0
+0\afov=43
+0\efl=40
+0\fieldstop=0
+1\name=Ocular 1
+1\afov=52
+1\efl=26
+1\fieldstop=0
+2\name=Ocular 2
+2\afov=82
+2\efl=31
+2\fieldstop=0
+3\name=Ocular 3
+3\afov=100
+3\efl=32
+3\fieldstop=0
+4\name=Ocular 4
+4\afov=100
+4\efl=17
+4\fieldstop=0
+
+[telescope]
+0\name=C1400
+0\focalLength=3190
+0\diameter=355.6
+0\vFlip=false
+0\hFlip=true
+1\name=80EDF
+1\focalLength=500
+1\diameter=80
+1\vFlip=false
+1\hFlip=false
+
+[ccd]
+0\name=EOS 450D
+0\resolutionX=4272
+0\resolutionY=2848
+0\chip_width=22.2
+0\chip_height=14.8
+0\pixel_width=5.2
+0\pixel_heght=4.2

=== modified file 'plugins/Oculars/src/CCD.cpp'
--- plugins/Oculars/src/CCD.cpp	2010-05-26 08:03:06 +0000
+++ plugins/Oculars/src/CCD.cpp	2010-10-23 15:46:40 +0000
@@ -1,20 +1,21 @@
 /*
-  * Copyright (C) 2010 Bernhard Reutner-Fischer
-  *
-  * 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.
-  */
+ * portions Copyright (C) 2010 Bernhard Reutner-Fischer
+ * portions Copyright (C) 2010 Timothy Reaves
+ *
+ * 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 "CCD.hpp"
 #include "Ocular.hpp"
@@ -22,30 +23,164 @@
 #include <QDebug>
 #include <QSettings>
 
-CCD::CCD(QSqlRecord record)
-{
-	CCDID = record.value("id").toInt();
-	name = record.value("name").toString();
-	resolution_x = record.value("resolution_x").toInt();
-	resolution_y = record.value("resolution_y").toInt();
-	chip_width = record.value("chip_width").toFloat();
-	chip_height = record.value("chip_height").toFloat();
-	pixel_width = record.value("pixel_width").toFloat();
-	pixel_height = record.value("pixel_height").toFloat();
+CCD::CCD()
+{
+}
+
+CCD::CCD(const QObject& other)
+{
+	Q_ASSERT(other);
+	Q_ASSERT(other->metaObject()->className() == "CCD");
+	this->m_name = other.property("name").toString();
+	this->m_chipHeight = other.property("chipHeight").toFloat();
+	this->m_chipWidth = other.property("chipWidth").toFloat();
+	this->m_pixelHeight = other.property("pixelHeight").toFloat();
+	this->m_pixelWidth = other.property("pixelWidth").toFloat();
+	this->m_resolutionX = other.property("resolutionX").toInt();
+	this->m_resolutionY = other.property("resolutionY").toInt();
 }
 
 CCD::~CCD()
 {
 }
 
-float CCD::getActualFOVx(Ocular *ocular)
-{
-	float FOVx = (chip_width * 206.265) / ocular->getEffectiveFocalLength();
+
+static QMap<int, QString> mapping;
+
+QMap<int, QString> CCD::propertyMap()
+{
+	if(mapping.isEmpty()) {
+		mapping = QMap<int, QString>();
+		mapping[0] = "name";
+		mapping[1] = "chipHeight";
+		mapping[2] = "chipWidth";
+		mapping[3] = "pixelHeight";
+		mapping[4] = "pixelWidth";
+		mapping[5] = "resolutionX";
+		mapping[6] = "resolutionY";
+	}
+	return mapping;
+}
+
+
+/* ********************************************************************* */
+#if 0
+#pragma mark -
+#pragma mark Instance Methods
+#endif
+/* ********************************************************************* */
+QString CCD::name() const
+{
+	return m_name;
+}
+
+void CCD::setName(QString name)
+{
+	m_name = name;
+}
+
+int CCD::resolutionX()  const 
+{
+	return m_resolutionX;
+}
+
+void CCD::setResolutionX(int resolution)
+{
+	m_resolutionX = resolution;
+}
+
+int CCD::resolutionY()  const 
+{
+	return m_resolutionY;
+}
+
+void CCD::setResolutionY(int resolution)
+{
+	m_resolutionY = resolution;
+}
+
+float CCD::chipWidth()  const 
+{
+	return m_chipWidth;
+}
+
+void CCD::setChipWidth(float width)
+{
+	m_chipWidth = width;
+}
+
+float CCD::chipHeight()  const 
+{
+	return m_chipHeight;
+}
+
+void CCD::setChipHeight(float height)
+{
+	m_chipHeight = height;
+}
+
+float CCD::pixelWidth()  const 
+{
+	return m_pixelWidth;
+}
+
+void CCD::setPixelWidth(float width)
+{
+	m_pixelWidth = width;
+}
+
+float CCD::pixelHeight()  const 
+{
+	return m_pixelHeight;
+}
+
+void CCD::setPixelHeight(float height)
+{
+	m_pixelHeight = height;
+}
+
+float CCD::getActualFOVx(Ocular *ocular) const
+{
+	float FOVx = (m_chipWidth * 206.265) / ocular->effectiveFocalLength();
 	return FOVx;
 }
 
-float CCD::getActualFOVy(Ocular *ocular)
+float CCD::getActualFOVy(Ocular *ocular) const
 {
-	float FOVy = (chip_height * 206.265) / ocular->getEffectiveFocalLength();
+	float FOVy = (m_chipHeight * 206.265) / ocular->effectiveFocalLength();
 	return FOVy;
 }
+
+/* ********************************************************************* */
+#if 0
+#pragma mark -
+#pragma mark Static Methods
+#endif
+/* ********************************************************************* */
+CCD* CCD::ccdFromSettings(QSettings* theSettings, int ccdIndex)
+{
+	CCD* ccd = new CCD();
+	QString prefix = "ccd/" + QVariant(ccdIndex).toString() + "/";
+	ccd->setName(theSettings->value(prefix + "name", "").toString());
+	ccd->setResolutionX(theSettings->value(prefix + "resolutionX", "0").toInt());
+	ccd->setResolutionY(theSettings->value(prefix + "resolutionY", "0").toInt());
+	ccd->setChipWidth(theSettings->value(prefix + "chip_width", "0.0").toFloat());
+	ccd->setChipHeight(theSettings->value(prefix + "chip_height", "0.0").toFloat());
+	ccd->setPixelWidth(theSettings->value(prefix + "pixel_width", "0.0").toFloat());
+	ccd->setPixelHeight(theSettings->value(prefix + "pixel_height", "0.0").toFloat());
+	
+	return ccd;
+}
+
+CCD* CCD::ccdModel()
+{
+	CCD* model = new CCD();
+	model->setName("My CCD");
+	model->setChipHeight(36.8);
+	model->setChipWidth(36.8);
+	model->setPixelHeight(9);
+	model->setPixelWidth(9);
+	model->setResolutionX(4096);
+	model->setResolutionY(4096);
+	return model;
+}

=== modified file 'plugins/Oculars/src/CCD.hpp'
--- plugins/Oculars/src/CCD.hpp	2010-05-04 02:04:28 +0000
+++ plugins/Oculars/src/CCD.hpp	2010-10-23 15:46:40 +0000
@@ -1,62 +1,83 @@
 /*
-  * Copyright (C) 2010 Bernhard Reutner-Fischer
-  *
-  * 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.
-  */
+ * portions Copyright (C) 2010 Bernhard Reutner-Fischer
+ * portions Copyright (C) 2010 Timothy Reaves
+ *
+ * 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 CCD_HPP_
 #define CCD_HPP_
 
 #include <QObject>
 #include <QString>
-#include <QSqlRecord>
+#include <QSettings>
 
 class Ocular;
 
 class CCD : public QObject
 {
 	Q_OBJECT
+	Q_PROPERTY(QString name READ name WRITE setName)
+	Q_PROPERTY(int resolutionX READ resolutionX WRITE setResolutionX)
+	Q_PROPERTY(int resolutionY READ resolutionY WRITE setResolutionY)
+	Q_PROPERTY(float chipWidth READ chipWidth WRITE setChipWidth)
+	Q_PROPERTY(float chipHeight READ chipHeight WRITE setChipHeight)
+	Q_PROPERTY(float pixelWidth READ pixelWidth WRITE setPixelWidth)
+	Q_PROPERTY(float pixelHeight READ pixelHeight WRITE setPixelHeight)
 public:
-	CCD(QSqlRecord record);
+	CCD();
+	Q_INVOKABLE CCD(const QObject& other);
 	virtual ~CCD();
-	const QString getName() {return name;};
-	int getCCDID() {return CCDID;};
-	int getResolutionX() {return resolution_x;};
-	int getResolutionY() {return resolution_y;};
-	float getChipWidth() {return chip_width;};
-	float getChipHeight() {return chip_height;};
-	float getPixelWidth() {return pixel_width;};
-	float getPixelHeight() {return pixel_height;};
-
-	float getActualFOVx(Ocular *ocular);
-	float getActualFOVy(Ocular *ocular);
+	static CCD* ccdFromSettings(QSettings* theSettings, int ccdIndex);
+	static CCD* ccdModel();
+
+	QString name() const;
+	void setName(QString name);
+	int getCCDID();
+	int resolutionX()  const;
+	void setResolutionX(int resolution);
+	int resolutionY()  const;
+	void setResolutionY(int resolution);
+	float chipWidth()  const;
+	void setChipWidth(float width);
+	float chipHeight()  const;
+	void setChipHeight(float height);
+	float pixelWidth()  const;
+	void setPixelWidth(float width);
+	float pixelHeight()  const;
+	void setPixelHeight(float height);
+
+	float getActualFOVx(Ocular *ocular) const;
+	float getActualFOVy(Ocular *ocular) const;
+	QMap<int, QString> propertyMap();
 private:
-	int CCDID;
-	QString name;
+	int ccdID;
+	QString m_name;
 	//! total resolution width in pixels
-	int resolution_x;
+	int m_resolutionX;
 	//! total resolution height in pixels
-	int resolution_y;
+	int m_resolutionY;
 	//! chip width in millimeters
-	float chip_width;
+	float m_chipWidth;
 	//! chip height in millimeters
-	float chip_height;
+	float m_chipHeight;
 	//! height of 1 pixel in micron (micrometer)
-	float pixel_width;
+	float m_pixelWidth;
 	//! width of 1 pixel in micron (micrometer)
-	float pixel_height;
+	float m_pixelHeight;
 };
 
+
 #endif /* CCD_HPP_ */

=== modified file 'plugins/Oculars/src/CMakeLists.txt'
--- plugins/Oculars/src/CMakeLists.txt	2010-05-10 08:59:49 +0000
+++ plugins/Oculars/src/CMakeLists.txt	2010-10-23 15:46:40 +0000
@@ -17,6 +17,8 @@
   Telescope.cpp
   gui/OcularDialog.hpp
   gui/OcularDialog.cpp
+  gui/PropertyBasedTableModel.hpp
+  gui/PropertyBasedTableModel.cpp
   gui/StelDialogOculars.hpp
   gui/StelDialogOculars.cpp
 )
@@ -38,13 +40,13 @@
   Oculars.hpp
   Telescope.hpp
   gui/OcularDialog.hpp
+  gui/PropertyBasedTableModel.hpp
   gui/StelDialogOculars.hpp
 )
 
 # After this call, Oculars_MOC_SRCS = moc_Oculars.cxx
 QT4_WRAP_CPP(Oculars_MOC_SRCS ${Oculars_MOC_HDRS})
 
-SET(QT_USE_QTSQL TRUE)
 INCLUDE(${QT_USE_FILE})
 
 SET(extLinkerOption ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES})

=== modified file 'plugins/Oculars/src/Ocular.cpp'
--- plugins/Oculars/src/Ocular.cpp	2010-07-12 01:49:07 +0000
+++ plugins/Oculars/src/Ocular.cpp	2010-10-23 15:46:40 +0000
@@ -19,43 +19,59 @@
 #include "Ocular.hpp"
 #include "Telescope.hpp"
 
-#include <QDebug>
-#include <QSettings>
+Ocular::Ocular()
+{
+}
 
-Ocular::Ocular(QSqlRecord record)
+Ocular::Ocular(const QObject& other)
 {
-	ocularID = record.value("id").toInt();
-	name = record.value("name").toString();
-	appearentFOV = record.value("afov").toDouble();
-	effectiveFocalLength = record.value("efl").toDouble();
-	fieldStop = record.value("fieldStop").toDouble();
+	Q_ASSERT(other);
+	Q_ASSERT(other->metaObject()->className() == "Ocular");
+	this->m_appearentFOV = other.property("appearentFOV").toDouble();
+	this->m_effectiveFocalLength = other.property("effectiveFocalLength").toDouble();
+	this->m_fieldStop = other.property("fieldStop").toDouble();
+	this->m_name = other.property("name").toString();
 }
 
 Ocular::~Ocular()
 {
 }
 
+static QMap<int, QString> mapping;
+QMap<int, QString> Ocular::propertyMap()
+{
+	if(mapping.isEmpty()) {
+		mapping = QMap<int, QString>();
+		mapping[0] = "name";
+		mapping[1] = "appearentFOV";
+		mapping[2] = "effectiveFocalLength";
+		mapping[3] = "fieldStop";
+	}
+	return mapping;
+}
+
+
 /* ********************************************************************* */
 #if 0
 #pragma mark -
 #pragma mark Instance Methods
 #endif
 /* ********************************************************************* */
-double Ocular::getActualFOV(Telescope *telescope)
+double Ocular::actualFOV(Telescope *telescope) const
 {
 	double actualFOV = 0.0;
-	if (fieldStop > 0.0) {
-		actualFOV =  fieldStop / telescope->getFocalLength() * 57.3;
+	if (fieldStop() > 0.0) {
+		actualFOV =  fieldStop() / telescope->focalLength() * 57.3;
 	} else {
 		//actualFOV = apparent / mag
-		actualFOV = appearentFOV / (telescope->getFocalLength() / effectiveFocalLength);
+		actualFOV = appearentFOV() / (telescope->focalLength() / effectiveFocalLength());
 	}
 	return actualFOV;
 }
 
-double Ocular::getMagnification(Telescope *telescope)
+double Ocular::magnification(Telescope *telescope) const
 {
-	return telescope->getFocalLength() / effectiveFocalLength;
+	return telescope->focalLength() / effectiveFocalLength();
 }
 
 /* ********************************************************************* */
@@ -64,27 +80,81 @@
 #pragma mark Accessors & Mutators
 #endif
 /* ********************************************************************* */
-const QString Ocular::getName()
-{
-	return name;
-}
-
-int Ocular::getOcularID()
-{
-	return ocularID;
-}
-
-double Ocular::getAppearentFOV()
-{
-	return appearentFOV;
-}
-
-double Ocular::getEffectiveFocalLength()
-{
-	return effectiveFocalLength;
-}
-
-double Ocular::getFieldStop()
-{
-	return fieldStop;
+const QString Ocular::name() const
+{
+	return m_name;
+}
+
+void Ocular::setName(QString aName)
+{
+	m_name = aName;
+}
+
+double Ocular::appearentFOV() const
+{
+	return m_appearentFOV;
+}
+
+void Ocular::setAppearentFOV(double fov)
+{
+	m_appearentFOV = fov;
+}
+
+double Ocular::effectiveFocalLength() const
+{
+	return m_effectiveFocalLength;
+}
+
+void Ocular::setEffectiveFocalLength(double fl)
+{
+	m_effectiveFocalLength = fl;
+}
+
+double Ocular::fieldStop() const
+{
+	return m_fieldStop;
+}
+
+void Ocular::setFieldStop(double fs)
+{
+	m_fieldStop = fs;
+}
+
+/* ********************************************************************* */
+#if 0
+#pragma mark -
+#pragma mark Static Methods
+#endif
+/* ********************************************************************* */
+
+Ocular* Ocular::ocularFromSettings(QSettings* theSettings, int ocularIndex)
+{
+	Ocular* ocular = new Ocular();
+	QString prefix = "ocular/" + QVariant(ocularIndex).toString() + "/";
+
+	ocular->setName(theSettings->value(prefix + "name", "").toString());
+	ocular->setAppearentFOV(theSettings->value(prefix + "afov", "0.0").toDouble());
+	ocular->setEffectiveFocalLength(theSettings->value(prefix + "efl", "0.0").toDouble());
+	ocular->setFieldStop(theSettings->value(prefix + "fieldStop", "0.0").toDouble());
+	
+	if (!(ocular->appearentFOV() > 0.0 && ocular->effectiveFocalLength() > 0.0)) {
+		qWarning() << "WARNING: Invalid data for ocular. Ocular values must be positive. \n"
+		<< "\tafov: " << ocular->appearentFOV() << "\n"
+		<< "\tefl: " << ocular->effectiveFocalLength() << "\n"
+		<< "\tThis ocular will be ignored.";
+		delete ocular;
+		ocular = NULL;
+	}
+	
+	return ocular;
+}
+
+Ocular* Ocular::ocularModel()
+{
+	Ocular* model = new Ocular();
+	model->setName("My Ocular");
+	model->setAppearentFOV(68);
+	model->setEffectiveFocalLength(32);
+	model->setFieldStop(0);
+	return model;
 }

=== modified file 'plugins/Oculars/src/Ocular.hpp'
--- plugins/Oculars/src/Ocular.hpp	2010-07-12 01:49:07 +0000
+++ plugins/Oculars/src/Ocular.hpp	2010-10-23 15:46:40 +0000
@@ -19,32 +19,46 @@
 #ifndef OCULAR_HPP_
 #define OCULAR_HPP_
 
+#include <QDebug>
 #include <QObject>
 #include <QString>
-#include <QSqlRecord>
+#include <QSettings>
 
 class Telescope;
 
 class Ocular : public QObject
 {
 	Q_OBJECT
+	Q_PROPERTY(QString name READ name WRITE setName)
+	Q_PROPERTY(double appearentFOV READ appearentFOV WRITE setAppearentFOV)
+	Q_PROPERTY(double effectiveFocalLength READ effectiveFocalLength WRITE setEffectiveFocalLength)
+	Q_PROPERTY(double fieldStop READ fieldStop WRITE setFieldStop)
 public:
-	Ocular(QSqlRecord record);
+	Ocular();
+	Q_INVOKABLE Ocular(const QObject& other);
 	virtual ~Ocular();
-	const QString getName();
-	int getOcularID();
-	double getAppearentFOV();
-	double getEffectiveFocalLength();
-	double getFieldStop();
-
-	double getActualFOV(Telescope *telescope);
-	double getMagnification(Telescope *telescope);
+	static Ocular* ocularFromSettings(QSettings* theSettings, int ocularIndex);
+	static Ocular* ocularModel();
+
+	const QString name() const;
+	void setName(QString aName);
+	double appearentFOV() const;
+	void setAppearentFOV(double fov);
+	double effectiveFocalLength() const;
+	void setEffectiveFocalLength(double fl);
+	double fieldStop() const;
+	void setFieldStop(double fs);
+
+	double actualFOV(Telescope *telescope) const;
+	double magnification(Telescope *telescope) const;
+	QMap<int, QString> propertyMap();
 
 private:
-	int ocularID;
-	QString name;
-	double appearentFOV;
-	double effectiveFocalLength;
-	double fieldStop;
+	QString m_name;
+	double m_appearentFOV;
+	double m_effectiveFocalLength;
+	double m_fieldStop;
 };
+
+
 #endif /* OCULAR_HPP_ */

=== modified file 'plugins/Oculars/src/Oculars.cpp'
--- plugins/Oculars/src/Oculars.cpp	2010-07-20 17:53:11 +0000
+++ plugins/Oculars/src/Oculars.cpp	2010-10-23 15:46:40 +0000
@@ -39,11 +39,6 @@
 #include <QMouseEvent>
 #include <QtNetwork>
 #include <QPixmap>
-#include <QSettings>
-#include <QSqlDatabase>
-#include <QSqlError>
-#include <QSqlQuery>
-#include <QSqlTableModel>
 
 #include <cmath>
 
@@ -53,6 +48,7 @@
 #include <GL/glu.h>	/* Header File For The GLU Library */
 #endif
 
+static QSettings *settings; //!< The settings as read in from the ini file.
 
 /* ********************************************************************* */
 #if 0
@@ -96,31 +92,27 @@
 	flagShowOculars = false;
 	flagShowCrosshairs = false;
 	flagShowTelrad = false;
+	ready = false;
+	useMaxEyepieceAngle = true;
+	visible = false;
+
 	font.setPixelSize(14);
 	maxEyepieceAngle = 0.0;
-	CCDs = QList<CCD *>();
+
+	ccds = QList<CCD *>();
 	oculars = QList<Ocular *>();
-	ready = false;
-	selectedCCDIndex = 0;
+	telescopes = QList<Telescope *>();
+
+	selectedCCDIndex = -1;
 	selectedOcularIndex = 0;
 	selectedTelescopeIndex = 0;
+
 	setObjectName("Oculars");
-	telescopes = QList<Telescope *>();
-	useMaxEyepieceAngle = true;
-	visible = false;
-	ocularsTableModel = NULL;
-	telescopesTableModel = NULL;
-	ocularDialog = NULL;
+
 }
 
 Oculars::~Oculars()
 {
-	delete CCDsTableModel;
-	CCDsTableModel = NULL;
-	delete ocularsTableModel;
-	ocularsTableModel = NULL;
-	delete telescopesTableModel;
-	telescopesTableModel = NULL;
 	delete ocularDialog;
 	ocularDialog = NULL;
 }
@@ -145,9 +137,42 @@
 
 void Oculars::deinit()
 {
-	QSqlDatabase db = QSqlDatabase::database("oculars");
-	db.close();
-	QSqlDatabase::removeDatabase(QSqlDatabase::defaultConnection);
+	// update the ini file.
+	settings->remove("ccd");
+	settings->remove("ocular");
+	settings->remove("telescope");
+	int index = 0;
+	foreach(CCD* ccd, ccds) {
+		QString prefix = "ccd/" + QVariant(index).toString() + "/";
+		settings->setValue(prefix + "name", ccd->name());
+		settings->setValue(prefix + "resolutionX", ccd->resolutionX());
+		settings->setValue(prefix + "resolutionY", ccd->resolutionY());
+		settings->setValue(prefix + "chip_width", ccd->chipWidth());
+		settings->setValue(prefix + "chip_height", ccd->chipHeight());
+		settings->setValue(prefix + "pixel_width", ccd->pixelWidth());
+		settings->setValue(prefix + "pixel_height", ccd->pixelWidth());
+		index++;
+	}
+	index = 0;
+	foreach(Ocular* ocular, oculars) {
+		QString prefix = "ocular/" + QVariant(index).toString() + "/";
+		settings->setValue(prefix + "name", ocular->name());
+		settings->setValue(prefix + "afov", ocular->appearentFOV());
+		settings->setValue(prefix + "efl", ocular->effectiveFocalLength());
+		settings->setValue(prefix + "fieldStop", ocular->fieldStop());
+		index++;
+	}
+	index = 0;
+	foreach(Telescope* telescope, telescopes){
+		QString prefix = "telescope/" + QVariant(index).toString() + "/";
+		settings->setValue(prefix + "name", telescope->name());
+		settings->setValue(prefix + "focalLength", telescope->focalLength());
+		settings->setValue(prefix + "diameter", telescope->diameter());
+		settings->setValue(prefix + "hFlip", telescope->isHFlipped());
+		settings->setValue(prefix + "vFlip", telescope->isVFlipped());
+		index++;
+	}
+	settings->sync();
 }
 
 //! Draw any parts on the screen which are for our module
@@ -158,9 +183,9 @@
 	}
 	if (flagShowOculars){
 		// Insure there is a selected ocular & telescope
-		if (selectedCCDIndex > CCDs.count()) {
+		if (selectedCCDIndex > ccds.count()) {
 			qWarning() << "Oculars: the selected sensor index of " << selectedCCDIndex << " is greater than the sensor count of "
-			<< CCDs.count() << ". Module disabled!";
+			<< ccds.count() << ". Module disabled!";
 			ready = false;
 		}
 		if (selectedOcularIndex > oculars.count()) {
@@ -252,19 +277,37 @@
 	qDebug() << "Ocular plugin - press Command-O to toggle eyepiece view mode. Press ALT-o for configuration.";
 
 	// Load settings from ocular.ini
-	validateIniFile();
-	if (initializeDB()) {
+	try {
+		validateAndLoadIniFile();
 		// assume all is well
+
+		useMaxEyepieceAngle = settings->value("use_max_exit_circle", 0.0).toBool();
+		int ocularCount = settings->value("ocular_count", 0).toInt();
+		for (int index = 0; index < ocularCount; index++) {
+			Ocular *newOcular = Ocular::ocularFromSettings(settings, index);
+			if (newOcular != NULL) {
+				oculars.append(newOcular);
+			}
+		}
+		int ccdCount = settings->value("ccd_count", 0).toInt();
+		for (int index = 0; index < ccdCount; index++) {
+			CCD *newCCD = CCD::ccdFromSettings(settings, index);
+			if (newCCD != NULL) {
+				ccds.append(newCCD);
+			}
+		}
+		int telescopeCount = settings->value("telescope_count", 0).toInt();
+		for (int index = 0; index < telescopeCount; index++) {
+			Telescope *newTelescope = Telescope::telescopeFromSettings(settings, index);
+			if (newTelescope != NULL) {
+				telescopes.append(newTelescope);
+			}
+		}
+
 		ready = true;
-		ocularDialog = new OcularDialog(CCDsTableModel, ocularsTableModel, telescopesTableModel);
+		ocularDialog = new OcularDialog(&ccds, &oculars, &telescopes);
 		initializeActivationActions();
-	}
-	try {
-		StelFileMgr::Flags flags = (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable);
-		QString ocularIniPath = StelFileMgr::findFile("modules/Oculars/", flags) + "ocular.ini";
-
-		QSettings settings(ocularIniPath, QSettings::IniFormat);
-		useMaxEyepieceAngle = settings.value("use_max_exit_circle", 0.0).toBool();
+		determineMaxEyepieceAngle();
 	} catch (std::runtime_error& e) {
 		qWarning() << "WARNING: unable to locate ocular.ini file or create a default one for Ocular plugin: " << e.what();
 	}
@@ -305,8 +348,8 @@
 		while (ocularIterator.hasNext()) {
 			Ocular *ocular = ocularIterator.next();
 
-			if (ocular->getAppearentFOV() > maxEyepieceAngle) {
-				maxEyepieceAngle = ocular->getAppearentFOV();
+			if (ocular->appearentFOV() > maxEyepieceAngle) {
+				maxEyepieceAngle = ocular->appearentFOV();
 			}
 		}
 	}
@@ -322,33 +365,6 @@
 	zoom(true);
 }
 
-void Oculars::loadCCDs()
-{
-	CCDs.clear();
-	int rowCount = CCDsTableModel->rowCount();
-	for (int row = 0; row < rowCount; row++) {
-		CCDs.append(new CCD(CCDsTableModel->record(row)));
-	}
-}
-
-void Oculars::loadOculars()
-{
-	oculars.clear();
-	int rowCount = ocularsTableModel->rowCount();
-	for (int row = 0; row < rowCount; row++) {
-		oculars.append(new Ocular(ocularsTableModel->record(row)));
-	}
-}
-
-void Oculars::loadTelescopes()
-{
-	telescopes.clear();
-	int rowCount = telescopesTableModel->rowCount();
-	for (int row = 0; row < rowCount; row++) {
-		telescopes.append(new Telescope(telescopesTableModel->record(row)));
-	}
-}
-
 void Oculars::setScaleImageCircle(bool state)
 {
 	if (state) {
@@ -372,7 +388,6 @@
 
 	if (b) {
 		// load data and determine if we're ready (if we have all required data)
-		loadDatabaseObjects();
 	}
 	if (!ready) {
 		// no, some data was missing. We already warned, done.
@@ -417,8 +432,8 @@
 void Oculars::decrementCCDIndex()
 {
 	selectedCCDIndex--;
-	if (selectedCCDIndex == -1) {
-		selectedCCDIndex = CCDs.count() - 1;
+	if (selectedCCDIndex == -2) {
+		selectedCCDIndex = ccds.count() - 1;
 	}
 	emit(selectedCCDChanged());
 }
@@ -444,8 +459,8 @@
 void Oculars::incrementCCDIndex()
 {
 	selectedCCDIndex++;
-	if (selectedCCDIndex == CCDs.count()) {
-		selectedCCDIndex = 0;
+	if (selectedCCDIndex == ccds.count()) {
+		selectedCCDIndex = -1;
 	}
 	emit(selectedCCDChanged());
 }
@@ -494,8 +509,8 @@
 					   projector->getViewportPosY()+projector->getViewportHeight()/2);
 	GLdouble length = 0.5 * params.viewportFovDiameter;
 	// See if we need to scale the length
-	if (useMaxEyepieceAngle && oculars[selectedOcularIndex]->getAppearentFOV() > 0.0) {
-		length = oculars[selectedOcularIndex]->getAppearentFOV() * length / maxEyepieceAngle;
+	if (useMaxEyepieceAngle && oculars[selectedOcularIndex]->appearentFOV() > 0.0) {
+		length = oculars[selectedOcularIndex]->appearentFOV() * length / maxEyepieceAngle;
 	}
 
 	// Draw the lines
@@ -550,13 +565,25 @@
 	StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
 	Q_ASSERT(gui);
 
-	gui->addGuiActions("actionShow_Ocular", N_("Enable ocular"), "Ctrl+O", "Plugin Key Bindings", true);
+	gui->addGuiActions("actionShow_Ocular",
+							 N_("Enable ocular"),
+							 settings->value("toggle_oculars", "Ctrl+O").toString(),
+							 "Plugin Key Bindings",
+							 true);
 	gui->getGuiActions("actionShow_Ocular")->setChecked(flagShowOculars);
 	connect(gui->getGuiActions("actionShow_Ocular"), SIGNAL(toggled(bool)), this, SLOT(enableOcular(bool)));
-	gui->addGuiActions("actionShow_Ocular_Window", N_("Configuration Window"), "ALT+O", group, true);
+	gui->addGuiActions("actionShow_Ocular_Window",
+							 N_("Configuration Window"),
+							 settings->value("toggle_config_dialog", "ALT+O").toString(),
+							 group,
+							 true);
 	connect(gui->getGuiActions("actionShow_Ocular_Window"), SIGNAL(toggled(bool)), ocularDialog, SLOT(setVisible(bool)));
 	connect(ocularDialog, SIGNAL(visibleChanged(bool)), gui->getGuiActions("actionShow_Ocular_Window"), SLOT(setChecked(bool)));
-	gui->addGuiActions("actionShow_Ocular_Telrad", N_("Display Telrad"), "Ctrl+B", group, true);
+	gui->addGuiActions("actionShow_Ocular_Telrad",
+							 N_("Display Telrad"),
+							 settings->value("toggle_telrad", "Ctrl+B").toString(),
+							 group,
+							 true);
 	gui->getGuiActions("actionShow_Ocular_Telrad")->setChecked(flagShowTelrad);
 	connect(gui->getGuiActions("actionShow_Ocular_Telrad"), SIGNAL(toggled(bool)), this, SLOT(toggleTelrad()));
 
@@ -587,14 +614,35 @@
 	StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
 
 	Q_ASSERT(gui);
-	gui->addGuiActions("actionShow_Ocular_Crosshair", N_("Toggle Crosshair"), "ALT+C", group, true);
+	gui->addGuiActions("actionShow_Ocular_Crosshair",
+							 N_("Toggle Crosshair"),
+							 settings->value("toggle_crosshair", "ALT+C").toString(),
+							 group, true);
 
-	gui->addGuiActions("actionShow_CCD_increment", N_("Select next sensor"), "Shift+Ctrl+]", group, false);
-	gui->addGuiActions("actionShow_CCD_decrement", N_("Select previous sensor"), "Shift+Ctrl+[", group, false);
-	gui->addGuiActions("actionShow_Ocular_increment", N_("Select next ocular"), "Ctrl+]", group, false);
-	gui->addGuiActions("actionShow_Ocular_decrement", N_("Select previous ocular"), "Ctrl+[", group, false);
-	gui->addGuiActions("actionShow_Telescope_increment", N_("Select next telescope"), "Shift+]", group, false);
-	gui->addGuiActions("actionShow_Telescope_decrement", N_("Select previous telescope"), "Shift+[", group, false);
+	gui->addGuiActions("actionShow_CCD_increment",
+							 N_("Select next sensor"),
+							 settings->value("next_ccd", "Shift+Ctrl+]").toString(),
+							 group, false);
+	gui->addGuiActions("actionShow_CCD_decrement",
+							 N_("Select previous sensor"),
+							 settings->value("prev_ccd", "Shift+Ctrl+[").toString(),
+							 group, false);
+	gui->addGuiActions("actionShow_Ocular_increment",
+							 N_("Select next ocular"),
+							 settings->value("next_ocular", "Ctrl+]").toString(),
+							 group, false);
+	gui->addGuiActions("actionShow_Ocular_decrement",
+							 N_("Select previous ocular"),
+							 settings->value("prev_ocular", "Ctrl+[").toString(),
+							 group, false);
+	gui->addGuiActions("actionShow_Telescope_increment",
+							 N_("Select next telescope"),
+							 settings->value("next_telescope", "Shift+]").toString(),
+							 group, false);
+	gui->addGuiActions("actionShow_Telescope_decrement",
+							 N_("Select previous telescope"),
+							 settings->value("prev_telescope", "Shift+[").toString(),
+							 group, false);
 
 	connect(gui->getGuiActions("actionShow_Ocular_Crosshair"), SIGNAL(toggled(bool)), this, SLOT(toggleCrosshair()));
 
@@ -616,59 +664,6 @@
 	connect(ocularDialog, SIGNAL(scaleImageCircleChanged(bool)), this, SLOT(setScaleImageCircle(bool)));
 }
 
-// Return true if we're ready (could read all required data), false otherwise
-bool Oculars::initializeDB()
-{
-	StelFileMgr::Flags flags = (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable);
-	QString dbPath = StelFileMgr::findFile("modules/Oculars/", flags);
-	QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "oculars");
-	db.setDatabaseName(dbPath + "oculars.sqlite");
-	if (db.open()) {
-#define EXEC(sql) if (!query.exec(sql)) { qDebug() << query.lastError(); return false;}
-		qDebug() << "Oculars opened the DB successfully.";
-		// See if the tables alreadt exist.
-		QStringList tableList = db.tables();
-		if (!tableList.contains("oculars")) {
-			QSqlQuery query = QSqlQuery(db);
-			EXEC("create table oculars (id INTEGER PRIMARY KEY, name VARCHAR, afov FLOAT, efl FLOAT, fieldStop FLOAT)");
-			EXEC("INSERT INTO oculars (name, afov, efl, fieldStop) VALUES ('one', 43, 40, 0)");
-			EXEC("INSERT INTO oculars (name, afov, efl, fieldStop) VALUES ('two', 82, 31, 0)");
-			EXEC("INSERT INTO oculars (name, afov, efl, fieldStop) VALUES ('three', 52, 10.5, 0)");
-			EXEC("INSERT INTO oculars (name, afov, efl, fieldStop) VALUES ('four', 52, 26, 0)");
-			EXEC("INSERT INTO oculars (name, afov, efl, fieldStop) VALUES ('five', 82, 20, 0)");
-		}
-		if (!tableList.contains("telescopes")) {
-			QSqlQuery query = QSqlQuery(db);
-			EXEC("create table telescopes (id INTEGER PRIMARY KEY, name VARCHAR, focalLength FLOAT, diameter FLOAT, vFlip VARCHAR, hFlip VARCHAR)");
-			EXEC("INSERT INTO telescopes (name, focalLength, diameter, vFlip, hFlip) VALUES ('C1400', 3190, 355.6, 'false', 'true')");
-			EXEC("INSERT INTO telescopes (name, focalLength, diameter, vFlip, hFlip) VALUES ('80EDF', 500, 80, 'false', 'false')");
-		}
-		if (!tableList.contains("ccd")) {
-			QSqlQuery query = QSqlQuery(db);
-			EXEC("create table ccd (id INTEGER PRIMARY KEY, name VARCHAR, resolution_x INTEGER, resolution_y INTEGER, chip_width FLOAT, chip_height FLOAT, pixel_width FLOAT, pixel_height FLOAT)");
-			EXEC("INSERT INTO ccd (name, resolution_x, resolution_y, chip_width, chip_height, pixel_width, pixel_height) VALUES ('None', 0, 0, 0, 0, 0, 0)");
-			EXEC("INSERT INTO ccd (name, resolution_x, resolution_y, chip_width, chip_height, pixel_width, pixel_height) VALUES ('EOS 450D', 4272, 2848, 22.2, 14.8, 5.2, 5.2)");
-		}
-
-		// Set the table models
-		CCDsTableModel = new QSqlTableModel(0, db);
-		CCDsTableModel->setTable("ccd");
-		CCDsTableModel->select();
-		ocularsTableModel = new QSqlTableModel(0, db);
-		ocularsTableModel->setTable("oculars");
-		if (!ocularsTableModel->select())
-			return false;
-		telescopesTableModel = new QSqlTableModel(0, db);
-		telescopesTableModel->setTable("telescopes");
-		if (!telescopesTableModel->select())
-			return false;
-#undef EXEC
-		return true;
-	} else {
-		qDebug() << "Oculars could not open its database; disabling module.";
-	}
-	return false;
-}
 
 void Oculars::interceptMovementKey(QKeyEvent* event)
 {
@@ -769,30 +764,6 @@
 	}
 }
 
-void Oculars::loadDatabaseObjects()
-{
-	loadCCDs();
-	loadOculars();
-	loadTelescopes();
-	if (useMaxEyepieceAngle) {
-		determineMaxEyepieceAngle();
-	}
-	// A telescope and one of [CCD|Ocular] must be defined for the plugin to be usable.
-	if (telescopes.size() == 0)
-	{
-		ready = false;
-		qWarning() << "WARNING: no telescopes found.  Ocular will be disabled.";
-	}
-	else if (oculars.size() == 0 && CCDs.size() == 0) {
-		ready = false;
-		qWarning() << "WARNING: no oculars or CCDs found.  Ocular will be disabled.";
-	}
-	else
-	{
-		ready = true;
-	}
-}
-
 void Oculars::paintMask()
 {
 	StelCore *core = StelApp::getInstance().getCore();
@@ -807,8 +778,8 @@
 	GLdouble inner = 0.5 * params.viewportFovDiameter;
 
 	// See if we need to scale the mask
-	if (useMaxEyepieceAngle && oculars[selectedOcularIndex]->getAppearentFOV() > 0.0) {
-		inner = oculars[selectedOcularIndex]->getAppearentFOV() * inner / maxEyepieceAngle;
+	if (useMaxEyepieceAngle && oculars[selectedOcularIndex]->appearentFOV() > 0.0) {
+		inner = oculars[selectedOcularIndex]->appearentFOV() * inner / maxEyepieceAngle;
 	}
 
 	GLdouble outer = params.viewportXywh[2] + params.viewportXywh[3];
@@ -819,21 +790,23 @@
 	gluDisk(quadric, inner - 1.0, inner, 256, 1);
 	gluDeleteQuadric(quadric);
 	// draw sensor rectangle
-	CCD *ccd = CCDs[selectedCCDIndex];
-	if (ccd) {
-		glColor4f(0.77, 0.14, 0.16, 0.5);
-		Ocular *ocular = oculars[selectedOcularIndex];
-		float CCDx = ccd->getActualFOVx(ocular);
-		float CCDy = ccd->getActualFOVy(ocular);
-		if (CCDx > 0.0 && CCDy > 0.0) {
-			glBegin(GL_LINE_LOOP);
-			glVertex2f(-CCDx, CCDy);
-			glVertex2f(CCDx, CCDy);
-			glVertex2f(CCDx, -CCDy);
-			glVertex2f(-CCDx, -CCDy);
-			glEnd();
+	if(selectedCCDIndex != -1) {
+		CCD *ccd = ccds[selectedCCDIndex];
+		if (ccd) {
+			glColor4f(0.77, 0.14, 0.16, 0.5);
+			Ocular *ocular = oculars[selectedOcularIndex];
+			float CCDx = ccd->getActualFOVx(ocular);
+			float CCDy = ccd->getActualFOVy(ocular);
+			if (CCDx > 0.0 && CCDy > 0.0) {
+				glBegin(GL_LINE_LOOP);
+				glVertex2f(-CCDx, CCDy);
+				glVertex2f(CCDx, CCDy);
+				glVertex2f(CCDx, -CCDy);
+				glVertex2f(-CCDx, -CCDy);
+				glEnd();
+			}
 		}
-	}
+}
 	glPopMatrix();
 }
 
@@ -843,7 +816,10 @@
 	StelPainter painter(prj);	
 
 	// Get the current instruments
-	CCD *ccd = CCDs[selectedCCDIndex];
+	CCD *ccd = NULL;
+	if(selectedCCDIndex != -1) {
+		ccd = ccds[selectedCCDIndex];
+	}
 	Ocular *ocular = oculars[selectedOcularIndex];
 	Telescope *telescope = telescopes[selectedTelescopeIndex];
 
@@ -865,16 +841,16 @@
 	const int lineHeight = painter.getFontMetrics().height();
 	
 	// The CCD
-	QString ccdSensorLabel, ccdInfoLabel;
-	if (ccd && ccd->getChipWidth() > .0 && ccd->getChipHeight() > .0) {
-		ccdInfoLabel = "Dimension : " + QVariant(ccd->getChipWidth()).toString() + "x" + QVariant(ccd->getChipHeight()).toString() + " mm";
-		if (ccd->getName() != QString("")) {
-			ccdSensorLabel = "Sensor #" + QVariant(selectedCCDIndex).toString();
-			ccdSensorLabel.append(" : ").append(ccd->getName());
+	QString ccdsensorLabel, ccdInfoLabel;
+	if (ccd && ccd->chipWidth() > .0 && ccd->chipHeight() > .0) {
+		ccdInfoLabel = "Dimension : " + QVariant(ccd->chipWidth()).toString() + "x" + QVariant(ccd->chipHeight()).toString() + " mm";
+		if (ccd->name() != QString("")) {
+			ccdsensorLabel = "Sensor #" + QVariant(selectedCCDIndex).toString();
+			ccdsensorLabel.append(" : ").append(ccd->name());
 		}
 	}
-	if (ccdSensorLabel != QString("")) {
-		painter.drawText(xPosition, yPosition, ccdSensorLabel);
+	if (ccdsensorLabel != QString("")) {
+		painter.drawText(xPosition, yPosition, ccdsensorLabel);
 		yPosition-=lineHeight;
 		painter.drawText(xPosition, yPosition, ccdInfoLabel);
 		yPosition-=lineHeight;
@@ -882,42 +858,41 @@
 
 	// The Ocular
 	QString ocularNumberLabel = "Ocular #" + QVariant(selectedOcularIndex).toString();
-	if (ocular->getName() != QString(""))  {
-		ocularNumberLabel.append(" : ").append(ocular->getName());
+	if (ocular->name() != QString(""))  {
+		ocularNumberLabel.append(" : ").append(ocular->name());
 	}
 	painter.drawText(xPosition, yPosition, ocularNumberLabel);
 	yPosition-=lineHeight;
 
-	QString ocularFLLabel = "Ocular FL: " + QVariant(ocular->getEffectiveFocalLength()).toString() + QChar(0x00B0);
+	QString ocularFLLabel = "Ocular FL: " + QVariant(ocular->effectiveFocalLength()).toString() + QChar(0x00B0);
 	painter.drawText(xPosition, yPosition, ocularFLLabel);
 	yPosition-=lineHeight;
 
-	QString ocularFOVLabel = "Ocular aFOV: " + QVariant(ocular->getAppearentFOV()).toString() + QChar(0x00B0);
+	QString ocularFOVLabel = "Ocular aFOV: " + QVariant(ocular->appearentFOV()).toString() + QChar(0x00B0);
 	painter.drawText(xPosition, yPosition, ocularFOVLabel);
 	yPosition-=lineHeight;
 
 	// The telescope
 	QString telescopeNumberLabel = "Telescope #" + QVariant(selectedTelescopeIndex).toString();
-	if (telescope->getName() != QString(""))  {
-		telescopeNumberLabel.append(" : ").append(telescope->getName());
+	if (telescope->name() != QString(""))  {
+		telescopeNumberLabel.append(" : ").append(telescope->name());
 	}
 	painter.drawText(xPosition, yPosition, telescopeNumberLabel);
 	yPosition-=lineHeight;
 
 	// General info
-	QString magnificationLabel = "Magnification: " + QVariant(((int)(ocular->getMagnification(telescope) * 10.0)) / 10.0).toString() + "x";
+	QString magnificationLabel = "Magnification: " + QVariant(((int)(ocular->magnification(telescope) * 10.0)) / 10.0).toString() + "x";
 	painter.drawText(xPosition, yPosition, magnificationLabel);
 	yPosition-=lineHeight;
 
-	QString fovLabel = "FOV: " + QVariant(((int)(ocular->getActualFOV(telescope) * 10000.00)) / 10000.0).toString() + QChar(0x00B0);
+	QString fovLabel = "FOV: " + QVariant(((int)(ocular->actualFOV(telescope) * 10000.00)) / 10000.0).toString() + QChar(0x00B0);
 	painter.drawText(xPosition, yPosition, fovLabel);
 }
 
-void Oculars::validateIniFile()
+void Oculars::validateAndLoadIniFile()
 {
 	// Insure the module directory exists
 	StelFileMgr::makeSureDirExistsAndIsWritable(StelFileMgr::getUserDir()+"/modules/Oculars");
-
 	StelFileMgr::Flags flags = (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable);
 	QString ocularIniPath = StelFileMgr::findFile("modules/Oculars/", flags) + "ocular.ini";
 
@@ -925,7 +900,8 @@
 	if(!QFileInfo(ocularIniPath).exists()) {
 		QFile src(":/ocular/default_ocular.ini");
 		if (!src.copy(ocularIniPath)) {
-			qWarning() << "Oculars::validateIniFile cannot copy default_ocular.ini resource to [non-existing] " + ocularIniPath;
+			qWarning() << "Oculars::validateIniFile cannot copy default_ocular.ini resource to [non-existing] "
+					+ ocularIniPath;
 		} else {
 			qDebug() << "Oculars::validateIniFile copied default_ocular.ini to " << ocularIniPath;
 			// The resource is read only, and the new file inherits this, so set write-able.
@@ -948,12 +924,15 @@
 			// Rename the old one, and copy over a new one
 			QFile oldFile(ocularIniPath);
 			if (!oldFile.rename(ocularIniPath + ".old")) {
-				qWarning() << "Oculars::validateIniFile cannot move ocular.ini resource to ocular.ini.old at path  " + ocularIniPath;
+				qWarning() << "Oculars::validateIniFile cannot move ocular.ini resource to ocular.ini.old at path  "
+						+ ocularIniPath;
 			} else {
-				qWarning() << "Oculars::validateIniFile ocular.ini resource renamed to ocular.ini.old at path  " + ocularIniPath;
+				qWarning() << "Oculars::validateIniFile ocular.ini resource renamed to ocular.ini.old at path  "
+						+ ocularIniPath;
 				QFile src(":/ocular/default_ocular.ini");
 				if (!src.copy(ocularIniPath)) {
-					qWarning() << "Oculars::validateIniFile cannot copy default_ocular.ini resource to [non-existing] " + ocularIniPath;
+					qWarning() << "Oculars::validateIniFile cannot copy default_ocular.ini resource to [non-existing] "
+							+ ocularIniPath;
 				} else {
 					qDebug() << "Oculars::validateIniFile copied default_ocular.ini to " << ocularIniPath;
 					// The resource is read only, and the new file inherits this...  make sure the new file
@@ -964,6 +943,12 @@
 			}
 		}
 	}
+	settings = new QSettings(ocularIniPath, QSettings::IniFormat, this);
+}
+
+QSettings* Oculars::appSettings()
+{
+	return settings;
 }
 
 void Oculars::unzoomOcular()
@@ -1045,10 +1030,10 @@
 	core->setFlipHorz(telescope->isHFlipped());
 	core->setFlipVert(telescope->isVFlipped());
 
-	double actualFOV = ocular->getActualFOV(telescope);
+	double actualFOV = ocular->actualFOV(telescope);
 	// See if the mask was scaled; if so, correct the actualFOV.
-	if (useMaxEyepieceAngle && ocular->getAppearentFOV() > 0.0) {
-		actualFOV = maxEyepieceAngle * actualFOV / ocular->getAppearentFOV();
+	if (useMaxEyepieceAngle && ocular->appearentFOV() > 0.0) {
+		actualFOV = maxEyepieceAngle * actualFOV / ocular->appearentFOV();
 	}
 	movementManager->zoomTo(actualFOV, 0.0);
 }

=== modified file 'plugins/Oculars/src/Oculars.hpp'
--- plugins/Oculars/src/Oculars.hpp	2010-07-12 01:49:07 +0000
+++ plugins/Oculars/src/Oculars.hpp	2010-10-23 15:46:40 +0000
@@ -27,15 +27,15 @@
 #include "Telescope.hpp"
 
 #include <QFont>
+#include <QSettings>
 
 #define MIN_OCULARS_INI_VERSION 0.12
 
 QT_BEGIN_NAMESPACE
-class QSqlTableModel;
 class QKeyEvent;
 class QMouseEvent;
 class QPixmap;
-class QSqlQuery;
+class QSettings;
 QT_END_NAMESPACE
 
 class StelButton;
@@ -48,6 +48,7 @@
 public:
 	Oculars();
 	virtual ~Oculars();
+	static QSettings* appSettings();
 
 	///////////////////////////////////////////////////////////////////////////
 	// Methods defined in the StelModule class
@@ -89,9 +90,6 @@
 	//! Signifies a change in ocular or telescope.  Sets new zoom level.
 	void instrumentChanged();
 	void determineMaxEyepieceAngle();
-	void loadCCDs();
-	void loadOculars();
-	void loadTelescopes();
 	void setScaleImageCircle(bool state);
 
 private:
@@ -101,10 +99,6 @@
 	//! Renders the three Telrad circles, but only if not in ocular mode.
 	void drawTelrad();
 
-	//! Insures that each required table exists in the database, as well as instantiate the table models.
-	//! @return true if the DB was correctly initialized, false if it was not.
-	bool initializeDB();
-	
 	//! Set up the Qt actions needed to activate the plugin.
 	void initializeActivationActions();
 	
@@ -116,8 +110,6 @@
 	//! while flagShowOculars == true.
 	void interceptMovementKey(class QKeyEvent* event);
 
-	void loadDatabaseObjects();
-
 	//! Paint the mask into the viewport.
 	void paintMask();
 	
@@ -133,7 +125,8 @@
 	//! ends.  However, if one does exist, it opens it, and looks for the oculars_version key.  The value (or even
 	//! presence) is used to determine if the ini file is usable.  If not, it is renamed, and a new one copied over.
 	//! It does not ty to cope values over.
-	void validateIniFile();
+	//! Once there is a valid ini file, it is loaded into the settings attribute.
+	void validateAndLoadIniFile();
 
 	//! Recordd the state of the GridLinesMgr views beforehand, so that it can be reset afterwords.
 	//! @param rezoom if true, this zoom operation is starting from an already zoomed state.
@@ -144,7 +137,7 @@
 	void zoomOcular();
 
 	//! A list of all the oculars defined in the ini file.  Must have at least one, or module will not run.
-	QList<CCD *> CCDs;
+	QList<CCD *> ccds;
 	QList<Ocular *> oculars;
 	QList<Telescope *> telescopes;
 	int selectedCCDIndex;
@@ -179,10 +172,6 @@
 	bool ready; //!< A flag that determines that this module is usable.  If false, we won't open.
 	bool newInstrument; //!< true the first time draw is called for a new ocular or telescope, false otherwise.
 
-	QSqlTableModel *CCDsTableModel;
-	QSqlTableModel *ocularsTableModel;
-	QSqlTableModel *telescopesTableModel;
-
 	//Styles
 	QByteArray normalStyleSheet;
 	QByteArray nightStyleSheet;

=== modified file 'plugins/Oculars/src/Telescope.cpp'
--- plugins/Oculars/src/Telescope.cpp	2010-01-22 20:35:39 +0000
+++ plugins/Oculars/src/Telescope.cpp	2010-10-23 15:46:40 +0000
@@ -21,52 +21,122 @@
 #include <QDebug>
 #include <QSettings>
 
-Telescope::Telescope(QSqlRecord record)
-{
-	telescopeID = record.value("id").toInt();
-	name = record.value("name").toString();
-	focalLength = record.value("focalLength").toDouble();
-	diameter = record.value("diameter").toDouble();
-	hFlipped = record.value("hFlip").toBool();
-	vFlipped = record.value("vFlip").toBool();
+Telescope::Telescope()
+{
+}
+
+Telescope::Telescope(const QObject& other)
+{
+	Q_ASSERT(other);
+	Q_ASSERT(other->metaObject()->className() == "Telescope");
+	this->m_diameter = other.property("diameter").toDouble();
+	this->m_focalLength = other.property("focalLength").toDouble();
+	this->m_hFlipped = other.property("hFlipped").toBool();
+	this->m_vFlipped = other.property("vFlipped").toBool();
+	this->m_name = other.property("name").toString();
 }
 
 Telescope::~Telescope()
 {
 }
 
+static QMap<int, QString> mapping;
+QMap<int, QString> Telescope::propertyMap()
+{
+	if(mapping.isEmpty()) {
+		mapping = QMap<int, QString>();
+		mapping[0] = "name";
+		mapping[1] = "diameter";
+		mapping[2] = "focalLength";
+		mapping[3] = "hFlipped";
+		mapping[4] = "vFlipped";
+	}
+	return mapping;
+}
+
 /* ********************************************************************* */
 #if 0
 #pragma mark -
 #pragma mark Accessors & Mutators
 #endif
 /* ********************************************************************* */
-const QString Telescope::getName()
-{
-	return name;
-}
-
-double Telescope::getFocalLength()
-{
-	return focalLength;
-}
-
-int Telescope::getTelescopeID()
-{
-	return telescopeID;
-}
-
-double Telescope::getDiameter()
-{
-	return diameter;
-}
-
-bool Telescope::isHFlipped()
-{
-	return hFlipped;
-}
-
-bool Telescope::isVFlipped()
-{
-	return vFlipped;
+const QString Telescope::name() const
+{
+	return m_name;
+}
+
+void Telescope::setName(QString theValue)
+{
+	m_name = theValue;
+}
+
+double Telescope::focalLength() const
+{
+	return m_focalLength;
+}
+
+void Telescope::setFocalLength(double theValue)
+{
+	m_focalLength = theValue;
+}
+
+double Telescope::diameter() const
+{
+	return m_diameter;
+}
+
+void Telescope::setDiameter(double theValue)
+{
+	m_diameter = theValue;
+}
+
+bool Telescope::isHFlipped() const
+{
+	return m_hFlipped;
+}
+
+void Telescope::setHFlipped(bool flipped)
+{
+	m_hFlipped = flipped;
+}
+
+bool Telescope::isVFlipped() const
+{
+	return m_vFlipped;
+}
+
+void Telescope::setVFlipped(bool flipped)
+{
+	m_vFlipped = flipped;
+}
+
+/* ********************************************************************* */
+#if 0
+#pragma mark -
+#pragma mark Static Methods
+#endif
+/* ********************************************************************* */
+
+Telescope* Telescope::telescopeFromSettings(QSettings* theSettings, int telescopeIndex)
+{
+	Telescope* telescope = new Telescope();
+	QString prefix = "telescope/" + QVariant(telescopeIndex).toString() + "/";
+	
+	telescope->setName(theSettings->value(prefix + "name", "").toString());
+	telescope->setFocalLength(theSettings->value(prefix + "focalLength", "0").toDouble());
+	telescope->setDiameter(theSettings->value(prefix + "diameter", "0").toDouble());
+	telescope->setHFlipped(theSettings->value(prefix + "hFlip").toBool());
+	telescope->setVFlipped(theSettings->value(prefix + "vFlip").toBool());
+	
+	return telescope;
+}
+Telescope* Telescope::telescopeModel()
+{
+	Telescope* model = new Telescope();
+	model->setName("My Telescope");
+	model->setDiameter(80);
+	model->setFocalLength(500);
+	model->setHFlipped(true);
+	model->setVFlipped(true);
+	return model;
 }

=== modified file 'plugins/Oculars/src/Telescope.hpp'
--- plugins/Oculars/src/Telescope.hpp	2010-04-28 16:30:31 +0000
+++ plugins/Oculars/src/Telescope.hpp	2010-10-23 15:46:40 +0000
@@ -21,26 +21,40 @@
 
 #include <QObject>
 #include <QString>
-#include <QSqlRecord>
+#include <QSettings>
 
 class Telescope : public QObject
 {
 	Q_OBJECT
+	Q_PROPERTY(QString name READ name WRITE setName)
+	Q_PROPERTY(double diameter READ diameter WRITE setDiameter)
+	Q_PROPERTY(double focalLength READ focalLength WRITE setFocalLength)
+	Q_PROPERTY(bool hFlipped READ isHFlipped WRITE setHFlipped)
+	Q_PROPERTY(bool vFlipped READ isVFlipped WRITE setVFlipped)
 public:
-	Telescope(QSqlRecord record);
+	Telescope();
+	Q_INVOKABLE Telescope(const QObject& other);
 	virtual ~Telescope();
-	double getDiameter();
-	double getFocalLength();
-	int getTelescopeID();
-	const QString getName();
-	bool isHFlipped();
-	bool isVFlipped();
+	static Telescope* telescopeFromSettings(QSettings* theSettings, int telescopeIndex);
+	static Telescope* telescopeModel();
+
+	double diameter() const;
+	void setDiameter(double theValue);
+	double focalLength() const;
+	void setFocalLength(double theValue);
+	const QString name() const;
+	void setName(QString theValue);
+	bool isHFlipped() const;
+	void setHFlipped(bool flipped);
+	bool isVFlipped() const;
+	void setVFlipped(bool flipped);
+	QMap<int, QString> propertyMap();
 private:
-	int telescopeID;
-	QString name;
-	double diameter;
-	double focalLength;
-	bool hFlipped;
-	bool vFlipped;
+	QString m_name;
+	double m_diameter;
+	double m_focalLength;
+	bool m_hFlipped;
+	bool m_vFlipped;
 };
+
 #endif /*TELESCOPE_HPP_*/

=== modified file 'plugins/Oculars/src/gui/OcularDialog.cpp'
--- plugins/Oculars/src/gui/OcularDialog.cpp	2010-10-08 13:15:36 +0000
+++ plugins/Oculars/src/gui/OcularDialog.cpp	2010-10-23 15:46:40 +0000
@@ -16,7 +16,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include "Ocular.hpp"
 #include "Oculars.hpp"
 #include "OcularDialog.hpp"
 #include "ui_ocularDialog.h"
@@ -28,25 +27,33 @@
 #include "StelMainGraphicsView.hpp"
 #include "StelTranslator.hpp"
 
+#include <QAbstractItemModel>
 #include <QDataWidgetMapper>
 #include <QDebug>
 #include <QFrame>
 #include <QModelIndex>
 #include <QSettings>
-#include <QSqlError>
-#include <QSqlField>
-#include <QSqlDatabase>
-#include <QSqlRecord>
-#include <QSqlTableModel>
+#include <QStandardItemModel>
 #include <limits>
 
-OcularDialog::OcularDialog(QSqlTableModel *CCDsTableModel, QSqlTableModel *ocularsTableModel, QSqlTableModel *telescopesTableModel)
+OcularDialog::OcularDialog(QList<CCD *>* ccds, QList<Ocular *>* oculars, QList<Telescope *>* telescopes)
 {
 	ui = new Ui_ocularDialogForm;
-	this->CCDsTableModel = CCDsTableModel;
-	this->ocularsTableModel = ocularsTableModel;
-	this->telescopesTableModel = telescopesTableModel;
-
+	this->ccds = ccds;
+	ccdTableModel = new PropertyBasedTableModel(this);
+	ccdTableModel->init(reinterpret_cast<QList<QObject *>* >(ccds),
+							  CCD::ccdModel(),
+							  CCD::ccdModel()->propertyMap());
+	this->oculars = oculars;
+	ocularTableModel = new PropertyBasedTableModel(this);
+	ocularTableModel->init(reinterpret_cast<QList<QObject *>* >(oculars),
+								  Ocular::ocularModel(), Ocular::ocularModel()->propertyMap());
+	this->telescopes = telescopes;
+	telescopeTableModel = new PropertyBasedTableModel(this);
+	telescopeTableModel->init(reinterpret_cast<QList<QObject *>* >(telescopes),
+									  Telescope::telescopeModel(),
+									  Telescope::telescopeModel()->propertyMap());
+	
 	validatorPositiveInt = new QIntValidator(0, std::numeric_limits<int>::max(), this);
 	validatorPositiveDouble = new QDoubleValidator(.0, std::numeric_limits<double>::max(), 24, this);
 	validatorOcularAFOV = new QIntValidator(35, 120, this);
@@ -69,15 +76,15 @@
 		ui->ocularName->setValidator(0);
 		ui->telescopeName->setValidator(0);
 		ui->ocularName->setValidator(0);
-		ui->CCDName->setValidator(0);
-		ui->CCDResX->setValidator(0);
-		ui->CCDResY->setValidator(0);
-		ui->CCDChipX->setValidator(0);
-		ui->CCDChipY->setValidator(0);
-		ui->CCDPixelX->setValidator(0);
-		ui->CCDPixelX->setValidator(0);
-		delete CCDMapper;
-		CCDMapper = NULL;
+		ui->ccdName->setValidator(0);
+		ui->ccdResX->setValidator(0);
+		ui->ccdResY->setValidator(0);
+		ui->ccdChipX->setValidator(0);
+		ui->ccdChipY->setValidator(0);
+		ui->ccdPixelX->setValidator(0);
+		ui->ccdPixelX->setValidator(0);
+		delete ccdMapper;
+		ccdMapper = NULL;
 		delete ocularMapper;
 		ocularMapper = NULL;
 		delete telescopeMapper;
@@ -144,154 +151,39 @@
 
 void OcularDialog::deleteSelectedCCD()
 {
-	QModelIndex selection = ui->ccdListView->currentIndex();
-	if (selection.row() != -1 && CCDsTableModel->rowCount() > 1) {
-		CCDsTableModel->removeRows(selection.row(), 1);
-		ui->ccdListView->setCurrentIndex(CCDsTableModel->index(0, 1));
-	}
+	ccdTableModel->removeRows(ui->ccdListView->currentIndex().row(), 1);
+	ui->ccdListView->setCurrentIndex(ccdTableModel->index(0, 1));
 }
 
 
 void OcularDialog::deleteSelectedOcular()
 {
-	QModelIndex selection = ui->ocularListView->currentIndex();
-	if (selection.row() != -1 && ocularsTableModel->rowCount() > 1) {
-		ocularsTableModel->removeRows(selection.row(), 1);
-		ui->ocularListView->setCurrentIndex(ocularsTableModel->index(0, 1));
-	}
+	ocularTableModel->removeRows(ui->ocularListView->currentIndex().row(), 1);
+	ui->ocularListView->setCurrentIndex(ocularTableModel->index(0, 1));
 }
 
 void OcularDialog::deleteSelectedTelescope()
 {
-	QModelIndex selection = ui->telescopeListView->currentIndex();
-	if (selection.row() != -1 && telescopesTableModel->rowCount() > 1) {
-		telescopesTableModel->removeRows(selection.row(), 1);
-		ui->telescopeListView->setCurrentIndex(telescopesTableModel->index(0, 1));
-	}
+	telescopeTableModel->removeRows(ui->telescopeListView->currentIndex().row(), 1);
+	ui->telescopeListView->setCurrentIndex(telescopeTableModel->index(0, 1));
 }
 
 void OcularDialog::insertNewCCD()
 {
-	QSqlField field1("name", QVariant::String);
-	QSqlField field2("resolution_x", QVariant::Int);
-	QSqlField field3("resolution_y", QVariant::Int);
-	QSqlField field4("chip_width", QVariant::Double);
-	QSqlField field5("chip_height", QVariant::Double);
-	QSqlField field6("pixel_width", QVariant::Double);
-	QSqlField field7("pixel_height", QVariant::Double);
-	field1.setValue(QVariant("New Sensor"));
-	field2.setValue(QVariant(4096));
-	field3.setValue(QVariant(4096));
-	field4.setValue(QVariant(36.8));
-	field5.setValue(QVariant(36.8));
-	field6.setValue(QVariant(9));
-	field7.setValue(QVariant(9));
-	QSqlRecord newRecord = QSqlRecord();
-	newRecord.append(field1);
-	newRecord.append(field2);
-	newRecord.append(field3);
-	newRecord.append(field4);
-	newRecord.append(field5);
-	newRecord.append(field6);
-	newRecord.append(field7);
-
-	if (CCDsTableModel->insertRecord(-1, newRecord)) {
-		ui->ccdListView->setCurrentIndex(CCDsTableModel->index(CCDsTableModel->rowCount() - 1, 1));
-	} else {
-		qWarning() << "Oculars: could not insert new sensor.  The error is: " << CCDsTableModel->lastError();
-	}
+	ccdTableModel->insertRows(ccdTableModel->rowCount(), 1);
+	ui->ccdListView->setCurrentIndex(ccdTableModel->index(ccdTableModel->rowCount() - 1, 1));
 }
 
 void OcularDialog::insertNewOcular()
 {
-	QSqlField field1("name", QVariant::String);
-	QSqlField field2("afov", QVariant::Double);
-	QSqlField field3("efl", QVariant::Double);
-	QSqlField field4("fieldStop", QVariant::Double);
-	field1.setValue(QVariant("New Ocular"));
-	field2.setValue(QVariant(82));
-	field3.setValue(QVariant(32));
-	field4.setValue(QVariant(0));
-	QSqlRecord newRecord = QSqlRecord();
-	newRecord.append(field1);
-	newRecord.append(field2);
-	newRecord.append(field3);
-	newRecord.append(field4);
-
-	if (ocularsTableModel->insertRecord(-1, newRecord)) {
-		ui->ocularListView->setCurrentIndex(ocularsTableModel->index(ocularsTableModel->rowCount() - 1, 1));
-	} else {
-		qWarning() << "Oculars: could not insert new ocular.  The error is: " << ocularsTableModel->lastError();
-	}
+	ocularTableModel->insertRows(ocularTableModel->rowCount(), 1);
+	ui->ocularListView->setCurrentIndex(ocularTableModel->index(ocularTableModel->rowCount() - 1, 1));
 }
 
 void OcularDialog::insertNewTelescope()
 {
-	QSqlField field1("name", QVariant::String);
-	QSqlField field2("focalLength", QVariant::Double);
-	QSqlField field3("diameter", QVariant::Double);
-	QSqlField field4("vFlip", QVariant::String);
-	QSqlField field5("hFlip", QVariant::String);
-	field1.setValue(QVariant("New Telescope"));
-	field2.setValue(QVariant(500));
-	field3.setValue(QVariant(80));
-	field4.setValue(QVariant("false"));
-	field5.setValue(QVariant("false"));
-	QSqlRecord newRecord = QSqlRecord();
-	newRecord.append(field1);
-	newRecord.append(field2);
-	newRecord.append(field3);
-	newRecord.append(field4);
-	newRecord.append(field5);
-
-	if (telescopesTableModel->insertRecord(-1, newRecord)) {
-		ui->telescopeListView->setCurrentIndex(telescopesTableModel->index(telescopesTableModel->rowCount() - 1, 1));
-	} else {
-		qWarning() << "Oculars: could not insert new telescope.  The error is: " << telescopesTableModel->lastError();
-	}
-}
-
-void OcularDialog::CCDSelected(const QModelIndex &)
-{
-}
-
-void OcularDialog::ocularSelected(const QModelIndex &)
-{
-}
-
-void OcularDialog::telescopeSelected(const QModelIndex &)
-{
-}
-
-void OcularDialog::updateCCD()
-{
-	int selectionIndex = ui->ccdListView->currentIndex().row();
-	if (CCDMapper->submit()) {
-		ui->ccdListView->setCurrentIndex(CCDsTableModel->index(selectionIndex, 1));
-	} else {
-		qWarning() << "Oculars: error saving modified sensor.  Error is: " << CCDsTableModel->lastError();
-	}
-}
-
-void OcularDialog::updateOcular()
-{
-	int selectionIndex = ui->ocularListView->currentIndex().row();
-	if (ocularMapper->submit()) {
-		ui->ocularListView->setCurrentIndex(ocularsTableModel->index(selectionIndex, 1));
-	} else {
-		qWarning() << "Oculars: error saving modified ocular.  Error is: " << ocularsTableModel->lastError();
-	}
-}
-
-void OcularDialog::updateTelescope()
-{
-	int selectionIndex = ui->telescopeListView->currentIndex().row();
-	if (telescopeMapper->submit()) {
-		ui->telescopeListView->setCurrentIndex(telescopesTableModel->index(selectionIndex, 1));
-	} else {
-		qWarning() << "Oculars: error saving modified telescope.  Error is: " << telescopesTableModel->lastError();
-	}
-
+	telescopeTableModel->insertRows(ccdTableModel->rowCount(), 1);
+	ui->telescopeListView->setCurrentIndex(telescopeTableModel->index(telescopeTableModel->rowCount() - 1, 1));
 }
 
 /* ********************************************************************* */
@@ -300,6 +192,56 @@
 #pragma mark Private Slot Methods
 #endif
 /* ********************************************************************* */
+void OcularDialog::keyBindingTextTogglePluginChanged(const QString& newString)
+{
+	Oculars::appSettings()->setValue("bindings/toggle_oculars", newString);
+}
+
+void OcularDialog::keyBindingTextTogglePluginConfigChanged(const QString& newString)
+{
+	Oculars::appSettings()->setValue("bindings/toggle_config_dialog", newString);
+}
+
+void OcularDialog::keyBindingTextToggleCrosshairChanged(const QString& newString)
+{
+	Oculars::appSettings()->setValue("bindings/toggle_crosshair", newString);
+}
+
+void OcularDialog::keyBindingTextToggleTelradChanged(const QString& newString)
+{
+	Oculars::appSettings()->setValue("bindings/toggle_telrad", newString);
+}
+
+void OcularDialog::keyBindingTextNextCCDChanged(const QString& newString)
+{
+	Oculars::appSettings()->setValue("bindings/next_ccd", newString);
+}
+
+void OcularDialog::keyBindingTextNextOcularChanged(const QString& newString)
+{
+	Oculars::appSettings()->setValue("bindings/next_ocular", newString);
+}
+
+void OcularDialog::keyBindingTextNextTelescopeChanged(const QString& newString)
+{
+	Oculars::appSettings()->setValue("bindings/next_telescope", newString);
+}
+
+void OcularDialog::keyBindingTextPreviousCCDChanged(const QString& newString)
+{
+	Oculars::appSettings()->setValue("bindings/prev_ccd", newString);
+}
+
+void OcularDialog::keyBindingTextPreviousOcularChanged(const QString& newString)
+{
+	Oculars::appSettings()->setValue("bindings/prev_ocular", newString);
+}
+
+void OcularDialog::keyBindingTextPreviousTelescopeChanged(const QString& newString)
+{
+	Oculars::appSettings()->setValue("bindings/prev_telescope", newString);
+}
+					  
 void OcularDialog::scaleImageCircleStateChanged(int state)
 {
 	bool shouldScale = (state == Qt::Checked);
@@ -322,12 +264,12 @@
 void OcularDialog::createDialogContent()
 {
 	ui->setupUi(dialog);
-
+	ui->ccdListView->setModel(ccdTableModel);
+	ui->ocularListView->setModel(ocularTableModel);
+	ui->telescopeListView->setModel(telescopeTableModel);
+	
 	//Now the rest of the actions.
 	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
-	connect(ui->updateCCDButton, SIGNAL(clicked()), this, SLOT(updateCCD()));
-	connect(ui->updateOcularButton, SIGNAL(clicked()), this, SLOT(updateOcular()));
-	connect(ui->updateTelescopeButton, SIGNAL(clicked()), this, SLOT(updateTelescope()));
 	connect(ui->scaleImageCircleCheckBox, SIGNAL(stateChanged(int)), this, SLOT(scaleImageCircleStateChanged(int)));
 	// The add & delete buttons
 	connect(ui->addCCD, SIGNAL(clicked()), this, SLOT(insertNewCCD()));
@@ -337,27 +279,14 @@
 	connect(ui->addTelescope, SIGNAL(clicked()), this, SLOT(insertNewTelescope()));
 	connect(ui->deleteTelescope, SIGNAL(clicked()), this, SLOT(deleteSelectedTelescope()));
 
-	// Oculars model
-	ui->ccdListView->setModel(CCDsTableModel);
-	ui->ccdListView->setModelColumn(1);
-	connect(ui->ccdListView, SIGNAL(clicked(const QModelIndex &)), this, SLOT(CCDSelected(const QModelIndex &)));
-
-	ui->ocularListView->setModel(ocularsTableModel);
-	ui->ocularListView->setModelColumn(1);
-	connect(ui->ocularListView, SIGNAL(clicked(const QModelIndex &)), this, SLOT(ocularSelected(const QModelIndex &)));
-
-	ui->telescopeListView->setModel(telescopesTableModel);
-	ui->telescopeListView->setModelColumn(1);
-	connect(ui->telescopeListView, SIGNAL(clicked(const QModelIndex &)), this, SLOT(telescopeSelected(const QModelIndex &)));
-
 	// Validators
-	ui->CCDName->setValidator(validatorName);
-	ui->CCDResX->setValidator(validatorPositiveInt);
-	ui->CCDResY->setValidator(validatorPositiveInt);
-	ui->CCDChipX->setValidator(validatorPositiveDouble);
-	ui->CCDChipY->setValidator(validatorPositiveDouble);
-	ui->CCDPixelX->setValidator(validatorPositiveDouble);
-	ui->CCDPixelY->setValidator(validatorPositiveDouble);
+	ui->ccdName->setValidator(validatorName);
+	ui->ccdResX->setValidator(validatorPositiveInt);
+	ui->ccdResY->setValidator(validatorPositiveInt);
+	ui->ccdChipX->setValidator(validatorPositiveDouble);
+	ui->ccdChipY->setValidator(validatorPositiveDouble);
+	ui->ccdPixelX->setValidator(validatorPositiveDouble);
+	ui->ccdPixelY->setValidator(validatorPositiveDouble);
 	ui->ocularAFov->setValidator(validatorOcularAFOV);
 	ui->ocularFL->setValidator(validatorOcularEFL);
 	ui->ocularFieldStop->setValidator(validatorOcularEFL);
@@ -365,59 +294,84 @@
 	ui->telescopeDiameter->setValidator(validatorTelescopeDiameter);
 	ui->ocularName->setValidator(validatorName);
 	ui->telescopeName->setValidator(validatorName);
-
+	
+	// The key bindings
+	ui->togglePluginLineEdit->setText(Oculars::appSettings()->value("bindings/toggle_oculars").toString());
+	ui->toggleConfigWindowLineEdit->setText(Oculars::appSettings()->value("bindings/toggle_config_dialog").toString());
+	ui->toggleCrosshairLineEdit->setText(Oculars::appSettings()->value("bindings/toggle_crosshair").toString());
+	ui->toggleTelradLineEdit->setText(Oculars::appSettings()->value("bindings/toggle_telrad").toString());
+	ui->nextCCDLineEdit->setText(Oculars::appSettings()->value("bindings/next_ccd").toString());
+	ui->nextOcularLineEdit->setText(Oculars::appSettings()->value("bindings/next_ocular").toString());
+	ui->nextTelescopeLineEdit->setText(Oculars::appSettings()->value("bindings/next_telescope").toString());
+	ui->previousCCDLineEdit->setText(Oculars::appSettings()->value("bindings/prev_ccd").toString());
+	ui->previousOcularLineEdit->setText(Oculars::appSettings()->value("bindings/prev_ocular").toString());
+	ui->previousTelescopeLineEdit->setText(Oculars::appSettings()->value("bindings/prev_telescope").toString());
+	connect(ui->togglePluginLineEdit, SIGNAL(textEdited(const QString&)), 
+			this, SLOT(keyBindingTextTogglePluginChanged(const QString&)));
+	connect(ui->toggleConfigWindowLineEdit, SIGNAL(textEdited(const QString&)), 
+			this, SLOT(keyBindingTextTogglePluginConfigChanged(const QString&)));
+	connect(ui->toggleCrosshairLineEdit, SIGNAL(textEdited(const QString&)), 
+			this, SLOT(keyBindingTextToggleCrosshairChanged(const QString&)));
+	connect(ui->toggleTelradLineEdit, SIGNAL(textEdited(const QString&)), 
+			this, SLOT(keyBindingTextToggleTelradChanged(const QString&)));
+	connect(ui->nextCCDLineEdit, SIGNAL(textEdited(const QString&)), 
+			this, SLOT(keyBindingTextNextCCDChanged(const QString&)));
+	connect(ui->nextOcularLineEdit, SIGNAL(textEdited(const QString&)), 
+			this, SLOT(keyBindingTextNextOcularChanged(const QString&)));
+	connect(ui->nextTelescopeLineEdit, SIGNAL(textEdited(const QString&)), 
+			this, SLOT(keyBindingTextNextTelescopeChanged(const QString&)));
+	connect(ui->previousCCDLineEdit, SIGNAL(textEdited(const QString&)), 
+			this, SLOT(keyBindingTextPreviousCCDChanged(const QString&)));
+	connect(ui->previousOcularLineEdit, SIGNAL(textEdited(const QString&)), 
+			this, SLOT(keyBindingTextPreviousOcularChanged(const QString&)));
+	connect(ui->previousTelescopeLineEdit, SIGNAL(textEdited(const QString&)), 
+			this, SLOT(keyBindingTextPreviousTelescopeChanged(const QString&)));
+						  
 	// The CCD mapper
-	CCDMapper = new QDataWidgetMapper();
-	CCDMapper->setModel(CCDsTableModel);
-//	CCDMapper->setSubmitPolicy(QDataWidgetMapper::AutoSubmit);
-	CCDMapper->addMapping(ui->CCDID, CCDsTableModel->fieldIndex("id"), "text");
-	CCDMapper->addMapping(ui->CCDName, CCDsTableModel->fieldIndex("name"));
-	CCDMapper->addMapping(ui->CCDResX, CCDsTableModel->fieldIndex("resolution_x"));
-	CCDMapper->addMapping(ui->CCDResY, CCDsTableModel->fieldIndex("resolution_y"));
-	CCDMapper->addMapping(ui->CCDChipX, CCDsTableModel->fieldIndex("chip_width"));
-	CCDMapper->addMapping(ui->CCDChipY, CCDsTableModel->fieldIndex("chip_height"));
-	CCDMapper->addMapping(ui->CCDPixelX, CCDsTableModel->fieldIndex("pixel_width"));
-	CCDMapper->addMapping(ui->CCDPixelY, CCDsTableModel->fieldIndex("pixel_height"));
-	CCDMapper->toFirst();
+	ccdMapper = new QDataWidgetMapper();
+	ccdMapper->setModel(ccdTableModel);
+	ccdMapper->setSubmitPolicy(QDataWidgetMapper::AutoSubmit);
+	ccdMapper->addMapping(ui->ccdName, 0);
+	ccdMapper->addMapping(ui->ccdChipY, 1);
+	ccdMapper->addMapping(ui->ccdChipX, 2);
+	ccdMapper->addMapping(ui->ccdPixelY, 3);
+	ccdMapper->addMapping(ui->ccdPixelX, 4);
+	ccdMapper->addMapping(ui->ccdResX, 5);
+	ccdMapper->addMapping(ui->ccdResY, 6);
+	ccdMapper->toFirst();
 	connect(ui->ccdListView->selectionModel() , SIGNAL(currentRowChanged(QModelIndex, QModelIndex)),
-			CCDMapper, SLOT(setCurrentModelIndex(QModelIndex)));
-	ui->ccdListView->setCurrentIndex(CCDsTableModel->index(0, 1));
+			ccdMapper, SLOT(setCurrentModelIndex(QModelIndex)));
+	ui->ccdListView->setCurrentIndex(ccdTableModel->index(0, 1));
 
 	// The ocular mapper
 	ocularMapper = new QDataWidgetMapper();
-	ocularMapper->setModel(ocularsTableModel);
-//	ocularMapper->setSubmitPolicy(QDataWidgetMapper::AutoSubmit);
-	ocularMapper->addMapping(ui->ocularID, ocularsTableModel->fieldIndex("id"), "text");
-	ocularMapper->addMapping(ui->ocularName, ocularsTableModel->fieldIndex("name"));
-	ocularMapper->addMapping(ui->ocularAFov, ocularsTableModel->fieldIndex("afov"));
-	ocularMapper->addMapping(ui->ocularFL, ocularsTableModel->fieldIndex("efl"));
-	ocularMapper->addMapping(ui->ocularFieldStop, ocularsTableModel->fieldIndex("fieldStop"));
+	ocularMapper->setModel(ocularTableModel);
+	ocularMapper->setSubmitPolicy(QDataWidgetMapper::AutoSubmit);
+	ocularMapper->addMapping(ui->ocularName, 0);
+	ocularMapper->addMapping(ui->ocularAFov, 1);
+	ocularMapper->addMapping(ui->ocularFL, 2);
+	ocularMapper->addMapping(ui->ocularFieldStop, 3);
 	ocularMapper->toFirst();
 	connect(ui->ocularListView->selectionModel() , SIGNAL(currentRowChanged(QModelIndex, QModelIndex)),
-			ocularMapper, SLOT(setCurrentModelIndex(QModelIndex)));
-	ui->ocularListView->setCurrentIndex(ocularsTableModel->index(0, 1));
+			  ocularMapper, SLOT(setCurrentModelIndex(QModelIndex)));
+	ui->ocularListView->setCurrentIndex(ocularTableModel->index(0, 1));
 
 	// The telescope mapper
 	telescopeMapper = new QDataWidgetMapper();
-	telescopeMapper->setModel(telescopesTableModel);
-//	telescopeMapper->setSubmitPolicy(QDataWidgetMapper::AutoSubmit);
-	telescopeMapper->addMapping(ui->telescopeID, telescopesTableModel->fieldIndex("id"), "text");
-	telescopeMapper->addMapping(ui->telescopeName, telescopesTableModel->fieldIndex("name"));
-	telescopeMapper->addMapping(ui->telescopeDiameter, telescopesTableModel->fieldIndex("diameter"));
-	telescopeMapper->addMapping(ui->telescopeFL, telescopesTableModel->fieldIndex("focalLength"));
-	telescopeMapper->addMapping(ui->telescopeVFlip, telescopesTableModel->fieldIndex("vFlip"), "checked");
-	telescopeMapper->addMapping(ui->telescopeHFlip, telescopesTableModel->fieldIndex("hFlip"), "checked");
+	telescopeMapper->setModel(telescopeTableModel);
+	telescopeMapper->setSubmitPolicy(QDataWidgetMapper::AutoSubmit);
+	telescopeMapper->addMapping(ui->telescopeName, 0);
+	telescopeMapper->addMapping(ui->telescopeDiameter, 1);
+	telescopeMapper->addMapping(ui->telescopeFL, 2);
+	telescopeMapper->addMapping(ui->telescopeHFlip, 3, "checked");
+	telescopeMapper->addMapping(ui->telescopeVFlip, 4, "checked");
 	ocularMapper->toFirst();
 	connect(ui->telescopeListView->selectionModel() , SIGNAL(currentRowChanged(QModelIndex, QModelIndex)),
 			telescopeMapper, SLOT(setCurrentModelIndex(QModelIndex)));
-	ui->telescopeListView->setCurrentIndex(telescopesTableModel->index(0, 1));
+	ui->telescopeListView->setCurrentIndex(telescopeTableModel->index(0, 1));
 
 	// set the initial state
-	StelFileMgr::Flags flags = (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable);
-	QString ocularIniPath = StelFileMgr::findFile("modules/Oculars/", flags) + "ocular.ini";
-	QSettings settings(ocularIniPath, QSettings::IniFormat);
-	bool useMaxImageCircle = settings.value("use_max_exit_circle", false).toBool();
-	if (useMaxImageCircle) {
+	if (Oculars::appSettings()->value("use_max_exit_circle", false).toBool()) {
 		ui->scaleImageCircleCheckBox->setCheckState(Qt::Checked);
 	}
 

=== modified file 'plugins/Oculars/src/gui/OcularDialog.hpp'
--- plugins/Oculars/src/gui/OcularDialog.hpp	2010-06-08 18:22:16 +0000
+++ plugins/Oculars/src/gui/OcularDialog.hpp	2010-10-23 15:46:40 +0000
@@ -20,11 +20,12 @@
 #define _OCULARDIALOG_HPP_
 
 #include <QObject>
+#include "CCD.hpp"
+#include "Ocular.hpp"
+#include "PropertyBasedTableModel.hpp"
 #include "StelDialogOculars.hpp"
-#include "Ocular.hpp"
 #include "StelStyle.hpp"
-
-#include <QSqlRecord>
+#include "Telescope.hpp"
 
 class Ui_ocularDialogForm;
 
@@ -34,8 +35,7 @@
 class QIntValidator;
 class QRegExpValidator;
 class QModelIndex;
-class QSqlRecord;
-class QSqlTableModel;
+class QStandardItemModel;
 QT_END_NAMESPACE
 
 
@@ -44,7 +44,7 @@
 	Q_OBJECT
 
 public:
-	OcularDialog(QSqlTableModel *CCDsTableModel, QSqlTableModel *ocularsTableModel, QSqlTableModel *telescopesTableModel);
+	OcularDialog(QList<CCD *>* ccds, QList<Ocular *>* oculars, QList<Telescope *>* telescopes);
 	virtual ~OcularDialog();
 	void languageChanged();
 	//! Notify that the application style changed
@@ -60,37 +60,45 @@
 	void insertNewCCD();
 	void insertNewOcular();
 	void insertNewTelescope();
-	void CCDSelected(const QModelIndex &index);
-	void ocularSelected(const QModelIndex &index);
-	void telescopeSelected(const QModelIndex &index);
-	void updateCCD();
-	void updateOcular();
-	void updateTelescope();
 
 signals:
 	void scaleImageCircleChanged(bool state);
+	
 protected:
 	//! Initialize the dialog widgets and connect the signals/slots
 	virtual void createDialogContent();
 	Ui_ocularDialogForm* ui;
 
 private slots:
+	void keyBindingTextTogglePluginChanged(const QString& newString);
+	void keyBindingTextTogglePluginConfigChanged(const QString& newString);
+	void keyBindingTextToggleCrosshairChanged(const QString& newString);
+	void keyBindingTextToggleTelradChanged(const QString& newString);
+	void keyBindingTextNextCCDChanged(const QString& newString);
+	void keyBindingTextNextOcularChanged(const QString& newString);
+	void keyBindingTextNextTelescopeChanged(const QString& newString);
+	void keyBindingTextPreviousCCDChanged(const QString& newString);
+	void keyBindingTextPreviousOcularChanged(const QString& newString);
+	void keyBindingTextPreviousTelescopeChanged(const QString& newString);
 	void scaleImageCircleStateChanged(int state);
 
 private:
-	QDataWidgetMapper *CCDMapper;
-	QSqlTableModel *CCDsTableModel;
-	QDataWidgetMapper *ocularMapper;
-	QSqlTableModel *ocularsTableModel;
-	QDataWidgetMapper *telescopeMapper;
-	QSqlTableModel *telescopesTableModel;
-	QIntValidator *validatorOcularAFOV;
-	QDoubleValidator *validatorOcularEFL;
-	QDoubleValidator *validatorTelescopeDiameter;
-	QDoubleValidator *validatorTelescopeFL;
-	QRegExpValidator *validatorName;
-	QIntValidator *validatorPositiveInt;
-	QDoubleValidator *validatorPositiveDouble;
+	QDataWidgetMapper*			ccdMapper;
+	QList<CCD *>*					ccds;
+	PropertyBasedTableModel*	ccdTableModel;
+	QDataWidgetMapper*			ocularMapper;
+	QList<Ocular *>*				oculars;
+	PropertyBasedTableModel*	ocularTableModel;
+	QDataWidgetMapper*			telescopeMapper;
+	QList<Telescope *>*			telescopes;
+	PropertyBasedTableModel*	telescopeTableModel;
+	QIntValidator*					validatorOcularAFOV;
+	QDoubleValidator*				validatorOcularEFL;
+	QDoubleValidator*				validatorTelescopeDiameter;
+	QDoubleValidator*				validatorTelescopeFL;
+	QRegExpValidator*				validatorName;
+	QIntValidator*					validatorPositiveInt;
+	QDoubleValidator*				validatorPositiveDouble;
 };
 
 #endif // _OCULARDIALOG_HPP_

=== added file 'plugins/Oculars/src/gui/PropertyBasedTableModel.cpp'
--- plugins/Oculars/src/gui/PropertyBasedTableModel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Oculars/src/gui/PropertyBasedTableModel.cpp	2010-10-23 15:46:40 +0000
@@ -0,0 +1,109 @@
+#include "PropertyBasedTableModel.hpp"
+#include <QDebug>
+
+PropertyBasedTableModel::PropertyBasedTableModel(QObject *parent)
+	: QAbstractTableModel(parent)
+{
+}
+
+
+PropertyBasedTableModel::~PropertyBasedTableModel()
+{
+	delete modelObject;
+	modelObject = NULL;
+}
+
+void PropertyBasedTableModel::init(QList<QObject *>* content, QObject *model, QMap<int,QString> mappings)
+{
+	beginResetModel();
+	this->content = content;
+	this->modelObject = model;
+	this->mappings = mappings;
+	endResetModel();
+}
+
+/* ********************************************************************* */
+#if 0
+#pragma mark -
+#pragma mark Model Methods
+#endif
+/* ********************************************************************* */
+
+int PropertyBasedTableModel::rowCount(const QModelIndex &parent) const
+{
+	Q_UNUSED(parent);
+	return content->size();
+}
+
+int PropertyBasedTableModel::columnCount(const QModelIndex &parent) const
+{
+	Q_UNUSED(parent);
+	return mappings.size();
+}
+
+QVariant PropertyBasedTableModel::data(const QModelIndex &index, int role) const
+{
+	QVariant data;
+	if ((role == Qt::DisplayRole || role ==Qt::EditRole)
+		 && index.isValid()
+		 && index.row() < content->size()
+		 && index.row() >= 0
+		 && index.column() < mappings.size()
+		 && index.column() >= 0){
+			QObject *object = content->at(index.row());
+			data = object->property(mappings[index.column()].toStdString().c_str());
+  }
+	return data;
+}
+
+bool PropertyBasedTableModel::insertRows(int position, int rows, const QModelIndex &index)
+{
+	Q_UNUSED(index);
+	beginInsertRows(QModelIndex(), position, position+rows-1);
+
+	for (int row=0; row < rows; row++) {
+		QObject* newInstance = modelObject->metaObject()->newInstance(Q_ARG(QObject, *modelObject));
+		Q_ASSERT(newInstance != 0);
+		content->insert(position, newInstance);
+	}
+
+	endInsertRows();
+	return true;
+}
+
+bool PropertyBasedTableModel::removeRows(int position, int rows, const QModelIndex &index)
+{
+	Q_UNUSED(index);
+	beginRemoveRows(QModelIndex(), position, position+rows-1);
+
+	for (int row=0; row < rows; ++row) {
+		content->removeAt(position);
+	}
+
+	endRemoveRows();
+	return true;
+}
+
+bool PropertyBasedTableModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+	bool changeMade = false;
+	if (index.isValid() && role == Qt::EditRole && index.column() < mappings.size()) {
+		QObject* object = content->at(index.row());
+		object->setProperty(mappings[index.column()].toStdString().c_str(), value);
+		emit(dataChanged(index, index));
+
+		changeMade = true;
+	}
+
+	return changeMade;
+}
+
+Qt::ItemFlags PropertyBasedTableModel::flags(const QModelIndex &index) const
+{
+	if (!index.isValid()) {
+		return Qt::ItemIsEnabled;
+	}
+
+	return QAbstractTableModel::flags(index) | Qt::ItemIsEditable;
+}
+

=== added file 'plugins/Oculars/src/gui/PropertyBasedTableModel.hpp'
--- plugins/Oculars/src/gui/PropertyBasedTableModel.hpp	1970-01-01 00:00:00 +0000
+++ plugins/Oculars/src/gui/PropertyBasedTableModel.hpp	2010-10-23 15:46:40 +0000
@@ -0,0 +1,32 @@
+#ifndef PROPERTYBASEDTABLEMODEL_H
+#define PROPERTYBASEDTABLEMODEL_H
+
+#include <QAbstractTableModel>
+
+class PropertyBasedTableModel : public QAbstractTableModel
+{
+	Q_OBJECT
+public:
+	PropertyBasedTableModel(QObject *parent = 0);
+	virtual ~PropertyBasedTableModel();
+
+	void init(QList<QObject *>* content, QObject *model, QMap<int, QString> mappings);
+
+	//Over-rides from QAbstractTableModel
+	virtual QVariant data(const QModelIndex &item, int role = Qt::DisplayRole) const;
+
+	virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
+	virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
+
+	virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+	virtual bool insertRows(int position, int rows, const QModelIndex &index=QModelIndex());
+	virtual bool setData(const QModelIndex &index, const QVariant &value, int role=Qt::EditRole);
+	virtual bool removeRows(int position, int rows, const QModelIndex &index=QModelIndex());
+
+private:
+	QList<QObject *>* content;
+	QMap<int, QString> mappings;
+	QObject* modelObject;
+};
+
+#endif // PROPERTYBASEDTABLEMODEL_H

=== modified file 'plugins/Oculars/src/gui/ocularDialog.ui'
--- plugins/Oculars/src/gui/ocularDialog.ui	2010-06-07 17:32:10 +0000
+++ plugins/Oculars/src/gui/ocularDialog.ui	2010-10-23 15:46:40 +0000
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>513</width>
-    <height>342</height>
+    <height>400</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -169,6 +169,363 @@
            <string>Scale Image Circle</string>
           </property>
          </widget>
+         <widget class="QGroupBox" name="groupBox">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>40</y>
+            <width>503</width>
+            <height>249</height>
+           </rect>
+          </property>
+          <property name="title">
+           <string>Key Mappings</string>
+          </property>
+          <layout class="QGridLayout" name="gridLayout_2">
+           <item row="0" column="1">
+            <widget class="QLabel" name="label_24">
+             <property name="text">
+              <string>Toggle</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="3">
+            <widget class="QLabel" name="label_25">
+             <property name="text">
+              <string>Toggle</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_11">
+             <property name="text">
+              <string>Plugin:</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QLineEdit" name="togglePluginLineEdit">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="baseSize">
+              <size>
+               <width>100</width>
+               <height>22</height>
+              </size>
+             </property>
+             <property name="text">
+              <string/>
+             </property>
+             <property name="maxLength">
+              <number>50</number>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="2">
+            <widget class="QLabel" name="label_13">
+             <property name="text">
+              <string>Configuration:</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="3">
+            <widget class="QLineEdit" name="toggleConfigWindowLineEdit">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="baseSize">
+              <size>
+               <width>100</width>
+               <height>22</height>
+              </size>
+             </property>
+             <property name="maxLength">
+              <number>50</number>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0">
+            <widget class="QLabel" name="label_14">
+             <property name="text">
+              <string>Telrad:</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1" rowspan="2">
+            <widget class="QLineEdit" name="toggleTelradLineEdit">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="baseSize">
+              <size>
+               <width>100</width>
+               <height>22</height>
+              </size>
+             </property>
+             <property name="maxLength">
+              <number>50</number>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="2">
+            <widget class="QLabel" name="label_15">
+             <property name="text">
+              <string>Crosshair:</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="3" rowspan="2">
+            <widget class="QLineEdit" name="toggleCrosshairLineEdit">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="baseSize">
+              <size>
+               <width>100</width>
+               <height>22</height>
+              </size>
+             </property>
+             <property name="text">
+              <string/>
+             </property>
+             <property name="maxLength">
+              <number>50</number>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="1">
+            <widget class="QLabel" name="label_22">
+             <property name="text">
+              <string>Previous</string>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="3">
+            <widget class="QLabel" name="label_23">
+             <property name="text">
+              <string>Next</string>
+             </property>
+            </widget>
+           </item>
+           <item row="5" column="0">
+            <widget class="QLabel" name="label_16">
+             <property name="text">
+              <string>CCD:</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item row="5" column="1">
+            <widget class="QLineEdit" name="previousCCDLineEdit">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="baseSize">
+              <size>
+               <width>100</width>
+               <height>22</height>
+              </size>
+             </property>
+             <property name="text">
+              <string/>
+             </property>
+             <property name="maxLength">
+              <number>50</number>
+             </property>
+            </widget>
+           </item>
+           <item row="5" column="3">
+            <widget class="QLineEdit" name="nextCCDLineEdit">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="baseSize">
+              <size>
+               <width>100</width>
+               <height>22</height>
+              </size>
+             </property>
+             <property name="text">
+              <string/>
+             </property>
+             <property name="maxLength">
+              <number>50</number>
+             </property>
+            </widget>
+           </item>
+           <item row="6" column="0">
+            <widget class="QLabel" name="label_18">
+             <property name="text">
+              <string>Ocular:</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item row="6" column="1">
+            <widget class="QLineEdit" name="previousOcularLineEdit">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="baseSize">
+              <size>
+               <width>100</width>
+               <height>22</height>
+              </size>
+             </property>
+             <property name="text">
+              <string/>
+             </property>
+             <property name="maxLength">
+              <number>50</number>
+             </property>
+            </widget>
+           </item>
+           <item row="6" column="3">
+            <widget class="QLineEdit" name="nextOcularLineEdit">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="baseSize">
+              <size>
+               <width>100</width>
+               <height>22</height>
+              </size>
+             </property>
+             <property name="text">
+              <string/>
+             </property>
+             <property name="maxLength">
+              <number>50</number>
+             </property>
+            </widget>
+           </item>
+           <item row="7" column="0">
+            <widget class="QLabel" name="label_20">
+             <property name="text">
+              <string>Telescope:</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item row="7" column="1">
+            <widget class="QLineEdit" name="previousTelescopeLineEdit">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="baseSize">
+              <size>
+               <width>100</width>
+               <height>22</height>
+              </size>
+             </property>
+             <property name="text">
+              <string/>
+             </property>
+             <property name="maxLength">
+              <number>50</number>
+             </property>
+            </widget>
+           </item>
+           <item row="7" column="3">
+            <widget class="QLineEdit" name="nextTelescopeLineEdit">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="baseSize">
+              <size>
+               <width>100</width>
+               <height>22</height>
+              </size>
+             </property>
+             <property name="text">
+              <string/>
+             </property>
+             <property name="maxLength">
+              <number>50</number>
+             </property>
+            </widget>
+           </item>
+           <item row="7" column="2">
+            <widget class="QLabel" name="label_21">
+             <property name="text">
+              <string>Telescope:</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item row="6" column="2">
+            <widget class="QLabel" name="label_19">
+             <property name="text">
+              <string>Ocular:</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item row="5" column="2">
+            <widget class="QLabel" name="label_17">
+             <property name="text">
+              <string>CCD:</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
         </widget>
         <widget class="QWidget" name="Eyepieces">
          <attribute name="title">
@@ -428,60 +785,6 @@
               </widget>
              </item>
              <item>
-              <widget class="QFrame" name="frame_2">
-               <property name="frameShape">
-                <enum>QFrame::StyledPanel</enum>
-               </property>
-               <property name="frameShadow">
-                <enum>QFrame::Raised</enum>
-               </property>
-               <layout class="QHBoxLayout" name="horizontalLayout_3">
-                <property name="spacing">
-                 <number>0</number>
-                </property>
-                <property name="topMargin">
-                 <number>0</number>
-                </property>
-                <property name="bottomMargin">
-                 <number>12</number>
-                </property>
-                <item>
-                 <spacer name="horizontalSpacer_2">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>68</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-                <item>
-                 <widget class="QPushButton" name="updateOcularButton">
-                  <property name="text">
-                   <string>Update Ocular</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <spacer name="horizontalSpacer_4">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>68</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
               <spacer name="verticalSpacer">
                <property name="orientation">
                 <enum>Qt::Vertical</enum>
@@ -669,7 +972,7 @@
                  </widget>
                 </item>
                 <item row="1" column="1">
-                 <widget class="QLineEdit" name="CCDName">
+                 <widget class="QLineEdit" name="ccdName">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                     <horstretch>0</horstretch>
@@ -695,7 +998,7 @@
                  </widget>
                 </item>
                 <item row="2" column="1">
-                 <widget class="QLineEdit" name="CCDResX">
+                 <widget class="QLineEdit" name="ccdResX">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                     <horstretch>0</horstretch>
@@ -721,7 +1024,7 @@
                  </widget>
                 </item>
                 <item row="3" column="1">
-                 <widget class="QLineEdit" name="CCDResY">
+                 <widget class="QLineEdit" name="ccdResY">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                     <horstretch>0</horstretch>
@@ -747,7 +1050,7 @@
                  </widget>
                 </item>
                 <item row="4" column="1">
-                 <widget class="QLineEdit" name="CCDChipX">
+                 <widget class="QLineEdit" name="ccdChipX">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                     <horstretch>0</horstretch>
@@ -773,7 +1076,7 @@
                  </widget>
                 </item>
                 <item row="5" column="1">
-                 <widget class="QLineEdit" name="CCDChipY">
+                 <widget class="QLineEdit" name="ccdChipY">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                     <horstretch>0</horstretch>
@@ -799,7 +1102,7 @@
                  </widget>
                 </item>
                 <item row="6" column="1">
-                 <widget class="QLineEdit" name="CCDPixelX">
+                 <widget class="QLineEdit" name="ccdPixelX">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                     <horstretch>0</horstretch>
@@ -825,7 +1128,7 @@
                  </widget>
                 </item>
                 <item row="7" column="1">
-                 <widget class="QLineEdit" name="CCDPixelY">
+                 <widget class="QLineEdit" name="ccdPixelY">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                     <horstretch>0</horstretch>
@@ -847,60 +1150,6 @@
               </widget>
              </item>
              <item>
-              <widget class="QFrame" name="CCDframe_update">
-               <property name="frameShape">
-                <enum>QFrame::StyledPanel</enum>
-               </property>
-               <property name="frameShadow">
-                <enum>QFrame::Raised</enum>
-               </property>
-               <layout class="QHBoxLayout" name="CCD_horizontalLayout_3">
-                <property name="spacing">
-                 <number>0</number>
-                </property>
-                <property name="topMargin">
-                 <number>0</number>
-                </property>
-                <property name="bottomMargin">
-                 <number>12</number>
-                </property>
-                <item>
-                 <spacer name="horizontalSpacer_CCD_update_left">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>68</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-                <item>
-                 <widget class="QPushButton" name="updateCCDButton">
-                  <property name="text">
-                   <string>Update Sensor</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <spacer name="horizontalSpacer_CCD_update_right">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>68</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
               <spacer name="CCDverticalSpacer">
                <property name="orientation">
                 <enum>Qt::Vertical</enum>
@@ -1125,60 +1374,6 @@
               </widget>
              </item>
              <item>
-              <widget class="QFrame" name="frame_6">
-               <property name="frameShape">
-                <enum>QFrame::StyledPanel</enum>
-               </property>
-               <property name="frameShadow">
-                <enum>QFrame::Raised</enum>
-               </property>
-               <layout class="QHBoxLayout" name="horizontalLayout_4">
-                <property name="spacing">
-                 <number>0</number>
-                </property>
-                <property name="topMargin">
-                 <number>0</number>
-                </property>
-                <property name="bottomMargin">
-                 <number>12</number>
-                </property>
-                <item>
-                 <spacer name="horizontalSpacer_5">
-                  <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="updateTelescopeButton">
-                  <property name="text">
-                   <string>Update Telescope</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <spacer name="horizontalSpacer_6">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>40</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
               <spacer name="verticalSpacer_2">
                <property name="orientation">
                 <enum>Qt::Vertical</enum>
@@ -1220,15 +1415,18 @@
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
+&lt;tr&gt;
+&lt;td style=&quot;border: none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Author: &lt;a href=&quot;[e-mail]&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Timothy Reaves&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:xx-large; font-weight:600;&quot;&gt;Overview&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Overview&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;This plugin is intended to simulate what you would see through an eyepiece.  This configuration dialog can be used to add, modify, or delete eyepieces and telescopes, as well as CCD Sensors.  Your first time running the app will populate some samples to get your started.&lt;/p&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;You can choose to scale the image you see on the screen.  This is intended to show you a better comparison of what one eyepiece/telescope combination will be like as compared to another.  The same eyepiece in two different telescopes of differing focal length will produce two different exit circles, changing the view someone.  The trade-off of this is that, with the image scaled, a good deal of the screen can be wasted.  Therefor I recommend that you leave it off, unless you feel you have a need of it.&lt;/p&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;You can toggle a crosshair in the view.  Ideally, I wanted this to be aligned to North.  I've been unable to do so.  So currently it aligns to the top of the screen.&lt;/p&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;You can toggle a Telrad finder; this can only be done when you have not turned on the Ocular view.  This feature draws three concentric circles of 0.5°, 2.0°, and 4.0°, helping you see what you would expect to see with the naked eye through the Telrad (or similar) finder.&lt;/p&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If you find any issues, please let me know.  Enjoy!&lt;/p&gt;
-&lt;p style=&quot; margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:xx-large; font-weight:600;&quot;&gt;Hot Keys&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Hot Keys&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;There are several keys that allow you to use the features of this plugin.  If you are not a Mac user, replace the &lt;span style=&quot; font-style:italic;&quot;&gt;Command&lt;/span&gt; key with the &lt;span style=&quot; font-style:italic;&quot;&gt;CTRL&lt;/span&gt; key.&lt;/p&gt;
 &lt;p style=&quot; margin-top:8px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Command-B&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Activate / de-activate the Telrad overlay.  Only available when not using an ocular.  This will display a 0.5°, 2.0°, and 4.0° red circle at the center of the screen.&lt;/p&gt;
@@ -1249,7 +1447,7 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Alt-C&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:8px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Toggle the reticale on and off.&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Alt-O&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Shows this configuration dialog.  Unfortunatly, you must close it by clicking the close button.  I've been unable to figure out why this does not toggle the dialog open and close.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Shows this configuration dialog.  Unfortunatly, you must close it by clicking the close button.  I've been unable to figure out why this does not toggle the dialog open and close.&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
            </widget>
           </item>