From 1a0a3e5edba1a6ed1bd1d26f3fca5bbacacd7091 Mon Sep 17 00:00:00 2001
From: Robert Jonsson <spamatica@gmail.com>
Date: Mon, 27 Dec 2010 12:30:47 +0000
Subject: open dialog changed to view stored project

---
 muse2/ChangeLog                     | 1 +
 muse2/muse/widgets/filedialog.cpp   | 4 +++-
 muse2/muse/widgets/projectcreate.ui | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index b4d0b7c1..1e4a5e78 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -16,6 +16,7 @@
         - Remove the environment variables info from the usage output. (Orcan)
         - midiedit links to ctrl. (Orcan)
         - Merged changes from ccherrett into pianroll (h-splittter). (Tim)
+        - changed open dialog to view stored project directory for PROJECT_VIEW (rj)
 26.12.2010:
         - Initial addition of midi track info to pianoroll. WORK IN PROGRESS. (Tim)
           TODO: Just to get off the hard drive. A few things still need to be linked up!
diff --git a/muse2/muse/widgets/filedialog.cpp b/muse2/muse/widgets/filedialog.cpp
index 28c65ba5..d2b189b6 100644
--- a/muse2/muse/widgets/filedialog.cpp
+++ b/muse2/muse/widgets/filedialog.cpp
@@ -16,6 +16,7 @@
 #include "icons.h"
 #include "filedialog.h"
 #include "../globals.h"
+#include "gconfig.h"
 
 MFileDialog::ViewType MFileDialog::lastViewUsed = GLOBAL_VIEW;
 QString MFileDialog::lastUserDir = "";
@@ -130,7 +131,8 @@ void MFileDialog::projectToggled(bool flag)
             if (museProject == museProjectInitPath ) {
                   // if project path is uninitialized, meaning it is still set to museProjectInitPath.
                   // then project path is set to current pwd instead.
-                  s = QString(getcwd(0,0)) + QString("/");
+                  //s = QString(getcwd(0,0)) + QString("/");
+                  s = config.projectBaseFolder;
                   }
             else
                   s = museProject + QString("/"); // + baseDir;
diff --git a/muse2/muse/widgets/projectcreate.ui b/muse2/muse/widgets/projectcreate.ui
index 7cb73a82..406c83d6 100644
--- a/muse2/muse/widgets/projectcreate.ui
+++ b/muse2/muse/widgets/projectcreate.ui
@@ -71,7 +71,7 @@
        <item>
         <widget class="QCheckBox" name="createFolderCheckbox">
          <property name="text">
-          <string>Create project folder (always use for audio projects)</string>
+          <string>Create project folder (recommended for audio projects)</string>
          </property>
         </widget>
        </item>
-- 
cgit v1.2.3