Merge lp:~alexwolf/stellarium/bookmarks into lp:stellarium

[Alexander Wolf]

Added implementation of bookmarks: users can add objects with proper name or designation into bookmarks (date and location is optional) for quick access to objects from this list in subsequently.

[gzotti (georg-zotti)]

I removed all bookmarks from previous test, now I cannot create new ones. No hint in logfile what can be wrong?

review: Needs Fixing

[Alexander Wolf (alexwolf)]

The format of bookmarks file has been changed and currenty I can't reproduce the issue. Of course the tool should put in the log info about problems.

review: Needs Information

[lp:~alexwolf/stellarium/bookmarks]

8250. By Alexander Wolf on 2016-04-03

A small fix for unnamed locations

8251. By Alexander Wolf on 2016-04-03

Added movement to bookmark's place through double click

8252. By Alexander Wolf on 2016-04-03

Obvious tiny fix

[gzotti (georg-zotti)]

It seems to work ok now. However, what is the new "search for DSO number" in NebulaMgr? Currently, DSO proper name is stored in the bookmark, and when changing skyculture language, this is lost (bookmark does not load object). I know, changing skyculture language is not too common, but may still happen. Maybe prefer (untranslated) catalog number as object and show a comment column with object name?

review: Needs Fixing

[lp:~alexwolf/stellarium/bookmarks]

8253. By Alexander Wolf on 2016-04-03

Change behaviour of bookmarks

[Alexander Wolf (alexwolf)]

OK, English only names for Solar system bodies and designations only for DSO and stars because user can change skyculture.

[lp:~alexwolf/stellarium/bookmarks]

8254. By Alexander Wolf on 2016-04-03

simplifications...

8255. By Alexander Wolf on 2016-04-04

Usability improvements

8256. By Alexander Wolf on 2016-04-04

Final fix =)

Unmerged revisions

=== modified file 'plugins/TelescopeControl/src/gui/StoredPointsDialog.hpp'
--- plugins/TelescopeControl/src/gui/StoredPointsDialog.hpp	2015-06-30 18:51:58 +0000
+++ plugins/TelescopeControl/src/gui/StoredPointsDialog.hpp	2016-04-03 19:30:56 +0000
@@ -33,7 +33,7 @@
 #include "StelModuleMgr.hpp"
 #include "StelUtils.hpp"
 
-#include <AngleSpinBox.hpp>
+#include "AngleSpinBox.hpp"
 
 class Ui_StoredPoints;
 

=== modified file 'po/stellarium/POTFILES.in'
--- po/stellarium/POTFILES.in	2015-08-22 22:20:20 +0000
+++ po/stellarium/POTFILES.in	2016-04-03 19:30:56 +0000
@@ -34,6 +34,7 @@
 src/gui/ShortcutsDialog.cpp
 src/gui/CustomDeltaTEquationDialog.cpp
 src/gui/AstroCalcDialog.cpp
+src/gui/BookmarksDialog.cpp
 src/main.cpp
 src/StelMainView.cpp
 
@@ -52,6 +53,7 @@
 src/ui_atmosphereDialog.h
 src/ui_scriptConsole.h
 src/ui_astroCalcDialog.h
+src/ui_bookmarksDialog.h
 
 # Plug-in translations
 # NOTE: Plugins should be enabled for building

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-01-30 18:35:25 +0000
+++ src/CMakeLists.txt	2016-04-03 19:30:56 +0000
@@ -334,6 +334,8 @@
           gui/CustomDeltaTEquationDialog.cpp
           gui/AstroCalcDialog.hpp
           gui/AstroCalcDialog.cpp
+          gui/BookmarksDialog.hpp
+          gui/BookmarksDialog.cpp
           gui/StelDialog.hpp
           gui/StelDialog.cpp
      )
@@ -350,6 +352,7 @@
           gui/atmosphereDialog.ui
           gui/customDeltaTEquationDialog.ui
           gui/astroCalcDialog.ui
+          gui/bookmarksDialog.ui
           gui/addRemoveLandscapesDialog.ui
      )
 

=== modified file 'src/core/modules/Nebula.cpp'
--- src/core/modules/Nebula.cpp	2016-04-01 17:22:51 +0000
+++ src/core/modules/Nebula.cpp	2016-04-03 19:30:56 +0000
@@ -659,43 +659,49 @@
 
 	QString str = getNameI18n();
 	if (str.isEmpty())
