Merge lp:~stolowski/stellarium/oculars-barlow-lens into lp:stellarium

[Paweł Stołowski]

Implementation of barlow lens for Oculars plugin.

Implementation of barlow lens for Oculars plugin. Barlow lenses can be managed via ocular config dialog (see http://imgur.com/BwnO3GK,wY788Oj#0) and can be switched via ocular panel (see http://imgur.com/BwnO3GK,wY788Oj#1) or via popup menu. Barlow's multiplicity affects selected telescope's focal length (and thus increases magnification / decreases fov). It's perfectly fine to have no barlow active, which is indicated by "Barlow: None" and "Multiplicity: N/A" in the GUI.
This change introduces new "barlow" section in the settings file, but this section is optional. No barlow is defined by default (that was intended, but I can add one in the default .ini if desired, though this would affect only new installations).
Other than that, this patch introduces new strings for translators.

[lp:~stolowski/stellarium/oculars-barlow-lens]

5764. By Paweł Stołowski on 2013-01-28

Reverted some unintended changes to the .ui file.

[Alexander Wolf (alexwolf)]

review: Approve

=== modified file 'data/gui/nightStyle.css'
--- data/gui/nightStyle.css	2012-10-05 13:00:30 +0000
+++ data/gui/nightStyle.css	2013-01-28 17:20:27 +0000
@@ -235,11 +235,11 @@
         image: url(:/graphicGui/nv_searchButtonImage.png);
 }
 
-QPushButton#pushButtonMoveSensorUp, QPushButton#pushButtonMoveOcularUp, QPushButton#pushButtonMoveTelescopeUp {
+QPushButton#pushButtonMoveSensorUp, QPushButton#pushButtonMoveOcularUp, QPushButton#pushButtonMoveTelescopeUp, QPushButton#pushButtonMoveBarlowUp {
         image: url(:/graphicGui/nv_spinup.png);
 }
 
-QPushButton#pushButtonMoveSensorDown, QPushButton#pushButtonMoveOcularDown, QPushButton#pushButtonMoveTelescopeDown {
+QPushButton#pushButtonMoveSensorDown, QPushButton#pushButtonMoveOcularDown, QPushButton#pushButtonMoveTelescopeDown, QPushButton#pushButtonMoveBarlowDown {
         image: url(:/graphicGui/nv_spindown.png);
 }
 

=== modified file 'data/gui/normalStyle.css'
--- data/gui/normalStyle.css	2012-10-05 13:00:30 +0000
+++ data/gui/normalStyle.css	2013-01-28 17:20:27 +0000
@@ -243,11 +243,11 @@
 	background-image: url(:/graphicGui/closeButton-hover.png);
 }
 
-QPushButton#pushButtonMoveSensorUp, QPushButton#pushButtonMoveOcularUp, QPushButton#pushButtonMoveTelescopeUp {
+QPushButton#pushButtonMoveSensorUp, QPushButton#pushButtonMoveOcularUp, QPushButton#pushButtonMoveTelescopeUp, QPushButton#pushButtonMoveBarlowUp {
         image: url(:/graphicGui/spinup.png);
 }
 
-QPushButton#pushButtonMoveSensorDown, QPushButton#pushButtonMoveOcularDown, QPushButton#pushButtonMoveTelescopeDown {
+QPushButton#pushButtonMoveSensorDown, QPushButton#pushButtonMoveOcularDown, QPushButton#pushButtonMoveTelescopeDown, QPushButton#pushButtonMoveBarlowDown {
         image: url(:/graphicGui/spindown.png);
 }
 

=== added file 'plugins/Oculars/src/Barlow.cpp'
--- plugins/Oculars/src/Barlow.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Oculars/src/Barlow.cpp	2013-01-28 17:20:27 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2009 Timothy Reaves
+ * Copytight (C) 2013 Pawel Stolowski
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
+ */
+
+#include "Barlow.hpp"
+#include <QSettings>
+
+Barlow::Barlow()
+{
+}
+
+Barlow::Barlow(const QObject& other)
+{
+    this->m_multipler = other.property("multipler").toDouble();
+    this->m_name = other.property("name").toString();
+}
+
+Barlow::~Barlow()
+{
+}
+
+static QMap<int, QString> mapping;
+QMap<int, QString> Barlow::propertyMap()
+{
+    if(mapping.isEmpty()) {
+        mapping = QMap<int, QString>();
+        mapping[0] = "name";
+        mapping[1] = "multipler";
+     }
+    return mapping;
+}
+
+const QString Barlow::name() const
+{
+    return m_name;
+}
+
+void Barlow::setName(const QString& theValue)
+{
+    m_name = theValue;
+}
+
+double Barlow::multipler() const
+{
+    return m_multipler;
+}
+
+void Barlow::setMultipler(double theValue)
+{
+    m_multipler = theValue;
+}
+
+/* ********************************************************************* */
+#if 0
+#pragma mark -
+#pragma mark Static Methods
+#endif
+/* ********************************************************************* */
+
+Barlow* Barlow:: barlowFromSettings(QSettings* theSettings, int barlowIndex)
+{
+    Barlow* barlow = new Barlow();
+    QString prefix = "barlow/" + QVariant(barlowIndex).toString() + "/";
+
+    barlow->setName(theSettings->value(prefix + "name", "").toString());
+    barlow->setMultipler(theSettings->value(prefix + "multipler", "1").toDouble());
+
+    return barlow;
+}
+
+Barlow* Barlow::barlowModel()
+{
+    Barlow* model = new Barlow();
+    model->setName("My Barlow");
+    model->setMultipler(2.0f);
+    return model;
+}

=== added file 'plugins/Oculars/src/Barlow.hpp'
--- plugins/Oculars/src/Barlow.hpp	1970-01-01 00:00:00 +0000
+++ plugins/Oculars/src/Barlow.hpp	2013-01-28 17:20:27 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2009 Timothy Reaves
+ * Copytight (C) 2013 Pawel Stolowski
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
+ */
+
+#ifndef BARLOW_HPP_
+#define BARLOW_HPP_
+
+#include <QObject>
+#include <QString>
+#include <QMap>
+
+class QSettings;
+
+class Barlow : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(double multipler READ multipler WRITE setMultipler)
+
+public:
+    Barlow();
+    Q_INVOKABLE Barlow(const QObject& other);
+    virtual ~Barlow();
+    static Barlow* barlowFromSettings(QSettings* theSettings, int barlowIndex);
+    static Barlow* barlowModel();
+
+    double multipler() const;
+    void setMultipler(double theValue);
+    const QString name() const;
+    void setName(const QString& theValue);
+    QMap<int, QString> propertyMap();
+
+private:
+    QString m_name;
+    double m_multipler;
+};
+
+#endif

