Jeck - Some basic options handling rewrites, main menu update, example alternate theme (for testing). I'm closing issues 44 and 45, as hopefully this resolves them satisfactorily.

* The alternate theme is just useful for testing themes, but please comment on the changes to the main theme.
 * Options reading and initializing separated from UI.
 * Options UI abstracted a bit, made more easily extensible.
 * With some extension, the options UI could be used as the basis for more complicated themes, if we load a file and use it to do stuff like GameStateOptions::Start()

projects/mtg/src/GameStateOptions.cpp

@@ -10,7 +10,7 @@
 GameStateOptions::GameStateOptions(GameApp* parent): GameState(parent) {
   optionsTabs = NULL;
   optionsMenu = NULL;
-  confirmMenu = NULL;
+  mReload = false;
 }
 
 
@@ -20,57 +20,61 @@ GameStateOptions::~GameStateOptions() {
 
 void GameStateOptions::Start()
 {
+  newProfile = "";
   timer =  0;
   mState = SHOW_OPTIONS;
   JRenderer::GetInstance()->EnableVSync(true);
 
-  OptionsList * optionsList;
+  WGuiList * optionsList;
 
-  optionsList = NEW OptionsList("Settings");
+  optionsList = NEW WGuiList("Settings");
   
-  optionsList->Add(NEW OptionHeader("General Options"));
-  if (GameApp::HasMusic) optionsList->Add(NEW OptionVolume(Options::MUSICVOLUME, "Music volume", true));
-  optionsList->Add(NEW OptionVolume(Options::SFXVOLUME, "SFX volume"));
+  optionsList->Add(NEW WGuiHeader("General Options"));
+  if (GameApp::HasMusic) 
+    optionsList->Add(NEW WDecoEnum(NEW OptionInteger(Options::MUSICVOLUME,"Music volume",100,10,100),OptionVolume::getInstance()));
+  optionsList->Add(NEW WDecoEnum(NEW OptionInteger(Options::SFXVOLUME,"SFX volume",100,10,100),OptionVolume::getInstance()));
   optionsList->Add(NEW OptionInteger(Options::OSD, "Display InGame extra information"));
   if (options[Options::DIFFICULTY_MODE_UNLOCKED].number)
-    optionsList->Add(NEW OptionInteger(Options::DIFFICULTY, "Difficulty", 3, 1));
+    optionsList->Add(NEW WDecoEnum(NEW OptionInteger(Options::DIFFICULTY,"Difficulty",3,1,0),OptionDifficulty::getInstance()));
   optionsList->Add(NEW OptionInteger(Options::INTERRUPT_SECONDS, "Seconds to pause for an Interrupt", 20, 1));
   optionsList->Add(NEW OptionInteger(Options::INTERRUPTMYSPELLS, "Interrupt my spells"));
   optionsList->Add(NEW OptionInteger(Options::INTERRUPTMYABILITIES, "Interrupt my abilities"));  
-  optionsTabs = NEW OptionsMenu();  
+  optionsTabs = NEW WGuiTabMenu();  
   optionsTabs->Add(optionsList);
 
-  optionsList = NEW OptionsList("Game");
-  optionsList->Add(NEW OptionClosedHand(Options::CLOSEDHAND, "Closed hand"));
-  optionsList->Add(NEW OptionHandDirection(Options::HANDDIRECTION, "Hand direction"));
-  optionsList->Add(NEW OptionManaDisplay(Options::MANADISPLAY, "Mana display"));
+  optionsList = NEW WGuiList("Game");
+  optionsList->Add(NEW WGuiHeader("Interface Options"));
+  optionsList->Add(NEW WDecoEnum(NEW OptionInteger(Options::CLOSEDHAND,"Closed hand",2,1,0)));
+  optionsList->Add(NEW WDecoEnum(NEW OptionInteger(Options::CLOSEDHAND,"Hand direction",2,1,0)));
+  optionsList->Add(NEW WDecoEnum(NEW OptionInteger(Options::MANADISPLAY,"Mana display",3,1,0)));
   optionsList->Add(NEW OptionInteger(Options::REVERSETRIGGERS, "Reverse left and right triggers"));
   optionsList->Add(NEW OptionInteger(Options::DISABLECARDS,"Disable card image loading"));
   optionsTabs->Add(optionsList);
 
-  optionsList = NEW OptionsList("Profiles");
-  OptionNewProfile * key = NEW OptionNewProfile("New Profile");
-  key->bShowValue = false;
-  optionsList->Add(key);
-  OptionProfile * pickProf = NEW OptionProfile(mParent);
-  optionsList->Add(pickProf);
-  OptionTheme * theme = NEW OptionTheme();  
-  optionsList->Add(theme);
+  optionsList = NEW WGuiList("User");
+  optionsList->Add(NEW WGuiHeader("User Options"));
+
+  WDecoConfirm * cPrf = NEW WDecoConfirm(this,NEW OptionProfile(mParent,this));
+  cPrf->confirm = "Use this Profile";
+  OptionDirectory * od = NEW OptionTheme();
+  WDecoConfirm * cThm = NEW WDecoConfirm(this,od);
+  cThm->confirm = "Use this Theme";  
   
+  optionsList->Add(NEW WGuiSplit(cPrf,cThm));
+  optionsList->Add(NEW WGuiButton(NEW WGuiHeader("New Profile"),-102,4,this));
   optionsTabs->Add(optionsList);
-  optionsList = NEW OptionsList("Credits");
+
+  optionsList = NEW WGuiList("Credits");
   optionsList->failMsg = "";
   optionsTabs->Add(optionsList);
 
   JLBFont * mFont = resources.GetJLBFont("f3");
-  optionsMenu = NEW SimpleMenu(102, this,mFont, 50,170);
+  optionsMenu = NEW SimpleMenu(-102, this,mFont, 50,170);
   optionsMenu->Add(1, "Save & Back to Main Menu");
   optionsMenu->Add(2, "Back to Main Menu");
   optionsMenu->Add(3, "Cancel");
 
-  confirmMenu = NEW SimpleMenu(103, this,mFont, 50,170);
-  confirmMenu->Add(1, "Use this profile");
-  confirmMenu->Add(2, "Cancel");
+  optionsTabs->Current()->Entering(0);
 }
 
 
@@ -79,7 +83,6 @@ void GameStateOptions::End()
   JRenderer::GetInstance()->EnableVSync(false);
   SAFE_DELETE(optionsTabs);
   SAFE_DELETE(optionsMenu);
-  SAFE_DELETE(confirmMenu);
 }
 
 