-	{
-		// On screen label: one only, priority as given here.
-		if (catalogFilters&CatM && M_nb>0)
-			str = QString("M %1").arg(M_nb);
-		else if (catalogFilters&CatC && C_nb>0)
-			str = QString("C %1").arg(C_nb);
-		else if (catalogFilters&CatNGC && NGC_nb>0)
-			str = QString("NGC %1").arg(NGC_nb);
-		else if (catalogFilters&CatIC && IC_nb>0)
-			str = QString("IC %1").arg(IC_nb);
-		else if (catalogFilters&CatB && B_nb>0)
-			str = QString("B %1").arg(B_nb);
-		else if (catalogFilters&CatSh2 && Sh2_nb>0)
-			str = QString("Sh 2-%1").arg(Sh2_nb);
-		else if (catalogFilters&CatVdB && VdB_nb>0)
-			str = QString("VdB %1").arg(VdB_nb);
-		else if (catalogFilters&CatRCW && RCW_nb>0)
-			str = QString("RCW %1").arg(RCW_nb);
-		else if (catalogFilters&CatLDN && LDN_nb>0)
-			str = QString("LDN %1").arg(LDN_nb);
-		else if (catalogFilters&CatLBN && LBN_nb > 0)
-			str = QString("LBN %1").arg(LBN_nb);
-		else if (catalogFilters&CatCr && Cr_nb > 0)
-			str = QString("Cr %1").arg(Cr_nb);
-		else if (catalogFilters&CatMel && Mel_nb > 0)
-			str = QString("Mel %1").arg(Mel_nb);
-		else if (catalogFilters&CatPGC && PGC_nb > 0)
-			str = QString("PGC %1").arg(PGC_nb);
-		else if (catalogFilters&CatUGC && UGC_nb > 0)
-			str = QString("UGC %1").arg(UGC_nb);
-		else if (catalogFilters&CatCed && !Ced_nb.isEmpty())
-			str = QString("Ced %1").arg(Ced_nb);
-	}
+		str = getDSODesignation();
 
 	sPainter.drawText(XY[0]+shift, XY[1]+shift, str, 0, 0, 0, false);
 }
 
+QString Nebula::getDSODesignation()
+{
+	QString str = "";
+	// Get designation for DSO with priority as given here.
+	if (catalogFilters&CatM && M_nb>0)
+		str = QString("M %1").arg(M_nb);
+	else if (catalogFilters&CatC && C_nb>0)
+		str = QString("C %1").arg(C_nb);
+	else if (catalogFilters&CatNGC && NGC_nb>0)
+		str = QString("NGC %1").arg(NGC_nb);
+	else if (catalogFilters&CatIC && IC_nb>0)
+		str = QString("IC %1").arg(IC_nb);
+	else if (catalogFilters&CatB && B_nb>0)
+		str = QString("B %1").arg(B_nb);
+	else if (catalogFilters&CatSh2 && Sh2_nb>0)
+		str = QString("Sh 2-%1").arg(Sh2_nb);
+	else if (catalogFilters&CatVdB && VdB_nb>0)
+		str = QString("VdB %1").arg(VdB_nb);
+	else if (catalogFilters&CatRCW && RCW_nb>0)
+		str = QString("RCW %1").arg(RCW_nb);
+	else if (catalogFilters&CatLDN && LDN_nb>0)
+		str = QString("LDN %1").arg(LDN_nb);
+	else if (catalogFilters&CatLBN && LBN_nb > 0)
+		str = QString("LBN %1").arg(LBN_nb);
+	else if (catalogFilters&CatCr && Cr_nb > 0)
+		str = QString("Cr %1").arg(Cr_nb);
+	else if (catalogFilters&CatMel && Mel_nb > 0)
+		str = QString("Mel %1").arg(Mel_nb);
+	else if (catalogFilters&CatPGC && PGC_nb > 0)
+		str = QString("PGC %1").arg(PGC_nb);
+	else if (catalogFilters&CatUGC && UGC_nb > 0)
+		str = QString("UGC %1").arg(UGC_nb);
+	else if (catalogFilters&CatCed && !Ced_nb.isEmpty())
+		str = QString("Ced %1").arg(Ced_nb);
+
+	return str;
+}
+
 void Nebula::readDSO(QDataStream &in)
 {
 	float	ra, dec;

=== modified file 'src/core/modules/Nebula.hpp'
--- src/core/modules/Nebula.hpp	2015-12-06 10:51:40 +0000
+++ src/core/modules/Nebula.hpp	2016-04-03 19:30:56 +0000
@@ -128,6 +128,10 @@
 
 	void setProperName(QString name) { englishName = name; }
 
+	//! Get designation for DSO (with priority: M, C, NGC, IC, B, Sh2, VdB, RCW, LDN, LBN, Cr, Mel, PGC, UGC, Ced)
+	//! @return a designation
+	QString getDSODesignation();
+
 private:
 	friend struct DrawNebulaFuncObject;
 	

=== modified file 'src/core/modules/NebulaMgr.cpp'
--- src/core/modules/NebulaMgr.cpp	2016-01-31 16:07:32 +0000
+++ src/core/modules/NebulaMgr.cpp	2016-04-03 19:30:56 +0000
@@ -739,6 +739,21 @@
 	return NebulaP();
 }
 