=== modified file 'plugins/Oculars/src/CMakeLists.txt'
--- plugins/Oculars/src/CMakeLists.txt	2012-12-06 15:00:12 +0000
+++ plugins/Oculars/src/CMakeLists.txt	2013-01-28 17:20:27 +0000
@@ -9,6 +9,8 @@
 SET(Oculars_SRCS
   CCD.hpp
   CCD.cpp
+  Barlow.hpp
+  Barlow.cpp
   Ocular.hpp
   Ocular.cpp
   Oculars.hpp
@@ -73,4 +75,3 @@
 	SET_TARGET_PROPERTIES(Oculars-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
 	ADD_DEPENDENCIES(AllStaticPlugins Oculars-static)
 ENDIF()
-

=== modified file 'plugins/Oculars/src/Ocular.cpp'
--- plugins/Oculars/src/Ocular.cpp	2012-01-11 10:50:37 +0000
+++ plugins/Oculars/src/Ocular.cpp	2013-01-28 17:20:27 +0000
@@ -18,6 +18,7 @@
 
 #include "Ocular.hpp"
 #include "Telescope.hpp"
+#include "Barlow.hpp"
 
 Ocular::Ocular()
 {
@@ -57,27 +58,29 @@
 #pragma mark Instance Methods
 #endif
 /* ********************************************************************* */
-double Ocular::actualFOV(Telescope *telescope) const
+double Ocular::actualFOV(Telescope *telescope, Barlow *barlow) const
 {
+	const double barlow_multipler = (barlow != NULL ? barlow->multipler() : 1.0f);
 	double actualFOV = 0.0;
 	if (m_binoculars) {
 		actualFOV = appearentFOV();
 	} else if (fieldStop() > 0.0) {
-		actualFOV =  fieldStop() / telescope->focalLength() * 57.3;
+            actualFOV =  fieldStop() / (telescope->focalLength() * barlow_multipler) * 57.3;
 	} else {
 		//actualFOV = apparent / mag
-		actualFOV = appearentFOV() / (telescope->focalLength() / effectiveFocalLength());
+		actualFOV = appearentFOV() / (telescope->focalLength() * barlow_multipler / effectiveFocalLength());
 	}
 	return actualFOV;
 }
 
-double Ocular::magnification(Telescope *telescope) const
+double Ocular::magnification(Telescope *telescope, Barlow *barlow) const
 {
 	double magnifiction = 0.0;
 	if (m_binoculars) {
 		magnifiction = effectiveFocalLength();
 	} else {
-		magnifiction = telescope->focalLength() / effectiveFocalLength();
+		const double barlow_multipler = (barlow != NULL ? barlow->multipler() : 1.0f);
+		magnifiction = telescope->focalLength() * barlow_multipler / effectiveFocalLength();
 	}
 	return magnifiction;
 }

=== modified file 'plugins/Oculars/src/Ocular.hpp'
--- plugins/Oculars/src/Ocular.hpp	2012-01-11 10:50:37 +0000
+++ plugins/Oculars/src/Ocular.hpp	2013-01-28 17:20:27 +0000
@@ -25,6 +25,7 @@
 #include <QSettings>
 
 class Telescope;
+class Barlow;
 
 class Ocular : public QObject
 {
@@ -52,8 +53,8 @@
 	bool isBinoculars() const;
 	void setBinoculars(bool flag);
 
-	double actualFOV(Telescope *telescope) const;
-	double magnification(Telescope *telescope) const;
+    double actualFOV(Telescope *telescope, Barlow *barlow) const;
+        double magnification(Telescope *telescope, Barlow *barlow) const;
 	QMap<int, QString> propertyMap();
 
 private:

=== modified file 'plugins/Oculars/src/Oculars.cpp'
--- plugins/Oculars/src/Oculars.cpp	2013-01-07 13:54:44 +0000
+++ plugins/Oculars/src/Oculars.cpp	2013-01-28 17:20:27 +0000
@@ -119,14 +119,18 @@
 	ccds = QList<CCD *>();
 	oculars = QList<Ocular *>();
 	telescopes = QList<Telescope *>();
+	barlows = QList<Barlow *> ();
+
 	ccdRotationSignalMapper = new QSignalMapper(this);
 	ccdsSignalMapper = new QSignalMapper(this);
 	ocularsSignalMapper = new QSignalMapper(this);
 	telescopesSignalMapper = new QSignalMapper(this);
+	barlowSignalMapper = new QSignalMapper(this);
 	
 	selectedCCDIndex = -1;
 	selectedOcularIndex = -1;
 	selectedTelescopeIndex = -1;
+	selectedBarlowIndex = -1;
 	
 	usageMessageLabelID = -1;
 
@@ -157,6 +161,8 @@
 	telescopes.clear();
 	qDeleteAll(oculars);
 	oculars.clear();
+	qDeleteAll(barlows);
+	barlows.clear();
 }
 
 QSettings* Oculars::appSettings()
@@ -186,6 +192,7 @@
 	settings->remove("ccd");
 	settings->remove("ocular");
 	settings->remove("telescope");
+	settings->remove("barlow");
 	int index = 0;
 	foreach(CCD* ccd, ccds) {
 		QString prefix = "ccd/" + QVariant(index).toString() + "/";
@@ -218,9 +225,18 @@
 		settings->setValue(prefix + "vFlip", telescope->isVFlipped());
 		index++;
 	}
+	index = 0;
+	foreach(Barlow* barlow, barlows) {
+		QString prefix = "barlow/" + QVariant(index).toString() + "/";
+		settings->setValue(prefix + "name", barlow->name());
+		settings->setValue(prefix + "multipler", barlow->multipler());
+		index++;
+	}
+        
 	settings->setValue("ocular_count", oculars.count());
 	settings->setValue("telescope_count", telescopes.count());
 	settings->setValue("ccd_count", ccds.count());
+	settings->setValue("barlow_count", barlows.count());
 	settings->sync();
 }
 
@@ -495,7 +511,23 @@
 			selectedTelescopeIndex = 0;
 		}
 
-		ocularDialog = new OcularDialog(this, &ccds, &oculars, &telescopes);
+		int barlowCount = settings->value("barlow_count", 0).toInt();
+		int actualBarlowCount = barlowCount;
+		for (int index = 0; index<barlowCount; index++) {
+			Barlow *newBarlow = Barlow::barlowFromSettings(settings, index);
+			if (newBarlow != NULL) {
+				barlows.append(newBarlow);
+			}
+			else {
+				actualBarlowCount--;
+			}
+		}
+		if (barlowCount > 0 && actualBarlowCount < barlowCount)
+		{
+			qWarning() << "The Oculars ini file appears to be corrupt; delete it.";
+		}
+
+		ocularDialog = new OcularDialog(this, &ccds, &oculars, &telescopes, &barlows);
 		initializeActivationActions();
 		determineMaxEyepieceAngle();
 		
@@ -822,6 +854,15 @@
 	emit(selectedTelescopeChanged());
 }
 
