From 41edc27edec1292205a906c2415d6f025b058935 Mon Sep 17 00:00:00 2001
From: Robert Knight <robertknight@gmail.com>
Date: Sat, 5 May 2007 23:20:54 +0000
Subject: [PATCH] Remove a number of older color schemes from the default
 installation.  Remember to unpreview changes if the edit profile dialog is
 not accepted.

svn path=/branches/work/konsole-split-view/; revision=661555
---
 konsole/EditProfileDialog.cpp      |  3 ++-
 other/color-schemes/CMakeLists.txt | 39 ++++++++++++++++--------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/konsole/EditProfileDialog.cpp b/konsole/EditProfileDialog.cpp
index 16e2641d..c4d503d1 100644
--- a/konsole/EditProfileDialog.cpp
+++ b/konsole/EditProfileDialog.cpp
@@ -308,7 +308,8 @@ void EditProfileDialog::hideEvent(QHideEvent* event)
 
         // only reset preview changes for temporary changes 
         // ( changes saved in _tempProfile are considered permanent )
-        if ( !_tempProfile->isPropertySet( (Profile::Property)iter.key() ) )
+        if ( !_tempProfile->isPropertySet( (Profile::Property)iter.key() ) 
+             || result() != QDialog::Accepted )
             map.insert((Profile::Property)iter.key(),iter.value());
     }
 
diff --git a/other/color-schemes/CMakeLists.txt b/other/color-schemes/CMakeLists.txt
index ac604c97..7f9f4c0b 100644
--- a/other/color-schemes/CMakeLists.txt
+++ b/other/color-schemes/CMakeLists.txt
@@ -1,24 +1,27 @@
+# Note some color schemes are deliberately not installed
+# at present
+
 install( FILES 
-         BlackOnLightColor.schema 
+#       BlackOnLightColor.schema 
          BlackOnLightYellow.schema 
          BlackOnWhite.schema  	
-         Example.Schema 
-         GreenOnBlack.schema 
-         WhiteOnBlack.schema  	
-         README.default.Schema 
-         syscolor.schema 
-         Linux.schema
+#        Example.Schema 
+        GreenOnBlack.schema 
+        WhiteOnBlack.schema  	
+#        README.default.Schema 
+#        syscolor.schema 
+#         Linux.schema
          Linux.colorscheme 
-         XTerm.schema 
-         vim.schema    
-         DarkPicture.schema 
-         LightPicture.schema 
-         Transparent.schema 
-         GreenTint.schema    
-         Transparent_MC.schema 
-         GreenTint_MC.schema    
-         Transparent_lightbg.schema    
-         Transparent_darkbg.schema
-         README.Schema 
+#         XTerm.schema 
+#         vim.schema    
+#         DarkPicture.schema 
+#         LightPicture.schema 
+#         Transparent.schema 
+#         GreenTint.schema    
+#         Transparent_MC.schema 
+#         GreenTint_MC.schema    
+#         Transparent_lightbg.schema    
+#         Transparent_darkbg.schema
+#         README.Schema 
          DESTINATION 
          ${DATA_INSTALL_DIR}/konsole )