+QString NebulaMgr::getLatestSelectedDSODesignation()
+{
+	QString result = "";
+
+	const QList<StelObjectP> selected = GETSTELMODULE(StelObjectMgr)->getSelectedObject("Nebula");
+	if (!selected.empty())
+	{
+		foreach (const NebulaP& n, dsoArray)
+			if (n==selected[0])
+				result = n->getDSODesignation(); // Get designation for latest selected DSO
+	}
+
+	return result;
+}
+
 void NebulaMgr::convertDSOCatalog(const QString &in, const QString &out, bool decimal=false)
 {
 	QFile dsoIn(in);
@@ -1842,7 +1857,8 @@
 	QStringList result;
 	if (maxNbItem==0) return result;
 
-	 QString objw = objPrefix.toUpper();
+	QString objw = objPrefix.toUpper();
+
 	// Search by Messier objects number (possible formats are "M31" or "M 31")
 	if (objw.size()>=1 && objw.left(1)=="M" && objw.left(2)!="ME")
 	{

=== modified file 'src/core/modules/NebulaMgr.hpp'
--- src/core/modules/NebulaMgr.hpp	2015-12-06 10:51:40 +0000
+++ src/core/modules/NebulaMgr.hpp	2016-04-03 19:30:56 +0000
@@ -122,6 +122,11 @@
 
 	bool objectInDisplayedCatalog(NebulaP n);
 
+	//! Get designation for latest selected DSO with priority
+	//! @note using for bookmarks feature as example
+	//! @return a designation
+	QString getLatestSelectedDSODesignation();
+
 	///////////////////////////////////////////////////////////////////////////
 	// Properties setters and getters
 public slots:

=== added file 'src/gui/BookmarksDialog.cpp'
--- src/gui/BookmarksDialog.cpp	1970-01-01 00:00:00 +0000
+++ src/gui/BookmarksDialog.cpp	2016-04-03 19:30:56 +0000
@@ -0,0 +1,317 @@
+/*
+ * Stellarium
+ * Copyright (C) 2016 Alexander Wolf
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
+*/
+
+#include "StelApp.hpp"
+#include "StelCore.hpp"
+#include "StelModuleMgr.hpp"
+#include "StelMovementMgr.hpp"
+#include "StelObjectMgr.hpp"
+#include "StelUtils.hpp"
+#include "StelTranslator.hpp"
+#include "StelLocaleMgr.hpp"
+#include "StelLocation.hpp"
+#include "StelLocationMgr.hpp"
+#include "StelFileMgr.hpp"
+#include "StelJsonParser.hpp"
+#include "AngleSpinBox.hpp"
+#include "NebulaMgr.hpp"
+
+#include "BookmarksDialog.hpp"
+#include "ui_bookmarksDialog.h"
+
+BookmarksDialog::BookmarksDialog(QObject *parent)
+	: StelDialog(parent)
+{
+	dialogName = "Bookmarks";
+	ui = new Ui_bookmarksDialogForm;
+	core = StelApp::getInstance().getCore();
+	objectMgr = GETSTELMODULE(StelObjectMgr);
+	bookmarksListModel = new QStandardItemModel(0, ColumnCount);
+	bookmarksJsonPath = StelFileMgr::findFile("data", (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable)) + "/bookmarks.json";
+}
+
+BookmarksDialog::~BookmarksDialog()
+{
+	delete ui;
+	delete bookmarksListModel;
+}
+
+void BookmarksDialog::retranslate()
+{
+	if (dialog)
+	{
+		ui->retranslateUi(dialog);
+		setBookmarksHeaderNames();		
+	}
+}
+
+void BookmarksDialog::createDialogContent()
+{
+	ui->setupUi(dialog);
+	
+	//Signals and slots
+	connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate()));
+	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
+	connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint)));
+
+	connect(ui->addBookmarkButton, SIGNAL(clicked()), this, SLOT(addBookmarkButtonPressed()));
+	connect(ui->removeBookmarkButton, SIGNAL(clicked()), this, SLOT(removeBookmarkButtonPressed()));
+	connect(ui->goToButton, SIGNAL(clicked()), this, SLOT(goToBookmarkButtonPressed()));
+	connect(ui->clearBookmarksButton, SIGNAL(clicked()), this, SLOT(clearBookmarksButtonPressed()));
+	connect(ui->bookmarksTreeView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(selectCurrentBookmark(QModelIndex)));
+
+	//Initializing the list of bookmarks
+	bookmarksListModel->setColumnCount(ColumnCount);
+	setBookmarksHeaderNames();
+
+	ui->bookmarksTreeView->setModel(bookmarksListModel);
+	ui->bookmarksTreeView->header()->setSectionsMovable(false);
+	ui->bookmarksTreeView->header()->setSectionResizeMode(ColumnName, QHeaderView::ResizeToContents);
+	ui->bookmarksTreeView->header()->setStretchLastSection(true);
+	ui->bookmarksTreeView->hideColumn(0);
+
+	loadBookmarks();
+}
+
+void BookmarksDialog::setBookmarksHeaderNames()
+{
+	QStringList headerStrings;
+	headerStrings << "UUID"; // Hide the column
+	headerStrings << q_("Object");
+	headerStrings << q_("Date and Time");	
+	headerStrings << q_("Location of observer");
+
+	bookmarksListModel->setHorizontalHeaderLabels(headerStrings);
+}
+
+void BookmarksDialog::addModelRow(int number, QString uuid, QString name, QString Date, QString Location)
+{
+	QStandardItem* tempItem = 0;
+
+	tempItem = new QStandardItem(uuid);
+	tempItem->setEditable(false);
+	bookmarksListModel->setItem(number, ColumnUUID, tempItem);
+
+	tempItem = new QStandardItem(name);
+	tempItem->setEditable(false);
+	bookmarksListModel->setItem(number, ColumnName, tempItem);
+
+	tempItem = new QStandardItem(Date);
+	tempItem->setEditable(false);
+	bookmarksListModel->setItem(number, ColumnDate, tempItem);
+
+	tempItem = new QStandardItem(Location);
+	tempItem->setEditable(false);
+	bookmarksListModel->setItem(number, ColumnLocation, tempItem);
+
+	for(int i = 0; i < ColumnCount; ++i)
+	{
+	    ui->bookmarksTreeView->resizeColumnToContents(i);
+	}
+}
+
+void BookmarksDialog::addBookmarkButtonPressed()
+{
+	const QList<StelObjectP>& selected = objectMgr->getSelectedObject();
+	if (!selected.isEmpty())
+	{
+		QString name = selected[0]->getEnglishName();
+		if (selected[0]->getType()=="Nebula")
+			name = GETSTELMODULE(NebulaMgr)->getLatestSelectedDSODesignation();
+
+		if (!name.isEmpty()) // Don't allow adding objects without name!
+		{
+			bool dateTimeFlag = ui->dateTimeCheckBox->isChecked();
+			bool locationFlag = ui->locationCheckBox->isChecked();
+
+			QString JDs = "";
+			double JD = -1.;
+
+			if (dateTimeFlag)
+			{
+				JD = core->getJD();
+				JDs = StelUtils::julianDayToISO8601String(JD + StelUtils::getGMTShiftFromQT(JD)/24.).replace("T", " ");
+			}
+
+			QString Location = "";
+			if (locationFlag)
+			{
+				StelLocation loc = core->getCurrentLocation();
+				if (loc.name.isEmpty())
+					Location = QString("%1, %2").arg(loc.latitude).arg(loc.longitude);
+				else
+					Location = QString("%1, %2").arg(loc.name).arg(loc.country);
+			}
+
+			int lastRow = bookmarksListModel->rowCount();
+
+			QString uuid = QUuid::createUuid().toString();
+			addModelRow(lastRow, uuid, name, JDs, Location);
+
+			bookmark bm;
+			bm.name	= name;
+			if (!JDs.isEmpty())
+				bm.jd	= QString::number(JD, 'f', 6);
+			if (!Location.isEmpty())
+				bm.location = Location;
+
+			bookmarksCollection.insert(uuid, bm);
+
+			saveBookmarks();
+		}
+	}
+}
+
+void BookmarksDialog::removeBookmarkButtonPressed()
+{
+	int number = ui->bookmarksTreeView->currentIndex().row();
+	QString uuid = bookmarksListModel->index(number, ColumnUUID).data().toString();
+	bookmarksListModel->removeRow(number);
+	bookmarksCollection.remove(uuid);
+	saveBookmarks();
+}
+
+void BookmarksDialog::clearBookmarksButtonPressed()
+{
+	bookmarksListModel->clear();
+	bookmarksCollection.clear();
+	setBookmarksHeaderNames();
+	ui->bookmarksTreeView->hideColumn(0);
+	saveBookmarks();
+}
+
+void BookmarksDialog::goToBookmarkButtonPressed()
+{
+	goToBookmark(bookmarksListModel->index(ui->bookmarksTreeView->currentIndex().row(), ColumnUUID).data().toString());
+}
+
+void BookmarksDialog::selectCurrentBookmark(const QModelIndex &modelIdx)
+{
+	goToBookmark(modelIdx.sibling(modelIdx.row(), ColumnUUID).data().toString());
+}
+
+void BookmarksDialog::goToBookmark(QString uuid)
+{
+	if (!uuid.isEmpty())
+	{
+		bookmark bm = bookmarksCollection.value(uuid);
+		if (!bm.jd.isEmpty())
+		{
+			core->setJD(bm.jd.toDouble());
+		}
+		if (!bm.location.isEmpty())
+		{
+			StelLocationMgr* locationMgr = &StelApp::getInstance().getLocationMgr();
+			core->moveObserverTo(locationMgr->locationForString(bm.location));
+		}
+
+		objectMgr->unSelect();
+		if (objectMgr->findAndSelect(bm.name))
+		{
+			const QList<StelObjectP> newSelected = objectMgr->getSelectedObject();
+			if (!newSelected.empty())
+			{
+				StelMovementMgr* mvmgr = GETSTELMODULE(StelMovementMgr);
+				mvmgr->moveToObject(newSelected[0], mvmgr->getAutoMoveDuration());
+				mvmgr->setFlagTracking(true);
+			}
+		}
+	}
+}
+
+void BookmarksDialog::loadBookmarks()
+{
+	QVariantMap map;
+	QFile jsonFile(bookmarksJsonPath);
+	if (!jsonFile.open(QIODevice::ReadOnly))
+		qWarning() << "Bookmarks: cannot open" << QDir::toNativeSeparators(bookmarksJsonPath);
+	else
+	{
+		map = StelJsonParser::parse(jsonFile.readAll()).toMap();
+		jsonFile.close();
+	}
+
+	bookmarksCollection.clear();
+	QVariantMap bookmarksMap = map.value("bookmarks").toMap();
+	int i = 0;
+	foreach(QString bookmarkKey, bookmarksMap.keys())
+	{
+		QVariantMap bookmarkData = bookmarksMap.value(bookmarkKey).toMap();
+		bookmark bm;
+
+		QString JDs = "";
+
+		bm.name		= bookmarkData.value("name").toString();
+		QString JD	= bookmarkData.value("jd").toString();
+		if (!JD.isEmpty())
+		{
+			bm.jd	= JD;
+			JDs = StelUtils::julianDayToISO8601String(JD.toDouble() + StelUtils::getGMTShiftFromQT(JD.toDouble())/24.).replace("T", " ");
+		}
+		QString Location = bookmarkData.value("location").toString();
+		if (!Location.isEmpty())
+			bm.location = Location;
+
+		bookmarksCollection.insert(bookmarkKey, bm);
+		addModelRow(i, bookmarkKey, bm.name, JDs, Location);
+		i++;
+	}
+}
+
+void BookmarksDialog::saveBookmarks()
+{
+	if (bookmarksJsonPath.isEmpty())
+	{
+		qWarning() << "Bookmarks: Error saving bookmarks";
+		return;
+	}
+	QFile jsonFile(bookmarksJsonPath);
+	if(!jsonFile.open(QFile::WriteOnly|QFile::Text))
+	{
+		qWarning() << "Bookmarks: bookmarks can not be saved. A file can not be open for writing:"
+			   << QDir::toNativeSeparators(bookmarksJsonPath);
+		return;
+	}
+
+	QVariantMap bookmarksDataList;
+	QHashIterator<QString, bookmark> i(bookmarksCollection);
+	while (i.hasNext())
+	{
+	    i.next();
+
+	    bookmark sp = i.value();
+	    QVariantMap bm;
+	    bm.insert("name",	sp.name);
+	    if (!sp.jd.isEmpty())
+		    bm.insert("jd", sp.jd);
+	    if (!sp.location.isEmpty())
+		    bm.insert("location", sp.location);
+
+	    bookmarksDataList.insert(i.key(), bm);
+	}
+
+	QVariantMap bmList;
+	bmList.insert("bookmarks", bookmarksDataList);
+
+	//Convert the tree to JSON
+	StelJsonParser::write(bmList, &jsonFile);
+	jsonFile.flush();
+	jsonFile.close();
+
+}
+