+void Oculars::decrementBarlowIndex()
+{
+	selectedBarlowIndex++;
+	if (selectedBarlowIndex == barlows.count()) {
+		selectedBarlowIndex = -1;
+	}
+	emit(selectedBarlowChanged());
+}
+
 void Oculars::displayPopupMenu()
 {
 	QMenu* popup = new QMenu(&StelMainWindow::getInstance());
@@ -877,6 +918,8 @@
 		{
 			QMenu* submenu = addTelescopeSubmenu(popup);
 			popup->addMenu(submenu);
+			submenu = addBarlowSubmenu(popup);
+			popup->addMenu(submenu);
 			popup->addSeparator();
 		}
 
@@ -1029,6 +1072,21 @@
 	emit(selectedTelescopeChanged());
 }
 
+void Oculars::incrementBarlowIndex()
+{
+	selectedBarlowIndex++;
+	if (selectedBarlowIndex == barlows.count()) {
+		selectedBarlowIndex = -1;
+	}
+	emit(selectedBarlowChanged());
+}
+
+void Oculars::disableBarlow()
+{
+	selectedBarlowIndex = -1;
+	emit(selectedBarlowChanged());
+}
+
 void Oculars::rotateCCD(QString amount)
 {
 	ccdRotationAngle += amount.toInt();
@@ -1077,6 +1135,15 @@
 	}
 }
 
+void Oculars::selectBarlowAtIndex(QString indexString)
+{
+	int index = indexString.toInt();
+	if (index > -2 && index < barlows.count()) {
+		selectedBarlowIndex = index;
+		emit(selectedBarlowChanged());
+	}
+}
+
 void Oculars::toggleCCD(bool show)
 {
 	//If there are no sensors...
@@ -1239,6 +1306,7 @@
 	connect(this, SIGNAL(selectedOcularChanged()), this, SLOT(instrumentChanged()));
 	connect(this, SIGNAL(selectedTelescopeChanged()), this, SLOT(instrumentChanged()));
 	connect(this, SIGNAL(selectedTelescopeChanged()), this, SLOT(setScreenFOVForCCD()));
+	connect(this, SIGNAL(selectedBarlowChanged()), this, SLOT(instrumentChanged()));
 	connect(ocularDialog, SIGNAL(requireSelectionChanged(bool)), this, SLOT(setRequireSelection(bool)));
 	connect(ocularDialog, SIGNAL(scaleImageCircleChanged(bool)), this, SLOT(setScaleImageCircle(bool)));
 
@@ -1248,6 +1316,7 @@
 	connect(ocularsSignalMapper, SIGNAL(mapped(QString)), this, SLOT(selectOcularAtIndex(QString)));
 	connect(telescopesSignalMapper, SIGNAL(mapped(QString)), this, SLOT(selectTelescopeAtIndex(QString)));
 	connect(telescopesSignalMapper, SIGNAL(mapped(QString)), this, SLOT(setScreenFOVForCCD()));
+	connect(barlowSignalMapper, SIGNAL(mapped(QString)), this, SLOT(selectBarlowAtIndex(QString)));
 }
 
 bool Oculars::isBinocularDefined()
@@ -1422,6 +1491,7 @@
 	}
 	Ocular *ocular = oculars[selectedOcularIndex];
 	Telescope *telescope = telescopes[selectedTelescopeIndex];
+	Barlow *barlow = selectedBarlowIndex >=0  ? barlows[selectedBarlowIndex] : NULL;
 
 	// set up drawing
 	if (StelApp::getInstance().getVisionModeNight())
@@ -1478,7 +1548,28 @@
 			                         .arg(ocularFov);
 			renderer->drawText(TextParams(xPosition, yPosition, ocularFOVLabel));
 			yPosition-=lineHeight;
-			
+	
+			QString barlowNumberLabel;
+			// Barlow lens
+			if (barlow != NULL) // it's null if barlow is not selected (barlow index = -1)
+			{
+				QString barlowName = barlow->name();
+				if (barlowName.isEmpty())
+				{
+					barlowNumberLabel = QString(q_("Barlow #%1")).arg(selectedBarlowIndex);
+				}
+				else
+				{
+					barlowNumberLabel = QString (q_("Barlow #%1: %2")).arg(selectedBarlowIndex).arg(barlowName);
+				}
+			}
+			else
+			{
+				barlowNumberLabel = QString (q_("Barlow: none")); //FIXME
+			}
+			renderer->drawText(TextParams(xPosition, yPosition, barlowNumberLabel));
+			yPosition-=lineHeight;
+		
 			// The telescope
 			QString telescopeNumberLabel;
 			QString telescopeName = telescope->name();
@@ -1497,7 +1588,7 @@
 			yPosition-=lineHeight;
 			
 			// General info
-			double magnification = ((int)(ocular->magnification(telescope) * 10.0)) / 10.0;
+			double magnification = ((int)(ocular->magnification(telescope, barlow) * 10.0)) / 10.0;
 			QString magString = QString::number(magnification);
 			magString.append(QChar(0x00D7));//Multiplication sign
 			QString magnificationLabel = QString(q_("Magnification: %1"))
@@ -1505,7 +1596,7 @@
 			renderer->drawText(TextParams(xPosition, yPosition, magnificationLabel));
 			yPosition-=lineHeight;
 			
-			double fov = ((int)(ocular->actualFOV(telescope) * 10000.00)) / 10000.0;
+			double fov = ((int)(ocular->actualFOV(telescope, barlow) * 10000.00)) / 10000.0;
 			QString fovString = QString::number(fov);
 			fovString.append(QChar(0x00B0));//Degree sign
 			QString fovLabel = QString(q_("FOV: %1")).arg(fovString);
@@ -1700,6 +1791,7 @@
 	// core->setMaskType(StelProjector::MaskDisk);
 	Ocular *ocular = oculars[selectedOcularIndex];
 	Telescope *telescope = NULL;
+        Barlow *barlow = NULL;
 	// Only consider flip is we're not binoculars
 	if (ocular->isBinoculars())
 	{
@@ -1708,12 +1800,14 @@
 	}
 	else
 	{
+        if (selectedBarlowIndex >= 0)
+            barlow = barlows[selectedBarlowIndex];
 		telescope = telescopes[selectedTelescopeIndex];
 		core->setFlipHorz(telescope->isHFlipped());
 		core->setFlipVert(telescope->isVFlipped());
 	}
 
