Merge lp:~daggerstab/stellarium/add-remove-landscapes into lp:stellarium

[Bogdan Marinov]

A merge of my "AddRemoveLandscapes" plug-in into a feature in the main code, with improvements. (Lots of improvements, actually.)

To open the feature's window, go to the "Landscapes" tab of the "Sky and viewing options" window and press the "Add/remove landscapes..." button. You can test it with the landscape archives from the Stellarium Wiki:
http://www.stellarium.org/wiki/index.php/Landscapes

[Fabien Chéreau (xalioth)]

Hi Bogdan,
I just come back from holidays (I just turned 30 years old 5 days ago!!)
From the code it looks fine, but I still need to have a closer look tomorrow.
Fab

[Fabien Chéreau (xalioth)]

I had a better look today and it's excellent :)
Worked perfectly, well commented code.
I merged in rev 4760.
Thanks a lot Bogdan!
Fabien

review: Approve

=== modified file 'po/stellarium/POTFILES.in'
--- po/stellarium/POTFILES.in	2010-05-19 13:33:21 +0000
+++ po/stellarium/POTFILES.in	2010-09-13 16:37:45 +0000
@@ -19,6 +19,7 @@
 src/gui/StelGuiItems.cpp
 src/gui/ViewDialog.cpp
 src/gui/LocationDialog.cpp
+src/gui/AddRemoveLandscapesDialog.cpp
 src/main.cpp
 src/translations.h
 src/ui_dateTimeDialogGui.h
@@ -27,3 +28,5 @@
 src/ui_searchDialogGui.h
 src/ui_viewDialog.h
 src/ui_configurationDialog.h
+src/ui_addRemoveLandscapesDialog.h
+
 
=== modified file 'po/stellarium/stellarium.pot'
--- po/stellarium/stellarium.pot	2010-05-19 13:33:21 +0000
+++ po/stellarium/stellarium.pot	2010-09-13 16:37:45 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-19 15:26+0200\n"
+"POT-Creation-Date: 2010-09-13 19:07+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -16,20 +16,20 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/core/modules/LandscapeMgr.cpp:401
+#: src/core/modules/LandscapeMgr.cpp:447
 msgid "Author: "
 msgstr ""
 
-#: src/core/modules/LandscapeMgr.cpp:404
+#: src/core/modules/LandscapeMgr.cpp:450
 msgid "Location: "
 msgstr ""
 
-#: src/core/modules/LandscapeMgr.cpp:409
+#: src/core/modules/LandscapeMgr.cpp:455
 #, qt-format
 msgid ", %1 m"
 msgstr ""
 
-#: src/core/modules/LandscapeMgr.cpp:412
+#: src/core/modules/LandscapeMgr.cpp:458
 msgid "Planet: "
 msgstr ""
 
@@ -115,7 +115,7 @@
 msgid "Parallax: %1\""
 msgstr ""
 
-#: src/core/StelProjector.cpp:61
+#: src/core/StelProjector.cpp:62
 msgid "Maximum FOV: "
 msgstr ""
 
@@ -223,54 +223,54 @@
 msgid "Az/Alt: %1/%2"
 msgstr ""
 
-#: src/gui/ConfigurationDialog.cpp:285
+#: src/gui/ConfigurationDialog.cpp:294
 msgid "Select screenshot directory"
 msgstr ""
 
-#: src/gui/ConfigurationDialog.cpp:451
+#: src/gui/ConfigurationDialog.cpp:460
 #, qt-format
 msgid "Startup FOV: %1%2"
 msgstr ""
 
-#: src/gui/ConfigurationDialog.cpp:459
+#: src/gui/ConfigurationDialog.cpp:468
 #, qt-format
 msgid "Startup direction of view Az/Alt: %1/%2"
 msgstr ""
 
-#: src/gui/ConfigurationDialog.cpp:495
+#: src/gui/ConfigurationDialog.cpp:508
 msgid "Authors"
 msgstr ""
 
-#: src/gui/ConfigurationDialog.cpp:499 src/gui/ViewDialog.cpp:337
+#: src/gui/ConfigurationDialog.cpp:512 src/gui/ViewDialog.cpp:345
 msgid "Contact"
 msgstr ""
 
-#: src/gui/ConfigurationDialog.cpp:571
+#: src/gui/ConfigurationDialog.cpp:584
 msgid "Author"
 msgstr ""
 
-#: src/gui/ConfigurationDialog.cpp:572
+#: src/gui/ConfigurationDialog.cpp:585
 msgid "License"
 msgstr ""
 
-#: src/gui/ConfigurationDialog.cpp:603
+#: src/gui/ConfigurationDialog.cpp:614
 msgid "Running script: "
 msgstr ""
 
-#: src/gui/ConfigurationDialog.cpp:610
+#: src/gui/ConfigurationDialog.cpp:621
 msgid "Running script: [none]"
 msgstr ""
 
-#: src/gui/ConfigurationDialog.cpp:653
+#: src/gui/ConfigurationDialog.cpp:664
 msgid "Finished downloading all star catalogs!"
 msgstr ""
 
-#: src/gui/ConfigurationDialog.cpp:662
+#: src/gui/ConfigurationDialog.cpp:673
 #, qt-format
 msgid "Get catalog %1 of %2"
 msgstr ""
 
-#: src/gui/ConfigurationDialog.cpp:664
+#: src/gui/ConfigurationDialog.cpp:675
 #, qt-format
 msgid ""
 "Download size: %1MB\n"
@@ -278,31 +278,31 @@
 "Magnitude range: %3 - %4"
 msgstr ""
 
-#: src/gui/ConfigurationDialog.cpp:673
+#: src/gui/ConfigurationDialog.cpp:684
 msgid ""
 "Finished downloading new star catalogs!\n"
 "Restart Stellarium to display them."
 msgstr ""
 
-#: src/gui/ConfigurationDialog.cpp:711 src/gui/ConfigurationDialog.cpp:745
+#: src/gui/ConfigurationDialog.cpp:722 src/gui/ConfigurationDialog.cpp:756
 #, qt-format
 msgid ""
 "Error downloading %1:\n"
 "%2"
 msgstr ""
 
-#: src/gui/ConfigurationDialog.cpp:716
+#: src/gui/ConfigurationDialog.cpp:727
 #, qt-format
 msgid ""
 "Downloading %1...\n"
 "(You can close this window.)"
 msgstr ""
 
-#: src/gui/ConfigurationDialog.cpp:796
+#: src/gui/ConfigurationDialog.cpp:807
 msgid "Verifying file integrity..."
 msgstr ""
 
-#: src/gui/ConfigurationDialog.cpp:800
+#: src/gui/ConfigurationDialog.cpp:811
 #, qt-format
 msgid ""
 "Error downloading %1:\n"
@@ -483,15 +483,15 @@
 msgid "Constellation boundaries"
 msgstr ""
 
-#: src/gui/StelGui.cpp:104 src/ui_viewDialog.h:1027
+#: src/gui/StelGui.cpp:104 src/ui_viewDialog.h:1034
 msgid "Azimuthal grid"
 msgstr ""
 
-#: src/gui/StelGui.cpp:105 src/ui_viewDialog.h:1025
+#: src/gui/StelGui.cpp:105 src/ui_viewDialog.h:1032
 msgid "Equatorial grid"
 msgstr ""
 
-#: src/gui/StelGui.cpp:106 src/ui_viewDialog.h:1026
+#: src/gui/StelGui.cpp:106 src/ui_viewDialog.h:1033
 msgid "Equatorial J2000 grid"
 msgstr ""
 
@@ -499,19 +499,19 @@
 msgid "Galactic grid"
 msgstr ""
 
-#: src/gui/StelGui.cpp:108 src/ui_viewDialog.h:1030
+#: src/gui/StelGui.cpp:108 src/ui_viewDialog.h:1037
 msgid "Ecliptic line"
 msgstr ""
 
-#: src/gui/StelGui.cpp:109 src/ui_viewDialog.h:1028
+#: src/gui/StelGui.cpp:109 src/ui_viewDialog.h:1035
 msgid "Equator line"
 msgstr ""
 
-#: src/gui/StelGui.cpp:110 src/ui_viewDialog.h:1029
+#: src/gui/StelGui.cpp:110 src/ui_viewDialog.h:1036
 msgid "Meridian line"
 msgstr ""
 
-#: src/gui/StelGui.cpp:111 src/ui_viewDialog.h:1031
+#: src/gui/StelGui.cpp:111 src/ui_viewDialog.h:1038
 msgid "Cardinal points"
 msgstr ""
 
@@ -519,7 +519,7 @@
 msgid "Ground"
 msgstr ""
 
-#: src/gui/StelGui.cpp:114 src/ui_viewDialog.h:1009
+#: src/gui/StelGui.cpp:114 src/ui_viewDialog.h:1016
 msgid "Atmosphere"
 msgstr ""
 
@@ -527,7 +527,7 @@
 msgid "Fog"
 msgstr ""
 
-#: src/gui/StelGui.cpp:117 src/ui_viewDialog.h:1014
+#: src/gui/StelGui.cpp:117 src/ui_viewDialog.h:1021
 msgid "Nebulas"
 msgstr ""
 
@@ -535,7 +535,7 @@
 msgid "Nebulas background images"
 msgstr ""
 
-#: src/gui/StelGui.cpp:119 src/ui_viewDialog.h:995 src/ui_viewDialog.h:1013
+#: src/gui/StelGui.cpp:119 src/ui_viewDialog.h:1002 src/ui_viewDialog.h:1020
 msgid "Stars"
 msgstr ""
 
@@ -599,7 +599,7 @@
 msgid "Script console window"
 msgstr ""
 
-#: src/gui/StelGui.cpp:140 src/ui_dateTimeDialogGui.h:295
+#: src/gui/StelGui.cpp:140 src/ui_dateTimeDialogGui.h:294
 msgid "Date and Time"
 msgstr ""
 
@@ -720,35 +720,110 @@
 msgid "%1m"
 msgstr ""
 
-#: src/gui/ViewDialog.cpp:391
+#: src/gui/ViewDialog.cpp:399
 msgid "No description"
 msgstr ""
 
-#: src/gui/ViewDialog.cpp:451
+#: src/gui/ViewDialog.cpp:467
 msgid "No shooting stars"
 msgstr ""
 
-#: src/gui/ViewDialog.cpp:454
+#: src/gui/ViewDialog.cpp:470
 msgid "Normal rate"
 msgstr ""
 
-#: src/gui/ViewDialog.cpp:457
+#: src/gui/ViewDialog.cpp:473
 msgid "Standard Perseids rate"
 msgstr ""
 
-#: src/gui/ViewDialog.cpp:460
+#: src/gui/ViewDialog.cpp:476
 msgid "Exceptional Leonid rate"
 msgstr ""
 
-#: src/gui/ViewDialog.cpp:463
+#: src/gui/ViewDialog.cpp:479
 msgid "Highest rate ever (1966 Leonids)"
 msgstr ""
 
-#: src/gui/LocationDialog.cpp:340
+#: src/gui/LocationDialog.cpp:331
 msgid "New Location"
 msgstr ""
 
-#: src/main.cpp:317
+#: src/gui/AddRemoveLandscapesDialog.cpp:113
+msgid "Select a ZIP archive that contains a Stellarium landscape"
+msgstr ""
+
+#. TRANSLATORS: This string is displayed in the "Files of type:" drop-down list in the standard file selection dialog.
+#: src/gui/AddRemoveLandscapesDialog.cpp:115
+msgid "ZIP archives"
+msgstr ""
+
+#: src/gui/AddRemoveLandscapesDialog.cpp:128
+#, qt-format
+msgid "Landscape \"%1\" has been installed successfully."
+msgstr ""
+
+#: src/gui/AddRemoveLandscapesDialog.cpp:129
+#: src/gui/AddRemoveLandscapesDialog.cpp:156
+msgid "Success"
+msgstr ""
+
+#: src/gui/AddRemoveLandscapesDialog.cpp:142
+#: src/gui/AddRemoveLandscapesDialog.cpp:212
+#: src/gui/AddRemoveLandscapesDialog.cpp:221
+#: src/gui/AddRemoveLandscapesDialog.cpp:229
+msgid "No landscape was installed."
+msgstr ""
+
+#: src/gui/AddRemoveLandscapesDialog.cpp:143
+#: src/gui/AddRemoveLandscapesDialog.cpp:167
+#: src/gui/AddRemoveLandscapesDialog.cpp:216
+#: src/gui/AddRemoveLandscapesDialog.cpp:222
+#: src/gui/AddRemoveLandscapesDialog.cpp:230
+#: src/gui/AddRemoveLandscapesDialog.cpp:240
+msgid "Error!"
+msgstr ""
+
+#: src/gui/AddRemoveLandscapesDialog.cpp:155
+#, qt-format
+msgid "Landscape \"%1\" has been removed successfully."
+msgstr ""
+
+#: src/gui/AddRemoveLandscapesDialog.cpp:166
+#: src/gui/AddRemoveLandscapesDialog.cpp:236
+msgid "The selected landscape could not be (completely) removed."
+msgstr ""
+
+#. TRANSLATORS: MiB = mebibytes (IEC 60027-2 standard for 2^20 bytes)
+#: src/gui/AddRemoveLandscapesDialog.cpp:189
+#, qt-format
+msgid "Size on disk: %1 MiB"
+msgstr ""
+
+#. TRANSLATORS: The parameter is a file/directory path that may be quite long.
+#: src/gui/AddRemoveLandscapesDialog.cpp:215
+#, qt-format
+msgid "Stellarium cannot open for reading or writing %1"
+msgstr ""
+
+#: src/gui/AddRemoveLandscapesDialog.cpp:221
+msgid ""
+"The selected file is not a ZIP archive or does not contain a Stellarium "
+"landscape."
+msgstr ""
+
+#. TRANSLATORS: The parameter is the duplicate name or identifier.
+#: src/gui/AddRemoveLandscapesDialog.cpp:228
+#, qt-format
+msgid "A landscape with the same name or identifier (%1) already exists."
+msgstr ""
+
+#. TRANSLATORS: The parameter is a file/directory path that may be quite long. "It" refers to a landscape that can't be removed.
+#: src/gui/AddRemoveLandscapesDialog.cpp:239
+#, qt-format
+msgid "You can remove it manually by deleting the following directory: %1"
+msgstr ""
+
+#: src/main.cpp:335
 msgid "This system does not support OpenGL."
 msgstr ""
 
@@ -1196,558 +1271,586 @@
 msgid "Set UI Locale: "
 msgstr ""
 
-#: src/ui_dateTimeDialogGui.h:294 src/ui_helpDialogGui.h:259
-#: src/ui_locationDialogGui.h:387 src/ui_viewDialog.h:979
-#: src/ui_configurationDialog.h:746
-msgid "Form"
-msgstr ""
-
-#: src/ui_dateTimeDialogGui.h:297 src/ui_dateTimeDialogGui.h:298
+#: src/ui_dateTimeDialogGui.h:296 src/ui_dateTimeDialogGui.h:297
 msgid "/"
 msgstr ""
 
-#: src/ui_dateTimeDialogGui.h:299 src/ui_dateTimeDialogGui.h:300
+#: src/ui_dateTimeDialogGui.h:298 src/ui_dateTimeDialogGui.h:299
 msgid ":"
 msgstr ""
 
-#: src/ui_helpDialogGui.h:260 src/ui_helpDialogGui.h:266
+#: src/ui_helpDialogGui.h:259 src/ui_helpDialogGui.h:265
 msgid "Help"
 msgstr ""
 
-#: src/ui_helpDialogGui.h:268
+#: src/ui_helpDialogGui.h:267
 msgid "About"
 msgstr ""
 
-#: src/ui_helpDialogGui.h:270
+#: src/ui_helpDialogGui.h:269
 msgid "Log"
 msgstr ""
 
-#: src/ui_helpDialogGui.h:273
+#: src/ui_helpDialogGui.h:272
 msgid "Refresh"
 msgstr ""
 
-#: src/ui_locationDialogGui.h:388
+#: src/ui_locationDialogGui.h:387
 msgid "Location"
 msgstr ""
 
+#: src/ui_locationDialogGui.h:391
+msgid "Current location information"
+msgstr ""
+
 #: src/ui_locationDialogGui.h:392
-msgid "Current location information"
+msgid "Use as default"
 msgstr ""
 
 #: src/ui_locationDialogGui.h:393
-msgid "Use as default"
+msgid "Delete"
 msgstr ""
 
 #: src/ui_locationDialogGui.h:394
-msgid "Delete"
+msgid "Add to list"
 msgstr ""
 
 #: src/ui_locationDialogGui.h:395
-msgid "Add to list"
-msgstr ""
-
-#: src/ui_locationDialogGui.h:396
 msgid "Latitude:"
 msgstr ""
 
-#: src/ui_locationDialogGui.h:398 src/ui_locationDialogGui.h:402
+#: src/ui_locationDialogGui.h:397 src/ui_locationDialogGui.h:401
 msgid ""
 "You can enter values in decimal degrees, or using dms format, for example: "
 "+1d 12m 8s"
 msgstr ""
 
-#: src/ui_locationDialogGui.h:400
+#: src/ui_locationDialogGui.h:399
 msgid "Longitude:"
 msgstr ""
 
-#: src/ui_locationDialogGui.h:404
+#: src/ui_locationDialogGui.h:403
 msgid "Altitude:"
 msgstr ""
 
-#: src/ui_locationDialogGui.h:406
+#: src/ui_locationDialogGui.h:405
 msgid "Enter the altitude in meter"
 msgstr ""
 
+#: src/ui_locationDialogGui.h:407
+msgid " m"
+msgstr ""
+
 #: src/ui_locationDialogGui.h:408
-msgid " m"
+msgid "Name/City:"
 msgstr ""
 
 #: src/ui_locationDialogGui.h:409
-msgid "Name/City:"
+msgid "Country:"
 msgstr ""
 
 #: src/ui_locationDialogGui.h:410
-msgid "Country:"
-msgstr ""
-
-#: src/ui_locationDialogGui.h:411
 msgid "Planet:"
 msgstr ""
 
-#: src/ui_searchDialogGui.h:230 src/ui_searchDialogGui.h:231
+#: src/ui_searchDialogGui.h:227 src/ui_searchDialogGui.h:228
 msgid "Find Object"
 msgstr ""
 
-#: src/ui_searchDialogGui.h:236
+#: src/ui_searchDialogGui.h:233
 msgid "RA/Dec (J2000):"
 msgstr ""
 
-#: src/ui_viewDialog.h:980
+#: src/ui_viewDialog.h:987
 msgid "View"
 msgstr ""
 
-#: src/ui_viewDialog.h:986
+#: src/ui_viewDialog.h:993
 msgid "Sky"
 msgstr ""
 
-#: src/ui_viewDialog.h:988
+#: src/ui_viewDialog.h:995
 msgid "Markings"
 msgstr ""
 
-#: src/ui_viewDialog.h:990
+#: src/ui_viewDialog.h:997
 msgid "Landscape"
 msgstr ""
 
-#: src/ui_viewDialog.h:992
+#: src/ui_viewDialog.h:999
 msgid "Starlore"
 msgstr ""
 
-#: src/ui_viewDialog.h:996
+#: src/ui_viewDialog.h:1003
 msgid "Absolute scale:"
 msgstr ""
 
-#: src/ui_viewDialog.h:997
+#: src/ui_viewDialog.h:1004
 msgid "Relative scale:"
 msgstr ""
 
-#: src/ui_viewDialog.h:998
+#: src/ui_viewDialog.h:1005
 msgid "Twinkle:"
 msgstr ""
 
-#: src/ui_viewDialog.h:1000
+#: src/ui_viewDialog.h:1007
 msgid "Dim faint stars when a very bright object is visible"
 msgstr ""
 
-#: src/ui_viewDialog.h:1002
+#: src/ui_viewDialog.h:1009
 msgid "Dynamic eye adaptation"
 msgstr ""
 
-#: src/ui_viewDialog.h:1003
+#: src/ui_viewDialog.h:1010
 msgid "Planets and satellites"
 msgstr ""
 
-#: src/ui_viewDialog.h:1004
+#: src/ui_viewDialog.h:1011
 msgid "Show planets"
 msgstr ""
 
-#: src/ui_viewDialog.h:1005
+#: src/ui_viewDialog.h:1012
 msgid "Show planet markers"
 msgstr ""
 
