[Traverso-commit] traverso/src core/ProjectManager.cpp core/Proje...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/05/31 13:56:42

Modified files:
        src/core       : ProjectManager.cpp ProjectManager.h 
        src/traverso   : Traverso.cpp 

Log message:
        parse command line to see if traverso was started by clicking on a 
traverso.tpf file

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ProjectManager.cpp?cvsroot=traverso&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ProjectManager.h?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Traverso.cpp?cvsroot=traverso&r1=1.42&r2=1.43

Patches:
Index: core/ProjectManager.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ProjectManager.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- core/ProjectManager.cpp     8 May 2007 16:44:31 -0000       1.32
+++ core/ProjectManager.cpp     31 May 2007 13:56:41 -0000      1.33
@@ -246,7 +246,7 @@
        return currentProject;
 }
 
-void ProjectManager::start( )
+void ProjectManager::start(QString projectToLoad)
 {
        QString defaultpath = config().get_property("Project", 
"DefaultDirectory", "").toString();
        QString projects_path = config().get_property("Project", "directory", 
defaultpath).toString();
@@ -281,8 +281,17 @@
        
        bool loadProjectAtStartUp = config().get_property("Project", 
"loadLastUsed", 1).toBool();
 
-       if (loadProjectAtStartUp) {
-               QString projectToLoad = config().get_property("Project", 
"current", "").toString();
+       if (loadProjectAtStartUp || !(projectToLoad.isEmpty())) {
+               if (!projectToLoad.isEmpty()) {
+                       int splitpoint = projectToLoad.lastIndexOf("/");
+                       QString dir = projectToLoad.left(splitpoint);
+                       int splitpoint2 = dir.lastIndexOf("/") + 1;
+                       projectToLoad = dir.right(splitpoint - splitpoint2);
+                       dir = dir.remove(projectToLoad);
+                       config().set_property("Project", "directory", dir);
+               } else {
+                       projectToLoad = config().get_property("Project", 
"current", "").toString();
+               }
 
                if ( projectToLoad.isNull() || projectToLoad.isEmpty() )
                        projectToLoad="Untitled";

Index: core/ProjectManager.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/ProjectManager.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- core/ProjectManager.h       7 May 2007 18:15:30 -0000       1.13
+++ core/ProjectManager.h       31 May 2007 13:56:41 -0000      1.14
@@ -55,7 +55,7 @@
 
 
 public slots:
-       void start();
+       void start(QString projectToLoad);
        
        Command* save_project();
        Command* exit();

Index: traverso/Traverso.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Traverso.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- traverso/Traverso.cpp       14 May 2007 18:05:29 -0000      1.42
+++ traverso/Traverso.cpp       31 May 2007 13:56:41 -0000      1.43
@@ -117,7 +117,14 @@
        Interface* iface = Interface::instance();
        prepare_audio_device();
        iface->show();
-       pm().start();
+       QString projectToLoad;
+       foreach(QString string, QCoreApplication::arguments ()) {
+               if (string.contains("project.tpf")) {
+                       projectToLoad = string;
+                       break;
+               }
+       }
+       pm().start(projectToLoad);
 }
 
 void Traverso::shutdown( int signal )