ShapeFusion 0.6とマージ。

[marathon/ShapeFusion.git] / Sounds / SoundsView.cpp

diff --git a/Sounds/SoundsView.cpp b/Sounds/SoundsView.cpp
index f4ea028..dd87f2d 100644 (file)
--- a/Sounds/SoundsView.cpp
+++ b/Sounds/SoundsView.cpp
@@ -219,18 +219,18 @@ void SoundsView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
                        equals = true;
 
                if (!equals)
-                       wxLogDebug(wxT("Sound source different at %d"), i);
+                       wxLogDebug(_("Sound source different at %d"), i);
                gequals = gequals && equals;
        }
        if (!gequals) {
                // FIXME : Update this when we have a "complete" editor...
                wxMessageDialog msg(frame,
-                                               wxT("It seems 8-bit and 16-bit versions of some of this Sound file "
+                                               _("It seems 8-bit and 16-bit versions of some of this Sound file "
                                                "sounds have differences. This editor will replace 16-bit sounds "
                                                "flags with those from 8-bit sounds, to ensure consistency. "
                                                "If you really need to be able to change 16-bit flags independently, "
                                                "please file a feature request."),
-                                               wxT("Warning !"), wxOK | wxICON_WARNING);
+                                               _("Warning !"), wxOK | wxICON_WARNING);
                                                
                msg.ShowModal();
        }
@@ -256,7 +256,7 @@ void SoundsView::Update(void)
                // Make sure we always have something selected
                mSoundClass = sound_class_list->GetSelection();
                if (mSoundClass == wxNOT_FOUND) {
-                       wxLogDebug(wxT("[SoundsView] There is no sound selected. Selecting first item..."));
+                       wxLogDebug(_("[SoundsView] There is no sound selected. Selecting first item..."));
                        sound_class_list->SetSelection(0);
                        mSoundClass = sound_class_list->GetSelection();
                }
@@ -420,7 +420,7 @@ void SoundsView::FlagsChanged(wxCommandEvent &e)
                        def16->SetAmbient(e.IsChecked());
                        break;
                default:
-                       wxLogDebug(wxT("Invalid control id in FlagsChanged"));
+                       wxLogDebug(_("Invalid control id in FlagsChanged"));
                        break;
        }
        GetDocument()->Modify(true);
@@ -460,7 +460,7 @@ void SoundsView::MenuDelete(wxCommandEvent &e)
 
        switch (win->GetId()) {
                case SOUND_CLASS_LIST:
-                       wxLogDebug(wxT("Delete Sound Class"));
+                       wxLogDebug(_("Delete Sound Class"));
                        break;
                case SOUND_EIGHT_BIT_PERMUTATIONS_LIST:
                case SOUND_SIXTEEN_BIT_PERMUTATIONS_LIST:
@@ -482,11 +482,11 @@ void SoundsView::MenuDelete(wxCommandEvent &e)
 
 void SoundsView::MenuAddSoundClass(wxCommandEvent &e)
 {
-       wxLogDebug(wxT("Adding an item"));
+       wxLogDebug(_("Adding an item"));
        payload->AddSoundDefinition();
        
        // We add the new Sound class item by hand
-       sound_class_list->Append(wxString::Format(wxT("Sound %d"), sound_class_list->GetCount()));
+       sound_class_list->Append(wxString::Format(_("Sound %d"), sound_class_list->GetCount()));
 
        GetDocument()->Modify(true);
        
@@ -502,21 +502,21 @@ void SoundsView::MenuImportSound(wxCommandEvent &e)
        } else if (w == static_cast<wxWindow*>(sound_eight_bit_list)) {
                definition = payload->Get8BitSoundDefinition(mSoundClass);
        } else {
-               wxMessageDialog msg(frame, wxT("Sorry, you need to select a sound class and 8-bit or 16-bit to import a sound"), wxT("Error: No selection"), wxOK | wxICON_EXCLAMATION);
+               wxMessageDialog msg(frame, _("Sorry, you need to select a sound class and 8-bit or 16-bit to import a sound"), _("Error: No selection"), wxOK | wxICON_EXCLAMATION);
                msg.ShowModal();
                return;
        }
 
        if (definition->GetPermutationCount() >= MAXIMUM_PERMUTATIONS_PER_SOUND) {
-               wxMessageDialog msg(frame, wxT("There are already five permutations for this sound"), wxT("Error: permutation limit reached"), wxOK | wxICON_EXCLAMATION);
+               wxMessageDialog msg(frame, _("There are already five permutations for this sound"), _("Error: permutation limit reached"), wxOK | wxICON_EXCLAMATION);
                msg.ShowModal();
                return;
        }
        
-       wxFileDialog dlg(frame, wxT("Choose a sound file to add"), wxT(""), wxT(""), wxT("Common sound files (AIFF, WAV)|*.aif;*.wav"), wxOPEN);
+       wxFileDialog dlg(frame, _("Choose a sound file to add"), wxT(""), wxT(""), _("Common sound files (AIFF, WAV)|*.aif;*.wav"), wxOPEN);
        if (dlg.ShowModal() == wxID_OK) {
                if (definition->NewPermutation(dlg.GetPath()) == NULL) {
-                       wxMessageDialog msg(frame, wxT("Error importing sound"), wxT("Error"), wxOK | wxICON_EXCLAMATION);
+                       wxMessageDialog msg(frame, _("Error importing sound"), _("Error"), wxOK | wxICON_EXCLAMATION);
                        msg.ShowModal();
                        return;
                }
@@ -530,12 +530,12 @@ void SoundsView::MenuImportSound(wxCommandEvent &e)
 void SoundsView::MenuExportSound(wxCommandEvent &e)
 {
        if (mSoundClass == wxNOT_FOUND || mSoundSource == wxNOT_FOUND || mSoundPermutation == wxNOT_FOUND) {
-               wxMessageDialog msg(frame, wxT("Sorry, you need to select a sound class and a permutation to export a sound"), wxT("Error : No selection"), wxOK | wxICON_EXCLAMATION);
+               wxMessageDialog msg(frame, _("Sorry, you need to select a sound class and a permutation to export a sound"), _("Error : No selection"), wxOK | wxICON_EXCLAMATION);
                msg.ShowModal();
                return;
        }
        
-       wxFileDialog dlg(frame, wxT("Choose a file name :"), wxT(""), wxString::Format(wxT("Sound %d-%d.wav"), mSoundClass, mSoundPermutation), wxT("WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif"), wxSAVE | wxOVERWRITE_PROMPT);
+       wxFileDialog dlg(frame, _("Choose a file name :"), wxT(""), wxString::Format(wxT("Sound %d-%d.wav"), mSoundClass, mSoundPermutation), _("WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif"), wxSAVE | wxOVERWRITE_PROMPT);
 
        if (dlg.ShowModal() == wxID_OK) {
                SoundsDefinition        *def = payload->GetSoundDefinition(mSoundSource, mSoundClass);
@@ -554,7 +554,7 @@ void SoundsView::MenuExportSound(wxCommandEvent &e)
                }
 
                if (!result)
-                       wxLogDebug(wxT("[SoundsView] Error exporting sound"));
+                       wxLogDebug(_("[SoundsView] Error exporting sound"));
        }
 }
 
@@ -562,12 +562,12 @@ void SoundsView::SoundPermutationSelected(wxCommandEvent &e)
 {
        // We unselect the other permutation field
        if (e.GetId() == SOUND_EIGHT_BIT_PERMUTATIONS_LIST) {
-               wxLogDebug(wxT("Selected 8-bit"));
+               wxLogDebug(_("Selected 8-bit"));
                sound_sixteen_bit_list->SetSelection(wxNOT_FOUND);
                mSoundSource = 0;
                mSoundPermutation = sound_eight_bit_list->GetSelection();
        } else if (e.GetId() == SOUND_SIXTEEN_BIT_PERMUTATIONS_LIST) {
-               wxLogDebug(wxT("Selected 16-bit"));
+               wxLogDebug(_("Selected 16-bit"));
                sound_eight_bit_list->SetSelection(wxNOT_FOUND);
                mSoundSource = 1;
                mSoundPermutation = sound_sixteen_bit_list->GetSelection();