Merge lp:~georg-zotti/stellarium/gz_plugin-ArchaeoLines into lp:stellarium

[gzotti]

See branch description.

Any idea/insight how I can have the QColorDialog not in a separate panel?

[Alexander Wolf (alexwolf)]

Georg, Meteor Showers plugin has similar feature (QColorDialog) and I didn't have any problem with selecting color in the fullscreen mode. Forced switching in the windowed mode is not good idea IMHO.

[gzotti (georg-zotti)]

Ah good, thanks! I will have a look into how you did this, I also dislike the fullscreen mode switch.

[gzotti (georg-zotti)]

Dear Alex,

I have tested 4 systems:

on WinXP/Nvidia there is no problem with your solution.
on Win7/Nvidia I have the same problem in your MeteorShowers config that I saw: if I call the color panel, it is hidden behind the fullscreen main window. If I leave fullscreen before, I see the separate panel. This is why I have made my workaround implementation.
On Win8.1 AMD/Radeon netbook I have the problem.
On Ubuntu 14 / Odroid C1/Mali 450 OpenGL ES2 I have no problem, system panel comes to foreground.
No idea whether it works on Apple, or on Win/IntelGPU.

I am afraid the problem is frequent if not on all Win 7+ systems. (at least Geforce and Radeon.) There were some major changes for GPU driver in Win7, without me knowing details, but maybe this is one of the consequences? The other consequence is the missing tooltips in fullscreen mode - also now just seen on Win8/Radeon! What to do?

1) Ignore the problem and wait for reports of "hung system". This is what my Win8 looks like! Ctrl-Alt-Del with switch to task manager (my usual way out on Win7) immediately goes back to fullscreen Stellarium and does not show the color panel. I was finally forced to reboot. (-1 again for win8...)
2) Keep current solution, and maybe do something similar for your plugin?
3) Keep current solution, but switch out of fullscreen only on Windows builds? (No separation XP/7+, XP is legally dead.)

The problem is not a functional problem for the plugin's main functionality, but a cosmetic issue when configuring it.

[Alexander Wolf (alexwolf)]

It can be helpful:
http://stackoverflow.com/questions/16542524/widgets-within-a-qgraphicsscene
http://stackoverflow.com/questions/21479280/how-to-embed-qfontdialog-and-qcolordialog-into-qwidget
http://stackoverflow.com/questions/888646/how-could-i-use-the-qcolordialog-inside-another-widget-not-as-a-separate-dialog
stackoverflow.com/questions/18257281/qt-color-picker-widget

[Alexander Wolf (alexwolf)]

I think problem with QColorDialog in fullscreen mode at Windows platform should be fixed in any case

review: Needs Fixing

[lp:~georg-zotti/stellarium/gz_plugin-ArchaeoLines]

7199. By gzotti on 2015-04-08

fullscreen switching apparently only required for Windows. (Related to QTBUG-35302?). My trials to circumvent are also in here in one example.

[gzotti (georg-zotti)]

Not sure if I can invest time in checking if this QTBUG is still an issue on Windows? I don't know how to correctly parentize this Dialog so that it is shown on top of fullscreen Stellarium. Any ideas?

[gzotti (georg-zotti)]

OK, this is odd: I just jave installed Win7 on an Intel Core i5 4xxx CPU with HD4600 graphics (will replace my aging XP system which I am retiring), and tried 0.13.2.97-win64. Fullscreen has tooltips here, and in the Meteorshower plugin I can change colors without any problems. So the problem is reduced to (at least some) NVidia and Radeon GPUs on Win7 and later, or maybe even to MinGW builds? (0.13.2.97 built with MSVC.) Is it OK to just remove all fullscreen switching? I am afraid we cannot really solve this.

[Alexander Wolf (alexwolf)]

Removing all fullscreen switching within plugin is OK for me.

[lp:~georg-zotti/stellarium/gz_plugin-ArchaeoLines]

7200. By gzotti on 2015-04-09

Removed all fullscreen switching. I leave a warning in the config panel which is visible on Windows builds only, that users may have to leave fullscreen mode.

[gzotti (georg-zotti)]

I tried the 0.13.2.97-x64 on Win7/Nvidia. Again the color panel hides behind fullscreen window. So it is a Qt/GPU driver issue that appears at least on some NVidia Geforce and AMD Radeon systems on Win7 and 8.1. For the first time Intel GPU driver looks "better".

Is that OK like this?

review: Needs Resubmitting

[Alexander Wolf (alexwolf)]

It's OK for me.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-04-05 15:08:38 +0000
+++ CMakeLists.txt	2015-04-09 09:33:54 +0000
@@ -169,6 +169,7 @@
 ADD_PLUGIN(SimpleDrawLine 0)
 #### work plugins ####
 ADD_PLUGIN(AngleMeasure 1)
+ADD_PLUGIN(ArchaeoLines 1)
 ADD_PLUGIN(CompassMarks 1)
 ADD_PLUGIN(Exoplanets 1)
 ADD_PLUGIN(EquationOfTime 1)

=== added directory 'plugins/ArchaeoLines'
=== added file 'plugins/ArchaeoLines/ArchaeoLines.qrc'
--- plugins/ArchaeoLines/ArchaeoLines.qrc	1970-01-01 00:00:00 +0000
+++ plugins/ArchaeoLines/ArchaeoLines.qrc	2015-04-09 09:33:54 +0000
@@ -0,0 +1,6 @@
+<RCC>
+  <qresource prefix="archaeoLines" >
+    <file>bt_archaeolines_on.png</file>
+    <file>bt_archaeolines_off.png</file>
+  </qresource>
+</RCC>

=== added file 'plugins/ArchaeoLines/CMakeLists.txt'
--- plugins/ArchaeoLines/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/ArchaeoLines/CMakeLists.txt	2015-04-09 09:33:54 +0000
@@ -0,0 +1,12 @@
+# This is the cmake config file for the ArchaeoLines plugin
+SET(ARCHAEOLINES_VERSION "0.1.0")
+ADD_DEFINITIONS(-DARCHAEOLINES_VERSION="${ARCHAEOLINES_VERSION}")
+
+ADD_SUBDIRECTORY( src )
+
+IF(APPLE)
+    SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
+ElSE(APPLE)
+    SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
+ENDIF(APPLE)
+INSTALL(FILES DESTINATION "modules/ArchaeoLines")

=== added file 'plugins/ArchaeoLines/COPYING'
--- plugins/ArchaeoLines/COPYING	1970-01-01 00:00:00 +0000
+++ plugins/ArchaeoLines/COPYING	2015-04-09 09:33:54 +0000
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Suite 500, Boston, MA 02110-1335  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+

+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+

+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+

+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+

+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+

+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

=== added file 'plugins/ArchaeoLines/ChangeLog'
--- plugins/ArchaeoLines/ChangeLog	1970-01-01 00:00:00 +0000
+++ plugins/ArchaeoLines/ChangeLog	2015-04-09 09:33:54 +0000
@@ -0,0 +1,3 @@
+0.0.1 [2014-11-29]
+Created basic plugin
+

=== added file 'plugins/ArchaeoLines/README'
--- plugins/ArchaeoLines/README	1970-01-01 00:00:00 +0000
+++ plugins/ArchaeoLines/README	2015-04-09 09:33:54 +0000
@@ -0,0 +1,47 @@
+ArchaeoLines plugin for Stellarium
+==================================
+
+A tool to show the most relevant directions discussed in archeoastronomical alignment studies.
+
+TODO
+====
+
++ implement it...
++ 
+
+BUILDING THE PLUGIN
+===================
+
+Please note, these instructions are only directly applicable to Linux.
+Windows and OSX targets will probably require modification of the
+CMakeLists.txt file.
+
+0.  Install and build the SVN version of Stellarium as per the 
+instructions on the Stellarium wiki:
+
+  http://stellarium.org/wiki/index.php/Compilation_on_Linux
+
+NOTE: that the main program build must be set so that the libStelMain.so
+file will be generated.  This is achieved by setting the 
+GENERATE_STELMAINLIB variable in the main Stellarium CMakeLists.txt file
+to 1, like so:
+
+  SET(GENERATE_STELMAINLIB 1)
+
+1.  Set the environment variable STELROOT to the root of the Stellarium
+source tree.  The Stellarium build directory is expected to be:
+
+  $STELROOT/builds/unix 
+
+2.  Create a sub-directory builds/unix and change into that directory.
+
+3.  Run:
+
+  cmake ../.. 
+  make
+  make install
+
+If all goes well, the relevant files should be built and copied to your 
+~/.stellarium/modules directory.
+
+

=== added file 'plugins/ArchaeoLines/bt_archaeolines.tif'
Binary files plugins/ArchaeoLines/bt_archaeolines.tif	1970-01-01 00:00:00 +0000 and plugins/ArchaeoLines/bt_archaeolines.tif	2015-04-09 09:33:54 +0000 differ
=== added file 'plugins/ArchaeoLines/bt_archaeolines_off.png'
Binary files plugins/ArchaeoLines/bt_archaeolines_off.png	1970-01-01 00:00:00 +0000 and plugins/ArchaeoLines/bt_archaeolines_off.png	2015-04-09 09:33:54 +0000 differ
=== added file 'plugins/ArchaeoLines/bt_archaeolines_on.png'
Binary files plugins/ArchaeoLines/bt_archaeolines_on.png	1970-01-01 00:00:00 +0000 and plugins/ArchaeoLines/bt_archaeolines_on.png	2015-04-09 09:33:54 +0000 differ
=== added directory 'plugins/ArchaeoLines/src'
=== added file 'plugins/ArchaeoLines/src/ArchaeoLines.cpp'
--- plugins/ArchaeoLines/src/ArchaeoLines.cpp	1970-01-01 00:00:00 +0000
+++ plugins/ArchaeoLines/src/ArchaeoLines.cpp	2015-04-09 09:33:54 +0000
@@ -0,0 +1,890 @@
+/*
+ * Copyright (C) 2014 Georg Zotti
+ *
+ * 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 "StelUtils.hpp"
+#include "StelProjector.hpp"
+#include "StelPainter.hpp"
+#include "StelApp.hpp"
+#include "StelCore.hpp"
+#include "StelFileMgr.hpp"
+#include "StelLocaleMgr.hpp"
+#include "StelModuleMgr.hpp"
+#include "StelObjectMgr.hpp"
+#include "StelGui.hpp"
+#include "StelGuiItems.hpp"
+#include "StelVertexArray.hpp"
+#include "ArchaeoLines.hpp"
+#include "ArchaeoLinesDialog.hpp"
+#include "SolarSystem.hpp"
+#include "Planet.hpp"
+
+#include <QDebug>
+#include <QTimer>
+#include <QPixmap>
+#include <QColor>
+#include <QtNetwork>
+#include <QSettings>
+#include <QMouseEvent>
+#include <cmath>
+
+//! This method is the one called automatically by the StelModuleMgr just
+//! after loading the dynamic library
+StelModule* ArchaeoLinesStelPluginInterface::getStelModule() const
+{
+	return new ArchaeoLines();
+}
+
+StelPluginInfo ArchaeoLinesStelPluginInterface::getPluginInfo() const
+{
+	// Allow to load the resources when used as a static plugin
+	Q_INIT_RESOURCE(ArchaeoLines);
+
+	StelPluginInfo info;
+	info.id = "ArchaeoLines";
+	info.displayedName = N_("ArchaeoLines");
+	info.authors = "Georg Zotti";
+	info.contact = "http://homepage.univie.ac.at/Georg.Zotti";
+	info.description = N_("A tool for archaeo-/ethnoastronomical alignment studies");
+	info.version = ARCHAEOLINES_VERSION;
+	return info;
+}
+
+ArchaeoLines::ArchaeoLines()
+	: flagShowArchaeoLines(false)
+	, withDecimalDegree(false)
+	, flagUseDmsFormat(false)
+	, flagShowEquinox(false)
+	, flagShowSolstices(false)
+	, flagShowCrossquarters(false)
+	, flagShowMajorStandstills(false)
+	, flagShowMinorStandstills(false)
+	, flagShowZenithPassage(false)
+	, flagShowNadirPassage(false)
+	, flagShowSelectedObject(false)
+	, flagShowCurrentSun(false)
+	, flagShowCurrentMoon(false)
+	, enumShowCurrentPlanet(ArchaeoLine::CurrentPlanetNone)
+	, toolbarButton(NULL)
+{
+	setObjectName("ArchaeoLines");
+	font.setPixelSize(16);
+	core=StelApp::getInstance().getCore();
+	Q_ASSERT(core);
+	objMgr=GETSTELMODULE(StelObjectMgr);
+	Q_ASSERT(objMgr);
+
+	// optimize readabiity so that each upper line of the lunistice doubles is labeled.
+	equinoxLine = new ArchaeoLine(ArchaeoLine::Equinox, 0.0);
+	northernSolsticeLine = new ArchaeoLine(ArchaeoLine::Solstices, 23.50);
+	southernSolsticeLine = new ArchaeoLine(ArchaeoLine::Solstices, -23.50);
+	northernCrossquarterLine = new ArchaeoLine(ArchaeoLine::Crossquarters, 16.50);
+	southernCrossquarterLine = new ArchaeoLine(ArchaeoLine::Crossquarters, -16.50);
+	northernMajorStandstillLine0 = new ArchaeoLine(ArchaeoLine::MajorStandstill, 23.5+5.1);
+	northernMajorStandstillLine1 = new ArchaeoLine(ArchaeoLine::MajorStandstill, 23.5+5.1);
+	northernMajorStandstillLine0->setLabelVisible(false);
+	northernMinorStandstillLine2 = new ArchaeoLine(ArchaeoLine::MinorStandstill, 23.5-5.1);
+	northernMinorStandstillLine3 = new ArchaeoLine(ArchaeoLine::MinorStandstill, 23.5-5.1);
+	northernMinorStandstillLine2->setLabelVisible(false);
+	southernMinorStandstillLine4 = new ArchaeoLine(ArchaeoLine::MinorStandstill, -23.5+5.1);
+	southernMinorStandstillLine5 = new ArchaeoLine(ArchaeoLine::MinorStandstill, -23.5+5.1);
+	southernMinorStandstillLine4->setLabelVisible(false);
+	southernMajorStandstillLine6 = new ArchaeoLine(ArchaeoLine::MajorStandstill, -23.5-5.1);
+	southernMajorStandstillLine7 = new ArchaeoLine(ArchaeoLine::MajorStandstill, -23.5-5.1);
+	southernMajorStandstillLine6->setLabelVisible(false);
+	zenithPassageLine  = new ArchaeoLine(ArchaeoLine::ZenithPassage, 48.0);
+	nadirPassageLine   = new ArchaeoLine(ArchaeoLine::NadirPassage, 42.0);
+	selectedObjectLine = new ArchaeoLine(ArchaeoLine::SelectedObject, 0.0);
+	currentSunLine     = new ArchaeoLine(ArchaeoLine::CurrentSun, 0.0);
+	currentMoonLine    = new ArchaeoLine(ArchaeoLine::CurrentMoon, 0.0);
+	currentPlanetLine  = new ArchaeoLine(ArchaeoLine::CurrentPlanetNone, 0.0);
+
+	configDialog = new ArchaeoLinesDialog();
+	conf = StelApp::getInstance().getSettings();
+}
+
+ArchaeoLines::~ArchaeoLines()
+{
+	delete equinoxLine; equinoxLine=NULL;
+	delete northernSolsticeLine; northernSolsticeLine=NULL;
+	delete southernSolsticeLine; southernSolsticeLine=NULL;
+	delete northernCrossquarterLine; northernCrossquarterLine=NULL;
+	delete southernCrossquarterLine; southernCrossquarterLine=NULL;
+	delete northernMajorStandstillLine0; northernMajorStandstillLine0=NULL;
+	delete northernMajorStandstillLine1; northernMajorStandstillLine1=NULL;
+	delete northernMinorStandstillLine2; northernMinorStandstillLine2=NULL;
+	delete northernMinorStandstillLine3; northernMinorStandstillLine3=NULL;
+	delete southernMinorStandstillLine4; southernMinorStandstillLine4=NULL;
+	delete southernMinorStandstillLine5; southernMinorStandstillLine5=NULL;
+	delete southernMajorStandstillLine6; southernMajorStandstillLine6=NULL;
+	delete southernMajorStandstillLine7; southernMajorStandstillLine7=NULL;
+	delete zenithPassageLine;  zenithPassageLine=NULL;
+	delete nadirPassageLine;   nadirPassageLine=NULL;
+	delete selectedObjectLine; selectedObjectLine=NULL;
+	delete currentSunLine;     currentSunLine=NULL;
+	delete currentMoonLine;    currentMoonLine=NULL;
+	delete currentPlanetLine;  currentPlanetLine=NULL;
+
+	delete configDialog; configDialog=NULL;
+}
+
+bool ArchaeoLines::configureGui(bool show)
+{
+	if (show)
+		configDialog->setVisible(true);
+	return true;
+}
+
+//! Determine which "layer" the plugin's drawing will happen on.
+double ArchaeoLines::getCallOrder(StelModuleActionName actionName) const
+{
+	if (actionName==StelModule::ActionDraw)
+	  return StelApp::getInstance().getModuleMgr().getModule("NebulaMgr")->getCallOrder(actionName)+10.; // same as lines from core (hint AW)
+	return 0;
+}
+
+void ArchaeoLines::init()
+{
+	Q_ASSERT(equinoxLine);
+	Q_ASSERT(northernSolsticeLine);
+	Q_ASSERT(southernSolsticeLine);
+	Q_ASSERT(northernCrossquarterLine);
+	Q_ASSERT(southernCrossquarterLine);
+	Q_ASSERT(northernMajorStandstillLine0);
+	Q_ASSERT(northernMajorStandstillLine1);
+	Q_ASSERT(northernMinorStandstillLine2);
+	Q_ASSERT(northernMinorStandstillLine3);
+	Q_ASSERT(southernMinorStandstillLine4);
+	Q_ASSERT(southernMinorStandstillLine5);
+	Q_ASSERT(southernMajorStandstillLine6);
+	Q_ASSERT(southernMajorStandstillLine7);
+	Q_ASSERT(zenithPassageLine);
+	Q_ASSERT(nadirPassageLine);
+	Q_ASSERT(selectedObjectLine);
+	Q_ASSERT(currentSunLine);
+	Q_ASSERT(currentMoonLine);
+	Q_ASSERT(currentPlanetLine);
+
+	if (!conf->childGroups().contains("ArchaeoLines"))
+		restoreDefaultSettings();
+
+	loadSettings();
+
+	StelApp& app = StelApp::getInstance();
+
+	// Create action for enable/disable & hook up signals	
+	addAction("actionShow_Archaeo_Lines", N_("ArchaeoLines"), N_("ArchaeoLines"), "enabled", "Ctrl+U");
+
+	// Add a toolbar button
+	try
+	{
+		StelGui* gui = dynamic_cast<StelGui*>(app.getGui());
+		if (gui!=NULL)
+		{
+			toolbarButton = new StelButton(NULL,
+						       QPixmap(":/archaeoLines/bt_archaeolines_on.png"),
+						       QPixmap(":/archaeoLines/bt_archaeolines_off.png"),
+						       QPixmap(":/graphicGui/glow32x32.png"),
+						       "actionShow_Archaeo_Lines");
+			gui->getButtonBar()->addButton(toolbarButton, "065-pluginsGroup");
+		}
+	}
+	catch (std::runtime_error& e)
+	{
+		qWarning() << "WARNING: unable to create toolbar button for ArchaeoLines plugin: " << e.what();
+	}
+}
+
+void ArchaeoLines::update(double deltaTime)
+{
+	static SolarSystem *ssystem=GETSTELMODULE(SolarSystem);
+	static const double lunarI=5.145396; // inclination of lunar orbit
+	// compute min and max distance values for horizontal parallax.
+	// Meeus, AstrAlg 98, p342.
+	static const double meanDist=385000.56; // km earth-moon.
+	static const double addedValues=20905.355+3699.111+2955.968+569.925+48.888+3.149+246.158+152.138+170.733+
+			204.586+129.620+108.743+104.755+10.321+79.661+34.782+23.210+21.636+24.208+30.824+8.379+
+			16.675+12.831+10.445+11.650+14.403+7.003+10.056+6.322+9.884;
+	static const double minDist=meanDist-addedValues;
+	static const double maxDist=meanDist+addedValues;
+	static const double sinPiMin=6378.14/maxDist;
+	static const double sinPiMax=6378.14/minDist; // maximal parallax at min. distance!
+	static double eps;
+
+	PlanetP planet=ssystem->getSun();
+	double dec_equ, ra_equ;
+	StelUtils::rectToSphe(&ra_equ,&dec_equ,planet->getEquinoxEquatorialPos(core));
+	currentSunLine->setDeclination(dec_equ * 180.0/M_PI);
+	planet=ssystem->getMoon();
+	StelUtils::rectToSphe(&ra_equ,&dec_equ,planet->getEquinoxEquatorialPos(core));
+	currentMoonLine->setDeclination(dec_equ * 180.0/M_PI);
+
+	if (enumShowCurrentPlanet>ArchaeoLine::CurrentPlanetNone)
+	{
+		const char *planetStrings[]={"", "Mercury", "Venus", "Mars", "Jupiter", "Saturn"};
+		QString currentPlanet(planetStrings[enumShowCurrentPlanet - ArchaeoLine::CurrentPlanetNone]);
+		planet=ssystem->searchByEnglishName(currentPlanet);
+		Q_ASSERT(planet);
+		StelUtils::rectToSphe(&ra_equ,&dec_equ,planet->getEquinoxEquatorialPos(core));
+		currentPlanetLine->setDeclination(dec_equ * 180.0/M_PI);
+	}
+
+	double newJD=core->getJDay();
+	if (fabs(newJD-lastJD) > 10.0) // enough to compute this every 10 days?
+	{
+		eps= ssystem->getEarth()->getRotObliquity(core->getJDay()) *180.0/M_PI;
+		static const double invSqrt2=1.0/std::sqrt(2.0);
+		northernSolsticeLine->setDeclination( eps);
+		southernSolsticeLine->setDeclination(-eps);
+		northernCrossquarterLine->setDeclination( eps*invSqrt2);
+		southernCrossquarterLine->setDeclination(-eps*invSqrt2);
+		lastJD=newJD;
+	}
+	StelLocation loc=core->getCurrentLocation();
+
+	// compute parallax correction with Meeus 40.6. First, find H from h=0, then add corrections.
+
+	static const double b_over_a=0.99664719;
+	double latRad=loc.latitude*M_PI/180.0;
+	double u=std::atan(b_over_a*std::tan(latRad));
+	double rhoSinPhiP=b_over_a*std::sin(u)+loc.altitude/6378140.0*std::sin(latRad);
+	double rhoCosPhiP=         std::cos(u)+loc.altitude/6378140.0*std::cos(latRad);
+
+	QVector<double> lunarDE(8), sinPi(8);
+	lunarDE[0]=(eps+lunarI)*M_PI/180.0; // min_distance=max_parallax
+	lunarDE[1]=(eps+lunarI)*M_PI/180.0;
+	lunarDE[2]=(eps-lunarI)*M_PI/180.0;
+	lunarDE[3]=(eps-lunarI)*M_PI/180.0;
+	lunarDE[4]=(-eps+lunarI)*M_PI/180.0;
+	lunarDE[5]=(-eps+lunarI)*M_PI/180.0;
+	lunarDE[6]=(-eps-lunarI)*M_PI/180.0;
+	lunarDE[7]=(-eps-lunarI)*M_PI/180.0;
+	for (int i=0; i<8; i+=2){
+		sinPi[i]=sinPiMax;
+		sinPi[i+1]=sinPiMin;
+	}
+
+	// In the following we compute parallax-corrected declinations of the setting moon for max and min distances.
+	// odd indices for max_distance=min_parallax, even indices for min_distance=max_parallax. References are for Meeus AstrAlg 1998.
+	QVector<double> cosHo(8), sinHo(8); // setting hour angles.
+	for (int i=0; i<8; i++){
+		cosHo[i]=qMax(-1.0, qMin(1.0, -std::tan(latRad)*std::tan(lunarDE[i])));
+		sinHo[i]=std::sin(std::acos(cosHo[i]));
+	}
+
+	// 40.6
+	QVector<double> A(8), B(8), C(8), q(8), lunarDEtopo(8);
+	for (int i=0; i<8; i++){
+		A[i]=std::cos(lunarDE[i])*sinHo[i];
+		B[i]=std::cos(lunarDE[i])*cosHo[i]-rhoCosPhiP*sinPi[i];
+		C[i]=std::sin(lunarDE[i])-rhoSinPhiP*sinPi[i];
+		q[i]=std::sqrt(A[i]*A[i]+B[i]*B[i]+C[i]*C[i]);
+		lunarDEtopo[i]=std::asin(C[i]/q[i]);
+	}
+	northernMajorStandstillLine0->setDeclination(lunarDEtopo[0] *180.0/M_PI);
+	northernMajorStandstillLine1->setDeclination(lunarDEtopo[1] *180.0/M_PI);
+	northernMinorStandstillLine2->setDeclination(lunarDEtopo[2] *180.0/M_PI);
+	northernMinorStandstillLine3->setDeclination(lunarDEtopo[3] *180.0/M_PI);
+	southernMinorStandstillLine4->setDeclination(lunarDEtopo[4] *180.0/M_PI);
+	southernMinorStandstillLine5->setDeclination(lunarDEtopo[5] *180.0/M_PI);
+	southernMajorStandstillLine6->setDeclination(lunarDEtopo[6] *180.0/M_PI);
+	southernMajorStandstillLine7->setDeclination(lunarDEtopo[7] *180.0/M_PI);
+
+	zenithPassageLine->setDeclination(loc.latitude);
+	nadirPassageLine->setDeclination(-loc.latitude);
+
+	// Selected object?
+	if (objMgr->getWasSelected())
+	{
+		StelObjectP obj=objMgr->getSelectedObject().first();
+		StelUtils::rectToSphe(&ra_equ,&dec_equ,obj->getEquinoxEquatorialPos(core));
+		selectedObjectLine->setDeclination(dec_equ * 180.0/M_PI);
+		selectedObjectLine->setLabel(obj->getNameI18n());
+
+	}
+
+	// Updates for line brightness
+	lineFader.update((int)(deltaTime*1000));
+	equinoxLine->update(deltaTime);
+	northernSolsticeLine->update(deltaTime);
+	southernSolsticeLine->update(deltaTime);
+	northernCrossquarterLine->update(deltaTime);
+	southernCrossquarterLine->update(deltaTime);
+	northernMajorStandstillLine0->update(deltaTime);
+	northernMajorStandstillLine1->update(deltaTime);
+	northernMinorStandstillLine2->update(deltaTime);
+	northernMinorStandstillLine3->update(deltaTime);
+	southernMinorStandstillLine4->update(deltaTime);
+	southernMinorStandstillLine5->update(deltaTime);
+	southernMajorStandstillLine6->update(deltaTime);
+	southernMajorStandstillLine7->update(deltaTime);
+	zenithPassageLine->update(deltaTime);
+	nadirPassageLine->update(deltaTime);
+	selectedObjectLine->update(deltaTime);
+	currentSunLine->update(deltaTime);
+	currentMoonLine->update(deltaTime);
+	currentPlanetLine->update(deltaTime);
+
+	withDecimalDegree = StelApp::getInstance().getFlagShowDecimalDegrees();;
+}
+
+
+//! Draw any parts on the screen which are for our module
+void ArchaeoLines::draw(StelCore* core)
+{
+	equinoxLine->draw(core, lineFader.getInterstate());
+	northernSolsticeLine->draw(core, lineFader.getInterstate());
+	southernSolsticeLine->draw(core, lineFader.getInterstate());
+	northernCrossquarterLine->draw(core, lineFader.getInterstate());
+	southernCrossquarterLine->draw(core, lineFader.getInterstate());
+	northernMajorStandstillLine0->draw(core, lineFader.getInterstate());
+	northernMajorStandstillLine1->draw(core, lineFader.getInterstate());
+	northernMinorStandstillLine2->draw(core, lineFader.getInterstate());
+	northernMinorStandstillLine3->draw(core, lineFader.getInterstate());
+	southernMinorStandstillLine4->draw(core, lineFader.getInterstate());
+	southernMinorStandstillLine5->draw(core, lineFader.getInterstate());
+	southernMajorStandstillLine6->draw(core, lineFader.getInterstate());
+	southernMajorStandstillLine7->draw(core, lineFader.getInterstate());
+	zenithPassageLine->draw(core, lineFader.getInterstate());
+	nadirPassageLine->draw(core, lineFader.getInterstate());
+	if (objMgr->getWasSelected())
+		selectedObjectLine->draw(core, lineFader.getInterstate());
+	currentSunLine->draw(core, lineFader.getInterstate());
+	currentMoonLine->draw(core, lineFader.getInterstate());
+	if (enumShowCurrentPlanet>ArchaeoLine::CurrentPlanetNone)
+		currentPlanetLine->draw(core, lineFader.getInterstate());
+}
+
+
+void ArchaeoLines::enableArchaeoLines(bool b)
+{
+	flagShowArchaeoLines = b;
+	lineFader = b;
+}
+
+
+//void ArchaeoLines::useDmsFormat(bool b)
+//{
+//	flagUseDmsFormat=b;
+//	conf->setValue("ArchaeoLines/angle_format_dms",       isDmsFormat());
+//}
+
+void ArchaeoLines::restoreDefaultSettings()
+{
+	Q_ASSERT(conf);
+	// Remove the old values...
+	conf->remove("ArchaeoLines");
+	// ...load the default values...
+	loadSettings();
+}
+
+void ArchaeoLines::loadSettings()
+{
+	//useDmsFormat(conf->value("ArchaeoLines/angle_format_dms", false).toBool());
+
+	equinoxColor         = StelUtils::strToVec3f(conf->value("ArchaeoLines/color_equinox",          "1.00,1.00,0.5").toString());
+	equinoxLine->setColor(equinoxColor);
+	solsticesColor       = StelUtils::strToVec3f(conf->value("ArchaeoLines/color_solstices",        "1.00,1.00,0.25").toString());
+	northernSolsticeLine->setColor(solsticesColor);
+	southernSolsticeLine->setColor(solsticesColor);
+	crossquartersColor   = StelUtils::strToVec3f(conf->value("ArchaeoLines/color_crossquarters",    "1.00,0.75,0.25").toString());
+	northernCrossquarterLine->setColor(crossquartersColor);
+	southernCrossquarterLine->setColor(crossquartersColor);
+	majorStandstillColor = StelUtils::strToVec3f(conf->value("ArchaeoLines/color_major_standstill", "0.25,1.00,0.25").toString());
+	northernMajorStandstillLine0->setColor(majorStandstillColor);
+	northernMajorStandstillLine1->setColor(majorStandstillColor);
+	southernMajorStandstillLine6->setColor(majorStandstillColor);
+	southernMajorStandstillLine7->setColor(majorStandstillColor);
+	minorStandstillColor = StelUtils::strToVec3f(conf->value("ArchaeoLines/color_minor_standstill", "0.20,0.75,0.20").toString());
+	northernMinorStandstillLine2->setColor(minorStandstillColor);
+	northernMinorStandstillLine3->setColor(minorStandstillColor);
+	southernMinorStandstillLine4->setColor(minorStandstillColor);
+	southernMinorStandstillLine5->setColor(minorStandstillColor);
+	zenithPassageColor   = StelUtils::strToVec3f(conf->value("ArchaeoLines/color_zenith_passage",   "1.00,0.75,0.75").toString());
+	zenithPassageLine->setColor(zenithPassageColor);
+	nadirPassageColor    = StelUtils::strToVec3f(conf->value("ArchaeoLines/color_nadir_passage",    "1.00,0.75,0.75").toString());
+	nadirPassageLine->setColor(nadirPassageColor);
+	selectedObjectColor    = StelUtils::strToVec3f(conf->value("ArchaeoLines/color_selected_object",    "1.00,1.00,1.00").toString());
+	selectedObjectLine->setColor(selectedObjectColor);
+	currentSunColor    = StelUtils::strToVec3f(conf->value("ArchaeoLines/color_current_sun",    "1.00,1.00,0.75").toString());
+	currentSunLine->setColor(currentSunColor);
+	currentMoonColor    = StelUtils::strToVec3f(conf->value("ArchaeoLines/color_current_moon",    "0.50,1.00,0.50").toString());
+	currentMoonLine->setColor(currentMoonColor);
+	currentPlanetColor    = StelUtils::strToVec3f(conf->value("ArchaeoLines/color_current_planet",    "0.25,0.80,1.00").toString());
+	currentPlanetLine->setColor(currentPlanetColor);
+
+	// 5 solar limits
+	showEquinox(conf->value("ArchaeoLines/show_equinox", true).toBool());
+	showSolstices(conf->value("ArchaeoLines/show_solstices", true).toBool());
+	showCrossquarters(conf->value("ArchaeoLines/show_crossquarters", true).toBool());
+	// 4 lunar limits
+	showMajorStandstills(conf->value("ArchaeoLines/show_major_standstills", true).toBool());
+	showMinorStandstills(conf->value("ArchaeoLines/show_minor_standstills", true).toBool());
+	// esp. Mesoamerica
+	showZenithPassage(conf->value("ArchaeoLines/show_zenith_passage", true).toBool());
+	showNadirPassage(conf->value("ArchaeoLines/show_nadir_passage",  true).toBool());
+	// indicator for a line representing currently selected object
+	showSelectedObject(conf->value("ArchaeoLines/show_selected_object", false).toBool());
+	// indicators for current declinations (those move fast over days...)
+	showCurrentSun(conf->value("ArchaeoLines/show_current_sun", true).toBool());
+	showCurrentMoon(conf->value("ArchaeoLines/show_current_moon", true).toBool());
+	showCurrentPlanet(conf->value("ArchaeoLines/show_current_planet", "none").toString());
+}
+
+void ArchaeoLines::showEquinox(bool b)
+{
+	flagShowEquinox=b;
+	conf->setValue("ArchaeoLines/show_equinox",         isEquinoxDisplayed());
+	equinoxLine->setDisplayed(b);
+}
+void ArchaeoLines::showSolstices(bool b)
+{
+	flagShowSolstices=b;
+	conf->setValue("ArchaeoLines/show_solstices",         isSolsticesDisplayed());
+	northernSolsticeLine->setDisplayed(b);
+	southernSolsticeLine->setDisplayed(b);
+}
+void ArchaeoLines::showCrossquarters(bool b)
+{
+	flagShowCrossquarters=b;
+	conf->setValue("ArchaeoLines/show_crossquarters",     isCrossquartersDisplayed());
+	northernCrossquarterLine->setDisplayed(b);
+	southernCrossquarterLine->setDisplayed(b);
+}
+void ArchaeoLines::showMajorStandstills(bool b)
+{
+	flagShowMajorStandstills=b;
+	conf->setValue("ArchaeoLines/show_major_standstills", isMajorStandstillsDisplayed());
+	northernMajorStandstillLine0->setDisplayed(b);
+	northernMajorStandstillLine1->setDisplayed(b);
+	southernMajorStandstillLine6->setDisplayed(b);
+	southernMajorStandstillLine7->setDisplayed(b);
+}
+void ArchaeoLines::showMinorStandstills(bool b)
+{
+	flagShowMinorStandstills=b;
+	conf->setValue("ArchaeoLines/show_minor_standstills", isMinorStandstillsDisplayed());
+	northernMinorStandstillLine2->setDisplayed(b);
+	northernMinorStandstillLine3->setDisplayed(b);
+	southernMinorStandstillLine4->setDisplayed(b);
+	southernMinorStandstillLine5->setDisplayed(b);
+}
+void ArchaeoLines::showZenithPassage(bool b)
+{
+	flagShowZenithPassage=b;
+	conf->setValue("ArchaeoLines/show_zenith_passage",      isZenithPassageDisplayed());
+	zenithPassageLine->setDisplayed(b);
+}
+void ArchaeoLines::showNadirPassage(bool b)
+{
+	flagShowNadirPassage=b;
+	conf->setValue("ArchaeoLines/show_nadir_passage",       isNadirPassageDisplayed());
+	nadirPassageLine->setDisplayed(b);
+}
+void ArchaeoLines::showSelectedObject(bool b)
+{
+	flagShowSelectedObject=b;
+	conf->setValue("ArchaeoLines/show_selected_object",       isSelectedObjectDisplayed());
+	selectedObjectLine->setDisplayed(b);
+}
+void ArchaeoLines::showCurrentSun(bool b)
+{
+	flagShowCurrentSun=b;
+	conf->setValue("ArchaeoLines/show_current_sun",       isCurrentSunDisplayed());
+	currentSunLine->setDisplayed(b);
+}
+void ArchaeoLines::showCurrentMoon(bool b)
+{
+	flagShowCurrentMoon=b;
+	conf->setValue("ArchaeoLines/show_current_moon",       isCurrentMoonDisplayed());
+	currentMoonLine->setDisplayed(b);
+}
+
+void ArchaeoLines::showCurrentPlanet(ArchaeoLine::Line l)
+{
+	enumShowCurrentPlanet=l;
+	const char *planetStrings[]={"none", "Mercury", "Venus", "Mars", "Jupiter", "Saturn"};
+
+	conf->setValue("ArchaeoLines/show_current_planet", planetStrings[l-ArchaeoLine::CurrentPlanetNone]);
+	currentPlanetLine->setLineType(enumShowCurrentPlanet);
+	currentPlanetLine->setDisplayed(enumShowCurrentPlanet != ArchaeoLine::CurrentPlanetNone);
+}
+
+void ArchaeoLines::showCurrentPlanet(QString planet)
+{
+	if (planet=="none")
+		enumShowCurrentPlanet=ArchaeoLine::CurrentPlanetNone;
+	else if (planet=="Mercury")
+		enumShowCurrentPlanet=ArchaeoLine::CurrentPlanetMercury;
+	else if (planet=="Venus")
+		enumShowCurrentPlanet=ArchaeoLine::CurrentPlanetVenus;
+	else if (planet=="Mars")
+		enumShowCurrentPlanet=ArchaeoLine::CurrentPlanetMars;
+	else if (planet=="Jupiter")
+		enumShowCurrentPlanet=ArchaeoLine::CurrentPlanetJupiter;
+	else if (planet=="Saturn")
+		enumShowCurrentPlanet=ArchaeoLine::CurrentPlanetSaturn;
+	else {
+		qWarning() << "ArchaeoLines: showCurrentPlanet: Invalid planet requested: " << planet;
+		enumShowCurrentPlanet=ArchaeoLine::CurrentPlanetNone;
+	}
+
+	conf->setValue("ArchaeoLines/show_current_planet", planet);
+	currentPlanetLine->setLineType(enumShowCurrentPlanet);
+	currentPlanetLine->setDisplayed(enumShowCurrentPlanet != ArchaeoLine::CurrentPlanetNone);
+}
+
+// called by the dialog UI, converts QColor (0..255) to Stellarium's Vec3f float color.
+void ArchaeoLines::setLineColor(ArchaeoLine::Line whichLine, QColor color)
+{
+	switch (whichLine){
+		case ArchaeoLine::Equinox:
+			equinoxColor.set(color.redF(), color.greenF(), color.blueF());
+			conf->setValue("ArchaeoLines/color_equinox",        QString("%1,%2,%3").arg(equinoxColor.v[0]).arg(equinoxColor.v[1]).arg(equinoxColor.v[2]));
+			equinoxLine->setColor(equinoxColor);
+			break;
+		case ArchaeoLine::Solstices:
+			solsticesColor.set(color.redF(), color.greenF(), color.blueF());
+			conf->setValue("ArchaeoLines/color_solstices",        QString("%1,%2,%3").arg(solsticesColor.v[0]).arg(solsticesColor.v[1]).arg(solsticesColor.v[2]));
+			northernSolsticeLine->setColor(solsticesColor);
+			southernSolsticeLine->setColor(solsticesColor);
+			break;
+		case ArchaeoLine::Crossquarters:
+			crossquartersColor.set(color.redF(), color.greenF(), color.blueF());
+			conf->setValue("ArchaeoLines/color_crossquarters",    QString("%1,%2,%3").arg(crossquartersColor.v[0]).arg(crossquartersColor.v[1]).arg(crossquartersColor.v[2]));
+			northernCrossquarterLine->setColor(crossquartersColor);
+			southernCrossquarterLine->setColor(crossquartersColor);
+			break;
+		case ArchaeoLine::MajorStandstill:
+			majorStandstillColor.set(color.redF(), color.greenF(), color.blueF());
+			conf->setValue("ArchaeoLines/color_major_standstill", QString("%1,%2,%3").arg(majorStandstillColor.v[0]).arg(majorStandstillColor.v[1]).arg(majorStandstillColor.v[2]));
+			northernMajorStandstillLine0->setColor(majorStandstillColor);
+			southernMajorStandstillLine7->setColor(majorStandstillColor);
+			northernMajorStandstillLine1->setColor(majorStandstillColor);
+			southernMajorStandstillLine6->setColor(majorStandstillColor);
+			break;
+		case ArchaeoLine::MinorStandstill:
+			minorStandstillColor.set(color.redF(), color.greenF(), color.blueF());
+			conf->setValue("ArchaeoLines/color_minor_standstill", QString("%1,%2,%3").arg(minorStandstillColor.v[0]).arg(minorStandstillColor.v[1]).arg(minorStandstillColor.v[2]));
+			northernMinorStandstillLine2->setColor(minorStandstillColor);
+			southernMinorStandstillLine4->setColor(minorStandstillColor);
+			northernMinorStandstillLine3->setColor(minorStandstillColor);
+			southernMinorStandstillLine5->setColor(minorStandstillColor);
+			break;
+		case ArchaeoLine::ZenithPassage:
+			zenithPassageColor.set(color.redF(), color.greenF(), color.blueF());
+			conf->setValue("ArchaeoLines/color_zenith_passage",     QString("%1,%2,%3").arg(zenithPassageColor.v[0]).arg(zenithPassageColor.v[1]).arg(zenithPassageColor.v[2]));
+			zenithPassageLine->setColor(zenithPassageColor);
+			break;
+		case ArchaeoLine::NadirPassage:
+			nadirPassageColor.set(color.redF(), color.greenF(), color.blueF());
+			conf->setValue("ArchaeoLines/color_nadir_passage",      QString("%1,%2,%3").arg(nadirPassageColor.v[0]).arg(nadirPassageColor.v[1]).arg(nadirPassageColor.v[2]));
+			nadirPassageLine->setColor(nadirPassageColor);
+			break;
+		case ArchaeoLine::SelectedObject:
+			selectedObjectColor.set(color.redF(), color.greenF(), color.blueF());
+			conf->setValue("ArchaeoLines/color_selected_object",      QString("%1,%2,%3").arg(selectedObjectColor.v[0]).arg(selectedObjectColor.v[1]).arg(selectedObjectColor.v[2]));
+			selectedObjectLine->setColor(selectedObjectColor);
+			break;
+		case ArchaeoLine::CurrentSun:
+			currentSunColor.set(color.redF(), color.greenF(), color.blueF());
+			conf->setValue("ArchaeoLines/color_current_sun",      QString("%1,%2,%3").arg(currentSunColor.v[0]).arg(currentSunColor.v[1]).arg(currentSunColor.v[2]));
+			currentSunLine->setColor(currentSunColor);
+			break;
+		case ArchaeoLine::CurrentMoon:
+			currentMoonColor.set(color.redF(), color.greenF(), color.blueF());
+			conf->setValue("ArchaeoLines/color_current_moon",      QString("%1,%2,%3").arg(currentMoonColor.v[0]).arg(currentMoonColor.v[1]).arg(currentMoonColor.v[2]));
+			currentMoonLine->setColor(currentMoonColor);
+			break;
+		case ArchaeoLine::CurrentPlanetNone:
+		case ArchaeoLine::CurrentPlanetMercury:
+		case ArchaeoLine::CurrentPlanetVenus:
+		case ArchaeoLine::CurrentPlanetMars:
+		case ArchaeoLine::CurrentPlanetJupiter:
+		case ArchaeoLine::CurrentPlanetSaturn:
+			currentPlanetColor.set(color.redF(), color.greenF(), color.blueF());
+			conf->setValue("ArchaeoLines/color_current_planet",      QString("%1,%2,%3").arg(currentPlanetColor.v[0]).arg(currentPlanetColor.v[1]).arg(currentPlanetColor.v[2]));
+			currentPlanetLine->setColor(currentPlanetColor);
+			break;
+		default:
+			Q_ASSERT(0);
+	}
+}
+
+// called by the dialog UI, converts Stellarium's Vec3f float color to QColor (0..255).
+QColor ArchaeoLines::getLineColor(ArchaeoLine::Line whichLine)
+{
+	QColor color(0,0,0);
+	Vec3f* vColor;
+	switch (whichLine){
+		case ArchaeoLine::Equinox:
+			vColor=&equinoxColor;
+			break;
+		case ArchaeoLine::Solstices:
+			vColor=&solsticesColor;
+			break;
+		case ArchaeoLine::Crossquarters:
+			vColor=&crossquartersColor;
+			break;
+		case ArchaeoLine::MajorStandstill:
+			vColor=&majorStandstillColor;
+			break;
+		case ArchaeoLine::MinorStandstill:
+			vColor=&minorStandstillColor;
+			break;
+		case ArchaeoLine::ZenithPassage:
+			vColor=&zenithPassageColor;
+			break;
+		case ArchaeoLine::NadirPassage:
+			vColor=&nadirPassageColor;
+			break;
+		case ArchaeoLine::SelectedObject:
+			vColor=&selectedObjectColor;
+			break;
+		case ArchaeoLine::CurrentSun:
+			vColor=&currentSunColor;
+			break;
+		case ArchaeoLine::CurrentMoon:
+			vColor=&currentMoonColor;
+			break;
+		case ArchaeoLine::CurrentPlanetNone:
+		case ArchaeoLine::CurrentPlanetMercury:
+		case ArchaeoLine::CurrentPlanetVenus:
+		case ArchaeoLine::CurrentPlanetMars:
+		case ArchaeoLine::CurrentPlanetJupiter:
+		case ArchaeoLine::CurrentPlanetSaturn:
+			vColor=&currentPlanetColor;
+			break;
+		default:
+			Q_ASSERT(0);
+	}
+	color.setRgbF(vColor->v[0], vColor->v[1], vColor->v[2]);
+	return color;
+}
+
+
+// callback stuff shamelessly taken from GridLinesMgr. Changes: Text MUST be filled, can also be empty for no label!
+struct ALViewportEdgeIntersectCallbackData
+{
+	ALViewportEdgeIntersectCallbackData(StelPainter* p)
+		: sPainter(p)
+	{;}
+	StelPainter* sPainter;
+	//Vec4f textColor;
+	QString text;		// Label to display at the intersection of the lines and screen side
+};
+
+// Callback which draws the label of the grid
+void alViewportEdgeIntersectCallback(const Vec3d& screenPos, const Vec3d& direction, void* userData)
+{
+	// TODO: decide whether to use different color for labels.
+	// Currently label color is equal to line color, and provisions for changing that are commented away.
+
+	ALViewportEdgeIntersectCallbackData* d = static_cast<ALViewportEdgeIntersectCallbackData*>(userData);
+	Vec3d direc(direction);
+	direc.normalize();
+	//const Vec4f tmpColor = d->sPainter->getColor();
+	//d->sPainter->setColor(d->textColor[0], d->textColor[1], d->textColor[2], d->textColor[3]);
+
+	QString text = d->text; // original text-from-coordinates taken out!
+	if (text.isEmpty())
+		return;
+
+	double angleDeg = std::atan2(-direc[1], -direc[0])*180./M_PI;
+	float xshift=6.f;
+	if (angleDeg>90. || angleDeg<-90.)
+	{
+		angleDeg+=180.;
+		xshift=-d->sPainter->getFontMetrics().width(text)-6.f;
+	}
+
+	d->sPainter->drawText(screenPos[0], screenPos[1], text, angleDeg, xshift, 3);
+	//d->sPainter->setColor(tmpColor[0], tmpColor[1], tmpColor[2], tmpColor[3]); // RESTORE
+}
+
+
+ArchaeoLine::ArchaeoLine(ArchaeoLine::Line lineType, double declination) :
+	lineType(lineType), declination(declination), color(0.f, 0.f, 1.f), frameType(StelCore::FrameEquinoxEqu), flagLabel(true)
+{
+	// Font size is 14
+	font.setPixelSize(StelApp::getInstance().getBaseFontSize()+1);
+	updateLabel();
+	fader.setDuration(1000);
+	// Initialize the message strings and make sure they are translated when the language changes.
+	StelApp& app = StelApp::getInstance();
+	//updateLabel(); // WHY AGAIN??
+	connect(&app, SIGNAL(languageChanged()), this, SLOT(updateLabel()));
+
+}
+
+void ArchaeoLine::updateLabel()
+{
+	//qDebug() << "ArchaeoLine::updateLabel(): lineType is " << lineType;
+	// TODO: decide whether showing declinations in addition.
+	switch (lineType)
+	{
+		case ArchaeoLine::Equinox:
+			label = q_("Equinox");
+			break;
+		case ArchaeoLine::Solstices:
+			label = q_("Solstice");
+			break;
+		case ArchaeoLine::Crossquarters:
+			label = q_("Crossquarter");
+			break;
+		case ArchaeoLine::MajorStandstill:
+			label = q_("Major Lunar Standstill");
+			break;
+		case ArchaeoLine::MinorStandstill:
+			label = q_("Minor Lunar Standstill");
+			break;
+		case ArchaeoLine::ZenithPassage:
+			label = q_("Zenith Passage");
+			break;
+		case ArchaeoLine::NadirPassage:
+			label = q_("Nadir Passage");
+			break;
+		case ArchaeoLine::SelectedObject:
+			label = q_("Selected Object");
+			break;
+		case ArchaeoLine::CurrentSun:
+			label = q_("Sun");
+			break;
+		case ArchaeoLine::CurrentMoon:
+			label = q_("Moon");
+			break;
+		case ArchaeoLine::CurrentPlanetNone:
+			label = q_("error if you can read this");
+			break;
+		case ArchaeoLine::CurrentPlanetMercury:
+			label = q_("Mercury");
+			break;
+		case ArchaeoLine::CurrentPlanetVenus:
+			label = q_("Venus");
+			break;
+		case ArchaeoLine::CurrentPlanetMars:
+			label = q_("Mars");
+			break;
+		case ArchaeoLine::CurrentPlanetJupiter:
+			label = q_("Jupiter");
+			break;
+		case ArchaeoLine::CurrentPlanetSaturn:
+			label = q_("Saturn");
+			break;
+		default:
+			Q_ASSERT(0);
+	}
+}
+
+
+void ArchaeoLine::draw(StelCore *core, float intensity) const
+{
+	// borrowed largely from GridLinesMgr.
+	if (intensity*fader.getInterstate() < 0.000001f)
+		return;
+
+
+	StelProjectorP prj = core->getProjection(frameType, StelCore::RefractionAuto);
+
+	// Get the bounding halfspace
+	const SphericalCap& viewPortSphericalCap = prj->getBoundingCap();
+
+	// Initialize a painter and set OpenGL state
+	StelPainter sPainter(prj);
+	sPainter.setColor(color[0], color[1], color[2], intensity*fader.getInterstate());
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Normal transparency mode
+	glDisable(GL_TEXTURE_2D);
+	glEnable(GL_BLEND);
+
+	// OpenGL ES 2.0 doesn't have GL_LINE_SMOOTH
+	#ifdef GL_LINE_SMOOTH
+	if (QOpenGLContext::currentContext()->format().renderableType()==QSurfaceFormat::OpenGL)
+		glEnable(GL_LINE_SMOOTH);
+	#endif
+
+	//Vec4f textColor(color[0], color[1], color[2], intensity*fader.getInterstate());
+
+	ALViewportEdgeIntersectCallbackData userData(&sPainter);
+	sPainter.setFont(font);
+	//userData.textColor = textColor;
+	userData.text = (isLabelVisible() ? label : "");
+	/////////////////////////////////////////////////
+	// Draw the line
+	const double lat=declination*M_PI/180.0;
+	SphericalCap declinationCap(Vec3d(0,0,1), std::sin(lat));
+	const Vec3d rotCenter(0,0,declinationCap.d);
+
+	Vec3d p1, p2;
+	if (!SphericalCap::intersectionPoints(viewPortSphericalCap, declinationCap, p1, p2))
+	{
+		if ((viewPortSphericalCap.d<declinationCap.d && viewPortSphericalCap.contains(declinationCap.n))
+			|| (viewPortSphericalCap.d<-declinationCap.d && viewPortSphericalCap.contains(-declinationCap.n)))
+		{
+			// The line is fully included in the viewport, draw it in 3 sub-arcs to avoid length > 180.
+			Vec3d pt1;
+			Vec3d pt2;
+			Vec3d pt3;
+			const double lon1=0.0;
+			const double lon2=120.0*M_PI/180.0;
+			const double lon3=240.0*M_PI/180.0;
+			StelUtils::spheToRect(lon1, lat, pt1); pt1.normalize();
+			StelUtils::spheToRect(lon2, lat, pt2); pt2.normalize();
+			StelUtils::spheToRect(lon3, lat, pt3); pt3.normalize();
+
+			sPainter.drawSmallCircleArc(pt1, pt2, rotCenter, alViewportEdgeIntersectCallback, &userData);
+			sPainter.drawSmallCircleArc(pt2, pt3, rotCenter, alViewportEdgeIntersectCallback, &userData);
+			sPainter.drawSmallCircleArc(pt3, pt1, rotCenter, alViewportEdgeIntersectCallback, &userData);
+			#ifdef GL_LINE_SMOOTH
+			if (QOpenGLContext::currentContext()->format().renderableType()==QSurfaceFormat::OpenGL)
+				glDisable(GL_LINE_SMOOTH);
+			#endif
+			glDisable(GL_BLEND);
+			return;
+		}
+		else
+		{
+			#ifdef GL_LINE_SMOOTH
+			if (QOpenGLContext::currentContext()->format().renderableType()==QSurfaceFormat::OpenGL)
+				glDisable(GL_LINE_SMOOTH);
+			#endif
+			glDisable(GL_BLEND);
+			return;
+		}
+	}
+	// Draw the arc in 2 sub-arcs to avoid lengths > 180 deg
+	Vec3d middlePoint = p1-rotCenter+p2-rotCenter;
+	middlePoint.normalize();
+	middlePoint*=(p1-rotCenter).length();
+	middlePoint+=rotCenter;
+	if (!viewPortSphericalCap.contains(middlePoint))
+	{
+		middlePoint-=rotCenter;
+		middlePoint*=-1.;
+		middlePoint+=rotCenter;
+	}
+
+	sPainter.drawSmallCircleArc(p1, middlePoint, rotCenter,alViewportEdgeIntersectCallback, &userData);
+	sPainter.drawSmallCircleArc(p2, middlePoint, rotCenter, alViewportEdgeIntersectCallback, &userData);
+
+	// OpenGL ES 2.0 doesn't have GL_LINE_SMOOTH
+	#ifdef GL_LINE_SMOOTH
+	if (QOpenGLContext::currentContext()->format().renderableType()==QSurfaceFormat::OpenGL)
+		glDisable(GL_LINE_SMOOTH);
+	#endif
+
+	glDisable(GL_BLEND);
+}

=== added file 'plugins/ArchaeoLines/src/ArchaeoLines.hpp'
--- plugins/ArchaeoLines/src/ArchaeoLines.hpp	1970-01-01 00:00:00 +0000
+++ plugins/ArchaeoLines/src/ArchaeoLines.hpp	2015-04-09 09:33:54 +0000
@@ -0,0 +1,300 @@
+/*
+ * Copyright (C) 2014 Georg Zotti
+ *
+ * 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 ARCHAEOLINES_HPP_
+#define ARCHAEOLINES_HPP_
+
+#include <QFont>
+#include <QColor>
+#include <QKeyEvent>
+#include "VecMath.hpp"
+#include "StelModule.hpp"
+#include "StelFader.hpp"
+#include "StelCore.hpp"
+#include "StelObjectMgr.hpp"
+
+class QTimer;
+class QPixmap;
+class StelButton;
+class ArchaeoLinesDialog;
+class ArchaeoLine;
+
+
+//! @class ArchaeoLine
+//! Class which manages a line (small circle) to display around the sky like the solstices line.
+//! Modelled after @class SkyLine found in GridLinesMgr.cpp at V0.13.2, but with small-circle drawing.
+class ArchaeoLine : QObject
+{
+	Q_OBJECT
+	Q_PROPERTY(Vec3f color READ getColor WRITE setColor)
+	Q_PROPERTY(bool flagLabel READ isLabelVisible WRITE setLabelVisible)
+public:
+	enum Line {
+		Equinox,
+		Solstices,
+		Crossquarters,
+		MajorStandstill,
+		MinorStandstill,
+		ZenithPassage,
+		NadirPassage,
+		SelectedObject,
+		CurrentSun,
+		CurrentMoon,
+		CurrentPlanetNone, // actually a placeholder for counting/testing. By itself it makes no sense, i.e. deactivates the planet line
+		CurrentPlanetMercury,
+		CurrentPlanetVenus,
+		CurrentPlanetMars,
+		CurrentPlanetJupiter,
+		CurrentPlanetSaturn
+	};
+
+	ArchaeoLine(ArchaeoLine::Line lineType, double declination);
+	virtual ~ArchaeoLine(){}
+	void draw(StelCore* core, float intensity=1.0f) const;
+	const Vec3f& getColor() const {return color;}
+	bool isDisplayed(void) const {return fader;}
+
+public slots:
+	void setColor(const Vec3f& c) {color = c;}
+	void update(double deltaTime) {fader.update((int)(deltaTime*1000));}
+	void setFadeDuration(float duration) {fader.setDuration((int)(duration*1000.f));}
+	void setDisplayed(const bool displayed){fader = displayed;}
+	void setFontSize(double newSize){font.setPixelSize(newSize);}
+	//! Re-translates the label.
+	void updateLabel();
+	void setLabelVisible(bool b){flagLabel=b;}
+	//! reset declination (degrees) of this small arc.
+	void setDeclination(double decl){declination=decl;}
+	bool isLabelVisible() const{return flagLabel;}
+	void setLineType(ArchaeoLine::Line line) {lineType=line; updateLabel();} // Meaningful only for CurrentPlanet... types
+	//! change label. Used only for selected-object line - the other labels should not be changed!
+	void setLabel(const QString newLabel){label=newLabel;}
+
+private:
+	ArchaeoLine::Line lineType;
+	double declination; // degrees
+	Vec3f color;
+	StelCore::FrameType frameType;
+	bool flagLabel; //! show the label. (some should be permanently silent)
+	QString label;
+	LinearFader fader;
+	QFont font;
+};
+
+//! Main class of the ArchaeoLines plug-in.
+//! Provides an on-screen visualisation of several small circles relevant mainly to archaeoastronomy.
+//! GZ 2014-12
+class ArchaeoLines : public StelModule
+{
+	Q_OBJECT
+	Q_PROPERTY(bool enabled
+		   READ isEnabled
+		   WRITE enableArchaeoLines)
+//	Q_PROPERTY(bool dmsFormat
+//		   READ isDmsFormat
+//		   WRITE useDmsFormat)
+	Q_PROPERTY(bool flagShowEquinox
+				READ    isEquinoxDisplayed
+				WRITE showEquinox)
+	Q_PROPERTY(bool flagShowSolstices
+				READ    isSolsticesDisplayed
+				WRITE showSolstices)
+	Q_PROPERTY(bool flagShowCrossquarters
+				READ    isCrossquartersDisplayed
+				WRITE showCrossquarters)
+	Q_PROPERTY(bool flagShowMajorStandstills
+				READ    isMajorStandstillsDisplayed
+				WRITE showMajorStandstills)
+	Q_PROPERTY(bool flagShowMinorStandstills
+				READ    isMinorStandstillsDisplayed
+				WRITE showMinorStandstills)
+	Q_PROPERTY(bool flagShowZenithPassage
+				READ    isZenithPassageDisplayed
+				WRITE showZenithPassage)
+	Q_PROPERTY(bool flagShowNadirPassage
+				READ    isNadirPassageDisplayed
+				WRITE showNadirPassage)
+	Q_PROPERTY(bool flagShowSelectedObject
+				READ    isSelectedObjectDisplayed
+				WRITE showSelectedObject)
+	Q_PROPERTY(bool flagShowCurrentSun
+				READ    isCurrentSunDisplayed
+				WRITE showCurrentSun)
+	Q_PROPERTY(bool flagShowCurrentMoon
+				READ    isCurrentMoonDisplayed
+				WRITE showCurrentMoon)
+	Q_PROPERTY(ArchaeoLine::Line enumShowCurrentPlanet
+				READ    whichCurrentPlanetDisplayed
+				WRITE showCurrentPlanet)
+
+public:
+	ArchaeoLines();
+	virtual ~ArchaeoLines();
+	
+
+
+	///////////////////////////////////////////////////////////////////////////
+	// Methods defined in the StelModule class
+	virtual void init();
+	virtual void update(double deltaTime);
+	virtual void draw(StelCore* core);
+	virtual double getCallOrder(StelModuleActionName actionName) const;
+	virtual void handleKeys(class QKeyEvent* event){event->setAccepted(false);}
+	virtual bool configureGui(bool show=true);
+	bool isEnabled() const {return flagShowArchaeoLines;}
+	bool isDmsFormat() const { return flagUseDmsFormat; } // NOT SURE IF USEFUL
+	bool isEquinoxDisplayed() const {return flagShowEquinox;}
+	bool isSolsticesDisplayed() const {return flagShowSolstices;}
+	bool isCrossquartersDisplayed() const {return flagShowCrossquarters;}
+	bool isMajorStandstillsDisplayed() const {return flagShowMajorStandstills;}
+	bool isMinorStandstillsDisplayed() const {return flagShowMinorStandstills;}
+	bool isZenithPassageDisplayed() const {return flagShowZenithPassage;}
+	bool isNadirPassageDisplayed() const {return flagShowNadirPassage;}
+	bool isSelectedObjectDisplayed() const {return flagShowSelectedObject;}
+	bool isCurrentSunDisplayed() const {return flagShowCurrentSun;}
+	bool isCurrentMoonDisplayed() const {return flagShowCurrentMoon;}
+	ArchaeoLine::Line whichCurrentPlanetDisplayed() const {return enumShowCurrentPlanet;}
+
+	//! Restore the plug-in's settings to the default state.
+	//! Replace the plug-in's settings in Stellarium's configuration file
+	//! with the default values and re-load them.
+	//! Uses internally loadSettings().
+	void restoreDefaultSettings();
+
+	//! Load the plug-in's settings from the configuration file.
+	//! Settings are kept in the "ArchaeoLines" section in Stellarium's
+	//! configuration file. If no such section exists, it will load default
+	//! values.
+	//! @see restoreDefaultSettings()
+	void loadSettings();
+
+
+public slots:
+	void enableArchaeoLines(bool b);
+	//void useDmsFormat(bool b);
+
+	void showEquinox(bool b);
+	void showSolstices(bool b);
+	void showCrossquarters(bool b);
+	void showMajorStandstills(bool b);
+	void showMinorStandstills(bool b);
+	void showZenithPassage(bool b);
+	void showNadirPassage(bool b);
+	void showSelectedObject(bool b);
+	void showCurrentSun(bool b);
+	void showCurrentMoon(bool b);
+	void showCurrentPlanet(ArchaeoLine::Line l); // Allowed values for l: CurrentPlanetNone...CurrentPlanetSaturn.
+	void showCurrentPlanet(QString planet); // Allowed values for planet: "none", "Mercury", "Venus", "Mars", "Jupiter", "Saturn".
+
+	// called by the dialog GUI, converts GUI's QColor (0..255) to Stellarium's Vec3f float color.
+	void setLineColor(ArchaeoLine::Line whichLine, QColor color);
+	// called by the dialog UI, converts Stellarium's Vec3f float color to QColor (0..255).
+	QColor getLineColor(ArchaeoLine::Line whichLine);
+
+private:
+	QFont font;
+	bool flagShowArchaeoLines;
+	bool withDecimalDegree;
+	bool flagUseDmsFormat;
+	LinearFader lineFader;
+
+	Vec3f equinoxColor;
+	Vec3f solsticesColor;
+	Vec3f crossquartersColor;
+	Vec3f majorStandstillColor;
+	Vec3f minorStandstillColor;
+	Vec3f zenithPassageColor;
+	Vec3f nadirPassageColor;
+	Vec3f selectedObjectColor;
+	Vec3f currentSunColor;
+	Vec3f currentMoonColor;
+	Vec3f currentPlanetColor;
+
+
+
+	bool flagShowEquinox;
+	bool flagShowSolstices;
+	bool flagShowCrossquarters;
+	bool flagShowMajorStandstills;
+	bool flagShowMinorStandstills;
+	bool flagShowZenithPassage;
+	bool flagShowNadirPassage;
+	bool flagShowSelectedObject;
+	bool flagShowCurrentSun;
+	bool flagShowCurrentMoon;
+	ArchaeoLine::Line enumShowCurrentPlanet;
+	// These should go into ArchaeoLine single-line class!
+	double lastJD; // cache last-time-computed to 1/month or so?
+
+	ArchaeoLine * equinoxLine;
+	ArchaeoLine * northernSolsticeLine;
+	ArchaeoLine * southernSolsticeLine;
+	ArchaeoLine * northernCrossquarterLine;
+	ArchaeoLine * southernCrossquarterLine;
+	ArchaeoLine * northernMajorStandstillLine0;
+	ArchaeoLine * northernMajorStandstillLine1;
+	ArchaeoLine * northernMinorStandstillLine2;
+	ArchaeoLine * northernMinorStandstillLine3;
+	ArchaeoLine * southernMinorStandstillLine4;
+	ArchaeoLine * southernMinorStandstillLine5;
+	ArchaeoLine * southernMajorStandstillLine6;
+	ArchaeoLine * southernMajorStandstillLine7;
+	ArchaeoLine * zenithPassageLine;
+	ArchaeoLine * nadirPassageLine;
+	ArchaeoLine * selectedObjectLine;
+	ArchaeoLine * currentSunLine;
+	ArchaeoLine * currentMoonLine;
+	ArchaeoLine * currentPlanetLine;
+
+	StelButton* toolbarButton;
+
+	// draw one arc.
+	//! @param core the StelCore object
+	//! @param declination of the small circle
+	//! @param frameType usually StelCore::FrameEquinoxEqu
+	//! @param refractionMode usually StelCore::RefractionAuto
+	//! @param txtColor color used for any text printed regarding this line
+	//! @param lineColor color used for this line
+//	void drawOne(StelCore *core, const float declination, const StelCore::FrameType frameType, const StelCore::RefractionMode refractionMode, const Vec3f txtColor, const Vec3f lineColor);
+  
+	QSettings* conf;
+
+	// GUI
+	ArchaeoLinesDialog* configDialog;
+	StelCore* core; // used quite often, better keep a reference...
+	StelObjectMgr* objMgr;
+};
+
+
+
+#include <QObject>
+#include "StelPluginInterface.hpp"
+
+//! This class is used by Qt to manage a plug-in interface
+class ArchaeoLinesStelPluginInterface : public QObject, public StelPluginInterface
+{
+	Q_OBJECT
+	Q_PLUGIN_METADATA(IID StelPluginInterface_iid)
+	Q_INTERFACES(StelPluginInterface)
+public:
+	virtual StelModule* getStelModule() const;
+	virtual StelPluginInfo getPluginInfo() const;
+};
+
+#endif /*ARCHAEOLINES_HPP_*/
+

