Merge lp:~cardinot/stellarium/MeteorShowers into lp:stellarium

[Marcos Cardinot]

This plugin give visualization of the meteor showers, show information about meteor showers and displays marker for radiants in activity range for each meteor showers.

[Alexander Wolf (alexwolf)]

The population index does not used in model right now - it's used for info only. I guess we can use this parameter in model for calculation of brightness of meteors (via alpha channel possible).

review: Needs Fixing

[Marcos Cardinot (cardinot)]

That's true, but IMHO it is just about an improvement and not a "real bug" (to be fixed),
actually I have some ideas to improve the meteor design (color, brightness...), I started to write something in the past and I have plans to push new revisions soon... Anyway, for now I think it's not an issue to block the merge and maybe if the plugin is in trunk, We'd have more users helping with new ideas to build a good wishlist and keep in progress before the next release. =D

[Alexander Wolf (alexwolf)]

Of course, it's not a real bug. But it's a good point for TODO list. Right now plugin ready for merge with trunk and for public testing.

I guess in this plugin can be introduce some optimization of code in near future, after merge.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-03-01 15:42:49 +0000
+++ CMakeLists.txt	2014-03-10 17:28:07 +0000
@@ -161,6 +161,7 @@
 ADD_PLUGIN(EquationOfTime 1)
 ADD_PLUGIN(FOV 1)
 ADD_PLUGIN(LogBook 0)
+ADD_PLUGIN(MeteorShowers 1)
 ADD_PLUGIN(NavStars 1)
 ADD_PLUGIN(Novae 1)
 ADD_PLUGIN(Observability 1)

=== added directory 'plugins/MeteorShowers'
=== added file 'plugins/MeteorShowers/CMakeLists.txt'
--- plugins/MeteorShowers/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/MeteorShowers/CMakeLists.txt	2014-03-10 17:28:07 +0000
@@ -0,0 +1,16 @@
+SET(METEORSHOWERS_MAJOR "1")
+SET(METEORSHOWERS_MINOR "0")
+SET(METEORSHOWERS_PATCH "0")
+SET(METEORSHOWERS_VERSION "${METEORSHOWERS_MAJOR}.${METEORSHOWERS_MINOR}.${METEORSHOWERS_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(-DMETEORSHOWERS_PLUGIN_VERSION="${METEORSHOWERS_VERSION}")
+
+ADD_SUBDIRECTORY( src )
+
+INSTALL(FILES DESTINATION "modules/MeteorShowers")

=== added file 'plugins/MeteorShowers/COPYING'
--- plugins/MeteorShowers/COPYING	1970-01-01 00:00:00 +0000
+++ plugins/MeteorShowers/COPYING	2014-03-10 17:28:07 +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/MeteorShowers/resources'
=== added file 'plugins/MeteorShowers/resources/MeteorShower.qrc'
--- plugins/MeteorShowers/resources/MeteorShower.qrc	1970-01-01 00:00:00 +0000
+++ plugins/MeteorShowers/resources/MeteorShower.qrc	2014-03-10 17:28:07 +0000
@@ -0,0 +1,9 @@
+<RCC>
+    <qresource prefix="/MeteorShowers">
+        <file>showers.json</file>
+        <file>radiant.png</file>
+        <file>btMS-off.png</file>
+        <file>btMS-on.png</file>
+        <file>radiantSetting.png</file>
+    </qresource>
+</RCC>

=== added file 'plugins/MeteorShowers/resources/btMS-off.png'
Binary files plugins/MeteorShowers/resources/btMS-off.png	1970-01-01 00:00:00 +0000 and plugins/MeteorShowers/resources/btMS-off.png	2014-03-10 17:28:07 +0000 differ
=== added file 'plugins/MeteorShowers/resources/btMS-on.png'
Binary files plugins/MeteorShowers/resources/btMS-on.png	1970-01-01 00:00:00 +0000 and plugins/MeteorShowers/resources/btMS-on.png	2014-03-10 17:28:07 +0000 differ
=== added file 'plugins/MeteorShowers/resources/radiant.png'
Binary files plugins/MeteorShowers/resources/radiant.png	1970-01-01 00:00:00 +0000 and plugins/MeteorShowers/resources/radiant.png	2014-03-10 17:28:07 +0000 differ
=== added file 'plugins/MeteorShowers/resources/radiantSetting.png'
Binary files plugins/MeteorShowers/resources/radiantSetting.png	1970-01-01 00:00:00 +0000 and plugins/MeteorShowers/resources/radiantSetting.png	2014-03-10 17:28:07 +0000 differ
=== added file 'plugins/MeteorShowers/resources/showers.json'
--- plugins/MeteorShowers/resources/showers.json	1970-01-01 00:00:00 +0000
+++ plugins/MeteorShowers/resources/showers.json	2014-03-10 17:28:07 +0000
@@ -0,0 +1,976 @@
+{
+	"shortName": "meteor showers data",
+	"version": 1,
+	"showers":
+	{
+		"QUA":
+		{
+			"designation": "Quadrantids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": -1,
+				"variable": "60-200",
+				"start": "12.28",
+				"finish": "01.12",
+				"peak": "01.04"
+			},
+			{
+				"year": "2008",
+				"zhr": 120
+			},
+			{
+				"year": "2009",
+				"start": "01.01",
+				"finish": "01.05",
+				"peak": "01.03",
+				"zhr": 120
+			},
+			{
+				"year": "2011",
+				"zhr": 120
+			},
+			{
+				"year": "2012",
+				"zhr": 120
+			}
+			],
+			"speed": 41,
+			"radiantAlpha": "230",
+			"radiantDelta": "49",
+			"driftAlpha": "3",
+			"driftDelta": "-1",
+			"parentObj": "Asteroid 2003 EH1",
+			"pidx": 2.1
+		},
+		"ACE":
+		{
+			"designation": "α-Centaurids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": -1,
+				"variable": "5-20",
+				"start": "01.28",
+				"finish": "02.21",
+				"peak": "02.08"
+			},
+			{
+				"year": "2008",
+				"zhr": 5
+			},
+			{
+				"year": "2010",
+				"zhr": 6
+			},
+			{
+				"year": "2011",
+				"zhr": 6
+			}
+			],
+			"speed": 56,
+			"radiantAlpha": "210",
+			"radiantDelta": "-59",
+			"driftAlpha": "6.25",
+			"driftDelta": "-1.5",
+			"pidx": 2.0
+		},
+		"GNO":
+		{
+			"designation": "γ-Normids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 6,
+				"start": "02.25",
+				"finish": "03.22",
+				"peak": "03.15"
+			},
+			{
+				"year": "2008",
+				"zhr": 4
+			},
+			{
+				"year": "2010",
+				"zhr": 6
+			},
+			{
+				"year": "2011",
+				"zhr": 6
+			}
+			],
+			"speed": 56,
+			"radiantAlpha": "239",
+			"radiantDelta": "-50",
+			"driftAlpha": "5",
+			"driftDelta": "-0.3",
+			"pidx": 2.4
+		},
+		"ETA":
+		{
+			"designation": "η-Aquariids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": -1,
+				"variable": "40-85",
+				"start": "04.19",
+				"finish": "05.28",
+				"peak": "05.06"
+			},
+			{
+				"year": "2008",
+				"zhr": 70
+			},
+			{
+				"year": "2009",
+				"zhr": 85
+			},
+			{
+				"year": "2011",
+				"zhr": 70
+			}
+			],
+			"speed": 66,
+			"radiantAlpha": "338",
+			"radiantDelta": "-1",
+			"driftAlpha": "5",
+			"driftDelta": "2",
+			"parentObj": "Comet 1P/Halley",
+			"pidx": 2.4
+		},
+		"PAU":
+		{
+			"designation": "Piscis Austrinids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 5,
+				"start": "06.15",
+				"finish": "08.10",
+				"peak": "07.28"
+			},
+			{
+				"year": "2008",
+				"zhr": 5
+			},
+			{
+				"year": "2009",
+				"zhr": 5
+			}
+			],
+			"speed": 35,
+			"radiantAlpha": "341",
+			"radiantDelta": "-30",
+			"driftAlpha": "4",
+			"driftDelta": "1",
+			"pidx": 3.2
+		},
+		"LYR":
+		{
+			"designation": "Lyrids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": -1,
+				"variable": "0-90",
+				"start": "04.16",
+				"finish": "04.25",
+				"peak": "04.22"
+			},
+			{
+				"year": "1922",
+				"zhr": 96
+			},
+			{
+				"year": "1945",
+				"zhr": 112
+			},
+			{
+				"year": "1982",
+				"zhr": 100
+			},
+			{
+				"year": "2007",
+				"zhr": 18
+			},
+			{
+				"year": "2008",
+				"zhr": 18
+			},
+			{
+				"year": "2010",
+				"zhr": 18
+			},
+			{
+				"year": "2011",
+				"zhr": 20
+			},
+			{
+				"year": "2012",
+				"zhr": 18
+			}
+			],
+			"speed": 49,
+			"radiantAlpha": "271",
+			"radiantDelta": "34",
+			"driftAlpha": "3",
+			"driftDelta": "0",
+			"parentObj": "Comet Thatcher (1861 I)",
+			"pidx": 2.1
+		},
+		"JBO":
+		{
+			"designation": "June Bootids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": -1,
+				"variable": "0-100",
+				"start": "06.22",
+				"finish": "07.02",
+				"peak": "06.27"
+			}
+			],
+			"speed": 18,
+			"radiantAlpha": "224",
+			"radiantDelta": "48",
+			"driftAlpha": "2",
+			"driftDelta": "-1",
+			"parentObj": "Comet 7P/Pons-Winnecke",
+			"pidx": 2.2
+		},
+		"SDA":
+		{
+			"designation": "Southern δ-Aquariids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 16,
+				"start": "07.12",
+				"finish": "08.23",
+				"peak": "07.30"
+			},
+			{
+				"year": "2007",
+				"zhr": 20,
+				"start": "07.12",
+				"finish": "08.19",
+				"peak": "07.28"
+			},
+			{
+				"year": "2008",
+				"zhr": 20,
+				"start": "07.12",
+				"finish": "08.19",
+				"peak": "07.27"
+			},
+			{
+				"year": "2009",
+				"zhr": 20,
+				"start": "07.12",
+				"finish": "08.19",
+				"peak": "07.28"
+			}
+			],
+			"speed": 41,
+			"radiantAlpha": "339",
+			"radiantDelta": "-16",
+			"driftAlpha": "4",
+			"driftDelta": "0.5",
+			"parentObj": "Comet 96P/Machholz",
+			"pidx": 3.2
+		},
+		"CAP":
+		{
+			"designation": "α-Capricornids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 5,
+				"start": "07.03",
+				"finish": "08.15",
+				"peak": "07.30"
+			},
+			{
+				"year": "2007",
+				"zhr": 4
+			},
+			{
+				"year": "2008",
+				"zhr": 4
+			},
+			{
+				"year": "2009",
+				"zhr": 4
+			}
+			],
+			"speed": 23,
+			"radiantAlpha": "307",
+			"radiantDelta": "-10",
+			"driftAlpha": "5",
+			"driftDelta": "1",
+			"pidx": 2.5
+		},
+		"AUR":
+		{
+			"designation": "α-Aurigids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 6,
+				"start": "08.28",
+				"finish": "09.05",
+				"peak": "09.01"
+			},
+			{
+				"year": "2009",
+				"zhr": 7
+			}
+			],
+			"speed": 66,
+			"radiantAlpha": "91",
+			"radiantDelta": "+39",
+			"driftAlpha": "5",
+			"driftDelta": "0.7",
+			"pidx": 2.6
+		},
+		"SPE":
+		{
+			"designation": "September ε-Perseids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 5,
+				"start": "09.04",
+				"finish": "09.14",
+				"peak": "09.09"
+			}
+			],
+			"speed": 64,
+			"radiantAlpha": "47",
+			"radiantDelta": "+40",
+			"driftAlpha": "5",
+			"driftDelta": "0.1",
+			"pidx": 3.0
+		},
+		"DRA":
+		{
+			"designation": "Draconids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": -1,
+				"variable": "20-700",
+				"start": "10.06",
+				"finish": "10.10",
+				"peak": "10.08"
+			},
+			{
+				"year": "1933",
+				"zhr": 6000
+			},
+			{
+				"year": "1946",
+				"zhr": 6800
+			}
+			],
+			"speed": 20,
+			"radiantAlpha": "262",
+			"radiantDelta": "+54",
+			"driftAlpha": "0",
+			"driftDelta": "0",
+			"parentObj": "Comet 21P/Giacobini-Zinner",
+			"pidx": 2.6
+		},
+		"LEO":
+		{
+			"designation": "Leonids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": -1,
+				"variable": "5-20*",
+				"start": "11.06",
+				"finish": "11.30",
+				"peak": "11.18"
+			},
+			{
+				"year": "1833",
+				"zhr": 240000
+			},
+			{
+				"year": "1866",
+				"zhr": 5000
+			},
+			{
+				"year": "1867",
+				"zhr": 1000
+			},
+			{
+				"year": "1868",
+				"zhr": 1000
+			},
+			{
+				"year": "1898",
+				"zhr": 100
+			},
+			{
+				"year": "1901",
+				"zhr": 400
+			},
+			{
+				"year": "1966",
+				"zhr": 144000
+			},
+			{
+				"year": "1998",
+				"zhr": 2000
+			},
+			{
+				"year": "1999",
+				"zhr": 5000
+			},
+			{
+				"year": "2000",
+				"zhr": 480
+			},
+			{
+				"year": "2001",
+				"zhr": 3700
+			},
+			{
+				"year": "2002",
+				"zhr": 3000
+			},
+			{
+				"year": "2006",
+				"zhr": 78
+			},
+			{
+				"year": "2007",
+				"zhr": 35
+			},
+			{
+				"year": "2008",
+				"start": "11.14",
+				"finish": "11.22",
+				"peak": "11.17",
+				"zhr": 99
+			},
+			{
+				"year": "2009",
+				"start": "11.10",
+				"finish": "11.21",
+				"peak": "11.17",
+				"zhr": 79
+			},
+			{
+				"year": "2010",
+				"start": "11.10",
+				"finish": "11.23",
+				"peak": "11.17",
+				"zhr": 32
+			},
+			{
+				"year": "2011",
+				"zhr": 22
+			},
+			{
+				"year": 2012,
+				"start": "11.06",
+				"finish": "11.30",
+				"peak": "11.17",
+				"zhr": 61
+			}
+			],
+			"speed": 71,
+			"radiantAlpha": "152",
+			"radiantDelta": "+22",
+			"driftAlpha": "3",
+			"driftDelta": "-1.25",
+			"parentObj": "Comet 55P/Tempel-Tuttle",
+			"pidx": 2.5
+		},
+		"PHO":
+		{
+			"designation": "Phoenicids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": -1,
+				"variable": "0-100",
+				"start": "11.28",
+				"finish": "12.09",
+				"peak": "12.06"
+			}
+			],
+			"speed": 18,
+			"radiantAlpha": "18",
+			"radiantDelta": "-53",
+			"driftAlpha": "4",
+			"driftDelta": "-0.5",
+			"pidx": 2.8
+		},
+		"PUP":
+		{
+			"designation": "Puppid-Velids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 10,
+				"start": "12.01",
+				"finish": "12.15",
+				"peak": "12.07"
+			}
+			],
+			"speed": 40,
+			"radiantAlpha": "123",
+			"radiantDelta": "-45",
+			"driftAlpha": "3",
+			"driftDelta": "0",
+			"pidx": 2.9
+		},
+		"URS":
+		{
+			"designation": "Ursids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": -1,
+				"variable": "10-50",
+				"start": "12.17",
+				"finish": "12.26",
+				"peak": "12.23"
+			}
+			],
+			"speed": 33,
+			"radiantAlpha": "217",
+			"radiantDelta": "+76",
+			"driftAlpha": "0",
+			"driftDelta": "-2",
+			"pidx": 3.0
+		},
+		"PER":
+		{
+			"designation": "Perseids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 100,
+				"start": "07.17",
+				"finish": "08.24",
+				"peak": "08.13"
+			},
+			{
+				"year": "1863",
+				"zhr": 215
+			},
+			{
+				"year": "2004",
+				"zhr": 200
+			},
+			{
+				"year": "2007",
+				"zhr": 93
+			},
+			{
+				"year": "2008",
+				"zhr": 116
+			},
+			{
+				"year": "2009",
+				"zhr": 173
+			},
+			{
+				"year": "2010",
+				"zhr": 142
+			},
+			{
+				"year": "2011",
+				"zhr": 100
+			},
+			{
+				"year": "2012",
+				"zhr": 100
+			}
+			],
+			"speed": 59,
+			"radiantAlpha": "48",
+			"radiantDelta": "+58",
+			"driftAlpha": "6",
+			"driftDelta": "1",
+			"parentObj": "Comet 109P/Swift-Tuttle",
+			"pidx": 2.2
+		},
+		"DLE":
+		{
+			"designation": "δ-Leonids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 2,
+				"start": "02.15",
+				"finish": "03.10",
+				"peak": "02.24"
+			}
+			],
+			"speed": 23,
+			"radiantAlpha": "168",
+			"radiantDelta": "+16",
+			"driftAlpha": "0",
+			"driftDelta": "0",
+			"parentObj": "Asteroid (4450) Pan",
+			"pidx": 3.0
+		},
+		"PPU":
+		{
+			"designation": "π-Puppids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": -1,
+				"variable": "0-40",
+				"start": "04.15",
+				"finish": "04.28",
+				"peak": "04.24"
+			}
+			],
+			"speed": 18,
+			"radiantAlpha": "110",
+			"radiantDelta": "-45",
+			"driftAlpha": "2.5",
+			"driftDelta": "-0.5",
+			"parentObj": "Comet 26P/Grigg-Skjellerup",
+			"pidx": 2.0
+		},
+		"JLY":
+		{
+			"designation": "June Lyrids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": -1,
+				"variable": "0-5",
+				"start": "06.11",
+				"finish": "06.21",
+				"peak": "06.16"
+			}
+			],
+			"speed": 31,
+			"radiantAlpha": "277",
+			"radiantDelta": "+35",
+			"driftAlpha": "4",
+			"driftDelta": "0",
+			"pidx": 3.0
+		},
+		"KCG":
+		{
+			"designation": "κ-Cygnids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 3,
+				"start": "08.03",
+				"finish": "08.25",
+				"peak": "08.18"
+			}
+			],
+			"speed": 25,
+			"radiantAlpha": "286",
+			"radiantDelta": "+59",
+			"driftAlpha": "1",
+			"driftDelta": "0.5",
+			"pidx": 3.0
+		},
+		"ELY":
+		{
+			"designation": "ε-Lyrids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 3,
+				"start": "03.03",
+				"finish": "03.12",
+				"peak": "03.08"
+			}
+			],
+			"speed": 44,
+			"radiantAlpha": "287",
+			"radiantDelta": "+44",
+			"driftAlpha": "5",
+			"driftDelta": "0.5",
+			"pidx": 3.0
+		},
+		"DAU":
+		{
+			"designation": "δ-Aurigids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 3,
+				"start": "09.18",
+				"finish": "10.10",
+				"peak": "09.28"
+			}
+			],
+			"speed": 64,
+			"radiantAlpha": "82",
+			"radiantDelta": "+49",
+			"driftAlpha": "5",
+			"driftDelta": "-2",
+			"pidx": 2.9
+		},
+		"EGE":
+		{
+			"designation": "ε-Geminids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 3,
+				"start": "10.14",
+				"finish": "10.27",
+				"peak": "10.18"
+			}
+			],
+			"speed": 70,
+			"radiantAlpha": "102",
+			"radiantDelta": "+27",
+			"driftAlpha": "5",
+			"driftDelta": "0",
+			"pidx": 3.0
+		},
+		"STA":
+		{
+			"designation": "Southern Taurids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 5,
+				"start": "09.25",
+				"finish": "11.25",
+				"peak": "11.05"
+			}
+			],
+			"speed": 27,
+			"radiantAlpha": "52",
+			"radiantDelta": "+15",
+			"driftAlpha": "3",
+			"driftDelta": "1",
+			"pidx": 2.3
+		},
+		"NTA":
+		{
+			"designation": "Northern Taurids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 5,
+				"start": "09.25",
+				"finish": "11.25",
+				"peak": "11.12"
+			}
+			],
+			"speed": 29,
+			"radiantAlpha": "58",
+			"radiantDelta": "+22",
+			"driftAlpha": "5",
+			"driftDelta": "1",
+			"pidx": 2.3
+		},
+		"MON":
+		{
+			"designation": "Monocerotids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 2,
+				"start": "11.27",
+				"finish": "12.17",
+				"peak": "12.09"
+			}
+			],
+			"speed": 42,
+			"radiantAlpha": "100",
+			"radiantDelta": "+8",
+			"driftAlpha": "4",
+			"driftDelta": "0",
+			"pidx": 3.0
+		},
+		"HYD":
+		{
+			"designation": "σ-Hydrids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 3,
+				"start": "12.03",
+				"finish": "12.15",
+				"peak": "12.12"
+			}
+			],
+			"speed": 58,
+			"radiantAlpha": "127",
+			"radiantDelta": "+2",
+			"driftAlpha": "4",
+			"driftDelta": "-1",
+			"pidx": 3.0
+		},
+		"GEM":
+		{
+			"designation": "Geminids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 120,
+				"start": "12.07",
+				"finish": "12.17",
+				"peak": "12.14"
+			},
+			{
+				"year": "2006",
+				"zhr": 115
+			},
+			{
+				"year": "2007",
+				"zhr": 122
+			},
+			{
+				"year": "2008",
+				"zhr": 139
+			},
+			{
+				"year": "2009",
+				"zhr": 120
+			},
+			{
+				"year": "2010",
+				"zhr": 127
+			},
+			{
+				"year": "2011",
+				"zhr": 198
+			},
+			{
+				"year": "2012",
+				"zhr": 109
+			}
+			],
+			"speed": 35,
+			"radiantAlpha": "112",
+			"radiantDelta": "+33",
+			"driftAlpha": "5",
+			"driftDelta": "-0.1",
+			"pidx": 2.6
+		},
+		"LMI":
+		{
+			"designation": "Leonis Minorids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 2,
+				"start": "10.19",
+				"finish": "10.27",
+				"peak": "10.24"
+			}
+			],
+			"speed": 62,
+			"radiantAlpha": "162",
+			"radiantDelta": "+37",
+			"driftAlpha": "5",
+			"driftDelta": "-2",
+			"pidx": 3.0
+		},
+		"DLM":
+		{
+			"designation": "December Leonis Minorids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 5,
+				"start": "12.05",
+				"finish": "02.04",
+				"peak": "12.20"
+			}
+			],
+			"speed": 64,
+			"radiantAlpha": "161",
+			"radiantDelta": "+30",
+			"driftAlpha": "5",
+			"driftDelta": "-2",
+			"pidx": 3.0
+		},
+		"COM":
+		{
+			"designation": "Comae Berenicids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 3,
+				"start": "12.12",
+				"finish": "12.23",
+				"peak": "12.16"
+			}
+			],
+			"speed": 65,
+			"radiantAlpha": "175",
+			"radiantDelta": "+18",
+			"driftAlpha": "2.5",
+			"driftDelta": "-1.5",
+			"pidx": 3.0
+		},
+		"ORI":
+		{
+			"designation": "Orionids",
+			"activity":
+			[
+			{
+				"year": "generic",
+				"zhr": 25,
+				"start": "10.02",
+				"finish": "11.07",
+				"peak": "10.21"
+			}
+			],
+			"speed": 66,
+			"radiantAlpha": "95",
+			"radiantDelta": "+16",
+			"driftAlpha": "3",
+			"driftDelta": "0.5",
+			"pidx": 2.5
+		}
+	}
+}