-	double actualFOV = ocular->actualFOV(telescope);
+	double actualFOV = ocular->actualFOV(telescope, barlow);
 	// See if the mask was scaled; if so, correct the actualFOV.
 	if (useMaxEyepieceAngle && ocular->appearentFOV() > 0.0 && !ocular->isBinoculars()) {
 		actualFOV = maxEyepieceAngle * actualFOV / ocular->appearentFOV();
@@ -1732,6 +1826,45 @@
 	}
 }
 
+Barlow* Oculars::selectedBarlow()
+{
+    if (selectedBarlowIndex >= 0 && selectedBarlowIndex < barlows.count())
+        return barlows[selectedBarlowIndex];
+    return NULL;
+}
+
+QMenu* Oculars::addBarlowSubmenu(QMenu* parent)
+{
+	Q_ASSERT(parent);
+    
+	QMenu *submenu = new QMenu(q_("&Barlow"), parent);
+	submenu->addAction(q_("&Previous barlow"), this, SLOT(decrementBarlowIndex()));
+	submenu->addAction(q_("&Next barlow"), this, SLOT(incrementBarlowIndex()));
+	submenu->addSeparator();
+	submenu->addAction(q_("None"), this, SLOT(disableBarlow()));
+
+	for (int index = 0; index < barlows.count(); ++index)
+	{
+		QString label;
+		if (index < 10)
+		{
+			label = QString("&%1: %2").arg(index).arg(barlows[index]->name());
+		}
+		else
+		{
+			label = barlows[index]->name();
+		}
+		QAction* action = submenu->addAction(label, barlowSignalMapper, SLOT(map()));
+		if (index == selectedBarlowIndex)
+		{
+			action->setCheckable(true);
+			action->setChecked(true);
+		}
+		barlowSignalMapper->setMapping(action, QString("%1").arg(index));
+	}
+	return submenu;
+}
+
 QMenu* Oculars::addTelescopeSubmenu(QMenu *parent)
 {
 	Q_ASSERT(parent);

=== modified file 'plugins/Oculars/src/Oculars.hpp'
--- plugins/Oculars/src/Oculars.hpp	2012-08-12 12:26:44 +0000
+++ plugins/Oculars/src/Oculars.hpp	2013-01-28 17:20:27 +0000
@@ -26,6 +26,7 @@
 #include "CCD.hpp"
 #include "Ocular.hpp"
 #include "Telescope.hpp"
+#include "Barlow.hpp"
 
 #include <QFont>
 #include <QSettings>
@@ -86,6 +87,7 @@
 	void decrementCCDIndex();
 	void decrementOcularIndex();
 	void decrementTelescopeIndex();
+	void decrementBarlowIndex();
 	void displayPopupMenu();
 	//! This method is called with we detect that our hot key is pressed.  It handles
 	//! determining if we should do anything - based on a selected object.
@@ -93,10 +95,13 @@
 	void incrementCCDIndex();
 	void incrementOcularIndex();
 	void incrementTelescopeIndex();
+	void incrementBarlowIndex();
+	void disableBarlow();
 	void rotateCCD(QString amount); //!< amount must be a number.
 	void selectCCDAtIndex(QString indexString); //!< indexString must be an integer, in the range of -1:ccds.count()
 	void selectOcularAtIndex(QString indexString);  //!< indexString must be an integer, in the range of -1:oculars.count()
 	void selectTelescopeAtIndex(QString indexString);  //!< indexString must be an integer, in the range of -1:telescopes.count()
+	void selectBarlowAtIndex(QString indexString); //!< indexString must be an integer, in the range -1:barlows.count<()
 	//! Toggles the sensor frame overlay.
 	void toggleCCD(bool show);
 	//! Toggles the sensor frame overlay (overloaded for blind switching).
@@ -115,6 +120,7 @@
 	void selectedCCDChanged();
 	void selectedOcularChanged();
 	void selectedTelescopeChanged();
+	void selectedBarlowChanged();
 
 private slots:
 	//! Signifies a change in ocular or telescope.  Sets new zoom level.
@@ -129,7 +135,7 @@
 private:
 	//! Set up the Qt actions needed to activate the plugin.
 	void initializeActivationActions();
-	
+
 	//! Returns TRUE if at least one bincular is defined.
 	bool isBinocularDefined();
 
@@ -168,16 +174,25 @@
 
 	void hideUsageMessageIfDisplayed();
 
+	//! Creates the sub-menu listing barlow lenses in the pop-up menu
+	QMenu* addBarlowSubmenu(QMenu* parent);
+
 	//! Creates the sub-menu listing telescopes in the pop-up menu.
 	QMenu* addTelescopeSubmenu(QMenu* parent);
 
+	//! Returns selected barlow,or NULL if no barlow is selected
+	Barlow* selectedBarlow();
+
 	//! 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<Ocular *> oculars;
 	QList<Telescope *> telescopes;
+	QList<Barlow *> barlows;
+
 	int selectedCCDIndex; //!< index of the current CCD, in the range of -1:ccds.count().  -1 means no CCD is selected.
 	int selectedOcularIndex; //!< index of the current ocular, in the range of -1:oculars.count().  -1 means no ocular is selected.
 	int selectedTelescopeIndex; //!< index of the current telescope, in the range of -1:telescopes.count(). -1 means none is selected.
+	int selectedBarlowIndex; //!<  index of the current barlow lends, in the range of -1:barlows.count(). -1 means no barlow is selected
 
 	QFont font;					//!< The font used for drawing labels.
 	bool flagShowCCD;				//!< flag used to track f we are in CCD mode.
@@ -209,6 +224,7 @@
 	QSignalMapper* ccdsSignalMapper; //!< Used to determine which CCD was selected from the popup navigator. */
 	QSignalMapper* ocularsSignalMapper; //!< Used to determine which ocular was selected from the popup navigator. */
 	QSignalMapper* telescopesSignalMapper; //!< Used to determine which telescope was selected from the popup navigator. */
+	QSignalMapper* barlowSignalMapper; //!< Used to determine which barlow was selected from the popup navigator */
 
 	// for toolbar button
 	QPixmap* pxmapGlow;
@@ -249,4 +265,3 @@
 };
 
 #endif /*_OCULARS_HPP_*/
-

