From: <bru...@us...> - 2009-02-17 23:07:10
|
Revision: 3651 http://hugin.svn.sourceforge.net/hugin/?rev=3651&view=rev Author: brunopostle Date: 2009-02-17 22:47:12 +0000 (Tue, 17 Feb 2009) Log Message: ----------- Attempt to get PTBatcher translation working by replacing _T() with _() Modified Paths: -------------- hugin/trunk/src/PTBatcher/Batch.cpp hugin/trunk/src/PTBatcher/ProjectArray.cpp hugin/trunk/src/PTBatcherGUI/BatchFrame.cpp hugin/trunk/src/PTBatcherGUI/PTBatcherGUI.cpp hugin/trunk/src/PTBatcherGUI/ProjectListBox.cpp Modified: hugin/trunk/src/PTBatcher/Batch.cpp =================================================================== --- hugin/trunk/src/PTBatcher/Batch.cpp 2009-02-16 18:25:19 UTC (rev 3650) +++ hugin/trunk/src/PTBatcher/Batch.cpp 2009-02-17 22:47:12 UTC (rev 3651) @@ -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,_T("Batch")){ +Batch::Batch(wxFrame* parent, wxString path, bool bgui) : wxFrame(parent,wxID_ANY,_("Batch")){ //default flag settings parallel = false; deleteFiles = false; @@ -243,7 +243,7 @@ { if(gui) { - wxMessageDialog message(this, _T("Cannot clear batch in progress.\nDo you want to cancel it?"), _T("In progress"), wxYES | wxCANCEL | wxICON_INFORMATION); + wxMessageDialog message(this, _("Cannot clear batch in progress.\nDo you want to cancel it?"), _("In progress"), wxYES | wxCANCEL | wxICON_INFORMATION); if(message.ShowModal()==wxID_YES) { CancelBatch(); @@ -253,7 +253,7 @@ Project::idGenerator=1; m_projList.Clear(); if(gui) - ((wxFrame*)GetParent())->SetStatusText(_T("Cleared batch.")); + ((wxFrame*)GetParent())->SetStatusText(_("Cleared batch.")); else if(verbose) cout << "Cleared batch." << endl; return 2; @@ -274,7 +274,7 @@ Project::idGenerator=1; m_projList.Clear(); if(gui) - ((wxFrame*)GetParent())->SetStatusText(_T("Cleared batch.")); + ((wxFrame*)GetParent())->SetStatusText(_("Cleared batch.")); else if(verbose) cout << "Cleared batch." << endl; return 0; @@ -348,7 +348,7 @@ if((unsigned int)index<m_projList.GetCount()) return m_projList.Item(index).status; else if(gui) - wxMessageBox( _T("Error: Could not get status, project with index ")+wxString::Format(_("%d"),index)+_T(" is not in list."),_T("Error!"),wxOK | wxICON_INFORMATION ); + wxMessageBox( _("Error: Could not get status, project with index ")+wxString::Format(_("%d"),index)+_(" is not in list."),_("Error!"),wxOK | wxICON_INFORMATION ); else if(verbose) cout << "Error: Could not get status, project with index " << index << " is not in list." << endl; return Project::MISSING; @@ -390,7 +390,7 @@ return 2; } else if(gui) - wxMessageBox(_T("Error: Could not load batch file.")); + wxMessageBox(_("Error: Could not load batch file.")); else if(verbose) cout << "Error: Could not load batch file." << endl; return 1; @@ -487,7 +487,7 @@ { if(gui) //SetStatusText(_T("Project \"")+m_projList.Item(i).path+_T("\" finished. Batch successfully completed.")); - SetStatusText(_T("Batch successfully completed.")); + SetStatusText(_("Batch successfully completed.")); else //cout << "Project \"" << m_projList.Item(i).path.char_str() << "\" finished. Batch successfully completed." << endl; cout << "Batch successfully completed." << endl; @@ -496,7 +496,7 @@ { if(gui) //SetStatusText(_T("Project \""+m_projList.Item(i).path)+_T("\" finished. Batch completed with errors.")); - SetStatusText(_T("Batch completed with errors.")); + SetStatusText(_("Batch completed with errors.")); else //cout << "Project \"" << m_projList.Item(i).path.char_str() << "\" finished. Batch completed with errors." << endl; cout << "Batch completed with errors." << endl; @@ -505,12 +505,12 @@ { if(gui) { - wxProgressDialog progress(_("Initializing shutdown..."), _T("Shutting down..."),49,this, + wxProgressDialog progress(_("Initializing shutdown..."), _("Shutting down..."),49,this, wxPD_AUTO_HIDE | wxPD_SMOOTH | wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_CAN_SKIP); progress.Fit(); int i = 0; bool skip = false; - while(progress.Update(i, _T("Shutting down..."),&skip)) + while(progress.Update(i, _("Shutting down..."),&skip)) { if(skip || i==50) { @@ -534,9 +534,9 @@ { if(gui) #ifdef __WXMSW__ - wxMessageBox(_T("Error shutting down.")); + wxMessageBox(_("Error shutting down.")); #else - wxMessageBox(_T("Error shutting down. Do you have root privileges?")); + wxMessageBox(_("Error shutting down. Do you have root privileges?")); #endif else #ifdef __WXMSW__ @@ -700,7 +700,7 @@ RemoveProjectAtIndex(GetIndex(id)); } else if(gui) - wxMessageBox( _T("Error removing, project with id ")+wxString::Format(_T("%d"),id)+_T(" is not in list."),_T("Error!"),wxOK | wxICON_INFORMATION ); + wxMessageBox( _("Error removing, project with id ")+wxString::Format(_T("%d"),id)+_(" is not in list."),_("Error!"),wxOK | wxICON_INFORMATION ); else if(verbose) cout << "Error: Project with id " << id << " is not in list." << endl; } @@ -717,7 +717,7 @@ if(!wxRemoveFile(file.GetFullPath())) { if(gui) - wxMessageBox( _T("Error: Could not delete project file ")+file.GetFullPath(),_T("Error!"),wxOK | wxICON_INFORMATION ); + wxMessageBox( _("Error: Could not delete project file ")+file.GetFullPath(),_("Error!"),wxOK | wxICON_INFORMATION ); else if(verbose) cout << "Error: Could not delete project file " << (const char*)file.GetFullPath().char_str() << endl; } @@ -735,7 +735,7 @@ else if(!m_running) { if(gui) - ((wxFrame*)GetParent())->SetStatusText(_T("Running batch...")); + ((wxFrame*)GetParent())->SetStatusText(_("Running batch...")); else cout << "Running batch..." << endl; bool cancelRun = false; @@ -768,7 +768,7 @@ } } else if(gui) - ((wxFrame*)GetParent())->SetStatusText(_T("Batch already in progress.")); + ((wxFrame*)GetParent())->SetStatusText(_("Batch already in progress.")); } void Batch::RunNextInBatch() @@ -785,7 +785,7 @@ //if(wxFile::Exists(_T("h:\\pictures\\some2.tif"))) // wxMessageBox( _T("y"),_T("y"),wxOK | wxICON_INFORMATION ); if(gui) - SetStatusText(_T("Running command \"")+m_projList.Item(i).path+_T("\"")); + SetStatusText(_("Running command \"")+m_projList.Item(i).path+_T("\"")); else cout << "Running command \"" << (const char*)m_projList.Item(i).path.char_str() << "\"" << endl; m_projList.Item(i).status=Project::RUNNING; @@ -905,7 +905,7 @@ if((unsigned int)index<m_projList.GetCount()) m_projList.Item(index).status = status; else if(gui) - wxMessageBox( _T("Error: Could not set status, project with index ")+wxString::Format(_("%d"),index)+_T(" is not in list."),_T("Error!"),wxOK | wxICON_INFORMATION ); + wxMessageBox( _("Error: Could not set status, project with index ")+wxString::Format(_("%d"),index)+_(" is not in list."),_("Error!"),wxOK | wxICON_INFORMATION ); else if(verbose) cout << "Error: Could not set status, project with index " << index << " is not in list." << endl; } Modified: hugin/trunk/src/PTBatcher/ProjectArray.cpp =================================================================== --- hugin/trunk/src/PTBatcher/ProjectArray.cpp 2009-02-16 18:25:19 UTC (rev 3650) +++ hugin/trunk/src/PTBatcher/ProjectArray.cpp 2009-02-17 22:47:12 UTC (rev 3651) @@ -61,17 +61,17 @@ switch(status) { case WAITING: - return _T("Waiting"); + return _("Waiting"); case RUNNING: - return _T("In progress"); + return _("In progress"); case FINISHED: - return _T("Complete"); + return _("Complete"); case FAILED: - return _T("Failed"); + return _("Failed"); case MISSING: - return _T("File missing"); + return _("File missing"); case PAUSED: - return _T("Paused"); + return _("Paused"); default: return _T(""); } Modified: hugin/trunk/src/PTBatcherGUI/BatchFrame.cpp =================================================================== --- hugin/trunk/src/PTBatcherGUI/BatchFrame.cpp 2009-02-16 18:25:19 UTC (rev 3650) +++ hugin/trunk/src/PTBatcherGUI/BatchFrame.cpp 2009-02-17 22:47:12 UTC (rev 3651) @@ -89,22 +89,22 @@ // this->GetSizer()->SetItemMinSize(this,500,200); wxMenu *fileMenu = new wxMenu(); - fileMenu->Append(MENUADD,_T("Add project..."), - _T("Adds a project to the batch list.")); + fileMenu->Append(MENUADD,_("Add project..."), + _("Adds a project to the batch list.")); wxMenu *fileMenu1 = new wxMenu(); - fileMenu1->Append(MENUHELP,_T("Batch Stitcher help"), - _T("Open Batch Stitcher help.")); + fileMenu1->Append(MENUHELP,_("Batch Stitcher help"), + _("Open Batch Stitcher help.")); wxMenuBar *menuBar = new wxMenuBar(); - menuBar->Append(fileMenu,_T("File")); - menuBar->Append(fileMenu1,_T("Help")); + menuBar->Append(fileMenu,_("File")); + menuBar->Append(fileMenu1,_("Help")); SetMenuBar(menuBar); CreateStatusBar(1,0,STATUSBAR); - SetStatusText(_T("Not doing much...")); + SetStatusText(_("Not doing much...")); /*wxImage image(_T("filenew.bmp"),wxBITMAP_TYPE_ANY); wxBitmap icon(image); wxToolBar *toolbar = new wxToolBar(this, -1); - toolbar->AddTool(wxID_ANY, _("some label"), icon, icon);*/ + toolbar->AddTool(wxID_ANY, _T("some label"), icon, icon);*/ //create resizable control window wxFlexGridSizer* topSizer = new wxFlexGridSizer(2,1,0,0); @@ -134,26 +134,26 @@ wxBitmap icon13(this->m_xrcPrefix+_T("data/document-open.png"),wxBITMAP_TYPE_PNG); wxBitmap icon14(this->m_xrcPrefix+_T("data/media-floppy.png"),wxBITMAP_TYPE_PNG); wxBitmap icon15(this->m_xrcPrefix+_T("data/folder-saved-search.png"),wxBITMAP_TYPE_PNG); - toolbar->AddTool(TOOLCLEAR, _("clear"), icon12, wxNullBitmap, wxITEM_NORMAL, _T("Clear batch"), _T("Clears the batch list")); - toolbar->AddTool(TOOLOPEN, _("open"), icon13, wxNullBitmap, wxITEM_NORMAL, _T("Open batch"), _T("Opens a batch file with a list of projects")); - toolbar->AddTool(TOOLSAVE, _("save"), icon14, wxNullBitmap, wxITEM_NORMAL, _T("Save batch"), _T("Saves a batch file with a list of projects")); + toolbar->AddTool(TOOLCLEAR, _("clear"), icon12, wxNullBitmap, wxITEM_NORMAL, _("Clear batch"), _("Clears the batch list")); + toolbar->AddTool(TOOLOPEN, _("open"), icon13, wxNullBitmap, wxITEM_NORMAL, _("Open batch"), _("Opens a batch file with a list of projects")); + toolbar->AddTool(TOOLSAVE, _("save"), icon14, wxNullBitmap, wxITEM_NORMAL, _("Save batch"), _("Saves a batch file with a list of projects")); toolbar->AddSeparator(); toolbar->AddSeparator(); - toolbar->AddTool(TOOLRUN, _("start"), icon1, wxNullBitmap, wxITEM_NORMAL, _T("Start batch"), _T("Starts batch execution")); - toolbar->AddTool(TOOLSKIP, _("skip"), icon3, wxNullBitmap, wxITEM_NORMAL, _T("Skip project(s)"), _T("Skips execution of currently running project(s)")); - toolbar->AddTool(TOOLPAUSE, _("pause"), icon2, wxNullBitmap, wxITEM_CHECK, _T("Pause batch"), _T("Pauses batch execution")); - toolbar->AddTool(TOOLCANCEL, _("cancel"), icon7, wxNullBitmap, wxITEM_NORMAL, _T("Cancel batch"), _T("Cancels batch execution")); + toolbar->AddTool(TOOLRUN, _("start"), icon1, wxNullBitmap, wxITEM_NORMAL, _("Start batch"), _("Starts batch execution")); + toolbar->AddTool(TOOLSKIP, _("skip"), icon3, wxNullBitmap, wxITEM_NORMAL, _("Skip project(s)"), _("Skips execution of currently running project(s)")); + toolbar->AddTool(TOOLPAUSE, _("pause"), icon2, wxNullBitmap, wxITEM_CHECK, _("Pause batch"), _("Pauses batch execution")); + toolbar->AddTool(TOOLCANCEL, _("cancel"), icon7, wxNullBitmap, wxITEM_NORMAL, _("Cancel batch"), _("Cancels batch execution")); toolbar->AddSeparator(); toolbar->AddSeparator(); - toolbar->AddTool(TOOLADD, _("add"), icon10, wxNullBitmap, wxITEM_NORMAL, _T("Add project(s)"), _T("Appends project file(s) to the batch list")); + toolbar->AddTool(TOOLADD, _("add"), icon10, wxNullBitmap, wxITEM_NORMAL, _("Add project(s)"), _("Appends project file(s) to the batch list")); //toolbar->AddSeparator(); - toolbar->AddTool(TOOLREMOVE, _("remove"), icon11, wxNullBitmap, wxITEM_NORMAL, _T("Remove project"), _T("Removes selected project from the batch list")); - toolbar->AddTool(TOOLADDDIR, _("adddir"), icon15, wxNullBitmap, wxITEM_NORMAL, _T("Search directory"), _T("Appends all project files from a directory and subdirectories")); + toolbar->AddTool(TOOLREMOVE, _("remove"), icon11, wxNullBitmap, wxITEM_NORMAL, _("Remove project"), _("Removes selected project from the batch list")); + toolbar->AddTool(TOOLADDDIR, _("adddir"), icon15, wxNullBitmap, wxITEM_NORMAL, _("Search directory"), _("Appends all project files from a directory and subdirectories")); - /*toolbar->AddTool(wxID_ANY, _("cancel"), icon4, wxNullBitmap, wxITEM_NORMAL, _T("Cancel batch"), _T("Cancels batch execution")); - toolbar->AddTool(wxID_ANY, _("cancel"), icon5, wxNullBitmap, wxITEM_NORMAL, _T("Cancel batch"), _T("Cancels batch execution")); - toolbar->AddTool(wxID_ANY, _("cancel"), icon6, wxNullBitmap, wxITEM_NORMAL, _T("Cancel batch"), _T("Cancels batch execution"));*/ + /*toolbar->AddTool(wxID_ANY, _T("cancel"), icon4, wxNullBitmap, wxITEM_NORMAL, _T("Cancel batch"), _T("Cancels batch execution")); + toolbar->AddTool(wxID_ANY, _T("cancel"), icon5, wxNullBitmap, wxITEM_NORMAL, _T("Cancel batch"), _T("Cancels batch execution")); + toolbar->AddTool(wxID_ANY, _T("cancel"), icon6, wxNullBitmap, wxITEM_NORMAL, _T("Cancel batch"), _T("Cancels batch execution"));*/ toolbar->Realize(); //topSizer->AddGrowableRow(0,0); @@ -184,40 +184,40 @@ /*removed because we have an icon wxButton* button = new wxButton(panel,BUTTONADD,_T("Add project(s)"),wxDefaultPosition,wxDefaultSize); panelSizer->Add(button,0,wxEXPAND);*/ - wxButton* button = new wxButton(panel,BUTTONCOMMAND,_T("Add application"),wxDefaultPosition,wxDefaultSize); + wxButton* button = new wxButton(panel,BUTTONCOMMAND,_("Add application"),wxDefaultPosition,wxDefaultSize); panelSizer->Add(button,0,wxEXPAND); /*removed because we have an icon button = new wxButton(panel,BUTTONREMOVE,_T("Remove project"),wxDefaultPosition,wxDefaultSize); panelSizer->Add(button,0,wxEXPAND);*/ - button = new wxButton(panel,BUTTONCOMPLETE,_T("Remove complete"),wxDefaultPosition,wxDefaultSize); + button = new wxButton(panel,BUTTONCOMPLETE,_("Remove complete"),wxDefaultPosition,wxDefaultSize); panelSizer->Add(button,0,wxEXPAND); /*removed because we have an icon button = new wxButton(panel,BUTTONCLEAR,_T("Clear Batch"),wxDefaultPosition,wxDefaultSize); panelSizer->Add(button,0,wxEXPAND);*/ - button = new wxButton(panel,BUTTONPREFIX,_T("Change prefix"),wxDefaultPosition,wxDefaultSize); + button = new wxButton(panel,BUTTONPREFIX,_("Change prefix"),wxDefaultPosition,wxDefaultSize); panelSizer->Add(button,0,wxEXPAND); /*button = new wxButton(panel,BUTTONRUN,_T("Run batch"),wxDefaultPosition,wxDefaultSize); panelSizer->Add(button,0,wxEXPAND);*/ - button = new wxButton(panel,BUTTONRESET,_T("Reset project"),wxDefaultPosition,wxDefaultSize); + button = new wxButton(panel,BUTTONRESET,_("Reset project"),wxDefaultPosition,wxDefaultSize); panelSizer->Add(button,0,wxEXPAND); - button = new wxButton(panel,BUTTONRESETALL,_T("Reset all"),wxDefaultPosition,wxDefaultSize); + button = new wxButton(panel,BUTTONRESETALL,_("Reset all"),wxDefaultPosition,wxDefaultSize); panelSizer->Add(button,0,wxEXPAND); - button = new wxButton(panel,BUTTONHUGIN,_T("Edit with Hugin"),wxDefaultPosition,wxDefaultSize); + button = new wxButton(panel,BUTTONHUGIN,_("Edit with Hugin"),wxDefaultPosition,wxDefaultSize); panelSizer->Add(button,0,wxEXPAND); - button = new wxButton(panel,BUTTONUP,_T("Move project up"),wxDefaultPosition,wxDefaultSize); + button = new wxButton(panel,BUTTONUP,_("Move project up"),wxDefaultPosition,wxDefaultSize); panelSizer->Add(button,0,wxEXPAND); - button = new wxButton(panel,BUTTONDOWN,_T("Move project down"),wxDefaultPosition,wxDefaultSize); + button = new wxButton(panel,BUTTONDOWN,_("Move project down"),wxDefaultPosition,wxDefaultSize); panelSizer->Add(button,0,wxEXPAND); panelSizer->AddSpacer(10); - wxCheckBox* check = new wxCheckBox(panel,CHECKPARALLEL,_T("Parallel execution"),wxDefaultPosition,wxDefaultSize); + wxCheckBox* check = new wxCheckBox(panel,CHECKPARALLEL,_("Parallel execution"),wxDefaultPosition,wxDefaultSize); panelSizer->Add(check,0,wxEXPAND); - check = new wxCheckBox(panel,CHECKDELETE,_T("Delete *.pto files"),wxDefaultPosition,wxDefaultSize); + check = new wxCheckBox(panel,CHECKDELETE,_("Delete *.pto files"),wxDefaultPosition,wxDefaultSize); panelSizer->Add(check,0,wxEXPAND); - check = new wxCheckBox(panel,CHECKOVERWRITE,_T("Overwrite always"),wxDefaultPosition,wxDefaultSize); + check = new wxCheckBox(panel,CHECKOVERWRITE,_("Overwrite always"),wxDefaultPosition,wxDefaultSize); panelSizer->Add(check,0,wxEXPAND); - check = new wxCheckBox(panel,CHECKSHUTDOWN,_T("Shutdown when done"),wxDefaultPosition,wxDefaultSize); + check = new wxCheckBox(panel,CHECKSHUTDOWN,_("Shutdown when done"),wxDefaultPosition,wxDefaultSize); panelSizer->Add(check,0,wxEXPAND); - check = new wxCheckBox(panel,CHECKVERBOSE,_T("Verbose output"),wxDefaultPosition,wxDefaultSize); + check = new wxCheckBox(panel,CHECKVERBOSE,_("Verbose output"),wxDefaultPosition,wxDefaultSize); panelSizer->Add(check,0,wxEXPAND); panel->SetSizer(panelSizer); @@ -307,7 +307,7 @@ change = true; spoolFile->~wxFileInputStream(); if(!wxRemoveFile(pending)) - wxMessageBox( _T("Error: Could not remove temporary file"),_T("Error!"),wxOK | wxICON_INFORMATION ); + wxMessageBox( _("Error: Could not remove temporary file"),_("Error!"),wxOK | wxICON_INFORMATION ); } //wxMessageBox( _T("test2"),_T("Error!"),wxOK | wxICON_INFORMATION ); @@ -416,7 +416,7 @@ wxArrayString projects = traverser.GetProjectFiles(); for(unsigned int i=0; i<projects.GetCount(); i++) m_batch->AddProjectToBatch(projects.Item(i)); - SetStatusText(_T("Added projects from dir ")+dlg.GetPath()); + SetStatusText(_("Added projects from dir ")+dlg.GetPath()); } else { // bail //wxLogError( _("No project files specified")); @@ -442,7 +442,7 @@ { wxFileName name(paths.Item(i)); m_batch->AddProjectToBatch(paths.Item(i),name.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR) + name.GetName()); - SetStatusText(_T("Added project ")+paths.Item(i)); + SetStatusText(_("Added project ")+paths.Item(i)); projListBox->AppendProject(m_batch->GetProject(m_batch->GetProjectCount()-1)); } } @@ -477,7 +477,7 @@ } else { - SetStatusText(_T("Please select a project")); + SetStatusText(_("Please select a project")); } } @@ -581,11 +581,11 @@ if(projListBox->GetText(projListBox->GetSelectedIndex(),0).Cmp(_T(""))!=0) wxExecute(huginPath+_T("hugin \"" + projListBox->GetSelectedProject()+_T("\" -notips"))); else - SetStatusText(_T("Cannot open app in Hugin.")); + SetStatusText(_("Cannot open app in Hugin.")); else { //ask user if he/she wants to load an empty project - wxMessageDialog message(this,_T("No project selected. Open Hugin without project?"), _T("Question"), + wxMessageDialog message(this,_("No project selected. Open Hugin without project?"), _("Question"), wxYES | wxNO | wxICON_INFORMATION ); if(message.ShowModal() == wxID_YES) wxExecute(huginPath+_T("hugin")); @@ -603,7 +603,7 @@ { m_batch->PauseBatch(); ((wxToolBar*)FindWindow(TOOLBAR))->ToggleTool(TOOLPAUSE,true); - SetStatusText(_T("Batch paused")); + SetStatusText(_("Batch paused")); } //m_paused=true; //} @@ -613,7 +613,7 @@ { m_batch->PauseBatch(); ((wxToolBar*)FindWindow(TOOLBAR))->ToggleTool(TOOLPAUSE,false); - SetStatusText(_T("Continuing batch...")); + SetStatusText(_("Continuing batch...")); } //m_paused=false; //} @@ -628,7 +628,7 @@ bool removeErrors=false; if(!m_batch->NoErrors()) { - wxMessageDialog message(this,_T("There are failed projects in the list.\nRemove them also?"), _T("Question"), + wxMessageDialog message(this,_("There are failed projects in the list.\nRemove them also?"), _("Question"), wxYES | wxNO | wxICON_INFORMATION ); if(message.ShowModal()==wxID_YES) removeErrors=true; @@ -655,7 +655,7 @@ { if(m_batch->GetStatus(selIndex)==Project::RUNNING || m_batch->GetStatus(selIndex)==Project::PAUSED) { - wxMessageDialog message(this, _T("Cannot remove project in progress.\nDo you want to cancel it?"), _T("In progress"), wxYES | wxCANCEL | wxICON_INFORMATION); + wxMessageDialog message(this, _("Cannot remove project in progress.\nDo you want to cancel it?"), _("In progress"), wxYES | wxCANCEL | wxICON_INFORMATION); if(message.ShowModal()==wxID_YES) { OnButtonSkip(event); @@ -664,13 +664,13 @@ else { m_batch->RemoveProjectAtIndex(selIndex); - SetStatusText(_T("Removed project "+projListBox->GetSelectedProject())); + SetStatusText(_("Removed project "+projListBox->GetSelectedProject())); projListBox->DeleteItem(selIndex); //m_batch->SaveTemp(); } } else{ - SetStatusText(_T("Please select a project to remove")); + SetStatusText(_("Please select a project to remove")); } } @@ -682,7 +682,7 @@ { if(m_batch->GetStatus(selIndex)==Project::RUNNING || m_batch->GetStatus(selIndex)==Project::PAUSED) { - wxMessageDialog message(this, _T("Cannot reset project in progress.\nDo you want to cancel it?"), _T("In progress"), wxYES | wxCANCEL | wxICON_INFORMATION); + wxMessageDialog message(this, _("Cannot reset project in progress.\nDo you want to cancel it?"), _("In progress"), wxYES | wxCANCEL | wxICON_INFORMATION); if(message.ShowModal()==wxID_YES) { OnButtonSkip(event); @@ -691,18 +691,18 @@ else { m_batch->SetStatus(selIndex,Project::WAITING); - SetStatusText(_T("Reset project "+projListBox->GetSelectedProject())); + SetStatusText(_("Reset project "+projListBox->GetSelectedProject())); } } else{ - SetStatusText(_T("Please select a project to reset")); + SetStatusText(_("Please select a project to reset")); } } void BatchFrame::OnButtonResetAll(wxCommandEvent &event) { if(m_batch->GetRunningCount()!=0) { - wxMessageDialog message(this, _T("Cannot reset projects in progress.\nDo you want to cancel the batch?"), _T("In progress"), wxYES | wxCANCEL | wxICON_INFORMATION); + wxMessageDialog message(this, _("Cannot reset projects in progress.\nDo you want to cancel the batch?"), _("In progress"), wxYES | wxCANCEL | wxICON_INFORMATION); if(message.ShowModal()==wxID_YES) OnButtonCancel(event); } @@ -960,7 +960,7 @@ SetStatusText(_T("Project \""+wxGetApp().m_projList.Item(i).path)+_T("\" finished. Batch completed with errors.")); if(((wxCheckBox*)FindWindow(CHECKSHUTDOWN))->GetValue()) //after we are finished we turn off the computer if checked { - wxProgressDialog progress(_("Initializing shutdown..."), _T("Shutting down..."),49,this, + wxProgressDialog progress(_T("Initializing shutdown..."), _T("Shutting down..."),49,this, wxPD_AUTO_HIDE | wxPD_SMOOTH | wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_CAN_SKIP); progress.Fit(); int i = 0; Modified: hugin/trunk/src/PTBatcherGUI/PTBatcherGUI.cpp =================================================================== --- hugin/trunk/src/PTBatcherGUI/PTBatcherGUI.cpp 2009-02-16 18:25:19 UTC (rev 3650) +++ hugin/trunk/src/PTBatcherGUI/PTBatcherGUI.cpp 2009-02-17 22:47:12 UTC (rev 3651) @@ -105,7 +105,7 @@ { wxCMD_LINE_SWITCH, wxT("o"), wxT("overwrite"), wxT("overwrite previous files without asking") }, { wxCMD_LINE_SWITCH, wxT("s"), wxT("shutdown"), wxT("shutdown computer after batch is complete") }, { wxCMD_LINE_SWITCH, wxT("v"), wxT("verbose"), wxT("show verbose output when processing projects") }, - { wxCMD_LINE_PARAM, NULL, NULL, _T("<project1 <output prefix>> <project2 <output prefix>> <project3"), + { wxCMD_LINE_PARAM, NULL, NULL, _("<project1 <output prefix>> <project2 <output prefix>> <project3"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL + wxCMD_LINE_PARAM_MULTIPLE }, { wxCMD_LINE_NONE } }; @@ -140,7 +140,7 @@ } #endif*/ - m_frame = new BatchFrame(_T("Batch Processor"),&m_locale,m_xrcPrefix); + m_frame = new BatchFrame(_("Batch Processor"),&m_locale,m_xrcPrefix); m_frame->Show(true); //m_frame->SetLocaleAndXRC(&m_locale,m_xrcPrefix); //projectsRunning=0; @@ -156,7 +156,7 @@ wxFileName name(param); Project *proj = new Project(param,name.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR) + name.GetName()); projList.Add(proj); - m_frame->SetStatusText(_T("Added project "+param)); + m_frame->SetStatusText(_("Added project "+param)); m_frame->projListBox->AppendProject(proj); projectSpecified = true; @@ -213,7 +213,7 @@ wxFileName name(param); Project *proj = new Project(param,name.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR) + name.GetName()); projList.Add(proj); - m_frame->SetStatusText(_T("Added project "+param)); + m_frame->SetStatusText(_("Added project "+param)); m_frame->projListBox->AppendProject(proj); projectSpecified = true; } Modified: hugin/trunk/src/PTBatcherGUI/ProjectListBox.cpp =================================================================== --- hugin/trunk/src/PTBatcherGUI/ProjectListBox.cpp 2009-02-16 18:25:19 UTC (rev 3650) +++ hugin/trunk/src/PTBatcherGUI/ProjectListBox.cpp 2009-02-17 22:47:12 UTC (rev 3651) @@ -165,7 +165,7 @@ { long id=-1; if(!GetText(index,0).ToLong(&id)) - wxMessageBox(_T("Error, cannot convert id"),_T("Error")); + wxMessageBox(_("Error, cannot convert id"),_("Error")); return (int)id; } int ProjectListBox::GetSelectedIndex() @@ -204,7 +204,7 @@ for(int i=0; i< this->GetColumnCount(); i++) { if(columns[i]==STATUS) - this->SetItem(index,i,_T("File missing")); + this->SetItem(index,i,_("File missing")); if(columns[i]!=ID && columns[i]!=PROJECT && columns[i]!=PREFIX) this->SetItem(index,i,_T("")); } @@ -314,14 +314,14 @@ } const wxString ProjectListBox::columnTitle[] = { - _T("ID"), - _T("Project"), - _T("Output prefix"), - _T("Last modified"), - _T("Output format"), - _T("Projection"), - _T("Size"), - _T("Status")}; + _("ID"), + _("Project"), + _("Output prefix"), + _("Last modified"), + _("Output format"), + _("Projection"), + _("Size"), + _("Status")}; const wxString ProjectListBox::projectionFormat[] = { _T("RECTILINEAR"), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2009-02-20 23:22:42
|
Revision: 3662 http://hugin.svn.sourceforge.net/hugin/?rev=3662&view=rev Author: brunopostle Date: 2009-02-20 22:41:00 +0000 (Fri, 20 Feb 2009) Log Message: ----------- Make PTBatcherGUI translatable (Thomas Modes) Modified Paths: -------------- hugin/trunk/src/PTBatcher/Batch.cpp hugin/trunk/src/PTBatcher/Batch.h Modified: hugin/trunk/src/PTBatcher/Batch.cpp =================================================================== --- hugin/trunk/src/PTBatcher/Batch.cpp 2009-02-20 22:33:31 UTC (rev 3661) +++ hugin/trunk/src/PTBatcher/Batch.cpp 2009-02-20 22:41:00 UTC (rev 3662) @@ -47,45 +47,21 @@ // Required to access the preferences of hugin //SetAppName(wxT("hugin")); - if(!gui) - m_locale.Init(wxLANGUAGE_DEFAULT); - // setup the environment for the different operating systems #if defined __WXMSW__ wxString huginExeDir = getExePath(path); wxString huginRoot; wxFileName::SplitPath(huginExeDir, &huginRoot, NULL, NULL); - /*wxString huginRoot; - wxFileName::SplitPath(huginExeDir, &huginRoot, NULL, NULL); - m_xrcPrefix = huginRoot + wxT("/share/hugin/xrc/"); - // locale setup - m_locale.AddCatalogLookupPathPrefix(huginRoot + wxT("/share/locale"));*/ - - if(!gui) - { - wxConfigBase* config = new wxConfig(wxT("hugin")); - m_config = config; - wxConfigBase::Set(m_config); - - // locale setup - m_locale.AddCatalogLookupPathPrefix(huginRoot + wxT("/share/locale")); - } - progs = getPTProgramsConfig(huginExeDir, wxConfigBase::Get()); #else // add the locale directory specified during configure - if(!gui) - m_locale.AddCatalogLookupPathPrefix(wxT(INSTALL_LOCALE_DIR)); PTPrograms progs = getPTProgramsConfig(wxT(""), wxConfigBase::Get()); #endif // update incompatible configuration entries. updateHuginConfig(wxConfigBase::Get()); - - // set the name of locale recource to look for - m_locale.AddCatalog(wxT("hugin")); } void Batch::AddAppToBatch(wxString app) Modified: hugin/trunk/src/PTBatcher/Batch.h =================================================================== --- hugin/trunk/src/PTBatcher/Batch.h 2009-02-20 22:33:31 UTC (rev 3661) +++ hugin/trunk/src/PTBatcher/Batch.h 2009-02-20 22:41:00 UTC (rev 3662) @@ -128,7 +128,6 @@ private: //environment config objects wxConfigBase* m_config; - wxLocale m_locale; //internal list of projects in batch ProjectArray m_projList; //list of projects in progress This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |