Merge lp:~alexwolf/stellarium/equation-of-time into lp:stellarium

[Alexander Wolf]

I propose for merging the plugin, which shows the solution of the equation of time on top of the screen. In future this plugin can be extend for generate the graph for equation of time for year.

[lp:~alexwolf/stellarium/equation-of-time]

6544. By Alexander Wolf on 2014-02-05

added sources of algorithm

[gzotti (georg-zotti)]

Hi Alex!

it crashes just after boot. :-( (Win7, i7/NVidia)

end of logfile:

=============
Loading constellation boundary data ...
Loaded 782 constellation boundary segments
StelPainter: initGLShaders()...
StelPainter: initGLShaders()... done
Creating GUI ...
ASSERT: "matAltAzModelView[0]==matAltAzModelView[0]" in file
C:\Stellarium_DEV\BZR\equation-of-time\src\core\StelCore.cpp, line 665
QWidget::repaint: Recursive repaint detected
QPainter::begin: A paint device can only be painted by one painter at a time.
QPainter::setRenderHint: Painter must be active to set rendering hints
QPainter::setRenderHint: Painter must be active to set rendering hints
QPainter::worldTransform: Painter not active
QPainter::setWorldTransform: Painter not active
QPainter::setOpacity: Painter not active
QPainter::setWorldTransform: Painter not active
QPainter::setOpacity: Painter not active
QPainter::beginNativePainting: Painter not active
ASSERT: "matAltAzModelView[0]==matAltAzModelView[0]" in file
C:\Stellarium_DEV\BZR\equation-of-time\src\core\StelCore.cpp, line 665
=============

Not sure if the assert was guilty or the recursive repaint. The latter has
caused some occasional crashes for me in the past (will that be solved by
the changes for QML2?), but this is consistently failing now.

Kind regards,
Georg

On Mi, 5.02.2014, 18:23, Alexander Wolf wrote:
> Alexander Wolf has proposed merging
> lp:~alexwolf/stellarium/equation-of-time into lp:stellarium.
>
> Requested reviews:
> Stellarium (stellarium)
>
> For more details, see:
> https://code.launchpad.net/~alexwolf/stellarium/equation-of-time/+merge/205011
>
> I propose for merging the plugin, which shows the solution of the equation
> of time on top of the screen. In future this plugin can be extend for
> generate the graph for equation of time for year.
> --
> https://code.launchpad.net/~alexwolf/stellarium/equation-of-time/+merge/205011
> Your team Stellarium is requested to review the proposed merge of
> lp:~alexwolf/stellarium/equation-of-time into lp:stellarium.
>

[lp:~alexwolf/stellarium/equation-of-time]

6545. By Alexander Wolf on 2014-02-06

refactor code for getting size of scene

[Alexander Wolf (alexwolf)]

Dear Georg,

can you check plugin after refactoring?

[gzotti (georg-zotti)]

Hi!

No change, I am afraid :-(

But during the crash, my config.ini is corrupted! It is left as empty
file. If I delete it, a new file is created, again empty.

BTW, plugins/EquationOfTime/src/EquationOfTime.cpp, near line 674, you may
use fmod(sunMeanLongitude, 360.0) for a faster modulo, then add 360 if <0.
But this is not causing the problems. Does it work for you on Windows?

Kind regards,
Georg

On Do, 6.02.2014, 18:05, Alexander Wolf wrote:
> Dear Georg,
>
> can you check plugin after refactoring?
> --
> https://code.launchpad.net/~alexwolf/stellarium/equation-of-time/+merge/205011
> Your team Stellarium is requested to review the proposed merge of
> lp:~alexwolf/stellarium/equation-of-time into lp:stellarium.
>

[Alexander Wolf (alexwolf)]

Dear Georg,

2014-02-07 gzotti <email address hidden>:

> No change, I am afraid :-(
>

bad news :(

> But during the crash, my config.ini is corrupted! It is left as empty
> file. If I delete it, a new file is created, again empty.
>

This is very odd. Just for test - this issue can be reproduced only when
plugin enabled or not (It can be reproduce for trunk too)?

> BTW, plugins/EquationOfTime/src/EquationOfTime.cpp, near line 674, you may
> use fmod(sunMeanLongitude, 360.0) for a faster modulo, then add 360 if <0.
> But this is not causing the problems. Does it work for you on Windows?
>

I'll check it on Windows tonight.

--
With best regards, Alexander

[lp:~alexwolf/stellarium/equation-of-time]

6546. By Alexander Wolf on 2014-02-07

code refactoring

6547. By Alexander Wolf on 2014-02-07

code refactoring

6548. By Alexander Wolf on 2014-02-07

code refactoring & optimizations

[Alexander Wolf (alexwolf)]

Dear Georg,

I fixed my stupid error and now plugin works on Windows too.

[gzotti (georg-zotti)]

Indeed, it works now. Valuable addition, thank you!

Looking forward to the graphic solution! :-) Classical 8-figure with a dot representing the sun? This should have configurable screen position then.

G.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-06 15:37:56 +0000
+++ CMakeLists.txt	2014-02-07 18:17:25 +0000
@@ -171,6 +171,7 @@
 ADD_PLUGIN(AngleMeasure 1)
 ADD_PLUGIN(CompassMarks 1)
 ADD_PLUGIN(Exoplanets 1)
+ADD_PLUGIN(EquationOfTime 1)
 ADD_PLUGIN(FOV 1)
 ADD_PLUGIN(LogBook 0)
 ADD_PLUGIN(NavStars 1)

=== added directory 'plugins/EquationOfTime'
=== added file 'plugins/EquationOfTime/CMakeLists.txt'
--- plugins/EquationOfTime/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/EquationOfTime/CMakeLists.txt	2014-02-07 18:17:25 +0000
@@ -0,0 +1,18 @@
+SET(EQUATIONOFTIME_MAJOR "0")
+SET(EQUATIONOFTIME_MINOR "1")
+SET(EQUATIONOFTIME_PATCH "0")
+SET(EQUATIONOFTIME_VERSION "${EQUATIONOFTIME_MAJOR}.${EQUATIONOFTIME_MINOR}.${EQUATIONOFTIME_PATCH}")
+
+IF(APPLE)
+	SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
+ElSE(APPLE)
+	SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
+ENDIF(APPLE)
+
+ADD_DEFINITIONS(-DEQUATIONOFTIME_PLUGIN_VERSION="${EQUATIONOFTIME_VERSION}")
+
+ADD_SUBDIRECTORY( src )
+
+INSTALL(FILES DESTINATION "modules/EquationOfTime")
+
+

=== added file 'plugins/EquationOfTime/COPYING'
--- plugins/EquationOfTime/COPYING	1970-01-01 00:00:00 +0000
+++ plugins/EquationOfTime/COPYING	2014-02-07 18:17:25 +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 directory 'plugins/EquationOfTime/resources'
=== added file 'plugins/EquationOfTime/resources/EquationOfTime.qrc'
--- plugins/EquationOfTime/resources/EquationOfTime.qrc	1970-01-01 00:00:00 +0000
+++ plugins/EquationOfTime/resources/EquationOfTime.qrc	2014-02-07 18:17:25 +0000
@@ -0,0 +1,6 @@
+<RCC>
+  <qresource prefix="/EquationOfTime" >
+    <file>bt_EquationOfTime_On.png</file>
+    <file>bt_EquationOfTime_Off.png</file>
+  </qresource>
+</RCC>

=== added file 'plugins/EquationOfTime/resources/bt_EquationOfTime_Off.png'
Binary files plugins/EquationOfTime/resources/bt_EquationOfTime_Off.png	1970-01-01 00:00:00 +0000 and plugins/EquationOfTime/resources/bt_EquationOfTime_Off.png	2014-02-07 18:17:25 +0000 differ
=== added file 'plugins/EquationOfTime/resources/bt_EquationOfTime_On.png'
Binary files plugins/EquationOfTime/resources/bt_EquationOfTime_On.png	1970-01-01 00:00:00 +0000 and plugins/EquationOfTime/resources/bt_EquationOfTime_On.png	2014-02-07 18:17:25 +0000 differ
=== added directory 'plugins/EquationOfTime/src'
=== added file 'plugins/EquationOfTime/src/CMakeLists.txt'
--- plugins/EquationOfTime/src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/EquationOfTime/src/CMakeLists.txt	2014-02-07 18:17:25 +0000
@@ -0,0 +1,33 @@
+INCLUDE_DIRECTORIES(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/plugins/EquationOfTime/src
+  ${CMAKE_BINARY_DIR}/plugins/EquationOfTime/src/gui
+  . gui)
+
+LINK_DIRECTORIES(${BUILD_DIR}/src)
+
+SET(EQUATIONOFTIME_SRCS
+  EquationOfTime.hpp
+  EquationOfTime.cpp
+  gui/EquationOfTimeWindow.hpp
+  gui/EquationOfTimeWindow.cpp
+  )
+
+SET(EQUATIONOFTIME_UIS
+  gui/equationOfTimeWindow.ui
+)
+
+QT5_WRAP_UI(EQUATIONOFTIME_UIS_H ${EQUATIONOFTIME_UIS})
+
+################# compiles resources files ############
+SET(EQUATIONOFTIME_RES ../resources/EquationOfTime.qrc)
+QT5_ADD_RESOURCES(EQUATIONOFTIME_RES_CXX ${EQUATIONOFTIME_RES})
+
+SET(extLinkerOption ${OPENGL_LIBRARIES})
+
+ADD_LIBRARY(EquationOfTime-static STATIC ${EQUATIONOFTIME_SRCS} ${EQUATIONOFTIME_RES_CXX} ${EQUATIONOFTIME_UIS_H})
+QT5_USE_MODULES(EquationOfTime-static Core Declarative Network)
+SET_TARGET_PROPERTIES(EquationOfTime-static PROPERTIES OUTPUT_NAME "EquationOfTime")
+TARGET_LINK_LIBRARIES(EquationOfTime-static ${extLinkerOption})
+SET_TARGET_PROPERTIES(EquationOfTime-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
+ADD_DEPENDENCIES(AllStaticPlugins EquationOfTime-static)

=== added file 'plugins/EquationOfTime/src/EquationOfTime.cpp'
--- plugins/EquationOfTime/src/EquationOfTime.cpp	1970-01-01 00:00:00 +0000
+++ plugins/EquationOfTime/src/EquationOfTime.cpp	2014-02-07 18:17:25 +0000
@@ -0,0 +1,275 @@
+/*
+ * Equation Of Time plug-in for Stellarium
+ *
+ * Copyright (C) 2014 Alexander Wolf
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "StelProjector.hpp"
+#include "StelPainter.hpp"
+#include "StelApp.hpp"
+#include "StelCore.hpp"
+#include "SkyGui.hpp"
+#include "StelLocaleMgr.hpp"
+#include "StelModuleMgr.hpp"
+#include "StelFileMgr.hpp"
+#include "StelGui.hpp"
+#include "StelGuiItems.hpp"
+#include "StelObjectMgr.hpp"
+#include "StelUtils.hpp"
+#include "Planet.hpp"
+#include "EquationOfTime.hpp"
+#include "EquationOfTimeWindow.hpp"
+
+#include "sidereal_time.h"
+
+#include <QFontMetrics>
+#include <QSettings>
+#include <QPixmap>
+#include <cmath>
+
+StelModule* EquationOfTimeStelPluginInterface::getStelModule() const
+{
+	return new EquationOfTime();
+}
+
+StelPluginInfo EquationOfTimeStelPluginInterface::getPluginInfo() const
+{
+	// Allow to load the resources when used as a static plugin
+	Q_INIT_RESOURCE(EquationOfTime);
+
+	StelPluginInfo info;
+	info.id = "EquationOfTime";
+	info.displayedName = N_("Equation of Time");
+	info.authors = "Alexander Wolf";
+	info.contact = "http://stellarium.org";
+	info.description = N_("This plugin shows the solution of the equation of time.");
+	info.version = EQUATIONOFTIME_PLUGIN_VERSION;
+	return info;
+}
+
+EquationOfTime::EquationOfTime()
+	: flagShowSolutionEquationOfTime(false),
+	  flagUseMsFormat(false),
+	  toolbarButton(NULL)
+{
+	setObjectName("EquationOfTime");
+	mainWindow = new EquationOfTimeWindow();
+}
+
+EquationOfTime::~EquationOfTime()
+{
+	delete mainWindow;
+}
+
+void EquationOfTime::init()
+{
+	StelApp &app = StelApp::getInstance();
+	conf = app.getSettings();
+	gui = dynamic_cast<StelGui*>(app.getGui());
+
+	if (!conf->childGroups().contains("EquationOfTime"))
+	{
+		qDebug() << "EquationOfTime::init() no EquationOfTime section exists in main config file - creating with defaults";
+		restoreDefaultConfigIni();
+	}
+
+	// populate settings from main config file.
+	readSettingsFromConfig();
+
+	addAction("actionShow_EquationOfTime", N_("Equation of Time"), N_("Show solution for Equation of Time"), "enabled", "");
+
+	enableEquationOfTime(getFlagEnableAtStartup());
+	setFlagShowEOTButton(flagShowEOTButton);
+
+	// Initialize the message strings and make sure they are translated when
+	// the language changes.
+	updateMessageText();
+	connect(&app, SIGNAL(languageChanged()), this, SLOT(updateMessageText()));
+}
+
+void EquationOfTime::deinit()
+{
+	//
+}
+
+void EquationOfTime::draw(StelCore *core)
+{
+	if (!isEnabled())
+		return;
+
+	StelPainter sPainter(core->getProjection2d());
+	sPainter.setColor(textColor[0], textColor[1], textColor[2], 1.f);
+	font.setPixelSize(getFontSize());
+	sPainter.setFont(font);
+
+	QString timeText;
+	double time = getSolutionEquationOfTime(core->getJDay());
+
+	if (getFlagInvertedValue())
+		time *= -1;
+
+	if (getFlagMsFormat())
+	{
+		double seconds = std::abs(round((time - (int)time)*60));
+		QString messageSecondsValue;
+		if (seconds<10.)
+			messageSecondsValue = QString("0%1").arg(QString::number(seconds, 'f', 0));
+		else
+			messageSecondsValue = QString("%1").arg(QString::number(seconds, 'f', 0));
+
+		timeText = QString("%1: %2%3%4%5").arg(messageEquation, QString::number((int)time), messageEquationMinutes, messageSecondsValue, messageEquationSeconds);
+	}
+	else
+		timeText = QString("%1: %2%3").arg(messageEquation, QString::number(time, 'f', 2), messageEquationMinutes);
+
+
+	QFontMetrics fm(font);
+	QSize fs = fm.size(Qt::TextSingleLine, timeText);	
+	if (core->getCurrentPlanet().data()->getEnglishName()=="Earth")
+		sPainter.drawText(gui->getSkyGui()->getSkyGuiWidth()/2 - fs.width()/2, gui->getSkyGui()->getSkyGuiHeight() - fs.height()*1.5, timeText);
+
+	//qDebug() << timeText;
+}
+
+void EquationOfTime::enableEquationOfTime(bool b)
+{
+	flagShowSolutionEquationOfTime = b;
+}
+
+double EquationOfTime::getCallOrder(StelModuleActionName actionName) const
+{
+	if (actionName==StelModule::ActionDraw)
+		return StelApp::getInstance().getModuleMgr().getModule("ConstellationMgr")->getCallOrder(actionName)+10.;
+	return 0;
+}
+
+bool EquationOfTime::configureGui(bool show)
+{
+	if (show)
+	{
+		mainWindow->setVisible(true);
+	}
+
+	return true;
+}
+
+void EquationOfTime::restoreDefaults(void)
+{
+	restoreDefaultConfigIni();
+	readSettingsFromConfig();
+}
+
+void EquationOfTime::restoreDefaultConfigIni(void)
+{
+	conf->beginGroup("EquationOfTime");
+
+	// delete all existing Equation Of Time settings...
+	conf->remove("");
+
+	conf->setValue("enable_at_startup", false);
+	conf->setValue("flag_use_ms_format", true);
+	conf->setValue("flag_use_inverted_value", false);
+	conf->setValue("flag_show_button", true);
+	conf->setValue("text_color", "0,0.5,1");
+	conf->setValue("font_size", 20);
+
+	conf->endGroup();
+}
+
+void EquationOfTime::readSettingsFromConfig(void)
+{
+	conf->beginGroup("EquationOfTime");
+
+	setFlagEnableAtStartup(conf->value("enable_at_startup", false).toBool());
+	setFlagMsFormat(conf->value("flag_use_ms_format", true).toBool());
+	setFlagInvertedValue(conf->value("flag_use_inverted_value", false).toBool());
+	textColor = StelUtils::strToVec3f(conf->value("text_color", "0,0.5,1").toString());
+	setFontSize(conf->value("font_size", 20).toInt());
+	flagShowEOTButton = conf->value("flag_show_button", true).toBool();
+
+	conf->endGroup();
+}
+
+void EquationOfTime::saveSettingsToConfig(void)
+{
+	conf->beginGroup("EquationOfTime");
+
+	conf->setValue("enable_at_startup", getFlagEnableAtStartup());
+	conf->setValue("flag_use_ms_format", getFlagMsFormat());
+	conf->setValue("flag_use_inverted_value", getFlagInvertedValue());
+	conf->setValue("flag_show_button", getFlagShowEOTButton());
+	//conf->setValue("text_color", "0,0.5,1");
+	conf->setValue("font_size", getFontSize());
+
+	conf->endGroup();
+}
+
+double EquationOfTime::getSolutionEquationOfTime(const double JDay) const
+{
+	StelCore* core = StelApp::getInstance().getCore();
+
+	double tau = (JDay - 2451545.0)/365250.0;
+	double sunMeanLongitude = 280.4664567 + tau*(360007.6892779 + tau*(0.03032028 + tau*(1/49931 - tau*(1/15300 - tau/2000000))));
+
+	int count = std::abs(sunMeanLongitude/360.);
+	if (count==0) count = 1;
+
+	if (sunMeanLongitude>360.)
+		sunMeanLongitude -= count*360.;
+
+	if (sunMeanLongitude<0.)
+		sunMeanLongitude += (1+count)*360.;
+
+	Vec3d pos = GETSTELMODULE(StelObjectMgr)->searchByName("Sun")->getEquinoxEquatorialPos(core);
+	double ra, dec;
+	StelUtils::rectToSphe(&ra, &dec, pos);
+	if (ra < 0.0)
+		ra += 2.0*M_PI;
+
+	double alpha = ra*180./M_PI;
+	if (alpha>360.)
+		alpha -= count*360.;
+
+	return 4*(sunMeanLongitude - 0.0057183 - alpha + get_nutation_longitude(JDay)*cos(get_mean_ecliptical_obliquity(JDay)));
+}
+
+void EquationOfTime::updateMessageText()
+{
+	messageEquation = q_("Equation of Time");
+	// TRANSLATORS: minutes.
+	messageEquationMinutes = qc_("m", "time");
+	// TRANSLATORS: seconds.
+	messageEquationSeconds = qc_("s", "time");
+}
+
+void EquationOfTime::setFlagShowEOTButton(bool b)
+{
+	if (b==true) {
+		if (toolbarButton==NULL) {
+			// Create the button
+			toolbarButton = new StelButton(NULL,
+						       QPixmap(":/EquationOfTime/bt_EquationOfTime_On.png"),
+						       QPixmap(":/EquationOfTime/bt_EquationOfTime_Off.png"),
+						       QPixmap(":/graphicGui/glow32x32.png"),
+						       "actionShow_EquationOfTime");
+		}
+		gui->getButtonBar()->addButton(toolbarButton, "065-pluginsGroup");
+	} else {
+		gui->getButtonBar()->hideButton("actionShow_EquationOfTime");
+	}
+	flagShowEOTButton = b;
+}
+

=== added file 'plugins/EquationOfTime/src/EquationOfTime.hpp'
--- plugins/EquationOfTime/src/EquationOfTime.hpp	1970-01-01 00:00:00 +0000
+++ plugins/EquationOfTime/src/EquationOfTime.hpp	2014-02-07 18:17:25 +0000
@@ -0,0 +1,134 @@
+/*
+ * Equation Of Time plug-in for Stellarium
+ *
+ * Copyright (C) 2014 Alexander Wolf
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _EQUATIONOFTIME_HPP_
+#define _EQUATIONOFTIME_HPP_
+
+#include "StelGui.hpp"
+#include "StelModule.hpp"
+
+#include <QFont>
+#include <QString>
+
+class QPixmap;
+class StelButton;
+class EquationOfTimeWindow;
+
+class EquationOfTime : public StelModule
+{
+	Q_OBJECT
+	Q_PROPERTY(bool enabled
+		   READ isEnabled
+		   WRITE enableEquationOfTime)
+
+public:
+	EquationOfTime();
+	virtual ~EquationOfTime();
+
+	virtual void init();
+	virtual void deinit();
+	virtual void update(double) {;}
+	virtual void draw(StelCore *core);
+	virtual double getCallOrder(StelModuleActionName actionName) const;
+	virtual bool configureGui(bool show);
+
+	//! Set up the plugin with default values.  This means clearing out the Pulsars section in the
+	//! main config.ini (if one already exists), and populating it with default values.
+	void restoreDefaults(void);
+
+	//! Read (or re-read) settings from the main config file.  This will be called from init and also
+	//! when restoring defaults (i.e. from the configuration dialog / restore defaults button).
+	void readSettingsFromConfig(void);
+
+	//! Save the settings to the main configuration file.
+	void saveSettingsToConfig(void);
+
+	//! Get solution of equation of time
+	//! Source: J. Meeus "Astronomical Algorithms" (2nd ed., with corrections as of August 10, 2009) p.183-187.
+	//! @param JDay JD
+	//! @return time in minutes
+	double getSolutionEquationOfTime(const double JDay) const;
+
+	//! Is plugin enabled?
+	bool isEnabled() const {return flagShowSolutionEquationOfTime;}
+
+	//! Get font size for messages
+	int getFontSize(void) { return fontSize; }
+	//! Get status of usage minutes and seconds for value of equation
+	bool getFlagMsFormat(void) { return flagUseMsFormat; }
+	//! Get status of usage inverted values for equation of time
+	bool getFlagInvertedValue(void) { return flagUseInvertedValue; }
+	bool getFlagEnableAtStartup(void) { return flagEnableAtStartup; }
+	bool getFlagShowEOTButton(void) { return flagShowEOTButton; }
+
+public slots:
+	//! Enable plugin usage
+	void enableEquationOfTime(bool b);
+	//! Enable usage inverted value for equation of time (switch sign of equation)
+	void setFlagInvertedValue(bool b) { flagUseInvertedValue=b; }
+	//! Enable usage minutes and seconds for value
+	void setFlagMsFormat(bool b) { flagUseMsFormat=b; }
+	//! Enable plugin usage at startup
+	void setFlagEnableAtStartup(bool b) { flagEnableAtStartup=b; }
+	//! Set font size for message
+	void setFontSize(int size) { fontSize=size; }
+	//! Display plugin button on toolbar
+	void setFlagShowEOTButton(bool b);
+
+private slots:
+	void updateMessageText();
+
+private:
+	// if existing, delete EquationOfTime section in main config.ini, then create with default values
+	void restoreDefaultConfigIni(void);
+
+	EquationOfTimeWindow* mainWindow;
+	QSettings* conf;
+	StelGui* gui;
+
+	QFont font;
+	bool flagShowSolutionEquationOfTime;
+	bool flagUseInvertedValue;
+	bool flagUseMsFormat;
+	bool flagEnableAtStartup;
+	bool flagShowEOTButton;
+	QString messageEquation;
+	QString messageEquationMinutes;
+	QString messageEquationSeconds;
+	Vec3f textColor;
+	int fontSize;
+	StelButton* toolbarButton;
+};
+
+
+#include <QObject>
+#include "StelPluginInterface.hpp"
+
+//! This class is used by Qt to manage a plug-in interface
+class EquationOfTimeStelPluginInterface : public QObject, public StelPluginInterface
+{
+	Q_OBJECT
+	Q_PLUGIN_METADATA(IID "stellarium.StelGuiPluginInterface/1.0")
+	Q_INTERFACES(StelPluginInterface)
+public:
+	virtual StelModule* getStelModule() const;
+	virtual StelPluginInfo getPluginInfo() const;
+};
+
+#endif /* _EQUATIONOFTIME_HPP_ */

=== added directory 'plugins/EquationOfTime/src/gui'
=== added file 'plugins/EquationOfTime/src/gui/EquationOfTimeWindow.cpp'
--- plugins/EquationOfTime/src/gui/EquationOfTimeWindow.cpp	1970-01-01 00:00:00 +0000
+++ plugins/EquationOfTime/src/gui/EquationOfTimeWindow.cpp	2014-02-07 18:17:25 +0000
@@ -0,0 +1,92 @@
+/*
+ * Equation of Time plug-in for Stellarium
+ *
+ * Copyright (C) 2014 Alexander Wolf
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "EquationOfTime.hpp"
+#include "EquationOfTimeWindow.hpp"
+#include "ui_equationOfTimeWindow.h"
+
+#include "StelApp.hpp"
+#include "StelLocaleMgr.hpp"
+#include "StelModule.hpp"
+#include "StelModuleMgr.hpp"
+
+EquationOfTimeWindow::EquationOfTimeWindow()
+{
+	ui = new Ui_equationOfTimeWindowForm();
+}
+
+EquationOfTimeWindow::~EquationOfTimeWindow()
+{
+	delete ui;
+}
+
+void EquationOfTimeWindow::retranslate()
+{
+	if (dialog)
+	{
+		ui->retranslateUi(dialog);
+		updateAboutText();
+	}
+}
+
+void EquationOfTimeWindow::createDialogContent()
+{
+	eq = GETSTELMODULE(EquationOfTime);
+	ui->setupUi(dialog);
+
+	connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate()));
+	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
+
+	ui->checkBoxEnableAtStartup->setChecked(eq->getFlagEnableAtStartup());
+	connect(ui->checkBoxEnableAtStartup, SIGNAL(clicked(bool)), eq, SLOT(setFlagEnableAtStartup(bool)));
+
+	ui->checkBoxInvertedValue->setChecked(eq->getFlagInvertedValue());
+	connect(ui->checkBoxInvertedValue, SIGNAL(clicked(bool)), eq, SLOT(setFlagInvertedValue(bool)));
+
+	ui->checkBoxMsFormat->setChecked(eq->getFlagMsFormat());
+	connect(ui->checkBoxMsFormat, SIGNAL(clicked(bool)), eq, SLOT(setFlagMsFormat(bool)));
+
+	ui->spinBoxFontSize->setValue(eq->getFontSize());
+	connect(ui->spinBoxFontSize, SIGNAL(valueChanged(int)), eq, SLOT(setFontSize(int)));
+
+	ui->checkBoxShowButton->setChecked(eq->getFlagShowEOTButton());
+	connect(ui->checkBoxShowButton, SIGNAL(clicked(bool)), eq, SLOT(setFlagShowEOTButton(bool)));
+
+	connect(ui->pushButtonSave, SIGNAL(clicked()), this, SLOT(saveEquationOfTimeSettings()));
+	connect(ui->pushButtonReset, SIGNAL(clicked()), this, SLOT(resetEquationOfTimeSettings()));
+
+	updateAboutText();	
+}
+
+void EquationOfTimeWindow::updateAboutText()
+{
+	ui->labelTitle->setText(q_("Equation of Time plug-in"));
+	QString version = QString(q_("Version %1")).arg(EQUATIONOFTIME_PLUGIN_VERSION);
+	ui->labelVersion->setText(version);
+}
+
+void EquationOfTimeWindow::saveEquationOfTimeSettings()
+{
+	eq->saveSettingsToConfig();
+}
+
+void EquationOfTimeWindow::resetEquationOfTimeSettings()
+{
+	eq->restoreDefaults();
+}

=== added file 'plugins/EquationOfTime/src/gui/EquationOfTimeWindow.hpp'
--- plugins/EquationOfTime/src/gui/EquationOfTimeWindow.hpp	1970-01-01 00:00:00 +0000
+++ plugins/EquationOfTime/src/gui/EquationOfTimeWindow.hpp	2014-02-07 18:17:25 +0000
@@ -0,0 +1,60 @@
+/*
+ * Equation of Time plug-in for Stellarium
+ *
+ * Copyright (C) 2014 Alexander Wolf
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _EQUATION_OF_TIME_WINDOW_HPP_
+#define _EQUATION_OF_TIME_WINDOW_HPP_
+
+#include "StelDialog.hpp"
+
+#include <QString>
+#include <QDoubleSpinBox>
+
+class Ui_equationOfTimeWindowForm;
+class EquationOfTime;
+
+//! Main window of the Equation of Time plug-in.
+class EquationOfTimeWindow : public StelDialog
+{
+	Q_OBJECT
+
+public:
+	EquationOfTimeWindow();
+	~EquationOfTimeWindow();
+
+public slots:
+	void retranslate();
+
+protected:
+	void createDialogContent();
+
+private:
+	Ui_equationOfTimeWindowForm* ui;
+	EquationOfTime* eq;
+
+	void updateAboutText();		
+
+private slots:
+	void saveEquationOfTimeSettings();
+	void resetEquationOfTimeSettings();
+
+
+};
+
+
+#endif /* _EQUATION_OF_TIME_WINDOW_HPP_ */

=== added file 'plugins/EquationOfTime/src/gui/equationOfTimeWindow.ui'
--- plugins/EquationOfTime/src/gui/equationOfTimeWindow.ui	1970-01-01 00:00:00 +0000
+++ plugins/EquationOfTime/src/gui/equationOfTimeWindow.ui	2014-02-07 18:17:25 +0000
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>equationOfTimeWindowForm</class>
+ <widget class="QWidget" name="equationOfTimeWindowForm">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>486</width>
+    <height>461</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <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="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>25</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>30</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>6</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 name="leftSpacer">
+        <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>Equation of Time</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="rightSpacer">
+        <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="tabWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="tabEquationOfTime">
+      <attribute name="title">
+       <string>Equation of Time</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayoutTimeZone">
+       <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="QGroupBox" name="groupBoxEOT">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>400</height>
+          </size>
+         </property>
+         <property name="title">
+          <string>Equation of Time</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+         <layout class="QGridLayout" name="gridLayoutCurrent">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <property name="verticalSpacing">
+           <number>8</number>
+          </property>
+          <item row="8" column="0" colspan="4">
+           <spacer name="verticalSpacerTimeZone">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="2" column="0" colspan="2">
+           <widget class="QCheckBox" name="checkBoxEnableAtStartup">
+            <property name="text">
+             <string>Enable display at startup</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0" rowspan="2" colspan="4">
+           <widget class="QLabel" name="labelEOTDescription">
+            <property name="text">
+             <string>The equation of time describes the discrepancy between two kinds of solar time. These are apparent solar time, which directly tracks the motion of the sun, and mean solar time, which tracks a fictitious &quot;mean&quot; sun with noons 24 hours apart. There is no universally accepted definition of the sign of the equation of time. Some publications show it as positive when a sundial is ahead of a clock; others when the clock is ahead of the sundial. In the English-speaking world, the former usage is the more common, but is not always followed. Anyone who makes use of a published table or graph should first check its sign usage.</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="2" colspan="2">
+           <widget class="QPushButton" name="pushButtonReset">
+            <property name="text">
+             <string>Restore defaults</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="2">
+           <widget class="QLabel" name="labelFontSize">
+            <property name="text">
+             <string>Font size:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="3">
+           <widget class="QSpinBox" name="spinBoxFontSize">
+            <property name="minimum">
+             <number>1</number>
+            </property>
+            <property name="maximum">
+             <number>50</number>
+            </property>
+            <property name="value">
+             <number>20</number>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0" colspan="2">
+           <widget class="QCheckBox" name="checkBoxShowButton">
+            <property name="text">
+             <string>Show plug-ins button on toolbar</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="0" colspan="2">
+           <widget class="QPushButton" name="pushButtonSave">
+            <property name="text">
+             <string>Save settings</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0" colspan="2">
+           <widget class="QCheckBox" name="checkBoxMsFormat">
+            <property name="text">
+             <string>Use minutes and seconds</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="2" colspan="2">
+           <widget class="QCheckBox" name="checkBoxInvertedValue">
+            <property name="text">
+             <string>Use inverted value for EOT</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tabAbout">
+      <attribute name="title">
+       <string comment="tab in plugin windows">About</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QLabel" name="labelTitle">
+         <property name="styleSheet">
+          <string notr="true">QLabel {
+	font: bold 18pt ;
+}</string>
+         </property>
+         <property name="text">
+          <string notr="true">Equation of Time plug-in</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelVersion">
+         <property name="text">
+          <string notr="true">Version %1</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelCopyright">
+         <property name="text">
+          <string notr="true">Copyright &amp;copy; 2014 Alexander Wolf</string>
+         </property>
+         <property name="textFormat">
+          <enum>Qt::RichText</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelLicense">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string notr="true">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/.</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+         <property name="textInteractionFlags">
+          <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+         </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>
+ <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>pushButtonSave</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>

=== modified file 'po/stellarium/POTFILES.in'
--- po/stellarium/POTFILES.in	2014-01-19 14:24:06 +0000
+++ po/stellarium/POTFILES.in	2014-02-07 18:17:25 +0000
@@ -112,3 +112,6 @@
 plugins/FOV/src/gui/FOVWindow.cpp
 plugins/FOV/src/ui_fovWindow.h
 plugins/NavStars/src/NavStars.cpp
+plugins/EquationOfTime/src/EquationOfTime.cpp
+plugins/EquationOfTime/src/gui/EquationOfTimeWindow.cpp
+plugins/EquationOfTime/src/ui_equationOfTimeWindow.h
\ No newline at end of file

=== modified file 'src/core/StelApp.cpp'
--- src/core/StelApp.cpp	2014-02-05 14:47:03 +0000
+++ src/core/StelApp.cpp	2014-02-07 18:17:25 +0000
@@ -151,6 +151,10 @@
 Q_IMPORT_PLUGIN(ExoplanetsStelPluginInterface)
 #endif
 
+#ifdef USE_STATIC_PLUGIN_EQUATIONOFTIME
+Q_IMPORT_PLUGIN(EquationOfTimeStelPluginInterface)
+#endif
+
 #ifdef USE_STATIC_PLUGIN_FOV
 Q_IMPORT_PLUGIN(FOVStelPluginInterface)
 #endif

=== modified file 'src/core/planetsephems/sidereal_time.c'
--- src/core/planetsephems/sidereal_time.c	2013-12-27 09:25:21 +0000
+++ src/core/planetsephems/sidereal_time.c	2014-02-07 18:17:25 +0000
@@ -332,18 +332,18 @@
  * Formula 11.1, 11.4 pg 83 */
 double get_mean_sidereal_time (double JD)
 {
-    double sidereal;
-    double T;
+	double sidereal;
+	double T;
     
-    T = (JD - 2451545.0) / 36525.0;
+	T = (JD - 2451545.0) / 36525.0;
         
-    /* calc mean angle */
-    sidereal = 280.46061837 + (360.98564736629 * (JD - 2451545.0)) + (0.000387933 * T * T) - (T * T * T / 38710000.0);
+	/* calc mean angle */
+	sidereal = 280.46061837 + (360.98564736629 * (JD - 2451545.0)) + (0.000387933 * T * T) - (T * T * T / 38710000.0);
     
-    /* add a convenient multiple of 360 degrees */
-    sidereal = range_degrees (sidereal);
+	/* add a convenient multiple of 360 degrees */
+	sidereal = range_degrees (sidereal);
 
-    return sidereal;
+	return sidereal;
 } 
 
 
@@ -352,27 +352,34 @@
  * Formula 11.1, 11.4 pg 83 */
 double get_apparent_sidereal_time (double JD)
 {
-   double correction, sidereal;
-   struct ln_nutation nutation;  
+	double correction, sidereal;
+	struct ln_nutation nutation;
    
-   /* get the mean sidereal time */
-   sidereal = get_mean_sidereal_time (JD);
+	/* get the mean sidereal time */
+	sidereal = get_mean_sidereal_time (JD);
         
-   /* add corrections for nutation in longitude and for the true obliquity of 
-   the ecliptic */   
-   get_nutation (JD, &nutation); 
+	/* add corrections for nutation in longitude and for the true obliquity of
+	the ecliptic */
+	get_nutation (JD, &nutation);
     
-   /* GZ: This was the only place where this was used. I added the summation here. */
-   correction = (nutation.longitude * cos ((nutation.ecliptic+nutation.obliquity)*M_PI/180.));
+	/* GZ: This was the only place where this was used. I added the summation here. */
+	correction = (nutation.longitude * cos ((nutation.ecliptic+nutation.obliquity)*M_PI/180.));
 
-   sidereal += correction;
+	sidereal += correction;
    
-   return (sidereal);
+	return (sidereal);
 }
 
 double get_mean_ecliptical_obliquity(double JDE)
 {
-  struct ln_nutation nutation;
-  get_nutation(JDE, &nutation);
-  return nutation.ecliptic;
+	struct ln_nutation nutation;
+	get_nutation(JDE, &nutation);
+	return nutation.ecliptic;
+}
+
+double get_nutation_longitude(double JDE)
+{
+	struct ln_nutation nutation;
+	get_nutation(JDE, &nutation);
+	return nutation.longitude;
 }

=== modified file 'src/core/planetsephems/sidereal_time.h'
--- src/core/planetsephems/sidereal_time.h	2014-01-23 11:11:41 +0000
+++ src/core/planetsephems/sidereal_time.h	2014-02-07 18:17:25 +0000
@@ -32,6 +32,8 @@
 double get_apparent_sidereal_time (double JD);
 /* Calculate mean ecliptical obliquity in degrees. */
 double get_mean_ecliptical_obliquity(double JDE);
+/* Calculate nutation in longitude in degrees. */
+double get_nutation_longitude(double JDE);
 
 #ifdef __cplusplus
 }

=== modified file 'src/gui/SkyGui.cpp'
--- src/gui/SkyGui.cpp	2014-01-20 14:56:57 +0000
+++ src/gui/SkyGui.cpp	2014-02-07 18:17:25 +0000
@@ -234,11 +234,21 @@
 	}
 }
 
+int SkyGui::getSkyGuiWidth() const
+{
+	return geometry().width();
+}
+
+int SkyGui::getSkyGuiHeight() const
+{
+	return geometry().height();
+}
+
 //! Update the position of the button bars in the main window
 void SkyGui::updateBarsPos()
 {
-	const int ww = geometry().width();
-	const int hh = geometry().height();
+	const int ww = getSkyGuiWidth();
+	const int hh = getSkyGuiHeight();
 	bool updatePath = false;
 
 	// Use a position cache to avoid useless redraw triggered by the position set if the bars don't move

=== modified file 'src/gui/SkyGui.hpp'
--- src/gui/SkyGui.hpp	2013-09-29 17:05:33 +0000
+++ src/gui/SkyGui.hpp	2014-02-07 18:17:25 +0000
@@ -66,6 +66,9 @@
 	void init(class StelGui* stelGui);
 	
 	virtual void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget* = 0);
+
+	int getSkyGuiWidth() const;
+	int getSkyGuiHeight() const;
 	
 protected:
 	virtual void resizeEvent(QGraphicsSceneResizeEvent* event);