Merge lp:~daggerstab/stellarium/oculars-gui-improvement into lp:stellarium

[Bogdan Marinov]

The original name of this branch was "plugins-gui-improvements", but I've changed it to better reflect the contents. It introduces two main changes.

One is a small change to StelGui allowing plug-ins to draw on the same QGraphics widget as the rest of Stellarium's GUI elements.

All of the other changes are to the Oculars plug-in:
- A GUI control panel with buttons has been added in the upper-right corner of the screen. It can be toggled in the configuration window.
- I found what was the problem with the keyboard shortcuts in the pop-up menu. Now it uses the standard "underlined letters" approach and the plug-in is usable with the keyboard only. The menu has been restructured to avoid duplicate shortcut keys.
- The "About" tab of the configuration window is now dynamically filled, including the proper names of the shortcut codes. It should be able to automatically display "Ctrl" and "Cmd" on the appropriate platforms (this should be tested). This will also make easier to make it translateable.
- Buttons allowing change of the order of the items in the lists in the configuration window.
- Fixed the inappropriate flipping of the binoculars view that happened sometimes.
- Fixed a bug with changing the key binding of the "actionShow_Ocular" action.
- And some other stuff - see the revision log below.

I was going to bump the version number, but apparently it is tracked only in the configuration file. As there have been no changes to the format, I decided to skip it.

There were a few more things that I'd like to do, but I'll do them after the merge, if I bother at all.

And if the merge is approved, I'd like to be the one to do it.

[treaves (treaves)]

The menu still does not work for me; I hit the letters, and nothing happens. This could be a Qt bug however. Not sure.

[treaves (treaves)]

As the menu didn't work before, that it still does not is no big deal.

review: Approve

[Bogdan Marinov (daggerstab)]

OK, according to Alexander Wolf, the latest revision enables the shortcuts on Mac. Apparently, they are disabled by default because they don't fit in Apple's design philosophy or something.

More info:
http://doc.qt.nokia.com/stable/qshortcut.html#details
http://doc.qt.nokia.com/stable/qtglobal.html#qt_set_sequence_auto_mnemonic

Unfortunately, this means that the underlines indicating the shortcuts are simply not displayed on a Mac and, by default, on Windows 7 (though this can be changed in the user settings). And this kills the whole idea. :(

Something that needs to be experimented with: using QActions like in your orignal implementation, but with setting their shortcut context to Qt::WidgetShortcut or some of the other values:
http://doc.qt.nokia.com/stable/qaction.html#shortcutContext-prop

QMenu::addAction() returns a pointer to the action, so calling setShortcut() for each menu item will be easy.

I don't have time to experiment with this right now, so I'm inclined to merge the code in its current implementation and make the adjustment later.

[Alexander Wolf (alexwolf)]

Shortcuts on Mac are underlined

[Alexander Wolf (alexwolf)]

review: Approve

[Bogdan Marinov (daggerstab)]

Really? According to the Qt documentation, they shouldn't be. :)

=== modified file 'doc/plugIns.doxygen'
--- doc/plugIns.doxygen	2010-12-03 12:04:33 +0000
+++ doc/plugIns.doxygen	2011-11-24 21:50:30 +0000
@@ -48,7 +48,14 @@
 @section code Coding
 A plugin should contain a main class deriving from the StelModule class as well as an instance of the StelPluginInterface which allows Stellarium to load it. At startup, the StelModuleMgr will load the library, and an instance of the StelModule it contains will be instantiated and added to the list of other "normal" StelModules.
 
-<em>Plugin developers - please note that classes used in plugins must inherit code from the core which is published under the GUN GPL. <b>If you distribute a binary plugin, you must do so under the terms of the same GNU GPL license that Stellarium uses.</b> No sneaky closed-source shenanigans now.</em>
+A plugin can interact with the users in many ways, not limited to:
+ - painting directly on the viewport like other StelModules (see the examples below);
+ - defining <a href="http://doc.qt.nokia.com/latest/qaction.html">QActions</a> triggered with keyboard shortcut combinations with StelGui::addGuiActions();
+ - buttons (StelButton) added to the bottom button bar (BottomStelBar; see the examples below);
+ - windows (subclasses of StelDialog) that can be designed with Qt's UI editor (see the examples and the configuration windows of the official plugins);
+ - custom controls displayed anywhere on the screen based on any of the classes that inherit <a href="http://doc.qt.nokia.com/latest/qgraphicsitem.html">QGraphicsItem</a> (see <a href="http://doc.qt.nokia.com/latest/graphicsview.html">the documentation of Qt's Graphics View Framework</a>). To get a base widget to work on, use StelGui::getSkyGui().
+
+<em>Plugin developers - please note that classes used in plugins must inherit code from the core which is published under the GNU GPL. <strong>If you distribute a binary plugin, you must do so under the terms of the same GNU General Public License that Stellarium uses</strong> (as of August 2011, this is GNU GPL "version 2 or any later version"). No sneaky closed-source shenanigans now.</em>
 
 @section examplePlugins Example Plugins
 
 
=== modified file 'plugins/Oculars/resources/Oculars.qrc'
--- plugins/Oculars/resources/Oculars.qrc	2010-03-26 13:37:41 +0000
+++ plugins/Oculars/resources/Oculars.qrc	2011-11-24 21:50:30 +0000
@@ -1,10 +1,17 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-  <qresource prefix="ocular" >
-    <file>bt_ocular_on.png</file>
-    <file>bt_ocular_off.png</file>
-    <file>normalStyle.css</file>
-    <file>nightStyle.css</file>
-    <file>default_ocular.ini</file>
-  </qresource>
+<RCC>
+    <qresource prefix="/ocular">
+        <file>bt_ocular_on.png</file>
+        <file>bt_ocular_off.png</file>
+        <file>normalStyle.css</file>
+        <file>nightStyle.css</file>
+        <file>default_ocular.ini</file>
+        <file>bt_crosshairs_off.png</file>
+        <file>bt_crosshairs_on.png</file>
+        <file>bt_sensor_off.png</file>
+        <file>bt_sensor_on.png</file>
+        <file>bt_telrad_off.png</file>
+        <file>bt_telrad_on.png</file>
+        <file>bt_settings_off.png</file>
+        <file>bt_settings_on.png</file>
+    </qresource>
 </RCC>
 
=== added file 'plugins/Oculars/resources/bt_crosshairs_off.png'
 Binary files plugins/Oculars/resources/bt_crosshairs_off.png	1970-01-01 00:00:00 +0000 and plugins/Oculars/resources/bt_crosshairs_off.png	2011-11-24 21:50:30 +0000 differ
=== added file 'plugins/Oculars/resources/bt_crosshairs_on.png'
 Binary files plugins/Oculars/resources/bt_crosshairs_on.png	1970-01-01 00:00:00 +0000 and plugins/Oculars/resources/bt_crosshairs_on.png	2011-11-24 21:50:30 +0000 differ
=== modified file 'plugins/Oculars/resources/bt_ocular_off.png'
 Binary files plugins/Oculars/resources/bt_ocular_off.png	2010-01-22 17:37:33 +0000 and plugins/Oculars/resources/bt_ocular_off.png	2011-11-24 21:50:30 +0000 differ
=== modified file 'plugins/Oculars/resources/bt_ocular_on.png'
 Binary files plugins/Oculars/resources/bt_ocular_on.png	2010-01-22 17:37:33 +0000 and plugins/Oculars/resources/bt_ocular_on.png	2011-11-24 21:50:30 +0000 differ
=== added file 'plugins/Oculars/resources/bt_sensor_off.png'
 Binary files plugins/Oculars/resources/bt_sensor_off.png	1970-01-01 00:00:00 +0000 and plugins/Oculars/resources/bt_sensor_off.png	2011-11-24 21:50:30 +0000 differ
=== added file 'plugins/Oculars/resources/bt_sensor_on.png'
 Binary files plugins/Oculars/resources/bt_sensor_on.png	1970-01-01 00:00:00 +0000 and plugins/Oculars/resources/bt_sensor_on.png	2011-11-24 21:50:30 +0000 differ
=== added file 'plugins/Oculars/resources/bt_settings_off.png'
 Binary files plugins/Oculars/resources/bt_settings_off.png	1970-01-01 00:00:00 +0000 and plugins/Oculars/resources/bt_settings_off.png	2011-11-24 21:50:30 +0000 differ
=== added file 'plugins/Oculars/resources/bt_settings_on.png'
 Binary files plugins/Oculars/resources/bt_settings_on.png	1970-01-01 00:00:00 +0000 and plugins/Oculars/resources/bt_settings_on.png	2011-11-24 21:50:30 +0000 differ
=== added file 'plugins/Oculars/resources/bt_telrad_off.png'
 Binary files plugins/Oculars/resources/bt_telrad_off.png	1970-01-01 00:00:00 +0000 and plugins/Oculars/resources/bt_telrad_off.png	2011-11-24 21:50:30 +0000 differ
=== added file 'plugins/Oculars/resources/bt_telrad_on.png'
 Binary files plugins/Oculars/resources/bt_telrad_on.png	1970-01-01 00:00:00 +0000 and plugins/Oculars/resources/bt_telrad_on.png	2011-11-24 21:50:30 +0000 differ
=== modified file 'plugins/Oculars/src/CMakeLists.txt'
--- plugins/Oculars/src/CMakeLists.txt	2011-01-06 20:50:30 +0000
+++ plugins/Oculars/src/CMakeLists.txt	2011-11-24 21:50:30 +0000
@@ -19,6 +19,8 @@
   gui/OcularDialog.cpp
   gui/PropertyBasedTableModel.hpp
   gui/PropertyBasedTableModel.cpp
+  gui/OcularsGuiPanel.hpp
+  gui/OcularsGuiPanel.cpp
 )
 
 SET(Oculars_RES ../resources/Oculars.qrc)
@@ -39,6 +41,7 @@
   Telescope.hpp
   gui/OcularDialog.hpp
   gui/PropertyBasedTableModel.hpp
+  gui/OcularsGuiPanel.hpp
 )
 
 # After this call, Oculars_MOC_SRCS = moc_Oculars.cxx
 
=== modified file 'plugins/Oculars/src/Oculars.cpp'
--- plugins/Oculars/src/Oculars.cpp	2011-11-12 22:55:30 +0000
+++ plugins/Oculars/src/Oculars.cpp	2011-11-24 21:50:30 +0000
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2009 Timothy Reaves
+ * Copyright (C) 2011 Bogdan Marinov
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,6 +18,7 @@
  */
 
 #include "Oculars.hpp"
+#include "OcularsGuiPanel.hpp"
 
 #include "GridLinesMgr.hpp"
 #include "LabelMgr.hpp"
@@ -33,8 +35,10 @@
 #include "StelGuiItems.hpp"
 #include "StelMainWindow.hpp"
 #include "StelTranslator.hpp"
+#include "SkyGui.hpp"
 
 #include <QAction>
+#include <QGraphicsWidget>
 #include <QKeyEvent>
 #include <QDebug>
 #include <QMenu>
@@ -51,6 +55,10 @@
 #include <GL/glu.h>	/* Header File For The GLU Library */
 #endif
 
+#ifdef Q_WS_MAC
+extern void qt_set_sequence_auto_mnemonic(bool b);
+#endif
+
 static QSettings *settings; //!< The settings as read in from the ini file.
 
 /* ********************************************************************* */
@@ -74,7 +82,7 @@
 	StelPluginInfo info;
 	info.id = "Oculars";
 	info.displayedName = N_("Oculars");
-	info.authors = "Timothy Reaves";
+	info.authors = "Timothy Reaves, Bogdan Marinov";
 	info.contact = "[e-mail]";
 	info.description = N_("Shows the sky as if looking through a telescope eyepiece. (Only magnification and field of view are simulated.) It can also show a sensor frame and a Telrad sight.");
 	return info;
@@ -89,7 +97,16 @@
 #pragma mark Instance Methods
 #endif
 /* ********************************************************************* */
-Oculars::Oculars() : pxmapGlow(NULL), pxmapOnIcon(NULL), pxmapOffIcon(NULL), toolbarButton(NULL)
+Oculars::Oculars():
+	pxmapGlow(NULL),
+	pxmapOnIcon(NULL),
+	pxmapOffIcon(NULL),
+	toolbarButton(NULL),
+	actionShowOcular(0),
+	actionShowCrosshairs(0),
+	actionShowSensor(0),
+	actionShowTelrad(0),
+	guiPanel(0)
 {
 	flagShowCCD = false;
 	flagShowOculars = false;
@@ -118,12 +135,17 @@
 
 	setObjectName("Oculars");
 
+#ifdef Q_WS_MAC
+	qt_set_sequence_auto_mnemonic(true);
+#endif
 }
 
 Oculars::~Oculars()
 {
 	delete ocularDialog;
 	ocularDialog = NULL;
+	if (guiPanel)
+		delete guiPanel;
 	
 	if (pxmapGlow)
 		delete pxmapGlow;
@@ -211,7 +233,7 @@
 	if (flagShowTelrad) {
 		paintTelrad();
 	} else if (flagShowOculars){
-		// Insure there is a selected ocular & telescope
+		// Ensure there is a selected ocular & telescope
 		if (selectedCCDIndex > ccds.count()) {
 			qWarning() << "Oculars: the selected sensor index of "
 						  << selectedCCDIndex << " is greater than the sensor count of "
@@ -238,17 +260,37 @@
 					paintCrosshairs();
 				}
 			}
+			if (guiPanelEnabled)
+			{
+				// Reset the state to allow the panel to be painted normally
+				glDisable(GL_TEXTURE_2D);
+				glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+				glEnable(GL_BLEND);
+			}
+			else
+			{
+				// Paint the information in the upper-right hand corner
+				paintText(core);
+			}
+		}
+	} else if (flagShowCCD) {
+		paintCCDBounds();
+		if (guiPanelEnabled)
+		{
+			// Reset the state to allow the panel to be painted normally
+			glDisable(GL_TEXTURE_2D);
+			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+			glEnable(GL_BLEND);
+		}
+		else
+		{
 			// Paint the information in the upper-right hand corner
 			paintText(core);
 		}
-	} else if (flagShowCCD) {
-		paintCCDBounds();
-		// Paint the information in the upper-right hand corner
-		paintText(core);
-	}	
+	}
 }
 
-//! Determine which "layer" the plagin's drawing will happen on.
+//! Determine which "layer" the plugin's drawing will happen on.
 double Oculars::getCallOrder(StelModuleActionName actionName) const
 {
 	// TODO; this really doesn't seem to have any effect.  I've tried everything from -100 to +100,
@@ -287,12 +329,7 @@
 			movementManager->setFlagTracking(true);
 		} else {
 			// remove the usage label if it is being displayed.
-			if (usageMessageLabelID > -1) {
-				LabelMgr *labelManager = GETSTELMODULE(LabelMgr);
-				labelManager->setLabelShow(usageMessageLabelID, false);
-				labelManager->deleteLabel(usageMessageLabelID);
-				usageMessageLabelID = -1;
-			}
+			hideUsageMessageIfDisplayed();
 		}
 	} else if(flagShowOculars) {
 		//TODO: this is broke in Stellarium.
@@ -465,9 +502,12 @@
 			selectedTelescopeIndex = 0;
 		}
 
-		ocularDialog = new OcularDialog(&ccds, &oculars, &telescopes);
+		ocularDialog = new OcularDialog(this, &ccds, &oculars, &telescopes);
 		initializeActivationActions();
 		determineMaxEyepieceAngle();
+		
+		guiPanelEnabled = settings->value("enable_control_panel", false).toBool();
+		enableGuiPanel(guiPanelEnabled);
 	} catch (std::runtime_error& e) {
 		qWarning() << "WARNING: unable to locate ocular.ini file or create a default one for Ocular plugin: " << e.what();
 		ready = false;
@@ -553,12 +593,84 @@
 	}
 }
 
+void Oculars::enableGuiPanel(bool enable)
+{
+	if (enable)
+	{
+		if (!guiPanel)
+		{
+			StelApp& app = StelApp::getInstance();
+			StelGui* gui = dynamic_cast<StelGui*>(app.getGui());
+			Q_ASSERT(gui);
+			guiPanel = new OcularsGuiPanel(this, gui->getSkyGui());
+		}
+	}
+	else
+	{
+		if (guiPanel)
+		{
+			guiPanel->hide();
+			delete guiPanel;
+			guiPanel = 0;
+		}
+	}
+	guiPanelEnabled = enable;
+	settings->setValue("enable_control_panel", enable);
+	settings->sync();
+}
+
 /* ********************************************************************* */
 #if 0
 #pragma mark -
 #pragma mark Slots Methods
 #endif
 /* ********************************************************************* */