=== added directory 'plugins/MeteorShowers/src'
=== added file 'plugins/MeteorShowers/src/CMakeLists.txt'
--- plugins/MeteorShowers/src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/MeteorShowers/src/CMakeLists.txt	2014-03-10 17:28:07 +0000
@@ -0,0 +1,37 @@
+INCLUDE_DIRECTORIES(
+    .
+    gui
+    ${CMAKE_BINARY_DIR}/plugins/MeteorShowers/src
+    ${CMAKE_BINARY_DIR}/plugins/MeteorShowers/src/gui
+)
+
+LINK_DIRECTORIES(${BUILD_DIR}/src)
+
+SET(MeteorShowers_SRCS
+    MeteorShower.hpp
+    MeteorShower.cpp
+    MeteorShowers.hpp
+    MeteorShowers.cpp
+    MeteorStream.hpp
+    MeteorStream.cpp
+    gui/MeteorShowerDialog.hpp
+    gui/MeteorShowerDialog.cpp
+)
+
+SET(MeteorShowersDialog_UIS
+    gui/meteorShowerDialog.ui
+)
+
+QT5_WRAP_UI(MeteorShowersDialog_UIS_H ${MeteorShowersDialog_UIS})
+
+SET(MeteorShowers_RES ../resources/MeteorShower.qrc)
+QT5_ADD_RESOURCES(MeteorShowers_RES_CXX ${MeteorShowers_RES})
+
+SET(extLinkerOption ${QT_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES})
+
+ADD_LIBRARY(MeteorShowers-static STATIC ${MeteorShowers_SRCS} ${MeteorShowers_MOC_SRCS} ${MeteorShowers_RES_CXX} ${MeteorShowersDialog_UIS_H})
+QT5_USE_MODULES(MeteorShowers-static Core Declarative Network)
+SET_TARGET_PROPERTIES(MeteorShowers-static PROPERTIES OUTPUT_NAME "MeteorShowers")
+TARGET_LINK_LIBRARIES(MeteorShowers-static ${extLinkerOption})
+SET_TARGET_PROPERTIES(MeteorShowers-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
+ADD_DEPENDENCIES(AllStaticPlugins MeteorShowers-static)

=== added file 'plugins/MeteorShowers/src/MeteorShower.cpp'
--- plugins/MeteorShowers/src/MeteorShower.cpp	1970-01-01 00:00:00 +0000
+++ plugins/MeteorShowers/src/MeteorShower.cpp	2014-03-10 17:28:07 +0000
@@ -0,0 +1,417 @@
+/*
+ * Copyright (C) 2013 Marcos Cardinot
+ * Copyright (C) 2011 Alexander Wolf
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
+ */
+
+#include "MeteorShower.hpp"
+#include "MeteorShowers.hpp"
+#include "StelApp.hpp"
+#include "StelCore.hpp"
+#include "StelModuleMgr.hpp"
+#include "StelObject.hpp"
+#include "StelPainter.hpp"
+#include "StelTexture.hpp"
+#include "StelUtils.hpp"
+
+#include <QDebug>
+#include <QList>
+#include <QOpenGLFunctions>
+#include <QTextStream>
+#include <QVariant>
+#include <QVariantMap>
+
+StelTextureSP MeteorShower::radiantTexture;
+float MeteorShower::showLabels = true;
+bool MeteorShower::radiantMarkerEnabled = true;
+
+MeteorShower::MeteorShower(const QVariantMap& map)
+	: initialized(false)
+{
+	// return initialized if the mandatory fields are not present
+	if(!map.contains("showerID"))
+		return;
+
+	showerID = map.value("showerID").toString();
+	designation  = map.value("designation").toString();
+	speed = map.value("speed").toInt();
+	rAlphaPeak = radiantAlpha = StelUtils::getDecAngle(map.value("radiantAlpha").toString());
+	rDeltaPeak = radiantDelta = StelUtils::getDecAngle(map.value("radiantDelta").toString());
+	driftAlpha = StelUtils::getDecAngle(map.value("driftAlpha").toString());
+	driftDelta = StelUtils::getDecAngle(map.value("driftDelta").toString());
+	parentObj = map.value("parentObj").toString();
+	pidx = map.value("pidx").toFloat();
+
+	if(map.contains("activity"))
+	{
+		foreach(const QVariant &ms, map.value("activity").toList())
+		{
+			QVariantMap activityMap = ms.toMap();
+			activityData d;
+			d.year = activityMap.value("year").toString();
+			d.zhr = activityMap.value("zhr").toInt();
+			d.variable = activityMap.value("variable").toString();
+			d.peak = activityMap.value("peak").toString();
+			d.start = activityMap.value("start").toString();
+			d.finish = activityMap.value("finish").toString();
+			activity.append(d);
+		}
+	}
+
+	updateCurrentData(getSkyQDateTime());
+
+	initialized = true;
+}
+
+MeteorShower::~MeteorShower()
+{
+	//
+}
+
+QVariantMap MeteorShower::getMap(void)
+{
+	QVariantMap map;
+	map["showerID"] = showerID;
+	map["designation"] = designation;
+	map["speed"] = speed;
+	map["radiantAlpha"] = rAlphaPeak;
+	map["radiantDelta"] = rDeltaPeak;
+	map["driftAlpha"] = driftAlpha;
+	map["driftDelta"] = driftDelta;
+	map["parentObj"] = parentObj;
+	map["pidx"] = pidx;
+
+	QVariantList activityList;
+	foreach(const activityData &p, activity)
+	{
+		QVariantMap activityMap;
+		activityMap["year"] = p.year;
+		activityMap["zhr"] = p.zhr;
+		activityMap["variable"] = p.variable;
+		activityMap["start"] = p.start;
+		activityMap["finish"] = p.finish;
+		activityMap["peak"] = p.peak;
+		activityList << activityMap;
+	}
+	map["activity"] = activityList;
+
+	return map;
+}
+
+float MeteorShower::getSelectPriority(const StelCore*) const
+{
+	return -2.0;
+}
+
+QString MeteorShower::getDesignation() const
+{
+	return designation;
+}
+
+QString MeteorShower::getDateFromJSON(QString jsondate) const
+{
+	QStringList parsedDate = jsondate.split(".");
+
+	return QString("%1 %2").arg(parsedDate.at(1).toInt()).arg(getMonthName(parsedDate.at(0).toInt()));
+}
+
+QString MeteorShower::getDayFromJSON(QString jsondate) const
+{
+	QStringList parsedDate = jsondate.split(".");
+
+	return QString("%1").arg(parsedDate.at(1).toInt());
+}
+
+int MeteorShower::getMonthFromJSON(QString jsondate) const
+{
+	QStringList parsedDate = jsondate.split(".");
+
+	return parsedDate.at(0).toInt();
+}
+
+QString MeteorShower::getMonthNameFromJSON(QString jsondate) const
+{
+	QStringList parsedDate = jsondate.split(".");
+
+	return QString("%1").arg(getMonthName(parsedDate.at(0).toInt()));
+}
+
+QString MeteorShower::getMonthName(int number) const
+{
+	QStringList monthList;
+	monthList.append(N_("January"));
+	monthList.append(N_("February"));
+	monthList.append(N_("March"));
+	monthList.append(N_("April"));
+	monthList.append(N_("May"));
+	monthList.append(N_("June"));
+	monthList.append(N_("July"));
+	monthList.append(N_("August"));
+	monthList.append(N_("September"));
+	monthList.append(N_("October"));
+	monthList.append(N_("November"));
+	monthList.append(N_("December"));
+
+	return q_(monthList.at(number-1));
+}
+
+QDateTime MeteorShower::getSkyQDateTime() const
+{
+	StelCore* core = StelApp::getInstance().getCore();
+	//get the current sky date
+	double JD = core->getJDay();
+	return StelUtils::jdToQDateTime(JD+StelUtils::getGMTShiftFromQT(JD)/24-core->getDeltaT(JD)/86400);
+}
+
+void MeteorShower::updateCurrentData(QDateTime skyDate)
+{
+	//Check if we have real data for the current sky year
+	int index = searchRealData(skyDate.toString("yyyy"));
+
+	/**************************
+	 *ZHR info
+	 **************************/
+	zhr = activity[index].zhr == 0 ? activity[0].zhr : activity[index].zhr;
+
+	if (zhr == -1)
+		variable = activity[index].variable.isEmpty() ? activity[0].variable : activity[index].variable;
+	else
+		variable = "";
+
+	/***************************
+	 *Dates - start/finish/peak
+	 ***************************/
+	QString dateStart = activity[index].start.isEmpty() ? activity[0].start : activity[index].start;
+	QString dateFinish = activity[index].finish.isEmpty() ? activity[0].finish : activity[index].finish;
+	QString datePeak = activity[index].peak.isEmpty() ? activity[0].peak : activity[index].peak;
+	QString yearBase = activity[index].year == "generic" ? skyDate.toString("yyyy") : activity[index].year;
+	QString yearS, yearF;
+
+	int monthStart = getMonthFromJSON(dateStart);
+	int monthFinish = getMonthFromJSON(dateFinish);
+
+	if(monthStart > monthFinish)
+	{
+		if(monthStart == skyDate.toString("MM").toInt())
+		{
+			yearS = yearBase;
+			yearF = QString("%1").arg(yearBase.toInt() + 1);
+		}
+		else
+		{
+			yearS = QString("%1").arg(yearBase.toInt() - 1);
+			yearF = yearBase;
+		}
+	}
+	else
+	{
+		yearS = yearF = yearBase;
+	}
+
+	start = QDateTime::fromString(dateStart + " " + yearS, "MM.dd yyyy");
+	finish = QDateTime::fromString(dateFinish + " " + yearF, "MM.dd yyyy");
+	peak = QDateTime::fromString(datePeak + " " + yearS, "MM.dd yyyy");
+
+	if (peak.operator <(start) || peak.operator >(finish))
+		peak = QDateTime::fromString(datePeak + " " + yearF, "MM.dd yyyy");
+
+	/***************************
+	 *Activity - is active?
+	 ***************************/
+	if(skyDate.operator >=(start) && skyDate.operator <=(finish))
+	{
+		if(index)
+			isActive = 1; // real data
+		else
+			isActive = 2; // generic data
+	}
+	else
+	{
+		isActive = 0; // isn't active
+	}
+
+	/**************************
+	 *Radiant drift
+	 *************************/
+	radiantAlpha = rAlphaPeak;
+	radiantDelta = rDeltaPeak;
+
+	if (isActive)
+	{
+		double time = (StelUtils::qDateTimeToJd(skyDate) - StelUtils::qDateTimeToJd(peak))*24;
+		radiantAlpha += (driftAlpha/120)*time;
+		radiantDelta += (driftDelta/120)*time;
+	}
+}
+
+int MeteorShower::searchRealData(QString yyyy) const
+{
+	int index = -1;
+	foreach(const activityData &p, activity)
+	{
+		index++;
+		if(p.year == yyyy)
+			return index;
+	}
+
+	return 0;
+}
+
+float MeteorShower::getSolarLongitude(QDateTime QDT) const
+{
+	//The number of days (positive or negative) since Greenwich noon,
+	//Terrestrial Time, on 1 January 2000 (J2000.0)
+	double n = StelUtils::qDateTimeToJd(QDT) - 2451545.0;
+
+	//The mean longitude of the Sun, corrected for the aberration of light
+	float slong = (280.460 + 0.9856474*n) / 360;
+	slong = (slong - (int) slong) * 360 - 1;
+
+	return slong;
+}
+
+QString MeteorShower::getInfoString(const StelCore* core, const InfoStringGroup& flags) const
+{
+	QString str;
+	QTextStream oss(&str);
+
+	QString mstdata = q_("generic data");
+	if(isActive == 1)
+		mstdata = q_("real data");
+
+	if(flags&Name)
+		oss << "<h2>" << getNameI18n() << " (" << showerID  <<")</h2>";
+
+	if(flags&Extra)
+		oss << q_("Type: <b>%1</b> (%2)").arg(q_("meteor shower"), mstdata) << "<br />";
+
+	// Ra/Dec etc.
+	oss << getPositionInfoString(core, flags);
+
+	if(flags&Extra)
+	{
+		oss << QString("%1: %2/%3")
+			.arg(q_("Radiant drift (per day)"))
+			.arg(StelUtils::radToHmsStr(driftAlpha/5))
+			.arg(StelUtils::radToDmsStr(driftDelta/5));
+		oss << "<br />";
+
+		oss << q_("Geocentric meteoric velocity: %1 km/s").arg(speed) << "<br />";
+		if(pidx>0)
+		{
+			oss << q_("The population index: %1").arg(pidx) << "<br />";
+		}
+
+		if(!parentObj.isEmpty())
+		{
+			oss << q_("Parent body: %1").arg(parentObj) << "<br />";
+		}
+
+		if(start.toString("M") == finish.toString("M"))
+		{
+			oss << QString("%1: %2 - %3 %4")
+			       .arg(q_("Active"))
+			       .arg(start.toString("d"))
+			       .arg(finish.toString("d"))
+			       .arg(start.toString("MMMM"));
+		}
+		else
+		{
+			oss << QString("%1: %2 - %3")
+			       .arg(q_("Active"))
+			       .arg(start.toString("d MMMM"))
+			       .arg(finish.toString("d MMMM"));
+		}
+		oss << "<br />";
+		oss << q_("Maximum: %1").arg(peak.toString("d MMMM"));
+
+		QString slong = QString::number( MeteorShower::getSolarLongitude(peak), 'f', 2 );
+		oss << QString(" (%1 %2&deg;)").arg(q_("Solar longitude is")).arg(slong);
+		oss << "<br />";
+
+		if(zhr>0)
+		{
+			oss << QString("ZHR<sub>max</sub>: %1").arg(zhr) << "<br />";
+		}
+		else
+		{
+			oss << QString("ZHR<sub>max</sub>: %1").arg(q_("variable"));
+			if(!variable.isEmpty())
+			{
+				oss << "; " << variable;
+			}
+			oss << "<br />";
+		}
+	}
+
+	postProcessInfoString(str, flags);
+
+	return str;
+}
+
+Vec3f MeteorShower::getInfoColor(void) const
+{
+	return StelApp::getInstance().getVisionModeNight() ? Vec3f(0.6, 0.0, 0.0) : Vec3f(1.0, 1.0, 1.0);
+}
+
+double MeteorShower::getAngularSize(const StelCore*) const
+{
+	return 0.001;
+}
+
+void MeteorShower::update(double deltaTime)
+{
+	labelsFader.update((int)(deltaTime*1000));
+	updateCurrentData(getSkyQDateTime());
+}
+
+void MeteorShower::draw(StelPainter& painter)
+{
+	StelUtils::spheToRect(radiantAlpha, radiantDelta, XYZ);
+	painter.getProjector()->project(XYZ, XY);
+
+	glEnable(GL_BLEND);
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+
+	qreal r, g, b;
+	float alpha = 0.85f + ((double) rand() / (RAND_MAX))/10;
+	switch(isActive)
+	{
+	case 1: //Active, real data
+		GETSTELMODULE(MeteorShowers)->getColorARR().getRgbF(&r,&g,&b);
+		break;
+	case 2: //Active, generic data
+		GETSTELMODULE(MeteorShowers)->getColorARG().getRgbF(&r,&g,&b);
+		break;
+	default: //Inactive
+		GETSTELMODULE(MeteorShowers)->getColorIR().getRgbF(&r,&g,&b);
+	}
+
+	painter.setColor(r, g, b, alpha);
+
+	if (MeteorShower::radiantMarkerEnabled)
+	{
+		MeteorShower::radiantTexture->bind();
+		painter.drawSprite2dMode(XY[0], XY[1], 10);
+
+		if (MeteorShower::showLabels)
+		{
+			float size = getAngularSize(NULL)*M_PI/180.*painter.getProjector()->getPixelPerRadAtCenter();
+			float shift = 8.f + size/1.8f;
+			painter.drawText(XY[0]+shift, XY[1]+shift, getNameI18n(), 0, 0, 0, false);
+		}
+	}
+}

=== added file 'plugins/MeteorShowers/src/MeteorShower.hpp'
--- plugins/MeteorShowers/src/MeteorShower.hpp	1970-01-01 00:00:00 +0000
+++ plugins/MeteorShowers/src/MeteorShower.hpp	2014-03-10 17:28:07 +0000
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2013 Marcos Cardinot
+ * Copyright (C) 2011 Alexander Wolf
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
+ */
+
+#ifndef _METEORSHOWER_HPP_
+#define _METEORSHOWER_HPP_
+
+#include <QDateTime>
+#include <QVariantMap>
+#include <QString>
+
+#include "StelFader.hpp"
+#include "StelObject.hpp"
+#include "StelPainter.hpp"
+#include "StelTextureTypes.hpp"
+#include "StelTranslator.hpp"
+
+class StelPainter;
+
+//! @class MeteorShower
+//! A MeteorShower object represents one meteor shower on the sky.
+//! Details about the meteor showers are passed using a QVariant which contains
+//! a map of data from the json file.
+
+class MeteorShower : public StelObject
+{
+	friend class MeteorShowers;
+
+public:
+	//! @param id The official ID designation for a meteor shower, e.g. "LYR"
+	MeteorShower(const QVariantMap& map);
+	~MeteorShower();
+
+	//! Get a QVariantMap which describes the meteor shower. Could be used to
+	//! create a duplicate.
+	QVariantMap getMap(void);
+
+	virtual QString getType(void) const
+	{
+		return "MeteorShower";
+	}
+	virtual float getSelectPriority(const StelCore* core) const;
+
+	//! Get an HTML string to describe the object
+	//! @param core A pointer to the core
+	//! @flags a set of flags with information types to include.
+	virtual QString getInfoString(const StelCore* core, const InfoStringGroup& flags) const;
+	virtual Vec3f getInfoColor(void) const;
+	virtual Vec3d getJ2000EquatorialPos(const StelCore*) const
+	{
+		return XYZ;
+	}
+	virtual double getAngularSize(const StelCore* core) const;
+	virtual QString getNameI18n(void) const
+	{
+		return q_(designation);
+	}
+	virtual QString getEnglishName(void) const
+	{
+		return designation;
+	}
+	QString getDesignation(void) const;
+	void update(double deltaTime);
+	static float showLabels;
+
+	//! Get current activity status of MS
+	//! @return 0:inactive 1:activeRealData 2:activeGenericData
+	int getStatus()
+	{
+		return isActive;
+	}
+
+	//! Get peak
+	//! @return peak
+	QDateTime getPeak()
+	{
+		return peak;
+	}
+
+	//! Get zhr
+	//! @return ZHR
+	int getZHR()
+	{
+		return zhr;
+	}
+
+private:
+	Vec3d XYZ;                      //! Cartesian equatorial position
+	Vec3d XY;                       //! Store temporary 2D position
+
+	static StelTextureSP radiantTexture;
+	static bool radiantMarkerEnabled;
+
+	LinearFader labelsFader;
+
+	typedef struct
+	{
+		QString year;		   //! Value of year for actual data
+		int zhr;		   //! ZHR of shower
+		QString variable;	   //! value of variable for ZHR
+		QString start;		   //! First day for activity
+		QString finish;		   //! Latest day for activity
+		QString peak;		   //! Day with maximum for activity
+	} activityData;
+
+	bool initialized;
+	QString showerID;		        //! The ID of the meteor shower
+	QString designation;            //! The designation of the meteor shower
+	QList<activityData> activity;	//! List of activity
+	int speed;                      //! Speed of meteors
+	double rAlphaPeak;              //! R.A. for radiant of meteor shower on the peak day
+	double rDeltaPeak;              //! Dec. for radiant of meteor shower on the peak day
+	double driftAlpha;		//! Drift of R.A.
+	double driftDelta;		//! Drift of Dec.
+	QString parentObj;		//! Parent object for meteor shower
+	float pidx;			//! The population index
+
+	//current information
+	double radiantAlpha;            //! Current R.A. for radiant of meteor shower
+	double radiantDelta;            //! Current Dec. for radiant of meteor shower
+	int zhr;			//! ZHR of shower
+	QString variable;		//! value of variable for ZHR
+	QDateTime start;		//! First day for activity
+	QDateTime finish;		//! Latest day for activity
+	QDateTime peak;			//! Day with maximum for activity
+
+	int isActive;		        //! Check if the radiant is active for the current sky date
+					//! 0=inactive; 1=realData 2=genericData
+
+	void draw(StelPainter &painter);
+
+	//! Get a date string from JSON file and parse it for display in info corner
+	//! @param jsondate A string from JSON file
+	QString getDateFromJSON(QString jsondate) const;
+
+	//! Get a day from JSON file and parse it for display in info corner
+	//! @param jsondate A string from JSON file
+	QString getDayFromJSON(QString jsondate) const;
+
+	//! Get a month string from JSON file and parse it for display in info corner
+	//! @param jsondate A string from JSON file
+	int getMonthFromJSON(QString jsondate) const;
+
+	//! Get a month string from JSON file and parse it for display in info corner
+	//! @param jsondate A string from JSON file
+	QString getMonthNameFromJSON(QString jsondate) const;
+
+	//! Get a month name from month number
+	//! @param jsondate A string from JSON file
+	QString getMonthName(int number) const;
+
+	//! Get the current sky QDateTime
+	//! @return Current QDateTime of sky
+	QDateTime getSkyQDateTime() const;
+
+	//! Update value of current information(zhr, variable, stat, finish and peak)
+	//! @param current sky QDateTime
+	void updateCurrentData(QDateTime skyDate);
+
+	//! Check if the JSON file has real data to a given year
+	//! @param yyyy year to check
+	//! @return index of the year or 0 to generic data
+	int searchRealData(QString yyyy) const;
+
+	//! Get the solar longitude for a specified date
+	//! @param QDT QDateTime
+	//! @return solar longitude in degree
+	float getSolarLongitude(QDateTime QDT) const;
+};
+
+#endif /*_METEORSHOWER_HPP_*/

=== added file 'plugins/MeteorShowers/src/MeteorShowers.cpp'
--- plugins/MeteorShowers/src/MeteorShowers.cpp	1970-01-01 00:00:00 +0000
+++ plugins/MeteorShowers/src/MeteorShowers.cpp	2014-03-10 17:28:07 +0000
@@ -0,0 +1,1225 @@
+/*
+ * Copyright (C) 2013 Marcos Cardinot
+ * Copyright (C) 2011 Alexander Wolf
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
+ */
+
+#include "StelProjector.hpp"
+#include "StelPainter.hpp"
+#include "StelApp.hpp"
+#include "StelCore.hpp"
+#include "StelGui.hpp"
+#include "StelGuiItems.hpp"
+#include "StelLocaleMgr.hpp"
+#include "StelObjectMgr.hpp"
+#include "StelModuleMgr.hpp"
+#include "StelTextureMgr.hpp"
+#include "StelJsonParser.hpp"
+#include "StelIniParser.hpp"
+#include "StelFileMgr.hpp"
+#include "LabelMgr.hpp"
+#include "LandscapeMgr.hpp"
+#include "StelTranslator.hpp"
+#include "StelUtils.hpp"
+#include "MeteorShower.hpp"
+#include "MeteorShowers.hpp"
+#include "MeteorShowerDialog.hpp"
+#include "MeteorStream.hpp"
+#include "StelProgressController.hpp"
+
+#include <QAction>
+#include <QColor>
+#include <QDebug>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QKeyEvent>
+#include <QList>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QProgressBar>
+#include <QSharedPointer>
+#include <QStringList>
+#include <QTimer>
+#include <QVariant>
+#include <QVariantMap>
+
+#define CATALOG_FORMAT_VERSION 1 /* Version of format of catalog */
+
+/*
+ This method is the one called automatically by the StelModuleMgr just
+ after loading the dynamic library
+*/
+StelModule* MeteorShowersStelPluginInterface::getStelModule() const
+{
+	return new MeteorShowers();
+}
+
+StelPluginInfo MeteorShowersStelPluginInterface::getPluginInfo() const
+{
+	// Allow to load the resources when used as a static plugin
+	Q_INIT_RESOURCE(MeteorShower);
+
+	StelPluginInfo info;
+	info.id = "MeteorShowers";
+	info.displayedName = N_("Meteor Showers");
+	info.authors = "Marcos Cardinot";
+	info.contact = "[e-mail]";
+	info.description = N_("This plugin give visualization of the meteor showers, show information about meteor showers and displays marker for radiants in activity range for each meteor showers.");
+	info.version = METEORSHOWERS_PLUGIN_VERSION;
+	return info;
+}
+
+/*
+ Constructor
+*/
+MeteorShowers::MeteorShowers()
+	: flagShowMS(false)
+	, OnIcon(NULL)
+	, OffIcon(NULL)
+	, GlowIcon(NULL)
+	, toolbarButton(NULL)
+	, progressBar(NULL)
+{
+	setObjectName("MeteorShowers");
+	configDialog = new MeteorShowerDialog();
+	conf = StelApp::getInstance().getSettings();
+}
+
+/*
+ Destructor
+*/
+MeteorShowers::~MeteorShowers()
+{
+	delete configDialog;
+
+	if(GlowIcon)
+		delete GlowIcon;
+	if(OnIcon)
+		delete OnIcon;
+	if(OffIcon)
+		delete OffIcon;
+
+	active.clear();
+	activeInfo.clear();
+}
+
+/*
+ Reimplementation of the getCallOrder method
+*/
+double MeteorShowers::getCallOrder(StelModuleActionName actionName) const
+{
+	if(actionName == StelModule::ActionDraw)
+		return StelApp::getInstance().getModuleMgr().getModule("MeteorMgr")->getCallOrder(actionName)+0;
+	return 0;
+}
+
+void MeteorShowers::init()
+{
+	upgradeConfigIni();
+
+	try
+	{
+		StelFileMgr::makeSureDirExistsAndIsWritable(StelFileMgr::getUserDir()+"/modules/MeteorShowers");
+
+		// If no settings in the main config file, create with defaults
+		if(!conf->childGroups().contains("MeteorShowers"))
+		{
+			qDebug() << "MeteorShowers: no MeteorShower section exists in main config file - creating with defaults";
+			restoreDefaultConfigIni();
+		}
+
+		// populate settings from main config file.
+		readSettingsFromConfig();
+
+		showersJsonPath = StelFileMgr::findFile("modules/MeteorShowers", (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable)) + "/showers.json";
+
+		texPointer = StelApp::getInstance().getTextureManager().createTexture(StelFileMgr::getInstallationDir()+"/textures/pointeur5.png");
+		MeteorShower::radiantTexture = StelApp::getInstance().getTextureManager().createTexture(":/MeteorShowers/radiant.png");
+
+		// key bindings and other actions
+		QString msGroup = N_("Meteor Shower");
+		addAction("actionShow_MeteorShower", msGroup, N_("Show meteor showers"), "msVisible", "Ctrl+Alt+M");
+		addAction("actionShow_radiant_Labels", msGroup, N_("Radiant labels"), "labelsVisible", "Shift+M");
+		addAction("actionShow_MeteorShower_ConfigDialog", msGroup, N_("Meteor Shower configuration window"), configDialog, "visible", "Alt+M");
+
+		GlowIcon = new QPixmap(":/graphicGui/glow32x32.png");
+		OnIcon = new QPixmap(":/MeteorShowers/btMS-on.png");
+		OffIcon = new QPixmap(":/MeteorShowers/btMS-off.png");
+
+		setFlagShowMSButton(flagShowMSButton);
+		setFlagShowMS(getEnableAtStartup());
+	}
+	catch(std::runtime_error &e)
+	{
+		qWarning() << "MeteorShowers: init error:" << e.what();
+		return;
+	}
+
+	// A timer for hiding alert messages
+	messageTimer = new QTimer(this);
+	messageTimer->setSingleShot(true);   // recurring check for update
+	messageTimer->setInterval(9000);      // 6 seconds should be enough time
+	messageTimer->stop();
+	connect(messageTimer, SIGNAL(timeout()), this, SLOT(messageTimeout()));
+
+	// If the json file does not already exist, create it from the resource in the QT resource
+	if(!QFileInfo(showersJsonPath).exists())
+	{
+		if(!checkJsonFileFormat() || getJsonFileFormatVersion()<CATALOG_FORMAT_VERSION)
+		{
+			displayMessage(q_("The old showers.json file is no longer compatible - using default file"), "#bb0000");
+			restoreDefaultJsonFile();
+		}
+		else
+		{
+			qDebug() << "MeteorShowers: showers.json does not exist - copying default file to" << QDir::toNativeSeparators(showersJsonPath);
+			restoreDefaultJsonFile();
+		}
+	}
+
+	qDebug() << "MeteorShowers: loading catalog file:" << QDir::toNativeSeparators(showersJsonPath);
+
+	// create meteor Showers according to content os Showers.json file
+	readJsonFile();
+
+	// Set up download manager and the update schedule
+	downloadMgr = new QNetworkAccessManager(this);
+	connect(downloadMgr, SIGNAL(finished(QNetworkReply*)), this, SLOT(updateDownloadComplete(QNetworkReply*)));
+	updateState = CompleteNoUpdates;
+	updateTimer = new QTimer(this);
+	updateTimer->setSingleShot(false);   // recurring check for update
+	updateTimer->setInterval(13000);     // check once every 13 seconds to see if it is time for an update
+	connect(updateTimer, SIGNAL(timeout()), this, SLOT(checkForUpdate()));
+	updateTimer->start();
+
+	// skyDate startup
+	skyDate = StelUtils::jdToQDateTime(StelApp::getInstance().getCore()->getJDay());
+
+	GETSTELMODULE(StelObjectMgr)->registerStelObjectMgr(this);
+}
+
+void MeteorShowers::deinit()
+{
+	MeteorShower::radiantTexture.clear();
+	texPointer.clear();
+}
+
+void MeteorShowers::upgradeConfigIni(void)
+{
+	// Upgrade settings for MeteorShower plugin
+	if (conf->contains("MeteorShowers/flag_show_ms"))
+	{
+		bool b = conf->value("MeteorShowers/flag_show_ms", false).toBool();
+		if (!conf->contains("MeteorShowers/enable_at_startup"))
+			conf->setValue("MeteorShowers/enable_at_startup", b);
+		conf->remove("MeteorShowers/flag_show_ms");
+	}
+}
+
+void MeteorShowers::setFlagShowMS(bool b)
+{
+	if(toolbarButton != NULL)
+		toolbarButton->setChecked(b);
+
+	flagShowMS=b;
+}
+
+// Define whether the button toggling meteor showers should be visible
+void MeteorShowers::setFlagShowMSButton(bool b)
+{
+	StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
+	if(b)
+	{
+		if(toolbarButton==NULL)
+		{
+			// Create the MeteorShowers button
+			toolbarButton = new StelButton(NULL, *OnIcon, *OffIcon, *GlowIcon, "actionShow_MeteorShower");
+		}
+		gui->getButtonBar()->addButton(toolbarButton, "065-pluginsGroup");
+	}
+	else
+	{
+		gui->getButtonBar()->hideButton("actionShow_MeteorShower");
+	}
+	flagShowMSButton = b;
+}
+
+bool MeteorShowers::changedSkyDate(StelCore* core)
+{
+	double JD = core->getJDay();
+	skyDate = StelUtils::jdToQDateTime(JD+StelUtils::getGMTShiftFromQT(JD)/24-core->getDeltaT(JD)/86400);
+	if(skyDate.toString("MM.dd.yyyy") != lastSkyDate.toString("MM.dd.yyyy"))  //if the sky date changed
+		return true;
+	else
+		return false;
+}
+
+void MeteorShowers::draw(StelCore* core)
+{
+	if(!getFlagShowMS())
+		return;
+
+	StelPainter painter(core->getProjection(StelCore::FrameJ2000));
+	drawMarker(core, painter);
+
+	if(GETSTELMODULE(StelObjectMgr)->getFlagSelectedObjectPointer())
+		drawPointer(core, painter);
+
+	painter.setProjector(core->getProjection(StelCore::FrameAltAz));
+	drawStream(core, painter);
+}
+
+void MeteorShowers::drawMarker(StelCore* core, StelPainter& painter)
+{
+	Q_UNUSED(core);
+	painter.setFont(labelFont);
+
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glEnable(GL_BLEND);
+	glEnable(GL_TEXTURE_2D);
+
+	foreach(const MeteorShowerP& ms, mShowers)
+	{
+		ms->updateCurrentData(skyDate);
+
+		bool flag=true;
+		if (ms->getStatus()==0 && getFlagActiveRadiant())
+			flag = false;
+
+		if(ms && ms->initialized && flag)
+			ms->draw(painter);
+	}
+	glDisable(GL_TEXTURE_2D);
+}
+
+void MeteorShowers::drawPointer(StelCore* core, StelPainter& painter)
+{
+	const StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
+
+	const QList<StelObjectP> newSelected = GETSTELMODULE(StelObjectMgr)->getSelectedObject("MeteorShower");
+	if(!newSelected.empty())
+	{
+		const StelObjectP obj = newSelected[0];
+		Vec3d pos=obj->getJ2000EquatorialPos(core);
+
+		Vec3d screenpos;
+		// Compute 2D pos and return if outside screen
+		if(!painter.getProjector()->project(pos, screenpos))
+			return;
+
+		const Vec3f& c(obj->getInfoColor());
+		painter.setColor(c[0],c[1],c[2]);
+		texPointer->bind();
+		painter.enableTexture2d(true);
+		glEnable(GL_BLEND);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Normal transparency mode
+
+		float size = obj->getAngularSize(core)*M_PI/180.*prj->getPixelPerRadAtCenter();
+		size+=20.f + 10.f*std::sin(2.f * StelApp::getInstance().getTotalRunTime());
+
+		painter.drawSprite2dMode(screenpos[0]-size/2, screenpos[1]-size/2, 10.f, 90);
+		painter.drawSprite2dMode(screenpos[0]-size/2, screenpos[1]+size/2, 10.f, 0);
+		painter.drawSprite2dMode(screenpos[0]+size/2, screenpos[1]+size/2, 10.f, -90);
+		painter.drawSprite2dMode(screenpos[0]+size/2, screenpos[1]-size/2, 10.f, -180);
+		painter.setColor(1,1,1,0);
+	}
+}
+
+void MeteorShowers::drawStream(StelCore* core, StelPainter& painter)
+{
+	LandscapeMgr* landmgr = (LandscapeMgr*)StelApp::getInstance().getModuleMgr().getModule("LandscapeMgr");
+	if(landmgr->getFlagAtmosphere() && landmgr->getLuminance()>5)
+		return;
+
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glEnable(GL_BLEND);
+	painter.enableTexture2d(false);
+
+	int index = 0;
+	if(active.size() > 0)
+	{
+		foreach(const activeData &a, activeInfo)
+		{
+			Q_UNUSED(a);
+			// step through and draw all active meteors
+			for(std::vector<MeteorStream*>::iterator iter = active[index].begin(); iter != active[index].end(); ++iter)
+			{
+				(*iter)->draw(core, painter);
+			}
+			index++;
+		}
+	}
+}
+
+int MeteorShowers::calculateZHR(int zhr, QString variable, QDateTime start, QDateTime finish, QDateTime peak)
+{
+	/***************************************
+	 * Get ZHR ranges
+	 ***************************************/
+	int highZHR;
+	int lowZHR;
+	//bool multPeak = false; //multiple peaks
+	if(zhr != -1)  //isn't variable
+	{
+		highZHR = zhr;
+		lowZHR = 0;
+	}
+	else
+	{
+		QStringList varZHR = variable.split("-");
+		lowZHR = varZHR.at(0).toInt();
+		if(varZHR.at(1).contains("*"))
+		{
+			//multPeak = true;
+			highZHR = varZHR[1].replace("*", "").toInt();
+		}
+		else
+		{
+			highZHR = varZHR.at(1).toInt();
+		}
+	}
+
+	/***************************************
+	 * Convert time intervals
+	 ***************************************/
+	double startJD = StelUtils::qDateTimeToJd(start);
+	double finishJD = StelUtils::qDateTimeToJd(finish);
+	double peakJD = StelUtils::qDateTimeToJd(peak);
+	double currentJD = StelUtils::qDateTimeToJd(skyDate);
+
+	/***************************************
+	 * Gaussian distribution
+	 ***************************************/
+	double sd; //standard deviation
+	if (currentJD >= startJD && currentJD < peakJD) //left side of gaussian
+		sd = (peakJD - startJD)/2;
+	else
+		sd = (finishJD - peakJD)/2;
+
+	double gaussian = highZHR * std::exp( - std::pow(currentJD - peakJD, 2) / (sd*sd) ) + lowZHR;
+
+	return (int) ((int) ((gaussian - (int) gaussian) * 10) >= 5 ? gaussian+1 : gaussian);
+}
+
+void MeteorShowers::updateActiveInfo(void)
+{
+	foreach(const MeteorShowerP& ms, mShowers)
+	{
+		if(ms && ms->initialized)
+		{
+			//if the meteor shower is active, get data
+			if(ms->isActive)
+			{
+				//First, check if there is already data about the constellation in "activeInfo"
+				//The var "index" will be updated to show the correct place do put the new information
+				int index = 0;
+				foreach(const activeData &a, activeInfo)
+				{
+					if(a.showerID == ms->showerID)  //exists
+						break;
+					index++;
+				}
+
+				if(activeInfo.size() < index + 1) //new?, put in the end
+				{
+					activeData newData;
+					newData.showerID = ms->showerID;
+					newData.speed = ms->speed;
+					newData.radiantAlpha = ms->radiantAlpha;
+					newData.radiantDelta = ms->radiantDelta;
+					newData.zhr = ms->zhr;
+					newData.variable = ms->variable;
+					newData.start = ms->start;
+					newData.finish = ms->finish;
+					newData.peak = ms->peak;
+					newData.status = ms->isActive;
+					activeInfo.append(newData);
+				}
+				else //just overwrites
+				{
+					activeInfo[index].zhr = ms->zhr;
+					activeInfo[index].variable = ms->variable;
+					activeInfo[index].start = ms->start;
+					activeInfo[index].finish = ms->finish;
+					activeInfo[index].peak = ms->peak;
+					activeInfo[index].status = ms->isActive;
+				}
+			}
+		}
+	}
+	lastSkyDate = skyDate;
+}
+
+void MeteorShowers::update(double deltaTime)
+{
+	if(!getFlagShowMS())
+		return;
+
+	StelCore* core = StelApp::getInstance().getCore();
+
+	double timeRate = core->getTimeRate();
+	if(timeRate > 0.2)
+		return;
+
+	//check if the sky date changed
+	bool changedDate = changedSkyDate(core);
+
+	if(changedDate)
+	{
+		// clear data of all MS active
+		activeInfo.clear();
+
+		// Is GUI visible and the year changed? refresh ranges
+		if(configDialog->visible() && lastSkyDate.toString("yyyy") != skyDate.toString("yyyy"))
+			configDialog->refreshRangeDates();
+	}
+
+	updateActiveInfo();
+
+	deltaTime*=1000;
+
+	std::vector<std::vector<MeteorStream*> >::iterator iterOut;
+	std::vector<MeteorStream*>::iterator iterIn;
+	int index = 0;
+	if(active.size() > 0)
+	{
+		// step through and update all active meteors
+		for(iterOut = active.begin(); iterOut != active.end(); ++iterOut)
+		{
+			for(iterIn = active[index].begin(); iterIn != active[index].end(); ++iterIn)
+			{
+				if(!(*iterIn)->update(deltaTime))
+				{
+					delete *iterIn;
+					active[index].erase(iterIn);
+					iterIn--;
+				}
+			}
+			if(active[index].empty())
+			{
+				active.erase(iterOut);
+				iterOut--;
+				index--;
+			}
+			index++;
+		}
+	}
+
+	index = 0;
+	foreach(const activeData &a, activeInfo)
+	{
+		ZHR = calculateZHR(a.zhr, a.variable, a.start, a.finish, a.peak);
+
+		// only makes sense given lifetimes of meteors to draw when timeSpeed is realtime
+		// otherwise high overhead of large numbers of meteors
+		double tspeed = timeRate*86400;  // sky seconds per actual second
+		if(tspeed<=0 || fabs(tspeed)>1.)
+			return; // don't start any more meteors
+
+		// if stellarium has been suspended, don't create huge number of meteors to
+		// make up for lost time!
+		if(deltaTime > 500)
+			deltaTime = 500;
+
+		// determine average meteors per frame needing to be created
+		int mpf = (int)((double)ZHR*zhrToWsr*deltaTime/1000.0 + 0.5);
+		if(mpf<1)
+			mpf = 1;
+
+		std::vector<MeteorStream*> aux;
+		if(active.empty() || active.size() < (unsigned) index+1)
+			active.push_back(aux);
+
+		for(int i=0; i<mpf; ++i)
+		{
+			// start new meteor based on ZHR time probability
+			double prob = ((double)rand())/RAND_MAX;
+			if(ZHR>0 && prob<((double)ZHR*zhrToWsr*deltaTime/1000.0/(double)mpf))
+			{
+				MeteorStream *m = new MeteorStream(core, a.speed, a.radiantAlpha, a.radiantDelta);
+				active[index].push_back(m);
+			}
+		}
+		index++;
+	}
+}
+
+QList<MeteorShowerP> MeteorShowers::searchEvents(QDate dateFrom, QDate dateTo) const
+{
+	QList<MeteorShowerP> result;
+	QDate date;
+
+	foreach(const MeteorShowerP& ms, mShowers)
+	{
+		date = dateFrom;
+		while(date.operator <=(dateTo))
+		{
+			ms->updateCurrentData((QDateTime) date);
+			if(ms->isActive)
+			{
+				result.append(ms);
+				break;
+			}
+			date = date.addDays(1);
+		}
+	}
+
+	return result;
+}
+
+QList<StelObjectP> MeteorShowers::searchAround(const Vec3d& av, double limitFov, const StelCore*) const
+{
+	QList<StelObjectP> result;
+
+	if(!getFlagRadiant())
+		return result;
+
+	Vec3d v(av);
+	v.normalize();
+	double cosLimFov = cos(limitFov * M_PI/180.);
+	Vec3d equPos;
+
+	foreach(const MeteorShowerP& ms, mShowers)
+	{
+		if(ms->initialized)
+		{
+			equPos = ms->XYZ;
+			equPos.normalize();
+			if(equPos[0]*v[0] + equPos[1]*v[1] + equPos[2]*v[2]>=cosLimFov)
+			{
+				result.append(qSharedPointerCast<StelObject>(ms));
+			}
+		}
+	}
+
+	return result;
+}
+
+StelObjectP MeteorShowers::searchByName(const QString& englishName) const
+{
+	if(!getFlagRadiant())
+		return NULL;
+
+	foreach(const MeteorShowerP& ms, mShowers)
+	{
+		if(ms->getEnglishName().toUpper() == englishName.toUpper())
+			return qSharedPointerCast<StelObject>(ms);
+	}
+
+	return NULL;
+}
+
+StelObjectP MeteorShowers::searchByNameI18n(const QString& nameI18n) const
+{
+	if(!getFlagRadiant())
+		return NULL;
+
+	foreach(const MeteorShowerP& ms, mShowers)
+	{
+		if(ms->getNameI18n().toUpper() == nameI18n.toUpper())
+			return qSharedPointerCast<StelObject>(ms);
+	}
+
+	return NULL;
+}
+
+QStringList MeteorShowers::listMatchingObjectsI18n(const QString& objPrefix, int maxNbItem, bool useStartOfWords) const
+{
+	QStringList result;
+	if(!getFlagRadiant())
+		return result;
+
+	if(maxNbItem==0)
+		return result;
+
+	QString sn;
+	bool find;
+
+	foreach(const MeteorShowerP& ms, mShowers)
+	{
+		sn = ms->getNameI18n();
+		find = false;
+		if (useStartOfWords)
+		{
+			if (sn.toUpper().left(objPrefix.length()) == objPrefix.toUpper())
+				find = true;
+		}
+		else
+		{
+			if (sn.contains(objPrefix, Qt::CaseInsensitive))
+				find = true;
+		}
+		if (find)
+			result << sn;
+
+
+	}
+
+	result.sort();
+
+	if(result.size()>maxNbItem)
+		result.erase(result.begin()+maxNbItem, result.end());
+
+	return result;
+}
+
+QStringList MeteorShowers::listMatchingObjects(const QString& objPrefix, int maxNbItem, bool useStartOfWords) const
+{
+	QStringList result;
+	if(!getFlagRadiant())
+		return result;
+
+	if(maxNbItem==0)
+		return result;
+
+	QString sn;
+	bool find;
+	foreach(const MeteorShowerP& ms, mShowers)
+	{
+		sn = ms->getEnglishName();
+		find = false;
+		if(useStartOfWords)
+		{
+			if(objPrefix.toUpper()==sn.toUpper().left(objPrefix.length()))
+				find = true;
+		}
+		else
+		{
+			if(sn.contains(objPrefix, Qt::CaseInsensitive))
+				find = true;
+		}
+		if(find)
+		{
+			result << sn;
+		}
+
+		sn = ms->getDesignation();
+		find = false;
+		if(useStartOfWords)
+		{
+			if(objPrefix.toUpper()==sn.toUpper().left(objPrefix.length()))
+				find = true;
+		}
+		else
+		{
+			if(sn.contains(objPrefix, Qt::CaseInsensitive))
+				find = true;
+		}
+		if(find)
+		{
+			result << sn;
+		}
+	}
+
+	result.sort();
+	if(result.size()>maxNbItem)
+		result.erase(result.begin()+maxNbItem, result.end());
+
+	return result;
+}
+
+QStringList MeteorShowers::listAllObjects(bool inEnglish) const
+{
+	QStringList result;
+	if(inEnglish)
+	{
+		foreach(const MeteorShowerP& ms, mShowers)
+		{
+			result << ms->getEnglishName();
+		}
+	}
+	else
+	{
+		foreach(const MeteorShowerP& ms, mShowers)
+		{
+			result << ms->getNameI18n();
+		}
+	}
+	return result;
+}
+
+bool MeteorShowers::configureGui(bool show)
+{
+	if(show)
+		configDialog->setVisible(true);
+
+	return true;
+}
+
+QVariantMap MeteorShowers::loadShowersMap(QString path)
+{
+	if(path.isEmpty())
+		path = showersJsonPath;
+
+	QVariantMap map;
+	QFile jsonFile(path);
+	if(!jsonFile.open(QIODevice::ReadOnly))
+		qWarning() << "MeteorShowers: cannot open" << path;
+	else
+		map = StelJsonParser::parse(jsonFile.readAll()).toMap();
+
+	jsonFile.close();
+	return map;
+}
+
+void MeteorShowers::readJsonFile(void)
+{
+	setShowersMap(loadShowersMap());
+}
+
+void MeteorShowers::setShowersMap(const QVariantMap& map)
+{
+	mShowers.clear();
+	QVariantMap msMap = map.value("showers").toMap();
+	foreach(QString msKey, msMap.keys())
+	{
+		QVariantMap msData = msMap.value(msKey).toMap();
+		msData["showerID"] = msKey;
+
+		MeteorShowerP ms(new MeteorShower(msData));
+		if(ms->initialized)
+			mShowers.append(ms);
+	}
+}
+
+void MeteorShowers::restoreDefaults(void)
+{
+	restoreDefaultConfigIni();
+	restoreDefaultJsonFile();
+	readJsonFile();
+	readSettingsFromConfig();
+}
+
+void MeteorShowers::restoreDefaultConfigIni(void)
+{
+	conf->beginGroup("MeteorShowers");
+
+	// delete all existing MeteorShower settings...
+	conf->remove("");
+
+	conf->setValue("enable_at_startup", false);
+	conf->setValue("updates_enabled", true);
+	conf->setValue("url", "http://stellarium.org/json/showers.json");
+	conf->setValue("update_frequency_hours", 100);
+	conf->setValue("flag_show_ms_button", true);
+	conf->setValue("flag_show_radiants", true);
+	conf->setValue("flag_active_radiants", false);
+
+	conf->setValue("colorARG", "0, 255, 240");
+	conf->setValue("colorARR", "255, 240, 0");
+	conf->setValue("colorIR", "255, 255, 255");
+
+	conf->setValue("show_radiant_labels", true);
+
+	conf->endGroup();
+}
+
+void MeteorShowers::restoreDefaultJsonFile(void)
+{
+	if(QFileInfo(showersJsonPath).exists())
+		backupJsonFile(true);
+
+	QFile src(":/MeteorShowers/showers.json");
+	if(!src.copy(showersJsonPath))
+	{
+		qWarning() << "MeteorShowers: cannot copy JSON resource to" << showersJsonPath;
+	}
+	else
+	{
+		qDebug() << "MeteorShowers: copied default showers.json to" << showersJsonPath;
+		// The resource is read only, and the new file inherits this...  make sure the new file
+		// is writable by the Stellarium process so that updates can be done.
+		QFile dest(showersJsonPath);
+		dest.setPermissions(dest.permissions() | QFile::WriteOwner);
+
+		// Make sure that in the case where an online update has previously been done, but
+		// the json file has been manually removed, that an update is schreduled in a timely
+		// manner
+		conf->remove("MeteorShowers/last_update");
+		lastUpdate = QDateTime::fromString("2013-12-31T12:00:00", Qt::ISODate);
+	}
+}
+
+bool MeteorShowers::backupJsonFile(bool deleteOriginal)
+{
+	QFile old(showersJsonPath);
+	if(!old.exists())
+	{
+		qWarning() << "MeteorShowers: no file to backup";
+		return false;
+	}
+
+	QString backupPath = showersJsonPath + ".old";
+	if(QFileInfo(backupPath).exists())
+		QFile(backupPath).remove();
+
+	if(old.copy(backupPath))
+	{
+		if(deleteOriginal)
+		{
+			if(!old.remove())
+			{
+				qWarning() << "MeteorShowers: WARNING - could not remove old showers.json file";
+				return false;
+			}
+		}
+	}
+	else
+	{
+		qWarning() << "MeteorShowers: WARNING - failed to copy showers.json to showers.json.old";
+		return false;
+	}
+
+	return true;
+}
+
+int MeteorShowers::getJsonFileFormatVersion(void)
+{
+	int jsonVersion = -1;
+	QFile showersJsonFile(showersJsonPath);
+	if(!showersJsonFile.open(QIODevice::ReadOnly))
+	{
+		qWarning() << "MeteorShowers: cannot open" << QDir::toNativeSeparators(showersJsonPath);
+		return jsonVersion;
+	}
+
+	QVariantMap map;
+	map = StelJsonParser::parse(&showersJsonFile).toMap();
+	if(map.contains("version"))
+	{
+		jsonVersion = map.value("version").toInt();
+	}
+
+	showersJsonFile.close();
+	qDebug() << "MeteorShowers: version of the format of the catalog:" << jsonVersion;
+	return jsonVersion;
+}
+
+bool MeteorShowers::checkJsonFileFormat()
+{
+	QFile showersJsonFile(showersJsonPath);
+	if(!showersJsonFile.open(QIODevice::ReadOnly))
+	{
+		qWarning() << "MeteorShowers: cannot open" << QDir::toNativeSeparators(showersJsonPath);
+		return false;
+	}
+	
+	QVariantMap map;
+	try
+	{
+		map = StelJsonParser::parse(&showersJsonFile).toMap();
+		showersJsonFile.close();
+	}
+	catch(std::runtime_error& e)
+	{
+		qDebug() << "MeteorShowers: file format is wrong! Error:" << e.what();
+		return false;
+	}
+	
+	return true;
+}
+
+void MeteorShowers::readSettingsFromConfig(void)
+{
+	conf->beginGroup("MeteorShowers");
+
+	updateUrl = conf->value("url", "http://stellarium.org/json/showers.json").toString();
+	updateFrequencyHours = conf->value("update_frequency_hours", 720).toInt();
+	lastUpdate = QDateTime::fromString(conf->value("last_update", "2013-12-10T12:00:00").toString(), Qt::ISODate);
+	updatesEnabled = conf->value("updates_enabled", true).toBool();
+	enableAtStartup = conf->value("enable_at_startup", false).toBool();
+	flagShowMSButton = conf->value("flag_show_ms_button", true).toBool();
+	setFlagRadiant(conf->value("flag_show_radiants", true).toBool());
+	flagShowAR = conf->value("flag_active_radiants", false).toBool();
+
+	Vec3f color;
+	color = StelUtils::strToVec3f(conf->value("colorARG", "0, 255, 240").toString());
+	colorARG = QColor(color[0],color[1],color[2]);
+	color = StelUtils::strToVec3f(conf->value("colorARR", "255, 240, 0").toString());
+	colorARR = QColor(color[0],color[1],color[2]);
+	color = StelUtils::strToVec3f(conf->value("colorIR", "255, 255, 255").toString());
+	colorIR = QColor(color[0],color[1],color[2]);
+
+	MeteorShower::showLabels = conf->value("show_radiant_labels", true).toBool();
+	labelFont.setPixelSize(conf->value("font_size", 13).toInt());
+
+	conf->endGroup();
+}
+
+void MeteorShowers::saveSettingsToConfig(void)
+{
+	conf->beginGroup("MeteorShowers");
+
+	conf->setValue("url", updateUrl);
+	conf->setValue("update_frequency_hours", updateFrequencyHours);
+	conf->setValue("updates_enabled", updatesEnabled);
+	conf->setValue("enable_at_startup", enableAtStartup);
+	conf->setValue("flag_show_ms_button", flagShowMSButton);
+	conf->setValue("flag_show_radiants", getFlagRadiant());
+	conf->setValue("flag_active_radiants", flagShowAR);
+
+	int r,g,b;
+	colorARG.getRgb(&r,&g,&b);
+	conf->setValue("colorARG", QString("%1, %2, %3").arg(r).arg(g).arg(b));
+	colorARR.getRgb(&r,&g,&b);
+	conf->setValue("colorARR", QString("%1, %2, %3").arg(r).arg(g).arg(b));
+	colorIR.getRgb(&r,&g,&b);
+	conf->setValue("colorIR", QString("%1, %2, %3").arg(r).arg(g).arg(b));
+
+	conf->setValue("show_radiant_labels", MeteorShower::showLabels);
+	conf->setValue("font_size", labelFont.pixelSize());
+
+	conf->endGroup();
+}
+
+int MeteorShowers::getSecondsToUpdate(void)
+{
+	QDateTime nextUpdate = lastUpdate.addSecs(updateFrequencyHours * 3600);
+	return QDateTime::currentDateTime().secsTo(nextUpdate);
+}
+
+void MeteorShowers::checkForUpdate(void)
+{
+	if(updatesEnabled && lastUpdate.addSecs(updateFrequencyHours * 3600) <= QDateTime::currentDateTime())
+		updateJSON();
+}
+
+void MeteorShowers::updateJSON(void)
+{
+	if(updateState==MeteorShowers::Updating)
+	{
+		qWarning() << "MeteorShowers: already updating...  will not start again current update is complete.";
+		return;
+	}
+	else
+	{
+		qDebug() << "MeteorShowers: starting update...";
+	}
+
+	lastUpdate = QDateTime::currentDateTime();
+	conf->setValue("MeteorShowers/last_update", lastUpdate.toString(Qt::ISODate));
+
+	emit(jsonUpdateComplete());
+
+	updateState = MeteorShowers::Updating;
+
+	emit(updateStateChanged(updateState));
+	updateFile.clear();
+
+	if(progressBar==NULL)
+		progressBar = StelApp::getInstance().addProgressBar();
+
+	progressBar->setValue(0);
+	progressBar->setRange(0, 100);
+	progressBar->setFormat("Update meteor showers");
+
+	QNetworkRequest request;
+	request.setUrl(QUrl(updateUrl));
+	request.setRawHeader("User-Agent", QString("Mozilla/5.0 (Stellarium Meteor Showers Plugin %1; http://stellarium.org/)").arg(METEORSHOWERS_PLUGIN_VERSION).toUtf8());
+	downloadMgr->get(request);
+
+	updateState = MeteorShowers::CompleteUpdates;
+	emit(updateStateChanged(updateState));
+	emit(jsonUpdateComplete());
+}
+
+void MeteorShowers::updateDownloadComplete(QNetworkReply* reply)
+{
+	// check the download worked, and save the data to file if this is the case.
+	if(reply->error() != QNetworkReply::NoError)
+	{
+		qWarning() << "MeteorShowers: FAILED to download" << reply->url() << " Error:" << reply->errorString();
+	}
+	else
+	{
+		// download completed successfully.
+		QString jsonFilePath = StelFileMgr::findFile("modules/MeteorShowers", StelFileMgr::Flags(StelFileMgr::Writable|StelFileMgr::Directory)) + "/showers.json";
+		if(jsonFilePath.isEmpty())
+		{
+			qWarning() << "MeteorShowers: cannot write JSON data to file";
+		}
+		else
+		{
+			QFile jsonFile(jsonFilePath);
+			if(jsonFile.exists())
+				jsonFile.remove();
+
+			jsonFile.open(QIODevice::WriteOnly | QIODevice::Text);
+			jsonFile.write(reply->readAll());
+			jsonFile.close();
+		}
+	}
+
+	if(progressBar)
+	{
+		progressBar->setValue(100);
+		StelApp::getInstance().removeProgressBar(progressBar);
+		progressBar = NULL;
+	}
+
+	readJsonFile();
+}
+
+void MeteorShowers::displayMessage(const QString& message, const QString hexColor)
+{
+	messageIDs << GETSTELMODULE(LabelMgr)->labelScreen(message, 30, 30 + (20*messageIDs.count()), true, 16, hexColor);
+	messageTimer->start();
+}
+
+void MeteorShowers::messageTimeout(void)
+{
+	foreach(int i, messageIDs)
+	{
+		GETSTELMODULE(LabelMgr)->deleteLabel(i);
+	}
+}
+
+bool MeteorShowers::getFlagLabels()
+{
+	return MeteorShower::showLabels;
+}
+
+void MeteorShowers::setFlagLabels(bool b)
+{
+	if (MeteorShower::showLabels != b)
+		MeteorShower::showLabels = b;
+}
+
+void MeteorShowers::setLabelFontSize(int size)
+{
+	if (labelFont.pixelSize() != size)
+		labelFont.setPixelSize(size);
+}
+
+void MeteorShowers::translations()
+{
+#if 0
+	// Meteor showers
+	// TRANSLATORS: Name of meteor shower
+	N_("Quadrantids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Lyrids");
+	// TRANSLATORS: Name of meteor shower
+	N_("α-Centaurids");
+	// TRANSLATORS: Name of meteor shower
+	N_("γ-Normids");
+	// TRANSLATORS: Name of meteor shower
+	N_("η-Aquariids");
+	// TRANSLATORS: Name of meteor shower
+	N_("June Bootids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Piscis Austrinids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Southern δ-Aquariids");
+	// TRANSLATORS: Name of meteor shower
+	N_("α-Capricornids");
+	// TRANSLATORS: Name of meteor shower
+	N_("α-Aurigids");
+	// TRANSLATORS: Name of meteor shower
+	N_("September ε-Perseids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Draconids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Leonids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Phoenicids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Puppid-Velids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Ursids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Perseids");
+	// TRANSLATORS: Name of meteor shower
+	N_("δ-Leonids");
+	// TRANSLATORS: Name of meteor shower
+	N_("π-Puppids");
+	// TRANSLATORS: Name of meteor shower
+	N_("June Lyrids");
+	// TRANSLATORS: Name of meteor shower
+	N_("κ-Cygnids");
+	// TRANSLATORS: Name of meteor shower
+	N_("ε-Lyrids");
+	// TRANSLATORS: Name of meteor shower
+	N_("δ-Aurigids");
+	// TRANSLATORS: Name of meteor shower
+	N_("ε-Geminids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Southern Taurids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Northern Taurids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Monocerotids");
+	// TRANSLATORS: Name of meteor shower
+	N_("σ-Hydrids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Geminids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Leonis Minorids");
+	// TRANSLATORS: Name of meteor shower
+	N_("December Leonis Minorids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Comae Berenicids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Orionids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Andromedids");
+
+	// List of parent objects for meteor showers
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Minor planet 2003 EH1 and Comet C/1490 Y1");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet 1P/Halley");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet 7P/Pons-Winnecke");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet 55P/Tempel-Tuttle");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet 96P/Machholz");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet 109P/Swift-Tuttle");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet Thatcher (1861 I)");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Minor planet (4450) Pan");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet 26P/Grigg-Skjellerup");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet 21P/Giacobini-Zinner");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet 169P/NEAT");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet 289P/Blanpain");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet 8P/Tuttle");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Minor planet 2008 ED69");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet 2P/Encke");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet 3D/Biela");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Minor planet 2004 TG10");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Minor planet (3200) Phaethon");
+
+	/* For copy/paste:
+	// TRANSLATORS: Name of meteor shower
+	N_("");
+	*/
+
+#endif
+}