=== added file 'src/gui/BookmarksDialog.hpp'
--- src/gui/BookmarksDialog.hpp	1970-01-01 00:00:00 +0000
+++ src/gui/BookmarksDialog.hpp	2016-04-03 19:30:56 +0000
@@ -0,0 +1,93 @@
+/*
+ * Stellarium
+ * 
+ * Copyright (C) 2016 Alexander Wolf
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
+*/
+
+#ifndef _BOOKMARKSDIALOG_HPP_
+#define _BOOKMARKSDIALOG_HPP_
+
+#include <QObject>
+#include <QStandardItemModel>
+#include <QMap>
+#include <QDir>
+#include <QUuid>
+
+#include "StelDialog.hpp"
+#include "StelCore.hpp"
+
+class Ui_bookmarksDialogForm;
+
+struct bookmark
+{
+	QString name;
+	QString jd;
+	QString location;
+};
+Q_DECLARE_METATYPE(bookmark)
+
+class BookmarksDialog : public StelDialog
+{
+	Q_OBJECT
+
+public:
+	BookmarksDialog(QObject* parent);
+	virtual ~BookmarksDialog();
+
+public slots:
+        void retranslate();
+
+protected:
+        //! Initialize the dialog widgets and connect the signals/slots.
+        virtual void createDialogContent();
+	Ui_bookmarksDialogForm *ui;
+
+private slots:
+	void addBookmarkButtonPressed();
+	void removeBookmarkButtonPressed();
+	void goToBookmarkButtonPressed();
+	void clearBookmarksButtonPressed();
+
+	void selectCurrentBookmark(const QModelIndex &modelIdx);
+
+private:
+	enum BookmarksColumns {
+		ColumnUUID,		//! UUID of bookmark
+		ColumnName,		//! name of bookmark
+		ColumnDate,		//! date and time (optional)
+		ColumnLocation,		//! location (optional)
+		ColumnCount		//! total number of columns
+	};
+	QStandardItemModel * bookmarksListModel;
+
+	class StelCore* core;
+	class StelObjectMgr* objectMgr;
+
+	QString bookmarksJsonPath;
+	QHash<QString, bookmark> bookmarksCollection;
+
+	//! Update header names for bookmarks table
+	void setBookmarksHeaderNames();
+
+	void addModelRow(int number, QString uuid, QString name, QString date = "", QString Location = "");
+
+	void loadBookmarks();
+	void saveBookmarks();
+	void goToBookmark(QString uuid);
+};
+
+
+#endif // _BOOKMARKSDIALOG_HPP_

