From: <hug...@li...> - 2010-10-20 18:58:43
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/cf493904f8aa changeset: 4510:cf493904f8aa user: tmodes date: Wed Oct 20 20:58:16 2010 +0200 description: Remove caption from wxMessageDialog for Unix and Apple It is required by Windows User Experience Interaction Guidelines, but Gnome Human Interface Guidelines and Apple Human Interface Guidelines does not want titles. diffstat: src/hugin1/hugin/CPEditorPanel.cpp | 8 +++++++ src/hugin1/hugin/MainFrame.cpp | 7 +++++- src/hugin1/hugin/PanoPanel.cpp | 8 +++++++ src/hugin1/ptbatcher/Batch.cpp | 8 ++++++- src/hugin1/ptbatcher/BatchFrame.cpp | 40 +++++++++++++++++++++++++++++++----- 5 files changed, 63 insertions(+), 8 deletions(-) diffs (167 lines): diff -r 3edfcd782b6a -r cf493904f8aa src/hugin1/hugin/CPEditorPanel.cpp --- a/src/hugin1/hugin/CPEditorPanel.cpp Wed Oct 20 19:30:33 2010 +0200 +++ b/src/hugin1/hugin/CPEditorPanel.cpp Wed Oct 20 20:58:16 2010 +0200 @@ -1065,7 +1065,11 @@ #if wxCHECK_VERSION(2, 9, 0) wxMessageDialog dlg(this, _("No similar point found."), +#ifdef _WINDOWS _("Hugin"), +#else + wxT(""), +#endif wxICON_ERROR | wxOK); dlg.SetExtendedMessage(wxString::Format(_("Check the similarity visually.\nCorrelation coefficient (%.3f) is lower than the threshold set in the preferences."), res.maxi)); @@ -1074,7 +1078,11 @@ wxMessageBox( wxString::Format(_("No similar point found. Check the similarity visually.\nCorrelation coefficient (%.3f) is lower than the threshold set in the preferences."), res.maxi), +#ifdef _WINDOWS _("Hugin"), +#else + wxT(""), +#endif wxICON_ERROR | wxOK, this); #endif return false; diff -r 3edfcd782b6a -r cf493904f8aa src/hugin1/hugin/MainFrame.cpp --- a/src/hugin1/hugin/MainFrame.cpp Wed Oct 20 19:30:33 2010 +0200 +++ b/src/hugin1/hugin/MainFrame.cpp Wed Oct 20 20:58:16 2010 +0200 @@ -499,7 +499,12 @@ { if (pano.isDirty()) { wxMessageDialog message(this, - _("Save changes to the panorama before closing?"), _("Hugin"), + _("Save changes to the panorama before closing?"), +#ifdef _WINDOWS + _("Hugin"), +#else + wxT(""), +#endif wxICON_EXCLAMATION | wxYES_NO | (cancelable? (wxCANCEL):0)); #if wxCHECK_VERSION(2, 9, 0) message.SetExtendedMessage("If you close without saving, changes since your last save will be discarded"); diff -r 3edfcd782b6a -r cf493904f8aa src/hugin1/hugin/PanoPanel.cpp --- a/src/hugin1/hugin/PanoPanel.cpp Wed Oct 20 19:30:33 2010 +0200 +++ b/src/hugin1/hugin/PanoPanel.cpp Wed Oct 20 20:58:16 2010 +0200 @@ -1299,7 +1299,11 @@ #if wxCHECK_VERSION(2,9,0) wxMessageDialog dialog(this, _("Are you sure you want to stitch such a large panorama?"), +#ifdef _WINDOWS _("Hugin"), +#else + wxT(""), +#endif wxICON_EXCLAMATION | wxYES_NO); dialog.SetExtendedMessage( wxString::Format(_("The panorama you are trying to stitch is %.1f gigapixels.\nIf this is too big, reduce the panorama Canvas Size and the cropped region and stitch from the Stitcher tab. Stitching a panorama this size could take a long time and a large amount of memory."), @@ -1323,7 +1327,11 @@ wxMessageDialog dialog(this, wxString::Format(_("Are you sure you want to stitch such a large panorama?\n\nThe panorama you are trying to stitch is %.1f gigapixels.\nIf this is too big, reduce the panorama Canvas Size and the cropped region and stitch from the Stitcher tab. Stitching a panorama this size could take a long time and a large amount of memory."), area / 1000000000.0), +#ifdef _WINDOWS _("Hugin"), +#else + wxT(""), +#endif wxICON_EXCLAMATION | wxYES_NO); #endif bool result; diff -r 3edfcd782b6a -r cf493904f8aa src/hugin1/ptbatcher/Batch.cpp --- a/src/hugin1/ptbatcher/Batch.cpp Wed Oct 20 19:30:33 2010 +0200 +++ b/src/hugin1/ptbatcher/Batch.cpp Wed Oct 20 20:58:16 2010 +0200 @@ -241,7 +241,13 @@ { if(gui) { - wxMessageDialog message(this, _("Cannot clear batch in progress.\nDo you want to cancel it?"), _("In progress"), wxYES | wxCANCEL | wxICON_INFORMATION); + wxMessageDialog message(this, _("Cannot clear batch in progress.\nDo you want to cancel it?"), +#ifdef _WINDOWS + _("PTBatcherGUI"), +#else + wxT(""), +#endif + wxYES | wxCANCEL | wxICON_INFORMATION); if(message.ShowModal()==wxID_YES) { CancelBatch(); diff -r 3edfcd782b6a -r cf493904f8aa src/hugin1/ptbatcher/BatchFrame.cpp --- a/src/hugin1/ptbatcher/BatchFrame.cpp Wed Oct 20 19:30:33 2010 +0200 +++ b/src/hugin1/ptbatcher/BatchFrame.cpp Wed Oct 20 20:58:16 2010 +0200 @@ -583,7 +583,12 @@ else { //ask user if he/she wants to load an empty project - wxMessageDialog message(this,_("No project selected. Open Hugin without project?"), _("Question"), + wxMessageDialog message(this,_("No project selected. Open Hugin without project?"), +#ifdef _WINDOWS + _("PTBatcherGUI"), +#else + wxT(""), +#endif wxYES | wxNO | wxICON_INFORMATION ); if(message.ShowModal() == wxID_YES) { #ifdef __WXMAC__ @@ -631,8 +636,13 @@ bool removeErrors=false; if(!m_batch->NoErrors()) { - wxMessageDialog message(this,_("There are failed projects in the list.\nRemove them also?"), _("Question"), - wxYES | wxNO | wxICON_INFORMATION ); + wxMessageDialog message(this,_("There are failed projects in the list.\nRemove them also?"), +#ifdef _WINDOWS + _("PTBatcherGUI"), +#else + wxT(""), +#endif + wxYES | wxNO | wxICON_INFORMATION ); if(message.ShowModal()==wxID_YES) removeErrors=true; } @@ -659,7 +669,13 @@ { if(m_batch->GetStatus(selIndex)==Project::RUNNING || m_batch->GetStatus(selIndex)==Project::PAUSED) { - wxMessageDialog message(this, _("Cannot remove project in progress.\nDo you want to cancel it?"), _("In progress"), wxYES | wxCANCEL | wxICON_INFORMATION); + wxMessageDialog message(this, _("Cannot remove project in progress.\nDo you want to cancel it?"), +#ifdef _WINDOWS + _("PTBatcherGUI"), +#else + wxT(""), +#endif + wxYES | wxCANCEL | wxICON_INFORMATION); if(message.ShowModal()==wxID_YES) { OnButtonSkip(event); @@ -687,7 +703,13 @@ { if(m_batch->GetStatus(selIndex)==Project::RUNNING || m_batch->GetStatus(selIndex)==Project::PAUSED) { - wxMessageDialog message(this, _("Cannot reset project in progress.\nDo you want to cancel it?"), _("In progress"), wxYES | wxCANCEL | wxICON_INFORMATION); + wxMessageDialog message(this, _("Cannot reset project in progress.\nDo you want to cancel it?"), +#ifdef _WINDOWS + _("PTBatcherGUI"), +#else + wxT(""), +#endif + wxYES | wxCANCEL | wxICON_INFORMATION); if(message.ShowModal()==wxID_YES) { OnButtonSkip(event); @@ -708,7 +730,13 @@ { if(m_batch->GetRunningCount()!=0) { - wxMessageDialog message(this, _("Cannot reset projects in progress.\nDo you want to cancel the batch?"), _("In progress"), wxYES | wxCANCEL | wxICON_INFORMATION); + wxMessageDialog message(this, _("Cannot reset projects in progress.\nDo you want to cancel the batch?"), +#ifdef _WINDOWS + _("PTBatcherGUI"), +#else + wxT(""), +#endif + wxYES | wxCANCEL | wxICON_INFORMATION); if(message.ShowModal()==wxID_YES) OnButtonCancel(event); } |