[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src core/ProjectManager.cpp core/Proje...
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src core/ProjectManager.cpp core/Proje... |
Date: |
Tue, 26 Jun 2007 18:29:55 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/06/26 18:29:55
Modified files:
src/core : ProjectManager.cpp ProjectManager.h
src/traverso/dialogs/project: OpenProjectDialog.cpp
src/traverso/widgets: InfoWidgets.cpp
Log message:
more robust detection if project renaming is still in progress
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ProjectManager.cpp?cvsroot=traverso&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ProjectManager.h?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/OpenProjectDialog.cpp?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.40&r2=1.41
Patches:
Index: core/ProjectManager.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ProjectManager.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- core/ProjectManager.cpp 26 Jun 2007 18:07:56 -0000 1.35
+++ core/ProjectManager.cpp 26 Jun 2007 18:29:54 -0000 1.36
@@ -58,6 +58,8 @@
m_renamingDir = false;
cpointer().add_contextitem(this);
+
+ connect(&m_resetDirRenamingTimer, SIGNAL(timemout), this,
SLOT(reset_dir_renaming_progress()));
}
/**
@@ -386,6 +388,7 @@
int ProjectManager::rename_project_dir(const QString & olddir, const QString &
newdir)
{
m_renamingDir = true;
+ m_resetDirRenamingTimer.start(1000);
QDir dir(olddir);
@@ -400,10 +403,14 @@
bool ProjectManager::renaming_directory_in_progress()
{
if (m_renamingDir) {
- m_renamingDir = false;
return true;
}
return false;
}
+void ProjectManager::reset_dir_renaming_progress()
+{
+ m_renamingDir = false;
+}
+
Index: core/ProjectManager.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/ProjectManager.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- core/ProjectManager.h 26 Jun 2007 18:07:56 -0000 1.15
+++ core/ProjectManager.h 26 Jun 2007 18:29:54 -0000 1.16
@@ -25,6 +25,7 @@
#include "ContextItem.h"
#include <QUndoGroup>
#include <QList>
+#include <QTimer>
class Project;
class Song;
@@ -73,6 +74,7 @@
Project* currentProject;
QList<Song*> m_deletionSongList;
+ QTimer m_resetDirRenamingTimer;
bool m_exitInProgress;
bool m_renamingDir;
@@ -88,6 +90,9 @@
signals:
void projectLoaded(Project* );
void aboutToDelete(Song* );
+
+private slots:
+ void reset_dir_renaming_progress();
};
Index: traverso/dialogs/project/OpenProjectDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/OpenProjectDialog.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- traverso/dialogs/project/OpenProjectDialog.cpp 26 Jun 2007 18:20:42
-0000 1.9
+++ traverso/dialogs/project/OpenProjectDialog.cpp 26 Jun 2007 18:29:55
-0000 1.10
@@ -71,7 +71,6 @@
void OpenProjectDialog::update_projects_list()
{
- printf("update_projects_list()\n");
projectListView->clear();
QString path = config().get_property("Project", "directory",
getenv("HOME")).toString();
Index: traverso/widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- traverso/widgets/InfoWidgets.cpp 21 Jun 2007 15:33:20 -0000 1.40
+++ traverso/widgets/InfoWidgets.cpp 26 Jun 2007 18:29:55 -0000 1.41
@@ -35,9 +35,9 @@
#include <QDesktopWidget>
#include <QPalette>
-#if defined (WIN_BUILD)
+#if defined (Q_WS_WIN)
#include <Windows.h>
-#elif defined (OSX_BUILD)
+#elif defined (Q_WS_MAC)
#include <sys/param.h>
#include <sys/mount.h>
#else
@@ -285,7 +285,7 @@
return;
}
-#if defined (WIN_BUILD)
+#if defined (Q_WS_WIN)
__int64 freebytestocaller, totalbytes, freebytes;
if (! GetDiskFreeSpaceEx ((const
WCHAR*)(m_project->get_root_dir().toUtf8().data()),
(PULARGE_INTEGER)&freebytestocaller,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src core/ProjectManager.cpp core/Proje...,
Remon Sijrier <=