=== modified file 'src/gui/StelGui.cpp'
--- src/gui/StelGui.cpp	2016-02-05 17:43:12 +0000
+++ src/gui/StelGui.cpp	2016-04-03 19:30:56 +0000
@@ -60,6 +60,7 @@
 #include "ViewDialog.hpp"
 #include "ShortcutsDialog.hpp"
 #include "AstroCalcDialog.hpp"
+#include "BookmarksDialog.hpp"
 
 #include <QDebug>
 #include <QTimeLine>
@@ -95,6 +96,7 @@
 	, scriptConsole(0)
 #endif
 	, astroCalcDialog(0)
+	, bookmarksDialog(0)
 	, flagShowFlipButtons(false)
 	, flipVert(NULL)
 	, flipHoriz(NULL)
@@ -158,6 +160,11 @@
 		delete astroCalcDialog;
 		astroCalcDialog = NULL;
 	}
+	if (bookmarksDialog)
+	{
+		delete bookmarksDialog;
+		bookmarksDialog = NULL;
+	}
 }
 
 void StelGui::init(QGraphicsWidget *atopLevelGraphicsWidget)
@@ -177,6 +184,7 @@
 	scriptConsole = new ScriptConsole(atopLevelGraphicsWidget);
 #endif
 	astroCalcDialog = new AstroCalcDialog(atopLevelGraphicsWidget);