=== added file 'plugins/MeteorShowers/src/MeteorShowers.hpp'
--- plugins/MeteorShowers/src/MeteorShowers.hpp	1970-01-01 00:00:00 +0000
+++ plugins/MeteorShowers/src/MeteorShowers.hpp	2014-03-10 17:28:07 +0000
@@ -0,0 +1,412 @@
+/*
+ * Copyright (C) 2013 Marcos Cardinot
+ * Copyright (C) 2011 Alexander Wolf
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
+ */
+
+#ifndef METEORSHOWERS_HPP_
+#define METEORSHOWERS_HPP_
+
+#include "MeteorShower.hpp"
+#include "MeteorStream.hpp"
+#include "StelFader.hpp"
+#include "StelModule.hpp"
+#include "StelObjectModule.hpp"
+#include "StelTextureTypes.hpp"
+
+#include <QColor>
+#include <QDateTime>
+#include <QFont>
+#include <QSharedPointer>
+#include <QVariantMap>
+
+class QNetworkAccessManager;
+class QNetworkReply;
+class QProgressBar;
+class QSettings;
+class QTimer;
+class MeteorShowerDialog;
+class StelButton;
+class StelPainter;
+
+typedef QSharedPointer<MeteorShower> MeteorShowerP;
+
+//! This is an example of a plug-in which can be dynamically loaded into stellarium
+class MeteorShowers : public StelObjectModule
+{
+	Q_OBJECT
+	Q_PROPERTY(bool msVisible READ getFlagShowMS WRITE setFlagShowMS)
+	Q_PROPERTY(bool labelsVisible READ getFlagLabels WRITE setFlagLabels)
+public:
+	//! @enum UpdateState
+	//! Used for keeping track of the download/update status
+	enum UpdateState
+	{
+		Updating,             //!< Update in progress
+		CompleteNoUpdates,    //!< Update completed, there we no updates
+		CompleteUpdates,      //!< Update completed, there were updates
+		DownloadError,        //!< Error during download phase
+		OtherError            //!< Other error
+	};
+
+	MeteorShowers();
+	virtual ~MeteorShowers();
+
+	///////////////////////////////////////////////////////////////////////////
+	// Methods defined in the StelModule class
+	virtual void init();
+	//! called before the plug-in is un-loaded.
+	//! Useful for stopping processes, unloading textures, etc.
+	virtual void deinit();
+	virtual void update(double deltaTime);
+	virtual void draw(StelCore* core);
+	virtual void drawMarker(StelCore* core, StelPainter& painter);
+	virtual void drawPointer(StelCore* core, StelPainter& painter);
+	virtual void drawStream(StelCore* core, StelPainter& painter);
+	virtual double getCallOrder(StelModuleActionName actionName) const;
+
+	///////////////////////////////////////////////////////////////////////////
+	// Methods defined in StelObjectManager class
+	//! Used to get a list of objects which are near to some position.
+	//! @param v a vector representing the position in th sky around which to search for nebulae.
+	//! @param limitFov the field of view around the position v in which to search for satellites.
+	//! @param core the StelCore to use for computations.
+	//! @return an list containing the satellites located inside the limitFov circle around position v.
+	virtual QList<StelObjectP> searchAround(const Vec3d& v, double limitFov, const StelCore* core) const;
+
+	//! Return the matching satellite object's pointer if exists or NULL.
+	//! @param nameI18n The case in-sensistive satellite name
+	virtual StelObjectP searchByNameI18n(const QString& nameI18n) const;
+
+	//! Return the matching satellite if exists or NULL.
+	//! @param name The case in-sensistive standard program name
+	virtual StelObjectP searchByName(const QString& name) const;
+
+	//! Find and return the list of at most maxNbItem objects auto-completing the passed object I18n name.
+	//! @param objPrefix the case insensitive first letters of the searched object
+	//! @param maxNbItem the maximum number of returned object names
+	//! @return a list of matching object name by order of relevance, or an empty list if nothing match
+	virtual QStringList listMatchingObjectsI18n(const QString& objPrefix, int maxNbItem=5, bool useStartOfWords=false) const;
+	virtual QStringList listMatchingObjects(const QString& objPrefix, int maxNbItem=5, bool useStartOfWords=false) const;
+	virtual QStringList listAllObjects(bool inEnglish) const;
+	virtual QString getName() const
+	{
+		return "Meteor Showers";
+	}
+
+	//! get a ms object by identifier
+	MeteorShowerP getByID(const QString& id);
+
+	//! Implment this to tell the main Stellarium GUI that there is a GUI element to configure this
+	//! plugin.
+	virtual bool configureGui(bool show=true);
+
+	//! Set up the plugin with default values.  This means clearing out the MeteorShower section in the
+	//! main config.ini (if one already exists), and populating it with default values.  It also
+	//! creates the default showers.json file from the resource embedded in the plugin lib/dll file.
+	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 whether or not the plugin will try to update TLE data from the internet
+	//! @return true if updates are set to be done, false otherwise
+	bool getUpdatesEnabled(void)
+	{
+		return updatesEnabled;
+	}
+	//! set whether or not the plugin will try to update TLE data from the internet
+	//! @param b if true, updates will be enabled, else they will be disabled
+	void setUpdatesEnabled(bool b)
+	{
+		updatesEnabled=b;
+	}
+
+	//! get the date and time the TLE elements were updated
+	QDateTime getLastUpdate(void)
+	{
+		return lastUpdate;
+	}
+
+	//! get the update frequency in hours
+	int getUpdateFrequencyHours(void)
+	{
+		return updateFrequencyHours;
+	}
+	void setUpdateFrequencyHours(int hours)
+	{
+		updateFrequencyHours = hours;
+	}
+
+	//! get the number of seconds till the next update
+	int getSecondsToUpdate(void);
+
+	//! Get the current updateState
+	UpdateState getUpdateState(void)
+	{
+		return updateState;
+	}
+
+	//! Get current color of active radiant based  in generic data
+	QColor getColorARG()
+	{
+		return colorARG;
+	}
+	void setColorARG(QColor color)
+	{
+		colorARG = color;
+	}
+
+	//! Get current color of active radiant based  in real data
+	QColor getColorARR()
+	{
+		return colorARR;
+	}
+	void setColorARR(QColor color)
+	{
+		colorARR = color;
+	}
+
+	//! Get current inactive radiant color
+	QColor getColorIR()
+	{
+		return colorIR;
+	}
+	void setColorIR(QColor color)
+	{
+		colorIR = color;
+	}
+
+	//! get the label font size.
+	//! @return the pixel size of the font
+	int getLabelFontSize()
+	{
+		return labelFont.pixelSize();
+	}
+
+	//! Get status of labels
+	//! @return false: hidden
+	bool getFlagLabels();
+
+	//! Get current sky date.
+	//! @return current sky date
+	QDateTime getSkyDate()
+	{
+		return skyDate;
+	}
+
+	//! Find all meteor_shower events in a given date interval
+	//! @param dateFrom
+	//! @param dateTo
+	//! @return meteor_shower list
+	QList<MeteorShowerP> searchEvents(QDate dateFrom, QDate dateTo) const;
+
+signals:
+	//! @param state the new update state.
+	void updateStateChanged(MeteorShowers::UpdateState state);
+
+	//! emitted after a JSON update has run.
+	void jsonUpdateComplete(void);
+
+public slots:
+	//! Download JSON from web recources described in the module section of the
+	//! module.ini file and update the local JSON file.
+	void updateJSON(void);
+
+	void setFlagShowMS(bool b);
+	bool getFlagShowMS(void)
+	{
+		return flagShowMS;
+	}
+
+	//! Display a message. This is used for plugin-specific warnings and such
+	void displayMessage(const QString& message, const QString hexColor="#999999");
+	void messageTimeout(void);
+
+	//! Define whether the button toggling meteor showers should be visible
+	void setFlagShowMSButton(bool b);
+	bool getFlagShowMSButton(void) { return flagShowMSButton; }
+
+	//! set the label font size.
+	//! @param size the pixel size of the font
+	void setLabelFontSize(int size);
+
+	//! Set whether text labels should be displayed next to radiant.
+	//! @param false: hidden
+	void setFlagLabels(bool b);
+
+	bool getFlagActiveRadiant(void) { return flagShowAR; }
+	void setFlagActiveRadiant(bool b) { flagShowAR=b; }
+
+	bool getEnableAtStartup(void) {return enableAtStartup;}
+	void setEnableAtStartup(bool b)	{enableAtStartup=b;}
+
+	bool getFlagRadiant(void) const { return MeteorShower::radiantMarkerEnabled; }
+	void setFlagRadiant(bool b) { MeteorShower::radiantMarkerEnabled=b; }
+
+private:
+	// Upgrade config.ini: rename old key settings to new
+	void upgradeConfigIni(void);
+
+	//! Check if the sky date was changed
+	//! @param core
+	//! @return if changed, return true
+	bool changedSkyDate(StelCore* core);
+
+	//! Calculate value of ZHR using normal distribution
+	//! @param zhr
+	//! @param variable
+	//! @param start
+	//! @param finish
+	//! @param peak
+	int calculateZHR(int zhr, QString variable, QDateTime start, QDateTime finish, QDateTime peak);
+
+	//! Update the list with information about active meteors
+	//! @param core
+	void updateActiveInfo(void);
+
+	//! Set up the plugin with default values.
+	void restoreDefaultConfigIni(void);
+
+	//! replace the json file with the default from the compiled-in resource
+	void restoreDefaultJsonFile(void);
+
+	//! read the json file and create the meteor Showers.
+	void readJsonFile(void);
+
+	//! Creates a backup of the showers.json file called showers.json.old
+	//! @param deleteOriginal if true, the original file is removed, else not
+	//! @return true on OK, false on failure
+	bool backupJsonFile(bool deleteOriginal=false);
+
+	//! Get the version from the "version of format" value in the showers.json file
+	//! @return version, e.g. "1"
+	int getJsonFileFormatVersion(void);
+	
+	//! Check format of the catalog of meteor showers
+	//! @return valid boolean, e.g. "true"
+	bool checkJsonFileFormat(void);
+
+	//! Parse JSON file and load showers to map
+	QVariantMap loadShowersMap(QString path=QString());
+
+	//! Set items for list of struct from data map
+	void setShowersMap(const QVariantMap& map);
+
+	//! A fake method for strings marked for translation.
+	//! Use it instead of translations.h for N_() strings, except perhaps for
+	//! keyboard action descriptions. (It's better for them to be in a single
+	//! place.)
+	static void translations();
+
+	//! Font used for displaying our text
+	QFont labelFont;
+
+	QString showersJsonPath;
+
+	StelTextureSP texPointer;
+	QList<MeteorShowerP> mShowers;
+
+	// GUI
+	MeteorShowerDialog* configDialog;
+	bool flagShowMS;
+	bool flagShowMSButton;	
+	QPixmap* OnIcon;
+	QPixmap* OffIcon;
+	QPixmap* GlowIcon;
+	StelButton* toolbarButton;
+	QColor colorARR;			//color of active radiant based on real data
+	QColor colorARG;			//color of active radiant based on generic data
+	QColor colorIR;			//color of inactive radiant
+
+	// variables and functions for the updater
+	UpdateState updateState;
+	QNetworkAccessManager* downloadMgr;
+	QString updateUrl;
+	QString updateFile;
+	class StelProgressController* progressBar;
+	QTimer* updateTimer;
+	QTimer* messageTimer;
+	QList<int> messageIDs;
+	bool updatesEnabled;
+	QDateTime lastUpdate;
+	int updateFrequencyHours;
+	bool enableAtStartup;
+
+	QSettings* conf;
+
+	//MS
+	std::vector<std::vector<MeteorStream*> > active;		// Matrix containing all active meteors
+	int ZHR;
+	const static double zhrToWsr = 1.6667f/3600.f;  // factor to convert from zhr to whole earth per second rate
+
+	bool flagShowAR;   //! Show marker of active radiant
+
+	bool flagShow;
+	bool flagShowARG;  //! Show marker of active radiant based on generic data
+	bool flagShowARR;  //! Show marker of active radiant based on generic data
+	bool flagShowIR;   //! Show marker of inactive radiant
+
+	bool flagShowStreamARG;  //! Show meteor stream of active radiant based on generic data
+	bool flagShowStreamARR;  //! Show meteor stream of active radiant based on generic data
+
+	typedef struct
+	{
+		QString showerID;	//! The ID of the meteor shower
+		QDateTime start;	//! First day for activity
+		QDateTime finish;	//! Latest day for activity
+		QDateTime peak;		//! Day with maximum for activity
+		int status;		//! 0:inactive 1:activeRealData 2:activeGenericData
+		int zhr;		//! ZHR of shower
+		QString variable;	//! value of variable for ZHR
+		int speed;		//! Speed of meteors
+		double radiantAlpha;    //! R.A. for radiant of meteor shower
+		double radiantDelta;    //! Dec. for radiant of meteor shower
+	} activeData;
+
+	QList<activeData> activeInfo;	//! List of active meteors
+	QDateTime skyDate;              //! Current sky date
+	QDateTime lastSkyDate;          //! Last sky date
+
+private slots:
+	//! check to see if an update is required.  This is called periodically by a timer
+	//! if the last update was longer than updateFrequencyHours ago then the update is
+	//! done.
+	void checkForUpdate(void);
+	void updateDownloadComplete(QNetworkReply* reply);
+};
+
+
+//#include "fixx11h.h"
+#include <QObject>
+#include "StelPluginInterface.hpp"
+
+//! This class is used by Qt to manage a plug-in interface
+class MeteorShowersStelPluginInterface : 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 /*METEORSHOWERS_HPP_*/

