diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-03-03 19:33:43 +0300 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-03-03 19:33:43 +0300 |
commit | 19348b4edc09da7cd002c0ef9464a2a9b1e9c9a4 (patch) | |
tree | 50557fc979823c44fa7b7bbad7c99cc5e3a3bad9 /src/apps | |
parent | aeee62deb22103b68a966d9af72c6280118cfcfd (diff) |
Refactored Player options and moved "Free windows resizing" to Player options
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1725 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/apps')
22 files changed, 9 insertions, 9 deletions
diff --git a/src/apps/mplayerc/PPagePlayer.cpp b/src/apps/mplayerc/PPagePlayer.cpp index 0749d302a..c30a5bb4e 100644 --- a/src/apps/mplayerc/PPagePlayer.cpp +++ b/src/apps/mplayerc/PPagePlayer.cpp @@ -47,6 +47,7 @@ CPPagePlayer::CPPagePlayer() , m_fShowOSD(FALSE)
, m_fRememberDVDPos(FALSE)
, m_fRememberFilePos(FALSE)
+ , m_fFreeWindowResizing(TRUE)
{
}
@@ -72,6 +73,7 @@ void CPPagePlayer::DoDataExchange(CDataExchange* pDX) DDX_Check(pDX, IDC_SHOW_OSD, m_fShowOSD);
DDX_Check(pDX, IDC_DVD_POS, m_fRememberDVDPos);
DDX_Check(pDX, IDC_FILE_POS, m_fRememberFilePos);
+ DDX_Check(pDX, IDC_CHECK4, m_fFreeWindowResizing);
}
BEGIN_MESSAGE_MAP(CPPagePlayer, CPPageBase)
@@ -102,8 +104,9 @@ BOOL CPPagePlayer::OnInitDialog() m_fHideCDROMsSubMenu = s.fHideCDROMsSubMenu;
m_priority = s.priority != NORMAL_PRIORITY_CLASS;
m_fShowOSD = s.fShowOSD;
- m_fRememberDVDPos = s.fRememberDVDPos;
- m_fRememberFilePos = s.fRememberFilePos;
+ m_fRememberDVDPos = s.fRememberDVDPos;
+ m_fRememberFilePos = s.fRememberFilePos;
+ m_fFreeWindowResizing = s.fFreeWindowResizing;
UpdateData(FALSE);
@@ -132,8 +135,9 @@ BOOL CPPagePlayer::OnApply() s.fHideCDROMsSubMenu = !!m_fHideCDROMsSubMenu;
s.priority = !m_priority ? NORMAL_PRIORITY_CLASS : GetVersion() < 0 ? HIGH_PRIORITY_CLASS : ABOVE_NORMAL_PRIORITY_CLASS;
s.fShowOSD = !!m_fShowOSD;
- s.fRememberDVDPos = m_fRememberDVDPos ? true : false;
- s.fRememberFilePos = m_fRememberFilePos ? true : false;
+ s.fRememberDVDPos = m_fRememberDVDPos ? true : false;
+ s.fRememberFilePos = m_fRememberFilePos ? true : false;
+ s.fFreeWindowResizing = !!m_fFreeWindowResizing;
if(!m_fKeepHistory)
{
diff --git a/src/apps/mplayerc/PPagePlayer.h b/src/apps/mplayerc/PPagePlayer.h index ecb72d1dd..396e7b055 100644 --- a/src/apps/mplayerc/PPagePlayer.h +++ b/src/apps/mplayerc/PPagePlayer.h @@ -51,6 +51,7 @@ public: BOOL m_fShowOSD;
BOOL m_fRememberDVDPos;
BOOL m_fRememberFilePos;
+ BOOL m_fFreeWindowResizing;
// Dialog Data
enum { IDD = IDD_PPAGEPLAYER };
diff --git a/src/apps/mplayerc/PPageTweaks.cpp b/src/apps/mplayerc/PPageTweaks.cpp index e566a935d..8b40d84a1 100644 --- a/src/apps/mplayerc/PPageTweaks.cpp +++ b/src/apps/mplayerc/PPageTweaks.cpp @@ -37,7 +37,6 @@ CPPageTweaks::CPPageTweaks() , m_nJumpDistS(0)
, m_nJumpDistM(0)
, m_nJumpDistL(0)
- , m_fFreeWindowResizing(TRUE)
, m_fNotifyMSN(TRUE)
, m_fNotifyGTSdll(FALSE)
, m_GTSdllLink(_T("https://sourceforge.net/project/showfiles.php?group_id=82303&package_id=169521&release_id=371114"))
@@ -62,7 +61,6 @@ void CPPageTweaks::DoDataExchange(CDataExchange* pDX) DDX_Text(pDX, IDC_EDIT1, m_nJumpDistS);
DDX_Text(pDX, IDC_EDIT2, m_nJumpDistM);
DDX_Text(pDX, IDC_EDIT3, m_nJumpDistL);
- DDX_Check(pDX, IDC_CHECK1, m_fFreeWindowResizing);
DDX_Check(pDX, IDC_CHECK4, m_fNotifyMSN);
DDX_Check(pDX, IDC_CHECK5, m_fNotifyGTSdll);
DDX_Control(pDX, IDC_STATICLINKGTS, m_GTSdllLink);
@@ -81,7 +79,6 @@ BOOL CPPageTweaks::OnInitDialog() m_nJumpDistS = s.nJumpDistS;
m_nJumpDistM = s.nJumpDistM;
m_nJumpDistL = s.nJumpDistL;
- m_fFreeWindowResizing = s.fFreeWindowResizing;
m_fNotifyMSN = s.fNotifyMSN;
m_fNotifyGTSdll = s.fNotifyGTSdll;
@@ -105,7 +102,6 @@ BOOL CPPageTweaks::OnApply() s.nJumpDistS = m_nJumpDistS;
s.nJumpDistM = m_nJumpDistM;
s.nJumpDistL = m_nJumpDistL;
- s.fFreeWindowResizing = !!m_fFreeWindowResizing;
s.fNotifyMSN = !!m_fNotifyMSN;
s.fNotifyGTSdll = !!m_fNotifyGTSdll;
diff --git a/src/apps/mplayerc/PPageTweaks.h b/src/apps/mplayerc/PPageTweaks.h index 8969cb1a0..4fc61d702 100644 --- a/src/apps/mplayerc/PPageTweaks.h +++ b/src/apps/mplayerc/PPageTweaks.h @@ -50,7 +50,6 @@ public: int m_nJumpDistS;
int m_nJumpDistM;
int m_nJumpDistL;
- BOOL m_fFreeWindowResizing;
BOOL m_fNotifyMSN;
BOOL m_fNotifyGTSdll;
CStaticLink m_GTSdllLink;
diff --git a/src/apps/mplayerc/mplayerc.br.rc b/src/apps/mplayerc/mplayerc.br.rc Binary files differindex 8ee83db4d..d0198e999 100644 --- a/src/apps/mplayerc/mplayerc.br.rc +++ b/src/apps/mplayerc/mplayerc.br.rc diff --git a/src/apps/mplayerc/mplayerc.by.rc b/src/apps/mplayerc/mplayerc.by.rc Binary files differindex c158ea657..943eb137e 100644 --- a/src/apps/mplayerc/mplayerc.by.rc +++ b/src/apps/mplayerc/mplayerc.by.rc diff --git a/src/apps/mplayerc/mplayerc.cz.rc b/src/apps/mplayerc/mplayerc.cz.rc Binary files differindex a784612f9..4f79ee03f 100644 --- a/src/apps/mplayerc/mplayerc.cz.rc +++ b/src/apps/mplayerc/mplayerc.cz.rc diff --git a/src/apps/mplayerc/mplayerc.de.rc b/src/apps/mplayerc/mplayerc.de.rc Binary files differindex 07609bd75..fab627e52 100644 --- a/src/apps/mplayerc/mplayerc.de.rc +++ b/src/apps/mplayerc/mplayerc.de.rc diff --git a/src/apps/mplayerc/mplayerc.es.rc b/src/apps/mplayerc/mplayerc.es.rc Binary files differindex 31077ffed..6475f1183 100644 --- a/src/apps/mplayerc/mplayerc.es.rc +++ b/src/apps/mplayerc/mplayerc.es.rc diff --git a/src/apps/mplayerc/mplayerc.fr.rc b/src/apps/mplayerc/mplayerc.fr.rc Binary files differindex 90b0f0f91..b66a40b73 100644 --- a/src/apps/mplayerc/mplayerc.fr.rc +++ b/src/apps/mplayerc/mplayerc.fr.rc diff --git a/src/apps/mplayerc/mplayerc.hu.rc b/src/apps/mplayerc/mplayerc.hu.rc Binary files differindex d27ff7908..fd2860082 100644 --- a/src/apps/mplayerc/mplayerc.hu.rc +++ b/src/apps/mplayerc/mplayerc.hu.rc diff --git a/src/apps/mplayerc/mplayerc.it.rc b/src/apps/mplayerc/mplayerc.it.rc Binary files differindex b3e641dbe..3cd04755d 100644 --- a/src/apps/mplayerc/mplayerc.it.rc +++ b/src/apps/mplayerc/mplayerc.it.rc diff --git a/src/apps/mplayerc/mplayerc.kr.rc b/src/apps/mplayerc/mplayerc.kr.rc Binary files differindex 6c3ef8692..56b08c1c4 100644 --- a/src/apps/mplayerc/mplayerc.kr.rc +++ b/src/apps/mplayerc/mplayerc.kr.rc diff --git a/src/apps/mplayerc/mplayerc.pl.rc b/src/apps/mplayerc/mplayerc.pl.rc Binary files differindex affac44e5..2b9f31f88 100644 --- a/src/apps/mplayerc/mplayerc.pl.rc +++ b/src/apps/mplayerc/mplayerc.pl.rc diff --git a/src/apps/mplayerc/mplayerc.rc b/src/apps/mplayerc/mplayerc.rc Binary files differindex f7f6f4912..47e18da6b 100644 --- a/src/apps/mplayerc/mplayerc.rc +++ b/src/apps/mplayerc/mplayerc.rc diff --git a/src/apps/mplayerc/mplayerc.ru.rc b/src/apps/mplayerc/mplayerc.ru.rc Binary files differindex 0177894dd..fde9147d0 100644 --- a/src/apps/mplayerc/mplayerc.ru.rc +++ b/src/apps/mplayerc/mplayerc.ru.rc diff --git a/src/apps/mplayerc/mplayerc.sc.rc b/src/apps/mplayerc/mplayerc.sc.rc Binary files differindex 532d4be61..f58d040b5 100644 --- a/src/apps/mplayerc/mplayerc.sc.rc +++ b/src/apps/mplayerc/mplayerc.sc.rc diff --git a/src/apps/mplayerc/mplayerc.sk.rc b/src/apps/mplayerc/mplayerc.sk.rc Binary files differindex 2c8583398..434fd80c6 100644 --- a/src/apps/mplayerc/mplayerc.sk.rc +++ b/src/apps/mplayerc/mplayerc.sk.rc diff --git a/src/apps/mplayerc/mplayerc.sv.rc b/src/apps/mplayerc/mplayerc.sv.rc Binary files differindex b692230fc..72efcdb0e 100644 --- a/src/apps/mplayerc/mplayerc.sv.rc +++ b/src/apps/mplayerc/mplayerc.sv.rc diff --git a/src/apps/mplayerc/mplayerc.tc.rc b/src/apps/mplayerc/mplayerc.tc.rc Binary files differindex 918a366d3..73a5aa701 100644 --- a/src/apps/mplayerc/mplayerc.tc.rc +++ b/src/apps/mplayerc/mplayerc.tc.rc diff --git a/src/apps/mplayerc/mplayerc.tr.rc b/src/apps/mplayerc/mplayerc.tr.rc Binary files differindex ac224300f..a722d9746 100644 --- a/src/apps/mplayerc/mplayerc.tr.rc +++ b/src/apps/mplayerc/mplayerc.tr.rc diff --git a/src/apps/mplayerc/mplayerc.ua.rc b/src/apps/mplayerc/mplayerc.ua.rc Binary files differindex 117498ce0..ec4447345 100644 --- a/src/apps/mplayerc/mplayerc.ua.rc +++ b/src/apps/mplayerc/mplayerc.ua.rc |