プロパティクラスのアクセス修飾子を修正

[nlite/nlite.git] / nlite / nlite_mainframe.cpp

diff --git a/nlite/nlite_mainframe.cpp b/nlite/nlite_mainframe.cpp
index 9ef4a78..e3aab74 100644 (file)
--- a/nlite/nlite_mainframe.cpp
+++ b/nlite/nlite_mainframe.cpp
@@ -158,8 +158,8 @@ LRESULT CNliteMainFrame::OnCreate(LPCREATESTRUCT lpcs){
        this->GetWindowRect(&wndRect);
        
        LONG cyMaxImized = GetSystemMetrics (SM_CYMAXIMIZED);
-       wndRect.bottom = nliteProperty.mfp.windowSize.cy != 0 ? nliteProperty.mfp.windowSize.cy : (LONG)cyMaxImized / 2;
-       wndRect.right = nliteProperty.mfp.windowSize.cx != 0 ? nliteProperty.mfp.windowSize.cx : commentViewSize.left + commentViewSize.right + 20 + commentView.GetColumnHolSizeSum();
+       wndRect.bottom = nliteProperty.GetMainFrameProperty().GetWindowSize().cy != 0 ? nliteProperty.GetMainFrameProperty().GetWindowSize().cy : (LONG)cyMaxImized / 2;
+       wndRect.right = nliteProperty.GetMainFrameProperty().GetWindowSize().cx != 0 ? nliteProperty.GetMainFrameProperty().GetWindowSize().cx : commentViewSize.left + commentViewSize.right + 20 + commentView.GetColumnHolSizeSum();
 
        
 
@@ -174,10 +174,10 @@ LRESULT CNliteMainFrame::OnCreate(LPCREATESTRUCT lpcs){
        
        listenerSettingWindow.Create(*this);
        
-       this->SetMenuItemCheck(IDM_FRONT_WINDOW_CHECK,nliteProperty.mfp.windowFrontFlag);
-       this->SetMenuItemCheck(IDM_SPEAK_COMMENT_CHECK,nliteProperty.crp.commentReadFlag);
+       this->SetMenuItemCheck(IDM_FRONT_WINDOW_CHECK,nliteProperty.GetMainFrameProperty().IsWindowFront());
+       this->SetMenuItemCheck(IDM_SPEAK_COMMENT_CHECK,nliteProperty.GetCommentReadProperty().IsCommentRead());
        
-       this->SetWindowPos(nliteProperty.mfp.windowFrontFlag == TRUE ? HWND_TOPMOST : HWND_NOTOPMOST,0,0,0,0,SWP_NOSIZE | SWP_NOMOVE);
+       this->SetWindowPos(nliteProperty.GetMainFrameProperty().IsWindowFront() == TRUE ? HWND_TOPMOST : HWND_NOTOPMOST,0,0,0,0,SWP_NOSIZE | SWP_NOMOVE);
 
        return 0;
 }
@@ -190,31 +190,31 @@ VOID CNliteMainFrame::Initialize(LPCTSTR localAppDataPath){
                nliteProperty.ReadProperty();
 
        
-               if((nliteProperty.gp.ncvUserSettingReadedFlag == FALSE) && 
+               if((nliteProperty.GetGeneralProperty().IsNCVUserSettingReaded() == FALSE) && 
                        ((PathFileExists(ncvAppSettingPath) &&  (!::PathIsDirectory( ncvAppSettingPath ))))){
                
                        if((::MessageBox(NULL,TEXT("NCV\82Ì\83\8a\83X\83i\81[\8fî\95ñ\82Æ\93¯\8aú\82µ\82Ü\82·\82©\81H"),TEXT("\83\8a\83X\83i\81[\8fî\95ñ\93Ç\82Ý\8d\9e\82Ý"),MB_OK | MB_OKCANCEL) == IDOK)){
                                listenerList.ReadProperty(GetNCVListenerInfoFilePath());
                        }
-                       nliteProperty.gp.ncvUserSettingReadedFlag = TRUE;
+                       nliteProperty.GetGeneralProperty().SetNCVUSerSettingReaded(TRUE);
                
 
                        
                        
                }
 
-               listenerList.ReadProperty(nliteProperty.listenerDataPath);
+               listenerList.ReadProperty(nliteProperty.GetListenerDataPath());
 
-               commentView.SetProperty(nliteProperty.cvp,nliteProperty.gp);
-               if(nliteProperty.gp.browserType == BT_NOSETTING){
+               commentView.SetProperty(nliteProperty.GetCommentViewProperty(),nliteProperty.GetGeneralProperty());
+               if(nliteProperty.GetGeneralProperty().GetBrowserType() == BT_NOSETTING){
                        nliteProperty.CookieSetting();
-                       while(nliteProperty.gp.browserType == BT_NOSETTING){
+                       while(nliteProperty.GetGeneralProperty().GetBrowserType() == BT_NOSETTING){
                                ::MessageBox(NULL,TEXT("\83u\83\89\83E\83U\83^\83C\83v\82ð\8ew\92è\82µ\82Ä\82­\82¾\82³\82¢\81B\82±\82ê\88È\8aO\82Ì\83u\83\89\83E\83U\82Í\8c»\8dÝ\8eg\97p\82·\82é\82±\82Æ\82Í\82Å\82«\82Ü\82¹\82ñ"),TEXT("\83u\83\89\83E\83U\83^\83C\83v\8ew\92è\83G\83\89\81["),MB_OK);
                                nliteProperty.CookieSetting();
                        }
                }
                        
-               nicoVideoAuth.SetBrowserType(nliteProperty.gp.browserType);
+               nicoVideoAuth.SetBrowserType(nliteProperty.GetGeneralProperty().GetBrowserType());
                nicoLiveStream.SetResFrom(200);
        }catch(Exception &e){
 
@@ -279,9 +279,9 @@ VOID CNliteMainFrame::OnMenuAbount(UINT uNotifyCode,int nID,HWND hWndCtl){
 
 VOID CNliteMainFrame::Finalaize(){
 
-       nliteProperty.cvp = commentView.GetProperty();
+       nliteProperty.SetCommentViewProperty(commentView.GetProperty());
        nliteProperty.WriteProperty();
-       listenerList.WriteProperty(nliteProperty.listenerDataPath);
+       listenerList.WriteProperty(nliteProperty.GetListenerDataPath());
 }
 
 VOID CNliteMainFrame::OnViewPreference(UINT uNotifyCode,int nID,HWND hWndCtl){
@@ -302,13 +302,13 @@ LRESULT CNliteMainFrame::OnUnlockLvNoBuffer(UINT uMsg,WPARAM wParam,LPARAM lPara
 VOID CNliteMainFrame::OnCookie(UINT uNotifyCode,int nID,HWND hWndCtl){
        nliteProperty.CookieSetting();
                        
-       while(nliteProperty.gp.browserType == BT_NOSETTING){
+       while(nliteProperty.GetGeneralProperty().GetBrowserType() == BT_NOSETTING){
                ::MessageBox(NULL,TEXT("\83u\83\89\83E\83U\83^\83C\83v\82ð\8ew\92è\82µ\82Ä\82­\82¾\82³\82¢\81B\82±\82ê\88È\8aO\82Ì\83u\83\89\83E\83U\82Í\8c»\8dÝ\8eg\97p\82·\82é\82±\82Æ\82Í\82Å\82«\82Ü\82¹\82ñ"),TEXT("\83u\83\89\83E\83U\83^\83C\83v\8ew\92è\83G\83\89\81["),MB_OK);
                nliteProperty.CookieSetting();
        }
                        
        try {
-               nicoVideoAuth.SetBrowserType(nliteProperty.gp.browserType);
+               nicoVideoAuth.SetBrowserType(nliteProperty.GetGeneralProperty().GetBrowserType());
        } catch(NLIBException &e){
 
                MessageBox(e.what(),TEXT("\83N\83b\83L\81[\8eæ\93¾\8e¸\94s"),MB_OK | MB_ICONERROR);
@@ -321,8 +321,8 @@ VOID CNliteMainFrame::OnCookie(UINT uNotifyCode,int nID,HWND hWndCtl){
 VOID CNliteMainFrame::OnSpeakCommentCheck(UINT uNotifyCode,int nID,HWND hWndCtl){
 
 
-       nliteProperty.crp.commentReadFlag = !IsMenuItemChecked(IDM_SPEAK_COMMENT_CHECK);
-       SetMenuItemCheck(IDM_SPEAK_COMMENT_CHECK,nliteProperty.crp.commentReadFlag );
+       nliteProperty.GetCommentReadProperty().SetCommentRead(!IsMenuItemChecked(IDM_SPEAK_COMMENT_CHECK));
+       SetMenuItemCheck(IDM_SPEAK_COMMENT_CHECK,nliteProperty.GetCommentReadProperty().IsCommentRead() );
        
        return;
 }
@@ -330,9 +330,9 @@ VOID CNliteMainFrame::OnSpeakCommentCheck(UINT uNotifyCode,int nID,HWND hWndCtl)
 VOID CNliteMainFrame::OnFrontWindowCheck(UINT uNotifyCode,int nID,HWND hWndCtl){
 
 
-       nliteProperty.mfp.windowFrontFlag = !IsMenuItemChecked(IDM_FRONT_WINDOW_CHECK);
-       SetMenuItemCheck(IDM_FRONT_WINDOW_CHECK,nliteProperty.mfp.windowFrontFlag );
-       this->SetWindowPos(nliteProperty.mfp.windowFrontFlag == TRUE ? HWND_TOPMOST : HWND_NOTOPMOST,0,0,0,0,SWP_NOSIZE | SWP_NOMOVE);
+       nliteProperty.GetMainFrameProperty().SetWindowFront(!IsMenuItemChecked(IDM_FRONT_WINDOW_CHECK));
+       SetMenuItemCheck(IDM_FRONT_WINDOW_CHECK,nliteProperty.GetMainFrameProperty().IsWindowFront() );
+       this->SetWindowPos(nliteProperty.GetMainFrameProperty().IsWindowFront() == TRUE ? HWND_TOPMOST : HWND_NOTOPMOST,0,0,0,0,SWP_NOSIZE | SWP_NOMOVE);
        return;
 }