From: <bru...@us...> - 2009-02-20 23:22:54
|
Revision: 3661 http://hugin.svn.sourceforge.net/hugin/?rev=3661&view=rev Author: brunopostle Date: 2009-02-20 22:33:31 +0000 (Fri, 20 Feb 2009) Log Message: ----------- "Batch" is internal string not for translation (Thomas Modes) Modified Paths: -------------- hugin/trunk/src/PTBatcher/Batch.cpp Modified: hugin/trunk/src/PTBatcher/Batch.cpp =================================================================== --- hugin/trunk/src/PTBatcher/Batch.cpp 2009-02-20 14:16:59 UTC (rev 3660) +++ hugin/trunk/src/PTBatcher/Batch.cpp 2009-02-20 22:33:31 UTC (rev 3661) @@ -31,7 +31,7 @@ EVT_END_PROCESS(-1, Batch::OnProcessTerminate) END_EVENT_TABLE() -Batch::Batch(wxFrame* parent, wxString path, bool bgui) : wxFrame(parent,wxID_ANY,_("Batch")){ +Batch::Batch(wxFrame* parent, wxString path, bool bgui) : wxFrame(parent,wxID_ANY,_T("Batch")){ //default flag settings parallel = false; deleteFiles = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-02-28 12:03:48
|
Revision: 3680 http://hugin.svn.sourceforge.net/hugin/?rev=3680&view=rev Author: stativ Date: 2009-02-28 12:03:45 +0000 (Sat, 28 Feb 2009) Log Message: ----------- Use absolute paths in PTBatcher queue. Fixes 'Missing' problem. Modified Paths: -------------- hugin/trunk/src/PTBatcher/Batch.cpp Modified: hugin/trunk/src/PTBatcher/Batch.cpp =================================================================== --- hugin/trunk/src/PTBatcher/Batch.cpp 2009-02-28 11:46:43 UTC (rev 3679) +++ hugin/trunk/src/PTBatcher/Batch.cpp 2009-02-28 12:03:45 UTC (rev 3680) @@ -72,11 +72,14 @@ void Batch::AddProjectToBatch(wxString projectFile, wxString outputFile) { - wxFileName name(projectFile); + wxFileName projectName(projectFile); + wxFileName outName(outputFile); + projectName.Normalize(); + outName.Normalize(); if(outputFile.Cmp(_T(""))!=0) { - Project *proj = new Project(projectFile,outputFile); + Project *proj = new Project(projectName.GetFullPath(),outName.GetFullPath()); m_projList.Add(proj); /*if(gui) ((wxFrame*)GetParent())->SetStatusText(_T("Added project ")+projectFile+_T(" with output ")+outputFile); @@ -85,7 +88,7 @@ } else { //on output set as "", it defaults to same path and name as project file - Project *proj = new Project(projectFile,name.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR) + name.GetName()); + Project *proj = new Project(projectName.GetFullPath(),projectName.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR) + projectName.GetName()); m_projList.Add(proj); /*if(gui) ((wxFrame*)GetParent())->SetStatusText(_T("Added project ")+projectFile); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |