[Traverso-commit] traverso/src core/FileHelpers.cpp core/ProjectM...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/04 00:46:38

Modified files:
        src/core       : FileHelpers.cpp ProjectManager.cpp 
        src/traverso/dialogs/project: NewProjectDialog.cpp 

Log message:
        * dir names are _without_ the backslashes, so we have to _add_ them if 
needed !!!!!!!!
        * new project dialog opens new project after creation
        * maybe something else, don't know... I'll leave the rest for you guys!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/FileHelpers.cpp?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ProjectManager.cpp?cvsroot=traverso&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewProjectDialog.cpp?cvsroot=traverso&r1=1.1&r2=1.2

Patches:
Index: core/FileHelpers.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/FileHelpers.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- core/FileHelpers.cpp        15 Jan 2007 23:51:47 -0000      1.6
+++ core/FileHelpers.cpp        4 Apr 2007 00:46:38 -0000       1.7
@@ -17,7 +17,7 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: FileHelpers.cpp,v 1.6 2007/01/15 23:51:47 r_sijrier Exp $
+$Id: FileHelpers.cpp,v 1.7 2007/04/04 00:46:38 r_sijrier Exp $
 */
 
 #include "FileHelpers.h"
@@ -25,6 +25,7 @@
 #include <sys/stat.h>
 #include "Config.h"
 #include <QDir>
+#include <Utils.h>
 
 #include "Debugger.h"
 
@@ -35,12 +36,14 @@
 int FileHelper::remove_recursively(const QString& pName)
 {
        QString name = config().get_property("Project", "directory", 
"/directory/unknown").toString();
-       name += pName;
+       name += "/" + pName;
 
        QFileInfo fileInfo(name);
 
-       if (!fileInfo.exists())
+       if (!fileInfo.exists()) {
+               PERROR("File does not exist! %s", QS_C(name));
                return -1;
+       }
 
        if (!fileInfo.isWritable()) {
                PERROR("failed to remove %s: you don't have write access to 
it\n", name.toAscii().data());

Index: core/ProjectManager.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ProjectManager.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- core/ProjectManager.cpp     4 Apr 2007 00:05:51 -0000       1.27
+++ core/ProjectManager.cpp     4 Apr 2007 00:46:38 -0000       1.28
@@ -193,7 +193,7 @@
 bool ProjectManager::project_is_current(const QString& title)
 {
        QString path = config().get_property("Project", "directory", 
"/directory/unknown").toString();
-       path += title;
+       path += "/" + title;
 
        if (currentProject && (currentProject->get_root_dir() == path)) {
                return true;

Index: traverso/dialogs/project/NewProjectDialog.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/project/NewProjectDialog.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- traverso/dialogs/project/NewProjectDialog.cpp       4 Apr 2007 00:07:14 
-0000       1.1
+++ traverso/dialogs/project/NewProjectDialog.cpp       4 Apr 2007 00:46:38 
-0000       1.2
@@ -113,6 +113,10 @@
        project->set_engineer(newProjectEngineer->text());
        project->save();
        delete project;
+       
+       pm().load_project(title);
+       
+       hide();
 }
 
 void NewProjectDialog::use_template_checkbox_state_changed(int state)