=== modified file 'plugins/Oculars/src/gui/OcularDialog.cpp'
--- plugins/Oculars/src/gui/OcularDialog.cpp	2012-08-14 05:48:00 +0000
+++ plugins/Oculars/src/gui/OcularDialog.cpp	2013-01-28 17:20:27 +0000
@@ -38,7 +38,7 @@
 #include <QStandardItemModel>
 #include <limits>
 
-OcularDialog::OcularDialog(Oculars* pluginPtr, QList<CCD *>* ccds, QList<Ocular *>* oculars, QList<Telescope *>* telescopes) :
+OcularDialog::OcularDialog(Oculars* pluginPtr, QList<CCD *>* ccds, QList<Ocular *>* oculars, QList<Telescope *>* telescopes, QList<Barlow *>* barlows) :
 	plugin(pluginPtr)
 {
 	ui = new Ui_ocularDialogForm;
@@ -60,12 +60,18 @@
 														telescopeModel,
 														telescopeModel->propertyMap());
 	
+	this->barlows = barlows;
+	barlowTableModel = new PropertyBasedTableModel(this);
+	Barlow* barlowModel = Barlow::barlowModel();
+	barlowTableModel->init(reinterpret_cast<QList<QObject *>* >(barlows), barlowModel, barlowModel->propertyMap());
+
 	validatorPositiveInt = new QIntValidator(0, std::numeric_limits<int>::max(), this);
 	validatorPositiveDouble = new QDoubleValidator(.0, std::numeric_limits<double>::max(), 24, this);
 	validatorOcularAFOV = new QDoubleValidator(1.0, 120.0, 1, this);
 	validatorOcularEFL = new QDoubleValidator(1.0, 60.0, 1, this);
 	validatorTelescopeDiameter = new QDoubleValidator(1.0, 1000.0, 1, this);
 	validatorTelescopeFL = new QDoubleValidator(1.0, 10000.0, 1, this);
+	validatorBarlowMultipler = new QDoubleValidator(1.0, 6.0, 1, this);
 	QRegExp nameExp("^\\S.*");
 	validatorName = new QRegExpValidator(nameExp, this);
 }
@@ -146,6 +152,17 @@
 	}
 }
 
+void OcularDialog::deleteSelectedBarlow()
+{
+    if (barlowTableModel->rowCount() > 0) {
+        barlowTableModel->removeRows(ui->barlowListView->currentIndex().row(), 1);
+        if (barlowTableModel->rowCount() > 0) {
+            ui->barlowListView->setCurrentIndex(barlowTableModel->index(0, 1));
+        }
+        plugin->updateLists();
+    }
+}
+
 void OcularDialog::insertNewCCD()
 {
 	ccdTableModel->insertRows(ccdTableModel->rowCount(), 1);
@@ -164,6 +181,12 @@
 	ui->telescopeListView->setCurrentIndex(telescopeTableModel->index(telescopeTableModel->rowCount() - 1, 1));
 }
 
+void OcularDialog::insertNewBarlow()
+{
+	barlowTableModel->insertRows(barlowTableModel->rowCount(), 1);
+	ui->barlowListView->setCurrentIndex(barlowTableModel->index(barlowTableModel->rowCount() - 1, 1));
+}
+
 void OcularDialog::moveUpSelectedSensor()
 {
 	int index = ui->ccdListView->currentIndex().row();
@@ -194,6 +217,16 @@
 	}
 }
 
+void OcularDialog::moveUpSelectedBarlow()
+{
+	int index = ui->barlowListView->currentIndex().row();
+	if (index > 0)
+	{
+		barlowTableModel->moveRowUp(index);
+		plugin->updateLists();
+	}
+}
+
 void OcularDialog::moveDownSelectedSensor()
 {
 	int index = ui->ccdListView->currentIndex().row();
@@ -224,6 +257,16 @@
 	}
 }
 
+void OcularDialog::moveDownSelectedBarlow()
+{
+	int index = ui->barlowListView->currentIndex().row();
+	if (index >= 0 && index < barlowTableModel->rowCount() - 1)
+	{
+		barlowTableModel->moveRowDown(index);
+		plugin->updateLists();
+	}
+}
+
 /* ********************************************************************* */
 #if 0
 #pragma mark -
@@ -288,6 +331,7 @@
 	ui->ccdListView->setModel(ccdTableModel);
 	ui->ocularListView->setModel(ocularTableModel);
 	ui->telescopeListView->setModel(telescopeTableModel);
+	ui->barlowListView->setModel(barlowTableModel);
 	
 	//Now the rest of the actions.
 	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
@@ -301,6 +345,8 @@
 	connect(ui->deleteCCD, SIGNAL(clicked()), this, SLOT(deleteSelectedCCD()));
 	connect(ui->addOcular, SIGNAL(clicked()), this, SLOT(insertNewOcular()));
 	connect(ui->deleteOcular, SIGNAL(clicked()), this, SLOT(deleteSelectedOcular()));
+	connect(ui->addBarlow, SIGNAL(clicked()), this, SLOT(insertNewBarlow()));
+	connect(ui->deleteBarlow, SIGNAL(clicked()), this, SLOT(deleteSelectedBarlow()));
 	connect(ui->addTelescope, SIGNAL(clicked()), this, SLOT(insertNewTelescope()));
 	connect(ui->deleteTelescope, SIGNAL(clicked()), this, SLOT(deleteSelectedTelescope()));
 
@@ -319,6 +365,8 @@
 	ui->telescopeDiameter->setValidator(validatorTelescopeDiameter);
 	ui->ocularName->setValidator(validatorName);
 	ui->telescopeName->setValidator(validatorName);
+	ui->barlowName->setValidator(validatorName);
+	ui->barlowMultipler->setValidator(validatorBarlowMultipler);
 	
 	// The key bindings
 	QString bindingString = Oculars::appSettings()->value("bindings/toggle_oculars", "Ctrl+O").toString();
@@ -348,6 +396,10 @@
 					this, SLOT(moveUpSelectedTelescope()));
 	connect(ui->pushButtonMoveTelescopeDown, SIGNAL(pressed()),
 					this, SLOT(moveDownSelectedTelescope()));
+	connect(ui->pushButtonMoveBarlowUp, SIGNAL(pressed()),
+					this, SLOT(moveUpSelectedBarlow()));
+	connect(ui->pushButtonMoveBarlowDown, SIGNAL(pressed()),
+					this, SLOT(moveDownSelectedBarlow()));
 
 	// The CCD mapper
 	ccdMapper = new QDataWidgetMapper();
@@ -379,6 +431,17 @@
 					ocularMapper, SLOT(setCurrentModelIndex(QModelIndex)));
 	ui->ocularListView->setCurrentIndex(ocularTableModel->index(0, 1));
 
+	// The barlow lens mapper
+	barlowMapper = new QDataWidgetMapper();
+	barlowMapper->setModel(barlowTableModel);
+	barlowMapper->setSubmitPolicy(QDataWidgetMapper::AutoSubmit);
+	barlowMapper->addMapping(ui->barlowName, 0);
+	barlowMapper->addMapping(ui->barlowMultipler, 1);
+	barlowMapper->toFirst();
+	connect(ui->barlowListView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)),
+			barlowMapper, SLOT(setCurrentModelIndex(QModelIndex)));
+	ui->barlowListView->setCurrentIndex(barlowTableModel->index(0, 1));
+
 	// The telescope mapper
 	telescopeMapper = new QDataWidgetMapper();
 	telescopeMapper->setModel(telescopeTableModel);

=== modified file 'plugins/Oculars/src/gui/OcularDialog.hpp'
--- plugins/Oculars/src/gui/OcularDialog.hpp	2012-04-01 21:12:29 +0000
+++ plugins/Oculars/src/gui/OcularDialog.hpp	2013-01-28 17:20:27 +0000
@@ -27,6 +27,7 @@
 #include "StelDialog.hpp"
 #include "StelStyle.hpp"
 #include "Telescope.hpp"
+#include "Barlow.hpp"
 
 class Ui_ocularDialogForm;
 
@@ -46,7 +47,7 @@
 	Q_OBJECT
 
 public:
-	OcularDialog(Oculars* plugin, QList<CCD *>* ccds, QList<Ocular *>* oculars, QList<Telescope *>* telescopes);
+    OcularDialog(Oculars* plugin, QList<CCD *>* ccds, QList<Ocular *>* oculars, QList<Telescope *>* telescopes, QList<Barlow *>* barlows);
 	virtual ~OcularDialog();
 	//! Notify that the application style changed
 	void styleChanged();
@@ -57,15 +58,19 @@
 	void deleteSelectedCCD();
 	void deleteSelectedOcular();
 	void deleteSelectedTelescope();
+	void deleteSelectedBarlow();
 	void insertNewCCD();
 	void insertNewOcular();
 	void insertNewTelescope();
+	void insertNewBarlow();
 	void moveUpSelectedSensor();
 	void moveUpSelectedOcular();
 	void moveUpSelectedTelescope();
+	void moveUpSelectedBarlow();
 	void moveDownSelectedSensor();
 	void moveDownSelectedOcular();
 	void moveDownSelectedTelescope();
+	void moveDownSelectedBarlow();
 	void retranslate();
 
 signals:
@@ -96,10 +101,14 @@
 	QDataWidgetMapper*			telescopeMapper;
 	QList<Telescope *>*			telescopes;
 	PropertyBasedTableModel*	telescopeTableModel;
+	QDataWidgetMapper*			barlowMapper;
+	QList<Barlow *>*			barlows;
+	PropertyBasedTableModel*	barlowTableModel;
 	QDoubleValidator*				validatorOcularAFOV;
 	QDoubleValidator*				validatorOcularEFL;
 	QDoubleValidator*				validatorTelescopeDiameter;
 	QDoubleValidator*				validatorTelescopeFL;
+	QDoubleValidator*				validatorBarlowMultipler;
 	QRegExpValidator*				validatorName;
 	QIntValidator*					validatorPositiveInt;
 	QDoubleValidator*				validatorPositiveDouble;

=== modified file 'plugins/Oculars/src/gui/OcularsGuiPanel.cpp'
--- plugins/Oculars/src/gui/OcularsGuiPanel.cpp	2012-07-06 17:00:39 +0000
+++ plugins/Oculars/src/gui/OcularsGuiPanel.cpp	2013-01-28 17:20:27 +0000
@@ -130,6 +130,9 @@
 	ocularControls = new QGraphicsWidget(this);
 	ocularControls->setParentItem(this);
 	ocularControls->setVisible(false);
+	barlowControls = new QGraphicsWidget(this);
+	barlowControls->setParentItem(this);
+	barlowControls->setVisible(false);
 	ccdControls = new QGraphicsWidget(this);
 	ccdControls->setParentItem(this);
 	ccdControls->setVisible(false);
@@ -147,6 +150,9 @@
 	fieldMagnification = new QGraphicsTextItem(telescopeControls);
 	fieldFov = new QGraphicsTextItem(telescopeControls);
 
+	fieldBarlowName = new QGraphicsTextItem(barlowControls);
+	fieldBarlowMultipler = new QGraphicsTextItem(barlowControls);
+
 	QFont newFont = font();
 	newFont.setPixelSize(12);
 	setControlsFont(newFont);
@@ -167,6 +173,9 @@
 	fieldMagnification->setTextWidth(maxWidth);
 	fieldFov->setTextWidth(maxWidth);
 
+	fieldBarlowName->setTextWidth(maxWidth);
+	fieldBarlowMultipler->setTextWidth(maxWidth);
+
 	QPixmap pa(":/graphicGui/btTimeRewind-on.png");
 	QPixmap prevArrow = pa.scaledToHeight(lineHeight, Qt::SmoothTransformation);
 	QPixmap paOff(":/graphicGui/btTimeRewind-off.png");
@@ -190,6 +199,18 @@
 	                                  QPixmap(),
 	                                  defaultAction);
 	nextOcularButton->setToolTip(q_("Next ocular"));
+	prevBarlowButton = new StelButton(barlowControls,
+                                      prevArrow,
+                                      prevArrowOff,
+                                      QPixmap(),
+                                      defaultAction);
+	prevBarlowButton->setToolTip(q_("Previous Barlow lens"));
+	nextBarlowButton = new StelButton(barlowControls,
+                                      nextArrow,
+                                      nextArrowOff,
+                                      QPixmap(),
+                                      defaultAction);
+	nextBarlowButton->setToolTip(q_("Next Barlow lens"));
 	prevCcdButton = new StelButton(ccdControls,
 	                               prevArrow,
 	                               prevArrowOff,
@@ -227,6 +248,10 @@
 	        ocularsPlugin, SLOT(decrementCCDIndex()));
 	connect(prevTelescopeButton, SIGNAL(triggered()),
 	        ocularsPlugin, SLOT(decrementTelescopeIndex()));
+	connect(nextBarlowButton, SIGNAL(triggered()),
+			ocularsPlugin, SLOT(incrementBarlowIndex()));
+	connect(prevBarlowButton, SIGNAL(triggered()),
+			ocularsPlugin, SLOT(decrementBarlowIndex()));
 
 	QColor cOn(255, 255, 255);
 	QColor cOff(102, 102, 102);