-#: src/ui_viewDialog.h:1006
+#: src/ui_viewDialog.h:1013
 msgid "Show planet orbits"
 msgstr ""
 
-#: src/ui_viewDialog.h:1007
+#: src/ui_viewDialog.h:1014
 msgid "Simulate light speed"
 msgstr ""
 
-#: src/ui_viewDialog.h:1008
+#: src/ui_viewDialog.h:1015
 msgid "Scale Moon"
 msgstr ""
 
-#: src/ui_viewDialog.h:1010
+#: src/ui_viewDialog.h:1017
 msgid "Show atmosphere"
 msgstr ""
 
-#: src/ui_viewDialog.h:1011
+#: src/ui_viewDialog.h:1018
 msgid "Light pollution: "
 msgstr ""
 
-#: src/ui_viewDialog.h:1012
+#: src/ui_viewDialog.h:1019
 msgid "Labels and Markers"
 msgstr ""
 
-#: src/ui_viewDialog.h:1015
+#: src/ui_viewDialog.h:1022
 msgid "Planets"
 msgstr ""
 
-#: src/ui_viewDialog.h:1016
+#: src/ui_viewDialog.h:1023
 msgid "Shooting Stars"
 msgstr ""
 
-#: src/ui_viewDialog.h:1017
+#: src/ui_viewDialog.h:1024
 msgid "Hourly zenith rate:"
 msgstr ""
 
-#: src/ui_viewDialog.h:1018
+#: src/ui_viewDialog.h:1025
 msgid "0"
 msgstr ""
 
-#: src/ui_viewDialog.h:1019
+#: src/ui_viewDialog.h:1026
 msgid "10"
 msgstr ""
 
-#: src/ui_viewDialog.h:1020
+#: src/ui_viewDialog.h:1027
 msgid "80"
 msgstr ""
 
-#: src/ui_viewDialog.h:1021
+#: src/ui_viewDialog.h:1028
 msgid "10000"
 msgstr ""
 
-#: src/ui_viewDialog.h:1022
+#: src/ui_viewDialog.h:1029
 msgid "144000"
 msgstr ""
 
-#: src/ui_viewDialog.h:1024
+#: src/ui_viewDialog.h:1031
 msgid "Celestial Sphere"
 msgstr ""
 
-#: src/ui_viewDialog.h:1032
+#: src/ui_viewDialog.h:1039
 msgid "Constellations"
 msgstr ""
 
-#: src/ui_viewDialog.h:1033
+#: src/ui_viewDialog.h:1040
 msgid "Show lines"
 msgstr ""
 
-#: src/ui_viewDialog.h:1034
+#: src/ui_viewDialog.h:1041
 msgid "Show labels"
 msgstr ""
 
-#: src/ui_viewDialog.h:1035
+#: src/ui_viewDialog.h:1042
 msgid "Show boundaries"
 msgstr ""
 
-#: src/ui_viewDialog.h:1036
+#: src/ui_viewDialog.h:1043
 msgid "Show art"
 msgstr ""
 
-#: src/ui_viewDialog.h:1037
+#: src/ui_viewDialog.h:1044
 msgid "Art brightness: "
 msgstr ""
 
-#: src/ui_viewDialog.h:1038
+#: src/ui_viewDialog.h:1045
 msgid "Projection"
 msgstr ""
 
-#: src/ui_viewDialog.h:1039 src/ui_viewDialog.h:1044 src/ui_viewDialog.h:1046
-#: src/ui_configurationDialog.h:853 src/ui_configurationDialog.h:864
+#: src/ui_viewDialog.h:1046
+msgid "Add/remove landscapes..."
+msgstr ""
+
+#: src/ui_viewDialog.h:1047 src/ui_viewDialog.h:1052 src/ui_viewDialog.h:1054
+#: src/ui_configurationDialog.h:852 src/ui_configurationDialog.h:863
 msgid "Options"
 msgstr ""
 
-#: src/ui_viewDialog.h:1040
+#: src/ui_viewDialog.h:1048
 msgid "Show ground"
 msgstr ""
 
-#: src/ui_viewDialog.h:1041
+#: src/ui_viewDialog.h:1049
 msgid "Show fog"
 msgstr ""
 
-#: src/ui_viewDialog.h:1042
+#: src/ui_viewDialog.h:1050
 msgid "Use associated planet and position"
 msgstr ""
 
-#: src/ui_viewDialog.h:1043
+#: src/ui_viewDialog.h:1051
 msgid "Use this landscape as default"
 msgstr ""
 
-#: src/ui_viewDialog.h:1045
+#: src/ui_viewDialog.h:1053
 msgid "Use this sky culture as default"
 msgstr ""
 
-#: src/ui_viewDialog.h:1047
+#: src/ui_viewDialog.h:1055
 msgid "Visible"
 msgstr ""
 
-#: src/ui_configurationDialog.h:747
+#: src/ui_configurationDialog.h:746
 msgid "Configuration"
 msgstr ""
 
+#: src/ui_configurationDialog.h:748
+msgid "Program language"
+msgstr ""
+
 #: src/ui_configurationDialog.h:749
-msgid "Program language"
-msgstr ""
-
-#: src/ui_configurationDialog.h:750
 msgid "Selected object information"
 msgstr ""
 
-#: src/ui_configurationDialog.h:752
+#: src/ui_configurationDialog.h:751
 msgid "Display all information available"
 msgstr ""
 
-#: src/ui_configurationDialog.h:754
+#: src/ui_configurationDialog.h:753
 msgid "All available"
 msgstr ""
 
-#: src/ui_configurationDialog.h:756
+#: src/ui_configurationDialog.h:755
 msgid "Display less information"
 msgstr ""
 
-#: src/ui_configurationDialog.h:758
+#: src/ui_configurationDialog.h:757
 msgid "Short"
 msgstr ""
 
-#: src/ui_configurationDialog.h:760
+#: src/ui_configurationDialog.h:759
 msgid "Display no information"
 msgstr ""
 
+#: src/ui_configurationDialog.h:761
+msgid "None"
+msgstr ""
+
 #: src/ui_configurationDialog.h:762
-msgid "None"
-msgstr ""
-
-#: src/ui_configurationDialog.h:763
 msgid "Default options"
 msgstr ""
 
-#: src/ui_configurationDialog.h:765
+#: src/ui_configurationDialog.h:764
 msgid ""
 "Save the settings you've changed this session to be the same the next time "
 "you start Stellarium"
 msgstr ""
 
-#: src/ui_configurationDialog.h:767
+#: src/ui_configurationDialog.h:766
 msgid "Save settings"
 msgstr ""
 
-#: src/ui_configurationDialog.h:769
+#: src/ui_configurationDialog.h:768
 msgid "Restore the default settings that came with Stellarium"
 msgstr ""
 
+#: src/ui_configurationDialog.h:770
+msgid "Restore defaults"
+msgstr ""
+
 #: src/ui_configurationDialog.h:771
-msgid "Restore defaults"
-msgstr ""
-
-#: src/ui_configurationDialog.h:772
 msgid ""
 "Restoring default settings requires a restart of Stellarium. Saving all the "
 "current options includes the current FOV and direction of view for use at "
 "next startup."
 msgstr ""
 
-#: src/ui_configurationDialog.h:774
+#: src/ui_configurationDialog.h:773
 msgid "The width of your view when Stellarium starts"
 msgstr ""
 
-#: src/ui_configurationDialog.h:776
+#: src/ui_configurationDialog.h:775
 msgid "Startup FOV: XX"
 msgstr ""
 
-#: src/ui_configurationDialog.h:778
+#: src/ui_configurationDialog.h:777
 msgid "The direction you're looking when Stellarium starts"
 msgstr ""
 
+#: src/ui_configurationDialog.h:779
+msgid "Startup direction of view: xxxx"
+msgstr ""
+
 #: src/ui_configurationDialog.h:780
-msgid "Startup direction of view: xxxx"
-msgstr ""
-
-#: src/ui_configurationDialog.h:781
 msgid "Control"
 msgstr ""
 
-#: src/ui_configurationDialog.h:783
+#: src/ui_configurationDialog.h:782
 msgid "Allow keyboard to pan and zoom"
 msgstr ""
 
-#: src/ui_configurationDialog.h:785
+#: src/ui_configurationDialog.h:784
 msgid "Enable keyboard navigation"
 msgstr ""
 
-#: src/ui_configurationDialog.h:787
+#: src/ui_configurationDialog.h:786
 msgid "Allow mouse to pan (drag) and zoom (mousewheel)"
 msgstr ""
 
+#: src/ui_configurationDialog.h:788
+msgid "Enable mouse navigation"
+msgstr ""
+
 #: src/ui_configurationDialog.h:789
-msgid "Enable mouse navigation"
-msgstr ""
-
-#: src/ui_configurationDialog.h:790
 msgid "Startup date and time"
 msgstr ""
 
-#: src/ui_configurationDialog.h:792
+#: src/ui_configurationDialog.h:791
 msgid "Starts Stellarium at system clock date and time"
 msgstr ""
 
-#: src/ui_configurationDialog.h:794
+#: src/ui_configurationDialog.h:793
 msgid "System date and time"
 msgstr ""
 
-#: src/ui_configurationDialog.h:796
+#: src/ui_configurationDialog.h:795
 msgid ""
 "Sets the simulation time to the next instance of this time of day when "
 "Stellarium starts"
 msgstr ""
 
-#: src/ui_configurationDialog.h:798
+#: src/ui_configurationDialog.h:797
 msgid "System date at:"
 msgstr ""
 
-#: src/ui_configurationDialog.h:800
+#: src/ui_configurationDialog.h:799
 msgid "Use a specific date and time when Stellarium starts up"
 msgstr ""
 
+#: src/ui_configurationDialog.h:801
+msgid "Other:"
+msgstr ""
+
 #: src/ui_configurationDialog.h:802
-msgid "Other:"
+msgid "use current"
 msgstr ""
 
 #: src/ui_configurationDialog.h:803
-msgid "use current"
-msgstr ""
-
-#: src/ui_configurationDialog.h:804
 msgid "Other"
 msgstr ""
 
-#: src/ui_configurationDialog.h:806
+#: src/ui_configurationDialog.h:805
 msgid "Hides the mouse cursor when inactive"
 msgstr ""
 