+void Oculars::updateLists()
+{
+	if (oculars.isEmpty())
+	{
+		selectedOcularIndex = -1;
+		actionShowOcular->setChecked(false);
+	}
+	else
+	{
+		if (selectedOcularIndex >= oculars.count())
+			selectedOcularIndex = oculars.count() - 1;
+
+		if (flagShowOculars)
+			emit selectedOcularChanged();
+	}
+
+	if (telescopes.isEmpty())
+	{
+		selectedTelescopeIndex = -1;
+		actionShowOcular->setChecked(false);
+		actionShowSensor->setChecked(false);
+	}
+	else
+	{
+		if (selectedTelescopeIndex >= telescopes.count())
+			selectedTelescopeIndex = telescopes.count() - 1;
+
+		if (flagShowOculars || flagShowCCD)
+			emit selectedTelescopeChanged();
+	}
+
+	if (ccds.isEmpty())
+	{
+		selectedCCDIndex = -1;
+		actionShowSensor->setChecked(false);
+	}
+	else
+	{
+		if (selectedCCDIndex >= ccds.count())
+			selectedCCDIndex = ccds.count() - 1;
+
+		if (flagShowCCD)
+			emit selectedCCDChanged();
+	}
+}
+
 void Oculars::ccdRotationReset()
 {
 	ccdRotationAngle = 0.0;
@@ -566,14 +678,25 @@
 
 void Oculars::enableOcular(bool enableOcularMode)
 {
-	// If showing a CCD, cancel it.
-	if (flagShowCCD) {
-		flagShowCCD = false;
-		selectedCCDIndex = -1;
-	}
-	
-	if (enableOcularMode) {
-		// Check to insure that we have enough oculars & telescopes, as they may have been edited in the config dialog
+	if (enableOcularMode)
+	{
+		// Close the sensor view if it's displayed
+		if (flagShowCCD)
+		{
+			if (actionShowSensor->isChecked())
+				actionShowSensor->setChecked(false);
+			flagShowCCD = false;
+			selectedCCDIndex = -1;
+		}
+
+		// Close the Telrad sight if it's displayed
+		if (flagShowTelrad)
+		{
+			if (actionShowTelrad->isChecked())
+				actionShowTelrad->setChecked(false);
+		}
+
+		// Check to ensure that we have enough oculars & telescopes, as they may have been edited in the config dialog
 		if (oculars.count() == 0) {
 			selectedOcularIndex = -1;
 			qWarning() << "No oculars found";
@@ -596,11 +719,11 @@
 	StelCore *core = StelApp::getInstance().getCore();
 	LabelMgr* labelManager = GETSTELMODULE(LabelMgr);
 
-	// Toggle the plugin on & off.  To toggle on, we want to ensure there is a selected object.
+	// Toggle the ocular view on & off. To toggle on, we want to ensure there is a selected object.
 	if (!flagShowOculars && requireSelection && !StelApp::getInstance().getStelObjectMgr().getWasSelected() ) {
 		if (usageMessageLabelID == -1) {
 			QFontMetrics metrics(font);
-			QString labelText = "Please select an object before enabling Ocular.";
+			QString labelText = "Please select an object before switching to ocular view.";
 			StelProjector::StelProjectorParams projectorParams = core->getCurrentStelProjectorParams();
 			int xPosition = projectorParams.viewportCenter[0];
 			xPosition = xPosition - 0.5 * (metrics.width(labelText));
@@ -610,21 +733,20 @@
 																			true, font.pixelSize(), "#99FF99");
 		}
 		// we didn't accept the new status - make sure the toolbar button reflects this
-		StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
-		Q_ASSERT(gui);
-		disconnect(gui->getGuiActions("actionShow_Ocular"), SIGNAL(toggled(bool)), this, SLOT(enableOcular(bool)));
-		gui->getGuiActions("actionShow_Ocular")->setChecked(false);
-		connect(gui->getGuiActions("actionShow_Ocular"), SIGNAL(toggled(bool)), this, SLOT(enableOcular(bool)));
+		disconnect(actionShowOcular, SIGNAL(toggled(bool)),
+		           this, SLOT(enableOcular(bool)));
+		actionShowOcular->setChecked(false);
+		connect(actionShowOcular, SIGNAL(toggled(bool)),
+		        this, SLOT(enableOcular(bool)));
 	} else {
 		if (selectedOcularIndex != -1) {
 			// remove the usage label if it is being displayed.
-			if (usageMessageLabelID > -1) {
-				labelManager->setLabelShow(usageMessageLabelID, false);
-				labelManager->deleteLabel(usageMessageLabelID);
-				usageMessageLabelID = -1;
-			}
+			hideUsageMessageIfDisplayed();
 			flagShowOculars = enableOcularMode;
 			zoom(false);
+			//BM: I hope this is the right place...
+			if (guiPanel)
+				guiPanel->showOcularGui();
 		}
 	}
 }
@@ -632,7 +754,7 @@
 void Oculars::decrementCCDIndex()
 {
 	selectedCCDIndex--;
-	if (selectedCCDIndex == -2) {
+	if (selectedCCDIndex == -1) {
 		selectedCCDIndex = ccds.count() - 1;
 	}
 	emit(selectedCCDChanged());
@@ -671,136 +793,165 @@
 
 void Oculars::displayPopupMenu()
 {
-	QMenu* popup = new QMenu();
+	QMenu* popup = new QMenu(&StelMainWindow::getInstance());
 
-	if (flagShowOculars) {
+	if (flagShowOculars)
+	{
 		// We are in Oculars mode
 		// We want to show all of the Oculars, and if the current ocular is not a binocular,
 		// we will also show the telescopes.
-		if (oculars.count() > 0) {
-			popup->addAction("previous ocular", this, SLOT(decrementOcularIndex()), Qt::Key_1);
-			popup->addAction("next ocular", this, SLOT(incrementOcularIndex()), Qt::Key_2);
-			QMenu* submenu = new QMenu("select ocular", popup);
+		if (!oculars.isEmpty())
+		{
+			popup->addAction("&Previous ocular", this, SLOT(decrementOcularIndex()));
+			popup->addAction("&Next ocular", this, SLOT(incrementOcularIndex()));
+			QMenu* submenu = new QMenu("Select &ocular", popup);
 			int availableOcularCount = 0;
-			for (int index = 0; index < oculars.count(); ++index) {
+			for (int index = 0; index < oculars.count(); ++index)
+			{
+				QString label;
+				if (availableOcularCount < 10)
+				{
+					label = QString("&%1: %2").arg(availableOcularCount).arg(oculars[index]->name());
+				}
+				else
+				{
+					label = oculars[index]->name();
+				}
+				//BM: Does this happen at all any more?
+				QAction* action = 0;
 				if (selectedTelescopeIndex == -1) {
 					if (oculars[index]->isBinoculars()) {
-						QAction* action = submenu->addAction(oculars[index]->name(), ocularsSignalMapper, SLOT(map()), 
-																		 QKeySequence(QString("%1").arg(availableOcularCount++)));
+						action = submenu->addAction(label, ocularsSignalMapper, SLOT(map()));
+						availableOcularCount++;
 						ocularsSignalMapper->setMapping(action, QString("%1").arg(index));
 					}
 				} else {
-					QAction* action = submenu->addAction(oculars[index]->name(), ocularsSignalMapper, SLOT(map()), 
-																	 QKeySequence(QString("%1").arg(availableOcularCount++)));
+					action = submenu->addAction(label, ocularsSignalMapper, SLOT(map()));
+					availableOcularCount++;
 					ocularsSignalMapper->setMapping(action, QString("%1").arg(index));
 				}
-			}
-			popup->addMenu(submenu);
-			popup->addSeparator();
-		}
-
-		if (telescopes.count() > 0 && (selectedOcularIndex > -1 && !oculars[selectedOcularIndex]->isBinoculars())) {
-			popup->addAction("previous telescope", this, SLOT(decrementTelescopeIndex()), Qt::Key_3);
-			popup->addAction("next telescope", this, SLOT(incrementTelescopeIndex()), Qt::Key_4);
-			QMenu* submenu = new QMenu("select telescope", popup);
-			for (int index = 0; index < telescopes.count(); ++index) {
-				QAction* action = submenu->addAction(telescopes[index]->name(), telescopesSignalMapper, SLOT(map()), 
-																 QKeySequence(QString("%1").arg(index)));
-				telescopesSignalMapper->setMapping(action, QString("%1").arg(index));
-			}
-			popup->addMenu(submenu);
-			popup->addSeparator();
-		}
-
-		popup->addAction("toggle crosshair", this, SLOT(toggleCrosshair()), Qt::Key_5);
+				if (action && index == selectedOcularIndex)
+				{
+					action->setCheckable(true);
+					action->setChecked(true);
+				}
+			}
+			popup->addMenu(submenu);
+			popup->addSeparator();
+		}
+
+		// If there is more than one telescope, show the prev/next/list complex.
+		// If the selected ocular is a binoculars, show nothing.
+		if (telescopes.count() > 1 && (selectedOcularIndex > -1 && !oculars[selectedOcularIndex]->isBinoculars()))
+		{
+			QMenu* submenu = addTelescopeSubmenu(popup);
+			popup->addMenu(submenu);
+			popup->addSeparator();
+		}
+
+		QAction* action = popup->addAction("Toggle &crosshair");
+		action->setCheckable(true);
+		action->setChecked(flagShowCrosshairs);
+		connect(action, SIGNAL(toggled(bool)),
+		        actionShowCrosshairs, SLOT(setChecked(bool))); 
 	} else {
-		int outerMenuLevel = 1;
-		// We are not in Oculars mode
-		// We want to show the CCD's, and if a CCD is selected, the Telescopes (as a CCD requires a telescope),
-		// and the general menu items.
-		QAction* action = new QAction("Configure Oculars", popup);
-		action->setCheckable(TRUE);
-		action->setShortcut(QString("%1").arg(outerMenuLevel++));
-		connect(action, SIGNAL(toggled(bool)), ocularDialog, SLOT(setVisible(bool)));
-		connect(ocularDialog, SIGNAL(visibleChanged(bool)), action, SLOT(setChecked(bool)));
+		// We are not in ocular mode
+		// We want to show the CCD's, and if a CCD is selected, the telescopes
+		//(as a CCD requires a telescope) and the general menu items.
+		QAction* action = new QAction("Configure &Oculars", popup);
+		action->setCheckable(true);
+		action->setChecked(ocularDialog->visible());
+		connect(action, SIGNAL(triggered(bool)),
+		        ocularDialog, SLOT(setVisible(bool)));
 		popup->addAction(action);
 		popup->addSeparator();
 
 		if (!flagShowTelrad) {
-			popup->addAction("Toggle CCD", this, SLOT(toggleCCD()), QKeySequence(QString("%1").arg(outerMenuLevel++)));
+			QAction* action = popup->addAction("Toggle &CCD");
+			action->setCheckable(true);
+			action->setChecked(flagShowCCD);
+			connect(action, SIGNAL(toggled(bool)),
+			        actionShowSensor, SLOT(setChecked(bool)));
 		}
 		
 		if (!flagShowCCD) {
-			popup->addAction("Toggle Telrad", this,
-								  SLOT(toggleTelrad()), QKeySequence(QString("%1").arg(outerMenuLevel++)));
+			QAction* action = popup->addAction("Toggle &Telrad");
+			action->setCheckable(true);
+			action->setChecked(flagShowTelrad);
+			connect(action, SIGNAL(toggled(bool)),
+			        actionShowTelrad, SLOT(setChecked(bool)));
 		}
-
+		
 		popup->addSeparator();
-		if (selectedCCDIndex > -1 && selectedTelescopeIndex > -1) {
-			popup->addAction("previous CCD", this,
-								  SLOT(decrementCCDIndex()), QKeySequence(QString("%1").arg(outerMenuLevel++)));
-			popup->addAction("next CCD", this,
-								  SLOT(incrementCCDIndex()), QKeySequence(QString("%1").arg(outerMenuLevel++)));
-			QMenu* submenu = new QMenu("select CCD", popup);
-			for (int index = 0; index < ccds.count(); ++index) {
-				QAction* action = submenu->addAction(ccds[index]->name(), ccdsSignalMapper, SLOT(map()), 
-																 QKeySequence(QString("%1").arg(index)));
+		if (flagShowCCD && selectedCCDIndex > -1 && selectedTelescopeIndex > -1)
+		{
+			popup->addAction("&Previous CCD", this, SLOT(decrementCCDIndex()));
+			popup->addAction("&Next CCD", this, SLOT(incrementCCDIndex()));
+			QMenu* submenu = new QMenu("&Select CCD", popup);
+			for (int index = 0; index < ccds.count(); ++index)
+			{
+				QString label;
+				if (index < 10)
+				{
+					label = QString("&%1: %2").arg(index).arg(ccds[index]->name());
+				}
+				else
+				{
+					label = ccds[index]->name();
+				}
+				QAction* action = submenu->addAction(label, ccdsSignalMapper, SLOT(map()));
+				if (index == selectedCCDIndex)
+				{
+					action->setCheckable(true);
+					action->setChecked(true);
+				}
 				ccdsSignalMapper->setMapping(action, QString("%1").arg(index));
 			}
 			popup->addMenu(submenu);
 			
-			submenu = new QMenu("Rotate CCD", popup);
+			submenu = new QMenu("&Rotate CCD", popup);
 			QAction* rotateAction = NULL;
-			rotateAction = submenu->addAction(QString("-90") + QChar(0x00B0),
-														 ccdRotationSignalMapper, SLOT(map()), Qt::Key_1);
+			rotateAction = submenu->addAction(QString("&1: -90") + QChar(0x00B0),
+														 ccdRotationSignalMapper, SLOT(map()));
 			ccdRotationSignalMapper->setMapping(rotateAction, QString("-90"));
-			rotateAction = submenu->addAction(QString("-45") + QChar(0x00B0),
-														 ccdRotationSignalMapper, SLOT(map()), Qt::Key_2);
+			rotateAction = submenu->addAction(QString("&2: -45") + QChar(0x00B0),
+														 ccdRotationSignalMapper, SLOT(map()));
 			ccdRotationSignalMapper->setMapping(rotateAction, QString("-45"));
-			rotateAction = submenu->addAction(QString("-15") + QChar(0x00B0),
-														 ccdRotationSignalMapper, SLOT(map()), Qt::Key_3);
+			rotateAction = submenu->addAction(QString("&3: -15") + QChar(0x00B0),
+														 ccdRotationSignalMapper, SLOT(map()));
 			ccdRotationSignalMapper->setMapping(rotateAction, QString("-15"));
-			rotateAction = submenu->addAction(QString("-5") + QChar(0x00B0),
-														 ccdRotationSignalMapper, SLOT(map()), Qt::Key_4);
+			rotateAction = submenu->addAction(QString("&4: -5") + QChar(0x00B0),
+														 ccdRotationSignalMapper, SLOT(map()));
 			ccdRotationSignalMapper->setMapping(rotateAction, QString("-5"));
-			rotateAction = submenu->addAction(QString("-1") + QChar(0x00B0),
-														 ccdRotationSignalMapper, SLOT(map()), Qt::Key_5);
+			rotateAction = submenu->addAction(QString("&5: -1") + QChar(0x00B0),
+														 ccdRotationSignalMapper, SLOT(map()));
 			ccdRotationSignalMapper->setMapping(rotateAction, QString("-1"));
-			rotateAction = submenu->addAction(QString("+1") + QChar(0x00B0),
-														 ccdRotationSignalMapper, SLOT(map()), Qt::Key_6);
+			rotateAction = submenu->addAction(QString("&6: +1") + QChar(0x00B0),
+														 ccdRotationSignalMapper, SLOT(map()));
 			ccdRotationSignalMapper->setMapping(rotateAction, QString("1"));
-			rotateAction = submenu->addAction(QString("+5") + QChar(0x00B0),
-														 ccdRotationSignalMapper, SLOT(map()), Qt::Key_7);
+			rotateAction = submenu->addAction(QString("&7: +5") + QChar(0x00B0),
+														 ccdRotationSignalMapper, SLOT(map()));
 			ccdRotationSignalMapper->setMapping(rotateAction, QString("5"));
-			rotateAction = submenu->addAction(QString("+15") + QChar(0x00B0),
-														 ccdRotationSignalMapper, SLOT(map()), Qt::Key_8);
+			rotateAction = submenu->addAction(QString("&8: +15") + QChar(0x00B0),
+														 ccdRotationSignalMapper, SLOT(map()));
 			ccdRotationSignalMapper->setMapping(rotateAction, QString("15"));
-			rotateAction = submenu->addAction(QString("+45") + QChar(0x00B0),
-														 ccdRotationSignalMapper, SLOT(map()), Qt::Key_9);
+			rotateAction = submenu->addAction(QString("&9: +45") + QChar(0x00B0),
+														 ccdRotationSignalMapper, SLOT(map()));
 			ccdRotationSignalMapper->setMapping(rotateAction, QString("45"));
-			rotateAction = submenu->addAction(QString("+90") + QChar(0x00B0),
-														 ccdRotationSignalMapper, SLOT(map()), Qt::Key_0);
+			rotateAction = submenu->addAction(QString("&0: +90") + QChar(0x00B0),
+														 ccdRotationSignalMapper, SLOT(map()));
 			ccdRotationSignalMapper->setMapping(rotateAction, QString("90"));
-			rotateAction = submenu->addAction("Reset", this, SLOT(ccdRotationReset()), Qt::Key_R);
+			rotateAction = submenu->addAction("&Reset", this, SLOT(ccdRotationReset()));
 			popup->addMenu(submenu);
 			
 			popup->addSeparator();
 		}
-		if (selectedCCDIndex > -1 && telescopes.count() > 0) {
-			popup->addAction("previous telescope", this,
-								  SLOT(decrementTelescopeIndex()), QKeySequence(QString("%1").arg(outerMenuLevel++)));
-			popup->addAction("next telescope", this,
-								  SLOT(incrementTelescopeIndex()), QKeySequence(QString("%1").arg(outerMenuLevel++)));
-			QMenu* submenu = new QMenu("select telescope", popup);
-			for (int index = 0; index < telescopes.count(); ++index) {
-				QAction* action = submenu->addAction(telescopes[index]->name(), telescopesSignalMapper, SLOT(map()), 
-																 QKeySequence(QString("%1").arg(index)));
-				telescopesSignalMapper->setMapping(action, QString("%1").arg(index));
-			}
+		if (flagShowCCD && selectedCCDIndex > -1 && telescopes.count() > 1)
+		{
+			QMenu* submenu = addTelescopeSubmenu(popup);
 			popup->addMenu(submenu);
 			popup->addSeparator();
 		}
-		
 	}
 
 	popup->exec(QCursor::pos());
@@ -811,7 +962,7 @@
 {
 	selectedCCDIndex++;
 	if (selectedCCDIndex == ccds.count()) {
-		selectedCCDIndex = -1;
+		selectedCCDIndex = 0;
 	}
 	emit(selectedCCDChanged());
 }
@@ -850,6 +1001,10 @@
 void Oculars::rotateCCD(QString amount)
 {
 	ccdRotationAngle += amount.toInt();
+	if (ccdRotationAngle >= 360)
+		ccdRotationAngle -= 360;
+	if (ccdRotationAngle <= -360)
+		ccdRotationAngle += 360;
 }
 
 void Oculars::selectCCDAtIndex(QString indexString)
@@ -891,46 +1046,103 @@
 	}
 }
 
-void Oculars::toggleCCD()
+void Oculars::toggleCCD(bool show)
 {
-	StelCore *core = StelApp::getInstance().getCore();
-	StelMovementMgr *movementManager = core->getMovementMgr();
-	if (flagShowCCD) {
+	//If there are no sensors...
+	if (ccds.isEmpty() || telescopes.isEmpty())
+	{
+		//TODO: BM: Make this an on-screen message and/or disable the button
+		//if there are no sensors.
+		if (show)
+			qWarning() << "Oculars plugin: Unable to display a sensor boundary:"
+			           << "No sensors or telescopes are defined.";
 		flagShowCCD = false;
 		selectedCCDIndex = -1;
-		movementManager->zoomTo(movementManager->getInitFov());
-		movementManager->setFlagTracking(false);
-	} else {
-		// Check to insure that we have enough CCDs & telescopes, as they may have been edited in the config dialog
-		if (ccds.count() == 0) {
-			selectedCCDIndex = -1;
-			qDebug() << "No CCDs found";
-		} else if (ccds.count() > 0 && selectedCCDIndex == -1) {
+		show = false;
+		if (actionShowSensor->isChecked())
+			actionShowSensor->setChecked(false);
+	}
+
+	if (show)
+	{
+		//Mutually exclusive with the ocular mode
+		hideUsageMessageIfDisplayed();
+		if (flagShowOculars)
+		{
+			if (actionShowOcular->isChecked())
+				actionShowOcular->setChecked(false);
+		}
+
+		if (flagShowTelrad)
+		{
+			if (actionShowTelrad->isChecked())
+				actionShowTelrad->setChecked(false);
+		}
+
+		if (selectedTelescopeIndex < 0)
+			selectedTelescopeIndex = 0;
+		if (selectedCCDIndex < 0)
 			selectedCCDIndex = 0;
-		}
-		if (telescopes.count() == 0) {
-			selectedTelescopeIndex = -1;
-			qDebug() << "No telescopes found";
-		} else if (telescopes.count() > 0 && selectedTelescopeIndex == -1) {
-			selectedTelescopeIndex = 0;
-		}		
-		if (!ready  || selectedCCDIndex == -1 || selectedTelescopeIndex == -1 ) {
-			qDebug() << "The Oculars module has been disabled.";
-			return;
-		}
 		flagShowCCD = true;
 		setScreenFOVForCCD();
-	}
-}
-
-void Oculars::toggleCrosshair()
-{
-	flagShowCrosshairs = !flagShowCrosshairs;
+
+		if (guiPanel)
+			guiPanel->showCcdGui();
+	}
+	else
+	{
+		flagShowCCD = false;
+
+		//Zoom out
+		StelCore *core = StelApp::getInstance().getCore();
+		StelMovementMgr *movementManager = core->getMovementMgr();
+		movementManager->zoomTo(movementManager->getInitFov());
+		movementManager->setFlagTracking(false);
+
+		if (guiPanel)
+			guiPanel->foldGui();
+	}
+}
+
+void Oculars::toggleCCD()
+{
+	if (flagShowCCD)
+		toggleCCD(false);
+	else
+		toggleCCD(true);
+}
+
+void Oculars::toggleCrosshairs(bool show)
+{
+	if (show && flagShowOculars)
+	{
+		flagShowCrosshairs = true;
+	}
+	else
+	{
+		flagShowCrosshairs = false;
+	}
+}
+
+void Oculars::toggleTelrad(bool show)
+{
+	if (show)
+	{
+		hideUsageMessageIfDisplayed();
+		if (actionShowOcular->isChecked())
+			actionShowOcular->setChecked(false);
+		if (actionShowSensor->isChecked())
+			actionShowSensor->setChecked(false);
+	}
+	flagShowTelrad = show;
 }
 
 void Oculars::toggleTelrad()
 {
-	flagShowTelrad = !flagShowTelrad;
+	if (flagShowTelrad)
+		toggleTelrad(false);
+	else
+		toggleTelrad(true);
 }
 
 /* ********************************************************************* */
@@ -953,12 +1165,13 @@
 	//the necessary button is created to prevent the button from being checked
 	//the first time this action is checked. See:
 	//http://doc.qt.nokia.com/4.7/signalsandslots.html#signals
-	gui->addGuiActions("actionShow_Ocular",
-							 N_("Ocular view"),
-							 settings->value("bindings/toggle_oculars", "Ctrl+O").toString(),
-							 N_("Plugin Key Bindings"),
-							 true);
-	gui->getGuiActions("actionShow_Ocular")->setChecked(flagShowOculars);
+	QString shortcutStr = settings->value("bindings/toggle_oculars", "Ctrl+O").toString();
+	actionShowOcular = gui->addGuiActions("actionShow_Ocular",
+	                                      N_("Ocular view"),
+	                                      shortcutStr,
+	                                      group,
+	                                      true);
+	actionShowOcular->setChecked(flagShowOculars);
 	// Make a toolbar button
 	try {
 		pxmapGlow = new QPixmap(":/graphicGui/glow32x32.png");
@@ -968,19 +1181,56 @@
 										*pxmapOnIcon,
 										*pxmapOffIcon,
 										*pxmapGlow,
-										gui->getGuiActions("actionShow_Ocular"));
+										actionShowOcular);
 		gui->getButtonBar()->addButton(toolbarButton, "065-pluginsGroup");
 	} catch (std::runtime_error& e) {
 		qWarning() << "WARNING: unable create toolbar button for Oculars plugin: " << e.what();
 	}
-	connect(gui->getGuiActions("actionShow_Ocular"), SIGNAL(toggled(bool)), this, SLOT(enableOcular(bool)));
-
-	gui->addGuiActions("actionShow_Ocular_Menu",
-							 N_("Oculars popup menu"),
-							 settings->value("bindings/popup_navigator", "Alt+O").toString(),
-							 group,
-							 true);
-	connect(gui->getGuiActions("actionShow_Ocular_Menu"), SIGNAL(toggled(bool)), this, SLOT(displayPopupMenu()));
+	connect(actionShowOcular, SIGNAL(toggled(bool)),
+	        this, SLOT(enableOcular(bool)));
+
+	shortcutStr = settings->value("bindings/popup_navigator", "Alt+O").toString();
+	actionMenu = gui->addGuiActions("actionShow_Ocular_Menu",
+	                                N_("Oculars popup menu"),
+	                                shortcutStr,
+	                                group,
+	                                true);
+	connect(actionMenu, SIGNAL(toggled(bool)),
+	        this, SLOT(displayPopupMenu()));
+
+	actionShowCrosshairs = gui->addGuiActions("actionShow_Ocular_Crosshairs",
+	                                          N_("Crosshairs"),
+	                                          QString(),
+	                                          group,
+	                                          true);
+	connect(actionShowCrosshairs, SIGNAL(toggled(bool)),
+	        this, SLOT(toggleCrosshairs(bool)));
+
+	actionShowSensor = gui->addGuiActions("actionShow_Sensor",
+	                                      N_("Sensor"),
+	                                      QString(),
+	                                      group,
+	                                      true);
+	connect(actionShowSensor, SIGNAL(toggled(bool)),
+			this, SLOT(toggleCCD(bool)));
+
+	actionShowTelrad = gui->addGuiActions("actionShow_Telrad",
+	                                      N_("Telrad"),
+	                                      QString(),
+	                                      group,
+	                                      true);
+	connect(actionShowTelrad, SIGNAL(toggled(bool)),
+	        this, SLOT(toggleTelrad(bool)));
+
+	actionConfiguration = gui->addGuiActions("actionOpen_Oculars_Configuration",
+	                                         N_("Oculars plugin configuration"),
+	                                         QString(),
+	                                         group,
+	                                         true);
+	connect(actionConfiguration, SIGNAL(toggled(bool)),
+	        ocularDialog, SLOT(setVisible(bool)));
+	connect(ocularDialog, SIGNAL(visibleChanged(bool)),
+	        actionConfiguration, SLOT(setChecked(bool)));
 
 	connect(this, SIGNAL(selectedCCDChanged()), this, SLOT(instrumentChanged()));
 	connect(this, SIGNAL(selectedCCDChanged()), this, SLOT(setScreenFOVForCCD()));
@@ -1354,7 +1604,13 @@
 	Ocular *ocular = oculars[selectedOcularIndex];
 	Telescope *telescope = NULL;
 	// Only consider flip is we're not binoculars
-	if (!ocular->isBinoculars()) {
+	if (ocular->isBinoculars())
+	{
+		core->setFlipHorz(false);
+		core->setFlipVert(false);
+	}
+	else
+	{
 		telescope = telescopes[selectedTelescopeIndex];
 		core->setFlipHorz(telescope->isHFlipped());
 		core->setFlipVert(telescope->isVFlipped());
@@ -1368,3 +1624,44 @@
 	movementManager->zoomTo(actualFOV, 0.0);
 }
 
+void Oculars::hideUsageMessageIfDisplayed()
+{
+	if (usageMessageLabelID > -1)
+	{
+		LabelMgr *labelManager = GETSTELMODULE(LabelMgr);
+		labelManager->setLabelShow(usageMessageLabelID, false);
+		labelManager->deleteLabel(usageMessageLabelID);
+		usageMessageLabelID = -1;
+	}
+}
+
+QMenu* Oculars::addTelescopeSubmenu(QMenu *parent)
+{
+	Q_ASSERT(parent);
+
+	QMenu* submenu = new QMenu("&Telescope", parent);
+	submenu->addAction("&Previous telescope", this, SLOT(decrementTelescopeIndex()));
+	submenu->addAction("&Next telescope", this, SLOT(incrementTelescopeIndex()));
+	submenu->addSeparator();
+	for (int index = 0; index < telescopes.count(); ++index)
+	{
+		QString label;
+		if (index < 10)
+		{
+			label = QString("&%1: %2").arg(index).arg(telescopes[index]->name());
+		}
+		else
+		{
+			label = telescopes[index]->name();
+		}
+		QAction* action = submenu->addAction(label, telescopesSignalMapper, SLOT(map()));
+		if (index == selectedTelescopeIndex)
+		{
+			action->setCheckable(true);
+			action->setChecked(true);
+		}
+		telescopesSignalMapper->setMapping(action, QString("%1").arg(index));
+	}
+
+	return submenu;
+}
 
=== modified file 'plugins/Oculars/src/Oculars.hpp'
--- plugins/Oculars/src/Oculars.hpp	2011-03-24 16:25:59 +0000
+++ plugins/Oculars/src/Oculars.hpp	2011-11-24 21:50:30 +0000
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2009 Timothy Reaves
+ * Copyright (C) 2011 Bogdan Marinov
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -32,7 +33,9 @@
 #define MIN_OCULARS_INI_VERSION 0.12
 
 QT_BEGIN_NAMESPACE
+class QAction;
 class QKeyEvent;
+class QMenu;
 class QMouseEvent;
 class QPixmap;
 class QSettings;
@@ -41,10 +44,13 @@
 
 class StelButton;
 
-//! This is an example of a plug-in which can be dynamically loaded into stellarium
+//! Main class of the Oculars plug-in.
 class Oculars : public StelModule
 {
 	Q_OBJECT
+	//BM: Temporary, until the GUI is finalized and some other method of getting
+	//info from the main class is implemented.
+	friend class OcularsGuiPanel;
 
 public:
 	Oculars();
@@ -69,6 +75,10 @@
 	virtual void update(double) {;}
 
 public slots:
+	//! Update the ocular, telescope and sensor lists after the removal of a member.
+	//! Necessary because of the way model/view management in the OcularDialog
+	//! is implemented.
+	void updateLists();
 	void ccdRotationReset();
 	void decrementCCDIndex();
 	void decrementOcularIndex();
@@ -80,13 +90,20 @@
 	void incrementCCDIndex();
 	void incrementOcularIndex();
 	void incrementTelescopeIndex();
-	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 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()
+	//! Toggles the sensor frame overlay.
+	void toggleCCD(bool show);
+	//! Toggles the sensor frame overlay (overloaded for blind switching).
 	void toggleCCD();
-	void toggleCrosshair();
+	void toggleCrosshairs(bool show = true);
+	//! Toggles the Telrad sight overlay.
+	void toggleTelrad(bool show);
+	//! Toggles the Telrad sight overlay (overloaded for blind switching).
 	void toggleTelrad();
+	void enableGuiPanel(bool enable = true);
 
 signals:
 	void selectedCCDChanged();
@@ -142,13 +159,18 @@
 	//! This method is called by the zoom() method, when this plugin is toggled on; it resets the zoomed view.
 	void zoomOcular();
 
+	void hideUsageMessageIfDisplayed();
+
+	//! Creates the sub-menu listing telescopes in the pop-up menu.
+	QMenu* addTelescopeSubmenu(QMenu* parent);
+
 	//! 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;
-	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 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.
 
 	QFont font;					//!< The font used for drawing labels.
 	bool flagShowCCD;				//!< flag used to track f we are in CCD mode.
@@ -164,15 +186,17 @@
 	bool flagEclipticLine;		//!< Flag to track if EclipticLine was displayed at activation.
 	bool flagMeridianLine;		//!< Flag to track if MeridianLine was displayed at activation.
 
-	double ccdRotationAngle;	//<! The angle to rotate the CCD bounding box. */
+	double ccdRotationAngle;	//!< The angle to rotate the CCD bounding box. */
 	double maxEyepieceAngle;	//!< The maximum aFOV of any eyepiece.
 	bool requireSelection;		//!< Read from the ini file, whether an object is required to be selected to zoom in.
 	bool useMaxEyepieceAngle;	//!< Read from the ini file, whether to scale the mask based aFOV.
+	//! Display the GUI control panel
+	bool guiPanelEnabled;
 
-	QSignalMapper* ccdRotationSignalMapper;  //<! Used to rotate the CCD. */
-	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* ccdRotationSignalMapper;  //!< Used to rotate the CCD. */
+	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. */
 
 	// for toolbar button
 	QPixmap* pxmapGlow;
@@ -183,6 +207,15 @@
 	OcularDialog *ocularDialog;
 	bool ready; //!< A flag that determines that this module is usable.  If false, we won't open.
 
+	QAction* actionShowOcular;
+	QAction* actionShowCrosshairs;
+	QAction* actionShowSensor;
+	QAction* actionShowTelrad;
+	QAction* actionConfiguration;
+	QAction* actionMenu;
+
+	class OcularsGuiPanel* guiPanel;
+
 	//Styles
 	QByteArray normalStyleSheet;
 	QByteArray nightStyleSheet;
 
=== modified file 'plugins/Oculars/src/gui/OcularDialog.cpp'
--- plugins/Oculars/src/gui/OcularDialog.cpp	2011-11-12 22:55:30 +0000
+++ plugins/Oculars/src/gui/OcularDialog.cpp	2011-11-24 21:50:30 +0000
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2009 Timothy Reaves
+ * Copyright (C) 2011 Bogdan Marinov
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -37,10 +38,8 @@
 #include <QStandardItemModel>
 #include <limits>
 
-OcularDialog::OcularDialog(QList<CCD *>* ccds, QList<Ocular *>* oculars, QList<Telescope *>* telescopes) :
-    ccdMapper(0),
-    ocularMapper(0),
-    telescopeMapper(0)
+OcularDialog::OcularDialog(Oculars* pluginPtr, QList<CCD *>* ccds, QList<Ocular *>* oculars, QList<Telescope *>* telescopes) :
+	plugin(pluginPtr)
 {
 	ui = new Ui_ocularDialogForm;
 	this->ccds = ccds;
@@ -116,7 +115,7 @@
 	if(dialog) {
 		StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
 		Q_ASSERT(gui);
-		const StelStyle pluginStyle = GETSTELMODULE(Oculars)->getModuleStyleSheet(gui->getStelStyle());
+		const StelStyle pluginStyle = plugin->getModuleStyleSheet(gui->getStelStyle());
 		dialog->setStyleSheet(pluginStyle.qtStyleSheet);
 		ui->textBrowser->document()->setDefaultStyleSheet(QString(pluginStyle.htmlStyleSheet));
 	}
@@ -138,6 +137,7 @@
 {
 	ccdTableModel->removeRows(ui->ccdListView->currentIndex().row(), 1);
 	ui->ccdListView->setCurrentIndex(ccdTableModel->index(0, 1));
+	plugin->updateLists();
 }
 
 void OcularDialog::deleteSelectedOcular()
@@ -147,6 +147,7 @@
 	} else {
 		ocularTableModel->removeRows(ui->ocularListView->currentIndex().row(), 1);
 		ui->ocularListView->setCurrentIndex(ocularTableModel->index(0, 1));
+		plugin->updateLists();
 	}
 }
 
@@ -157,6 +158,7 @@
 	} else {
 		telescopeTableModel->removeRows(ui->telescopeListView->currentIndex().row(), 1);
 		ui->telescopeListView->setCurrentIndex(telescopeTableModel->index(0, 1));
+		plugin->updateLists();
 	}
 }
 
@@ -178,6 +180,66 @@
 	ui->telescopeListView->setCurrentIndex(telescopeTableModel->index(telescopeTableModel->rowCount() - 1, 1));
 }
 
+void OcularDialog::moveUpSelectedSensor()
+{
+	int index = ui->ccdListView->currentIndex().row();
+	if (index > 0)
+	{
+		ccdTableModel->moveRowUp(index);
+		plugin->updateLists();
+	}
+}
+
+void OcularDialog::moveUpSelectedOcular()
+{
+	int index = ui->ocularListView->currentIndex().row();
+	if (index > 0)
+	{
+		ocularTableModel->moveRowUp(index);
+		plugin->updateLists();
+	}
+}
+
+void OcularDialog::moveUpSelectedTelescope()
+{
+	int index = ui->ocularListView->currentIndex().row();
+	if (index > 0)
+	{
+		telescopeTableModel->moveRowUp(index);
+		plugin->updateLists();
+	}
+}
+
+void OcularDialog::moveDownSelectedSensor()
+{
+	int index = ui->ccdListView->currentIndex().row();
+	if (index >= 0 && index < ccdTableModel->rowCount() - 1)
+	{
+		ccdTableModel->moveRowDown(index);
+		plugin->updateLists();
+	}
+}
+
+void OcularDialog::moveDownSelectedOcular()
+{
+	int index = ui->ocularListView->currentIndex().row();
+	if (index >= 0 && index < ocularTableModel->rowCount() - 1)
+	{
+		ocularTableModel->moveRowDown(index);
+		plugin->updateLists();
+	}
+}
+
+void OcularDialog::moveDownSelectedTelescope()
+{
+	int index = ui->telescopeListView->currentIndex().row();
+	if (index >= 0 && index < telescopeTableModel->rowCount() - 1)
+	{
+		telescopeTableModel->moveRowDown(index);
+		plugin->updateLists();
+	}
+}
+
 /* ********************************************************************* */
 #if 0
 #pragma mark -
@@ -189,7 +251,7 @@
 	Oculars::appSettings()->setValue("bindings/toggle_oculars", newString);
 	StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
 	Q_ASSERT(gui);
-	QAction* action = gui->getGuiActions("toggle_oculars");
+	QAction* action = gui->getGuiActions("actionShow_Ocular");
 	if (action != NULL) {
 		action->setShortcut(QKeySequence(newString.trimmed()));
 	}
@@ -223,7 +285,7 @@
 	bool useMaxImageCircle = Oculars::appSettings()->value("use_max_exit_circle",01.0).toBool();
 	if (shouldScale != useMaxImageCircle) {
 		Oculars::appSettings()->setValue("use_max_exit_circle", shouldScale);
-		Oculars::appSettings()->sync();\
+		Oculars::appSettings()->sync();
 		emit(scaleImageCircleChanged(shouldScale));
 	}
 }
@@ -246,6 +308,9 @@
 	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
 	connect(ui->scaleImageCircleCheckBox, SIGNAL(stateChanged(int)), this, SLOT(scaleImageCircleStateChanged(int)));
 	connect(ui->requireSelectionCheckBox, SIGNAL(stateChanged(int)), this, SLOT(requireSelectionStateChanged(int)));
+	connect(ui->checkBoxControlPanel, SIGNAL(clicked(bool)),
+	        plugin, SLOT(enableGuiPanel(bool)));
+	
 	// The add & delete buttons
 	connect(ui->addCCD, SIGNAL(clicked()), this, SLOT(insertNewCCD()));
 	connect(ui->deleteCCD, SIGNAL(clicked()), this, SLOT(deleteSelectedCCD()));
@@ -275,11 +340,30 @@
 	ui->togglePluginLineEdit->setText(bindingString);
 	bindingString = Oculars::appSettings()->value("bindings/popup_navigator", "Alt+O").toString();
 	ui->togglePopupNavigatorWindowLineEdit->setText(bindingString);
-	connect(ui->togglePluginLineEdit, SIGNAL(textEdited(const QString&)), 
-			this, SLOT(keyBindingTogglePluginChanged(const QString&)));
-	connect(ui->togglePopupNavigatorWindowLineEdit, SIGNAL(textEdited(const QString&)), 
-			this, SLOT(keyBindingPopupNavigatorConfigChanged(const QString&)));
-						  
+	connect(ui->togglePluginLineEdit, SIGNAL(textEdited(const QString&)),
+	        this, SLOT(keyBindingTogglePluginChanged(const QString&)));
+	connect(ui->togglePopupNavigatorWindowLineEdit, SIGNAL(textEdited(const QString&)),
+	        this, SLOT(keyBindingPopupNavigatorConfigChanged(const QString&)));
+	
+	initAboutText();
+	connect(ui->togglePluginLineEdit, SIGNAL(textEdited(QString)),
+	        this, SLOT(initAboutText()));
+	connect(ui->togglePopupNavigatorWindowLineEdit, SIGNAL(textEdited(QString)),
+	        this, SLOT(initAboutText()));
+
+	connect(ui->pushButtonMoveOcularUp, SIGNAL(pressed()),
+	       this, SLOT(moveUpSelectedOcular()));
+	connect(ui->pushButtonMoveOcularDown, SIGNAL(pressed()),
+	        this, SLOT(moveDownSelectedOcular()));
+	connect(ui->pushButtonMoveSensorUp, SIGNAL(pressed()),
+	        this, SLOT(moveUpSelectedSensor()));
+	connect(ui->pushButtonMoveSensorDown, SIGNAL(pressed()),
+	        this, SLOT(moveDownSelectedSensor()));
+	connect(ui->pushButtonMoveTelescopeUp, SIGNAL(pressed()),
+	        this, SLOT(moveUpSelectedTelescope()));
+	connect(ui->pushButtonMoveTelescopeDown, SIGNAL(pressed()),
+	        this, SLOT(moveDownSelectedTelescope()));
+
 	// The CCD mapper
 	ccdMapper = new QDataWidgetMapper();
 	ccdMapper->setModel(ccdTableModel);
@@ -331,7 +415,65 @@
 	if (Oculars::appSettings()->value("use_max_exit_circle", 0.0).toBool()) {
 		ui->scaleImageCircleCheckBox->setCheckState(Qt::Checked);
 	}
+	if (Oculars::appSettings()->value("enable_control_panel", false).toBool())
+	{
+		ui->checkBoxControlPanel->setChecked(true);
+	}
 
 	//Initialize the style
 	updateStyle();
 }
+
+void OcularDialog::initAboutText()
+{
+	//BM: Most of the text for now is the original contents of the About widget.
+	QString html = "<html><head><title></title></head><body>";
+
+	html += "<h1>Oculars plug-in</h1>";
+	
+	//Authors
+	QString authors = "Authors: <a href=\"mailto:[e-mail]\">Timothy Reaves</a>, Bogdan Marinov";
+	html += "<h3>" + authors + "</h3>";
+
+	//Overview
+	html += "<h2>Overview</h2>";
+
+	html += "<p>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.</p>";
+	html += "<p>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.</p>";
+	html += "<p>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.</p>";
+	html += QString("<p>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%1, 2.0%1, and 4.0%1, helping you see what you would expect to see with the naked eye through the Telrad (or similar) finder.</p>").arg(QChar(0x00B0));
+	html += "<p>If you find any issues, please let me know.  Enjoy!</p>";
+
+	//Keys
+	html += "<h2>Hot Keys</h2>";
+	html += "<p>The plug-in's key bindings can be edited in the General Tab.</p>";
+
+	StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
+	Q_ASSERT(gui);
+	QAction* actionOcular = gui->getGuiActions("actionShow_Ocular");
+	Q_ASSERT(actionOcular);
+	QAction* actionMenu = gui->getGuiActions("actionShow_Ocular_Menu");
+	Q_ASSERT(actionMenu);
+	QKeySequence ocularShortcut = actionOcular->shortcut();
+	QString ocularString = ocularShortcut.toString(QKeySequence::NativeText);
+	ocularString = Qt::escape(ocularString);
+	if (ocularString.isEmpty())
+		ocularString = "[no key defined]";
+	QKeySequence menuShortcut = actionMenu->shortcut();
+	QString menuString = menuShortcut.toString(QKeySequence::NativeText);
+	menuString = Qt::escape(menuString);
+	if (menuString.isEmpty())
+		menuString = "[no key defined]";
+
+	html += "<ul>";
+	html += "<li>";
+	html += QString("<strong>%1:</strong> Switches on/off the ocular overlay.").arg(ocularString);
+	html += "</li>";
+	
+	html += "<li>";
+	html += QString("<strong>%1:</strong> Opens the pop-up navigation menu.").arg(menuString);
+	html += "</li>";
+	html += "</ul>";
+	html += "</body></html>";
+	ui->textBrowser->setHtml(html);
+}
 
=== modified file 'plugins/Oculars/src/gui/OcularDialog.hpp'
--- plugins/Oculars/src/gui/OcularDialog.hpp	2011-03-24 16:25:59 +0000
+++ plugins/Oculars/src/gui/OcularDialog.hpp	2011-11-24 21:50:30 +0000
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2009 Timothy Reaves
+ * Copyright (C) 2011 Bogdan Marinov
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -38,17 +39,17 @@
 class QStandardItemModel;
 QT_END_NAMESPACE
 
+class Oculars;
 
 class OcularDialog : public StelDialog
 {
 	Q_OBJECT
 
 public:
-	OcularDialog(QList<CCD *>* ccds, QList<Ocular *>* oculars, QList<Telescope *>* telescopes);
+	OcularDialog(Oculars* plugin, QList<CCD *>* ccds, QList<Ocular *>* oculars, QList<Telescope *>* telescopes);
 	virtual ~OcularDialog();
 	//! Notify that the application style changed
 	void styleChanged();
-	void setOculars(QList<Ocular*> theOculars);
 	void updateStyle();
 
 public slots:
@@ -59,6 +60,12 @@
 	void insertNewCCD();
 	void insertNewOcular();
 	void insertNewTelescope();
+	void moveUpSelectedSensor();
+	void moveUpSelectedOcular();
+	void moveUpSelectedTelescope();
+	void moveDownSelectedSensor();
+	void moveDownSelectedOcular();
+	void moveDownSelectedTelescope();
 	void languageChanged();
 
 signals:
@@ -73,10 +80,13 @@
 private slots:
 	void keyBindingTogglePluginChanged(const QString& newString);
 	void keyBindingPopupNavigatorConfigChanged(const QString& newString);
+	void initAboutText();
 	void requireSelectionStateChanged(int state);
 	void scaleImageCircleStateChanged(int state);
 
 private:
+	Oculars* plugin;
+
 	QDataWidgetMapper*			ccdMapper;
 	QList<CCD *>*					ccds;
 	PropertyBasedTableModel*	ccdTableModel;
 
=== added file 'plugins/Oculars/src/gui/OcularsGuiPanel.cpp'
--- plugins/Oculars/src/gui/OcularsGuiPanel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Oculars/src/gui/OcularsGuiPanel.cpp	2011-11-24 21:50:30 +0000
@@ -0,0 +1,954 @@
+/*
+Oculars plug-in for Stellarium: graphical user interface widget
+Copyright (C) 2011  Bogdan Marinov
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#include "Oculars.hpp"
+#include "OcularsGuiPanel.hpp"
+#include "StelApp.hpp"
+#include "StelGui.hpp"
+#include "StelGuiItems.hpp"
+
+#include <QAction>
+#include <QGridLayout>
+#include <QGraphicsLinearLayout>
+#include <QGraphicsPathItem>
+#include <QGraphicsProxyWidget>
+#include <QLabel>
+#include <QPainter>
+#include <QPen>
+#include <QPushButton>
+#include <QSignalMapper>
+#include <QWidget>
+
+OcularsGuiPanel::OcularsGuiPanel(Oculars* plugin,
+                                 QGraphicsWidget *parent,
+                                 Qt::WindowFlags wFlags):
+	QGraphicsWidget(parent, wFlags),
+	ocularsPlugin(plugin),
+	parentWidget(parent),
+	borderPath(0)
+{
+	//setVisible(false);
+	//setMinimumSize(0, 0);
+	setMaximumSize(300, 400);
+	//setPreferredSize(230, 100);
+	setContentsMargins(0, 0, 0, 0);
+	//TODO: set font?
+
+	//First create the layout and populate it, then set it?
+	mainLayout = new QGraphicsLinearLayout(Qt::Vertical);
+	//layout->setContentsMargins(0, 0, 0, 0);
+	//layout->setSpacing(0);
+
+	//Button bar
+	buttonBar = new QGraphicsWidget();
+	mainLayout->addItem(buttonBar);
+
+	//QPixmap leftBackground(":/graphicGui/btbg-left.png");
+	//QPixmap middleBackground(":/graphicGui/btbg-middle.png");
+	//QPixmap rightBackground(":/graphicGui/btbg-right.png");
+
+	StelApp& stelApp = StelApp::getInstance();
+	buttonOcular = new StelButton(buttonBar,
+	                              QPixmap(":/ocular/bt_ocular_on.png"),
+	                              QPixmap(":/ocular/bt_ocular_off.png"),
+	                              QPixmap(),
+	                              ocularsPlugin->actionShowOcular,
+	                              true); //No background
+	buttonOcular->setToolTip("Ocular");
+	//buttonOcular->setBackgroundPixmap(leftBackground);
+	buttonOcular->setParentItem(buttonBar);
+
+	//Hack to avoid buttonOcular being left "checked" if it has been toggled
+	//without any object selected.
+	disconnect(ocularsPlugin->actionShowOcular, SIGNAL(toggled(bool)),
+	           ocularsPlugin, SLOT(enableOcular(bool)));
+	connect(ocularsPlugin->actionShowOcular, SIGNAL(toggled(bool)),
+	        ocularsPlugin, SLOT(enableOcular(bool)));
+
+	buttonCrosshairs = new StelButton(buttonBar,
+	                                  QPixmap(":/ocular/bt_crosshairs_on.png"),
+	                                  QPixmap(":/ocular/bt_crosshairs_off.png"),
+	                                  QPixmap(),
+	                                  ocularsPlugin->actionShowCrosshairs,
+	                                  true);
+	buttonCrosshairs->setToolTip("Crosshairs");
+	buttonCrosshairs->setVisible(false);
+
+	buttonCcd = new StelButton(buttonBar,
+	                           QPixmap(":/ocular/bt_sensor_on.png"),
+	                           QPixmap(":/ocular/bt_sensor_off.png"),
+	                           QPixmap(),
+	                           ocularsPlugin->actionShowSensor,
+	                           true);
+	buttonCcd->setToolTip("Sensor");
+
+	buttonTelrad = new StelButton(buttonBar,
+	                              QPixmap(":/ocular/bt_telrad_on.png"),
+	                              QPixmap(":/ocular/bt_telrad_off.png"),
+	                              QPixmap(),
+	                              ocularsPlugin->actionShowTelrad,
+	                              true);
+	buttonTelrad->setToolTip("Telrad circles");
+
+	buttonConfiguration = new StelButton(buttonBar,
+	                                     QPixmap(":/ocular/bt_settings_on.png"),
+	                                     QPixmap(":/ocular/bt_settings_off.png"),
+	                                     QPixmap(),
+	                                     ocularsPlugin->actionConfiguration,
+	                                     true);
+	buttonConfiguration->setToolTip("Oculars plugin configuration window");
+
+	qreal buttonHeight = buttonOcular->boundingRect().height();
+	buttonBar->setMinimumHeight(buttonHeight);
+	buttonBar->setMaximumHeight(buttonHeight);
+
+	setLayout(mainLayout);
+
+	//Widgets with control and information fields
+	ocularControls = new QGraphicsWidget(this);
+	ocularControls->setParentItem(this);
+	ocularControls->setVisible(false);
+	ccdControls = new QGraphicsWidget(this);
+	ccdControls->setParentItem(this);
+	ccdControls->setVisible(false);
+	telescopeControls = new QGraphicsWidget(this);
+	telescopeControls->setParentItem(this);
+	telescopeControls->setVisible(false);
+
+	fieldOcularName = new QGraphicsTextItem(ocularControls);
+	fieldOcularFl = new QGraphicsTextItem(ocularControls);
+	fieldOcularAfov = new QGraphicsTextItem(ocularControls);
+	fieldCcdName = new QGraphicsTextItem(ccdControls);
+	fieldCcdDimensions = new QGraphicsTextItem(ccdControls);
+	fieldCcdRotation = new QGraphicsTextItem(ccdControls);
+	fieldTelescopeName = new QGraphicsTextItem(telescopeControls);
+	fieldMagnification = new QGraphicsTextItem(telescopeControls);
+	fieldFov = new QGraphicsTextItem(telescopeControls);
+
+	QFont newFont = font();
+	newFont.setPixelSize(12);
+	setControlsFont(newFont);
+	//setControlsColor(QColor::fromRgbF(0.9, 0.91, 0.95, 0.9));
+
+	//Traditional field width from Ocular ;)
+	QFontMetrics fm(fieldOcularName->font());
+	int maxWidth = fm.width(QString("MMMMMMMMMMMMMMMMMMM"));
+	int lineHeight = fm.height();
+
+	fieldOcularName->setTextWidth(maxWidth);
+	fieldOcularFl->setTextWidth(maxWidth);
+	fieldOcularAfov->setTextWidth(maxWidth);
+	fieldCcdName->setTextWidth(maxWidth);
+	fieldCcdDimensions->setTextWidth(maxWidth);
+	fieldCcdRotation->setTextWidth(maxWidth);
+	fieldTelescopeName->setTextWidth(maxWidth);
+	fieldMagnification->setTextWidth(maxWidth);
+	fieldFov->setTextWidth(maxWidth);
+
+	QPixmap pa(":/graphicGui/btTimeRewind-on.png");
+	QPixmap prevArrow = pa.scaledToHeight(lineHeight, Qt::SmoothTransformation);
+	QPixmap paOff(":/graphicGui/btTimeRewind-off.png");
+	QPixmap prevArrowOff = paOff.scaledToHeight(lineHeight, Qt::SmoothTransformation);
+	QPixmap na(":/graphicGui/btTimeForward-on.png");
+	QPixmap nextArrow = na.scaledToHeight(lineHeight, Qt::SmoothTransformation);
+	QPixmap naOff(":/graphicGui/btTimeForward-off.png");
+	QPixmap nextArrowOff = naOff.scaledToHeight(lineHeight, Qt::SmoothTransformation);
+
+	QAction* defaultAction = new QAction(this);
+	defaultAction->setCheckable(false);
+	prevOcularButton = new StelButton(ocularControls,
+	                                  prevArrow,
+	                                  prevArrowOff,
+	                                  QPixmap(),
+	                                  defaultAction);
+	prevOcularButton->setToolTip("Previous ocular");
+	nextOcularButton = new StelButton(ocularControls,
+	                                  nextArrow,
+	                                  nextArrowOff,
+	                                  QPixmap(),
+	                                  defaultAction);
+	nextOcularButton->setToolTip("Next ocular");
+	prevCcdButton = new StelButton(ccdControls,
+	                               prevArrow,
+	                               prevArrowOff,
+	                               QPixmap(),
+	                               defaultAction);
+	prevCcdButton->setToolTip("Previous CCD frame");
+	nextCcdButton = new StelButton(ccdControls,
+	                               nextArrow,
+	                               nextArrowOff,
+	                               QPixmap(),
+	                               defaultAction);
+	nextCcdButton->setToolTip("Next CCD frame");
+	prevTelescopeButton = new StelButton(telescopeControls,
+	                                     prevArrow,
+	                                     prevArrowOff,
+	                                     QPixmap(),
+	                                     defaultAction);
+	prevTelescopeButton->setToolTip("Previous telescope");
+	nextTelescopeButton = new StelButton(telescopeControls,
+	                                     nextArrow,
+	                                     nextArrowOff,
+	                                     QPixmap(),
+	                                     defaultAction);
+	nextTelescopeButton->setToolTip("Next telescope");
+
+	connect(nextOcularButton, SIGNAL(triggered()),
+	        ocularsPlugin, SLOT(incrementOcularIndex()));
+	connect(nextCcdButton, SIGNAL(triggered()),
+	        ocularsPlugin, SLOT(incrementCCDIndex()));
+	connect(nextTelescopeButton, SIGNAL(triggered()),
+	        ocularsPlugin, SLOT(incrementTelescopeIndex()));
+	connect(prevOcularButton, SIGNAL(triggered()),
+	        ocularsPlugin, SLOT(decrementOcularIndex()));
+	connect(prevCcdButton, SIGNAL(triggered()),
+	        ocularsPlugin, SLOT(decrementCCDIndex()));
+	connect(prevTelescopeButton, SIGNAL(triggered()),
+	        ocularsPlugin, SLOT(decrementTelescopeIndex()));
+
+	QColor cOn(255, 255, 255);
+	QColor cOff(102, 102, 102);
+	QColor cHover(162, 162, 162);
+	QString degrees = QString("-15%1").arg(QChar(0x00B0));
+	int degreesW = fm.width(degrees);
+	QPixmap pOn = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOn);
+	QPixmap pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
+	QPixmap pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cHover);
+	rotateCcdMinus15Button = new StelButton(ccdControls,
+	                                        pOn,
+	                                        pOff,
+	                                        pHover,
+	                                        defaultAction,
+	                                        true);
+	rotateCcdMinus15Button->setToolTip("Rotate the sensor frame 15 degrees counterclockwise");
+
+	degrees = QString("-5%1").arg(QChar(0x00B0));
+	degreesW = fm.width(degrees);
+	pOn = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOn);
+	pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
+	pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cHover);
+	rotateCcdMinus5Button = new StelButton(ccdControls,
+	                                       pOn,
+	                                       pOff,
+	                                       pHover,
+	                                       defaultAction,
+                                           true);
+	rotateCcdMinus5Button->setToolTip("Rotate the sensor frame 5 degrees counterclockwise");
+
+	degrees = QString("-1%1").arg(QChar(0x00B0));
+	degreesW = fm.width(degrees);
+	pOn = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOn);
+	pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
+	pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cHover);
+	rotateCcdMinus1Button = new StelButton(ccdControls,
+	                                       pOn,
+                                           pOff,
+	                                       pHover,
+	                                       defaultAction,
+                                           true);
+	rotateCcdMinus1Button->setToolTip("Rotate the sensor frame 1 degree counterclockwise");
+
+	degrees = QString("0%1").arg(QChar(0x00B0));
+	degreesW = fm.width(degrees);
+	pOn = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOn);
+	pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
+	pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cHover);
+	resetCcdRotationButton = new StelButton(ccdControls,
+	                                        pOn,
+	                                        pOff,
+	                                        pHover,
+	                                        defaultAction,
+                                            true);
+	resetCcdRotationButton->setToolTip("Reset the sensor frame rotation");
+
+	degrees = QString("+1%1").arg(QChar(0x00B0));
+	degreesW = fm.width(degrees);
+	pOn = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOn);
+	pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
+	pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cHover);
+	rotateCcdPlus1Button = new StelButton(ccdControls,
+	                                      pOn,
+                                          pOff,
+	                                      pHover,
+                                          defaultAction,
+                                          true);
+	rotateCcdPlus1Button->setToolTip("Rotate the sensor frame 1 degree clockwise");
+
+	degrees = QString("+5%1").arg(QChar(0x00B0));
+	degreesW = fm.width(degrees);
+	pOn = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOn);
+	pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
+	pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cHover);
+	rotateCcdPlus5Button = new StelButton(ccdControls,
+	                                      pOn,
+                                          pOff,
+	                                      pHover,
+                                          defaultAction,
+                                          true);
+	rotateCcdPlus5Button->setToolTip("Rotate the sensor frame 5 degrees clockwise");
+
+	degrees = QString("+15%1").arg(QChar(0x00B0));
+	degreesW = fm.width(degrees);
+	pOn = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOn);
+	pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
+	pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cHover);
+	rotateCcdPlus15Button = new StelButton(ccdControls,
+	                                       pOn,
+                                           pOff,
+	                                       pHover,
+	                                       defaultAction,
+                                           true);
+	rotateCcdPlus15Button->setToolTip("Rotate the sensor frame 15 degrees clockwise");
+
+	QSignalMapper* sm = ocularsPlugin->ccdRotationSignalMapper;
+	sm->setMapping(rotateCcdMinus15Button, QString("-15"));
+	sm->setMapping(rotateCcdMinus5Button, QString("-5"));
+	sm->setMapping(rotateCcdMinus1Button, QString("-1"));
+	sm->setMapping(rotateCcdPlus1Button, QString("1"));
+	sm->setMapping(rotateCcdPlus5Button, QString("5"));
+	sm->setMapping(rotateCcdPlus15Button, QString("15"));
+
+	connect(rotateCcdMinus15Button, SIGNAL(triggered()),
+	        sm, SLOT(map()));
+	connect(rotateCcdMinus5Button, SIGNAL(triggered()),
+	        sm, SLOT(map()));
+	connect(rotateCcdMinus1Button, SIGNAL(triggered()),
+	        sm, SLOT(map()));
+	connect(rotateCcdPlus1Button, SIGNAL(triggered()),
+	        sm, SLOT(map()));
+	connect(rotateCcdPlus5Button, SIGNAL(triggered()),
+	        sm, SLOT(map()));
+	connect(rotateCcdPlus15Button, SIGNAL(triggered()),
+	        sm, SLOT(map()));
+	connect(resetCcdRotationButton, SIGNAL(triggered()),
+	        ocularsPlugin, SLOT(ccdRotationReset()));
+
+	connect(rotateCcdMinus15Button, SIGNAL(triggered()),
+	        this, SLOT(updateCcdControls()));
+	connect(rotateCcdMinus5Button, SIGNAL(triggered()),
+	        this, SLOT(updateCcdControls()));
+	connect(rotateCcdMinus1Button, SIGNAL(triggered()),
+	        this, SLOT(updateCcdControls()));
+	connect(rotateCcdPlus1Button, SIGNAL(triggered()),
+	        this, SLOT(updateCcdControls()));
+	connect(rotateCcdPlus5Button, SIGNAL(triggered()),
+	        this, SLOT(updateCcdControls()));
+	connect(rotateCcdPlus15Button, SIGNAL(triggered()),
+	        this, SLOT(updateCcdControls()));
+	connect(resetCcdRotationButton, SIGNAL(triggered()),
+	        this, SLOT(updateCcdControls()));
+
+
+	//Set the layout and update the size
+	qreal width = 2*prevOcularButton->boundingRect().width() + maxWidth;
+	qreal left, right, top, bottom;
+	mainLayout->getContentsMargins(&left, &top, &right, &bottom);
+	ocularControls->setMaximumWidth(width);
+	ccdControls->setMaximumWidth(width);
+	telescopeControls->setMaximumWidth(width);
+	resize(width + left + right, 10);
+	buttonBar->resize(width, size().height());
+	updateMainButtonsPositions();
+
+
+	//Border/background for the widget
+	borderPath = new QGraphicsPathItem();
+	borderPath->setZValue(100);
+	QBrush borderBrush(QColor::fromRgbF(0.22, 0.22, 0.23, 0.2));
+	borderPath->setBrush(borderBrush);
+	QPen borderPen = QPen(QColor::fromRgbF(0.7,0.7,0.7,0.5));
+	borderPen.setWidthF(1.);
+	borderPath->setPen(borderPen);
+	borderPath->setParentItem(parentWidget);
+
+	updatePosition();
+	connect (parentWidget, SIGNAL(geometryChanged()),
+	         this, SLOT(updatePosition()));
+
+	//Connecting other slots
+	connect(ocularsPlugin, SIGNAL(selectedOcularChanged()),
+	        this, SLOT(updateOcularControls()));
+	connect(ocularsPlugin, SIGNAL(selectedCCDChanged()),
+	        this, SLOT(updateCcdControls()));
+	connect(ocularsPlugin, SIGNAL(selectedTelescopeChanged()),
+	        this, SLOT(updateTelescopeControls()));
+
+	//Night mode
+	connect(&stelApp, SIGNAL(colorSchemeChanged(const QString&)),
+	        this, SLOT(setColorScheme(const QString&)));
+	setColorScheme(stelApp.getCurrentStelStyle());
+}
+
+OcularsGuiPanel::~OcularsGuiPanel()
+{
+	if (borderPath)
+		delete borderPath;
+}
+
+void OcularsGuiPanel::showOcularGui()
+{
+	setPreferredHeight(0);//WTF?
+	if (ocularsPlugin->flagShowOculars)
+	{
+		updateOcularControls();
+	}
+	else
+	{
+		setOcularControlsVisible(false);
+		setTelescopeControlsVisible(false);
+		updatePosition();
+	}
+}
+
+void OcularsGuiPanel::showCcdGui()
+{
+	updateCcdControls();
+}
+
+void OcularsGuiPanel::foldGui()
+{
+	//qDebug() << "hidePanel()";
+	setOcularControlsVisible(false);
+	setCcdControlsVisible(false);
+	setTelescopeControlsVisible(false);
+	updatePosition();
+}
+
+void OcularsGuiPanel::updatePosition()
+{
+	updateGeometry();
+	/*qDebug() << "Widget:" << size()
+		<< "Buttonbar:" << buttonBar->size()
+		<< "Ocular" << ocularControls->size()
+		<< "CCD" << ccdControls->size()
+		<< "Telescope" << telescopeControls->size()
+		<< "Layout" << mainLayout->geometry();*/
+	qreal xPos = parentWidget->size().width() - size().width();
+	qreal yPos = 0;
+	setPos(xPos, yPos);
+
+	//Update border/shading
+	QPainterPath newBorderPath;
+	double cornerRadius = 12.0;
+	QPointF verticalBorderStart = geometry().topLeft();
+	QPointF horizontalBorderEnd = geometry().bottomRight();
+	QPointF cornerArcStart(verticalBorderStart.x(),
+	                       horizontalBorderEnd.y() - cornerRadius);
+	newBorderPath.moveTo(verticalBorderStart);
+	newBorderPath.lineTo(cornerArcStart);
+	newBorderPath.arcTo(cornerArcStart.x(), cornerArcStart.y(), cornerRadius, cornerRadius, 180, 90);
+	newBorderPath.lineTo(horizontalBorderEnd);
+	newBorderPath.lineTo(horizontalBorderEnd.x(), verticalBorderStart.y());
+	borderPath->setPath(newBorderPath);
+}
+
+void OcularsGuiPanel::updateOcularControls()
+{
+	setCcdControlsVisible(false);
+
+	//Get the name
+	int index = ocularsPlugin->selectedOcularIndex;
+	Ocular* ocular = ocularsPlugin->oculars[index];
+	Q_ASSERT(ocular);
+	QString name = ocular->name();
+	QString fullName;
+	if (name.isEmpty())
+	{
+		fullName = QString("Ocular #%1").arg(index);
+	}
+	else
+	{
+		fullName = QString("Ocular #%1: %2").arg(index).arg(name);
+	}
+	fieldOcularName->setPlainText(fullName);
+
+	qreal posX = 0.;
+	qreal posY = 0.;
+	qreal widgetWidth = 0.;
+	qreal widgetHeight = 0.;
+
+	//Prev button
+	qreal heightAdjustment = (fieldOcularName->boundingRect().height() - prevOcularButton->boundingRect().height()) / 2.;
+	prevOcularButton->setPos(posX, round(posY + heightAdjustment));
+	posX += prevOcularButton->boundingRect().width();
+	widgetWidth += prevOcularButton->boundingRect().width();
+
+	//Name field
+	fieldOcularName->setPos(posX, posY);
+	posX += fieldOcularName->boundingRect().width();
+	widgetWidth += fieldOcularName->boundingRect().width();
+
+	//Next button
+	nextOcularButton->setPos(posX, posY + heightAdjustment);
+	widgetWidth += nextOcularButton->boundingRect().width();
+
+	posX = prevOcularButton->boundingRect().width();
+	posY += fieldOcularName->boundingRect().height();
+	widgetHeight += fieldOcularName->boundingRect().height();
+
+
+	if (ocular->isBinoculars())
+	{
+		fieldOcularFl->setVisible(false);
+		fieldOcularAfov->setVisible(false);
+	}
+	else
+	{
+		double focalLength = ocular->effectiveFocalLength();
+		QString focalLengthString = QString("Ocular FL: %1mm").arg(focalLength);
+		fieldOcularFl->setPlainText(focalLengthString);
+		fieldOcularFl->setToolTip("Focal length of the ocular");
+		fieldOcularFl->setPos(posX, posY);
+		posY += fieldOcularFl->boundingRect().height();
+		widgetHeight += fieldOcularFl->boundingRect().height();
+
+		double apparentFov = ocular->appearentFOV();
+		//TODO: This one could be better. Even in LTR languages the degree sign
+		//is to the right of the value?
+		QString apparentFovString =
+			QString("Ocular aFOV: %1%2").arg(apparentFov).arg(QChar(0x00B0));
+		fieldOcularAfov->setPlainText(apparentFovString);
+		fieldOcularAfov->setToolTip("Apparent field of view of the ocular");
+		fieldOcularAfov->setPos(posX, posY);
+		widgetHeight += fieldOcularAfov->boundingRect().height();
+
+		fieldOcularFl->setVisible(true);
+		fieldOcularAfov->setVisible(true);
+	}
+
+	ocularControls->setMinimumSize(widgetWidth, widgetHeight);
+	ocularControls->resize(widgetWidth, widgetHeight);
+	setOcularControlsVisible(true);
+
+	updateTelescopeControls();//Contains a call to updatePosition()
+}
+
+void OcularsGuiPanel::updateCcdControls()
+{
+	setOcularControlsVisible(false);
+
+	//Get the name
+	int index = ocularsPlugin->selectedCCDIndex;
+	CCD* ccd = ocularsPlugin->ccds[index];
+	Q_ASSERT(ccd);
+	QString name = ccd->name();
+	QString fullName;
+	if (name.isEmpty())
+	{
+		fullName = QString("Sensor #%1").arg(index);
+	}
+	else
+	{
+		fullName = QString("Sensor #%1: %2").arg(index).arg(name);
+	}
+	fieldCcdName->setPlainText(fullName);
+
+	qreal posX = 0.;
+	qreal posY = 0.;
+	qreal widgetWidth = 0.;
+	qreal widgetHeight = 0.;
+
+	//Prev button
+	qreal heightAdjustment = (fieldCcdName->boundingRect().height() - prevCcdButton->boundingRect().height()) / 2.;
+	prevCcdButton->setPos(posX, posY + heightAdjustment);
+	posX += prevCcdButton->boundingRect().width();
+	widgetWidth += prevCcdButton->boundingRect().width();
+
+	//Name field
+	fieldCcdName->setPos(posX, posY);
+	posX += fieldCcdName->boundingRect().width();
+	widgetWidth += fieldCcdName->boundingRect().width();
+
+	//Next button
+	nextCcdButton->setPos(posX, posY + heightAdjustment);
+	widgetWidth += nextCcdButton->boundingRect().width();
+
+	posX = prevCcdButton->boundingRect().width();
+	posY = fieldCcdName->boundingRect().height();
+	widgetHeight += fieldCcdName->boundingRect().height();
+
+	//We need the current telescope
+	index = ocularsPlugin->selectedTelescopeIndex;
+	Telescope* telescope = ocularsPlugin->telescopes[index];
+	Q_ASSERT(telescope);
+	double fovX = ((int)(ccd->getActualFOVx(telescope) * 1000.0)) / 1000.0;
+	double fovY = ((int)(ccd->getActualFOVy(telescope) * 1000.0)) / 1000.0;
+	//TODO: Again, the symbol could be handled simpler.
+	QString dimensions = QString("Dimensions: %1%2 %3 %4%5").arg(fovX).arg(QChar(0x00B0)).arg(QChar(0x00D7)).arg(fovY).arg(QChar(0x00B0));
+	fieldCcdDimensions->setPlainText(dimensions);
+	fieldCcdDimensions->setPos(posX, posY);
+	posY += fieldCcdDimensions->boundingRect().height();
+	widgetHeight += fieldCcdDimensions->boundingRect().height();
+
+	QString rotation = QString("Rotation (angle): %1%2").arg(ocularsPlugin->ccdRotationAngle, 0, 'f', 2).arg(QChar(0x00B0));
+	fieldCcdRotation->setPlainText(rotation);
+	fieldCcdRotation->setPos(posX, posY);
+	posY += fieldCcdRotation->boundingRect().height();
+	widgetHeight += fieldCcdRotation->boundingRect().height();
+
+	int rotationButtonsWidth = rotateCcdMinus15Button->boundingRect().width();
+	rotationButtonsWidth += rotateCcdMinus5Button->boundingRect().width();
+	rotationButtonsWidth += rotateCcdMinus1Button->boundingRect().width();
+	rotationButtonsWidth += resetCcdRotationButton->boundingRect().width();
+	rotationButtonsWidth += rotateCcdPlus1Button->boundingRect().width();
+	rotationButtonsWidth += rotateCcdPlus5Button->boundingRect().width();
+	rotationButtonsWidth += rotateCcdPlus15Button->boundingRect().width();
+	int spacing = (fieldCcdRotation->boundingRect().width() - rotationButtonsWidth) / 6;
+	posX = fieldCcdRotation->x();
+	rotateCcdMinus15Button->setPos(posX, posY);
+	posX += rotateCcdMinus15Button->boundingRect().width() + spacing;
+	rotateCcdMinus5Button->setPos(posX, posY);
+	posX += rotateCcdMinus5Button->boundingRect().width() + spacing;
+	rotateCcdMinus1Button->setPos(posX, posY);
+	posX += rotateCcdMinus1Button->boundingRect().width() + spacing;
+	resetCcdRotationButton->setPos(posX, posY);
+	posX += resetCcdRotationButton->boundingRect().width() + spacing;
+	rotateCcdPlus1Button->setPos(posX, posY);
+	posX += rotateCcdPlus1Button->boundingRect().width() + spacing;
+	rotateCcdPlus5Button->setPos(posX, posY);
+	posX += rotateCcdPlus5Button->boundingRect().width() + spacing;
+	rotateCcdPlus15Button->setPos(posX, posY);
+	widgetHeight += rotateCcdMinus15Button->boundingRect().height();
+
+	ccdControls->setMinimumSize(widgetWidth, widgetHeight);
+	ccdControls->resize(widgetWidth, widgetHeight);
+	setCcdControlsVisible(true);
+
+	updateTelescopeControls();//Contains a call to updatePosition()
+}
+
+void OcularsGuiPanel::updateTelescopeControls()
+{
+	//Get the name
+	int index = ocularsPlugin->selectedTelescopeIndex;
+	Telescope* telescope = ocularsPlugin->telescopes[index];
+	Q_ASSERT(telescope);
+	QString name = telescope->name();
+	QString fullName;
+	if (name.isEmpty())
+	{
+		fullName = QString("Telescope #%1").arg(index);
+	}
+	else
+	{
+		fullName = QString("Telescope #%1: %2").arg(index).arg(name);
+	}
+	fieldTelescopeName->setPlainText(fullName);
+
+	qreal posX = 0.;
+	qreal posY = 0.;
+	qreal widgetWidth = 0.;
+	qreal widgetHeight = 0.;
+
+	//Prev button
+	qreal heightAdjustment = (fieldTelescopeName->boundingRect().height() - prevTelescopeButton->boundingRect().height()) / 2.;
+	prevTelescopeButton->setPos(posX, posY + heightAdjustment);
+	posX += prevTelescopeButton->boundingRect().width();
+	widgetWidth += prevTelescopeButton->boundingRect().width();
+
+	//Name field
+	fieldTelescopeName->setPos(posX, posY);
+	posX += fieldTelescopeName->boundingRect().width();
+	widgetWidth += fieldTelescopeName->boundingRect().height();
+
+	//Next button
+	nextTelescopeButton->setPos(posX, posY + heightAdjustment);
+	widgetWidth += nextTelescopeButton->boundingRect().width();
+
+	posX = prevTelescopeButton->boundingRect().width();
+	posY += fieldTelescopeName->boundingRect().height();
+	widgetHeight += fieldTelescopeName->boundingRect().height();
+
+	if (ocularsPlugin->flagShowOculars)
+	{
+		//We need the current ocular
+		int index = ocularsPlugin->selectedOcularIndex;
+		Ocular* ocular = ocularsPlugin->oculars[index];
+		Q_ASSERT(ocular);
+
+		if (ocular->isBinoculars())
+		{
+			prevTelescopeButton->setVisible(false);
+			nextTelescopeButton->setVisible(false);
+			fieldTelescopeName->setVisible(false);
+			posY = 0.;
+			widgetHeight = 0.;
+
+			fieldMagnification->setToolTip("Magnification provided by these binoculars");
+			fieldFov->setToolTip("Actual field of view provided by these binoculars");
+		}
+		else
+		{
+			prevTelescopeButton->setVisible(true);
+			nextTelescopeButton->setVisible(true);
+			fieldTelescopeName->setVisible(true);
+
+			fieldMagnification->setToolTip("Magnification provided by this ocular/telescope combination");
+			fieldFov->setToolTip("Actual field of view provided by this ocular/telescope combination");
+		}
+
+		//WTF? Rounding?
+		double magnification = ((int)(ocular->magnification(telescope) * 10.0)) / 10.0;
+		//TODO: Again, this can be simpler
+		QString magnificationString =
+			QString("Magnification: %1%2").arg(magnification).arg(QChar(0x00D7));
+		fieldMagnification->setPlainText(magnificationString);
+		fieldMagnification->setPos(posX, posY);
+		posY += fieldMagnification->boundingRect().height();
+		widgetHeight += fieldMagnification->boundingRect().height();
+
+		double fov = ((int)(ocular->actualFOV(telescope) * 10000.00)) / 10000.0;
+		//TODO: Again, this can be simpler
+		QString fovString = QString("FOV: %1%2").arg(fov).arg(QChar(0x00B0));
+		fieldFov->setPlainText(fovString);
+		fieldFov->setPos(posX, posY);
+		widgetHeight += fieldFov->boundingRect().height();
+
+		fieldMagnification->setVisible(true);
+		fieldFov->setVisible(true);
+	}
+	else
+	{
+		prevTelescopeButton->setVisible(true);
+		nextTelescopeButton->setVisible(true);
+		fieldTelescopeName->setVisible(true);
+
+		fieldMagnification->setVisible(false);
+		fieldFov->setVisible(false);
+	}
+
+	telescopeControls->setMinimumSize(widgetWidth, widgetHeight);
+	telescopeControls->resize(widgetWidth, widgetHeight);
+	setTelescopeControlsVisible(true);
+
+	updatePosition();
+}
+
+void OcularsGuiPanel::setOcularControlsVisible(bool show)
+{
+	if (show)
+	{
+		if (!ocularControls->isVisible())
+		{
+			ocularControls->setVisible(true);
+			mainLayout->insertItem(0, ocularControls);
+		}
+	}
+	else
+	{
+		if (ocularControls->isVisible())
+		{
+			mainLayout->removeItem(ocularControls);
+			ocularControls->setVisible(false);
+		}
+	}
+	buttonCrosshairs->setVisible(show);
+	updateMainButtonsPositions();
+}
+
+void OcularsGuiPanel::setCcdControlsVisible(bool show)
+{
+	if (show)
+	{
+		if (!ccdControls->isVisible())
+		{
+			ccdControls->setVisible(true);
+			mainLayout->insertItem(0, ccdControls);
+		}
+	}
+	else
+	{
+		if (ccdControls->isVisible())
+		{
+			mainLayout->removeItem(ccdControls);
+			ccdControls->setVisible(false);
+		}
+	}
+}
+
+void OcularsGuiPanel::setTelescopeControlsVisible(bool show)
+{
+	if (show)
+	{
+		if (!telescopeControls->isVisible())
+		{
+			telescopeControls->setVisible(true);
+			mainLayout->insertItem(1, telescopeControls);
+		}
+	}
+	else
+	{
+		if (telescopeControls->isVisible())
+		{
+			mainLayout->removeItem(telescopeControls);
+			telescopeControls->setVisible(false);
+		}
+	}
+	mainLayout->invalidate();
+	mainLayout->activate();
+	resize(mainLayout->geometry().width(),
+	       mainLayout->geometry().height());
+}
+
+void OcularsGuiPanel::updateMainButtonsPositions()
+{
+	Q_ASSERT(buttonOcular);
+	Q_ASSERT(buttonCrosshairs);
+	Q_ASSERT(buttonCrosshairs);
+	Q_ASSERT(buttonCcd);
+	Q_ASSERT(buttonTelrad);
+	Q_ASSERT(buttonConfiguration);
+
+	int n = buttonCrosshairs->isVisible() ? 5 : 4;
+	qreal width = n * buttonOcular->getButtonPixmapWidth();
+
+	//Relative position inside the parent widget
+	qreal posX = 0.;
+	qreal posY = 0.;
+	qreal spacing = 0.;
+	if (prevTelescopeButton)
+	{
+		width += 2 * prevTelescopeButton->getButtonPixmapWidth();
+		posX = prevTelescopeButton->getButtonPixmapWidth();
+	}
+	if (buttonOcular->parentItem())
+	{
+		qreal parentWidth = buttonOcular->parentItem()->boundingRect().width();
+		int nGaps = n - 1;//n buttons have n-1 gaps
+		//posX = round((parentWidth-width)/2.0);//Centering, deprecated
+		spacing = round((parentWidth-width)/nGaps);
+	}
+	buttonOcular->setPos(posX, posY);
+	posX += buttonOcular->getButtonPixmapWidth() + spacing;
+	if (buttonCrosshairs->isVisible())
+	{
+		buttonCrosshairs->setPos(posX, posY);
+		posX += buttonCrosshairs->getButtonPixmapWidth()  + spacing;
+	}
+	buttonCcd->setPos(posX, posY);
+	posX += buttonCcd->getButtonPixmapWidth()  + spacing;
+	buttonTelrad->setPos(posX, posY);
+	posX += buttonTelrad->getButtonPixmapWidth() + spacing;
+	buttonConfiguration->setPos(posX, posY);
+	posX += buttonConfiguration->getButtonPixmapWidth() + spacing;
+}
+
+void OcularsGuiPanel::setControlsColor(const QColor& color)
+{
+	Q_ASSERT(fieldOcularName);
+	Q_ASSERT(fieldOcularFl);
+	Q_ASSERT(fieldOcularAfov);
+	Q_ASSERT(fieldCcdName);
+	Q_ASSERT(fieldCcdDimensions);
+	Q_ASSERT(fieldCcdRotation);
+	Q_ASSERT(fieldTelescopeName);
+	Q_ASSERT(fieldMagnification);
+	Q_ASSERT(fieldFov);
+
+	fieldOcularName->setDefaultTextColor(color);
+	fieldOcularFl->setDefaultTextColor(color);
+	fieldOcularAfov->setDefaultTextColor(color);
+	fieldCcdName->setDefaultTextColor(color);
+	fieldCcdDimensions->setDefaultTextColor(color);
+	fieldCcdRotation->setDefaultTextColor(color);
+	fieldTelescopeName->setDefaultTextColor(color);
+	fieldMagnification->setDefaultTextColor(color);
+	fieldFov->setDefaultTextColor(color);
+}
+
+void OcularsGuiPanel::setControlsFont(const QFont& font)
+{
+	Q_ASSERT(fieldOcularName);
+	Q_ASSERT(fieldOcularFl);
+	Q_ASSERT(fieldOcularAfov);
+	Q_ASSERT(fieldCcdName);
+	Q_ASSERT(fieldCcdDimensions);
+	Q_ASSERT(fieldCcdRotation);
+	Q_ASSERT(fieldTelescopeName);
+	Q_ASSERT(fieldMagnification);
+	Q_ASSERT(fieldFov);
+
+	fieldOcularName->setFont(font);
+	fieldOcularFl->setFont(font);
+	fieldOcularAfov->setFont(font);
+	fieldCcdName->setFont(font);
+	fieldCcdDimensions->setFont(font);
+	fieldCcdRotation->setFont(font);
+	fieldTelescopeName->setFont(font);
+	fieldMagnification->setFont(font);
+	fieldFov->setFont(font);
+}
+
+void OcularsGuiPanel::setButtonsNightMode(bool nightMode)
+{
+	//Reused from SkyGui, with modifications
+	foreach (QGraphicsItem *child, QGraphicsItem::children())
+	{
+		foreach (QGraphicsItem *grandchild, child->children())
+		{
+			StelButton* button = qgraphicsitem_cast<StelButton*>(grandchild);
+			if (button)
+				button->setRedMode(nightMode);
+		}
+	}
+}
+
+void OcularsGuiPanel::setColorScheme(const QString &schemeName)
+{
+	if (schemeName == "night_color")
+	{
+		borderPath->setPen(QColor::fromRgbF(0.7,0.2,0.2,0.5));
+		borderPath->setBrush(QColor::fromRgbF(0.23, 0.13, 0.03, 0.2));
+		setControlsColor(QColor::fromRgbF(0.9, 0.33, 0.33, 0.9));
+		setButtonsNightMode(true);
+	}
+	else
+	{
+		borderPath->setPen(QColor::fromRgbF(0.7,0.7,0.7,0.5));
+		borderPath->setBrush(QColor::fromRgbF(0.15, 0.16, 0.19, 0.2));
+		setControlsColor(QColor::fromRgbF(0.9, 0.91, 0.95, 0.9));
+		setButtonsNightMode(false);
+	}
+}
+
+QPixmap OcularsGuiPanel::createPixmapFromText(const QString& text,
+                                              int width,
+                                              int height,
+                                              const QFont& font,
+                                              const QColor& textColor,
+                                              const QColor& backgroundColor)
+{
+	if (width <= 0 || height <=0)
+		return QPixmap();
+
+	QPixmap pixmap(width, height);
+	pixmap.fill(backgroundColor);
+
+	if (text.isEmpty())
+		return pixmap;
+
+	QPainter painter(&pixmap);
+	painter.setFont(font);
+	painter.setPen(QPen(textColor));
+	painter.drawText(0, 0, width, height,
+	                 Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextSingleLine,
+	                 text);
+
+	return pixmap;
+}
 
=== added file 'plugins/Oculars/src/gui/OcularsGuiPanel.hpp'
--- plugins/Oculars/src/gui/OcularsGuiPanel.hpp	1970-01-01 00:00:00 +0000
+++ plugins/Oculars/src/gui/OcularsGuiPanel.hpp	2011-11-24 21:50:30 +0000
@@ -0,0 +1,137 @@
+/*
+Oculars plug-in for Stellarium: graphical user interface widget
+Copyright (C) 2011  Bogdan Marinov
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#ifndef OCULARSGUIPANEL_HPP
+#define OCULARSGUIPANEL_HPP
+
+#include <QGraphicsWidget>
+
+class Oculars;
+class StelButton;
+class QGraphicsLinearLayout;
+class QGraphicsProxyWidget;
+class QLabel;
+class QPushButton;
+class QWidget;
+
+//! A screen widget similar to InfoPanel. Contains controls and information.
+class OcularsGuiPanel : public QGraphicsWidget
+{
+	Q_OBJECT
+
+public:
+	OcularsGuiPanel(Oculars* ocularsPlugin,
+	                QGraphicsWidget * parent = 0,
+	                Qt::WindowFlags wFlags = 0);
+	~OcularsGuiPanel();
+
+public slots:
+	//! Show only the controls used with an ocular overlay.
+	void showOcularGui();
+	//! Show only the controls used with a CCD overlay.
+	void showCcdGui();
+	//! Hide the controls, leaving only the button bar.
+	void foldGui();
+
+private slots:
+	//! Update the position of the widget within the parent.
+	//! Tied to the parent's geometryChanged() signal.
+	void updatePosition();
+
+	//! Updates the information shown when an ocular overlay is displayed
+	void updateOcularControls();
+	//! Updates the information shown when a sensor overlay is displayed
+	void updateCcdControls();
+	//! Updates the information that depends on the current telescope.
+	//! Called in both updateOcularControls() and updateCcdControls().
+	void updateTelescopeControls();
+
+	//! Sets the color scheme (day/night mode)
+	void setColorScheme(const QString& schemeName);
+
+private:
+	Oculars* ocularsPlugin;
+
+	//! This is actually SkyGui. Perhaps it should be more specific?
+	QGraphicsWidget* parentWidget;
+
+	QGraphicsLinearLayout* mainLayout;
+
+	QGraphicsPathItem* borderPath;
+
+	//! Mini-toolbar holding StelButtons
+	QGraphicsWidget* buttonBar;
+	QGraphicsWidget* ocularControls;
+	QGraphicsWidget* ccdControls;
+	QGraphicsWidget* telescopeControls;
+
+	//Mini-toolbar
+	StelButton* buttonOcular;
+	StelButton* buttonCrosshairs;
+	StelButton* buttonCcd;
+	StelButton* buttonTelrad;
+	StelButton* buttonConfiguration;
+
+	//Information display
+	StelButton* prevOcularButton;
+	StelButton* nextOcularButton;
+	StelButton* prevTelescopeButton;
+	StelButton* nextTelescopeButton;
+	StelButton* prevCcdButton;
+	StelButton* nextCcdButton;
+	QGraphicsTextItem* fieldOcularName;
+	QGraphicsTextItem* fieldOcularFl;
+	QGraphicsTextItem* fieldOcularAfov;
+	QGraphicsTextItem* fieldCcdName;
+	QGraphicsTextItem* fieldCcdDimensions;
+	QGraphicsTextItem* fieldCcdRotation;
+	QGraphicsTextItem* fieldTelescopeName;
+	QGraphicsTextItem* fieldMagnification;
+	QGraphicsTextItem* fieldFov;
+
+	//Sensor frame rotation controls
+	StelButton* rotateCcdMinus15Button;
+	StelButton* rotateCcdMinus5Button;
+	StelButton* rotateCcdMinus1Button;
+	StelButton* resetCcdRotationButton;
+	StelButton* rotateCcdPlus1Button;
+	StelButton* rotateCcdPlus5Button;
+	StelButton* rotateCcdPlus15Button;
+
+	//! Sets the visibility of the ocular name label and the associated buttons.
+	void setOcularControlsVisible(bool show);
+	void setCcdControlsVisible(bool show);
+	void setTelescopeControlsVisible(bool show);
+	//! Updates the positions of the buttons inside the button bar.
+	void updateMainButtonsPositions();
+
+	void setControlsColor(const QColor& color);
+	void setControlsFont(const QFont& font);
+	//! Sets the night mode flag on all StelButton-s.
+	void setButtonsNightMode(bool nightMode);
+
+	static QPixmap createPixmapFromText(const QString& text,
+	                                    int width,
+	                                    int height,
+	                                    const QFont& font,
+	                                    const QColor& textColor,
+	                                    const QColor& backgroundColor = QColor(0,0,0,0));
+};
+
+#endif // OCULARSGUIPANEL_HPP
 
=== modified file 'plugins/Oculars/src/gui/PropertyBasedTableModel.cpp'
--- plugins/Oculars/src/gui/PropertyBasedTableModel.cpp	2011-01-12 21:08:24 +0000
+++ plugins/Oculars/src/gui/PropertyBasedTableModel.cpp	2011-11-24 21:50:30 +0000
@@ -113,3 +113,29 @@
 	return QAbstractTableModel::flags(index) | Qt::ItemIsEditable;
 }
 
+void PropertyBasedTableModel::moveRowUp(int position)
+{
+	int count = content->count();
+	if (count < 2 || position < 1 || position >= count)
+		return;
+
+	beginMoveRows(QModelIndex(), position, position, QModelIndex(), position-1);
+
+	content->move(position, position - 1);
+
+	endMoveRows();
+}
+
+void PropertyBasedTableModel::moveRowDown(int position)
+{
+	int count = content->count();
+	if (count < 2 || position < 0 || position > (count - 2))
+		return;
+
+	beginMoveRows(QModelIndex(), position, position, QModelIndex(), position+2);
+
+	content->move(position, position + 1);
+
+	endMoveRows();
+}
+
 
=== modified file 'plugins/Oculars/src/gui/PropertyBasedTableModel.hpp'
--- plugins/Oculars/src/gui/PropertyBasedTableModel.hpp	2011-01-12 21:08:24 +0000
+++ plugins/Oculars/src/gui/PropertyBasedTableModel.hpp	2011-11-24 21:50:30 +0000
@@ -40,6 +40,9 @@
 	virtual bool setData(const QModelIndex &index, const QVariant &value, int role=Qt::EditRole);
 	virtual bool removeRows(int position, int rows, const QModelIndex &index=QModelIndex());
 
+	void moveRowUp(int position);
+	void moveRowDown(int position);
+
 private:
 	QList<QObject *>* content;
 	QMap<int, QString> mappings;
 
=== modified file 'plugins/Oculars/src/gui/ocularDialog.ui'
--- plugins/Oculars/src/gui/ocularDialog.ui	2011-03-24 16:25:59 +0000
+++ plugins/Oculars/src/gui/ocularDialog.ui	2011-11-24 21:50:30 +0000
@@ -22,9 +22,6 @@
     <height>320</height>
    </size>
   </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="spacing">
     <number>0</number>
@@ -152,115 +149,149 @@
         <property name="currentIndex">
          <number>0</number>
         </property>
-        <property name="documentMode">
-         <bool>false</bool>
-        </property>
         <widget class="QWidget" name="General">
          <attribute name="title">
           <string>General</string>
          </attribute>
-         <widget class="QCheckBox" name="scaleImageCircleCheckBox">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>10</y>
-            <width>141</width>
-            <height>21</height>
-           </rect>
-          </property>
-          <property name="text">
-           <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>121</height>
-           </rect>
-          </property>
-          <property name="title">
-           <string>Key Mappings</string>
-          </property>
-          <layout class="QGridLayout" name="gridLayout_2">
-           <item row="0" column="0">
-            <widget class="QLabel" name="label_11">
-             <property name="text">
-              <string>Toggle Plugin:</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="0" 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="0" column="2">
-            <widget class="QLabel" name="label_13">
-             <property name="text">
-              <string>Popup Navigator:</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="3">
-            <widget class="QLineEdit" name="togglePopupNavigatorWindowLineEdit">
-             <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>
-          </layout>
-         </widget>
-         <widget class="QCheckBox" name="requireSelectionCheckBox">
-          <property name="geometry">
-           <rect>
-            <x>260</x>
-            <y>10</y>
-            <width>201</width>
-            <height>21</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>Require selection to enable</string>
-          </property>
-         </widget>
+         <layout class="QVBoxLayout" name="verticalLayoutTabGeneral">
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QGroupBox" name="groupBoxOcularOptions">
+            <property name="title">
+             <string>Ocular view</string>
+            </property>
+            <layout class="QVBoxLayout" name="verticalLayout_7">
+             <property name="margin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="QCheckBox" name="requireSelectionCheckBox">
+               <property name="text">
+                <string>Enable only if an object is selected</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QCheckBox" name="scaleImageCircleCheckBox">
+               <property name="text">
+                <string>Scale image circle</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <widget class="QGroupBox" name="groupBox">
+            <property name="title">
+             <string>Key mappings</string>
+            </property>
+            <layout class="QFormLayout" name="formLayout_3">
+             <property name="margin">
+              <number>0</number>
+             </property>
+             <item row="0" column="0">
+              <widget class="QLabel" name="label_11">
+               <property name="text">
+                <string>Toggle ocular view:</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QLineEdit" name="togglePluginLineEdit">
+               <property name="maximumSize">
+                <size>
+                 <width>100</width>
+                 <height>16777215</height>
+                </size>
+               </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="0">
+              <widget class="QLabel" name="labelPopupMenuShortcut">
+               <property name="text">
+                <string>Open pop-up navigation menu:</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="togglePopupNavigatorWindowLineEdit">
+               <property name="maximumSize">
+                <size>
+                 <width>100</width>
+                 <height>16777215</height>
+                </size>
+               </property>
+               <property name="baseSize">
+                <size>
+                 <width>100</width>
+                 <height>22</height>
+                </size>
+               </property>
+               <property name="maxLength">
+                <number>50</number>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <widget class="QGroupBox" name="groupBoxInterface">
+            <property name="title">
+             <string>Interface</string>
+            </property>
+            <layout class="QVBoxLayout" name="verticalLayout_8">
+             <property name="margin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="QCheckBox" name="checkBoxControlPanel">
+               <property name="text">
+                <string>On-screen control panel</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <spacer name="verticalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
         </widget>
         <widget class="QWidget" name="Eyepieces">
          <attribute name="title">
@@ -335,9 +366,6 @@
                 <enum>QFrame::Raised</enum>
                </property>
                <layout class="QHBoxLayout" name="horizontalLayout_2">
-                <property name="spacing">
-                 <number>0</number>
-                </property>
                 <property name="leftMargin">
                  <number>0</number>
                 </property>
@@ -352,29 +380,65 @@
                 </property>
                 <item>
                  <widget class="QPushButton" name="addOcular">
+                  <property name="minimumSize">
+                   <size>
+                    <width>0</width>
+                    <height>24</height>
+                   </size>
+                  </property>
                   <property name="text">
                    <string>Add</string>
                   </property>
                  </widget>
                 </item>
                 <item>
-                 <spacer name="horizontalSpacer_3">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeType">
-                   <enum>QSizePolicy::Preferred</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>20</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
+                 <widget class="QPushButton" name="pushButtonMoveOcularUp">
+                  <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>
+                  <property name="icon">
+                   <iconset resource="../../../../data/gui/guiRes.qrc">
+                    <normaloff>:/graphicGui/spinup.png</normaloff>:/graphicGui/spinup.png</iconset>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="pushButtonMoveOcularDown">
+                  <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>
+                  <property name="icon">
+                   <iconset resource="../../../../data/gui/guiRes.qrc">
+                    <normaloff>:/graphicGui/spindown.png</normaloff>:/graphicGui/spindown.png</iconset>
+                  </property>
+                 </widget>
                 </item>
                 <item>
                  <widget class="QPushButton" name="deleteOcular">
+                  <property name="minimumSize">
+                   <size>
+                    <width>0</width>
+                    <height>24</height>
+                   </size>
+                  </property>
                   <property name="text">
                    <string>Delete</string>
                   </property>
@@ -468,7 +532,7 @@
                 <item row="2" column="0">
                  <widget class="QLabel" name="label_5">
                   <property name="text">
-                   <string>Focal Length:</string>
+                   <string>Focal length:</string>
                   </property>
                  </widget>
                 </item>
@@ -488,7 +552,7 @@
                 <item row="3" column="0">
                  <widget class="QLabel" name="label_10">
                   <property name="text">
-                   <string>Field Stop:</string>
+                   <string>Field stop:</string>
                   </property>
                  </widget>
                 </item>
@@ -606,9 +670,6 @@
                 <enum>QFrame::Raised</enum>
                </property>
                <layout class="QHBoxLayout" name="CCD_horizontalLayout_2">
-                <property name="spacing">
-                 <number>0</number>
-                </property>
                 <property name="leftMargin">
                  <number>0</number>
                 </property>
@@ -623,29 +684,65 @@
                 </property>
                 <item>
                  <widget class="QPushButton" name="addCCD">
+                  <property name="minimumSize">
+                   <size>
+                    <width>0</width>
+                    <height>24</height>
+                   </size>
+                  </property>
                   <property name="text">
                    <string>Add</string>
                   </property>
                  </widget>
                 </item>
                 <item>
-                 <spacer name="horizontalSpacer_add_remove">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeType">
-                   <enum>QSizePolicy::Preferred</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>20</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
+                 <widget class="QPushButton" name="pushButtonMoveSensorUp">
+                  <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>
+                  <property name="icon">
+                   <iconset resource="../../../../data/gui/guiRes.qrc">
+                    <normaloff>:/graphicGui/spinup.png</normaloff>:/graphicGui/spinup.png</iconset>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="pushButtonMoveSensorDown">
+                  <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>
+                  <property name="icon">
+                   <iconset resource="../../../../data/gui/guiRes.qrc">
+                    <normaloff>:/graphicGui/spindown.png</normaloff>:/graphicGui/spindown.png</iconset>
+                  </property>
+                 </widget>
                 </item>
                 <item>
                  <widget class="QPushButton" name="deleteCCD">
+                  <property name="minimumSize">
+                   <size>
+                    <width>0</width>
+                    <height>24</height>
+                   </size>
+                  </property>
                   <property name="text">
                    <string>Delete</string>
                   </property>
@@ -947,38 +1044,80 @@
              </item>
              <item>
               <widget class="QFrame" name="frame_3">
-               <property name="frameShape">
-                <enum>QFrame::StyledPanel</enum>
-               </property>
-               <property name="frameShadow">
-                <enum>QFrame::Raised</enum>
-               </property>
                <layout class="QHBoxLayout" name="horizontalLayout">
+                <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="addTelescope">
+                  <property name="minimumSize">
+                   <size>
+                    <width>0</width>
+                    <height>24</height>
+                   </size>
+                  </property>
                   <property name="text">
                    <string>Add</string>
                   </property>
                  </widget>
                 </item>
                 <item>
-                 <spacer name="horizontalSpacer">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeType">
-                   <enum>QSizePolicy::Preferred</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>20</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
+                 <widget class="QPushButton" name="pushButtonMoveTelescopeUp">
+                  <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>
+                  <property name="icon">
+                   <iconset resource="../../../../data/gui/guiRes.qrc">
+                    <normaloff>:/graphicGui/spinup.png</normaloff>:/graphicGui/spinup.png</iconset>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="pushButtonMoveTelescopeDown">
+                  <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>
+                  <property name="icon">
+                   <iconset resource="../../../../data/gui/guiRes.qrc">
+                    <normaloff>:/graphicGui/spindown.png</normaloff>:/graphicGui/spindown.png</iconset>
+                  </property>
+                 </widget>
                 </item>
                 <item>
                  <widget class="QPushButton" name="deleteTelescope">
+                  <property name="minimumSize">
+                   <size>
+                    <width>0</width>
+                    <height>24</height>
+                   </size>
+                  </property>
                   <property name="text">
                    <string>Delete</string>
                   </property>
@@ -1040,7 +1179,7 @@
                 <item row="1" column="0">
                  <widget class="QLabel" name="label_9">
                   <property name="text">
-                   <string>Focal Length:</string>
+                   <string>Focal length:</string>
                   </property>
                  </widget>
                 </item>
@@ -1068,14 +1207,14 @@
                 <item row="3" column="1">
                  <widget class="QCheckBox" name="telescopeHFlip">
                   <property name="text">
-                   <string>Horizontal Flip</string>
+                   <string>Horizontal flip</string>
                   </property>
                  </widget>
                 </item>
                 <item row="4" column="1">
                  <widget class="QCheckBox" name="telescopeVFlip">
                   <property name="text">
-                   <string>Vertical Flip</string>
+                   <string>Vertical flip</string>
                   </property>
                  </widget>
                 </item>
@@ -1105,42 +1244,13 @@
           <string>About</string>
          </attribute>
          <layout class="QGridLayout" name="gridLayout">
-          <property name="leftMargin">
-           <number>12</number>
-          </property>
-          <property name="topMargin">
+          <property name="margin">
            <number>0</number>
           </property>
-          <property name="rightMargin">
-           <number>12</number>
-          </property>
-          <property name="bottomMargin">
-           <number>12</number>
-          </property>
           <item row="0" column="0">
            <widget class="QTextBrowser" name="textBrowser">
-            <property name="html">
-             <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&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:'Sans Serif'; font-size:9pt; 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;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt;&quot;&gt;Author: &lt;/span&gt;&lt;a href=&quot;[e-mail]&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt; 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; font-family:'Lucida Grande'; font-size:13pt;&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-family:'Lucida Grande'; font-size:13pt; 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;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt;&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;/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;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt;&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;/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;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt;&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;/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;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt;&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;/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;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt;&quot;&gt;If you find any issues, please let me know.  Enjoy!&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-family:'Lucida Grande'; font-size:13pt; 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;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt;&quot;&gt;These keys are the default, and can be edited in the General Tab.  If you are not a Mac user, replace the &lt;/span&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt; font-style:italic;&quot;&gt;Command&lt;/span&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt;&quot;&gt; key with the &lt;/span&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt; font-style:italic;&quot;&gt;CTRL&lt;/span&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt;&quot;&gt; key.&lt;/span&gt;&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-family:'Lucida Grande'; font-size:13pt; font-weight:600;&quot;&gt;Command-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;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt;&quot;&gt;Activate / de-activate the plugin.&lt;/span&gt;&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-family:'Lucida Grande'; font-size:13pt; 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;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt;&quot;&gt;Shows the popup menu.&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <property name="openExternalLinks">
+             <bool>true</bool>
             </property>
            </widget>
           </item>
@@ -1161,6 +1271,48 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
- <resources/>
+ <tabstops>
+  <tabstop>Tabs</tabstop>
+  <tabstop>requireSelectionCheckBox</tabstop>
+  <tabstop>scaleImageCircleCheckBox</tabstop>
+  <tabstop>togglePluginLineEdit</tabstop>
+  <tabstop>togglePopupNavigatorWindowLineEdit</tabstop>
+  <tabstop>ocularListView</tabstop>
+  <tabstop>addOcular</tabstop>
+  <tabstop>pushButtonMoveOcularUp</tabstop>
+  <tabstop>pushButtonMoveOcularDown</tabstop>
+  <tabstop>deleteOcular</tabstop>
+  <tabstop>ocularName</tabstop>
+  <tabstop>ocularAFov</tabstop>
+  <tabstop>ocularFL</tabstop>
+  <tabstop>ocularFieldStop</tabstop>
+  <tabstop>binocularsCheckBox</tabstop>
+  <tabstop>ccdListView</tabstop>
+  <tabstop>addCCD</tabstop>
+  <tabstop>pushButtonMoveSensorUp</tabstop>
+  <tabstop>pushButtonMoveSensorDown</tabstop>
+  <tabstop>deleteCCD</tabstop>
+  <tabstop>ccdName</tabstop>
+  <tabstop>ccdResX</tabstop>
+  <tabstop>ccdResY</tabstop>
+  <tabstop>ccdChipX</tabstop>
+  <tabstop>ccdChipY</tabstop>
+  <tabstop>ccdPixelX</tabstop>
+  <tabstop>ccdPixelY</tabstop>
+  <tabstop>telescopeListView</tabstop>
+  <tabstop>addTelescope</tabstop>
+  <tabstop>pushButtonMoveTelescopeUp</tabstop>
+  <tabstop>pushButtonMoveTelescopeDown</tabstop>
+  <tabstop>deleteTelescope</tabstop>
+  <tabstop>telescopeName</tabstop>
+  <tabstop>telescopeFL</tabstop>
+  <tabstop>telescopeDiameter</tabstop>
+  <tabstop>telescopeHFlip</tabstop>
+  <tabstop>telescopeVFlip</tabstop>
+  <tabstop>textBrowser</tabstop>
+ </tabstops>
+ <resources>
+  <include location="../../../../data/gui/guiRes.qrc"/>
+ </resources>
  <connections/>
 </ui>
 
=== modified file 'src/gui/StelGui.cpp'
--- src/gui/StelGui.cpp	2011-11-21 10:37:37 +0000
+++ src/gui/StelGui.cpp	2011-11-24 21:50:30 +0000
@@ -837,6 +837,8 @@
 
 LeftStelBar* StelGui::getWindowsButtonBar() {return skyGui->winBar;}
 
+SkyGui* StelGui::getSkyGui() {return skyGui;}
+
 bool StelGui::getAutoHideHorizontalButtonBar() const {return skyGui->autoHideHorizontalButtonBar;}
 
 void StelGui::setAutoHideHorizontalButtonBar(bool b) {skyGui->autoHideHorizontalButtonBar=b;}
 
=== modified file 'src/gui/StelGui.hpp'
--- src/gui/StelGui.hpp	2011-01-29 18:14:28 +0000
+++ src/gui/StelGui.hpp	2011-11-24 21:50:30 +0000
@@ -78,6 +78,10 @@
 	
 	//! Get the button bar of the left of the screen
 	class LeftStelBar* getWindowsButtonBar();
+
+	//! Get the SkyGui instance (useful for adding other interface elements).
+	//! It will return a valid object only if called after init().
+	class SkyGui* getSkyGui();
 	
 	//! Get whether the buttons toggling image flip are visible
 	bool getFlagShowFlipButtons() {return flagShowFlipButtons;}
 
=== modified file 'src/gui/StelGuiItems.cpp'
--- src/gui/StelGuiItems.cpp	2011-07-21 11:07:44 +0000
+++ src/gui/StelGuiItems.cpp	2011-11-24 21:50:30 +0000
@@ -45,11 +45,22 @@
 #include <QGraphicsLinearLayout>
 #include <QSettings>
 
-StelButton::StelButton(QGraphicsItem* parent, const QPixmap& apixOn, const QPixmap& apixOff,
-		const QPixmap& apixHover, QAction* aaction, bool noBackground) :
-			QGraphicsPixmapItem(apixOff, parent), pixOn(apixOn), pixOff(apixOff), pixHover(apixHover),
-			checked(ButtonStateOff), action(aaction), noBckground(noBackground), isTristate_(false),
-			opacity(1.), hoverOpacity(0.)
+StelButton::StelButton(QGraphicsItem* parent,
+                       const QPixmap& apixOn,
+                       const QPixmap& apixOff,
+                       const QPixmap& apixHover,
+                       QAction* aaction,
+                       bool noBackground) :
+	QGraphicsPixmapItem(apixOff, parent),
+	pixOn(apixOn),
+	pixOff(apixOff),
+	pixHover(apixHover),
+	checked(ButtonStateOff),
+	action(aaction),
+	noBckground(noBackground),
+	isTristate_(false),
+	opacity(1.),
+	hoverOpacity(0.)
 {
 	Q_ASSERT(!pixOn.isNull());
 	Q_ASSERT(!pixOff.isNull());
@@ -70,24 +81,41 @@
 
 	if (action!=NULL)
 	{
-		QObject::connect(action, SIGNAL(toggled(bool)), this, SLOT(setChecked(bool)));
+		QObject::connect(action, SIGNAL(toggled(bool)),
+		                 this, SLOT(setChecked(bool)));
 		if (action->isCheckable())
 		{
 			setChecked(action->isChecked());
-			QObject::connect(this, SIGNAL(toggled(bool)), action, SLOT(setChecked(bool)));
+			QObject::connect(this, SIGNAL(toggled(bool)),
+			                 action, SLOT(setChecked(bool)));
 		}
 		else
 		{
-			QObject::connect(this, SIGNAL(triggered()), action, SLOT(trigger()));
+			QObject::connect(this, SIGNAL(triggered()),
+			                 action, SLOT(trigger()));
 		}
 	}
 }
 
-StelButton::StelButton(QGraphicsItem* parent, const QPixmap& apixOn, const QPixmap& apixOff, const QPixmap& apixNoChange,
-		const QPixmap& apixHover, QAction* aaction, bool noBackground, bool isTristate) :
-			QGraphicsPixmapItem(apixOff, parent), pixOn(apixOn), pixOff(apixOff), pixNoChange(apixNoChange), pixHover(apixHover),
-			checked(ButtonStateOff), action(aaction), noBckground(noBackground), isTristate_(isTristate),
-			opacity(1.), hoverOpacity(0.)
+StelButton::StelButton(QGraphicsItem* parent,
+                       const QPixmap& apixOn,
+                       const QPixmap& apixOff,
+                       const QPixmap& apixNoChange,
+                       const QPixmap& apixHover,
+                       QAction* aaction,
+                       bool noBackground,
+                       bool isTristate) :
+	QGraphicsPixmapItem(apixOff, parent),
+	pixOn(apixOn),
+	pixOff(apixOff),
+	pixNoChange(apixNoChange),
+	pixHover(apixHover),
+	checked(ButtonStateOff),
+	action(aaction),
+	noBckground(noBackground),
+	isTristate_(isTristate),
+	opacity(1.),
+	hoverOpacity(0.)
 {
 	Q_ASSERT(!pixOn.isNull());
 	Q_ASSERT(!pixOff.isNull());
@@ -95,7 +123,8 @@
 	redMode = StelApp::getInstance().getVisionModeNight();
 	pixOnRed = StelButton::makeRed(pixOn);
 	pixOffRed = StelButton::makeRed(pixOff);
-	if (isTristate_) {
+	if (isTristate_)
+	{
 		Q_ASSERT(!pixNoChange.isNull());
 		pixNoChangeRed = StelButton::makeRed(pixNoChange);
 	}
@@ -108,27 +137,33 @@
 	setAcceptsHoverEvents(true);
 	timeLine = new QTimeLine(250, this);
 	timeLine->setCurveShape(QTimeLine::EaseOutCurve);
-	connect(timeLine, SIGNAL(valueChanged(qreal)), this, SLOT(animValueChanged(qreal)));
+	connect(timeLine, SIGNAL(valueChanged(qreal)),
+	        this, SLOT(animValueChanged(qreal)));
 
 	if (action!=NULL)
 	{
-		QObject::connect(action, SIGNAL(toggled(bool)), this, SLOT(setChecked(bool)));
+		QObject::connect(action, SIGNAL(toggled(bool)),
+		                 this, SLOT(setChecked(bool)));
 		if (action->isCheckable())
 		{
 			setChecked(action->isChecked());
-			QObject::connect(this, SIGNAL(toggled(bool)), action, SLOT(setChecked(bool)));
+			QObject::connect(this, SIGNAL(toggled(bool)),
+			                 action, SLOT(setChecked(bool)));
 		}
 		else
 		{
-			QObject::connect(this, SIGNAL(triggered()), action, SLOT(trigger()));
+			QObject::connect(this, SIGNAL(triggered()),
+			                 action, SLOT(trigger()));
 		}
 	}
 }
 
-int StelButton::toggleChecked(int checked) {
+int StelButton::toggleChecked(int checked)
+{
 	if (!isTristate_)
 		checked = !!!checked;
-	else {
+	else
+	{
 		if (++checked > ButtonStateNoChange)
 			checked = ButtonStateOff;
 	}
@@ -169,22 +204,22 @@
 
 void StelButton::updateIcon()
 {
-	if (opacity<0.)
-		opacity=0;
+	if (opacity < 0.)
+		opacity = 0;
 	QPixmap pix(pixOn.size());
 	pix.fill(QColor(0,0,0,0));
 	QPainter painter(&pix);
 	painter.setOpacity(opacity);
 	if (!pixBackground.isNull() && noBckground==false)
-		painter.drawPixmap(0,0, redMode ? pixBackgroundRed : pixBackground);
+		painter.drawPixmap(0, 0, redMode ? pixBackgroundRed : pixBackground);
 	painter.drawPixmap(0, 0,
 		(isTristate_ && checked == ButtonStateNoChange) ? (redMode ? pixNoChangeRed : pixNoChange) :
 		(checked == ButtonStateOn) ? (redMode ? pixOnRed : pixOn) :
 		/* (checked == ButtonStateOff) ? */ (redMode ? pixOffRed : pixOff));
-	if (hoverOpacity>0)
+	if (hoverOpacity > 0)
 	{
-		painter.setOpacity(hoverOpacity*opacity);
-		painter.drawPixmap(0,0, redMode ? pixHoverRed : pixHover);
+		painter.setOpacity(hoverOpacity * opacity);
+		painter.drawPixmap(0, 0, redMode ? pixHoverRed : pixHover);
 	}
 	setPixmap(pix);
 }