=== added file 'plugins/MeteorShowers/src/MeteorStream.cpp'
--- plugins/MeteorShowers/src/MeteorStream.cpp	1970-01-01 00:00:00 +0000
+++ plugins/MeteorShowers/src/MeteorStream.cpp	2014-03-10 17:28:07 +0000
@@ -0,0 +1,239 @@
+/*
+ * Copyright (C) 2013 Marcos Cardinot
+ *
+ * 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 <cstdlib>
+#include "MeteorShowers.hpp"
+#include "MeteorStream.hpp"
+#include "StelCore.hpp"
+#include "StelUtils.hpp"
+
+#include "StelToneReproducer.hpp"
+#include "StelMovementMgr.hpp"
+#include "StelPainter.hpp"
+
+MeteorStream::MeteorStream(const StelCore* core, double velocity, double radiantAlpha, double radiantDelta)
+{
+	speed = velocity;
+
+	maxMag = 1; //start with the maximum mag
+
+	//the meteor starts dead, after we'll calculate the position
+	//if the position is within the bounds, this parameter will be changed to TRUE
+	alive = false;
+
+	double high_range = EARTH_RADIUS+HIGH_ALTITUDE;
+	double low_range = EARTH_RADIUS+LOW_ALTITUDE;
+
+	// view matrix of meteor model
+	viewMatrix = Mat4d::zrotation(radiantAlpha) * Mat4d::yrotation(M_PI_2 - radiantDelta);
+
+	// find observer position in meteor coordinate system
+	obs = core->altAzToJ2000(Vec3d(0,0,EARTH_RADIUS));
+	obs.transfo4d(viewMatrix.transpose());
+
+	// select random trajectory using polar coordinates in XY plane, centered on observer
+	xydistance = (double)rand() / ((double)RAND_MAX+1)*(VISIBLE_RADIUS);
+	double angle = (double)rand() / ((double)RAND_MAX+1)*2*M_PI;
+
+	// set meteor start x,y
+	position[0] = posInternal[0] = posTrain[0] = xydistance*cos(angle) + obs[0];
+	position[1] = posInternal[1] = posTrain[1] = xydistance*sin(angle) + obs[1];
+
+	// D is distance from center of earth
+	double D = sqrt(position[0]*position[0] + position[1]*position[1]);
+
+	if(D > high_range)     // won't be visible, meteor still dead
+	{
+		return;
+	}
+
+	posTrain[2] = position[2] = startH = sqrt(high_range*high_range - D*D);
+
+	// determine end of burn point, and nearest point to observer for distance mag calculation
+	// mag should be max at nearest point still burning
+	endH = -startH;  // earth grazing
+	minDist = xydistance;
+	if(D <= low_range)
+	{
+		endH = sqrt(low_range*low_range - D*D);
+		minDist = sqrt(xydistance*xydistance + pow(endH - obs[2], 2));
+	}
+
+	if(minDist > VISIBLE_RADIUS)
+	{
+		// on average, not visible (although if were zoomed ...)
+		return; //meteor still dead
+	}
+
+	//If everything is ok until here,
+	alive = true;  //the meteor is alive
+	train = false; //and initially it is only a point
+
+	// Determine drawing color given magnitude and eye
+	// (won't be visible during daylight)
+
+	// *** color varies somewhat based on speed, plus atmosphere reddening
+
+	// determine intensity
+	float Mag1 = (double)rand()/((double)RAND_MAX+1)*6.75f - 3;
+	float Mag2 = (double)rand()/((double)RAND_MAX+1)*6.75f - 3;
+	float Mag = (Mag1 + Mag2)/2.0f;
+
+	mag = (5. + Mag) / 256.0;
+	if(mag>250) mag = mag - 256;
+
+	float term1 = std::exp(-0.92103f*(mag + 12.12331f)) * 108064.73f;
+
+	float cmag=1.f;
+	float rmag;
+
+	// Compute the equivalent star luminance for a 5 arc min circle and convert it
+	// in function of the eye adaptation
+	const StelToneReproducer* eye = core->getToneReproducer();
+	rmag = eye->adaptLuminanceScaled(term1);
+	rmag = rmag/powf(core->getMovementMgr()->getCurrentFov(),0.85f)*500.f;
+
+	// if size of star is too small (blink) we put its size to 1.2 --> no more blink
+	// And we compensate the difference of brighteness with cmag
+	if(rmag<1.2f)
+	{
+		cmag=rmag*rmag/1.44f;
+	}
+
+	mag = cmag;  // assumes white
+
+	// most visible meteors are under about 180km distant
+	// scale max mag down if outside this range
+	float scale = 1;
+	if(minDist!=0) scale = 180*180/(minDist*minDist);
+	if(scale < 1) mag *= scale;
+}
+
+MeteorStream::~MeteorStream()
+{
+}
+
+// returns true if alive
+bool MeteorStream::update(double deltaTime)
+{
+	if(!alive)
+		return(0);
+
+	if(position[2] < endH)
+	{
+		// burning has stopped so magnitude fades out
+		// assume linear fade out
+
+		mag -= maxMag * deltaTime/500.0f;
+		if(mag < 0)
+			alive=0;    // no longer visible
+
+	}
+
+	// *** would need time direction multiplier to allow reverse time replay
+	position[2] = position[2] - speed*deltaTime/1000.0f;
+
+	// train doesn't extend beyond start of burn
+	if(position[2] + speed*0.5f > startH)
+	{
+		posTrain[2] = startH ;
+	}
+	else
+	{
+		posTrain[2] -= speed*deltaTime/1000.0f;
+	}
+
+	// determine visual magnitude based on distance to observer
+	double dist = sqrt(xydistance*xydistance + pow(position[2]-obs[2], 2));
+
+	if(dist == 0) dist = .01;    // just to be cautious (meteor hits observer!)
+
+	distMultiplier = minDist*minDist / (dist*dist);
+
+	return(alive);
+}
+
+
+// returns true if visible
+// Assumes that we are in local frame
+void MeteorStream::draw(const StelCore* core, StelPainter& sPainter)
+{
+	if(!alive)
+		return;
+
+	const StelProjectorP proj = sPainter.getProjector();
+
+	Vec3d spos = position;
+	Vec3d epos = posTrain;
+
+	// convert to equ
+	spos.transfo4d(viewMatrix);
+	epos.transfo4d(viewMatrix);
+
+	// convert to local and correct for earth radius
+	//[since equ and local coordinates in stellarium use same 0 point!]
+	spos = core->j2000ToAltAz(spos);
+	epos = core->j2000ToAltAz(epos);
+	spos[2] -= EARTH_RADIUS;
+	epos[2] -= EARTH_RADIUS;
+	// 1216 is to scale down under 1 for desktop version
+	spos/=1216;
+	epos/=1216;
+
+	if(train)
+	{
+		// connect this point with last drawn point
+		double tmag = mag*distMultiplier;
+
+		// compute an intermediate point so can curve slightly along projection distortions
+		Vec3d posi = posInternal;
+		posi[2] = position[2] + (posTrain[2] - position[2])/2;
+		posi.transfo4d(viewMatrix);
+		posi = core->j2000ToAltAz(posi);
+		posi[2] -= EARTH_RADIUS;
+		posi/=1216;
+
+		// draw dark to light
+		Vec4f colorArray[3];
+		colorArray[0].set(0,0,0,0);
+		colorArray[1].set(1,1,1,tmag*0.5);
+		colorArray[2].set(1,1,1,tmag);
+		Vec3d vertexArray[3];
+		vertexArray[0]=epos;
+		vertexArray[1]=posi;
+		vertexArray[2]=spos;
+		sPainter.setColorPointer(4, GL_FLOAT, colorArray);
+		sPainter.setVertexPointer(3, GL_DOUBLE, vertexArray);
+		sPainter.enableClientStates(true, false, true);
+		sPainter.drawFromArray(StelPainter::LineStrip, 3, 0, true);
+		sPainter.enableClientStates(false);
+	}
+	else
+	{
+		Vec3d start;
+		proj->project(spos, start);
+		sPainter.drawPoint2d(start[0],start[1]);
+	}
+
+	train = 1;
+}
+
+bool MeteorStream::isAlive(void)
+{
+	return(alive);
+}

=== added file 'plugins/MeteorShowers/src/MeteorStream.hpp'
--- plugins/MeteorShowers/src/MeteorStream.hpp	1970-01-01 00:00:00 +0000
+++ plugins/MeteorShowers/src/MeteorStream.hpp	2014-03-10 17:28:07 +0000
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2013 Marcos Cardinot
+ *
+ * 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 _METEORSTREAM_HPP_
+#define _METEORSTREAM_HPP_
+
+#include "VecMath.hpp"
+class StelCore;
+class StelPainter;
+
+// all in km - altitudes make up meteor range
+#define EARTH_RADIUS 6369.f
+#define VISIBLE_RADIUS 457.8f
+#define HIGH_ALTITUDE 115.f
+#define LOW_ALTITUDE 70.f
+
+//! @class MeteorStream
+//! Models a single meteor.
+//! Control of the meteor rate is performed in the MeteorShowers class.  Once
+//! created, a meteor object only lasts for some amount of time, and then
+//! "dies", after which, the update() member returns false.  The live/dead
+//! status of a meteor may also be determined using the isAlive member.
+class MeteorStream
+{
+public:
+	//! Create a Meteor object.
+	//! @param velocity the speed of the meteor in km/s.
+	//! @param rAlpha the radiant alpha in rad
+	//! @param rDelta the radiant delta in rad
+	MeteorStream(const StelCore*, double velocity, double radiantAlpha, double radiantDelta);
+	virtual ~MeteorStream();
+
+	//! Updates the position of the meteor, and expires it if necessary.
+	//! @return true of the meteor is still alive, else false.
+	bool update(double deltaTime);
+
+	//! Draws the meteor.
+	void draw(const StelCore* core, StelPainter& sPainter);
+
+	//! Determine if a meteor is alive or has burned out.
+	//! @return true if alive, else false.
+	bool isAlive(void);
+
+private:
+	bool alive;             //! Indicate if the meteor it still visible
+	bool train;             //! Indicate if the point or train is visible
+
+	Mat4d viewMatrix;       //! View Matrix
+	Vec3d obs;              //! Observer position
+	Vec3d position;         //! Equatorial coordinate position
+	Vec3d posInternal;      //! Middle of train
+	Vec3d posTrain;         //! End of train
+
+	double speed;           //! Velocity of meteor in km/s
+	double xydistance;      //! Distance in XY plane (orthogonal to meteor path) from observer to meteor
+	double initDist;        //! Initial distance from observer
+	double minDist;         //! Nearest point to observer along path
+	double distMultiplier;  //! Scale magnitude due to changes in distance
+
+	double startH;          //! Start height above center of earth
+	double endH;            //! End height
+
+	float mag;              //! Apparent magnitude at head, 0-1
+	float maxMag;           //! 0-1
+	float absMag;           //! Absolute magnitude
+	float visMag;           //! Visual magnitude at observer
+};
+
+#endif // _METEORSTREAM_HPP_

=== added directory 'plugins/MeteorShowers/src/gui'
=== added file 'plugins/MeteorShowers/src/gui/MeteorShowerDialog.cpp'
--- plugins/MeteorShowers/src/gui/MeteorShowerDialog.cpp	1970-01-01 00:00:00 +0000
+++ plugins/MeteorShowers/src/gui/MeteorShowerDialog.cpp	2014-03-10 17:28:07 +0000
@@ -0,0 +1,389 @@
+/*
+ * Stellarium Meteor Shower plugin config dialog
+ *
+ * Copyright (C) 2013 Marcos Cardinot
+ * Copyright (C) 2011 Alexander Wolf
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
+*/
+
+#include <QColorDialog>
+#include <QDateTime>
+#include <QDebug>
+#include <QFileDialog>
+#include <QGraphicsColorizeEffect>
+#include <QMessageBox>
+#include <QTimer>
+#include <QUrl>
+
+#include "MeteorShowerDialog.hpp"
+#include "MeteorShowers.hpp"
+#include "StelApp.hpp"
+#include "StelCore.hpp"
+#include "StelFileMgr.hpp"
+#include "StelGui.hpp"
+#include "StelMainView.hpp"
+#include "StelModuleMgr.hpp"
+#include "StelMovementMgr.hpp"
+#include "StelObjectMgr.hpp"
+#include "StelStyle.hpp"
+#include "StelTranslator.hpp"
+#include "StelUtils.hpp"
+#include "ui_meteorShowerDialog.h"
+
+MeteorShowerDialog::MeteorShowerDialog() : updateTimer(NULL)
+{
+    ui = new Ui_meteorShowerDialog;
+}
+
+MeteorShowerDialog::~MeteorShowerDialog()
+{
+	if (updateTimer)
+	{
+		updateTimer->stop();
+		delete updateTimer;
+		updateTimer = NULL;
+	}
+	delete ui;
+}
+
+void MeteorShowerDialog::retranslate()
+{
+	if (dialog)
+	{
+		ui->retranslateUi(dialog);
+		refreshUpdateValues();
+		setAboutHtml();
+		setHeaderNames();
+
+		//Retranslate name and datatype strings
+		QTreeWidgetItemIterator it(treeWidget);
+		while (*it) {
+			//Name
+			(*it)->setText(ColumnName, q_((*it)->text(ColumnName)));
+			//Data type
+			(*it)->setText(ColumnDataType, q_((*it)->text(ColumnDataType)));
+			++it;
+		}
+	}
+}
+
+// Initialize the dialog widgets and connect the signals/slots
+void MeteorShowerDialog::createDialogContent()
+{
+	ui->setupUi(dialog);
+	ui->tabs->setCurrentIndex(0);
+	connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate()));
+	plugin = GETSTELMODULE(MeteorShowers);
+
+	// Settings tab / updates group	
+	connect(ui->internetUpdates, SIGNAL(clicked(bool)), this, SLOT(setUpdatesEnabled(bool)));
+	connect(ui->updateButton, SIGNAL(clicked()), this, SLOT(updateJSON()));
+	connect(plugin, SIGNAL(updateStateChanged(MeteorShowers::UpdateState)), this, SLOT(updateStateReceiver(MeteorShowers::UpdateState)));
+	connect(plugin, SIGNAL(jsonUpdateComplete(void)), this, SLOT(updateCompleteReceiver(void)));
+	connect(ui->updateFrequencySpinBox, SIGNAL(valueChanged(int)), this, SLOT(setUpdateValues(int)));
+	refreshUpdateValues(); // fetch values for last updated and so on
+
+	updateTimer = new QTimer(this);
+	connect(updateTimer, SIGNAL(timeout()), this, SLOT(refreshUpdateValues()));
+	updateTimer->start(7000);
+
+	// Settings tab / event group
+	connect(ui->searchButton, SIGNAL(clicked()), this, SLOT(checkDates()));
+	refreshRangeDates();
+
+	treeWidget = ui->listEvents;
+	initListEvents();
+	connect(treeWidget, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(selectEvent(QModelIndex)));
+
+	// Settings tab / radiant group
+	ui->displayRadiant->setChecked(plugin->getFlagRadiant());
+	connect(ui->displayRadiant, SIGNAL(clicked(bool)), plugin, SLOT(setFlagRadiant(bool)));
+	ui->activeRadiantsOnly->setChecked(plugin->getFlagActiveRadiant());
+	connect(ui->activeRadiantsOnly, SIGNAL(clicked(bool)), plugin, SLOT(setFlagActiveRadiant(bool)));
+	ui->radiantLabels->setChecked(plugin->getFlagLabels());
+	connect(ui->radiantLabels, SIGNAL(clicked(bool)), plugin, SLOT(setFlagLabels(bool)));
+	ui->fontSizeSpinBox->setValue(plugin->getLabelFontSize());
+	connect(ui->fontSizeSpinBox, SIGNAL(valueChanged(int)), plugin, SLOT(setLabelFontSize(int)));
+
+	// Settings tab / meteor showers group
+	ui->displayMeteorShower->setChecked(plugin->getEnableAtStartup());
+	connect(ui->displayMeteorShower, SIGNAL(clicked(bool)), plugin, SLOT(setEnableAtStartup(bool)));
+	ui->displayShowMeteorShowerButton->setChecked(plugin->getFlagShowMSButton());
+	connect(ui->displayShowMeteorShowerButton, SIGNAL(clicked(bool)), plugin, SLOT(setFlagShowMSButton(bool)));
+
+	// /////////////////////////////////////////
+
+	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
+
+	connect(ui->restoreDefaultsButton, SIGNAL(clicked()), this, SLOT(restoreDefaults()));
+	connect(ui->saveSettingsButton, SIGNAL(clicked()), this, SLOT(saveSettings()));
+
+	// Markers tab
+	refreshColorMarkers();
+	connect(ui->changeColorARG, SIGNAL(clicked()), this, SLOT(setColorARG()));
+	connect(ui->changeColorARR, SIGNAL(clicked()), this, SLOT(setColorARR()));
+	connect(ui->changeColorIR, SIGNAL(clicked()), this, SLOT(setColorIR()));
+
+	// About tab
+	setAboutHtml();
+	StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
+	Q_ASSERT(gui);
+	ui->aboutTextBrowser->document()->setDefaultStyleSheet(QString(gui->getStelStyle().htmlStyleSheet));
+
+	updateGuiFromSettings();
+}
+
+void MeteorShowerDialog::initListEvents(void)
+{
+	treeWidget->clear();
+	treeWidget->setColumnCount(ColumnCount);
+	setHeaderNames();
+	treeWidget->header()->setSectionsMovable(false);
+	treeWidget->header()->setStretchLastSection(true);
+}
+
+void MeteorShowerDialog::setHeaderNames(void)
+{
+	QStringList headerStrings;
+	headerStrings << q_("Name");
+	headerStrings << q_("ZHR");
+	headerStrings << q_("Data Type");
+	headerStrings << q_("Peak");
+	treeWidget->setHeaderLabels(headerStrings);
+}
+
+void MeteorShowerDialog::checkDates(void)
+{
+	double jdFrom = StelUtils::qDateTimeToJd((QDateTime) ui->dateFrom->date());
+	double jdTo = StelUtils::qDateTimeToJd((QDateTime) ui->dateTo->date());
+
+	if(jdFrom > jdTo)
+		QMessageBox::warning(0, "Stellarium", q_("Start date greater than end date!"));
+	else if (jdTo-jdFrom > 365)
+		QMessageBox::warning(0, "Stellarium", q_("Time interval must be less than one year!"));
+	else
+		searchEvents();
+}
+
+void MeteorShowerDialog::searchEvents(void)
+{
+	QList<MeteorShowerP> searchResult = plugin->searchEvents(ui->dateFrom->date(), ui->dateTo->date());
+
+	//Fill list of events
+	initListEvents();
+	foreach(const MeteorShowerP& r, searchResult)
+	{
+		TreeWidgetItem *treeItem = new TreeWidgetItem(treeWidget);
+		//Name
+		treeItem->setText(ColumnName, r->getNameI18n());
+		//ZHR
+		QString zhr = r->getZHR()==-1?q_("Variable"):QString::number(r->getZHR());
+		treeItem->setText(ColumnZHR, zhr);
+		//Data Type
+		QString dataType = r->getStatus()==1?q_("Real"):q_("Generic");
+		treeItem->setText(ColumnDataType, dataType);
+		//Peak
+		QString peak = r->getPeak().toString("dd/MMM/yyyy");
+		treeItem->setText(ColumnPeak, peak);
+	}
+}
+
+void MeteorShowerDialog::selectEvent(const QModelIndex &modelIndex)
+{
+	StelCore *core = StelApp::getInstance().getCore();
+
+	//Change date
+	QString dateString = treeWidget->currentItem()->text(ColumnPeak);
+	QDateTime qDateTime = QDateTime::fromString(dateString, "dd/MMM/yyyy");
+	core->setJDay(StelUtils::qDateTimeToJd(qDateTime));
+
+	//Select object
+	QString namel18n = treeWidget->currentItem()->text(ColumnName);
+	StelObjectMgr* objectMgr = GETSTELMODULE(StelObjectMgr);
+	if((objectMgr->findAndSelectI18n(namel18n) || objectMgr->findAndSelect(namel18n)) && plugin->getFlagShowMS())
+	{
+		//Move to object
+		StelMovementMgr* mvmgr = GETSTELMODULE(StelMovementMgr);
+		mvmgr->moveToObject(objectMgr->getSelectedObject()[0], mvmgr->getAutoMoveDuration());
+		mvmgr->setFlagTracking(true);
+	}
+}
+
+void MeteorShowerDialog::refreshRangeDates(void)
+{
+	int year = plugin->getSkyDate().toString("yyyy").toInt();
+	ui->dateFrom->setDate(QDate(year, 1, 1)); // first date in the range - first day of the year
+	ui->dateTo->setDate(QDate(year, 12, 31)); // second date in the range - last day of the year
+}
+
+void MeteorShowerDialog::setAboutHtml(void)
+{
+	QString html = "<html><head></head><body>";
+	html += "<h2>" + q_("Meteor Showers Plugin") + "</h2><table width=\"90%\">";
+	html += "<tr width=\"30%\"><td>" + q_("Version:") + "</td><td>" + METEORSHOWERS_PLUGIN_VERSION + "</td></tr>";
+	html += "<tr><td>" + q_("Author:") + "</td><td>Marcos Cardinot &lt;[e-mail]&gt;</td></tr></table>";
+
+	html += "<p>" + q_("The Meteor Showers plugin give visualization of the meteor showers, show information about meteor showers and displays marker for radiants in activity range for each meteor showers.") + "</p>";
+	html += "<h3>" + q_("Terms") + "</h3>";
+	html += "<p><b>" + q_("Meteor shower") + "</b>";
+	html += "<br />" + q_("A meteor shower is a celestial event in which a number of meteors are observed to radiate, or originate, from one point in the night sky. These meteors are caused by streams of cosmic debris called meteoroids entering Earth's atmosphere at extremely high speeds on parallel trajectories. Most meteors are smaller than a grain of sand, so almost all of them disintegrate and never hit the Earth's surface. Intense or unusual meteor showers are known as meteor outbursts and meteor storms, which may produce greater than 1,000 meteors an hour.") + "</p>";
+	html += "<p><b>" + q_("Radiant") + "</b>";
+	html += "<br />" + q_("The radiant or apparent radiant of a meteor shower is the point in the sky, from which (to a planetary observer) meteors appear to originate. The Perseids, for example, are meteors which appear to come from a point within the constellation of Perseus.") + "</p>";
+	html += "<p>" + q_("An observer might see such a meteor anywhere in the sky but the direction of motion, when traced back, will point to the radiant. A meteor that does not point back to the known radiant for a given shower is known as a sporadic and is not considered part of that shower.") + "</p>";
+	html += "<p>" + q_("Many showers have a radiant point that changes position during the interval when it appears. For example, the radiant point for the Delta Aurigids drifts by more than a degree per night.") + "</p>";
+	html += "<p><b>" + q_("Zenithal Hourly Rate (ZHR)") + "</b>";
+	html += "<br />" + q_("In astronomy, the Zenithal Hourly Rate (ZHR) of a meteor shower is the number of meteors a single observer would see in one hour under a clear, dark sky (limiting apparent magnitude of 6.5) if the radiant of the shower were at the zenith. The rate that can effectively be seen is nearly always lower and decreases the closer the radiant is to the horizon.") + "</p>";
+	html += "<p><b>" + q_("Population index") + "</b>";
+	html += "<br />" + q_("The population index indicates the magnitude distribution of the meteor showers. The values below 2.5 correspond to distributions where bright meteors are more frequent than average, while values above 3.0 mean that the share of faint meteors is larger than usual.") + "</p>";
+	html += "<h3>" + q_("Notes") + "</h3>";
+	html += "<p>" + q_("This plugin was created as project of ESA Summer of Code in Space 2013.") + "</p>";
+	html += "<h3>" + q_("Info") + "</h3>";
+	html += "<p>" + q_("Info about meteor showers you can get here:") + "</p>";
+	html += "<ul>";
+	html += "<li>" + QString(q_("%1Meteor shower%2 - article in Wikipedia").arg("<a href=\"https://en.wikipedia.org/wiki/Meteor_Showers\">")).arg("</a>") + "</li>";
+	html += "<li>" + QString(q_("%1International Meteor Organization%2").arg("<a href=\"http://www.imo.net/\">")).arg("</a>") + "</li>";
+	html += "</ul>";
+	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("Meteor Showers Plugin") + "</p>";
+	html += "<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 the plugin, its history and format of the catalog you can %1get info here%2.").arg("<a href=\"http://stellarium.org/wiki/index.php/Meteor_Showers_plugin\">").arg("</a>") + "</li>";
+	html += "</ul></body></html>";
+
+	ui->aboutTextBrowser->setHtml(html);
+}
+
+void MeteorShowerDialog::refreshUpdateValues(void)
+{
+	ui->lastUpdateDateTimeEdit->setDateTime(plugin->getLastUpdate());
+	ui->updateFrequencySpinBox->setValue(plugin->getUpdateFrequencyHours());
+	int secondsToUpdate = plugin->getSecondsToUpdate();
+	if (!plugin->getUpdatesEnabled())
+		ui->nextUpdateLabel->setText(q_("Internet updates disabled"));
+	else if (plugin->getUpdateState() == MeteorShowers::Updating)
+		ui->nextUpdateLabel->setText(q_("Updating now..."));
+	else if (secondsToUpdate <= 60)
+		ui->nextUpdateLabel->setText(q_("Next update: < 1 minute"));
+	else if (secondsToUpdate < 3600)
+		ui->nextUpdateLabel->setText(QString(q_("Next update: %1 minutes")).arg((secondsToUpdate/60)+1));
+	else
+		ui->nextUpdateLabel->setText(QString(q_("Next update: %1 hours")).arg((secondsToUpdate/3600)+1));
+}
+
+void MeteorShowerDialog::setUpdateValues(int hours)
+{
+	plugin->setUpdateFrequencyHours(hours);
+	refreshUpdateValues();
+}
+
+void MeteorShowerDialog::setUpdatesEnabled(bool checkState)
+{
+	plugin->setUpdatesEnabled(checkState);
+	ui->updateFrequencySpinBox->setEnabled(checkState);
+	ui->updateButton->setText(q_("Update now"));
+	refreshUpdateValues();
+}
+
+
+void MeteorShowerDialog::updateStateReceiver(MeteorShowers::UpdateState state)
+{
+	//qDebug() << "MeteorShowerDialog::updateStateReceiver got a signal";
+	if (state==MeteorShowers::Updating)
+		ui->nextUpdateLabel->setText(q_("Updating now..."));
+	else if (state==MeteorShowers::DownloadError || state==MeteorShowers::OtherError)
+	{
+		ui->nextUpdateLabel->setText(q_("Update error"));
+		updateTimer->start();  // make sure message is displayed for a while...
+	}
+}
+
+void MeteorShowerDialog::updateCompleteReceiver(void)
+{
+        ui->nextUpdateLabel->setText(QString(q_("Meteor showers is updated")));
+	// display the status for another full interval before refreshing status
+	updateTimer->start();
+	ui->lastUpdateDateTimeEdit->setDateTime(GETSTELMODULE(MeteorShowers)->getLastUpdate());
+	QTimer *timer = new QTimer(this);
+	connect(timer, SIGNAL(timeout()), this, SLOT(refreshUpdateValues()));
+}
+
+void MeteorShowerDialog::restoreDefaults(void)
+{
+	qDebug() << "MeteorShowers::restoreDefaults";
+	plugin->restoreDefaults();
+	plugin->readSettingsFromConfig();
+	updateGuiFromSettings();
+}
+
+void MeteorShowerDialog::updateGuiFromSettings(void)
+{	
+	refreshUpdateValues();
+	refreshColorMarkers();
+}
+
+void MeteorShowerDialog::saveSettings(void)
+{
+	plugin->saveSettingsToConfig();
+}
+
+void MeteorShowerDialog::updateJSON(void)
+{
+	if(plugin->getUpdatesEnabled())
+	{
+		plugin->updateJSON();
+	}
+}
+
+void MeteorShowerDialog::refreshColorMarkers(void)
+{
+	setTextureColor(ui->textureARG, plugin->getColorARG());
+	setTextureColor(ui->textureARR, plugin->getColorARR());
+	setTextureColor(ui->textureIR, plugin->getColorIR());
+}
+
+void MeteorShowerDialog::setTextureColor(QLabel *texture, QColor color)
+{
+	QGraphicsColorizeEffect *e = new QGraphicsColorizeEffect(texture);
+	e->setColor(color);
+	texture->setGraphicsEffect(e);
+}
+
+void MeteorShowerDialog::setColorARG()
+{
+	QColor color = QColorDialog::getColor();
+	setTextureColor(ui->textureARG, color);
+	plugin->setColorARG(color);
+}
+
+void MeteorShowerDialog::setColorARR()
+{
+	QColor color = QColorDialog::getColor();
+	setTextureColor(ui->textureARR, color);
+	plugin->setColorARR(color);
+}
+
+void MeteorShowerDialog::setColorIR()
+{
+	QColor color = QColorDialog::getColor();
+	setTextureColor(ui->textureIR, color);
+	plugin->setColorIR(color);
+}