@@ -368,6 +393,7 @@
 	ocularControls->setMaximumWidth(width);
 	ccdControls->setMaximumWidth(width);
 	telescopeControls->setMaximumWidth(width);
+	barlowControls->setMaximumWidth(width);
 	resize(width + left + right, 10);
 	buttonBar->resize(width, size().height());
 	updateMainButtonsPositions();
@@ -394,6 +420,8 @@
 	        this, SLOT(updateCcdControls()));
 	connect(ocularsPlugin, SIGNAL(selectedTelescopeChanged()),
 	        this, SLOT(updateTelescopeControls()));
+    connect(ocularsPlugin, SIGNAL(selectedBarlowChanged()),
+            this, SLOT(updateTelescopeControls()));
 
 	//Night mode
 	connect(&stelApp, SIGNAL(colorSchemeChanged(const QString&)),
@@ -418,6 +446,7 @@
 	{
 		setOcularControlsVisible(false);
 		setTelescopeControlsVisible(false);
+		setBarlowControlsVisible(false);
 		updatePosition();
 	}
 }
@@ -433,6 +462,7 @@
 	setOcularControlsVisible(false);
 	setCcdControlsVisible(false);
 	setTelescopeControlsVisible(false);
+	setBarlowControlsVisible(false);
 	updatePosition();
 }
 
@@ -545,6 +575,76 @@
 	updateTelescopeControls();//Contains a call to updatePosition()
 }
 
+void OcularsGuiPanel::updateBarlowControls()
+{
+	if (ocularsPlugin->flagShowCCD)
+	{
+		setBarlowControlsVisible(false);
+		return;
+	}
+	int index = ocularsPlugin->selectedOcularIndex;
+	Ocular* ocular = ocularsPlugin->oculars[index];
+
+	Barlow* barlow = ocularsPlugin->selectedBarlow();
+	index = ocularsPlugin->selectedBarlowIndex;
+
+	QString fullName;
+	QString multiplerString;
+	if (barlow != NULL)
+	{
+		QString name = barlow->name();
+		if (name.isEmpty())
+		{
+			fullName = QString(q_("Barlow #%1")).arg(index);
+		}
+		else
+		{
+			fullName = QString(q_("Barlow #%1: %2")).arg(index).arg(name);
+		}
+		multiplerString = QString(q_("Multiplicity: %1")).arg(barlow->multipler());
+		multiplerString.append(QChar(0x00D7));
+	}
+	else
+	{
+		fullName = QString(q_("Barlow: None"));
+		multiplerString = QString(q_("Multiplicity: N/A"));
+	}
+	fieldBarlowName->setPlainText(fullName);
+	fieldBarlowMultipler->setPlainText(multiplerString);
+	fieldOcularFl->setToolTip(q_("Multiplicity of barlow lens"));
+	
+	qreal posX = 0.;
+	qreal posY = 0.;
+	qreal widgetWidth = 0.;
+	qreal widgetHeight = 0.;
+
+	//Prev button
+	qreal heightAdjustment = (fieldBarlowName->boundingRect().height() - prevBarlowButton->boundingRect().height()) / 2.;
+	prevBarlowButton->setPos(posX, round(posY + heightAdjustment));
+	posX += prevBarlowButton->boundingRect().width();
+	widgetWidth += prevBarlowButton->boundingRect().width();
+
+	//Name field
+	fieldBarlowName->setPos(posX, posY);
+	posX += fieldBarlowName->boundingRect().width();
+	widgetWidth += fieldBarlowName->boundingRect().width();
+	widgetHeight += fieldBarlowName->boundingRect().height();
+
+	//Next button
+	nextBarlowButton->setPos(posX, posY + heightAdjustment);
+	widgetWidth += nextBarlowButton->boundingRect().width();
+
+	posX = prevBarlowButton->boundingRect().width();
+	posY += fieldBarlowName->boundingRect().height();
+	fieldBarlowMultipler->setPos(posX, posY);
+	widgetHeight += fieldBarlowMultipler->boundingRect().height();
+
+	barlowControls->setMinimumSize(widgetWidth, widgetHeight);
+	barlowControls->resize(widgetWidth, widgetHeight);
+
+	setBarlowControlsVisible(true);
+}
+
 void OcularsGuiPanel::updateCcdControls()
 {
 	setOcularControlsVisible(false);
@@ -702,6 +802,8 @@
 		int index = ocularsPlugin->selectedOcularIndex;
 		Ocular* ocular = ocularsPlugin->oculars[index];
 		Q_ASSERT(ocular);
+                
+		Barlow *barlow = ocularsPlugin->selectedBarlow();
 
 		if (ocular->isBinoculars())
 		{
@@ -720,12 +822,12 @@
 			nextTelescopeButton->setVisible(true);
 			fieldTelescopeName->setVisible(true);
 
-			fieldMagnification->setToolTip(q_("Magnification provided by this ocular/telescope combination"));
-			fieldFov->setToolTip(q_("Actual field of view provided by this ocular/telescope combination"));
+			fieldMagnification->setToolTip(q_("Magnification provided by this ocular/barlow/telescope combination"));
+			fieldFov->setToolTip(q_("Actual field of view provided by this ocular/barlow/telescope combination"));
 		}
 
 		//WTF? Rounding?
-		double magnification = ((int)(ocular->magnification(telescope) * 10.0)) / 10.0;
+		double magnification = ((int)(ocular->magnification(telescope, barlow) * 10.0)) / 10.0;
 		QString magnificationString = QString::number(magnification);
 		magnificationString.append(QChar(0x00D7));
 		QString magnificationLabel = QString(q_("Magnification: %1"))
@@ -735,7 +837,7 @@
 		posY += fieldMagnification->boundingRect().height();
 		widgetHeight += fieldMagnification->boundingRect().height();
 
-		double fov = ((int)(ocular->actualFOV(telescope) * 10000.00)) / 10000.0;
+		double fov = ((int)(ocular->actualFOV(telescope, barlow) * 10000.00)) / 10000.0;
 		QString fovString = QString::number(fov) + QChar(0x00B0);
 		QString fovLabel = QString(q_("FOV: %1")).arg(fovString);
 		fieldFov->setPlainText(fovLabel);
@@ -759,9 +861,34 @@
 	telescopeControls->resize(widgetWidth, widgetHeight);
 	setTelescopeControlsVisible(true);
 
+	updateBarlowControls();
 	updatePosition();
 }
 
