Changeset 191

Timestamp:

26/04/09 17:03:05 (4 years ago)

Author:

guyru

Message:

Portable Edition 1.9 Preparations.

Removed SQLite support. Fixed configuration file path. Add new MSVC
configuration for the portable edition.

Location:

trunk

Files:

• openyahtzee.sln (modified) (2 diffs)
• openyahtzee.vcproj (modified) (3 diffs)
• src/DBwrapper.cpp (deleted)
• src/DBwrapper.h (deleted)
• src/MainFrame.cpp (modified) (1 diff)
• src/Makefile.am (modified) (4 diffs)
• src/configuration.cpp (modified) (2 diffs)
• src/configuration.h (modified) (3 diffs)
• src/sqlite (deleted)

trunk/openyahtzee.sln

@@ -7 +7 @@
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
                 Debug|Win32 = Debug|Win32
+                Portable Release|Win32 = Portable Release|Win32
                 Unicode Release|Win32 = Unicode Release|Win32
         EndGlobalSection
@@ -12 +13 @@
                 {751F1BED-0ADC-47C4-8424-42745E9CDF2C}.Debug|Win32.ActiveCfg = Debug|Win32
                 {751F1BED-0ADC-47C4-8424-42745E9CDF2C}.Debug|Win32.Build.0 = Debug|Win32
+                {751F1BED-0ADC-47C4-8424-42745E9CDF2C}.Portable Release|Win32.ActiveCfg = Portable Release|Win32
+                {751F1BED-0ADC-47C4-8424-42745E9CDF2C}.Portable Release|Win32.Build.0 = Portable Release|Win32
                 {751F1BED-0ADC-47C4-8424-42745E9CDF2C}.Unicode Release|Win32.ActiveCfg = Release|Win32
                 {751F1BED-0ADC-47C4-8424-42745E9CDF2C}.Unicode Release|Win32.Build.0 = Release|Win32

trunk/openyahtzee.vcproj

@@ -167 +167 @@
                         />
                 </Configuration>
+                <Configuration
+                        Name="Portable Release|Win32"
+                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)"
+                        ConfigurationType="1"
+                        CharacterSet="1"
+                        WholeProgramOptimization="1"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                Optimization="1"
+                                EnableIntrinsicFunctions="true"
+                                AdditionalIncludeDirectories="&quot;D:\wxWidgets-2.8.7\include&quot;;&quot;D:\wxWidgets-2.8.7\include\msvc&quot;"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;PORTABLE"
+                                RuntimeLibrary="2"
+                                EnableFunctionLevelLinking="true"
+                                UsePrecompiledHeader="0"
+                                WarningLevel="3"
+                                DebugInformationFormat="3"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                                AdditionalIncludeDirectories="&quot;D:\wxWidgets-2.8.7\include&quot;"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                AdditionalDependencies="comctl32.lib rpcrt4.lib winmm.lib advapi32.lib wsock32.lib wxmsw28u_core.lib wxbase28u.lib wxmsw28u_adv.lib wxmsw28u_aui.lib wxpng.lib wxjpeg.lib wxtiff.lib"
+                                LinkIncremental="1"
+                                AdditionalLibraryDirectories="&quot;D:\wxWidgets-2.8.7\lib\vc_lib&quot;"
+                                GenerateDebugInformation="false"
+                                SubSystem="2"
+                                OptimizeReferences="2"
+                                EnableCOMDATFolding="2"
+                                TargetMachine="1"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
         </Configurations>
         <References>
@@ -185 +263 @@
                         </File>
                         <File
-                                RelativePath=".\src\DBwrapper.cpp"
-                                >
-                        </File>
-                        <File
                                 RelativePath=".\src\highscores_dialog.cpp"
                                 >
@@ -207 +281 @@
                                 RelativePath=".\src\settings_dialog.cpp"
                                 >
-                        </File>
-                        <File
-                                RelativePath=".\src\sqlite\sqlite3.c"
-                                >
+                                <FileConfiguration
+                                        Name="Portable Release|Win32"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                                Optimization="1"
+                                                PreprocessorDefinitions="PORTABLE"
+                                        />
+                                </FileConfiguration>
                         </File>
                         <File

trunk/src/MainFrame.cpp

@@ -86 +86 @@
                 }
         #else
-                wxString config_file = wxStandardPaths::Get().GetExecutablePath() + wxT("/openyahtzee.dat");
+                wxFileName tmp_config_file(wxStandardPaths::Get().GetExecutablePath());
+                tmp_config_file.SetFullName(wxT("openyahtzee.dat"));
+                wxString config_file = tmp_config_file.GetFullPath();
         #endif
 

trunk/src/Makefile.am

