Merge remote-tracking branch 'sirherrbatka/filters' into saving

CMakeLists.txt

@@ -319,6 +319,9 @@ configure_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg
 
 configure_file(${OpenMW_SOURCE_DIR}/files/opencs.cfg
     "${OpenMW_BINARY_DIR}/opencs.cfg")
+    
+configure_file(${OpenMW_SOURCE_DIR}/files/opencs/defaultfilters
+    "${OpenMW_BINARY_DIR}/resources/defaultfilters" COPYONLY)
 
 if (NOT WIN32 AND NOT APPLE)
     configure_file(${OpenMW_SOURCE_DIR}/files/openmw.desktop

apps/opencs/editor.cpp

@@ -8,10 +8,11 @@
 
 #include "model/doc/document.hpp"
 #include "model/world/data.hpp"
+#include <iostream>
 
 
 CS::Editor::Editor()
-: mDocumentManager (mCfgMgr), mViewManager (mDocumentManager)
+    : mDocumentManager (mCfgMgr), mViewManager (mDocumentManager)
 {
     mIpcServerName = "org.openmw.OpenCS";
 
@@ -32,22 +33,23 @@ CS::Editor::Editor()
 
     connect (&mFileDialog, SIGNAL(openFiles()), this, SLOT(openFiles()));
     connect (&mFileDialog, SIGNAL(createNewFile (const boost::filesystem::path&)),
-        this, SLOT(createNewFile (const boost::filesystem::path&)));
+             this, SLOT(createNewFile (const boost::filesystem::path&)));
 
     connect (&mNewGame, SIGNAL (createRequest (const boost::filesystem::path&)),
-        this, SLOT (createNewGame (const boost::filesystem::path&)));
+             this, SLOT (createNewGame (const boost::filesystem::path&)));
 }
 
 void CS::Editor::setupDataFiles()
 {
     boost::program_options::variables_map variables;
-    boost::program_options::options_description desc;
+    boost::program_options::options_description desc("Syntax: opencs <options>\nAllowed options");
 
     desc.add_options()
     ("data", boost::program_options::value<Files::PathContainer>()->default_value(Files::PathContainer(), "data")->multitoken())
     ("data-local", boost::program_options::value<std::string>()->default_value(""))
     ("fs-strict", boost::program_options::value<bool>()->implicit_value(true)->default_value(false))
-    ("encoding", boost::program_options::value<std::string>()->default_value("win1252"));
+    ("encoding", boost::program_options::value<std::string>()->default_value("win1252"))
+    ("resources", boost::program_options::value<std::string>()->default_value("resources"));
 
     boost::program_options::notify(variables);
 
@@ -82,11 +84,13 @@ void CS::Editor::setupDataFiles()
     }
 
     // Set the charset for reading the esm/esp files
-   // QString encoding = QString::fromStdString(variables["encoding"].as<std::string>());
+    // QString encoding = QString::fromStdString(variables["encoding"].as<std::string>());
     //mFileDialog.setEncoding(encoding);
 
     dataDirs.insert (dataDirs.end(), dataLocal.begin(), dataLocal.end());
 
+    mDocumentManager.setResourceDir(mCfgMgr.getGlobalDataPath());
+
     for (Files::PathContainer::const_iterator iter = dataDirs.begin(); iter != dataDirs.end(); ++iter)
     {
         QString path = QString::fromStdString(iter->string());

apps/opencs/model/doc/document.cpp

@@ -9,7 +9,7 @@
 #endif
 
 void CSMDoc::Document::load (const std::vector<boost::filesystem::path>::const_iterator& begin,
-    const std::vector<boost::filesystem::path>::const_iterator& end, bool lastAsModified)
+                             const std::vector<boost::filesystem::path>::const_iterator& end, bool lastAsModified)
 {
     assert (begin!=end);
 
@@ -2219,13 +2219,11 @@ void CSMDoc::Document::createBase()
     }
 }
 