-#: src/ui_configurationDialog.h:808
+#: src/ui_configurationDialog.h:807
 msgid "Mouse cursor timeout (seconds):"
 msgstr ""
 
-#: src/ui_configurationDialog.h:810
+#: src/ui_configurationDialog.h:809
 msgid "Toggle vertical and horizontal image flip buttons."
 msgstr ""
 
+#: src/ui_configurationDialog.h:811
+msgid "Show flip buttons"
+msgstr ""
+
 #: src/ui_configurationDialog.h:812
-msgid "Show flip buttons"
-msgstr ""
-
-#: src/ui_configurationDialog.h:813
 msgid "Planetarium options"
 msgstr ""
 
-#: src/ui_configurationDialog.h:815
+#: src/ui_configurationDialog.h:814
 msgid ""
 "Spheric mirror distortion is used when projecting Stellarium onto a spheric "
 "mirror for low-cost planetarium systems."
 msgstr ""
 
-#: src/ui_configurationDialog.h:817
+#: src/ui_configurationDialog.h:816
 msgid "Spheric mirror distortion"
 msgstr ""
 
-#: src/ui_configurationDialog.h:819
+#: src/ui_configurationDialog.h:818
 msgid "Align labels with the horizon"
 msgstr ""
 
-#: src/ui_configurationDialog.h:821
+#: src/ui_configurationDialog.h:820
 msgid "Gravity labels"
 msgstr ""
 
-#: src/ui_configurationDialog.h:823
+#: src/ui_configurationDialog.h:822
 msgid ""
 "When enabled, the \"auto zoom out\" key will also set the initial viewing "
 "direction"
 msgstr ""
 
-#: src/ui_configurationDialog.h:825
+#: src/ui_configurationDialog.h:824
 msgid "Auto zoom out returns to initial direction of view"
 msgstr ""
 
-#: src/ui_configurationDialog.h:827
+#: src/ui_configurationDialog.h:826
 msgid "Mask out everything outside a central circle in the main view"
 msgstr ""
 
-#: src/ui_configurationDialog.h:829
+#: src/ui_configurationDialog.h:828
 msgid "Disc viewport"
 msgstr ""
 
-#: src/ui_configurationDialog.h:831
+#: src/ui_configurationDialog.h:830
 msgid "Hide other constellations when you click one"
 msgstr ""
 
+#: src/ui_configurationDialog.h:832
+msgid "Select single constellation"
+msgstr ""
+
 #: src/ui_configurationDialog.h:833
-msgid "Select single constellation"
+msgid "Screenshots"
 msgstr ""
 
 #: src/ui_configurationDialog.h:834
-msgid "Screenshots"
-msgstr ""
-
-#: src/ui_configurationDialog.h:835
 msgid "Screenshot Directory"
 msgstr ""
 
+#: src/ui_configurationDialog.h:836
+msgid "Invert colors"
+msgstr ""
+
 #: src/ui_configurationDialog.h:837
-msgid "Invert colors"
-msgstr ""
-
-#: src/ui_configurationDialog.h:838
 msgid "Star catalog updates"
 msgstr ""
 
-#: src/ui_configurationDialog.h:840
+#: src/ui_configurationDialog.h:839
 msgid "Click here to start downloading"
 msgstr ""
 
+#: src/ui_configurationDialog.h:841
+msgid "Get catalog x of y"
+msgstr ""
+
 #: src/ui_configurationDialog.h:842
-msgid "Get catalog x of y"
+msgid "Download this file to view even more stars"
 msgstr ""
 
 #: src/ui_configurationDialog.h:843
-msgid "Download this file to view even more stars"
-msgstr ""
-
-#: src/ui_configurationDialog.h:844
 msgid "xxx"
 msgstr ""
 
-#: src/ui_configurationDialog.h:846
+#: src/ui_configurationDialog.h:845
 msgid "Restart the download"
 msgstr ""
 
-#: src/ui_configurationDialog.h:848
+#: src/ui_configurationDialog.h:847
 msgid "Retry"
 msgstr ""
 
-#: src/ui_configurationDialog.h:850
+#: src/ui_configurationDialog.h:849
 msgid "Stop the download. You can always restart it later"
 msgstr ""
 
-#: src/ui_configurationDialog.h:852
+#: src/ui_configurationDialog.h:851
 msgid "Cancel"
 msgstr ""
 
-#: src/ui_configurationDialog.h:855
+#: src/ui_configurationDialog.h:854
 msgid "Close window when script runs"
 msgstr ""
 
-#: src/ui_configurationDialog.h:857
+#: src/ui_configurationDialog.h:856
 msgid "Run the selected script"
 msgstr ""
 
-#: src/ui_configurationDialog.h:861
+#: src/ui_configurationDialog.h:860
 msgid "Stop a running script"
 msgstr ""
 
+#: src/ui_configurationDialog.h:864
+msgid "Load at startup"
+msgstr ""
+
 #: src/ui_configurationDialog.h:865
-msgid "Load at startup"
-msgstr ""
-
-#: src/ui_configurationDialog.h:866
 msgid "configure"
 msgstr ""
 
-#: src/ui_configurationDialog.h:871
+#: src/ui_configurationDialog.h:870
 msgid "Main"
 msgstr ""
 
-#: src/ui_configurationDialog.h:873
+#: src/ui_configurationDialog.h:872
 msgid "Navigation"
 msgstr ""
 
-#: src/ui_configurationDialog.h:875
+#: src/ui_configurationDialog.h:874
 msgid "Tools"
 msgstr ""
 
-#: src/ui_configurationDialog.h:877
+#: src/ui_configurationDialog.h:876
 msgid "Scripts"
 msgstr ""
 
-#: src/ui_configurationDialog.h:879
+#: src/ui_configurationDialog.h:878
 msgid "Plugins"
 msgstr ""
+
+#: src/ui_addRemoveLandscapesDialog.h:266
+msgid "Add/Remove Landscapes"
+msgstr ""
+
+#: src/ui_addRemoveLandscapesDialog.h:268
+msgid "Add a new landscape"
+msgstr ""
+
+#: src/ui_addRemoveLandscapesDialog.h:269
+msgid "Install a new landscape from a ZIP archive..."
+msgstr ""
+
+#: src/ui_addRemoveLandscapesDialog.h:270
+msgid "Switch to the new landscape after installation"
+msgstr ""
+
+#: src/ui_addRemoveLandscapesDialog.h:273
+msgid "Remove an installed landscape"
+msgstr ""
+
+#: src/ui_addRemoveLandscapesDialog.h:275
+msgid "Remove"
+msgstr ""
+
+#: src/ui_addRemoveLandscapesDialog.h:276
+msgid ""
+"WARNING: Removing the selected landscape means deleting its files. This "
+"operation is irreversible."
+msgstr ""
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2010-09-06 10:39:45 +0000
+++ src/CMakeLists.txt	2010-09-13 16:37:45 +0000
@@ -407,6 +407,8 @@
 		gui/SearchDialog.cpp
 		gui/ConfigurationDialog.hpp
 		gui/ConfigurationDialog.cpp
+		gui/AddRemoveLandscapesDialog.hpp
+		gui/AddRemoveLandscapesDialog.cpp
 		gui/StelDialog.hpp
 		gui/StelDialog.cpp)
 
@@ -424,6 +426,7 @@
 		gui/ViewDialog.hpp
 		gui/SearchDialog.hpp
 		gui/ConfigurationDialog.hpp
+		gui/AddRemoveLandscapesDialog.hpp
 		gui/StelDialog.hpp)
 
 	################# compiles .ui files ############
@@ -433,7 +436,8 @@
 	gui/dateTimeDialogGui.ui
 	gui/viewDialog.ui
 	gui/searchDialogGui.ui