+	bookmarksDialog = new BookmarksDialog(atopLevelGraphicsWidget);
 
 	///////////////////////////////////////////////////////////////////////
 	// Create all the main actions of the program, associated with shortcuts
@@ -209,6 +217,7 @@
 	actionsMgr->addAction("actionShow_Location_Window_Global", windowsGroup, N_("Location window"), locationDialog, "visible", "F6", "", true);
 	actionsMgr->addAction("actionShow_Shortcuts_Window_Global", windowsGroup, N_("Shortcuts window"), shortcutsDialog, "visible", "F7", "", true);
 	actionsMgr->addAction("actionShow_AstroCalc_Window_Global", windowsGroup, N_("AstroCalc window"), astroCalcDialog, "visible", "F10", "Alt+A", true);
+	actionsMgr->addAction("actionShow_Bookmarks_Window_Global", windowsGroup, N_("Bookmarks window"), bookmarksDialog, "visible", "Alt+B", "", true);
 	actionsMgr->addAction("actionSave_Copy_Object_Information_Global", miscGroup, N_("Copy selected object information to clipboard"), this, "copySelectedObjectInfo()", "Ctrl+C", "", true);	
 
 	QSettings* conf = StelApp::getInstance().getSettings();

=== modified file 'src/gui/StelGui.hpp'
--- src/gui/StelGui.hpp	2016-02-01 14:05:43 +0000
+++ src/gui/StelGui.hpp	2016-04-03 19:30:56 +0000
@@ -42,6 +42,7 @@
 class ViewDialog;
 class ShortcutsDialog;
 class AstroCalcDialog;
