Resume the last game.

Customizable width and height.
OSD error compensation (shrink width/height or reduce colors).
Added setup option to hide the top row.
Set normal variation (two decks and 10 piles) as standard, together with "shrink height" and "hide top row".
Added user-defined variations.
Improved key handling.

1 files changed, 94 insertions, 3 deletions

diff --git a/setup.cpp b/setup.cpp
index 672e782..aa5a3ff 100644
--- a/setup.cpp
+++ b/setup.cpp
@@ -17,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * $Id: setup.cpp 95 2007-09-21 23:01:10Z tom $
+ * $Id: setup.cpp 97 2007-09-24 22:29:48Z tom $
  */
 
 #include "setup.h"
@@ -35,7 +35,16 @@ using namespace SpiderPlugin;
  */
 SetupData::SetupData()
 {
-  variation = Mini;
+  variation = Normal;
+  deck_count = 2;
+  pile_count = 10;
+  deal_count = 5;
+  osd_left = 48;
+  osd_top = 45;
+  osd_width = 624;
+  osd_height = 486;
+  osd_error_compensation = ShrinkHeight;
+  hide_toprow = 1;
 }
 
 /** Parse the setup parameters of the plugin.
@@ -47,6 +56,24 @@ bool SetupData::parse(const char* name, const char* value)
 {
   if (!strcasecmp(name, "Variation"))
     variation = atoi(value);
+  else if (!strcasecmp(name, "CustomDeckCount"))
+    deck_count = atoi(value);
+  else if (!strcasecmp(name, "CustomPileCount"))
+    pile_count = atoi(value);
+  else if (!strcasecmp(name, "CustomDealCount"))
+    deal_count = atoi(value);
+  else if (!strcasecmp(name, "OSDLeft"))
+    osd_left = atoi(value);
+  else if (!strcasecmp(name, "OSDTop"))
+    osd_top = atoi(value);
+  else if (!strcasecmp(name, "OSDWidth"))
+    osd_width = atoi(value);
+  else if (!strcasecmp(name, "OSDHeight"))
+    osd_height = atoi(value);
+  else if (!strcasecmp(name, "OSDErrorCompensation"))
+    osd_error_compensation = atoi(value);
+  else if (!strcasecmp(name, "HideToprow"))
+    hide_toprow = atoi(value);
   else
     return false;
   return true;
@@ -61,8 +88,63 @@ SetupPage::SetupPage(SetupData& setup) :
 {
   variationTexts[0] = tr("Mini (one deck)");
   variationTexts[1] = tr("Normal");
+  variationTexts[2] = tr("Custom");
+  compensationTexts[0] = tr("Shrink height");
+  compensationTexts[1] = tr("Shrink width");
+  compensationTexts[2] = tr("Shrink width and height");
+  compensationTexts[3] = tr("Reduce colors");
+  SetHelp(tr("Reset"));
+  Setup();
+}
+
+/** Set values into the menu page */
+void SetupPage::Setup()
+{
+  int current = Current();
+  Clear();
+
   Add(new cMenuEditStraItem(tr("Variation"), &data.variation,
-                            2, variationTexts));
+                            3, variationTexts));
+
+  if (data.variation == SetupData::Custom)
+  {
+    // TRANSLATORS: note the leading blank!
+    Add(new cMenuEditIntItem(tr(" Deck count"), &data.deck_count, 1, 4));
+    // TRANSLATORS: note the leading blank!
+    Add(new cMenuEditIntItem(tr(" Pile count"), &data.pile_count, 1, 20));
+    // TRANSLATORS: note the leading blank!
+    Add(new cMenuEditIntItem(tr(" Deal count"), &data.deal_count, 1, 10));
+  }
+
+  Add(new cMenuEditIntItem(tr("OSD position left"), &data.osd_left, 0, 720));
+  Add(new cMenuEditIntItem(tr("OSD position top"), &data.osd_top, 0, 576));
+  Add(new cMenuEditIntItem(tr("OSD width"), &data.osd_width, 100, 720));
+  Add(new cMenuEditIntItem(tr("OSD height"), &data.osd_height, 100, 576));
+  Add(new cMenuEditStraItem(tr("OSD error compensation"),
+                            &data.osd_error_compensation,
+                            4, compensationTexts));
+  Add(new cMenuEditBoolItem(tr("Hide top row"), &data.hide_toprow));
+
+  SetCurrent(Get(current));
+  Display();
+}
+
+/** Process user events */
+eOSState SetupPage::ProcessKey(eKeys Key)
+{
+  int custom = (data.variation == SetupData::Custom);
+  eOSState state = cMenuSetupPage::ProcessKey(Key);
+
+  if (Key != kNone && custom != (data.variation == SetupData::Custom))
+    Setup();
+
+  if (state == osUnknown && Key == kRed)
+  {
+    data = SetupData();
+    Setup();
+    state = osContinue;
+  }
+  return state;
 }
 
 /** Store the setup parameters of the plugin.
@@ -74,4 +156,13 @@ void SetupPage::Store()
 {
   setup = data;
   SetupStore("Variation", setup.variation);
+  SetupStore("CustomDeckCount", setup.deck_count);
+  SetupStore("CustomPileCount", setup.pile_count);
+  SetupStore("CustomDealCount", setup.deal_count);
+  SetupStore("OSDLeft", setup.osd_left);
+  SetupStore("OSDTop", setup.osd_top);
+  SetupStore("OSDWidth", setup.osd_width);
+  SetupStore("OSDHeight", setup.osd_height);
+  SetupStore("OSDErrorCompensation", setup.osd_error_compensation);
+  SetupStore("HideToprow", setup.hide_toprow);
 }