diff options
| author | sansnom05 <sansnom05@users.sourceforge.net> | 2010-12-16 16:53:08 +0300 |
|---|---|---|
| committer | sansnom05 <sansnom05@users.sourceforge.net> | 2010-12-16 16:53:08 +0300 |
| commit | f0d88a6ff96770b10031dcc59447cca2c7dbc91c (patch) | |
| tree | e188e4e733fcf6fc9b00dc349618c19f4d47a7c9 /src/apps/mplayerc/PPageTweaks.cpp | |
| parent | 5067b0b48d4d15b24669c8032b28e90e45202801 (diff) | |
legacy branch: merge r2662-r2759
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/branches/legacy@2778 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/apps/mplayerc/PPageTweaks.cpp')
| -rw-r--r-- | src/apps/mplayerc/PPageTweaks.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/apps/mplayerc/PPageTweaks.cpp b/src/apps/mplayerc/PPageTweaks.cpp index 39a7e491b..4c79b9aab 100644 --- a/src/apps/mplayerc/PPageTweaks.cpp +++ b/src/apps/mplayerc/PPageTweaks.cpp @@ -96,12 +96,12 @@ BOOL CPPageTweaks::OnInitDialog() m_fNotifyMSN = s.fNotifyMSN;
m_fNotifyGTSdll = s.fNotifyGTSdll;
- m_fPreventMinimize = s.m_fPreventMinimize;
- m_fUseWin7TaskBar = s.m_fUseWin7TaskBar;
- m_fDontUseSearchInFolder =s.m_fDontUseSearchInFolder;
+ m_fPreventMinimize = s.fPreventMinimize;
+ m_fUseWin7TaskBar = s.fUseWin7TaskBar;
+ m_fDontUseSearchInFolder =s.fDontUseSearchInFolder;
- m_OSD_Size = s.nOSD_Size;
- m_OSD_Font = s.m_OSD_Font;
+ m_OSD_Size = s.nOSDSize;
+ m_OSD_Font = s.strOSDFont;
CString str;
int iSel = 0;
@@ -151,11 +151,11 @@ BOOL CPPageTweaks::OnApply() s.fNotifyMSN = !!m_fNotifyMSN;
s.fNotifyGTSdll = !!m_fNotifyGTSdll;
- s.m_fPreventMinimize = m_fPreventMinimize;
- s.m_fUseWin7TaskBar = m_fUseWin7TaskBar;
- s.m_fDontUseSearchInFolder = m_fDontUseSearchInFolder;
- s.nOSD_Size = m_OSD_Size;
- m_FontType.GetLBText(m_FontType.GetCurSel(),s.m_OSD_Font);
+ s.fPreventMinimize = m_fPreventMinimize;
+ s.fUseWin7TaskBar = m_fUseWin7TaskBar;
+ s.fDontUseSearchInFolder = m_fDontUseSearchInFolder;
+ s.nOSDSize = m_OSD_Size;
+ m_FontType.GetLBText(m_FontType.GetCurSel(),s.strOSDFont);
CMainFrame* pFrame = ((CMainFrame*)GetParentFrame());
if(m_fUseWin7TaskBar) pFrame->CreateThumbnailToolbar();
|