-	gui/configurationDialog.ui)
+	gui/configurationDialog.ui
+	gui/addRemoveLandscapesDialog.ui)
 
 	IF(ENABLE_SCRIPT_CONSOLE)
 		SET(stellarium_gui_SRCS ${stellarium_gui_SRCS}
 
=== modified file 'src/core/modules/LandscapeMgr.cpp'
--- src/core/modules/LandscapeMgr.cpp	2010-06-03 21:41:26 +0000
+++ src/core/modules/LandscapeMgr.cpp	2010-09-13 16:37:45 +0000
@@ -1,6 +1,7 @@
 /*
  * Stellarium
  * Copyright (C) 2006 Fabien Chereau
+ * Copyright (C) 2010 Bogdan Marinov (add/remove landscapes feature)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -20,6 +21,9 @@
 #include <QDebug>
 #include <QSettings>
 #include <QString>
+#include <QDir>
+#include <QFile>
+#include <QTemporaryFile>
 
 #ifdef USE_OPENGL_ES2
  #include "GLES2/gl2.h"
@@ -27,6 +31,8 @@
  #include <QtOpenGL>
 #endif
 
+#include <stdexcept>
+
 #include "LandscapeMgr.hpp"
 #include "Landscape.hpp"
 #include "Atmosphere.hpp"
@@ -40,6 +46,8 @@
 #include "StelIniParser.hpp"
 #include "StelSkyDrawer.hpp"
 #include "StelPainter.hpp"
+#include "karchive.h"
+#include "kzip.h"
 
 // Class which manages the cardinal points displaying
 class Cardinals
@@ -144,6 +152,10 @@
 LandscapeMgr::LandscapeMgr() : atmosphere(NULL), cardinalsPoints(NULL), landscape(NULL), flagLandscapeSetsLocation(false)
 {
 	setObjectName("LandscapeMgr");
+
+	//TODO: Find a way to obtain this list automatically.
+	//Note: The first entry in the list is used as the default 'default landscape' in removeLandscape().
+	packagedLandscapeIDs = (QStringList() << "guereins" << "trees" << "moon" << "hurricane" << "ocean" << "garching" << "mars" << "saturn");
 }
 
 LandscapeMgr::~LandscapeMgr()
@@ -408,6 +420,20 @@
 	return result;
 }
 
+QStringList LandscapeMgr::getUserLandscapeIDs() const
+{
+	QMap<QString,QString> nameToDirMap = getNameToDirMap();
+	QStringList result;
+	foreach (QString id, nameToDirMap.values())
+	{
+		if(!packagedLandscapeIDs.contains(id))
+		{
+			result += id;
+		}
+	}
+	return result;
+}
+
 QString LandscapeMgr::getCurrentLandscapeName() const
 {
 	return landscape->getName();
@@ -604,3 +630,291 @@
 }
 
 
+QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, bool display, bool toMainDirectory)
+{
+	if (!QFile::exists(sourceFilePath))
+	{
+		qDebug() << "LandscapeMgr: File does not exist:" << sourceFilePath;
+		emit errorUnableToOpen(sourceFilePath);
+		return QString();
+	}
+
+	QDir parentDestinationDir;
+	//TODO: Fix the "for all users" option
+	parentDestinationDir.setPath(StelFileMgr::getUserDir());
+
+	if (!parentDestinationDir.exists("landscapes"))
+	{
+		//qDebug() << "LandscapeMgr: No 'landscapes' subdirectory exists in" << parentDestinationDir.absolutePath();
+		if (!parentDestinationDir.mkdir("landscapes"))
+		{
+			qWarning() << "LandscapeMgr: Unable to install landscape: Unable to create sub-directory 'landscapes' in" << parentDestinationDir.absolutePath();
+			emit errorUnableToOpen(QDir::cleanPath(parentDestinationDir.filePath("landscapes")));//parentDestinationDir.absolutePath()
+			return QString();
+		}
+	}
+	QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes"));
+
+	KZip sourceArchive(sourceFilePath);
+	if(!sourceArchive.open(QIODevice::ReadOnly))
+	{
+		qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << sourceFilePath;
+		emit errorNotArchive();
+		return QString();
+	}
+
+	//Detect top directory
+	const KArchiveDirectory * archiveTopDirectory = NULL;
+	QStringList topLevelContents = sourceArchive.directory()->entries();
+	if(topLevelContents.contains("landscape.ini"))
+	{
+		//If the landscape archive has no top level directory...
+		//(test case is "tulipfield" from the Stellarium Wiki)
+		archiveTopDirectory = sourceArchive.directory();
+	}
+	else
+	{
+		foreach (QString entryPath, topLevelContents)
+		{
+			if (sourceArchive.directory()->entry(entryPath)->isDirectory())
+			{
+				if((dynamic_cast<const KArchiveDirectory*>(sourceArchive.directory()->entry(entryPath)))->entries().contains("landscape.ini"))
+				{
+					archiveTopDirectory = dynamic_cast<const KArchiveDirectory*>(sourceArchive.directory()->entry(entryPath));
+					break;
+				}
+			}
+		}
+	}
+	if (archiveTopDirectory == NULL)
+	{
+		qWarning() << "LandscapeMgr: Unable to install landscape. There is no directory that contains a 'landscape.ini' file in the source archive.";
+		emit errorNotArchive();
+		return QString();
+	}
+
+	/*
+	qDebug() << "LandscapeMgr: Contents of the source archive:" << endl
+			 << "- top level direcotory:" << archiveTopDirectory->name() << endl
+			 << "- contents:" << archiveTopDirectory->entries();
+	*/
+
+	//Check if the top directory name is unique
+	//TODO: Prompt rename? Rename silently?
+	/*
+	if (destinationDir.exists(archiveTopDirectory->name()))
+	{
+		qWarning() << "LandscapeMgr: Unable to install landscape. A directory named" << archiveTopDirectory->name() << "already exists in" << destinationDir.absolutePath();
+		return QString();
+	}
+	*/
+	//Determine the landscape's identifier
+	QString landscapeID = archiveTopDirectory->name();
+	if (landscapeID.length() < 2)
+	{
+		//If the archive has no top level directory (landscapeID is "/"),
+		//use the first 65 characters of its file name for an identifier
+		QFileInfo sourceFileInfo(sourceFilePath);
+		landscapeID = sourceFileInfo.baseName().left(65);
+	}
+
+	//Check for duplicate IDs
+	if (getAllLandscapeIDs().contains(landscapeID))
+	{
+		qWarning() << "LandscapeMgr: Unable to install landscape. A landscape with the ID" << landscapeID << "already exists.";
+		emit errorNotUnique(landscapeID);
+		return QString();
+	}
+
+	//Read the .ini file and check if the landscape name is unique
+	QTemporaryFile tempLandscapeIni("landscapeXXXXXX.ini");
+	if (tempLandscapeIni.open())
+	{
+		const KZipFileEntry * archLandscapeIni = static_cast<const KZipFileEntry*>(archiveTopDirectory->entry("landscape.ini"));
+		tempLandscapeIni.write(archLandscapeIni->createDevice()->readAll());
+		tempLandscapeIni.close();
+
+		QSettings confLandscapeIni(tempLandscapeIni.fileName(), StelIniFormat);
+		QString landscapeName = confLandscapeIni.value("landscape/name").toString();
+		if (getAllLandscapeNames().contains(landscapeName))
+		{
+			qWarning() << "LandscapeMgr: Unable to install landscape. There is already a landscape named" << landscapeName;
+			emit errorNotUnique(landscapeName);
+			return QString();
+		}
+	}
+
+	//Copy the landscape directory to the target
+	//sourceArchive.directory()->copyTo(destinationDir.absolutePath());
+
+	//This case already has been handled - and commented out - above. :)
+	if(destinationDir.exists(landscapeID))
+	{
+		qWarning() << "LandscapeMgr: A subdirectory" << landscapeID << "already exists in" << destinationDir.absolutePath() << "Its contents may be overwritten.";
+	}
+	else if(!destinationDir.mkdir(landscapeID))
+	{
+		qWarning() << "LandscapeMgr: Unable to install landscape. Unable to create" << landscapeID << "directory in" << destinationDir.absolutePath();
+		emit errorUnableToOpen(QDir::cleanPath(destinationDir.filePath(landscapeID)));
+		return QString();
+	}
+	destinationDir.cd(landscapeID);
+	QString destinationDirPath = destinationDir.absolutePath();
+	QStringList landscapeFileEntries = archiveTopDirectory->entries();
+	foreach (QString entry, landscapeFileEntries)
+	{
+		const KArchiveEntry * archEntry = archiveTopDirectory->entry(entry);
+		if(archEntry->isFile())
+		{
+			static_cast<const KZipFileEntry*>(archEntry)->copyTo(destinationDirPath);
+		}
+	}
+
+	sourceArchive.close();
+
+	//If necessary, make the new landscape the current landscape
+	if (display)
+	{
+		setCurrentLandscapeID(landscapeID);
+	}
+
+	//Make sure that everyone knows that the list of available landscapes has changed
+	emit landscapesChanged();
+
+	qDebug() << "LandscapeMgr: Successfully installed landscape directory" << landscapeID << "to" << destinationDir.absolutePath();
+	return landscapeID;
+}
+
+bool LandscapeMgr::removeLandscape(QString landscapeID)
+{
+	if (landscapeID.isEmpty())
+	{
+		qWarning() << "LandscapeMgr: Error! No landscape ID passed to removeLandscape().";
+		return false;
+	}
+
+	if (packagedLandscapeIDs.contains(landscapeID))
+	{
+		qWarning() << "LandscapeMgr: Landscapes that are part of the default installation cannot be removed.";
+		return false;
+	}
+
+	qDebug() << "LandscapeMgr: Trying to remove landscape" << landscapeID;
+
+	QString landscapePath = getLandscapePath(landscapeID);
+	if (landscapePath.isEmpty())
+		return false;
+
+	QDir landscapeDir(landscapePath);
+	foreach (QString fileName, landscapeDir.entryList(QDir::Files | QDir::NoDotAndDotDot))
+	{
+		if(!landscapeDir.remove(fileName))
+		{
+			qWarning() << "LandscapeMgr: Unable to remove" << fileName;
+			emit errorRemoveManually(landscapeDir.absolutePath());
+			return false;
+		}
+	}
+	landscapeDir.cdUp();
+	if(!landscapeDir.rmdir(landscapeID))
+	{
+		qWarning() << "LandscapeMgr: Error! Landscape" << landscapeID
+				   << "could not be removed. "
+				   << "Some files were deleted, but not all."
+				   << endl
+				   << "LandscapeMgr: You can delete manually" << QDir::cleanPath(landscapeDir.filePath(landscapeID));
+		emit errorRemoveManually(QDir::cleanPath(landscapeDir.filePath(landscapeID)));
+		return false;
+	}
+
+	qDebug() << "LandscapeMgr: Successfully removed" << landscapePath;
+
+	//If the landscape has been selected, revert to the default one
+	//TODO: Make this optional?
+	if (getCurrentLandscapeID() == landscapeID)
+	{
+		if(getDefaultLandscapeID() == landscapeID)
+		{
+			setDefaultLandscapeID(packagedLandscapeIDs.first());
+			//TODO: Find what happens if a missing landscape is specified in the configuration file
+		}
+
+		setCurrentLandscapeID(getDefaultLandscapeID());
+	}
+
+	//Make sure that everyone knows that the list of available landscapes has changed
+	emit landscapesChanged();
+
+	return true;
+}
+
+QString LandscapeMgr::getLandscapePath(QString landscapeID)
+{
+	QString result;
+	//Is this necessary? This function is private.
+	if (landscapeID.isEmpty())
+		return result;
+
+	try
+	{
+		result = StelFileMgr::findFile("landscapes/" + landscapeID, StelFileMgr::Directory);
+	}
+	catch (std::runtime_error &e)
+	{
+		qWarning() << "LandscapeMgr: Error! Unable to find" << landscapeID << ":" << e.what();
+		return result;
+	}
+
+	return result;
+}
+
+QString LandscapeMgr::loadLandscapeName(QString landscapeID)
+{
+	QString landscapeName;
+	if (landscapeID.isEmpty())
+	{
+		qWarning() << "LandscapeMgr: Error! No landscape ID passed to loadLandscapeName().";
+		return landscapeName;
+	}
+
+	QString landscapePath = getLandscapePath(landscapeID);
+	if (landscapePath.isEmpty())
+		return landscapeName;
+
+	QDir landscapeDir(landscapePath);
+	if (landscapeDir.exists("landscape.ini"))
+	{
+		QString landscapeSettingsPath = landscapeDir.filePath("landscape.ini");
+		QSettings landscapeSettings(landscapeSettingsPath, StelIniFormat);
+		landscapeName = landscapeSettings.value("landscape/name").toString();
+	}
+	else
+	{
+		qWarning() << "LandscapeMgr: Error! Landscape directory" << landscapePath << "does not contain a 'landscape.ini' file";
+	}
+
+	return landscapeName;
+}
+
+quint64 LandscapeMgr::loadLandscapeSize(QString landscapeID)
+{
+	quint64 landscapeSize = 0;
+	if (landscapeID.isEmpty())
+	{
+		qWarning() << "LandscapeMgr: Error! No landscape ID passed to loadLandscapeSize().";
+		return landscapeSize;
+	}
+
+	QString landscapePath = getLandscapePath(landscapeID);
+	if (landscapePath.isEmpty())
+		return landscapeSize;
+
+	QDir landscapeDir(landscapePath);
+	foreach (QFileInfo file, landscapeDir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot))
+	{
+		//qDebug() << "name:" << file.baseName() << "size:" << file.size();
+		landscapeSize += file.size();
+	}
+
+	return landscapeSize;
+}
 
