Changeset 88 for trunk

Timestamp:

27/05/07 13:16:16 (6 years ago)

Author:

guyru

Message:

added settings for horizontal dialog in settings-dialog

Location:

trunk/OpenYahtzee

Files:

• openyahtzee.kdevelop.pcs (modified) (previous)
• openyahtzee.kdevses (modified) (3 diffs)
• src/MainFrame.cpp (modified) (5 diffs)
• src/SettingsDialog.cpp (modified) (4 diffs)
• src/SettingsDialog.h (modified) (2 diffs)

trunk/OpenYahtzee/openyahtzee.kdevses

@@ -2 +2 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="8" >
+ <DocsAndViews NumberOfDocuments="9" >
   <Doc0 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/About.cpp" >
    <View0 Type="Source" />
@@ -10 +10 @@
   </Doc1>
   <Doc2 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/MainFrame.cpp" >
-   <View0 line="199" Type="Source" />
+   <View0 line="124" Type="Source" />
   </Doc2>
   <Doc3 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/MainFrame.h" >
@@ -21 +21 @@
    <View0 Type="Source" />
   </Doc5>
-  <Doc6 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/UtilityFunctions.cpp" >
-   <View0 Type="Source" />
+  <Doc6 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/wxDynamicBitmap.cpp" >
+   <View0 line="106" Type="Source" />
   </Doc6>
-  <Doc7 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/wxDynamicBitmap.cpp" >
-   <View0 line="84" Type="Source" />
+  <Doc7 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/SettingsDialog.cpp" >
+   <View0 line="40" Type="Source" />
   </Doc7>
+  <Doc8 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/SettingsDialog.h" >
+   <View0 line="70" Type="Source" />
+  </Doc8>
  </DocsAndViews>
  <pluginList>

trunk/OpenYahtzee/src/MainFrame.cpp

@@ -122 +122 @@
         wxPanel* panel = new wxPanel(this, ID_PANEL,
                 wxDefaultPosition, wxDefaultSize);
-        m_horizontallayout = 0; //TODO remove this line
+
         wxBoxSizer *topSizer;
         wxBoxSizer *sectionsSizer;
@@ -430 +430 @@
         data.animate = (m_settingsdb->GetKey("animate")=="Yes")?true:false;
         data.subtotal = (m_settingsdb->GetKey("calculatesubtotal")=="Yes")?true:false;
+        data.horizontal = (m_settingsdb->GetKey("horizontallayout")=="Yes")?true:false;
         
         dialog->SetData(data);
@@ -458 +459 @@
                         m_settingsdb->SetKey("calculatesubtotal","No");
                         m_calculatesubtotal = false;
+                }
+                if (data.horizontal){
+                        m_settingsdb->SetKey("horizontallayout","Yes");
+                        m_horizontallayout = true;
+                        
+                } else {
+                        m_settingsdb->SetKey("horizontallayout","No");
+                        m_horizontallayout = false;
                 }
 
@@ -1014 +1023 @@
                 m_animate = true;
         }
+
         if (m_settingsdb->GetKey("calculatesubtotal") == "Yes") {
                 m_calculatesubtotal = true;
@@ -1022 +1032 @@
                 m_calculatesubtotal = true;
         }
-        
+
+        if (m_settingsdb->GetKey("horizontallayout") == "Yes") {
+                m_horizontallayout = true;
+        } else if (m_settingsdb->GetKey("horizontallayout") == "No") {
+                m_horizontallayout = false;
+        } else {
+                m_settingsdb->SetKey("horizontallayout", "No");
+                m_horizontallayout = false;
+        }
         if (m_settingsdb->GetKey("openyahtzeehomepage") == "") {
                 m_settingsdb->SetKey("openyahtzeehomepage", "http://openyahtzee.sourceforge.net/");

trunk/OpenYahtzee/src/SettingsDialog.cpp

@@ -39 +39 @@
         animate_checkbox = new wxCheckBox(this, ID_ANIMATECHECKBOX, wxT("Animate dice"));
         subtotal_checkbox = new wxCheckBox(this, wxID_ANY, wxT("Calculate sub-total score for the upper and lower sections"));
+        horizontal_checkbox = new wxCheckBox(this, wxID_ANY, wxT("Enable horizontal layout for user interface \n(requires restart of the game)."));
 
 
@@ -65 +66 @@
         top_sizer->Add(animate_checkbox,0,wxALL,5);
         top_sizer->Add(subtotal_checkbox,0,wxALL,5);
+        top_sizer->Add(horizontal_checkbox,0,wxALL,5);
 
         top_sizer->Add(CreateButtonSizer(wxOK|wxCANCEL), 1, wxBOTTOM, 10);
@@ -93 +95 @@
         animate_checkbox->SetValue(data.animate);
         subtotal_checkbox->SetValue(data.subtotal);
+        horizontal_checkbox->SetValue(data.horizontal);
 }
 
@@ -102 +105 @@
         data.animate = animate_checkbox->GetValue();
         data.subtotal = subtotal_checkbox->GetValue();
+        data.horizontal = horizontal_checkbox->GetValue();
         return data;
 }

trunk/OpenYahtzee/src/SettingsDialog.h

@@ -39 +39 @@
         bool animate;
         bool subtotal;
+        bool horizontal;
 };
 
@@ -68 +69 @@
         wxCheckBox* animate_checkbox;
         wxCheckBox* subtotal_checkbox;
+        wxCheckBox* horizontal_checkbox;
         
 };