@@ -201,6 +236,13 @@
 	updateIcon();
 }
 
+void StelButton::setBackgroundPixmap(const QPixmap &newBackground)
+{
+	pixBackground = newBackground;
+	pixBackgroundRed = makeRed(newBackground);
+	updateIcon();
+}
+
 QPixmap StelButton::makeRed(const QPixmap& p)
 {
 	QImage im = p.toImage().convertToFormat(QImage::Format_ARGB32);
@@ -314,9 +356,16 @@
 	}
 }
 
-BottomStelBar::BottomStelBar(QGraphicsItem* parent, const QPixmap& pixLeft, const QPixmap& pixRight,
-		const QPixmap& pixMiddle, const QPixmap& pixSingle) : QGraphicsItem(parent), pixBackgroundLeft(pixLeft), pixBackgroundRight(pixRight),
-		pixBackgroundMiddle(pixMiddle), pixBackgroundSingle(pixSingle)
+BottomStelBar::BottomStelBar(QGraphicsItem* parent,
+                             const QPixmap& pixLeft,
+                             const QPixmap& pixRight,
+                             const QPixmap& pixMiddle,
+                             const QPixmap& pixSingle) :
+	QGraphicsItem(parent),
+	pixBackgroundLeft(pixLeft),
+	pixBackgroundRight(pixRight),
+	pixBackgroundMiddle(pixMiddle),
+	pixBackgroundSingle(pixSingle)
 {
 	// The text is dummy just for testing
 	datetime = new QGraphicsSimpleTextItem("2008-02-06  17:33", this);
@@ -359,17 +408,17 @@
 void BottomStelBar::addButton(StelButton* button, const QString& groupName, const QString& beforeActionName)
 {
 	QList<StelButton*>& g = buttonGroups[groupName].elems;
-	bool done=false;
-	for (int i=0;i<g.size();++i)
+	bool done = false;
+	for (int i=0; i<g.size(); ++i)
 	{
 		if (g[i]->action && g[i]->action->objectName()==beforeActionName)
 		{
 			g.insert(i, button);
-			done=true;
+			done = true;
 			break;
 		}
 	}
-	if (done==false)
+	if (done == false)
 		g.append(button);
 
 	button->setVisible(true);
@@ -382,7 +431,7 @@
 StelButton* BottomStelBar::hideButton(const QString& actionName)
 {
 	QString gName;
-	StelButton* bToRemove=NULL;
+	StelButton* bToRemove = NULL;
 	for (QMap<QString, ButtonGroup>::iterator iter=buttonGroups.begin();iter!=buttonGroups.end();++iter)
 	{
 		int i=0;
@@ -390,7 +439,7 @@
 		{
 			if (b->action && b->action->objectName()==actionName)
 			{
-				gName=iter.key();
+				gName = iter.key();
 				bToRemove = b;
 				iter.value().elems.removeAt(i);
 				break;
@@ -398,9 +447,9 @@
 			++i;
 		}
 	}
-	if (bToRemove==NULL)
+	if (bToRemove == NULL)
 		return NULL;
-	if (buttonGroups[gName].elems.size()==0)
+	if (buttonGroups[gName].elems.size() == 0)
 	{
 		buttonGroups.remove(gName);
 	}
@@ -417,15 +466,18 @@
 {
 	if (!buttonGroups.contains(groupName))
 		return;
-	buttonGroups[groupName].leftMargin=left;
-	buttonGroups[groupName].rightMargin=right;
+	buttonGroups[groupName].leftMargin = left;
+	buttonGroups[groupName].rightMargin = right;
 	updateButtonsGroups();
 }
 
 //! Change the background of a group
-void BottomStelBar::setGroupBackground(const QString& groupName, const QPixmap& pixLeft,
-						const QPixmap& pixRight,  const QPixmap& pixMiddle,
-						const QPixmap& pixSingle){
+void BottomStelBar::setGroupBackground(const QString& groupName,
+                                       const QPixmap& pixLeft,
+                                       const QPixmap& pixRight,
+                                       const QPixmap& pixMiddle,
+                                       const QPixmap& pixSingle)
+{
 
 	if (!buttonGroups.contains(groupName))
 		return;
@@ -435,7 +487,6 @@
 	buttonGroups[groupName].pixBackgroundMiddle = new QPixmap(pixMiddle);
 	buttonGroups[groupName].pixBackgroundSingle = new QPixmap(pixSingle);
 	updateButtonsGroups();
-
 }
 
 QRectF BottomStelBar::getButtonsBoundingRect() const
@@ -461,63 +512,65 @@
 
 void BottomStelBar::updateButtonsGroups()
 {
-	double x=0;
-	double y = datetime->boundingRect().height()+3;
+	double x = 0;
+	double y = datetime->boundingRect().height() + 3;
 	for (QMap<QString, ButtonGroup >::iterator iter=buttonGroups.begin();iter!=buttonGroups.end();++iter)
 	{
-		if (iter.value().elems.empty())
+		ButtonGroup& group = iter.value();
+		QList<StelButton*>& buttons = group.elems;
+		if (buttons.empty())
 			continue;
-		x+=iter.value().leftMargin;
-		int n=0;
-		foreach (StelButton* b, iter.value().elems)
+		x += group.leftMargin;
+		int n = 0;
+		foreach (StelButton* b, buttons)
 		{
 			// We check if the group has its own background if not the case
 			// We apply a default background.
-			if (n==0)
+			if (n == 0)
 			{
-				if (iter.value().elems.size()==1)
+				if (buttons.size() == 1)
 				{
-					if (iter.value().pixBackgroundSingle == NULL)
-						b->pixBackground = pixBackgroundSingle;
+					if (group.pixBackgroundSingle == NULL)
+						b->setBackgroundPixmap(pixBackgroundSingle);
 					else
-						b->pixBackground = *(iter.value().pixBackgroundSingle);
+						b->setBackgroundPixmap(*group.pixBackgroundSingle);
 				}
 				else
 				{
-					if (iter.value().pixBackgroundLeft == NULL)
-						b->pixBackground = pixBackgroundLeft;
+					if (group.pixBackgroundLeft == NULL)
+						b->setBackgroundPixmap(pixBackgroundLeft);
 					else
-						b->pixBackground = *(iter.value().pixBackgroundLeft);
+						b->setBackgroundPixmap(*group.pixBackgroundLeft);
 				}
 			}
-			else if (n==iter.value().elems.size()-1)
+			else if (n == buttons.size()-1)
 			{
-				if (iter.value().elems.size()!=1)
+				if (buttons.size() != 1)
 				{
-					if (iter.value().pixBackgroundSingle == NULL)
-						b->pixBackground = pixBackgroundSingle;
+					if (group.pixBackgroundSingle == NULL)
+						b->setBackgroundPixmap(pixBackgroundSingle);
 					else
-						b->pixBackground = *(iter.value().pixBackgroundSingle);
+						b->setBackgroundPixmap(*group.pixBackgroundSingle);
 				}
-				if (iter.value().pixBackgroundRight == NULL)
-					b->pixBackground = pixBackgroundRight;
+				if (group.pixBackgroundRight == NULL)
+					b->setBackgroundPixmap(pixBackgroundRight);
 				else
-					b->pixBackground = *(iter.value().pixBackgroundRight);
+					b->setBackgroundPixmap(*group.pixBackgroundRight);
 			}
 			else
 			{
-				if (iter.value().pixBackgroundMiddle == NULL)
-					b->pixBackground = pixBackgroundMiddle;
+				if (group.pixBackgroundMiddle == NULL)
+					b->setBackgroundPixmap(pixBackgroundMiddle);
 				else
-					b->pixBackground = *(iter.value().pixBackgroundMiddle);
+					b->setBackgroundPixmap(*group.pixBackgroundMiddle);
 			}
 			// Update the button pixmap
 			b->animValueChanged(0.);
 			b->setPos(x, y);
-			x+=b->pixOn.width();
+			x += b->getButtonPixmapWidth();
 			++n;
 		}
-		x+=iter.value().rightMargin;
+		x+=group.rightMargin;
 	}
 	updateText(true);
 }
 
=== modified file 'src/gui/StelGuiItems.hpp'
--- src/gui/StelGuiItems.hpp	2010-05-09 20:23:43 +0000
+++ src/gui/StelGuiItems.hpp	2011-11-24 21:50:30 +0000
@@ -88,12 +88,21 @@
 	//! Get whether the button is checked
 	int isChecked() const {return checked;}
 
+	//! Get the width of the button image.
+	//! The width is based on pixOn.
+	int getButtonPixmapWidth() const {return pixOn.width();}
+
 	//! Set the button opacity
 	void setOpacity(double v) {opacity=v; updateIcon();}
 
 	//! Activate red mode for this button, i.e. will reduce the non red color component of the icon
 	void setRedMode(bool b) {redMode=b; updateIcon();}
 
+	//! Set the background pixmap of the button.
+	//! A variant for night vision mode (pixBackgroundRed) is automatically
+	//! generated from the new background.
+	void setBackgroundPixmap(const QPixmap& newBackground);
+
 	//! Transform the pixmap so that it look red for night vision mode
 	static QPixmap makeRed(const QPixmap& p);