[dasher] Rm SP_DEFAULT_COLOUR_ID

[Patrick Welche <pwelche src gnome org>]

commit a61e7d86f8f132df5f0d36d51610a672889cb505
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date:   Thu Jun 23 15:18:03 2011 +0100

    Rm SP_DEFAULT_COLOUR_ID
    
    It was just a global variable storing GetPalette() of the current alphabet...

 Src/DasherCore/DasherInterfaceBase.cpp |    5 +++--
 Src/DasherCore/NodeCreationManager.cpp |    6 +-----
 Src/DasherCore/Parameters.cpp          |    3 +--
 Src/DasherCore/Parameters.h            |    2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/Src/DasherCore/DasherInterfaceBase.cpp b/Src/DasherCore/DasherInterfaceBase.cpp
index c6a2d3d..b8bae0d 100644
--- a/Src/DasherCore/DasherInterfaceBase.cpp
+++ b/Src/DasherCore/DasherInterfaceBase.cpp
@@ -265,10 +265,9 @@ void CDasherInterfaceBase::HandleEvent(int iParameter) {
     ChangeColours();
     ScheduleRedraw();
     break;
-  case SP_DEFAULT_COLOUR_ID: // Delibarate fallthrough
   case BP_PALETTE_CHANGE:
     if(GetBoolParameter(BP_PALETTE_CHANGE))
- SetStringParameter(SP_COLOUR_ID, GetStringParameter(SP_DEFAULT_COLOUR_ID));
+ SetStringParameter(SP_COLOUR_ID, m_pNCManager->GetAlphabet()->GetPalette());
     break;
   case LP_LANGUAGE_MODEL_ID:
     CreateNCManager();
@@ -411,6 +410,8 @@ void CDasherInterfaceBase::CreateNCManager() {
 
   //now create the new manager...
   m_pNCManager = new CNodeCreationManager(this, this, m_AlphIO);
+  if (GetBoolParameter(BP_PALETTE_CHANGE))
+    SetStringParameter(SP_COLOUR_ID, m_pNCManager->GetAlphabet()->GetPalette());
 
   if (m_DasherScreen) {
     m_pNCManager->ChangeScreen(m_DasherScreen);
diff --git a/Src/DasherCore/NodeCreationManager.cpp b/Src/DasherCore/NodeCreationManager.cpp
index d317e95..cad445c 100644
--- a/Src/DasherCore/NodeCreationManager.cpp
+++ b/Src/DasherCore/NodeCreationManager.cpp
@@ -42,11 +42,7 @@ CNodeCreationManager::CNodeCreationManager(CSettingsUser *pCreateFrom,
   m_pInterface(pInterface), m_pControlManager(NULL), m_pScreen(NULL) {
 
   const Dasher::CAlphInfo *pAlphInfo(pAlphIO->GetInfo(GetStringParameter(SP_ALPHABET_ID)));
-  
-  SetStringParameter(SP_DEFAULT_COLOUR_ID, pAlphInfo->GetPalette());
-  
-  // --
-  
+
   switch (pAlphInfo->m_iConversionID) {
     default:
       //TODO: Error reporting here
diff --git a/Src/DasherCore/Parameters.cpp b/Src/DasherCore/Parameters.cpp
index a461cea..c2e1f3e 100644
--- a/Src/DasherCore/Parameters.cpp
+++ b/Src/DasherCore/Parameters.cpp
@@ -162,7 +162,6 @@ const sp_table stringparamtable[] = {
   {SP_ALPHABET_3, "Alphabet3", PERS, "", "Alphabet History 3"},
   {SP_ALPHABET_4, "Alphabet4", PERS, "", "Alphabet History 4"},
   {SP_COLOUR_ID, "ColourID", PERS, "", "ColourID"}, 
-  {SP_DEFAULT_COLOUR_ID, "DefaultColourID", !PERS, "", "Default Colour ID (Used for auto-colour mode)"},
   {SP_DASHER_FONT, "DasherFont", PERS, "", "DasherFont"},
   {SP_SYSTEM_LOC, "SystemLocation", !PERS, "sys_", "System Directory"},
   {SP_USER_LOC, "UserLocation", !PERS, "usr_", "User Directory"},
@@ -219,4 +218,4 @@ std::string GetParameterName(int iParameter) {
 }
 
 } //end namespace Settings
-} //end namespace Dasher
\ No newline at end of file
+} //end namespace Dasher
diff --git a/Src/DasherCore/Parameters.h b/Src/DasherCore/Parameters.h
index f98d867..a747608 100644
--- a/Src/DasherCore/Parameters.h
+++ b/Src/DasherCore/Parameters.h
@@ -71,7 +71,7 @@ enum {
 
 enum {
   SP_ALPHABET_ID = END_OF_LPS, SP_ALPHABET_1, SP_ALPHABET_2, SP_ALPHABET_3, SP_ALPHABET_4, 
-  SP_COLOUR_ID, SP_DEFAULT_COLOUR_ID, SP_DASHER_FONT, SP_SYSTEM_LOC, SP_USER_LOC, SP_GAME_TEXT_FILE,
+  SP_COLOUR_ID, SP_DASHER_FONT, SP_SYSTEM_LOC, SP_USER_LOC, SP_GAME_TEXT_FILE,
   SP_SOCKET_INPUT_X_LABEL, SP_SOCKET_INPUT_Y_LABEL, SP_INPUT_FILTER, SP_INPUT_DEVICE,
   SP_BUTTON_0, SP_BUTTON_1, SP_BUTTON_2, SP_BUTTON_3, SP_BUTTON_4, SP_BUTTON_10, SP_JOYSTICK_DEVICE,
 #ifdef TARGET_OS_IPHONE