=== modified file 'src/core/modules/LandscapeMgr.hpp'
--- src/core/modules/LandscapeMgr.hpp	2010-05-20 10:13:42 +0000
+++ src/core/modules/LandscapeMgr.hpp	2010-09-13 16:37:45 +0000
@@ -1,6 +1,7 @@
 /*
  * Stellarium
  * Copyright (C) 2006 Fabien Chereau
+ * Copyright (C) 2010 Bogdan Marinov (add/remove landscapes feature)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -32,8 +33,8 @@
 class QSettings;
 
 //! @class LandscapeMgr
-//! Manages all the rendering a the level of the observer's surrounding.
-//! This includes landscape textures, fog, atmosphere and cardinal points
+//! Manages all the rendering at the level of the observer's surroundings.
+//! This includes landscape textures, fog, atmosphere and cardinal points.
 //! I decided to put all these elements together in a single class because they are
 //! inherently linked, especially when we start moving the observer in altitude.
 class LandscapeMgr : public StelModule
@@ -95,16 +96,21 @@
 public slots:
 	///////////////////////////////////////////////////////////////////////////
 	// Methods callable from script and GUI
-	//! Retrieve list of the names of all the available landscape in the
-	//! file search path sub-directories of the landscape area
+	//! Retrieve a list of the names of all the available landscapes in
+	//! the file search path sub-directories of the landscape area
 	//! @return the names of the landscapes, which are the values of the name parameter in the landscape.ini files
 	QStringList getAllLandscapeNames() const;
 
-	//! Retrieve list of the names of all the available landscape in the
-	//! file search path sub-directories of the landscape area
-	//! @return the names of the landscapes, which are the values of the name parameter in the landscape.ini files
+	//! Retrieve a list of the identifiers of all the available landscapes in
+	//! the file search path sub-directories of the landscape area
+	//! @return the identifiers of the landscapes, which are the names of the directories containing the landscapes' files
 	QStringList getAllLandscapeIDs() const;
 
+	//! Retrieve a list of the identifiers of all user-installed landscapes.
+	//! Effectively, this returns the results of getAllLandscapeIDs() without
+	//! the landscapes specified in the #packagedLandscapeIDs list.
+	QStringList getUserLandscapeIDs() const;
+
 	//! Get the current landscape ID.
 	const QString& getCurrentLandscapeID() const {return currentLandscapeID;}
 	//! Change the current landscape to the landscape with the ID specified.
@@ -174,6 +180,106 @@
 	//! @param d the rotation angle in degrees as an offset from the originally loaded value.
 	void setZRotation(float d);
 
+	//! Install a landscape from a ZIP archive.
+	//! This function searches for a file named "landscape.ini" in the root
+	//! directory of the archive. If it is not found there, the function
+	//! searches inside the topmost sub-directories (if any), but no deeper.
+	//! If a landscape configuration file is found:
+	//!  - if a "landscapes" directory does not exist in the user data
+	//! directory, it is created;
+	//!  - inside it, a sub-directory is created with the landscape identifier
+	//! for a name;
+	//!  - all files in the archive directory that contains the "landscape.ini"
+	//! file are extracted to the new sub-directory of "landscapes";
+	//!  - all sub-directories of that archive directory will be skipped along
+	//! with any other files or directories in the archive.
+	//!
+	//! The landscape identifier is either:
+	//!  - the name of the folder in the archive that contains "landscape.ini",
+	//!  - or the first 65 (or less) characters of the archive name, if the
+	//! "landscape.ini" file is in the nameless root directory of the archive.
+	//!
+	//! The landscape identifier must be unique.
+	//! @param pathToSourceArchive path to the source archive file.
+	//! @param display If true, the landscape will be set to be the current
+	//! landscape after installation.
+	//! @param forAllUsers If true, this function will try to install the
+	//! landscape in a way that meakes it is available to all users of this
+	//! computer. May require running Stellarium as an administrator (root)
+	//! on some Windows or *nix systems. (NOT IMPLEMENTED!)
+	//! @returns the installed landscape's identifier, or
+	//! an empty string on failure.
+	//! @todo Find a better way to pass error messages.
+	QString installLandscapeFromArchive(QString pathToSourceArchive, bool display = false, bool forAllUsers = false);
+
+	//! Install a landscape from a directory.
+	//! Expected directory structure: the name of the directory that contains
+	//! a landscape.ini file is assumed to be the landscape ID and should be
+	//! unique.
+	//! This directory and all files in it will be installed, but its
+	//! subdirectories will be skipped along with any other files or
+	//! directories in the archive.
+	//! @param pathToSourceLandscapeIni path to a landscape.ini file. Its parent
+	//! directory is assumed to be the landscape source directory.
+	//! @param display If true, the landscape will be set to be the current
+	//! landscape after installation.
+	//! @param forAllUsers If true, this function will try to install the
+	//! landscape in a way that meakes it is available to all users of this
+	//! computer. May require running Stellarium as an administrator (root)
+	//! on some Windows or *nix systems. (NOT IMPLEMENTED!)
+	//! @returns the installed landscape's identifier (the folder name), or
+	//! an empty string on failure.
+	//QString installLandscapeFromDirectory(QString pathToSourceLandscapeIni, bool display = false, bool forAllUsers = false);
+
+	//! This function removes a landscape from the user data directory.
+	//! It tries to recursively delete all files in the landscape directory
+	//! and then remove it from the list of available landscapes.
+	//! If the function encounters any file that can't be deleted
+	//! it aborts the operation (previously deleted files are not restored).
+	//! Landscapes that were packaged with Stellarium can't be removed,
+	//! thanks to the #packagedtLandscapeIDs list.
+	//! @param landscapeID an installed landscape's identifier (the folder name)
+	//! @todo Find a better way to pass error messages.
+	bool removeLandscape(QString landscapeID);
+
+	//! This function reads a landscape's name from its configuration file.
+	//! @param landscapeID an installed landscape's identifier (the folder name)
+	//! @returns an empty string if there is no such landscape or some other
+	//! error occurs
+	QString loadLandscapeName(QString landscapeID);
+
+	//! This function calculates and returns a landscape's disc size in bytes.
+	//! It adds up the sizes of all files in the landscape's folder. It assumes
+	//! that there are no sub-directories. (There shouldn't be any anyway.)
+	//! @param landscapeID an installed landscape's identifier (the folder name)
+	quint64 loadLandscapeSize(QString landscapeID);
+
+signals:
+	//! Emitted when a landscape has been installed or un-installed.
+	//! For example, it is used to update the list of landscapes in
+	//! the Sky and viewing options window (the ViewDialog class)
+	void landscapesChanged();
+
+	//! Emitted when installLandscapeFromArchive() can't read from, write to or
+	//! create a file or a directory.
+	//! (A way of moving the need for translatable error messages to the GUI.)
+	//! \param path path to the file or directory
+	void errorUnableToOpen(QString path);
+	//! Emitted when the file passed to installLandscapeFromArchive() is not a
+	//! ZIP archive or does not contain a valid landscape.
+	//! (A way of moving the need for translatable error messages to the GUI.)
+	void errorNotArchive();
+	//! Emitted when installLandscapeFromArchive() tries to install a landscape
+	//! with the same name or identifier as an already installed one.
+	//! (A way of moving the need for translatable error messages to the GUI.)
+	//! \param nameOrID the name or the identifier of the landscape
+	void errorNotUnique(QString nameOrID);
+	//! Emitted when removeLandscape() is unable to remove all the files of
+	//! a landscape.
+	//! (A way of moving the need for translatable error messages to the GUI.)
+	//! \param path the path to the landscape's directory
+	void errorRemoveManually(QString path);
+
 private:
 	//! Get light pollution luminance level.
 	float getAtmosphereLightPollutionLuminance() const;
@@ -188,6 +294,12 @@
 	//! Return a map of landscape name to landscape ID (directory name).
 	QMap<QString,QString> getNameToDirMap() const;
 
+	//! Returns the path to an installed landscape's directory.
+	//! It uses StelFileMgr to look for it in the possible directories.
+	//! @param landscapeID an installed landscape's identifier (the folder name)
+	//! @returns an empty string, if no such landscape was found.
+	QString getLandscapePath(QString landscapeID);
+
 	Atmosphere* atmosphere;			// Atmosphere
 	Cardinals* cardinalsPoints;		// Cardinals points
 	Landscape* landscape;			// The landscape i.e. the fog, the ground and "decor"
@@ -200,6 +312,13 @@
 
 	// The ID of the default landscape
 	QString defaultLandscapeID;
+
+	//! List of the IDs of the landscapes packaged by default with Stellarium.
+	//! (So that they can't be removed.)
+	//! It is populated in LandscapeMgr() and has to be updated
+	//! manually on changes.
+	//! @todo Find a way to update it automatically.
+	QStringList packagedLandscapeIDs;
 };
 
 #endif // _LANDSCAPEMGR_HPP_
 
=== added file 'src/gui/AddRemoveLandscapesDialog.cpp'
--- src/gui/AddRemoveLandscapesDialog.cpp	1970-01-01 00:00:00 +0000
+++ src/gui/AddRemoveLandscapesDialog.cpp	2010-09-13 16:37:45 +0000
@@ -0,0 +1,241 @@
+/*
+ * Stellarium
+ * 
+ * Copyright (C) 2010 Bogdan Marinov (add/remove landscapes feature)
+ * 
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+#include "AddRemoveLandscapesDialog.hpp"
+#include "ui_addRemoveLandscapesDialog.h"
+
+#include "Dialog.hpp"
+#include "LandscapeMgr.hpp"
+#include "StelApp.hpp"
+#include "StelModuleMgr.hpp"
+#include "StelLocaleMgr.hpp"
+
+#include <QDebug>
+#include <QFileDialog>
+#include <QString>
+
+AddRemoveLandscapesDialog::AddRemoveLandscapesDialog()
+{
+	ui = new Ui_addRemoveLandscapesDialogForm;
+	
+	landscapeManager = GETSTELMODULE(LandscapeMgr);
+
+	lastUsedDirectoryPath = QDir::homePath();
+}
+
+AddRemoveLandscapesDialog::~AddRemoveLandscapesDialog()
+{
+	delete ui;
+}
+
+void AddRemoveLandscapesDialog::languageChanged()
+{
+	if (dialog)
+		ui->retranslateUi(dialog);
+}
+
+// Initialize the dialog widgets and connect the signals/slots
+void AddRemoveLandscapesDialog::createDialogContent()
+{
+	ui->setupUi(dialog);
+	
+	//Signals and slots
+	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
+
+	connect(ui->pushButtonBrowseForArchive, SIGNAL(clicked()), this, SLOT(browseForArchiveClicked()));
+	connect(ui->listWidgetUserLandscapes, SIGNAL(currentRowChanged(int)), this, SLOT(updateSidePane(int)));
+	connect(ui->pushButtonRemove, SIGNAL(clicked()), this, SLOT(removeClicked()));
+	connect(ui->pushButtonMessageOK, SIGNAL(clicked()), this, SLOT(messageAcknowledged()));
+
+	connect(landscapeManager, SIGNAL(landscapesChanged()), this, SLOT(populateLists()));
+	connect(landscapeManager, SIGNAL(errorUnableToOpen(QString)), this, SLOT(messageUnableToOpen(QString)));
+	connect(landscapeManager, SIGNAL(errorNotArchive()), this, SLOT(messageNotArchive()));
+	connect(landscapeManager, SIGNAL(errorNotUnique(QString)), this, SLOT(messageNotUnique(QString)));
+	connect(landscapeManager, SIGNAL(errorRemoveManually(QString)), this, SLOT(messageRemoveManually(QString)));
+
+	ui->groupBoxMessage->setVisible(false);
+
+	populateLists();
+}
+
+void AddRemoveLandscapesDialog::setVisible(bool v)
+{
+	StelDialog::setVisible(v);
+	//Make sure that every time when the dialog is displayed, the current
+	//landscape is selected in the list of user landscapes if it is in the list.
+	populateLists();
+}
+
+void AddRemoveLandscapesDialog::populateLists()
+{
+	ui->listWidgetUserLandscapes->clear();
+	QStringList landscapes = landscapeManager->getUserLandscapeIDs();
+	if (!landscapes.isEmpty())
+	{
+		landscapes.sort();
+		ui->listWidgetUserLandscapes->addItems(landscapes);
+		//If the current landscape is in the list of user landscapes, select its entry
+		if((ui->listWidgetUserLandscapes->findItems(landscapeManager->getCurrentLandscapeID(), Qt::MatchExactly).isEmpty()))
+		{
+			//If the current landscape is not in the list, simply select the first row
+			ui->listWidgetUserLandscapes->setCurrentRow(0);
+		}
+		else
+		{
+			ui->listWidgetUserLandscapes->setCurrentItem(ui->listWidgetUserLandscapes->findItems(landscapeManager->getCurrentLandscapeID(), Qt::MatchExactly).first());
+		}
+	}
+	else
+	{
+		//Force disabling the side pane
+		updateSidePane(-1);
+	}
+}
+
+void AddRemoveLandscapesDialog::browseForArchiveClicked()
+{
+	QString caption = q_("Select a ZIP archive that contains a Stellarium landscape");
+	// TRANSLATORS: This string is displayed in the "Files of type:" drop-down list in the standard file selection dialog.
+	QString filter = q_("ZIP archives");
+	filter += " (*.zip)";
+	QString sourceArchivePath = QFileDialog::getOpenFileName(NULL, caption, lastUsedDirectoryPath, filter);
+	bool useLandscape = ui->checkBoxUseLandscape->isChecked();
+	if (!sourceArchivePath.isEmpty() && QFile::exists(sourceArchivePath))
+	{
+		//Remember the last successfully used directory
+		lastUsedDirectoryPath = QFileInfo(sourceArchivePath).path();
+
+		QString newLandscapeID = landscapeManager->installLandscapeFromArchive(sourceArchivePath, useLandscape);
+		if(!newLandscapeID.isEmpty())
+		{
+			//Show a message
+			QString successMessage  = QString(q_("Landscape \"%1\" has been installed successfully.")).arg(newLandscapeID);
+			displayMessage(q_("Success"), successMessage);
+
+			//Make the new landscape selected in the list
+			//populateLists(); //No longer needed after the migration to signals/slots
+			ui->listWidgetUserLandscapes->setCurrentItem((ui->listWidgetUserLandscapes->findItems(newLandscapeID, Qt::MatchExactly)).first());
+		}
+		else
+		{
+			//If no error message has been displayed by the signal/slot mechanism,
+			//display a generic message.
+			if (!ui->groupBoxMessage->isVisible())
+			{
+				//Show an error message
+				QString failureMessage = q_("No landscape was installed.");
+				displayMessage(q_("Error!"), failureMessage);
+			}
+		}
+	}
+}
+
+void AddRemoveLandscapesDialog::removeClicked()
+{
+	QString landscapeID = ui->listWidgetUserLandscapes->currentItem()->data(0).toString();
+	if(landscapeManager->removeLandscape(landscapeID))
+	{
+		//populateLists();//No longer needed after the migration to signals/slots
+		QString successMessage  = QString(q_("Landscape \"%1\" has been removed successfully.")).arg(landscapeID);
+		displayMessage(q_("Success"), successMessage);
+	}
+	else
+	{
+		//If no error message has been displayed by the signal/slot mechanism,
+		//display a generic message.
+		if (!ui->groupBoxMessage->isVisible())
+		{
+			//Show an error message
+			//NB! This string is used elsewhere. Modify both to avoid two nearly identical translations.
+			QString failureMessage = q_("The selected landscape could not be (completely) removed.");
+			displayMessage(q_("Error!"), failureMessage);
+		}
+	}
+
+}
+
+void AddRemoveLandscapesDialog::updateSidePane(int newRow)
+{
+	bool displaySidePane = (newRow >= 0);
+	ui->labelLandscapeName->setVisible(displaySidePane);
+	ui->labelLandscapeSize->setVisible(displaySidePane);
+	ui->pushButtonRemove->setEnabled(displaySidePane);
+	ui->labelWarning->setEnabled(displaySidePane);
+	if (!displaySidePane)
+		return;
+
+	QString landscapeID = ui->listWidgetUserLandscapes->item(newRow)->data(0).toString();
+	//Name
+	ui->labelLandscapeName->setText("<h3>"+landscapeManager->loadLandscapeName(landscapeID)+"</h3>");
+	//Size in MiB
+	double landscapeSize = landscapeManager->loadLandscapeSize(landscapeID) / (double)(1024*1024);
+	// TRANSLATORS: MiB = mebibytes (IEC 60027-2 standard for 2^20 bytes)
+	ui->labelLandscapeSize->setText(QString(q_("Size on disk: %1 MiB")).arg(landscapeSize, 0, 'f', 2));
+}
+
+void AddRemoveLandscapesDialog::messageAcknowledged()
+{
+	ui->groupBoxMessage->setVisible(false);
+	ui->groupBoxAdd->setVisible(true);
+	ui->groupBoxRemove->setVisible(true);
+	ui->labelMessage->clear();
+	ui->groupBoxMessage->setTitle(QString());
+}
+
+void AddRemoveLandscapesDialog::displayMessage(QString title, QString message)
+{
+	ui->labelMessage->setText(message);
+	ui->groupBoxMessage->setTitle(title);
+	ui->groupBoxMessage->setVisible(true);
+	ui->groupBoxAdd->setVisible(false);
+	ui->groupBoxRemove->setVisible(false);
+}
+
+void AddRemoveLandscapesDialog::messageUnableToOpen(QString path)
+{
+	QString failureMessage = q_("No landscape was installed.");
+	failureMessage.append(" ");
+	// TRANSLATORS: The parameter is a file/directory path that may be quite long.
+	failureMessage.append(q_("Stellarium cannot open for reading or writing %1").arg(path));
+	displayMessage(q_("Error!"), failureMessage);
+}
+
+void AddRemoveLandscapesDialog::messageNotArchive()
+{
+	QString failureMessage = q_("No landscape was installed.") + " " + q_("The selected file is not a ZIP archive or does not contain a Stellarium landscape.");
+	displayMessage(q_("Error!"), failureMessage);
+}
+
+void AddRemoveLandscapesDialog::messageNotUnique(QString nameOrID)
+{
+	// TRANSLATORS: The parameter is the duplicate name or identifier.
+	QString nameMessage = q_("A landscape with the same name or identifier (%1) already exists.").arg(nameOrID);
+	QString failureMessage = q_("No landscape was installed.") + " " + nameMessage;
+	displayMessage(q_("Error!"), failureMessage);
+}
+
+void AddRemoveLandscapesDialog::messageRemoveManually(QString path)
+{
+	//NB! This string is used elsewhere. Modify both to avoid two nearly identical translations.
+	QString failureMessage = q_("The selected landscape could not be (completely) removed.");
+	failureMessage.append(" ");
+	// TRANSLATORS: The parameter is a file/directory path that may be quite long. "It" refers to a landscape that can't be removed.
+	failureMessage.append(q_("You can remove it manually by deleting the following directory: %1").arg(path));
+	displayMessage(q_("Error!"), failureMessage);
+}
 
=== added file 'src/gui/AddRemoveLandscapesDialog.hpp'
--- src/gui/AddRemoveLandscapesDialog.hpp	1970-01-01 00:00:00 +0000
+++ src/gui/AddRemoveLandscapesDialog.hpp	2010-09-13 16:37:45 +0000
@@ -0,0 +1,81 @@
+/*
+ * Stellarium
+ * 
+ * Copyright (C) 2010 Bogdan Marinov (add/remove landscapes feature)
+ * 
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+ 
+#ifndef _ADDREMOVELANDSCAPESDIALOG_HPP_
+#define _ADDREMOVELANDSCAPESDIALOG_HPP_
+
+#include <QObject>
+#include <QStringList>
+
+#include "StelDialog.hpp"
+
+class Ui_addRemoveLandscapesDialogForm;
+class LandscapeMgr;
+
+//! @class AddRemoveLandscapesDialog
+class AddRemoveLandscapesDialog : public StelDialog
+{
+	Q_OBJECT
+public:
+	AddRemoveLandscapesDialog();
+	virtual ~AddRemoveLandscapesDialog();
+	void languageChanged();
+
+public slots:
+	//! This function overrides the non-virtual StelDialog::setVisible()
+	//! to allow the current landscape to be selected in the list of user
+	//! landscapes (if it is in the list) every time the dialog is displayed.
+	void setVisible(bool);
+	void populateLists();
+	
+protected:
+	//! Initialize the dialog widgets and connect the signals/slots.
+	virtual void createDialogContent();
+	Ui_addRemoveLandscapesDialogForm* ui;
+
+private slots:
+	void browseForArchiveClicked();
+	void removeClicked();
+	void updateSidePane(int newRow);
+
+	//! Hides the message group box and returns to the "Add" group box.
+	//! Usually called by clicking the "OK" button in the message box.
+	void messageAcknowledged();
+
+	void messageUnableToOpen(QString path);
+	void messageNotArchive();
+	void messageNotUnique(QString nameOrID);
+	void messageRemoveManually(QString path);
+
+private:
+	LandscapeMgr* landscapeManager;
+
+	//! Path to the directory last used by QFileDialog in buttonAddClicked().
+	//! Initialized with QDir::homePath() in Landscape(). (DOESN'T WORK!)
+	QString lastUsedDirectoryPath;
+
+	//! Displays a message in place of the "Add" box.
+	//! Pressing the "OK" button in the message box calls messageAcknowledged().
+	//! @param title the title of the QGroupBox that contains the message
+	//! @param message the text of the message itself
+	void displayMessage(QString title, QString message);
+};
+
+#endif // _ADDREMOVELANDSCAPESDIALOG_
 
=== modified file 'src/gui/ViewDialog.cpp'
--- src/gui/ViewDialog.cpp	2010-04-22 10:02:15 +0000
+++ src/gui/ViewDialog.cpp	2010-09-13 16:37:45 +0000
@@ -20,6 +20,7 @@
 
 #include "ViewDialog.hpp"
 #include "ui_viewDialog.h"
+#include "AddRemoveLandscapesDialog.hpp"
 #include "StelApp.hpp"
 #include "StelCore.hpp"
 #include "StelSkyCultureMgr.hpp"
@@ -50,12 +51,15 @@
 ViewDialog::ViewDialog()
 {
 	ui = new Ui_viewDialogForm;
+	addRemoveLandscapesDialog = NULL;
 }
 
 ViewDialog::~ViewDialog()
 {
 	delete ui;
 	ui=NULL;
+	delete addRemoveLandscapesDialog;
+	addRemoveLandscapesDialog = NULL;
 }
 
 void ViewDialog::languageChanged()
@@ -196,6 +200,9 @@
 	ui->useAsDefaultLandscapeCheckBox->setEnabled(lmgr->getCurrentLandscapeID()!=lmgr->getDefaultLandscapeID());
 	connect(ui->useAsDefaultLandscapeCheckBox, SIGNAL(clicked()), this, SLOT(setCurrentLandscapeAsDefault()));
 
+	connect(GETSTELMODULE(LandscapeMgr), SIGNAL(landscapesChanged()), this, SLOT(populateLists()));
+	connect(ui->pushButtonAddRemoveLandscapes, SIGNAL(clicked()), this, SLOT(showAddRemoveLandscapesDialog()));
+
 	// Grid and lines
 	GridLinesMgr* glmgr = GETSTELMODULE(GridLinesMgr);
 	ui->showEquatorLineCheckBox->setChecked(glmgr->getFlagEquatorLine());
@@ -312,7 +319,8 @@
 	l->addItems(lmgr->getAllLandscapeNames());
 	l->setCurrentItem(l->findItems(lmgr->getCurrentLandscapeName(), Qt::MatchExactly).at(0));
 	l->blockSignals(false);
-	ui->landscapeTextBrowser->setHtml(lmgr->getCurrentLandscapeHtmlDescription());
+	//ui->landscapeTextBrowser->setHtml(lmgr->getCurrentLandscapeHtmlDescription()); //Is there any reason not to reuse code?
+	landscapeChanged(l->currentItem());
 }
 
 void ViewDialog::populateSkyLayersList()
@@ -420,6 +428,14 @@
 	ui->useAsDefaultLandscapeCheckBox->setEnabled(lmgr->getDefaultLandscapeID()!=lmgr->getCurrentLandscapeID());
 }
 
+void ViewDialog::showAddRemoveLandscapesDialog()
+{
+	if(addRemoveLandscapesDialog == NULL)
+		addRemoveLandscapesDialog = new AddRemoveLandscapesDialog();
+
+	addRemoveLandscapesDialog->setVisible(true);
+}
+
 void ViewDialog::shootingStarsZHRChanged()
 {
 	MeteorMgr* mmgr = GETSTELMODULE(MeteorMgr);
 
=== modified file 'src/gui/ViewDialog.hpp'
--- src/gui/ViewDialog.hpp	2009-05-25 15:24:19 +0000
+++ src/gui/ViewDialog.hpp	2010-09-13 16:37:45 +0000
@@ -26,6 +26,8 @@
 class Ui_viewDialogForm;
 class QListWidgetItem;
 
+class AddRemoveLandscapesDialog;
+
 class ViewDialog : public StelDialog
 {
 Q_OBJECT
@@ -54,6 +56,8 @@
 	//! This function should be called repeatidly with e.g. a timer
 	void updateFromProgram();
 
+	void showAddRemoveLandscapesDialog();
+
 	void populateSkyLayersList();
 	void skyLayersSelectionChanged(const QString&);
 	void skyLayersEnabledChanged(int);
@@ -61,6 +65,8 @@
 	void changePage(QListWidgetItem *current, QListWidgetItem *previous);
 private:
 	void updateSkyCultureText();
+
+	AddRemoveLandscapesDialog * addRemoveLandscapesDialog;
 };
 
 #endif // _VIEWDIALOG_HPP_
 
=== added file 'src/gui/addRemoveLandscapesDialog.ui'
--- src/gui/addRemoveLandscapesDialog.ui	1970-01-01 00:00:00 +0000
+++ src/gui/addRemoveLandscapesDialog.ui	2010-09-13 16:37:45 +0000
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>addRemoveLandscapesDialogForm</class>
+ <widget class="QWidget" name="addRemoveLandscapesDialogForm">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>450</width>
+    <height>400</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>400</width>
+    <height>400</height>
+   </size>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="BarFrame" name="LocationBar">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>400</width>
+       <height>25</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+     <property name="autoFillBackground">
+      <bool>false</bool>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <layout class="QHBoxLayout">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>4</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <spacer name="titleSpacerLeft">
+        <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>Add/Remove Landscapes</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="titleSpacerRight">
+        <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="QGroupBox" name="groupBoxAdd">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Add a new landscape</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="margin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0" colspan="2">
+       <widget class="QPushButton" name="pushButtonBrowseForArchive">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Install a new landscape from a ZIP archive...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="2">
+       <widget class="QCheckBox" name="checkBoxUseLandscape">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Switch to the new landscape after installation</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBoxMessage">
+     <property name="title">
+      <string notr="true">Message</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_4">
+      <property name="margin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0" colspan="2">
+       <widget class="QLabel" name="labelMessage">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font>
+          <family>DejaVu Sans</family>
+          <pointsize>12</pointsize>
+         </font>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+        <property name="textInteractionFlags">
+         <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="pushButtonMessageOK">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="../../data/gui/guiRes.qrc">
+          <normaloff>:/graphicGui/closeButton-hover.png</normaloff>:/graphicGui/closeButton-hover.png</iconset>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBoxRemove">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Remove an installed landscape</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="margin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QListWidget" name="listWidgetUserLandscapes">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QFrame" name="frameSidePane">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayoutSidePane">
+         <property name="margin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="labelLandscapeName">
+           <property name="text">
+            <string notr="true"/>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="labelLandscapeSize">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="pushButtonRemove">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Remove</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="labelWarning">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>WARNING: Removing the selected landscape means deleting its files. This operation is irreversible.</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>BarFrame</class>
+   <extends>QFrame</extends>
+   <header>Dialog.hpp</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>checkBoxUseLandscape</tabstop>
+  <tabstop>pushButtonBrowseForArchive</tabstop>
+  <tabstop>pushButtonMessageOK</tabstop>
+  <tabstop>listWidgetUserLandscapes</tabstop>
+  <tabstop>pushButtonRemove</tabstop>
+ </tabstops>
+ <resources>
+  <include location="../../data/gui/guiRes.qrc"/>
+ </resources>
+ <connections/>
+</ui>
 
=== modified file 'src/gui/viewDialog.ui'
--- src/gui/viewDialog.ui	2010-09-08 11:05:30 +0000
+++ src/gui/viewDialog.ui	2010-09-13 16:37:45 +0000
@@ -1228,7 +1228,7 @@
           <property name="spacing">
            <number>0</number>
           </property>
-          <item row="0" column="0" rowspan="2">
+          <item row="0" column="0" rowspan="4">
            <widget class="QListWidget" name="landscapesListWidget">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
@@ -1292,6 +1292,22 @@
             </property>
            </widget>
           </item>
+          <item row="2" column="1">
+           <widget class="QPushButton" name="pushButtonAddRemoveLandscapes">
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>37</height>
+             </size>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">margin-left: 10px; margin-right: 10px; margin-bottom:10px;</string>
+            </property>
+            <property name="text">
+             <string>Add/remove landscapes...</string>
+            </property>
+           </widget>
+          </item>
           <item row="1" column="1">
            <widget class="QGroupBox" name="landscapeOptionsGroupBox">
             <property name="sizePolicy">