From a83543617ce80203ee30819b0c0fcccea8e0d82b Mon Sep 17 00:00:00 2001 From: Underground78 Date: Mon, 9 Apr 2012 19:02:08 +0000 Subject: Temporary fix: avoid using translated strings when storing the settings. A better fix will be commited soon. git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@4314 10f7b99b-c216-0410-bff0-8a66a9350fd8 --- src/apps/mplayerc/MainFrm.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp index 1999f6cb3..fcc0c285d 100644 --- a/src/apps/mplayerc/MainFrm.cpp +++ b/src/apps/mplayerc/MainFrm.cpp @@ -1027,6 +1027,15 @@ void CMainFrame::RestoreFloatingControlBars() CRect r; GetWindowRect(r); + // Temporary fix: will be replaced by something better + CMapStringToString mapCaptionsToSettingsName; + mapCaptionsToSettingsName[ResStr(IDS_CAPTURE_SETTINGS)] = _T("Capture Settings"); + mapCaptionsToSettingsName[_T("Edit List Editor")] = _T("Edit List Editor"); // should be translatable + mapCaptionsToSettingsName[ResStr(IDS_NAVIGATION_BAR)] = _T("Navigation bar"); + mapCaptionsToSettingsName[ResStr(IDS_PLAYLIST_CAPTION)] = _T("Playlist"); + mapCaptionsToSettingsName[ResStr(IDS_SHADER_EDITOR)] = _T("Shader Editor"); + mapCaptionsToSettingsName[ResStr(IDS_SUBRESYNC_CAPTION)] = _T("Subresync"); + POSITION pos = m_dockingbars.GetHeadPosition(); while (pos) { CSizingControlBar* pBar = m_dockingbars.GetNext(pos); @@ -1036,7 +1045,7 @@ void CMainFrame::RestoreFloatingControlBars() if (str.IsEmpty()) { return; } - CString section = _T("ToolBars\\") + str; + CString section = _T("ToolBars\\") + mapCaptionsToSettingsName[str]; if ((pBar == &m_wndPlaylistBar) && pApp->GetProfileInt(section, _T("Visible"), FALSE)) { pBar->ShowWindow(SW_SHOW); @@ -1067,6 +1076,15 @@ void CMainFrame::SaveControlBars() { CWinApp* pApp = AfxGetApp(); + // Temporary fix: will be replaced by something better + CMapStringToString mapCaptionsToSettingsName; + mapCaptionsToSettingsName[ResStr(IDS_CAPTURE_SETTINGS)] = _T("Capture Settings"); + mapCaptionsToSettingsName[_T("Edit List Editor")] = _T("Edit List Editor"); // should be translatable + mapCaptionsToSettingsName[ResStr(IDS_NAVIGATION_BAR)] = _T("Navigation bar"); + mapCaptionsToSettingsName[ResStr(IDS_PLAYLIST_CAPTION)] = _T("Playlist"); + mapCaptionsToSettingsName[ResStr(IDS_SHADER_EDITOR)] = _T("Shader Editor"); + mapCaptionsToSettingsName[ResStr(IDS_SUBRESYNC_CAPTION)] = _T("Subresync"); + POSITION pos = m_dockingbars.GetHeadPosition(); while (pos) { CSizingControlBar* pBar = m_dockingbars.GetNext(pos); @@ -1076,7 +1094,7 @@ void CMainFrame::SaveControlBars() if (str.IsEmpty()) { return; } - CString section = _T("ToolBars\\") + str; + CString section = _T("ToolBars\\") + mapCaptionsToSettingsName[str]; pApp->WriteProfileInt(section, _T("Visible"), pBar->IsWindowVisible()); -- cgit v1.2.3