=== added file 'plugins/ArchaeoLines/src/CMakeLists.txt'
--- plugins/ArchaeoLines/src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/ArchaeoLines/src/CMakeLists.txt	2015-04-09 09:33:54 +0000
@@ -0,0 +1,29 @@
+INCLUDE_DIRECTORIES(. gui)
+LINK_DIRECTORIES(${BUILD_DIR}/src)
+
+SET(ArchaeoLines_SRCS
+  ArchaeoLines.hpp
+  ArchaeoLines.cpp
+  gui/ArchaeoLinesDialog.hpp
+  gui/ArchaeoLinesDialog.cpp
+)
+
+SET(ArchaeoLines_UIS
+  gui/archaeoLinesDialog.ui
+)
+
+QT5_WRAP_UI(ArchaeoLines_UIS_H ${ArchaeoLines_UIS})
+
+################# compiles resources files ############
+SET(ArchaeoLines_RES ../ArchaeoLines.qrc)
+QT5_ADD_RESOURCES(ArchaeoLines_RES_CXX ${ArchaeoLines_RES})
+
+SET(extLinkerOption ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${OPENGL_LIBRARIES})
+
+ADD_LIBRARY(ArchaeoLines-static STATIC ${ArchaeoLines_SRCS} ${ArchaeoLines_RES_CXX} ${ArchaeoLines_UIS_H})
+QT5_USE_MODULES(ArchaeoLines-static Core Network Widgets Declarative)
+# The library target "ArchaeoLines-static" has a default OUTPUT_NAME of "ArchaeoLines-static", so change it.
+SET_TARGET_PROPERTIES(ArchaeoLines-static PROPERTIES OUTPUT_NAME "ArchaeoLines")
+TARGET_LINK_LIBRARIES(ArchaeoLines-static ${extLinkerOption})
+SET_TARGET_PROPERTIES(ArchaeoLines-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
+ADD_DEPENDENCIES(AllStaticPlugins ArchaeoLines-static)

=== added directory 'plugins/ArchaeoLines/src/gui'
=== added file 'plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.cpp'
--- plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.cpp	1970-01-01 00:00:00 +0000
+++ plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.cpp	2015-04-09 09:33:54 +0000
@@ -0,0 +1,421 @@
+/*
+ * ArchaeoLines plug-in for Stellarium
+ *
+ * Copyright (C) 2014 Georg Zotti
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ArchaeoLines.hpp"
+#include "ArchaeoLinesDialog.hpp"
+#include "ui_archaeoLinesDialog.h"
+
+#include "StelApp.hpp"
+#include "StelLocaleMgr.hpp"
+#include "StelModule.hpp"
+#include "StelModuleMgr.hpp"
+#include "StelMainView.hpp"
+
+ArchaeoLinesDialog::ArchaeoLinesDialog()
+	: al(NULL)
+{
+	ui = new Ui_archaeoLinesDialog();
+	//colorDialog = new QColorDialog(NULL);
+}
+
+ArchaeoLinesDialog::~ArchaeoLinesDialog()
+{
+	//delete colorDialog; colorDialog=NULL;
+	delete ui;          ui=NULL;
+}
+
+void ArchaeoLinesDialog::retranslate()
+{
+	if (dialog)
+	{
+		ui->retranslateUi(dialog);
+		setAboutHtml();
+	}
+}
+
+void ArchaeoLinesDialog::createDialogContent()
+{
+	al = GETSTELMODULE(ArchaeoLines);
+	ui->setupUi(dialog);
+
+#ifdef Q_OS_WIN
+	//Kinetic scrolling for tablet pc and pc
+	QList<QWidget *> addscroll;
+	addscroll << ui->aboutTextBrowser;
+	installKineticScrolling(addscroll);
+#endif
+
+	connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate()));
+	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
+
+	//ui->useDmsFormatCheckBox->setChecked(al->isDmsFormat());
+	//connect(ui->useDmsFormatCheckBox, SIGNAL(toggled(bool)), al, SLOT(useDmsFormat(bool)));
+
+	ui->equinoxCheckBox->setChecked(al->isEquinoxDisplayed());
+	connect(ui->equinoxCheckBox, SIGNAL(toggled(bool)), al, SLOT(showEquinox(bool)));
+	ui->solsticesCheckBox->setChecked(al->isSolsticesDisplayed());
+	connect(ui->solsticesCheckBox, SIGNAL(toggled(bool)), al, SLOT(showSolstices(bool)));
+	ui->crossquarterCheckBox->setChecked(al->isCrossquartersDisplayed());
+	connect(ui->crossquarterCheckBox, SIGNAL(toggled(bool)), al, SLOT(showCrossquarters(bool)));
+	ui->majorStandstillCheckBox->setChecked(al->isMajorStandstillsDisplayed());
+	connect(ui->majorStandstillCheckBox, SIGNAL(toggled(bool)), al, SLOT(showMajorStandstills(bool)));
+	ui->minorStandstillCheckBox->setChecked(al->isMinorStandstillsDisplayed());
+	connect(ui->minorStandstillCheckBox, SIGNAL(toggled(bool)), al, SLOT(showMinorStandstills(bool)));
+	ui->zenithPassageCheckBox->setChecked(al->isZenithPassageDisplayed());
+	connect(ui->zenithPassageCheckBox, SIGNAL(toggled(bool)), al, SLOT(showZenithPassage(bool)));
+	ui->nadirPassageCheckBox->setChecked(al->isNadirPassageDisplayed());
+	connect(ui->nadirPassageCheckBox, SIGNAL(toggled(bool)), al, SLOT(showNadirPassage(bool)));
+	ui->selectedObjectCheckBox->setChecked(al->isSelectedObjectDisplayed());
+	connect(ui->selectedObjectCheckBox, SIGNAL(toggled(bool)), al, SLOT(showSelectedObject(bool)));
+	ui->currentSunCheckBox->setChecked(al->isCurrentSunDisplayed());
+	connect(ui->currentSunCheckBox, SIGNAL(toggled(bool)), al, SLOT(showCurrentSun(bool)));
+	ui->currentMoonCheckBox->setChecked(al->isCurrentMoonDisplayed());
+	connect(ui->currentMoonCheckBox, SIGNAL(toggled(bool)), al, SLOT(showCurrentMoon(bool)));
+	// Planet ComboBox requires special handling!
+	ui->currentPlanetComboBox->setCurrentIndex(al->whichCurrentPlanetDisplayed()-ArchaeoLine::CurrentPlanetNone);
+	connect(ui->currentPlanetComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(setCurrentPlanetFromGUI(int)));
+
+	equinoxColor         = al->getLineColor(ArchaeoLine::Equinox);
+	solsticeColor        = al->getLineColor(ArchaeoLine::Solstices);
+	crossquarterColor    = al->getLineColor(ArchaeoLine::Crossquarters);
+	majorStandstillColor = al->getLineColor(ArchaeoLine::MajorStandstill);
+	minorStandstillColor = al->getLineColor(ArchaeoLine::MinorStandstill);
+	zenithPassageColor   = al->getLineColor(ArchaeoLine::ZenithPassage);
+	nadirPassageColor    = al->getLineColor(ArchaeoLine::NadirPassage);
+	selectedObjectColor  = al->getLineColor(ArchaeoLine::SelectedObject);
+	currentSunColor      = al->getLineColor(ArchaeoLine::CurrentSun);
+	currentMoonColor     = al->getLineColor(ArchaeoLine::CurrentMoon);
+	currentPlanetColor   = al->getLineColor(ArchaeoLine::CurrentPlanetNone);
+	equinoxColorPixmap=QPixmap(48, 12);
+	equinoxColorPixmap.fill(equinoxColor);
+	ui->equinoxColorToolButton->setIconSize(QSize(48, 12));
+	ui->equinoxColorToolButton->setIcon(QIcon(equinoxColorPixmap));
+	solsticeColorPixmap=QPixmap(48, 12);
+	solsticeColorPixmap.fill(solsticeColor);
+	ui->solsticesColorToolButton->setIconSize(QSize(48, 12));
+	ui->solsticesColorToolButton->setIcon(QIcon(solsticeColorPixmap));
+	crossquarterColorPixmap=QPixmap(48, 12);
+	crossquarterColorPixmap.fill(crossquarterColor);
+	ui->crossquarterColorToolButton->setIconSize(QSize(48, 12));
+	ui->crossquarterColorToolButton->setIcon(QIcon(crossquarterColorPixmap));
+	minorStandstillColorPixmap=QPixmap(48, 12);
+	minorStandstillColorPixmap.fill(minorStandstillColor);
+	ui->minorStandstillColorToolButton->setIconSize(QSize(48, 12));
+	ui->minorStandstillColorToolButton->setIcon(QIcon(minorStandstillColorPixmap));
+	majorStandstillColorPixmap=QPixmap(48, 12);
+	majorStandstillColorPixmap.fill(majorStandstillColor);
+	ui->majorStandstillColorToolButton->setIconSize(QSize(48, 12));
+	ui->majorStandstillColorToolButton->setIcon(QIcon(majorStandstillColorPixmap));
+	zenithPassageColorPixmap=QPixmap(48, 12);
+	zenithPassageColorPixmap.fill(zenithPassageColor);
+	ui->zenithPassageColorToolButton->setIconSize(QSize(48, 12));
+	ui->zenithPassageColorToolButton->setIcon(QIcon(zenithPassageColorPixmap));
+	nadirPassageColorPixmap=QPixmap(48, 12);
+	nadirPassageColorPixmap.fill(nadirPassageColor);
+	ui->nadirPassageColorToolButton->setIconSize(QSize(48, 12));
+	ui->nadirPassageColorToolButton->setIcon(QIcon(nadirPassageColorPixmap));
+	selectedObjectColorPixmap=QPixmap(48, 12);
+	selectedObjectColorPixmap.fill(selectedObjectColor);
+	ui->selectedObjectColorToolButton->setIconSize(QSize(48, 12));
+	ui->selectedObjectColorToolButton->setIcon(QIcon(selectedObjectColorPixmap));
+	currentSunColorPixmap=QPixmap(48, 12);
+	currentSunColorPixmap.fill(currentSunColor);
+	ui->currentSunColorToolButton->setIconSize(QSize(48, 12));
+	ui->currentSunColorToolButton->setIcon(QIcon(currentSunColorPixmap));
+	currentMoonColorPixmap=QPixmap(48, 12);
+	currentMoonColorPixmap.fill(currentMoonColor);
+	ui->currentMoonColorToolButton->setIconSize(QSize(48, 12));
+	ui->currentMoonColorToolButton->setIcon(QIcon(currentMoonColorPixmap));
+	currentPlanetColorPixmap=QPixmap(48, 12);
+	currentPlanetColorPixmap.fill(currentPlanetColor);
+	ui->currentPlanetColorToolButton->setIconSize(QSize(48, 12));
+	ui->currentPlanetColorToolButton->setIcon(QIcon(currentPlanetColorPixmap));
+
+	connect(ui->equinoxColorToolButton,         SIGNAL(released()), this, SLOT(askEquinoxColor()));
+	connect(ui->solsticesColorToolButton,       SIGNAL(released()), this, SLOT(askSolsticeColor()));
+	connect(ui->crossquarterColorToolButton,    SIGNAL(released()), this, SLOT(askCrossquarterColor()));
+	connect(ui->majorStandstillColorToolButton, SIGNAL(released()), this, SLOT(askMajorStandstillColor()));
+	connect(ui->minorStandstillColorToolButton, SIGNAL(released()), this, SLOT(askMinorStandstillColor()));
+	connect(ui->zenithPassageColorToolButton,   SIGNAL(released()), this, SLOT(askZenithPassageColor()));
+	connect(ui->nadirPassageColorToolButton,    SIGNAL(released()), this, SLOT(askNadirPassageColor()));
+	connect(ui->selectedObjectColorToolButton,  SIGNAL(released()), this, SLOT(askSelectedObjectColor()));
+	connect(ui->currentSunColorToolButton,      SIGNAL(released()), this, SLOT(askCurrentSunColor()));
+	connect(ui->currentMoonColorToolButton,     SIGNAL(released()), this, SLOT(askCurrentMoonColor()));
+	connect(ui->currentPlanetColorToolButton,   SIGNAL(released()), this, SLOT(askCurrentPlanetColor()));
+
+	connect(ui->restoreDefaultsButton, SIGNAL(clicked()), this, SLOT(resetArchaeoLinesSettings()));
+
+	ui->formatDisplayBox->hide();
+	// We must apparently warn about a potential problem, but only on Windows. (QTBUG-35302)
+	#ifndef Q_OS_WIN
+	ui->switchToWindowedModeLabel->hide();
+	#endif
+	setAboutHtml();
+}
+
+void ArchaeoLinesDialog::setCurrentPlanetFromGUI(int index)
+{
+	Q_ASSERT(al);
+	al->showCurrentPlanet((ArchaeoLine::Line) (ArchaeoLine::CurrentPlanetNone+index));
+}
+
+
+void ArchaeoLinesDialog::setAboutHtml(void)
+{
+	QString html = "<html><head></head><body>";
+	html += "<h2>" + q_("ArchaeoLines Plug-in") + "</h2><table width=\"90%\">";
+	html += "<tr width=\"30%\"><td><strong>" + q_("Version") + ":</strong></td><td>" + ARCHAEOLINES_VERSION + "</td></tr>";
+	html += "<tr><td><strong>" + q_("Author") + ":</strong></td><td>Georg Zotti</td></tr>";
+	//html += "<tr><td><strong>" + q_("Contributors") + ":</strong></td><td> List with br separators </td></tr>";
+	html += "</table>";
+
+	html += "<p>" + q_("The ArchaeoLines plugin displays any combination of declination arcs most relevant to archaeo- or ethnoastronomical studies.") + "</p>";
+	html += "<ul><li>" + q_("Declinations of equinoxes (i.e. equator) and the solstices") + "</li>";
+	html += "<li>" + q_("Declinations of the crossquarter days (days right between solstices and equinoxes)") + "</li>";
+	html += "<li>" + q_("Declinations of the Major Lunar Standstills") + "</li>";
+	html += "<li>" + q_("Declinations of the Minor Lunar Standstills") + "</li>";
+	html += "<li>" + q_("Declination of the Zenith passage") + "</li>";
+	html += "<li>" + q_("Declination of the Nadir passage") + "</li>";
+	html += "<li>" + q_("Declination of the currently selected object") + "</li>";
+	html += "<li>" + q_("Current declination of the sun") + "</li>";
+	html += "<li>" + q_("Current declination of the moon") + "</li>";
+	html += "<li>" + q_("Current declination of a naked-eye planet") + "</li></ul>";
+	html += "<p>" + q_("The lunar lines include horizon parallax effects. "
+			   "There are two lines each drawn, for maximum and minimum distance of the moon. "
+			   "Note that declination of the moon at the major standstill can exceed the "
+			   "indicated limits if it is high in the sky due to parallax effects.") + "</p>";
+
+	html += "<h3>" + q_("Links") + "</h3>";
+	html += "<p>" + QString(q_("Support is provided via the Launchpad website.  Be sure to put \"%1\" in the subject when posting.")).arg("ArchaeoLines plugin") + "</p>";
+	html += "<p><ul>";
+	// TRANSLATORS: The numbers contain the opening and closing tag of an HTML link
+	html += "<li>" + QString(q_("If you have a question, you can %1get an answer here%2").arg("<a href=\"https://answers.launchpad.net/stellarium\">")).arg("</a>") + "</li>";
+	// TRANSLATORS: The numbers contain the opening and closing tag of an HTML link
+	html += "<li>" + QString(q_("Bug reports can be made %1here%2.")).arg("<a href=\"https://bugs.launchpad.net/stellarium\">").arg("</a>") + "</li>";
+	// TRANSLATORS: The numbers contain the opening and closing tag of an HTML link
+	html += "<li>" + q_("If you would like to make a feature request, you can create a bug report, and set the severity to \"wishlist\".") + "</li>";
+	//// TRANSLATORS: The numbers contain the opening and closing tag of an HTML link
+	//html += "<li>" + q_("If you want to read full information about this plugin and its history, you can %1get info here%2.").arg("<a href=\"http://stellarium.org/wiki/index.php/ArchaeoLines_plugin\">").arg("</a>") + "</li>";
+	html += "</ul></p></body></html>";
+
+	StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
+	if(gui!=NULL)
+	{
+		QString htmlStyleSheet(gui->getStelStyle().htmlStyleSheet);
+		ui->aboutTextBrowser->document()->setDefaultStyleSheet(htmlStyleSheet);
+	}
+
+	ui->aboutTextBrowser->setHtml(html);
+}
+
+
+void ArchaeoLinesDialog::resetArchaeoLinesSettings()
+{
+	al->restoreDefaultSettings();
+	equinoxColor         = al->getLineColor(ArchaeoLine::Equinox);
+	solsticeColor        = al->getLineColor(ArchaeoLine::Solstices);
+	crossquarterColor    = al->getLineColor(ArchaeoLine::Crossquarters);
+	majorStandstillColor = al->getLineColor(ArchaeoLine::MajorStandstill);
+	minorStandstillColor = al->getLineColor(ArchaeoLine::MinorStandstill);
+	zenithPassageColor   = al->getLineColor(ArchaeoLine::ZenithPassage);
+	nadirPassageColor    = al->getLineColor(ArchaeoLine::NadirPassage);
+	selectedObjectColor  = al->getLineColor(ArchaeoLine::SelectedObject);
+	currentSunColor      = al->getLineColor(ArchaeoLine::CurrentSun);
+	currentMoonColor     = al->getLineColor(ArchaeoLine::CurrentMoon);
+	currentPlanetColor   = al->getLineColor(ArchaeoLine::CurrentPlanetNone);
+	equinoxColorPixmap.fill(equinoxColor);
+	ui->equinoxColorToolButton->setIcon(QIcon(equinoxColorPixmap));
+	solsticeColorPixmap.fill(solsticeColor);
+	ui->solsticesColorToolButton->setIcon(QIcon(solsticeColorPixmap));
+	crossquarterColorPixmap.fill(crossquarterColor);
+	ui->crossquarterColorToolButton->setIcon(QIcon(crossquarterColorPixmap));
+	minorStandstillColorPixmap.fill(minorStandstillColor);
+	ui->minorStandstillColorToolButton->setIcon(QIcon(minorStandstillColorPixmap));
+	majorStandstillColorPixmap.fill(majorStandstillColor);
+	ui->majorStandstillColorToolButton->setIcon(QIcon(majorStandstillColorPixmap));
+	zenithPassageColorPixmap.fill(zenithPassageColor);
+	ui->zenithPassageColorToolButton->setIcon(QIcon(zenithPassageColorPixmap));
+	nadirPassageColorPixmap.fill(nadirPassageColor);
+	ui->nadirPassageColorToolButton->setIcon(QIcon(nadirPassageColorPixmap));
+	selectedObjectColorPixmap.fill(selectedObjectColor);
+	ui->selectedObjectColorToolButton->setIcon(QIcon(selectedObjectColorPixmap));
+	currentSunColorPixmap.fill(currentSunColor);
+	ui->currentSunColorToolButton->setIcon(QIcon(currentSunColorPixmap));
+	currentMoonColorPixmap.fill(currentMoonColor);
+	ui->currentMoonColorToolButton->setIcon(QIcon(currentMoonColorPixmap));
+	currentPlanetColorPixmap.fill(currentPlanetColor);
+	ui->currentPlanetColorToolButton->setIcon(QIcon(currentPlanetColorPixmap));
+
+	ui->equinoxCheckBox->setChecked(al->isEquinoxDisplayed());
+	ui->solsticesCheckBox->setChecked(al->isSolsticesDisplayed());
+	ui->crossquarterCheckBox->setChecked(al->isCrossquartersDisplayed());
+	ui->majorStandstillCheckBox->setChecked(al->isMajorStandstillsDisplayed());
+	ui->minorStandstillCheckBox->setChecked(al->isMinorStandstillsDisplayed());
+	ui->zenithPassageCheckBox->setChecked(al->isZenithPassageDisplayed());
+	ui->nadirPassageCheckBox->setChecked(al->isNadirPassageDisplayed());
+	ui->selectedObjectCheckBox->setChecked(al->isSelectedObjectDisplayed());
+	ui->currentSunCheckBox->setChecked(al->isCurrentSunDisplayed());
+	ui->currentMoonCheckBox->setChecked(al->isCurrentMoonDisplayed());
+	ui->currentPlanetComboBox->setCurrentIndex(al->whichCurrentPlanetDisplayed()-ArchaeoLine::CurrentPlanetNone);
+}
+
+// These are called by the respective buttons.
+void ArchaeoLinesDialog::askEquinoxColor()
+{
+	QColor c=QColorDialog::getColor(equinoxColor, NULL, q_("Select color for equinox line"));
+	if (c.isValid())
+	{
+		equinoxColor=c;
+		al->setLineColor(ArchaeoLine::Equinox, c);
+		equinoxColorPixmap.fill(c);
+		ui->equinoxColorToolButton->setIcon(QIcon(equinoxColorPixmap));
+	}
+}
+
+void ArchaeoLinesDialog::askSolsticeColor()
+{
+	QColor c=QColorDialog::getColor(solsticeColor, NULL, q_("Select color for solstice lines"));
+	if (c.isValid())
+	{
+		solsticeColor=c;
+		al->setLineColor(ArchaeoLine::Solstices, c);
+		solsticeColorPixmap.fill(c);
+		ui->solsticesColorToolButton->setIcon(QIcon(solsticeColorPixmap));
+	}
+}
+
+void ArchaeoLinesDialog::askCrossquarterColor()
+{
+	QColor c=QColorDialog::getColor(crossquarterColor, NULL, q_("Select color for crossquarter lines"));
+	if (c.isValid())
+	{
+		crossquarterColor=c;
+		al->setLineColor(ArchaeoLine::Crossquarters, c);
+		crossquarterColorPixmap.fill(c);
+		ui->crossquarterColorToolButton->setIcon(QIcon(crossquarterColorPixmap));
+	}
+}
+
+void ArchaeoLinesDialog::askMajorStandstillColor()
+{
+	QColor c=QColorDialog::getColor(majorStandstillColor, NULL, q_("Select color for major standstill lines"));
+	if (c.isValid())
+	{
+		majorStandstillColor=c;
+		al->setLineColor(ArchaeoLine::MajorStandstill, c);
+		majorStandstillColorPixmap.fill(c);
+		ui->majorStandstillColorToolButton->setIcon(QIcon(majorStandstillColorPixmap));
+	}
+}
+
+void ArchaeoLinesDialog::askMinorStandstillColor()
+{
+	QColor c=QColorDialog::getColor(minorStandstillColor, NULL, q_("Select color for minor standstill lines"));
+	if (c.isValid())
+	{
+		minorStandstillColor=c;
+		al->setLineColor(ArchaeoLine::MinorStandstill, c);
+		minorStandstillColorPixmap.fill(c);
+		ui->minorStandstillColorToolButton->setIcon(QIcon(minorStandstillColorPixmap));
+	}
+}
+
+void ArchaeoLinesDialog::askZenithPassageColor()
+{
+	QColor c=QColorDialog::getColor(zenithPassageColor, NULL, q_("Select color for zenith passage line"));
+	if (c.isValid())
+	{
+		zenithPassageColor=c;
+		al->setLineColor(ArchaeoLine::ZenithPassage, c);
+		zenithPassageColorPixmap.fill(c);
+		ui->zenithPassageColorToolButton->setIcon(QIcon(zenithPassageColorPixmap));
+	}
+}
+
+void ArchaeoLinesDialog::askNadirPassageColor()
+{
+	QColor c=QColorDialog::getColor(nadirPassageColor, NULL, q_("Select color for nadir passage line"));
+	if (c.isValid())
+	{
+		nadirPassageColor=c;
+		al->setLineColor(ArchaeoLine::NadirPassage, c);
+		nadirPassageColorPixmap.fill(c);
+		ui->nadirPassageColorToolButton->setIcon(QIcon(nadirPassageColorPixmap));
+	}
+}
+
+void ArchaeoLinesDialog::askSelectedObjectColor()
+{
+	QColor c=QColorDialog::getColor(selectedObjectColor, NULL, q_("Select color for selected object line"));
+	if (c.isValid())
+	{
+		selectedObjectColor=c;
+		al->setLineColor(ArchaeoLine::SelectedObject, c);
+		selectedObjectColorPixmap.fill(c);
+		ui->selectedObjectColorToolButton->setIcon(QIcon(selectedObjectColorPixmap));
+	}
+}
+
+void ArchaeoLinesDialog::askCurrentSunColor()
+{
+	QColor c=QColorDialog::getColor(currentSunColor, NULL, q_("Select color for current sun line"));
+	if (c.isValid())
+	{
+		currentSunColor=c;
+		al->setLineColor(ArchaeoLine::CurrentSun, c);
+		currentSunColorPixmap.fill(c);
+		ui->currentSunColorToolButton->setIcon(QIcon(currentSunColorPixmap));
+	}
+}
+
+void ArchaeoLinesDialog::askCurrentMoonColor()
+{
+	QColor c=QColorDialog::getColor(currentMoonColor, NULL, q_("Select color for current moon line"));
+	if (c.isValid())
+	{
+		currentMoonColor=c;
+		al->setLineColor(ArchaeoLine::CurrentMoon, c);
+		currentMoonColorPixmap.fill(c);
+		ui->currentMoonColorToolButton->setIcon(QIcon(currentMoonColorPixmap));
+	}
+}
+
+void ArchaeoLinesDialog::askCurrentPlanetColor()
+{
+	QColor c=QColorDialog::getColor(currentPlanetColor, NULL, q_("Select color for current planet line"));
+	if (c.isValid())
+	{
+		currentPlanetColor=c;
+		al->setLineColor(ArchaeoLine::CurrentPlanetNone, c);
+		currentPlanetColorPixmap.fill(c);
+		ui->currentPlanetColorToolButton->setIcon(QIcon(currentPlanetColorPixmap));
+	}
+}
+
+// Notes/Observations by GZ in 2015-04 with Qt5.4.0/MinGW on Windows7SP1.
+// (1) There are issues in calling the QColorPanel that seem to be related to QTBUG-35302,
+// although it was reportedly fixed at least for X11 in Qt5.3.0.
+// On Win7 with NVidia Geforce and Win8.1 on Radeon, the color panel hides behind the Stellarium main window if set to fullscreen.
+// On Win7 with Intel HD4600, and various Linuces, no problem is seen, the color panel is right on top of the fullscreen main window.
+// It seems not to depend on MinGW vs. MSVC builds, but on details in GPU drivers and Qt.
+
+// (2) Likely another bug in QColorDialog: If you choose one of the preconfigured colors (left half),
+// on next change of that color it will have toggled one high bit of one component.
+// On next change, it will be toggled again.
+// If you configure a color from the right color field, all is OK (unless you "hit" a preconfigured color in the right field).

=== added file 'plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.hpp'
--- plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.hpp	1970-01-01 00:00:00 +0000
+++ plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.hpp	2015-04-09 09:33:54 +0000
@@ -0,0 +1,108 @@
+/*
+ * ArchaeoLines plug-in for Stellarium
+ *
+ * Copyright (C) 2014 Georg Zotti
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _ARCHAEOLINESDIALOG_HPP_
+#define _ARCHAEOLINESDIALOG_HPP_
+
+#include "StelDialog.hpp"
+#include "StelGui.hpp"
+#include "StelTranslator.hpp"
+
+#include <QString>
+#include <QColor>
+#include <QColorDialog>
+
+class Ui_archaeoLinesDialog;
+class ArchaeoLines;
+
+//! Main window of the ArchaeoLines plug-in.
+class ArchaeoLinesDialog : public StelDialog
+{
+	Q_OBJECT
+
+public:
+	ArchaeoLinesDialog();
+	~ArchaeoLinesDialog();
+
+public slots:
+	void retranslate();
+	// actions to be called by the color dialog
+	// These must also forward the colors in float format to the ArchaeoLines object.
+	void setEquinoxColor(QColor color){equinoxColor=color;}
+	void setSolsticeColor(QColor color){solsticeColor=color;}
+	void setCrossquarterColor(QColor color){crossquarterColor=color;}
+	void setMajorStandstillColor(QColor color){majorStandstillColor=color;}
+	void setMinorStandstillColor(QColor color){minorStandstillColor=color;}
+	void setZenithPassageColor(QColor color){zenithPassageColor=color;}
+	void setNadirPassageColor(QColor color){nadirPassageColor=color;}
+	void setCurrentSunColor(QColor color){currentSunColor=color;}
+	void setCurrentMoonColor(QColor color){currentMoonColor=color;}
+	void setCurrentPlanetColor(QColor color){currentPlanetColor=color;}
+	void setSelectedObjectColor(QColor color){selectedObjectColor=color;}
+	void askEquinoxColor();
+	void askSolsticeColor();
+	void askCrossquarterColor();
+	void askMajorStandstillColor();
+	void askMinorStandstillColor();
+	void askZenithPassageColor();
+	void askNadirPassageColor();
+	void askCurrentSunColor();
+	void askCurrentMoonColor();
+	void askCurrentPlanetColor();
+	void askSelectedObjectColor();
+
+protected:
+	void createDialogContent();
+
+private:
+	Ui_archaeoLinesDialog* ui;
+	ArchaeoLines* al;
+	// These are colors to be settable with a QColorDialog.
+	QColor equinoxColor;
+	QColor solsticeColor;
+	QColor crossquarterColor;
+	QColor majorStandstillColor;
+	QColor minorStandstillColor;
+	QColor zenithPassageColor;
+	QColor nadirPassageColor;
+	QColor currentSunColor;
+	QColor currentMoonColor;
+	QColor currentPlanetColor;
+	QColor selectedObjectColor;
+	QPixmap equinoxColorPixmap;
+	QPixmap solsticeColorPixmap;
+	QPixmap crossquarterColorPixmap;
+	QPixmap majorStandstillColorPixmap;
+	QPixmap minorStandstillColorPixmap;
+	QPixmap zenithPassageColorPixmap;
+	QPixmap nadirPassageColorPixmap;
+	QPixmap currentSunColorPixmap;
+	QPixmap currentMoonColorPixmap;
+	QPixmap currentPlanetColorPixmap;
+	QPixmap selectedObjectColorPixmap;
+	void setAboutHtml();
+
+private slots:
+	void resetArchaeoLinesSettings();
+	//! setting planet requires a small function to link Combobox indices to line IDs.
+	void setCurrentPlanetFromGUI(int index);
+
+};
+
+#endif /* _ARCHAEOLINESDIALOG_HPP_ */

=== added file 'plugins/ArchaeoLines/src/gui/archaeoLinesDialog.ui'
--- plugins/ArchaeoLines/src/gui/archaeoLinesDialog.ui	1970-01-01 00:00:00 +0000
+++ plugins/ArchaeoLines/src/gui/archaeoLinesDialog.ui	2015-04-09 09:33:54 +0000
@@ -0,0 +1,449 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>archaeoLinesDialog</class>
+ <widget class="QWidget" name="archaeoLinesDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>530</width>
+    <height>454</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Pulsars Configuration</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <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>
+   <item>
+    <widget class="BarFrame" name="TitleBar">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>530</width>
+       <height>25</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>25</height>
+      </size>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+     <property name="autoFillBackground">
+      <bool>false</bool>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <layout class="QHBoxLayout">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <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="text">
+         <string>ArchaeoLines Plug-in Configuration</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="closeStelWindow">
+        <property name="minimumSize">
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QTabWidget" name="tabs">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <property name="documentMode">
+      <bool>false</bool>
+     </property>
+     <widget class="QWidget" name="settingsTab">
+      <attribute name="title">
+       <string>ArchaeoLines</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QLabel" name="switchToWindowedModeLabel">
+         <property name="text">
+          <string>To change colors you may have to leave fullscreen mode!</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QFormLayout" name="formLayout">
+         <property name="fieldGrowthPolicy">
+          <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+         </property>
+         <item row="0" column="0">
+          <widget class="QCheckBox" name="equinoxCheckBox">
+           <property name="text">
+            <string>Equinox line (Equator)</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QToolButton" name="equinoxColorToolButton">
+           <property name="text">
+            <string>EquinoxColor...</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QCheckBox" name="solsticesCheckBox">
+           <property name="text">
+            <string>Solstice Lines</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QToolButton" name="solsticesColorToolButton">
+           <property name="text">
+            <string>SolsticeColor...</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QCheckBox" name="crossquarterCheckBox">
+           <property name="text">
+            <string>Crossquarter Lines</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <widget class="QToolButton" name="crossquarterColorToolButton">
+           <property name="toolTip">
+            <string>Change color</string>
+           </property>
+           <property name="text">
+            <string>CrossquarterColor...</string>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="0">
+          <widget class="QCheckBox" name="majorStandstillCheckBox">
+           <property name="text">
+            <string>Major Lunar Standstill lines</string>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="1">
+          <widget class="QToolButton" name="majorStandstillColorToolButton">
+           <property name="text">
+            <string>majorLunarStandstillColor...</string>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="0">
+          <widget class="QCheckBox" name="minorStandstillCheckBox">
+           <property name="text">
+            <string>Minor Lunar Standstill lines</string>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="1">
+          <widget class="QToolButton" name="minorStandstillColorToolButton">
+           <property name="text">
+            <string>minorLunarStandstillColor...</string>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="0">
+          <widget class="QCheckBox" name="zenithPassageCheckBox">
+           <property name="text">
+            <string>Declination of Zenith passage</string>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="1">
+          <widget class="QToolButton" name="zenithPassageColorToolButton">
+           <property name="text">
+            <string>zenithPassageColor...</string>
+           </property>
+          </widget>
+         </item>
+         <item row="6" column="0">
+          <widget class="QCheckBox" name="nadirPassageCheckBox">
+           <property name="text">
+            <string>Declination of Nadir passage</string>
+           </property>
+          </widget>
+         </item>
+         <item row="6" column="1">
+          <widget class="QToolButton" name="nadirPassageColorToolButton">
+           <property name="text">
+            <string>NadirPassageColor...</string>
+           </property>
+          </widget>
+         </item>
+         <item row="7" column="0">
+          <widget class="QCheckBox" name="currentSunCheckBox">
+           <property name="text">
+            <string>Current Sun</string>
+           </property>
+          </widget>
+         </item>
+         <item row="7" column="1">
+          <widget class="QToolButton" name="currentSunColorToolButton">
+           <property name="text">
+            <string>SunColor...</string>
+           </property>
+          </widget>
+         </item>
+         <item row="8" column="0">
+          <widget class="QCheckBox" name="currentMoonCheckBox">
+           <property name="text">
+            <string>Current Moon</string>
+           </property>
+          </widget>
+         </item>
+         <item row="8" column="1">
+          <widget class="QToolButton" name="currentMoonColorToolButton">
+           <property name="text">
+            <string>MoonColor...</string>
+           </property>
+          </widget>
+         </item>
+         <item row="9" column="0">
+          <widget class="QComboBox" name="currentPlanetComboBox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>150</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="currentIndex">
+            <number>0</number>
+           </property>
+           <item>
+            <property name="text">
+             <string>Current Planet: None</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Current Planet: Mercury</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Current Planet: Venus</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Current Planet: Mars</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Current Planet: Jupiter</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Current Planet: Saturn</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item row="9" column="1">
+          <widget class="QToolButton" name="currentPlanetColorToolButton">
+           <property name="text">
+            <string>PlanetColor...</string>
+           </property>
+          </widget>
+         </item>
+         <item row="10" column="0">
+          <widget class="QCheckBox" name="selectedObjectCheckBox">
+           <property name="text">
+            <string>Selected Object</string>
+           </property>
+          </widget>
+         </item>
+         <item row="10" column="1">
+          <widget class="QToolButton" name="selectedObjectColorToolButton">
+           <property name="text">
+            <string>SelectedObjectColor...</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="formatDisplayBox">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="title">
+          <string>Format</string>
+         </property>
+         <property name="flat">
+          <bool>true</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_3">
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="useDmsFormatCheckBox">
+            <property name="text">
+             <string>Use dms format for angles</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>120</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_7">
+         <item>
+          <widget class="QPushButton" name="restoreDefaultsButton">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Restore default settings</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="aboutTab">
+      <attribute name="title">
+       <string comment="tab in plugin windows">About</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_11">
+       <property name="spacing">
+        <number>9</number>
+       </property>
+       <item>
+        <widget class="QTextBrowser" name="aboutTextBrowser">
+         <property name="openExternalLinks">
+          <bool>true</bool>
+         </property>
+         <property name="openLinks">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>BarFrame</class>
+   <extends>QFrame</extends>
+   <header>Dialog.hpp</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

=== modified file 'src/core/StelApp.cpp'
--- src/core/StelApp.cpp	2015-03-25 18:18:33 +0000
+++ src/core/StelApp.cpp	2015-04-09 09:33:54 +0000
@@ -90,6 +90,10 @@
 Q_IMPORT_PLUGIN(AngleMeasureStelPluginInterface)
 #endif
 
+#ifdef USE_STATIC_PLUGIN_ARCHAEOLINES
+Q_IMPORT_PLUGIN(ArchaeoLinesStelPluginInterface)
+#endif
+
 #ifdef USE_STATIC_PLUGIN_COMPASSMARKS
 Q_IMPORT_PLUGIN(CompassMarksStelPluginInterface)
 #endif

=== modified file 'src/core/StelObjectMgr.cpp'
--- src/core/StelObjectMgr.cpp	2015-03-30 07:40:56 +0000
+++ src/core/StelObjectMgr.cpp	2015-04-09 09:33:54 +0000
@@ -228,7 +228,7 @@
 }
 
 /*************************************************************************
- Return the list objects of type "withType" which was recently selected by
+ Return the list objects of type "type" which was recently selected by
   the user
 *************************************************************************/
 QList<StelObjectP> StelObjectMgr::getSelectedObject(const QString& type)