=== added file 'plugins/MeteorShowers/src/gui/MeteorShowerDialog.hpp'
--- plugins/MeteorShowers/src/gui/MeteorShowerDialog.hpp	1970-01-01 00:00:00 +0000
+++ plugins/MeteorShowers/src/gui/MeteorShowerDialog.hpp	2014-03-10 17:28:07 +0000
@@ -0,0 +1,111 @@
+/*
+ * Stellarium Meteor Shower Plug-in GUI
+ * 
+ * Copyright (C) 2013 Marcos Cardinot
+ * Copyright (C) 2011 Alexander Wolf
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
+*/
+ 
+#ifndef _METEORSHOWERDIALOG_HPP_
+#define _METEORSHOWERDIALOG_HPP_
+
+#include <QColor>
+#include <QLabel>
+#include <QObject>
+#include <QTreeWidget>
+
+#include "MeteorShowers.hpp"
+#include "StelDialog.hpp"
+
+class MeteorShowers;
+class QTimer;
+class Ui_meteorShowerDialog;
+
+class MeteorShowerDialog : public StelDialog
+{
+	Q_OBJECT
+
+public:
+	MeteorShowerDialog();
+	~MeteorShowerDialog();
+
+protected:
+	//! Initialize the dialog widgets and connect the signals/slots
+	void createDialogContent();
+
+public slots:
+	void retranslate();
+	void refreshUpdateValues(void); //! Refresh details about the last update
+	void refreshColorMarkers(void); //! Refresh the color of all markers
+	void refreshRangeDates(void);   //! Refresh dates range when year in main app change
+
+private slots:
+	void setUpdateValues(int hours);
+	void setUpdatesEnabled(bool checkState);
+	void updateStateReceiver(MeteorShowers::UpdateState state);
+        void updateCompleteReceiver();
+	void restoreDefaults(void);
+	void saveSettings(void);
+	void updateJSON(void);
+	void setColorARR(void);  //! Set color of active radiant based on real data.
+	void setColorARG(void);  //! Set color of active radiant based on generic data.
+	void setColorIR(void);   //! Set color of inactive radiant.
+	void checkDates(void);   //! Checks if the inputed dates are valid for use.
+	void searchEvents(void); //! Search events and fill the list.
+	void selectEvent(const QModelIndex &modelIndex); //! If an event is selected by user, the current date change and the object is selected.
+
+private:
+        Ui_meteorShowerDialog* ui;
+	MeteorShowers* plugin;
+	void setAboutHtml(void);
+	void updateGuiFromSettings(void);
+	QTimer* updateTimer;
+	void setTextureColor(QLabel* texture, QColor color);
+
+	//! Defines the number and the order of the columns in the table that lists active meteor showers
+	//! @enum ModelColumns
+	enum ModelColumns {
+		ColumnName,		//! name column
+		ColumnZHR,		//! zhr column
+		ColumnDataType,		//! data type column
+		ColumnPeak,		//! peak date column
+		ColumnCount		//! total number of columns
+	};
+	QTreeWidget* treeWidget;   //! list of events
+	void initListEvents(void); //! Init header and list of events
+	void setHeaderNames(void); //! Update header names
+
+	// Reimplementation of QTreeWidgetItem class to fix the sorting bug
+	class TreeWidgetItem : public QTreeWidgetItem
+	{
+	public:
+		TreeWidgetItem(QTreeWidget* parent):QTreeWidgetItem(parent){}
+
+	private:
+		bool operator<(const QTreeWidgetItem &other)const {
+			int column = treeWidget()->sortColumn();
+
+			if (column == ColumnPeak)
+				return QDateTime::fromString(text(column),"dd/MMM/yyyy").operator <(QDateTime::fromString(other.text(column),"dd/MMM/yyyy"));
+			else if (column == ColumnZHR)
+				return text(column).toInt() < other.text(column).toInt();
+			else //ColumnName or ColumnDataType
+				return text(column).toLower() < other.text(column).toLower();
+		}
+	};
+};
+
+#endif // _METEORSHOWERDIALOG_HPP_

