[Wired-commits] SF.net SVN: wired: [1308] branches/saveXml/src/gui

[<car...@us...>]

Revision: 1308
          http://svn.sourceforge.net/wired/?rev=1308&view=rev
Author:   carres_l
Date:     2007-01-30 08:44:05 -0800 (Tue, 30 Jan 2007)

Log Message:
-----------
Moved OpenWizard()
Asks for a project directory when doing NewSession()

Modified Paths:
--------------
    branches/saveXml/src/gui/MainApp.cpp
    branches/saveXml/src/gui/MainApp.h
    branches/saveXml/src/gui/MainWindow.cpp
    branches/saveXml/src/gui/MainWindow.h

Modified: branches/saveXml/src/gui/MainApp.cpp
===================================================================
--- branches/saveXml/src/gui/MainApp.cpp	2007-01-30 15:57:40 UTC (rev 1307)
+++ branches/saveXml/src/gui/MainApp.cpp	2007-01-30 16:44:05 UTC (rev 1308)
@@ -110,26 +110,11 @@
       exit(-1);
     }
 
-  OpenWizard();
+  MainWin->OpenWizard();
 
   return (true);
 }
 
-void		MainApp::OpenWizard()
-{
-  wxFileName	path;
-
-  wxDirDialog	dirDialog(NULL, _("Select a project folder"), wxGetCwd());
-
-  while(dirDialog.ShowModal() != wxID_OK)
-    MainWin->AlertDialog(_("Warning"),
-			 _("You have to select a project folder."));
- 
-  path.AssignDir(dirDialog.GetPath());
-
-  saveCenter->setProjectPath(path);
-}
-
 void	MainApp::ShowWelcome()
 {
   wxString	welcome;

Modified: branches/saveXml/src/gui/MainApp.h
===================================================================
--- branches/saveXml/src/gui/MainApp.h	2007-01-30 15:57:40 UTC (rev 1307)
+++ branches/saveXml/src/gui/MainApp.h	2007-01-30 16:44:05 UTC (rev 1308)
@@ -37,8 +37,6 @@
   void				OnUnhandledException();
   void				ShowWelcome();
 
-  //Shows a wxDirDialog to select a project folder
-  void				OpenWizard();
 };
 
 DECLARE_APP(MainApp)

Modified: branches/saveXml/src/gui/MainWindow.cpp
===================================================================
--- branches/saveXml/src/gui/MainWindow.cpp	2007-01-30 15:57:40 UTC (rev 1307)
+++ branches/saveXml/src/gui/MainWindow.cpp	2007-01-30 16:44:05 UTC (rev 1308)
@@ -664,6 +664,9 @@
   SeqPanel->DeleteAllTracks();
   RackPanel->DeleteAllRacks();
   OptPanel->DeleteTools();
+
+  OpenWizard();
+
   return (true);
 }
 
@@ -2051,7 +2054,21 @@
     }
 }
 
+void		MainWindow::OpenWizard()
+{
+  wxFileName	path;
 
+  wxDirDialog	dirDialog(NULL, _("Select a project folder"), wxGetCwd());
+
+  while(dirDialog.ShowModal() != wxID_OK)
+    AlertDialog(_("Warning"),
+			 _("You have to select a project folder."));
+ 
+  path.AssignDir(dirDialog.GetPath());
+
+  saveCenter->setProjectPath(path);
+}
+
 BEGIN_DECLARE_EVENT_TYPES()
   DECLARE_EVENT_TYPE(wxSetCursorPos, 313131)
   END_DECLARE_EVENT_TYPES()

Modified: branches/saveXml/src/gui/MainWindow.h
===================================================================
--- branches/saveXml/src/gui/MainWindow.h	2007-01-30 15:57:40 UTC (rev 1307)
+++ branches/saveXml/src/gui/MainWindow.h	2007-01-30 16:44:05 UTC (rev 1308)
@@ -135,6 +135,9 @@
   /* Plugin creation */
   void					CreatePluginFromUniqueId(wxString UniqueId);
 
+  /* Shows a wxDirDialog to select a project folder */
+  void					OpenWizard();
+
  protected:
   friend class				MediaLibrary;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.