+void OcularsGuiPanel::setBarlowControlsVisible(bool show)
+{
+	if (show)
+	{
+		if (!barlowControls->isVisible())
+		{
+			barlowControls->setVisible(true);
+			mainLayout->insertItem(2, barlowControls);
+		}
+	}
+	else
+	{
+		if (barlowControls->isVisible())
+		{
+			mainLayout->removeItem(barlowControls);
+			barlowControls->setVisible(false);
+		}
+	}
+	mainLayout->invalidate();
+	mainLayout->activate();
+	resize(mainLayout->geometry().width(),
+	       mainLayout->geometry().height());
+}
+
 void OcularsGuiPanel::setOcularControlsVisible(bool show)
 {
 	if (show)
@@ -881,6 +1008,8 @@
 	Q_ASSERT(fieldTelescopeName);
 	Q_ASSERT(fieldMagnification);
 	Q_ASSERT(fieldFov);
+	Q_ASSERT(fieldBarlowName);
+	Q_ASSERT(fieldBarlowMultipler);
 
 	fieldOcularName->setDefaultTextColor(color);
 	fieldOcularFl->setDefaultTextColor(color);
@@ -891,6 +1020,8 @@
 	fieldTelescopeName->setDefaultTextColor(color);
 	fieldMagnification->setDefaultTextColor(color);
 	fieldFov->setDefaultTextColor(color);
+	fieldBarlowName->setDefaultTextColor(color);
+	fieldBarlowMultipler->setDefaultTextColor(color);
 }
 
 void OcularsGuiPanel::setControlsFont(const QFont& font)
@@ -904,6 +1035,8 @@
 	Q_ASSERT(fieldTelescopeName);
 	Q_ASSERT(fieldMagnification);
 	Q_ASSERT(fieldFov);
+	Q_ASSERT(fieldBarlowName);
+	Q_ASSERT(fieldBarlowMultipler);
 
 	fieldOcularName->setFont(font);
 	fieldOcularFl->setFont(font);
@@ -914,6 +1047,8 @@
 	fieldTelescopeName->setFont(font);
 	fieldMagnification->setFont(font);
 	fieldFov->setFont(font);
+	fieldBarlowName->setFont(font);
+	fieldBarlowMultipler->setFont(font);
 }
 
 void OcularsGuiPanel::setButtonsNightMode(bool nightMode)

=== modified file 'plugins/Oculars/src/gui/OcularsGuiPanel.hpp'
--- plugins/Oculars/src/gui/OcularsGuiPanel.hpp	2012-01-11 10:50:37 +0000
+++ plugins/Oculars/src/gui/OcularsGuiPanel.hpp	2013-01-28 17:20:27 +0000
@@ -61,7 +61,8 @@
 	//! Updates the information that depends on the current telescope.
 	//! Called in both updateOcularControls() and updateCcdControls().
 	void updateTelescopeControls();
-
+	//! Updates the information that depends on the current barlow
+	void updateBarlowControls();
 	//! Sets the color scheme (day/night mode)
 	void setColorScheme(const QString& schemeName);
 
@@ -78,6 +79,7 @@
 	//! Mini-toolbar holding StelButtons
 	QGraphicsWidget* buttonBar;
 	QGraphicsWidget* ocularControls;
+	QGraphicsWidget* barlowControls;
 	QGraphicsWidget* ccdControls;
 	QGraphicsWidget* telescopeControls;
 
@@ -95,6 +97,10 @@
 	StelButton* nextTelescopeButton;
 	StelButton* prevCcdButton;
 	StelButton* nextCcdButton;
+	StelButton* prevBarlowButton;
+	StelButton* nextBarlowButton;
+	QGraphicsTextItem* fieldBarlowName;
+	QGraphicsTextItem* fieldBarlowMultipler;
 	QGraphicsTextItem* fieldOcularName;
 	QGraphicsTextItem* fieldOcularFl;
 	QGraphicsTextItem* fieldOcularAfov;
@@ -118,6 +124,7 @@
 	void setOcularControlsVisible(bool show);
 	void setCcdControlsVisible(bool show);
 	void setTelescopeControlsVisible(bool show);
+	void setBarlowControlsVisible(bool show);
 	//! Updates the positions of the buttons inside the button bar.
 	void updateMainButtonsPositions();
 

=== modified file 'plugins/Oculars/src/gui/ocularDialog.ui'
--- plugins/Oculars/src/gui/ocularDialog.ui	2012-08-10 14:45:17 +0000
+++ plugins/Oculars/src/gui/ocularDialog.ui	2013-01-28 17:20:27 +0000
@@ -596,6 +596,166 @@
           </item>
          </layout>
         </widget>
+        <widget class="QWidget" name="tab">
+         <attribute name="title">
+          <string>Barlow lenses</string>
+         </attribute>
+         <layout class="QHBoxLayout" name="horizontalLayout_4">
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_10">
+            <item>
+             <widget class="QLabel" name="label_6">
+              <property name="text">
+               <string>Barlows</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QListView" name="barlowListView"/>
+            </item>
+            <item>
+             <widget class="QFrame" name="frame_5">
+              <property name="frameShape">
+               <enum>QFrame::StyledPanel</enum>
+              </property>
+              <property name="frameShadow">
+               <enum>QFrame::Raised</enum>
+              </property>
+              <layout class="QHBoxLayout" name="horizontalLayout_3">
+               <property name="leftMargin">
+                <number>0</number>
+               </property>
+               <property name="topMargin">
+                <number>5</number>
+               </property>
+               <property name="rightMargin">
+                <number>0</number>
+               </property>
+               <property name="bottomMargin">
+                <number>0</number>
+               </property>
+               <item>
+                <widget class="QPushButton" name="addBarlow">
+                 <property name="minimumSize">
+                  <size>
+                   <width>0</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="text">
+                  <string>Add</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QPushButton" name="pushButtonMoveBarlowUp">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="minimumSize">
+                  <size>
+                   <width>24</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QPushButton" name="pushButtonMoveBarlowDown">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="minimumSize">
+                  <size>
+                   <width>24</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QPushButton" name="deleteBarlow">
+                 <property name="minimumSize">
+                  <size>
+                   <width>0</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="text">
+                  <string>Delete</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_9">
+            <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="QFormLayout" name="formLayout_4">
+               <item row="0" column="0">
+                <widget class="QLabel" name="label_7">
+                 <property name="text">
+                  <string>Name</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="1">
+                <widget class="QLineEdit" name="barlowName">
+                 <property name="maxLength">
+                  <number>50</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="0">
+                <widget class="QLabel" name="label_13">
+                 <property name="text">
+                  <string>Multiplicity</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="1">
+                <widget class="QLineEdit" name="barlowMultipler">
+                 <property name="maxLength">
+                  <number>5</number>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <spacer name="verticalSpacer_4">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
         <widget class="QWidget" name="CCD">
          <attribute name="title">
           <string>Sensors</string>