-CSMDoc::Document::Document (const Files::ConfigurationManager& configuration,
-    const std::vector<boost::filesystem::path>& files,
-    const boost::filesystem::path& savePath, bool new_)
-: mSavePath (savePath), mContentFiles (files), mTools (mData),
-  mProjectPath ((configuration.getUserPath() / "projects") /
-  (savePath.filename().string() + ".project")),
-  mSaving (*this, mProjectPath)
+CSMDoc::Document::Document (const Files::ConfigurationManager& configuration, const std::vector< boost::filesystem::path >& files, const boost::filesystem::path& savePath, const boost::filesystem::path& resDir, bool new_)
+    : mSavePath (savePath), mContentFiles (files), mTools (mData), mResDir(resDir),
+      mProjectPath ((configuration.getUserPath() / "projects") /
+                    (savePath.filename().string() + ".project")),
+      mSaving (*this, mProjectPath)
 {
     if (files.empty())
         throw std::runtime_error ("Empty content file sequence");
@@ -2256,7 +2254,17 @@ CSMDoc::Document::Document (const Files::ConfigurationManager& configuration,
         }
         else
         {
-            /// \todo create new project file with default filters
+            boost::filesystem::path locCustomFiltersPath (configuration.getUserPath());
+            locCustomFiltersPath /= "defaultfilters";
+            if (boost::filesystem::exists(locCustomFiltersPath))
+            {
+                boost::filesystem::copy(locCustomFiltersPath, mProjectPath);
+            } else {
+                boost::filesystem::path filters(mResDir);
+                filters /= "defaultfilters";
+                boost::filesystem::copy_file(filters, mProjectPath);
+            }
+            getData().loadFile (mProjectPath, false, true);
         }
     }
 
@@ -2271,7 +2279,7 @@ CSMDoc::Document::Document (const Files::ConfigurationManager& configuration,
     connect (&mSaving, SIGNAL (progress (int, int, int)), this, SLOT (progress (int, int, int)));
     connect (&mSaving, SIGNAL (done (int)), this, SLOT (operationDone (int)));
     connect (&mSaving, SIGNAL (reportMessage (const QString&, int)),
-        this, SLOT (reportMessage (const QString&, int)));
+             this, SLOT (reportMessage (const QString&, int)));
 }
 
 CSMDoc::Document::~Document()

apps/opencs/model/doc/document.hpp

@@ -43,6 +43,7 @@ namespace CSMDoc
             CSMTools::Tools mTools;
             boost::filesystem::path mProjectPath;
             Saving mSaving;
+            boost::filesystem::path mResDir;
 
             // It is important that the undo stack is declared last, because on desctruction it fires a signal, that is connected to a slot, that is
             // using other member variables.  Unfortunately this connection is cut only in the QObject destructor, which is way too late.
@@ -70,9 +71,7 @@ namespace CSMDoc
 
         public:
 
-            Document (const Files::ConfigurationManager& configuration,
-                const std::vector<boost::filesystem::path>& files,
-                const boost::filesystem::path& savePath, bool new_);
+            Document (const Files::ConfigurationManager& configuration, const std::vector< boost::filesystem::path >& files, const boost::filesystem::path& savePath, const boost::filesystem::path& resDir, bool new_);
 
             ~Document();
 
@@ -120,3 +119,4 @@ namespace CSMDoc
 }
 
 #endif
+

apps/opencs/model/doc/documentmanager.cpp

@@ -30,7 +30,7 @@ CSMDoc::DocumentManager::~DocumentManager()
 CSMDoc::Document *CSMDoc::DocumentManager::addDocument (const std::vector<boost::filesystem::path>& files, const boost::filesystem::path& savePath,
     bool new_)
 {
-    Document *document = new Document (mConfiguration, files, savePath, new_);
+    Document *document = new Document (mConfiguration, files, savePath, mResDir, new_);
 
     mDocuments.push_back (document);
 
@@ -48,4 +48,9 @@ bool CSMDoc::DocumentManager::removeDocument (Document *document)
     delete document;
 
     return mDocuments.empty();
+}
+
+void CSMDoc::DocumentManager::setResourceDir (const boost::filesystem::path& parResDir)
+{
+    mResDir = boost::filesystem::system_complete(parResDir);
 }

apps/opencs/model/doc/documentmanager.hpp

@@ -29,8 +29,7 @@ namespace CSMDoc
 
             ~DocumentManager();
 
-            Document *addDocument (const std::vector<boost::filesystem::path>& files,
-                const boost::filesystem::path& savePath, bool new_);
+            Document *addDocument (const std::vector< boost::filesystem::path >& files, const boost::filesystem::path& savePath, bool new_);
             ///< The ownership of the returned document is not transferred to the caller.
             ///
             /// \param new_ Do not load the last content file in \a files and instead create in an
@@ -38,6 +37,10 @@ namespace CSMDoc
 
             bool removeDocument (Document *document);
             ///< \return last document removed?
+	    void setResourceDir (const boost::filesystem::path& parResDir);
+	    
+    private:
+	    boost::filesystem::path mResDir;
     };
 }