[vlmc-devel] commit: Propagate the VLMCWorkspace type change. ( Hugo Beauzée-Luyssen )

[git at videolan.org]

vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Sun Jun 20 19:30:55 2010 +0200| [24a732f530369bb806577bea04da019cde6798f1] | committer: Hugo Beauzée-Luyssen 

Propagate the VLMCWorkspace type change.

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=24a732f530369bb806577bea04da019cde6798f1
---

 src/Gui/project/GuiProjectManager.cpp |    4 ++--
 src/Gui/wizard/GeneralPage.cpp        |    4 ++--
 src/Gui/wizard/WelcomePage.cpp        |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Gui/project/GuiProjectManager.cpp b/src/Gui/project/GuiProjectManager.cpp
index b8155d6..ea6fe6f 100644
--- a/src/Gui/project/GuiProjectManager.cpp
+++ b/src/Gui/project/GuiProjectManager.cpp
@@ -97,7 +97,7 @@ GUIProjectManager::createNewProjectFile( bool saveAs )
     {
         QString outputFileName =
             QFileDialog::getSaveFileName( NULL, "Enter the output file name",
-                                          VLMC_PROJECT_GET_STRING( "general/VLMCWorkspace" ),
+                                          VLMC_GET_STRING( "general/VLMCWorkspace" ),
                                           "VLMC project file(*.vlmc)" );
         if ( outputFileName.length() == 0 )
             return false;
@@ -259,7 +259,7 @@ GUIProjectManager::loadProject()
 {
     QString fileName =
             QFileDialog::getOpenFileName( NULL, "Enter the output file name",
-                                          VLMC_PROJECT_GET_STRING( "general/VLMCWorkspace" ),
+                                          VLMC_GET_STRING( "general/VLMCWorkspace" ),
                                           "VLMC project file(*.vlmc)" );
     if ( fileName.length() <= 0 ) //If the user canceled.
         return ;
diff --git a/src/Gui/wizard/GeneralPage.cpp b/src/Gui/wizard/GeneralPage.cpp
index 78c9467..094dea0 100644
--- a/src/Gui/wizard/GeneralPage.cpp
+++ b/src/Gui/wizard/GeneralPage.cpp
@@ -76,7 +76,7 @@ void GeneralPage::initializePage()
     ui.lineEditName->setText( projectName );
 
     //fetching the global workspace path
-    QString workspacePath = VLMC_PROJECT_GET_STRING( "general/VLMCWorkspace" );
+    QString workspacePath = VLMC_GET_STRING( "general/VLMCWorkspace" );
     ui.lineEditWorkspace->setText( workspacePath );
 
     updateProjectLocation();
@@ -109,7 +109,7 @@ bool GeneralPage::validatePage()
 
     QVariant projectName( ui.lineEditName->text() );
     sManager->setValue( "general/ProjectName", projectName, SettingsManager::Project );
-    sManager->setValue( "general/VLMCWorkspace", ui.lineEditWorkspace->text(), SettingsManager::Project );
+    sManager->setValue( "general/VLMCWorkspace", ui.lineEditWorkspace->text(), SettingsManager::Vlmc );
 
     //Create the project directory in the workspace dir.
     QString     projectPath = ui.lineEditName->text().replace( ' ', '_' );
diff --git a/src/Gui/wizard/WelcomePage.cpp b/src/Gui/wizard/WelcomePage.cpp
index acaddb2..582a106 100644
--- a/src/Gui/wizard/WelcomePage.cpp
+++ b/src/Gui/wizard/WelcomePage.cpp
@@ -134,7 +134,7 @@ void WelcomePage::loadProject()
 {
     QString projectPath =
             QFileDialog::getOpenFileName( NULL, "Enter the output file name",
-                                          VLMC_PROJECT_GET_STRING( "general/VLMCWorkspace" ),
+                                          VLMC_GET_STRING( "general/VLMCWorkspace" ),
                                           "VLMC project file(*.vlmc)" );
 
     if ( projectPath.isEmpty() ) return;