=== modified file 'src/core/StelPainter.hpp'
--- src/core/StelPainter.hpp	2015-01-05 16:39:19 +0000
+++ src/core/StelPainter.hpp	2015-04-09 09:33:54 +0000
@@ -106,6 +106,7 @@
 	//! The algorithm ensures that the line will look smooth, even for non linear distortion.
 	//! Each time the small circle crosses the edge of the viewport, the viewportEdgeIntersectCallback is called with the
 	//! screen 2d position, direction of the currently drawn arc toward the inside of the viewport.
+	//! Example: A latitude circle has 0/0/sin(latitude) as rotCenter.
 	//! If rotCenter is equal to 0,0,0, the method draws a great circle.
 	void drawSmallCircleArc(const Vec3d& start, const Vec3d& stop, const Vec3d& rotCenter, void (*viewportEdgeIntersectCallback)(const Vec3d& screenPos, const Vec3d& direction, void* userData)=NULL, void* userData=NULL);
 

=== modified file 'src/core/modules/GridLinesMgr.cpp'
--- src/core/modules/GridLinesMgr.cpp	2015-03-22 09:33:56 +0000
+++ src/core/modules/GridLinesMgr.cpp	2015-04-09 09:33:54 +0000
@@ -329,8 +329,8 @@
 		gridStepMeridianRad = (frameType==StelCore::FrameAltAz || frameType==StelCore::FrameGalactic) ? M_PI/180.* 10. : M_PI/180.* 15.;
 	else
 	{
-		const double closetResLon = (frameType==StelCore::FrameAltAz || frameType==StelCore::FrameGalactic) ? getClosestResolutionDMS(prj->getPixelPerRadAtCenter()*std::cos(lat2)) : getClosestResolutionHMS(prj->getPixelPerRadAtCenter()*std::cos(lat2));
-		gridStepMeridianRad = M_PI/180.* ((northPoleInViewport || southPoleInViewport) ? 15. : closetResLon);
+		const double closestResLon = (frameType==StelCore::FrameAltAz || frameType==StelCore::FrameGalactic) ? getClosestResolutionDMS(prj->getPixelPerRadAtCenter()*std::cos(lat2)) : getClosestResolutionHMS(prj->getPixelPerRadAtCenter()*std::cos(lat2));
+		gridStepMeridianRad = M_PI/180.* ((northPoleInViewport || southPoleInViewport) ? 15. : closestResLon);
 	}
 
 	// Get the bounding halfspace