@@ -89,30 +92,29 @@ void GameStateOptions::Update(float dt)
 
   if(options.keypadActive()){
     options.keypadUpdate(dt);
-  }
-  else if (mState == SHOW_OPTIONS){
-    
-    switch(optionsTabs->Submode()){
-     case OPTIONS_SUBMODE_RELOAD:
-      optionsTabs->acceptSubmode();
-      optionsTabs->reloadValues();
-      mState = SHOW_OPTIONS;
-       break;
-     case OPTIONS_SUBMODE_PROFILE:
-      mState = SHOW_OPTIONS_PROFILE;
-      break;
-     default:
-      if (PSP_CTRL_START == mEngine->ReadButton() )
-        mState = SHOW_OPTIONS_MENU;
-      
-      optionsTabs->Update(dt);
-      break;
-    }
 
-  }else if(mState == SHOW_OPTIONS_MENU){
-    optionsMenu->Update(dt);
-  }else if(mState == SHOW_OPTIONS_PROFILE){
-    confirmMenu->Update(dt);
+    if(newProfile != ""){
+        newProfile = options.keypadFinish();
+        if(newProfile != ""){
+          options[Options::ACTIVE_PROFILE] = newProfile;
+          options.reloadProfile(false);
+          optionsTabs->Reload();
+        }
+        newProfile = "";
+    }
+  }
+  else switch(mState){
+    default:
+    case SHOW_OPTIONS:
+      optionsTabs->Update(dt);
+
+      if (mEngine->ReadButton() == PSP_CTRL_START){
+        mState = SHOW_OPTIONS_MENU;
+      }
+      break;
+    case SHOW_OPTIONS_MENU:
+      optionsMenu->Update(dt);
+    break;
   }
 }
 
@@ -161,24 +163,22 @@ void GameStateOptions::Render()
 
   optionsTabs->Render();
 
-  switch(mState){
-  case SHOW_OPTIONS_MENU:
-    optionsMenu->Render();
-    break;
-  case SHOW_OPTIONS_PROFILE:
-    confirmMenu->Render();
-    break;
+  if(mReload){
+    optionsTabs->Reload();
+    mReload = false;
   }
 
+  if(mState == SHOW_OPTIONS_MENU)    
+      optionsMenu->Render();
+
   if(options.keypadActive())
     options.keypadRender();
 }
 
-
 void GameStateOptions::ButtonPressed(int controllerId, int controlId)
 {
   //Exit menu?
-  if(controllerId == 102)
+  if(controllerId == -102)
   switch (controlId){
   case 1:
     optionsTabs->save();
@@ -188,22 +188,14 @@ void GameStateOptions::ButtonPressed(int controllerId, int controlId)
   case 3:
     mState = SHOW_OPTIONS;
     break;
-  }
-  //Profile confirmation?
-  else if(controllerId == 103)
-  switch (controlId){
-  case 1:
-    //Load the New profile.
-    optionsTabs->acceptSubmode();
-    optionsTabs->reloadValues();
-    //Reset the current settings to those of the profile...
-    mState = SHOW_OPTIONS;
+  case 4:
+    options.keypadStart("",&newProfile);
+    options.keypadTitle("New Profile");
     break;
-  case 2:
-    optionsTabs->cancelSubmode();
-    mState = SHOW_OPTIONS;
+  case 5:
+    mReload = true;
     break;
   }
-};
-
-
+  else
+    optionsTabs->ButtonPressed(controllerId, controlId);
+};