From 74d683b5303e5b95a34fec6d082b9999aacecc3b Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 23 Sep 2013 11:58:11 +0200
Subject: [PATCH] fixed save path for newly created addons

---
 apps/opencs/editor.cpp              | 9 ++++-----
 apps/opencs/editor.hpp              | 2 +-
 apps/opencs/view/doc/filedialog.cpp | 9 +++++++--
 apps/opencs/view/doc/filedialog.hpp | 3 ++-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 104afa03b5..800f3984e9 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -30,7 +30,8 @@ CS::Editor::Editor() : mViewManager (mDocumentManager)
     connect (&mStartup, SIGNAL (editConfig()), this, SLOT (showSettings ()));
 
     connect (&mFileDialog, SIGNAL(openFiles()), this, SLOT(openFiles()));
-    connect (&mFileDialog, SIGNAL(createNewFile()), this, SLOT(createNewFile()));
+    connect (&mFileDialog, SIGNAL(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&)));
@@ -138,7 +139,7 @@ void CS::Editor::openFiles()
     mFileDialog.hide();
 }
 
-void CS::Editor::createNewFile()
+void CS::Editor::createNewFile (const boost::filesystem::path& savePath)
 {
     std::vector<boost::filesystem::path> files;
     QStringList paths = mFileDialog.checkedItemsPaths();
@@ -149,9 +150,7 @@ void CS::Editor::createNewFile()
 
     files.push_back(mFileDialog.fileName().toStdString());
 
-    /// \todo Get the save path from the file dialogue.
-
-    CSMDoc::Document *document = mDocumentManager.addDocument (files, *files.rbegin(), true);
+    CSMDoc::Document *document = mDocumentManager.addDocument (files, savePath, true);
 
     mViewManager.addView (document);
     mFileDialog.hide();
diff --git a/apps/opencs/editor.hpp b/apps/opencs/editor.hpp
index 248ebf2c54..abf9496e4b 100644
--- a/apps/opencs/editor.hpp
+++ b/apps/opencs/editor.hpp
@@ -60,7 +60,7 @@ namespace CS
 
             void loadDocument();
             void openFiles();
-            void createNewFile();
+            void createNewFile (const boost::filesystem::path& savePath);
             void createNewGame (const boost::filesystem::path& file);
 
             void showStartup();
diff --git a/apps/opencs/view/doc/filedialog.cpp b/apps/opencs/view/doc/filedialog.cpp
index 4d7c5bc159..4426d2e49c 100644
--- a/apps/opencs/view/doc/filedialog.cpp
+++ b/apps/opencs/view/doc/filedialog.cpp
@@ -35,7 +35,7 @@ CSVDoc::FileDialog::FileDialog(QWidget *parent) :
     mFileWidget->setType(true);
     mFileWidget->extensionLabelIsVisible(false);
 
-    connect(projectCreateButton, SIGNAL(clicked()), this, SIGNAL(createNewFile()));
+    connect(projectCreateButton, SIGNAL(clicked()), this, SLOT(createNewFile()));
 
     connect(projectButtonBox, SIGNAL(accepted()), this, SIGNAL(openFiles()));
     connect(projectButtonBox, SIGNAL(rejected()), this, SLOT(reject()));
@@ -118,5 +118,10 @@ void CSVDoc::FileDialog::slotAdjusterChanged(bool value)
 
 void CSVDoc::FileDialog::slotGameFileSelected(int value)
 {
-        emit signalUpdateCreateButton(value > -1, 1);
+    emit signalUpdateCreateButton(value > -1, 1);
 }
+
+void CSVDoc::FileDialog::createNewFile()
+{
+    emit createNewFile (mAdjusterWidget->getPath());
+}
\ No newline at end of file
diff --git a/apps/opencs/view/doc/filedialog.hpp b/apps/opencs/view/doc/filedialog.hpp
index 0c914b932a..37119ff0d0 100644
--- a/apps/opencs/view/doc/filedialog.hpp
+++ b/apps/opencs/view/doc/filedialog.hpp
@@ -58,7 +58,7 @@ namespace CSVDoc
 
     signals:
         void openFiles();
-        void createNewFile();
+        void createNewFile (const boost::filesystem::path& savePath);
 
         void signalUpdateCreateButton (bool, int);
         void signalUpdateCreateButtonFlags(int);
@@ -71,6 +71,7 @@ namespace CSVDoc
         void slotEnableCreateButton(bool enable, int widgetNumber);
         void slotAdjusterChanged(bool value);
         void slotGameFileSelected(int value);
+        void createNewFile();
     };
 }
 #endif // FILEDIALOG_HPP