+class BookmarksDialog;
 #ifdef ENABLE_SCRIPT_CONSOLE
 class ScriptConsole;
 #endif
@@ -191,6 +192,7 @@
 	ScriptConsole* scriptConsole;
 #endif
 	AstroCalcDialog* astroCalcDialog;
+	BookmarksDialog* bookmarksDialog;
 
 	bool flagShowFlipButtons;
 	StelButton* flipVert;

=== added file 'src/gui/bookmarksDialog.ui'
--- src/gui/bookmarksDialog.ui	1970-01-01 00:00:00 +0000
+++ src/gui/bookmarksDialog.ui	2016-04-03 19:30:56 +0000
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>bookmarksDialogForm</class>
+ <widget class="QWidget" name="bookmarksDialogForm">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>677</width>
+    <height>359</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="BarFrame" name="TitleBar">
+     <property name="minimumSize">
+      <size>
+       <width>16</width>
+       <height>25</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>25</height>
+      </size>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <layout class="QHBoxLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>4</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <spacer>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLabel" name="stelWindowTitle">
+        <property name="palette">
+         <palette>
+          <active/>
+          <inactive/>
+          <disabled/>
+         </palette>
+        </property>
+        <property name="font">
+         <font/>
+        </property>
+        <property name="text">
+         <string>Bookmarks</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="closeStelWindow">
+        <property name="minimumSize">
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QWidget" name="widget" native="true">
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QTreeView" name="bookmarksTreeView"/>
+      </item>
+      <item row="1" column="0">
+       <widget class="QFrame" name="frame">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_4">
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_6">
+           <item>
+            <widget class="QCheckBox" name="dateTimeCheckBox">
+             <property name="text">
+              <string>Add date and time</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="locationCheckBox">
+             <property name="text">
+              <string>Add location</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_7">
+           <item>
+            <widget class="QPushButton" name="addBookmarkButton">
+             <property name="text">
+              <string>&amp;Add bookmark</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="removeBookmarkButton">
+             <property name="text">
+              <string>&amp;Remove bookmark</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="clearBookmarksButton">
+             <property name="text">
+              <string>Clear bookmarks</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="goToButton">
+             <property name="text">
+              <string>&amp;Go to...</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>BarFrame</class>
+   <extends>QFrame</extends>
+   <header>Dialog.hpp</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>