@@ -6 +6 @@
         configuration.cpp \
         configuration.h \
-        DBwrapper.cpp \
         MainFrame.cpp \
         highscores_dialog.cpp \
@@ -22 +21 @@
         four.xpm \
         five.xpm \
-        six.xpm \
-        sqlite/sqlite3.c \
-        sqlite/sqlite3.h
+        six.xpm
 
 # set the include path found by configure
@@ -32 +29 @@
 
 noinst_HEADERS = \
-        DBwrapper.h \
         openyahtzee.ico \
         MainFrame.h \
@@ -43 +39 @@
 
 AM_CXXFLAGS = @WX_CXXFLAGS@
-openyahtzee_LDFLAGS = @WX_LIBS@
+openyahtzee_LDADD = @WX_LIBS@

trunk/src/configuration.cpp

@@ -50 +50 @@
         getline(conf_file,header);
         if (header.substr(0,11) != "openyahtzee") {
-                // this is probably an old sqllite file import it.
-                conf_file.close();
-                importOldFile();
+                /* The file might be an old configuration file or
+                 * currupted, anyway re-create it
+                 */
+                loadDefaultSettings();
+                save();
                 return;
         }
@@ -190 +192 @@
 }
 
-
-void Configuration::importOldFile()
-{
-        loadDefaultSettings();
-        if (old_db.Open(m_file)!=SQLITE_OK) {
-                return;
-        }
-        importSettings();
-        // importHighscores is called after importSettings() so the
-        // highscore size settings will be known
-        importHighscores();
-}
-
-string Configuration::getKeyFromDb(string key)
-{
-        string tmp_query;
-        std::list<string> tmp_value;
-        
-        tmp_query = "SELECT value FROM settings WHERE key = \"" + key + "\"";
-
-        tmp_value = old_db.Query(tmp_query);
-        if (tmp_value.empty()) { //if there was no result return an empty string
-                tmp_query = ""; //use tmp_query for holding a tmp_string
-                return tmp_query;
-        }
-        return  *(tmp_value.begin());
-}
-
-void Configuration::importSettings()
-{
-        string temp_value;
-
-        temp_value = getKeyFromDb("animate");
-        if (temp_value=="No") {
-                set("dice-animation","False");
-        }
-
-        temp_value = getKeyFromDb("calculatesubtotal");
-        if (temp_value=="No") {
-                set("calculate-subtotal","False");
-        }
-
-        temp_value = getKeyFromDb("horizontalayout");
-        if (temp_value=="No") {
-                set("horizontal-layout","False");
-        }
-
-        temp_value = getKeyFromDb("score_hints");
-        if (temp_value=="No") {
-                set("score-hints","False");
-        }
-
-        temp_value = getKeyFromDb("highscoresize");
-        if (temp_value=="") {
-                set("highscore-list-size",DEFAULT_HIGHSCORE_SIZE);
-        }
-}
-
-void Configuration::importHighscores()
-{
-        string tmp_query = "SELECT name,date,score FROM highscore LIMIT "
-                + m_settings["highscore-list-size"];
-        
-        list<string> res = old_db.Query(tmp_query);
-        HighscoreItem temp_item;
-
-        list<string>::iterator it = res.begin();
-        size_t pos;
-        while(it!=res.end()) {
-                temp_item.name = (*it++);
-
-                // the database saved the the hour before the date,
-                // we need to reverse this
-                pos = it->find(' ');
-                temp_item.date = it->substr(pos+1); // date
-                temp_item.date += " " + it->substr(0,pos-3); // time, without seconds
-                it++;
-
-                temp_item.score = atoi((*it++).c_str());
-
-                m_highscores.push_back(temp_item);
-        }
-}
-
 bool Configuration::isHighscore(int score) {
         const unsigned int highscore_list_size = atoi(m_settings["highscore-list-size"].c_str());

trunk/src/configuration.h

@@ -22 +22 @@
 #define OPENYAHTZEE_CONFIGURATION_INC
 
-#include "DBwrapper.h" // used in the back-compatibility code
 #include <string>
 #include <fstream>
@@ -80 +79 @@
         void setHighscoresSize(size_t size);
 private:
-        /**
-         * Imports old style configuration from sqllite database.
-         */
-        void importOldFile();
-
         void parseSettings(std::ifstream *file);
         void parseHighscores(std::ifstream *file);
@@ -100 +94 @@
 
         std::string m_file;
-
-        /* The following functions and variables are used for legacy SQLite
-         * configuration file, and could be dropped.
-         */
-        DBwrapper old_db;
-        std::string getKeyFromDb(std::string key);
-        void importSettings();
-        void importHighscores();
 };