=== modified file 'src/core/modules/LandscapeMgr.hpp'
--- src/core/modules/LandscapeMgr.hpp	2015-01-24 16:08:50 +0000
+++ src/core/modules/LandscapeMgr.hpp	2015-04-09 09:33:54 +0000
@@ -24,11 +24,11 @@
 
 #include "StelModule.hpp"
 #include "StelUtils.hpp"
+#include "Landscape.hpp"
 
 #include <QMap>
 #include <QStringList>
 
-class Landscape;
 class Atmosphere;
 class Cardinals;
 class QSettings;
@@ -117,7 +117,7 @@
 	Landscape* createFromFile(const QString& landscapeFile, const QString& landscapeId);
 
 	// GZ: implement StelModule's method. For test purposes only, we implement a manual transparency sampler.
-	// TODO: comment this away for final builds
+	// TODO: comment this away for final builds. Please leave it in until this feature is finished.
 	// virtual void handleMouseClicks(class QMouseEvent*);
 
 public slots:
@@ -325,7 +325,9 @@
 	//! Set flag for auto-enable atmosphere for planets with atmospheres in location window
 	void setFlagAtmosphereAutoEnable(bool b);
 
-
+	//! Forward opacity query to current landscape.
+	//! @param azalt direction of view line to sample in azaltimuth coordinates.
+	float getLandscapeOpacity(Vec3d azalt) const {return landscape->getOpacity(azalt);}
 
 signals:
 	void atmosphereDisplayedChanged(const bool displayed);