=== added file 'plugins/MeteorShowers/src/gui/meteorShowerDialog.ui'
--- plugins/MeteorShowers/src/gui/meteorShowerDialog.ui	1970-01-01 00:00:00 +0000
+++ plugins/MeteorShowers/src/gui/meteorShowerDialog.ui	2014-03-10 17:28:07 +0000
@@ -0,0 +1,867 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>meteorShowerDialog</class>
+ <widget class="QWidget" name="meteorShowerDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>530</width>
+    <height>404</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Meteor Showers 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>Meteor Showers 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>2</number>
+     </property>
+     <property name="documentMode">
+      <bool>false</bool>
+     </property>
+     <widget class="QWidget" name="settingsTab">
+      <attribute name="title">
+       <string>Settings</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QGroupBox" name="internetUpdates">
+         <property name="title">
+          <string>Update data from Internet</string>
+         </property>
+         <property name="flat">
+          <bool>true</bool>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_12">
+          <item>
+           <layout class="QGridLayout" name="gridLayout">
+            <item row="0" column="0">
+             <widget class="QLabel" name="lastUpdateLabel">
+              <property name="text">
+               <string>Last update:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="2">
+             <widget class="QDateTimeEdit" name="lastUpdateDateTimeEdit">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="frame">
+               <bool>false</bool>
+              </property>
+              <property name="buttonSymbols">
+               <enum>QAbstractSpinBox::NoButtons</enum>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="updateFrequencyLabel">
+              <property name="text">
+               <string>Update frequency (hours):</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="2">
+             <widget class="QSpinBox" name="updateFrequencySpinBox">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimum">
+               <number>1</number>
+              </property>
+              <property name="maximum">
+               <number>9999</number>
+              </property>
+              <property name="value">
+               <number>1</number>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="0">
+             <widget class="QLabel" name="nextUpdateLabel">
+              <property name="text">
+               <string>[next update info]</string>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1">
+             <spacer name="horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>17</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item row="2" column="2">
+             <widget class="QPushButton" name="updateButton">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Update now</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="displayMeteorShowerBox">
+         <property name="toolTip">
+          <string/>
+         </property>
+         <property name="title">
+          <string>Meteor showers</string>
+         </property>
+         <property name="flat">
+          <bool>true</bool>
+         </property>
+         <property name="checkable">
+          <bool>false</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_8">
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="displayShowMeteorShowerButton">
+            <property name="text">
+             <string>Show meteor showers button on toolbar</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="displayMeteorShower">
+            <property name="text">
+             <string>Enable display of meteor showers at startup</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>
+         <item>
+          <widget class="QPushButton" name="saveSettingsButton">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Save settings as default</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="radiantTab">
+      <property name="enabled">
+       <bool>true</bool>
+      </property>
+      <attribute name="title">
+       <string>Radiants</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <item>
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
+          <string>Color of radiants markers</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_5">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <item row="0" column="1" alignment="Qt::AlignHCenter">
+           <widget class="QGroupBox" name="activeGenericData">
+            <property name="minimumSize">
+             <size>
+              <width>86</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>Active Radiant - Generic Data</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_3">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <property name="spacing">
+              <number>0</number>
+             </property>
+             <item row="1" column="0">
+              <widget class="QPushButton" name="changeColorARG">
+               <property name="toolTip">
+                <string>Change Color</string>
+               </property>
+               <property name="text">
+                <string notr="true">...</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="0">
+              <widget class="QFrame" name="frame_4">
+               <property name="minimumSize">
+                <size>
+                 <width>64</width>
+                 <height>64</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>64</width>
+                 <height>64</height>
+                </size>
+               </property>
+               <property name="frameShape">
+                <enum>QFrame::StyledPanel</enum>
+               </property>
+               <property name="frameShadow">
+                <enum>QFrame::Raised</enum>
+               </property>
+               <widget class="QLabel" name="textureARG">
+                <property name="geometry">
+                 <rect>
+                  <x>0</x>
+                  <y>0</y>
+                  <width>64</width>
+                  <height>64</height>
+                 </rect>
+                </property>
+                <property name="minimumSize">
+                 <size>
+                  <width>64</width>
+                  <height>64</height>
+                 </size>
+                </property>
+                <property name="maximumSize">
+                 <size>
+                  <width>64</width>
+                  <height>64</height>
+                 </size>
+                </property>
+                <property name="styleSheet">
+                 <string notr="true">background-image: url(:/MeteorShowers/radiantSetting.png);</string>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="0" column="2" alignment="Qt::AlignHCenter">
+           <widget class="QGroupBox" name="inactive">
+            <property name="minimumSize">
+             <size>
+              <width>86</width>
+              <height>0</height>
+             </size>
+            </property>