mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-06-15 06:58:37 +02:00
Fix a few strings for translation.
Fix a minor icon issue in the game properties dialog. Use a little hack to deal with spaces in file names. Need to find a better way to deal with this. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7470 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -532,7 +532,7 @@ void CConfigMain::InitializeGUIValues()
|
|||||||
// video backend list
|
// video backend list
|
||||||
for (std::vector<VideoBackend*>::const_iterator it = g_available_video_backends.begin(); it != g_available_video_backends.end(); ++it)
|
for (std::vector<VideoBackend*>::const_iterator it = g_available_video_backends.begin(); it != g_available_video_backends.end(); ++it)
|
||||||
{
|
{
|
||||||
GraphicSelection->AppendString(wxString::FromUTF8((*it)->GetName().c_str()));
|
GraphicSelection->AppendString(wxGetTranslation(wxString::FromUTF8((*it)->GetName().c_str())));
|
||||||
if (*it == g_video_backend)
|
if (*it == g_video_backend)
|
||||||
GraphicSelection->Select(it - g_available_video_backends.begin());
|
GraphicSelection->Select(it - g_available_video_backends.begin());
|
||||||
}
|
}
|
||||||
|
@ -54,7 +54,7 @@ FifoPlayerDlg::~FifoPlayerDlg()
|
|||||||
Disconnect(FRAME_WRITTEN_EVENT, wxCommandEventHandler(FifoPlayerDlg::OnFrameWritten), NULL, this);
|
Disconnect(FRAME_WRITTEN_EVENT, wxCommandEventHandler(FifoPlayerDlg::OnFrameWritten), NULL, this);
|
||||||
|
|
||||||
// Disconnect Events
|
// Disconnect Events
|
||||||
this->Disconnect( wxEVT_PAINT, wxPaintEventHandler( FifoPlayerDlg::OnPaint ), NULL, this );
|
Disconnect(wxEVT_PAINT, wxPaintEventHandler(FifoPlayerDlg::OnPaint), NULL, this);
|
||||||
m_FrameFromCtrl->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnFrameFrom), NULL, this);
|
m_FrameFromCtrl->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnFrameFrom), NULL, this);
|
||||||
m_FrameToCtrl->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnFrameTo), NULL, this);
|
m_FrameToCtrl->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnFrameTo), NULL, this);
|
||||||
m_ObjectFromCtrl->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnObjectFrom), NULL, this);
|
m_ObjectFromCtrl->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnObjectFrom), NULL, this);
|
||||||
@ -130,7 +130,7 @@ void FifoPlayerDlg::CreateGUIControls()
|
|||||||
m_ObjectFromCtrl = new wxSpinCtrl(m_PlayPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10000, 0);
|
m_ObjectFromCtrl = new wxSpinCtrl(m_PlayPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10000, 0);
|
||||||
sObjectRange->Add(m_ObjectFromCtrl, 0, wxALL, 5);
|
sObjectRange->Add(m_ObjectFromCtrl, 0, wxALL, 5);
|
||||||
|
|
||||||
m_ObjectToLabel = new wxStaticText( m_PlayPage, wxID_ANY, wxT("To"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_ObjectToLabel = new wxStaticText(m_PlayPage, wxID_ANY, _("To"), wxDefaultPosition, wxDefaultSize, 0);
|
||||||
m_ObjectToLabel->Wrap(-1);
|
m_ObjectToLabel->Wrap(-1);
|
||||||
sObjectRange->Add(m_ObjectToLabel, 0, wxALL, 5);
|
sObjectRange->Add(m_ObjectToLabel, 0, wxALL, 5);
|
||||||
|
|
||||||
@ -219,10 +219,10 @@ void FifoPlayerDlg::CreateGUIControls()
|
|||||||
Layout();
|
Layout();
|
||||||
sMain->Fit(this);
|
sMain->Fit(this);
|
||||||
|
|
||||||
this->Center( wxBOTH );
|
Center(wxBOTH);
|
||||||
|
|
||||||
// Connect Events
|
// Connect Events
|
||||||
this->Connect( wxEVT_PAINT, wxPaintEventHandler( FifoPlayerDlg::OnPaint ) );
|
Connect(wxEVT_PAINT, wxPaintEventHandler(FifoPlayerDlg::OnPaint));
|
||||||
m_FrameFromCtrl->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnFrameFrom), NULL, this);
|
m_FrameFromCtrl->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnFrameFrom), NULL, this);
|
||||||
m_FrameToCtrl->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnFrameTo), NULL, this);
|
m_FrameToCtrl->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnFrameTo), NULL, this);
|
||||||
m_ObjectFromCtrl->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnObjectFrom), NULL, this);
|
m_ObjectFromCtrl->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnObjectFrom), NULL, this);
|
||||||
@ -472,11 +472,10 @@ void FifoPlayerDlg::RecordingFinished()
|
|||||||
{
|
{
|
||||||
sMutex.lock();
|
sMutex.lock();
|
||||||
|
|
||||||
wxEvtHandler* evtHandler = m_EvtHandler;
|
if (m_EvtHandler)
|
||||||
if (evtHandler)
|
|
||||||
{
|
{
|
||||||
wxCommandEvent event(RECORDING_FINISHED_EVENT);
|
wxCommandEvent event(RECORDING_FINISHED_EVENT);
|
||||||
evtHandler->AddPendingEvent( event );
|
m_EvtHandler->AddPendingEvent(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
sMutex.unlock();
|
sMutex.unlock();
|
||||||
@ -486,11 +485,10 @@ void FifoPlayerDlg::FileLoaded()
|
|||||||
{
|
{
|
||||||
sMutex.lock();
|
sMutex.lock();
|
||||||
|
|
||||||
wxEvtHandler* evtHandler = m_EvtHandler;
|
if (m_EvtHandler)
|
||||||
if (evtHandler)
|
|
||||||
{
|
{
|
||||||
wxPaintEvent event;
|
wxPaintEvent event;
|
||||||
evtHandler->AddPendingEvent( event );
|
m_EvtHandler->AddPendingEvent(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
sMutex.unlock();
|
sMutex.unlock();
|
||||||
@ -500,11 +498,10 @@ void FifoPlayerDlg::FrameWritten()
|
|||||||
{
|
{
|
||||||
sMutex.lock();
|
sMutex.lock();
|
||||||
|
|
||||||
wxEvtHandler* evtHandler = m_EvtHandler;
|
if (m_EvtHandler)
|
||||||
if (evtHandler)
|
|
||||||
{
|
{
|
||||||
wxCommandEvent event(FRAME_WRITTEN_EVENT);
|
wxCommandEvent event(FRAME_WRITTEN_EVENT);
|
||||||
evtHandler->AddPendingEvent( event );
|
m_EvtHandler->AddPendingEvent(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
sMutex.unlock();
|
sMutex.unlock();
|
||||||
|
@ -217,7 +217,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
|
|||||||
{
|
{
|
||||||
WiiPartition partition = WiiDisc.at(i);
|
WiiPartition partition = WiiDisc.at(i);
|
||||||
wxTreeItemId PartitionRoot =
|
wxTreeItemId PartitionRoot =
|
||||||
m_Treectrl->AppendItem(RootId, wxString::Format(_("Partition %i"), i));
|
m_Treectrl->AppendItem(RootId, wxString::Format(_("Partition %i"), i), 0, 0);
|
||||||
CreateDirectoryTree(PartitionRoot, partition.Files, 1, partition.Files.at(0)->m_FileSize);
|
CreateDirectoryTree(PartitionRoot, partition.Files, 1, partition.Files.at(0)->m_FileSize);
|
||||||
if (i == 1)
|
if (i == 1)
|
||||||
m_Treectrl->Expand(PartitionRoot);
|
m_Treectrl->Expand(PartitionRoot);
|
||||||
|
@ -41,6 +41,10 @@ void Explore(const char *path)
|
|||||||
wxPath = wxT("file://") + wxPath;
|
wxPath = wxT("file://") + wxPath;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef __WXGTK__
|
||||||
|
wxPath.Replace(wxT(" "), wxT("\\ "));
|
||||||
|
#endif
|
||||||
|
|
||||||
if (! ::wxLaunchDefaultBrowser(wxPath))
|
if (! ::wxLaunchDefaultBrowser(wxPath))
|
||||||
{
|
{
|
||||||
// WARN_LOG
|
// WARN_LOG
|
||||||
|
@ -49,7 +49,7 @@ static volatile bool emuRunningState = false;
|
|||||||
|
|
||||||
std::string VideoSoftware::GetName()
|
std::string VideoSoftware::GetName()
|
||||||
{
|
{
|
||||||
return "Software Renderer";
|
return _trans("Software Renderer");
|
||||||
}
|
}
|
||||||
|
|
||||||
void *DllDebugger(void *_hParent, bool Show)
|
void *DllDebugger(void *_hParent, bool Show)
|
||||||
|
Reference in New Issue
Block a user