ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3234 from JosJuice/createintegerlabel 

DolphinWX: Remove FifoPlayerDlg::CreateIntegerLabel
This commit is contained in:
flacs 2015-11-05 12:42:15 +01:00
parent 85144f5f77 da603b7665
commit fd6b093a7e
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Core/DolphinWX/FifoPlayerDlg.cpp
View File

@ -595,7 +595,7 @@ void FifoPlayerDlg::OnFrameListSelectionChanged(wxCommandEvent& event)
{ {
size_t num_objects = player.GetAnalyzedFrameInfo(event.GetInt()).objectStarts.size(); size_t num_objects = player.GetAnalyzedFrameInfo(event.GetInt()).objectStarts.size();
for (size_t i = 0; i < num_objects; ++i) for (size_t i = 0; i < num_objects; ++i)
m_objectsList->Append(wxString::Format("Object %u", (u32)i)); m_objectsList->Append(wxString::Format(_("Object %zu"), i));
} }
// Update object list // Update object list
@ -858,7 +858,7 @@ void FifoPlayerDlg::UpdateAnalyzerGui()
for (size_t i = 0; i < num_frames; ++i) for (size_t i = 0; i < num_frames; ++i)
{ {
m_framesList->Append(wxString::Format("Frame %u", (u32)i)); m_framesList->Append(wxString::Format(_("Frame %zu"), i));
} }
wxCommandEvent ev = wxCommandEvent(wxEVT_LISTBOX); wxCommandEvent ev = wxCommandEvent(wxEVT_LISTBOX);
@ -872,7 +872,7 @@ wxString FifoPlayerDlg::CreateFileFrameCountLabel() const
FifoDataFile *file = FifoPlayer::GetInstance().GetFile(); FifoDataFile *file = FifoPlayer::GetInstance().GetFile();
if (file) if (file)
return CreateIntegerLabel(file->GetFrameCount(), _("Frame")); return wxString::Format(_("%u frames"), file->GetFrameCount());
return _("No file loaded"); return _("No file loaded");
} }
@ -882,7 +882,7 @@ wxString FifoPlayerDlg::CreateCurrentFrameLabel() const
FifoDataFile *file = FifoPlayer::GetInstance().GetFile(); FifoDataFile *file = FifoPlayer::GetInstance().GetFile();
if (file) if (file)
return _("Frame ") + wxString::Format("%u", FifoPlayer::GetInstance().GetCurrentFrameNum()); return wxString::Format(_("Frame %u"), FifoPlayer::GetInstance().GetCurrentFrameNum());
return wxEmptyString; return wxEmptyString;
} }
@ -892,7 +892,7 @@ wxString FifoPlayerDlg::CreateFileObjectCountLabel() const
FifoDataFile *file = FifoPlayer::GetInstance().GetFile(); FifoDataFile *file = FifoPlayer::GetInstance().GetFile();
if (file) if (file)
return CreateIntegerLabel(FifoPlayer::GetInstance().GetFrameObjectCount(), _("Object")); return wxString::Format(_("%u objects"), FifoPlayer::GetInstance().GetFrameObjectCount());
return wxEmptyString; return wxEmptyString;
} }
@ -907,7 +907,7 @@ wxString FifoPlayerDlg::CreateRecordingFifoSizeLabel() const
for (size_t i = 0; i < file->GetFrameCount(); ++i) for (size_t i = 0; i < file->GetFrameCount(); ++i)
fifoBytes += file->GetFrame(i).fifoDataSize; fifoBytes += file->GetFrame(i).fifoDataSize;
return CreateIntegerLabel(fifoBytes, _("FIFO Byte")); return wxString::Format(_("%zu FIFO bytes"), fifoBytes);
} }
return _("No recorded file"); return _("No recorded file");
@ -927,7 +927,7 @@ wxString FifoPlayerDlg::CreateRecordingMemSizeLabel() const
memBytes += memUpdate.size; memBytes += memUpdate.size;
} }
return CreateIntegerLabel(memBytes, _("Memory Byte")); return wxString::Format(_("%zu memory bytes"), memBytes);
} }
return wxEmptyString; return wxEmptyString;
@ -938,23 +938,11 @@ wxString FifoPlayerDlg::CreateRecordingFrameCountLabel() const
FifoDataFile *file = FifoRecorder::GetInstance().GetRecordedFile(); FifoDataFile *file = FifoRecorder::GetInstance().GetRecordedFile();
if (file) if (file)
{ return wxString::Format(_("%u frames"), file->GetFrameCount());
size_t numFrames = file->GetFrameCount();
return CreateIntegerLabel(numFrames, _("Frame"));
}
return wxEmptyString; return wxEmptyString;
} }
wxString FifoPlayerDlg::CreateIntegerLabel(size_t size, const wxString& label) const
{
wxString postfix;
if (size != 1)
postfix = _("s");
return wxString::Format("%u ", (u32)size) + label + postfix;
}
bool FifoPlayerDlg::GetSaveButtonEnabled() const bool FifoPlayerDlg::GetSaveButtonEnabled() const
{ {
return (FifoRecorder::GetInstance().GetRecordedFile() != nullptr); return (FifoRecorder::GetInstance().GetRecordedFile() != nullptr);

1
Source/Core/DolphinWX/FifoPlayerDlg.h
View File

@ -66,7 +66,6 @@ private:
wxString CreateRecordingFifoSizeLabel() const; wxString CreateRecordingFifoSizeLabel() const;
wxString CreateRecordingMemSizeLabel() const; wxString CreateRecordingMemSizeLabel() const;
wxString CreateRecordingFrameCountLabel() const; wxString CreateRecordingFrameCountLabel() const;
wxString CreateIntegerLabel(size_t size, const wxString& label) const;
bool GetSaveButtonEnabled() const; bool GetSaveButtonEnabled() const;