YAEdit color properties support.

Property dialog and YAEdit itself.

diff --git a/.gitignore b/.gitignore
index bacb024..c2f2aeb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ UnitTest/release
 *.ncb\r
 *.vcxproj.user\r
 *.sdf\r
+*.aps\r

diff --git a/Src/MainFrame.cpp b/Src/MainFrame.cpp
index 500dd73..2d583c3 100644 (file)
--- a/Src/MainFrame.cpp
+++ b/Src/MainFrame.cpp
@@ -1399,6 +1399,16 @@ void MainFrame::OnProperty()
        // tabstop setting\r
        pDetailsView->SetTabstop();\r
 \r
+       // color setting\r
+       YAEditViewColorDef cdef;\r
+       cdef.rgbForeground = g_Property.GetFgColor();\r
+       cdef.rgbBackground = g_Property.GetBgColor();\r
+       cdef.rgbEol = g_Property.GetEolColor();\r
+       cdef.rgbLEol = g_Property.GetLEolColor();\r
+       cdef.rgbTab = g_Property.GetTabColor();\r
+       cdef.rgbEof = g_Property.GetEofColor();\r
+       pDetailsView->SetColorDef(cdef);\r
+\r
        // reload notes and folders\r
        msView.DeleteAllItem();\r
        msView.InitTree(pVFManager);\r

diff --git a/Src/MemoDetailsView.h b/Src/MemoDetailsView.h
index 2ad3ad1..637040f 100644 (file)
--- a/Src/MemoDetailsView.h
+++ b/Src/MemoDetailsView.h
@@ -6,6 +6,7 @@ class SearchEngineA;
 class TString;\r
 class TomboURI;\r
 class MemoManager;\r
+struct YAEditViewColorDef;\r
 \r
 ///////////////////////////////////////\r
 // Edit view abstraction\r
@@ -50,6 +51,8 @@ public:
 \r
        virtual void SelectAll() = 0;\r
 \r
+       virtual void SetColorDef(const YAEditViewColorDef& cdef) = 0;\r
+\r
        BOOL Search(BOOL bFirstSearch, BOOL bForward, BOOL bNFMsg, BOOL bSearchFromTop);\r
 \r
        BOOL Save(const TomboURI *pCurrentURI, TomboURI *pNewURI, TString *pNewHeadLine, LPCTSTR pText);\r
@@ -113,6 +116,8 @@ public:
 \r
        void SetModifyStatus();\r
 \r
+       void SetColorDef(const YAEditViewColorDef& cdef) {}\r
+\r
        ////////////////////////\r
        // Message handler\r
 \r

diff --git a/Src/MsgRes/DefaultMsg.cpp b/Src/MsgRes/DefaultMsg.cpp
index bd584e6..1ea0385 100644 (file)
--- a/Src/MsgRes/DefaultMsg.cpp
+++ b/Src/MsgRes/DefaultMsg.cpp
@@ -301,4 +301,11 @@ static LPCTSTR defaultMsg[] = {
        TEXT("Set file encoding. Auto detection/conversion is not supported, so do not change if you hanve already some notes."),\r
        TEXT("Undo"),\r
        TEXT("File"),\r
+       TEXT("Color"),\r
+       TEXT("Foreground"),\r
+       TEXT("Background"),\r
+       TEXT("End of line"),\r
+       TEXT("End of line(folding)"),\r
+       TEXT("Tab"),\r
+       TEXT("End of file"),\r
 };\r

diff --git a/Src/MsgRes/MsgDef.h b/Src/MsgRes/MsgDef.h
index d0dc9c9..4aba1c8 100644 (file)
--- a/Src/MsgRes/MsgDef.h
+++ b/Src/MsgRes/MsgDef.h
@@ -903,5 +903,26 @@
 #define MSG_ID_MENUITEM_FILE 301\r
 #define MSG_MENUITEM_FILE (g_mMsgRes.GetMsg(MSG_ID_MENUITEM_FILE))\r
 \r
+#define MSG_ID_PROPTAB_COLOR 302\r
+#define MSG_PROPTAB_COLOR (g_mMsgRes.GetMsg(MSG_ID_PROPTAB_COLOR))\r
 \r
-#define NUM_MESSAGES 301\r
+#define MSG_ID_DLG_COLORTAB_FOREGROUND 303\r
+#define MSG_DLG_COLORTAB_FOREGROUND (g_mMsgRes.GetMsg(MSG_ID_DLG_COLORTAB_FOREGROUND))\r
+\r
+#define MSG_ID_DLG_COLORTAB_BACKGROUND 304\r
+#define MSG_DLG_COLORTAB_BACKGROUND (g_mMsgRes.GetMsg(MSG_ID_DLG_COLORTAB_BACKGROUND))\r
+\r
+#define MSG_ID_DLG_COLORTAB_EOL 305\r
+#define MSG_DLG_COLORTAB_EOL (g_mMsgRes.GetMsg(MSG_ID_DLG_COLORTAB_EOL))\r
+\r
+#define MSG_ID_DLG_COLORTAB_LEOL 306\r
+#define MSG_DLG_COLORTAB_LEOL (g_mMsgRes.GetMsg(MSG_ID_DLG_COLORTAB_LEOL))\r
+\r
+#define MSG_ID_DLG_COLORTAB_TAB 307\r
+#define MSG_DLG_COLORTAB_TAB (g_mMsgRes.GetMsg(MSG_ID_DLG_COLORTAB_TAB))\r
+\r
+#define MSG_ID_DLG_COLORTAB_EOF 308\r
+#define MSG_DLG_COLORTAB_EOF (g_mMsgRes.GetMsg(MSG_ID_DLG_COLORTAB_EOF))\r
+\r
+\r
+#define NUM_MESSAGES 308\r

diff --git a/Src/MsgRes/MsgDef/TomboMsg_en.txt b/Src/MsgRes/MsgDef/TomboMsg_en.txt
index 8348025..7a60210 100644 (file)
--- a/Src/MsgRes/MsgDef/TomboMsg_en.txt
+++ b/Src/MsgRes/MsgDef/TomboMsg_en.txt
@@ -299,3 +299,10 @@ MSG_CODEPAGE_UTF8  UTF-8
 MSG_DLG_PROPTAB_CODEPAGE_NOTICE        Set file encoding. Auto detection/conversion is not supported, so do not change if you hanve already some notes.\r
 MSG_MENUITEM_UNDO      Undo\r
 MSG_MENUITEM_FILE      File\r
+MSG_PROPTAB_COLOR      Color\r
+MSG_DLG_COLORTAB_FOREGROUND    Foreground\r
+MSG_DLG_COLORTAB_BACKGROUND    Background\r
+MSG_DLG_COLORTAB_EOL   End of line\r
+MSG_DLG_COLORTAB_LEOL  End of line(wrap)\r
+MSG_DLG_COLORTAB_TAB   Tab\r
+MSG_DLG_COLORTAB_EOF   End of file\r

diff --git a/Src/MsgRes/MsgDef/TomboMsg_jp.txt b/Src/MsgRes/MsgDef/TomboMsg_jp.txt
index 971736f..b7d7631 100644 (file)
--- a/Src/MsgRes/MsgDef/TomboMsg_jp.txt
+++ b/Src/MsgRes/MsgDef/TomboMsg_jp.txt
@@ -299,3 +299,10 @@ MSG_CODEPAGE_UTF8  UTF-8
 MSG_DLG_PROPTAB_CODEPAGE_NOTICE        ファイルの文字コードを設定します。\r\n自動変換・自動判別は行われないため、既にメモをお持ちの方は変更しないでください。\r
 MSG_MENUITEM_UNDO      元に戻す\r
 MSG_MENUITEM_FILE      ファイル\r
+MSG_PROPTAB_COLOR      色指定\r
+MSG_DLG_COLORTAB_FOREGROUND    文字色\r
+MSG_DLG_COLORTAB_BACKGROUND    背景色\r
+MSG_DLG_COLORTAB_EOL   行末\r
+MSG_DLG_COLORTAB_LEOL  行末(折り返し)\r
+MSG_DLG_COLORTAB_TAB   タブ\r
+MSG_DLG_COLORTAB_EOF   ファイル終端\r

diff --git a/Src/MsgRes/MsgIDList.txt b/Src/MsgRes/MsgIDList.txt
index 27fe686..db2b240 100644 (file)
--- a/Src/MsgRes/MsgIDList.txt
+++ b/Src/MsgRes/MsgIDList.txt
@@ -299,3 +299,10 @@ MSG_CODEPAGE_UTF8
 MSG_DLG_PROPTAB_CODEPAGE_NOTICE\r
 MSG_MENUITEM_UNDO\r
 MSG_MENUITEM_FILE\r
+MSG_PROPTAB_COLOR\r
+MSG_DLG_COLORTAB_FOREGROUND\r
+MSG_DLG_COLORTAB_BACKGROUND\r
+MSG_DLG_COLORTAB_EOL\r
+MSG_DLG_COLORTAB_LEOL\r
+MSG_DLG_COLORTAB_TAB\r
+MSG_DLG_COLORTAB_EOF\r

diff --git a/Src/MsgRes/TomboMsg/en/TomboMsg.txt b/Src/MsgRes/TomboMsg/en/TomboMsg.txt
index ff5600f..d25f8cd 100644 (file)
--- a/Src/MsgRes/TomboMsg/en/TomboMsg.txt
+++ b/Src/MsgRes/TomboMsg/en/TomboMsg.txt
@@ -299,3 +299,10 @@ UTF-8
 Set file encoding. Auto detection/conversion is not supported, so do not change if you hanve already some notes.\r
 Undo\r
 File\r
+Color\r
+Foreground\r
+Background\r
+End of line\r
+End of line(folding)\r
+Tab\r
+End of file\r

diff --git a/Src/MsgRes/TomboMsg/jp/TomboMsg.txt b/Src/MsgRes/TomboMsg/jp/TomboMsg.txt
index cf574de..1fde8a7 100644 (file)
--- a/Src/MsgRes/TomboMsg/jp/TomboMsg.txt
+++ b/Src/MsgRes/TomboMsg/jp/TomboMsg.txt
@@ -299,3 +299,10 @@ UTF-8
 ファイルの文字コードを設定します。\r\n自動変換・自動判別は行われないため、既にメモをお持ちの方は変更しないでください。\r
 元に戻す\r
 ファイル\r
+色指定\r
+文字色\r
+背景色\r
+行末\r
+行末(折り返し)\r
+タブ\r
+ファイル終端\r

diff --git a/Src/Property.cpp b/Src/Property.cpp
index 01f018d..8f29ca2 100644 (file)
--- a/Src/Property.cpp
+++ b/Src/Property.cpp
@@ -49,7 +49,7 @@
 #if defined(PLATFORM_PKTPC) || defined(PLATFORM_WM5)\r
 #define PROPTAB_PAGES 10\r
 #else\r
-#define PROPTAB_PAGES 8\r
+#define PROPTAB_PAGES 9\r
 #endif\r
 \r
 //////////////////////////////////////////\r
@@ -292,6 +292,7 @@ DWORD Property::Popup(HINSTANCE hInst, HWND hWnd, const TomboURI *pCurrentSelect
 #if !defined(PLATFORM_PSPC)\r
        ExtAppTab pgExtApp(this);\r
 #endif\r
+       ColorTab pgColor(this);\r
 \r
        DWORD n = 0;\r
 \r
@@ -309,6 +310,7 @@ DWORD Property::Popup(HINSTANCE hInst, HWND hWnd, const TomboURI *pCurrentSelect
        pages[n++] = &pgSip;\r
 #endif\r
        pages[n++] = &pgCodepage;\r
+       pages[n++] = &pgColor;\r
 \r
        PropertyPage pp;\r
        if (pp.Popup(hInst, hWnd, pages, n, MSG_PROPTAB_TITLE, MAKEINTRESOURCE(IDI_TOMBO)) == IDOK) {\r

diff --git a/Src/TomboPropertyTab.cpp b/Src/TomboPropertyTab.cpp
index d4f6a5f..2cd5598 100644 (file)
--- a/Src/TomboPropertyTab.cpp
+++ b/Src/TomboPropertyTab.cpp
@@ -940,6 +940,124 @@ void ExtAppTab::Choose2(HWND hDlg)
 #endif\r
 \r
 //////////////////////////////////////////\r
+// Color tab\r
+//////////////////////////////////////////\r
+\r
+LRESULT APIENTRY ColorTab::CustomPageProc(HWND hDlg, UINT nMessage, WPARAM wParam, LPARAM lParam) {\r
+       if (DefaultPageProc(hDlg, nMessage, wParam, lParam)) return TRUE;\r
+\r
+       ColorTab *pPage = (ColorTab*)GetWindowLong(hDlg, DWL_USER);\r
+       if (pPage == NULL) return FALSE;\r
+\r
+       if (nMessage == WM_CTLCOLORSTATIC) {\r
+               HDC hDC = (HDC)wParam;\r
+               HWND hCtl = (HWND)lParam;\r
+               if (hCtl == GetDlgItem(hDlg, IDC_PROPTAB_COLOR_BG_C)) {\r
+                       return (LRESULT)pPage->hBgBrush;\r
+               } else if (hCtl == GetDlgItem(hDlg, IDC_PROPTAB_COLOR_FG_C)) {\r
+                       return (LRESULT)pPage->hFgBrush;\r
+               } else if (hCtl == GetDlgItem(hDlg, IDC_PROPTAB_COLOR_EOL_C)) {\r
+                       return (LRESULT)pPage->hEolBrush;\r
+               } else if (hCtl == GetDlgItem(hDlg, IDC_PROPTAB_COLOR_LEOL_C)) {\r
+                       return (LRESULT)pPage->hLEolBrush;\r
+               } else if (hCtl == GetDlgItem(hDlg, IDC_PROPTAB_COLOR_TAB_C)) {\r
+                       return (LRESULT)pPage->hTabBrush;\r
+               } else if (hCtl == GetDlgItem(hDlg, IDC_PROPTAB_COLOR_EOF_C)) {\r
+                       return (LRESULT)pPage->hEofBrush;\r
+               } else {\r
+                       return 0;\r
+               }\r
+       }\r
+       return 0;\r
+}\r
+\r
+ColorTab::~ColorTab() {\r
+       DeleteObject(hFgBrush);\r
+       DeleteObject(hBgBrush);\r
+       DeleteObject(hEolBrush);\r
+       DeleteObject(hLEolBrush);\r
+       DeleteObject(hTabBrush);\r
+       DeleteObject(hEofBrush);\r
+}\r
+\r
+static DlgMsgRes aColor[] = {\r
+       { IDC_PROPTAB_COLOR_FG,   MSG_ID_DLG_COLORTAB_FOREGROUND },\r
+       { IDC_PROPTAB_COLOR_BG,   MSG_ID_DLG_COLORTAB_BACKGROUND },\r
+       { IDC_PROPTAB_COLOR_EOL,  MSG_ID_DLG_COLORTAB_EOL },\r
+       { IDC_PROPTAB_COLOR_LEOL, MSG_ID_DLG_COLORTAB_LEOL },\r
+       { IDC_PROPTAB_COLOR_TAB,  MSG_ID_DLG_COLORTAB_TAB },\r
+       { IDC_PROPTAB_COLOR_EOF,  MSG_ID_DLG_COLORTAB_EOF },\r
+};\r
+\r
+void ColorTab::Init(HWND hDlg) {\r
+       OverrideDlgMsg(hDlg, -1, aColor, sizeof(aColor)/sizeof(DlgMsgRes));\r
+       hFgBrush = CreateSolidBrush(cFg = g_Property.GetFgColor());\r
+       hBgBrush = CreateSolidBrush(cBg = g_Property.GetBgColor());\r
+       hEolBrush = CreateSolidBrush(cEol = g_Property.GetEolColor());\r
+       hLEolBrush = CreateSolidBrush(cLEol = g_Property.GetLEolColor());\r
+       hTabBrush = CreateSolidBrush(cTab = g_Property.GetTabColor());\r
+       hEofBrush = CreateSolidBrush(cEof = g_Property.GetEofColor());\r
+}\r
+\r
+BOOL ColorTab::OnCommand(HWND hDlg, WPARAM wParam, LPARAM lParam) {\r
+       switch(LOWORD(wParam)) {\r
+       case IDC_PROPTAB_COLOR_BTN_FG:\r
+               Choose(hDlg, IDC_PROPTAB_COLOR_FG_C, &hFgBrush, &cFg);\r
+               break;\r
+       case IDC_PROPTAB_COLOR_BTN_BG:\r
+               Choose(hDlg, IDC_PROPTAB_COLOR_BG_C, &hBgBrush, &cBg);\r
+               break;\r
+       case IDC_PROPTAB_COLOR_BTN_EOL:\r
+               Choose(hDlg, IDC_PROPTAB_COLOR_EOL_C, &hEolBrush, &cEol);\r
+               break;\r
+       case IDC_PROPTAB_COLOR_BTN_LEOL:\r
+               Choose(hDlg, IDC_PROPTAB_COLOR_LEOL_C, &hLEolBrush, &cLEol);\r
+               break;\r
+       case IDC_PROPTAB_COLOR_BTN_TAB:\r
+               Choose(hDlg, IDC_PROPTAB_COLOR_TAB_C, &hTabBrush, &cTab);\r
+               break;\r
+       case IDC_PROPTAB_COLOR_BTN_EOF:\r
+               Choose(hDlg, IDC_PROPTAB_COLOR_EOF_C, &hEofBrush, &cEof);\r
+               break;\r
+       }\r
+       return TRUE;\r
+}\r
+\r
+void ColorTab::Choose(HWND hDlg, DWORD nCtlId, HBRUSH* pBrush, COLORREF *pColor) {\r
+       static COLORREF cr[16];\r
+\r
+       CHOOSECOLOR cc;\r
+       cc.lStructSize = sizeof(cc);\r
+       cc.hwndOwner = hDlg;\r
+       cc.lpCustColors = cr;\r
+       cc.rgbResult = *pColor;\r
+       cc.Flags = CC_RGBINIT;\r
+       cc.lpfnHook = NULL;\r
+       cc.lpTemplateName = NULL;\r
+\r
+       if (ChooseColor(&cc) != 0) {\r
+               DeleteObject(*pBrush);\r
+               *pColor = cc.rgbResult;\r
+               *pBrush = CreateSolidBrush(*pColor);\r
+               HWND hWnd = GetDlgItem(hDlg, nCtlId);\r
+               RECT r;\r
+               GetClientRect(hWnd, &r);\r
+               InvalidateRect(hWnd, &r, TRUE);\r
+               UpdateWindow(hWnd);\r
+       }\r
+}\r
+\r
+BOOL ColorTab::Apply(HWND hDlg) {\r
+       g_Property.SetFgColor(cFg);\r
+       g_Property.SetBgColor(cBg);\r
+       g_Property.SetEolColor(cEol);\r
+       g_Property.SetLEolColor(cLEol);\r
+       g_Property.SetTabColor(cTab);\r
+       g_Property.SetEofColor(cEof);\r
+       return TRUE;\r
+}\r
+\r
+//////////////////////////////////////////\r
 // helper functions\r
 //////////////////////////////////////////\r
 \r

diff --git a/Src/TomboPropertyTab.h b/Src/TomboPropertyTab.h
index c685095..4f65070 100644 (file)
--- a/Src/TomboPropertyTab.h
+++ b/Src/TomboPropertyTab.h
@@ -167,4 +167,24 @@ public:
 };\r
 #endif\r
 \r
+// ChooseColor dialog\r
+class ColorTab : public TomboPropertyTab {\r
+protected:\r
+       static LRESULT APIENTRY CustomPageProc(HWND hDlg, UINT nMessage, WPARAM wParam, LPARAM lParam);\r
+\r
+       void Choose(HWND hDlg, DWORD nCtlId, HBRUSH* pBrush, COLORREF *pColor);\r
+\r
+public:\r
+       COLORREF cFg, cBg, cEol, cLEol, cTab, cEof;\r
+       HBRUSH hFgBrush, hBgBrush, hEolBrush, hLEolBrush, hTabBrush, hEofBrush;\r
+\r
+       ColorTab(Property *p) :\r
+         TomboPropertyTab(p, IDD_PROPTAB_COLOR, (DLGPROC)CustomPageProc, MSG_PROPTAB_COLOR) {}\r
+       ~ColorTab();\r
+\r
+       void Init(HWND hDlg);\r
+       BOOL Apply(HWND hDlg);\r
+       BOOL OnCommand(HWND hDlg, WPARAM wParam, LPARAM lParam);\r
+};\r
+\r
 #endif
\ No newline at end of file

diff --git a/Src/YAEdit/YAEdit.cpp b/Src/YAEdit/YAEdit.cpp
index ad6e95d..47d2bb9 100644 (file)
--- a/Src/YAEdit/YAEdit.cpp
+++ b/Src/YAEdit/YAEdit.cpp
@@ -1525,8 +1525,15 @@ void YAEditImpl::SetSelectRegion(DWORD nStartPos, DWORD nEndPos)
 }\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
+// Color properies\r
 \r
 void YAEditImpl::SetBackgroundColor(COLORREF bk) {\r
        DeleteObject(hBkBrush);\r
        hBkBrush = CreateSolidBrush(bk);\r
 }\r
+\r
+void YAEditImpl::SetColorDef(const YAEditViewColorDef& cdef) {\r
+       DeleteObject(hBkBrush);\r
+       hBkBrush = CreateSolidBrush(cdef.rgbBackground);\r
+       pView->SetColorDef(cdef);\r
+}
\ No newline at end of file

diff --git a/Src/YAEdit/YAEdit.h b/Src/YAEdit/YAEdit.h
index fb68eda..3c4eedd 100644 (file)
--- a/Src/YAEdit/YAEdit.h
+++ b/Src/YAEdit/YAEdit.h
@@ -11,6 +11,15 @@ class PhysicalLineManager;
 struct YAEContextMenu;\r
 struct YAEditViewColorDef;\r
 \r
+struct YAEditViewColorDef {\r
+       COLORREF rgbEol;\r
+       COLORREF rgbLEol;\r
+       COLORREF rgbTab;\r
+       COLORREF rgbEof;\r
+       COLORREF rgbForeground;\r
+       COLORREF rgbBackground;\r
+};\r
+\r
 //////////////////////////////////////////////////\r
 // callback class\r
 //////////////////////////////////////////////////\r
@@ -75,6 +84,11 @@ public:
        virtual void CmdSelAll() = 0;\r
        virtual void CmdToggleWrapMode(BOOL bFold) = 0;\r
 \r
+\r
+       ///////////////////////////////////////\r
+       // color\r
+       virtual void SetColorDef(const YAEditViewColorDef& cdef) = 0;\r
+\r
        ///////////////////////////////////////\r
        // register window class\r
        static BOOL RegisterClass(HINSTANCE hInst);\r
@@ -302,6 +316,7 @@ public:
        ////////////////////////////////////////////////////\r
        // color\r
        void SetBackgroundColor(COLORREF cBk);\r
+       void SetColorDef(const YAEditViewColorDef& cdef);\r
 \r
        ////////////////////////////////////////////////////\r
        // data access from YAEditView\r

diff --git a/Src/YAEdit/YAEditView.cpp b/Src/YAEdit/YAEditView.cpp
index 5e2bb4c..2149595 100644 (file)
--- a/Src/YAEdit/YAEditView.cpp
+++ b/Src/YAEdit/YAEditView.cpp
@@ -986,4 +986,8 @@ BOOL YAEditView::IsVertScrollbarDisplayed()
 \r
        GetScrollInfo(hViewWnd, SB_VERT, &si);\r
        return (si.nMin != si.nMax) && ((UINT)si.nMin <= si.nPage) && (si.nPage <= (UINT)si.nMax);\r
+}\r
+\r
+void YAEditView::SetColorDef(const YAEditViewColorDef& cdef) {\r
+       colorDef = cdef;\r
 }
\ No newline at end of file

diff --git a/Src/YAEdit/YAEditView.h b/Src/YAEdit/YAEditView.h
index 6143b46..117bdd3 100644 (file)
--- a/Src/YAEdit/YAEditView.h
+++ b/Src/YAEdit/YAEditView.h
@@ -4,15 +4,6 @@
 class YAEditImpl;\r
 class YAEditDoc;\r
 \r
-struct YAEditViewColorDef {\r
-       COLORREF rgbEol;\r
-       COLORREF rgbLEol;\r
-       COLORREF rgbTab;\r
-       COLORREF rgbEof;\r
-       COLORREF rgbForeground;\r
-       COLORREF rgbBackground;\r
-};\r
-\r
 class YAEditView {\r
        YAEditImpl *pCtrl;\r
 \r
@@ -170,6 +161,8 @@ public:
        void ResetFontInfo();\r
        void SetFont(HFONT hFont);\r
 \r
+       void SetColorDef(const YAEditViewColorDef& cdef);\r
+\r
        ///////////////////////////////////////\r
        // scroll bar status\r
        BOOL IsVertScrollbarDisplayed();\r

diff --git a/Src/YAEditor.cpp b/Src/YAEditor.cpp
index 2fa863b..97ec82a 100644 (file)
--- a/Src/YAEditor.cpp
+++ b/Src/YAEditor.cpp
@@ -306,4 +306,8 @@ void YAEditor::CmdSelAll()
 BOOL YAEditor::Show(int nCmdShow)\r
 {\r
        return pEdit->Show(nCmdShow);\r
+}\r
+\r
+void YAEditor::SetColorDef(const YAEditViewColorDef& cdef) {\r
+       pEdit->SetColorDef(cdef);\r
 }
\ No newline at end of file

diff --git a/Src/YAEditor.h b/Src/YAEditor.h
index 8ca2afd..37b2ba2 100644 (file)
--- a/Src/YAEditor.h
+++ b/Src/YAEditor.h
@@ -57,6 +57,8 @@ public:
 \r
        BOOL ReplaceText(LPCTSTR p);\r
 \r
+       void SetColorDef(const YAEditViewColorDef& c);\r
+\r
        //////////////////////////\r
        // commands\r
        void CmdUndo();\r

diff --git a/Win32/Tombo/Tombo/Tombo.vcxproj b/Win32/Tombo/Tombo/Tombo.vcxproj
index de2f48b..d86cafb 100644 (file)
--- a/Win32/Tombo/Tombo/Tombo.vcxproj
+++ b/Win32/Tombo/Tombo/Tombo.vcxproj
@@ -234,6 +234,7 @@
     <ClInclude Include="..\..\..\Src\regex\config.h" />\r
     <ClInclude Include="..\..\..\Src\regex\ctypeutil.h" />\r
     <ClInclude Include="..\..\..\Src\regex\regex.h" />\r
+    <ClInclude Include="..\res\resource.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ResourceCompile Include="..\res\Tombo.rc" />\r
@@ -242,6 +243,12 @@
     <Library Include="..\..\..\expat\lib\Win32\libexpatw.lib" />\r
     <Library Include="..\..\..\oniguruma\win32\oniguruma.lib" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="..\..\..\Src\image\draftimg.bmp" />\r
+    <None Include="..\..\..\Src\image\memoimg.bmp" />\r
+    <None Include="..\..\..\Src\image\Tombo.ICO" />\r
+    <None Include="..\..\..\Src\image\toolbar.bmp" />\r
+  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r

diff --git a/Win32/Tombo/Tombo/Tombo.vcxproj.filters b/Win32/Tombo/Tombo/Tombo.vcxproj.filters
index 1c7435b..8123473 100644 (file)
--- a/Win32/Tombo/Tombo/Tombo.vcxproj.filters
+++ b/Win32/Tombo/Tombo/Tombo.vcxproj.filters
@@ -461,6 +461,9 @@
     <ClInclude Include="..\..\..\Src\regex\regex.h">\r
       <Filter>ヘッダー ファイル</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\res\resource.h">\r
+      <Filter>ヘッダー ファイル</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ResourceCompile Include="..\res\Tombo.rc">\r
@@ -471,4 +474,18 @@
     <Library Include="..\..\..\expat\lib\Win32\libexpatw.lib" />\r
     <Library Include="..\..\..\oniguruma\win32\oniguruma.lib" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="..\..\..\Src\image\memoimg.bmp">\r
+      <Filter>リソース ファイル</Filter>\r
+    </None>\r
+    <None Include="..\..\..\Src\image\toolbar.bmp">\r
+      <Filter>リソース ファイル</Filter>\r
+    </None>\r
+    <None Include="..\..\..\Src\image\draftimg.bmp">\r
+      <Filter>リソース ファイル</Filter>\r
+    </None>\r
+    <None Include="..\..\..\Src\image\Tombo.ICO">\r
+      <Filter>リソース ファイル</Filter>\r
+    </None>\r
+  </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Win32/Tombo/res/Tombo.rc b/Win32/Tombo/res/Tombo.rc
index a650ca2..5dc8995 100644 (file)
--- a/Win32/Tombo/res/Tombo.rc
+++ b/Win32/Tombo/res/Tombo.rc
@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.\r
+// Microsoft Visual C++ generated resource script.\r
 //\r
 #include "resource.h"\r
 \r
@@ -13,13 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
-// \93ú\96{\8cê resources\r
+// \93ú\96{\8cê (\93ú\96{) resources\r
 \r
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)\r
-#ifdef _WIN32\r
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT\r
 #pragma code_page(932)\r
-#endif //_WIN32\r
 \r
 #ifdef APSTUDIO_INVOKED\r
 /////////////////////////////////////////////////////////////////////////////\r
@@ -27,18 +25,18 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 // TEXTINCLUDE\r
 //\r
 \r
-1 TEXTINCLUDE DISCARDABLE \r
+1 TEXTINCLUDE \r
 BEGIN\r
     "resource.h\0"\r
 END\r
 \r
-2 TEXTINCLUDE DISCARDABLE \r
+2 TEXTINCLUDE \r
 BEGIN\r
     "#include ""afxres.h""\r\n"\r
     "\0"\r
 END\r
 \r
-3 TEXTINCLUDE DISCARDABLE \r
+3 TEXTINCLUDE \r
 BEGIN\r
     "\r\n"\r
     "\0"\r
@@ -52,17 +50,17 @@ END
 // Bitmap\r
 //\r
 \r
-IDB_MEMOSELECT_IMAGES   BITMAP  DISCARDABLE     "../../../Src/image/memoimg.bmp"\r
-IDB_TOOLBAR             BITMAP  DISCARDABLE     "../../../Src/image/toolbar.bmp"\r
-IDB_ARTICLEBOX          BITMAP  DISCARDABLE     "../../../Src/image/draftimg.bmp"\r
+IDB_MEMOSELECT_IMAGES   BITMAP                  "../../../Src/image/memoimg.bmp"\r
+IDB_TOOLBAR             BITMAP                  "../../../Src/image/toolbar.bmp"\r
+IDB_ARTICLEBOX          BITMAP                  "../../../Src/image/draftimg.bmp"\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Dialog\r
 //\r
 \r
-IDD_PASSWORD DIALOG DISCARDABLE  0, 0, 110, 65\r
-STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION\r
+IDD_PASSWORD DIALOG 0, 0, 110, 65\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION\r
 CAPTION "Password"\r
 FONT 9, "Tahoma"\r
 BEGIN\r
@@ -72,65 +70,54 @@ BEGIN
     PUSHBUTTON      "CANCEL",IDCANCEL,70,45,35,14\r
 END\r
 \r
-IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 249, 160\r
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+IDD_ABOUTBOX DIALOG 0, 0, 249, 160\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "About Tombo"\r
 FONT 9, "Tahoma"\r
 BEGIN\r
     DEFPUSHBUTTON   "OK",IDOK,195,140,50,14\r
     ICON            IDI_TOMBO,IDC_STATIC,10,5,20,20\r
     LTEXT           "Tombo Version 1.4",IDC_VERSIONINFO,40,10,195,10\r
-    EDITTEXT        IDC_COPYRIGHT,5,35,240,95,ES_MULTILINE | ES_AUTOVSCROLL | \r
-                    ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | NOT \r
-                    WS_TABSTOP\r
+    EDITTEXT        IDC_COPYRIGHT,5,35,240,95,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP\r
 END\r
 \r
-IDD_PROPTAB_FOLDER DIALOG DISCARDABLE  0, 0, 131, 135\r
-STYLE WS_CHILD | WS_BORDER\r
+IDD_PROPTAB_FOLDER DIALOG 0, 0, 131, 135\r
+STYLE DS_SETFONT | WS_CHILD | WS_BORDER\r
 FONT 9, "Tahoma"\r
 BEGIN\r
     LTEXT           "Memo folder:",IDC_PROPTAB_FOLDER_LABEL,5,5,72,10\r
     PUSHBUTTON      "...",IDC_FOLDERSEL,110,20,15,10\r
-    LTEXT           "Folder to store Tombo Notes",IDC_PROPTAB_FOLDER_HELP1,\r
-                    10,40,110,15\r
-    CONTROL         "Sync file name and title",IDC_KEEPTITLE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,5,60,120,10\r
-    LTEXT           "Rename file name if headline changed.",\r
-                    IDC_PROPTAB_FOLDER_HELP2,10,75,115,20\r
-    COMBOBOX        IDC_TOPFOLDER,5,20,100,85,CBS_DROPDOWN | CBS_AUTOHSCROLL | \r
-                    WS_VSCROLL | WS_TABSTOP\r
-    CONTROL         "Open notes read-only mode",IDC_PROP_READONLY,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,5,100,109,10\r
-END\r
-\r
-IDD_FILESELECT DIALOG DISCARDABLE  0, 0, 134, 89\r
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+    LTEXT           "Folder to store Tombo Notes",IDC_PROPTAB_FOLDER_HELP1,10,40,110,15\r
+    CONTROL         "Sync file name and title",IDC_KEEPTITLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,60,120,10\r
+    LTEXT           "Rename file name if headline changed.",IDC_PROPTAB_FOLDER_HELP2,10,75,115,20\r
+    COMBOBOX        IDC_TOPFOLDER,5,20,100,85,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
+    CONTROL         "Open notes read-only mode",IDC_PROP_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,100,109,10\r
+END\r
+\r
+IDD_FILESELECT DIALOG 0, 0, 134, 89\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Select File"\r
 FONT 9, "Tahoma"\r
 BEGIN\r
     PUSHBUTTON      "OK",IDOK,55,70,35,15\r
     PUSHBUTTON      "CANCEL",IDCANCEL,95,70,35,15\r
-    CONTROL         "Tree1",IDC_FILESELECT_TREE,"SysTreeView32",\r
-                    TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | \r
-                    WS_BORDER | WS_TABSTOP,5,0,125,65\r
+    CONTROL         "Tree1",IDC_FILESELECT_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP,5,0,125,65\r
 END\r
 \r
-IDD_PROPTAB_PASSWORD DIALOG DISCARDABLE  0, 0, 131, 121\r
-STYLE WS_CHILD | WS_BORDER\r
+IDD_PROPTAB_PASSWORD DIALOG 0, 0, 131, 121\r
+STYLE DS_SETFONT | WS_CHILD | WS_BORDER\r
 FONT 9, "Tahoma"\r
 BEGIN\r
     EDITTEXT        IDC_PASS1,5,15,90,12,ES_PASSWORD | ES_AUTOHSCROLL\r
     EDITTEXT        IDC_PASS2,5,40,90,12,ES_PASSWORD | ES_AUTOHSCROLL\r
     LTEXT           "Password:",IDC_STATIC,5,5,105,10\r
     LTEXT           "ReEnter:",IDC_STATIC,5,30,75,10\r
-    EDITTEXT        IDC_PROP_PASSWORD_DESC,5,55,120,60,ES_MULTILINE | \r
-                    ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | \r
-                    WS_VSCROLL\r
+    EDITTEXT        IDC_PROP_PASSWORD_DESC,5,55,120,60,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL\r
     PUSHBUTTON      "Option",IDC_PROP_SETPASS,100,37,25,15\r
 END\r
 \r
-IDD_NEWFOLDER DIALOG DISCARDABLE  0, 0, 103, 38\r
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+IDD_NEWFOLDER DIALOG 0, 0, 103, 38\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "NewFolder"\r
 FONT 9, "Tahoma"\r
 BEGIN\r
@@ -139,179 +126,146 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,60,20,40,14\r
 END\r
 \r
-IDD_PROPTAB_PASS_TIMEOUT DIALOG DISCARDABLE  0, 0, 196, 125\r
-STYLE WS_CHILD | WS_BORDER\r
+IDD_PROPTAB_PASS_TIMEOUT DIALOG 0, 0, 196, 125\r
+STYLE DS_SETFONT | WS_CHILD | WS_BORDER\r
 FONT 9, "Tahoma"\r
 BEGIN\r
     EDITTEXT        IDC_PASS_TIMEOUT,125,10,30,12,ES_AUTOHSCROLL\r
-    LTEXT           "Password timeout(min):",IDC_PROPTAB_PASS_TIMEOUT_LABEL,\r
-                    10,10,100,10\r
-    LTEXT           "Timeout length(1-60).",IDC_PROPTAB_PASS_TIMEOUT_HELP,10,\r
-                    25,130,20\r
+    LTEXT           "Password timeout(min):",IDC_PROPTAB_PASS_TIMEOUT_LABEL,10,10,100,10\r
+    LTEXT           "Timeout length(1-60).",IDC_PROPTAB_PASS_TIMEOUT_HELP,10,25,130,20\r
     CONTROL         "Use random filename",IDC_PASS_TIMEOUT_USE_SAFEFILE,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,60,140,10\r
-    LTEXT           "Use random filename for crypted notes",\r
-                    IDC_PROPTAB_PASS_TIMEOUT_SAFEFILE_HELP,10,80,175,25\r
+    LTEXT           "Use random filename for crypted notes",IDC_PROPTAB_PASS_TIMEOUT_SAFEFILE_HELP,10,80,175,25\r
 END\r
 \r
-IDD_PROPTAB_FONT DIALOG DISCARDABLE  0, 0, 162, 126\r
-STYLE WS_CHILD\r
+IDD_PROPTAB_FONT DIALOG 0, 0, 162, 126\r
+STYLE DS_SETFONT | WS_CHILD\r
 FONT 9, "Tahoma"\r
 BEGIN\r
     LTEXT           "Tree:",IDC_PROPTAB_FONT_TREE_LABEL,10,20,30,10\r
     LTEXT           "Memo:",IDC_PROPTAB_FONT_EDIT_LABEL,10,70,30,10\r
-    COMBOBOX        IDC_FONT_SELECT_NAME,40,35,65,65,CBS_DROPDOWNLIST | \r
-                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
-    COMBOBOX        IDC_FONT_DETAILS_NAME,40,85,65,65,CBS_DROPDOWNLIST | \r
-                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
-    COMBOBOX        IDC_FONT_SELECT_SIZE,109,35,35,65,CBS_DROPDOWN | \r
-                    WS_VSCROLL | WS_TABSTOP\r
-    COMBOBOX        IDC_FONT_DETAILS_SIZE,109,85,35,65,CBS_DROPDOWN | \r
-                    WS_VSCROLL | WS_TABSTOP\r
-    CONTROL         "Use default",IDC_FONT_SELECT_USEDEFAULT,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,20,105,10\r
-    CONTROL         "Use default",IDC_FONT_DETAILS_USEDEFAULT,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,50,70,105,10\r
-    CONTROL         "Use cleartype font",IDC_FONT_SELECT_CLEARTYPE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,40,50,118,10\r
-    CONTROL         "Use cleartype font",IDC_FONT_DETAILS_CLEARTYPE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,40,105,118,10\r
-END\r
-\r
-IDD_PROPTAB_INSDATE DIALOG DISCARDABLE  0, 0, 156, 125\r
-STYLE WS_CHILD | WS_BORDER\r
+    COMBOBOX        IDC_FONT_SELECT_NAME,40,35,65,65,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
+    COMBOBOX        IDC_FONT_DETAILS_NAME,40,85,65,65,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
+    COMBOBOX        IDC_FONT_SELECT_SIZE,109,35,35,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP\r
+    COMBOBOX        IDC_FONT_DETAILS_SIZE,109,85,35,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP\r
+    CONTROL         "Use default",IDC_FONT_SELECT_USEDEFAULT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,20,105,10\r
+    CONTROL         "Use default",IDC_FONT_DETAILS_USEDEFAULT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,70,105,10\r
+    CONTROL         "Use cleartype font",IDC_FONT_SELECT_CLEARTYPE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,50,118,10\r
+    CONTROL         "Use cleartype font",IDC_FONT_DETAILS_CLEARTYPE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,105,118,10\r
+END\r
+\r
+IDD_PROPTAB_INSDATE DIALOG 0, 0, 156, 125\r
+STYLE DS_SETFONT | WS_CHILD | WS_BORDER\r
 FONT 9, "Tahoma"\r
 BEGIN\r
     LTEXT           "Date1:",IDC_PROPTAB_INSDATE_DATE1,5,5,35,10\r
     LTEXT           "Date2:",IDC_PROPTAB_INSDATE_DATE2,5,20,35,10\r
     EDITTEXT        IDC_PROP_DATEFORMAT1,50,5,90,12,ES_AUTOHSCROLL\r
     EDITTEXT        IDC_PROP_DATEFORMAT2,50,20,90,12,ES_AUTOHSCROLL\r
-    EDITTEXT        IDC_DATEFORMAT_DESC,5,40,145,80,ES_MULTILINE | \r
-                    ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | NOT \r
-                    WS_TABSTOP\r
+    EDITTEXT        IDC_DATEFORMAT_DESC,5,40,145,80,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP\r
 END\r
 \r
-IDD_PROPTAB_KEEPCARET DIALOG DISCARDABLE  0, 0, 172, 137\r
-STYLE WS_CHILD\r
+IDD_PROPTAB_KEEPCARET DIALOG 0, 0, 172, 137\r
+STYLE DS_SETFONT | WS_CHILD\r
 FONT 9, "Tahoma"\r
 BEGIN\r
-    CONTROL         "Keep Caret",IDC_PROP_KEEPCARET,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,5,5,135,10\r
+    CONTROL         "Keep Caret",IDC_PROP_KEEPCARET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,5,135,10\r
     LTEXT           " ",IDC_PROPTAB_KEEPCARET_HELP1,25,20,135,15\r
     LTEXT           "Tab stop:",IDC_PROPTAB_KEEPCARET_LABEL,5,40,40,10\r
     EDITTEXT        IDC_PROP_TABSTOP,50,40,30,12,ES_AUTOHSCROLL\r
     LTEXT           " ",IDC_PROPTAB_KEEPCARET_HELP2,85,40,80,15\r
-    CONTROL         "Show title",IDC_PROP_SWITCHTITLE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,5,60,130,10\r
-    LTEXT           "Show memo title to titlebar",\r
-                    IDC_PROPTAB_KEEPCARET_HELP3,20,75,130,15\r
-    CONTROL         "Disable save dialog",IDC_PROPTAB_DISABLESAVEDLG,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,5,95,145,10\r
+    CONTROL         "Show title",IDC_PROP_SWITCHTITLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,60,130,10\r
+    LTEXT           "Show memo title to titlebar",IDC_PROPTAB_KEEPCARET_HELP3,20,75,130,15\r
+    CONTROL         "Disable save dialog",IDC_PROPTAB_DISABLESAVEDLG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,95,145,10\r
 END\r
 \r
-IDD_PROPTAB_SELECTMEMO DIALOG DISCARDABLE  0, 0, 192, 131\r
-STYLE WS_CHILD\r
+IDD_PROPTAB_SELECTMEMO DIALOG 0, 0, 192, 131\r
+STYLE DS_SETFONT | WS_CHILD\r
 FONT 9, "Tahoma"\r
 BEGIN\r
-    CONTROL         "Open memo single click",IDC_PROP_SINGLECLICK,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,11,10,140,10\r
+    CONTROL         "Open memo single click",IDC_PROP_SINGLECLICK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,10,140,10\r
     LTEXT           " ",IDC_STATIC,16,26,169,20\r
     CONTROL         "Toggle memo when cursor moved.",IDC_PROP_AUTOLOAD,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,52,140,10\r
     LTEXT           " ",IDC_STATIC,16,68,169,20\r
 END\r
 \r
-IDD_SEARCH DIALOG DISCARDABLE  0, 0, 187, 95\r
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+IDD_SEARCH DIALOG 0, 0, 187, 95\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Search"\r
 FONT 9, "Tahoma"\r
 BEGIN\r
-    COMBOBOX        IDC_SEARCH_STRING,50,5,130,125,CBS_DROPDOWN | \r
-                    CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
+    COMBOBOX        IDC_SEARCH_STRING,50,5,130,125,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
     DEFPUSHBUTTON   "OK",IDOK,75,75,50,14\r
     PUSHBUTTON      "Cancel",IDCANCEL,130,75,50,14\r
     LTEXT           "Search str:",IDC_SEARCH_FIND_LABEL,5,5,40,10\r
-    CONTROL         "Case sensitive",IDC_SEARCH_CASESENSITIVE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,30,105,10\r
-    CONTROL         "Include encrypted memo",IDC_SEARCH_ENCRYPTMEMO,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,45,110,10\r
-    CONTROL         "Find to file name",IDC_FILENAMEONLY,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,60,110,10\r
-    CONTROL         "Up",IDC_SEARCH_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON,\r
-                    140,40,30,10\r
-    CONTROL         "Down",IDC_SEARCH_DIRECTION_DOWN,"Button",\r
-                    BS_AUTORADIOBUTTON,140,55,30,10\r
+    CONTROL         "Case sensitive",IDC_SEARCH_CASESENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,30,105,10\r
+    CONTROL         "Include encrypted memo",IDC_SEARCH_ENCRYPTMEMO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,45,110,10\r
+    CONTROL         "Find to file name",IDC_FILENAMEONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,60,110,10\r
+    CONTROL         "Up",IDC_SEARCH_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON,140,40,30,10\r
+    CONTROL         "Down",IDC_SEARCH_DIRECTION_DOWN,"Button",BS_AUTORADIOBUTTON,140,55,30,10\r
     GROUPBOX        "Direction",IDC_SEARCH_DIRECT_LABEL,130,30,50,40\r
 END\r
 \r
-IDD_SEARCHING DIALOG DISCARDABLE  0, 0, 79, 82\r
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP\r
+IDD_SEARCHING DIALOG 0, 0, 79, 82\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP\r
 FONT 9, "Tahoma"\r
 BEGIN\r
     PUSHBUTTON      "CANCEL",IDCANCEL,15,60,50,14\r
     CTEXT           "Static",IDC_SEARCHMSG,7,30,65,8\r
 END\r
 \r
-IDD_GREPTAB_MAIN DIALOG DISCARDABLE  0, 0, 182, 111\r
-STYLE WS_CHILD\r
+IDD_GREPTAB_MAIN DIALOG 0, 0, 182, 111\r
+STYLE DS_SETFONT | WS_CHILD\r
 FONT 9, "Tahoma"\r
 BEGIN\r
     LTEXT           "Target Directory:",IDC_GREPTAB_MAIN_POSLABEL,10,10,50,8\r
     LTEXT           "Static",IDC_GREPTAB_MAIN_STARTDIR,70,10,105,8\r
     LTEXT           "Search String:",IDC_GREPTAB_MAIN_STRLABEL,10,25,50,8\r
-    COMBOBOX        IDC_GREPTAB_MAIN_SEARCHSTRING,65,25,110,90,CBS_DROPDOWN | \r
-                    WS_VSCROLL | WS_TABSTOP\r
-    CONTROL         "Case sensitive",IDC_GREPTAB_MAIN_CASESENSITIVE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,15,50,130,10\r
+    COMBOBOX        IDC_GREPTAB_MAIN_SEARCHSTRING,65,25,110,90,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP\r
+    CONTROL         "Case sensitive",IDC_GREPTAB_MAIN_CASESENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,50,130,10\r
     CONTROL         "Include encrypted memo",IDC_GREPTAB_MAIN_ENCRYPTNOTE,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,65,135,10\r
-    CONTROL         "Find to file name",IDC_GREPTAB_MAIN_FILENAME,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,15,80,135,10\r
+    CONTROL         "Find to file name",IDC_GREPTAB_MAIN_FILENAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,80,135,10\r
 END\r
 \r
-IDD_GREPTAB_PERSIST DIALOG DISCARDABLE  0, 0, 181, 110\r
-STYLE WS_CHILD | WS_BORDER\r
+IDD_GREPTAB_PERSIST DIALOG 0, 0, 181, 110\r
+STYLE DS_SETFONT | WS_CHILD | WS_BORDER\r
 FONT 9, "Tahoma"\r
 BEGIN\r
     LTEXT           "\95Û\91¶\96¼:",IDC_GREPTAB_PERSIST_LABEL,10,27,40,8\r
     EDITTEXT        IDC_GREPTAB_PERSIST_NAME,60,25,95,14,ES_AUTOHSCROLL\r
-    CONTROL         "\95Û\91¶\82·\82é",IDC_PROPTAB_PERSIST_SELECTPERSIST,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,5,5,55,10\r
+    CONTROL         "\95Û\91¶\82·\82é",IDC_PROPTAB_PERSIST_SELECTPERSIST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,5,55,10\r
 END\r
 \r
-IDD_FILTERCTL DIALOG DISCARDABLE  0, 0, 159, 120\r
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+IDD_FILTERCTL DIALOG 0, 0, 159, 120\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Virtual folder settings"\r
 FONT 9, "Tahoma"\r
 BEGIN\r
     DEFPUSHBUTTON   "OK",IDOK,50,100,50,14\r
     PUSHBUTTON      "Cancel",IDCANCEL,105,100,45,14\r
-    CONTROL         "List1",IDC_FILTERCTL_LIST,"SysListView32",LVS_REPORT | \r
-                    LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS | \r
-                    WS_BORDER | WS_TABSTOP,25,5,90,90\r
+    CONTROL         "List1",IDC_FILTERCTL_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,25,5,90,90\r
     PUSHBUTTON      "Up",IDC_FILTERCTL_UP,5,25,15,15\r
     PUSHBUTTON      "Dn",IDC_FILTERCTL_DOWN,5,45,15,14\r
     PUSHBUTTON      "New",IDC_FILTERCTL_NEW,125,25,25,14\r
-    CONTROL         "Save",IDC_FILTERCTL_KEEP,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,125,10,30,10\r
+    CONTROL         "Save",IDC_FILTERCTL_KEEP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,10,30,10\r
     PUSHBUTTON      "Del",IDC_FILTERCTL_DELETE,125,65,25,14\r
     PUSHBUTTON      "Ren",IDC_FILTERCTL_RENAME,125,45,25,14\r
 END\r
 \r
-IDD_FILTERDEF_SRC DIALOG DISCARDABLE  0, 0, 156, 135\r
-STYLE WS_CHILD | WS_BORDER\r
+IDD_FILTERDEF_SRC DIALOG 0, 0, 156, 135\r
+STYLE DS_SETFONT | WS_CHILD | WS_BORDER\r
 FONT 9, "Tahoma"\r
 BEGIN\r
     EDITTEXT        IDC_FILTERDEF_SRC_PATH,7,25,145,14,ES_AUTOHSCROLL\r
 END\r
 \r
-IDD_FILTERDEF_FILTER DIALOG DISCARDABLE  0, 0, 196, 151\r
-STYLE WS_CHILD | WS_BORDER\r
+IDD_FILTERDEF_FILTER DIALOG 0, 0, 196, 151\r
+STYLE DS_SETFONT | WS_CHILD | WS_BORDER\r
 FONT 9, "Tahoma"\r
 BEGIN\r
-    CONTROL         "List1",IDC_FILTERDEF_FILTER_LIST,"SysListView32",\r
-                    LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | \r
-                    WS_BORDER | WS_TABSTOP,10,10,145,90\r
+    CONTROL         "List1",IDC_FILTERDEF_FILTER_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,10,10,145,90\r
     PUSHBUTTON      "Up",IDC_FILTERDEF_FILTER_UP,160,25,25,14\r
     PUSHBUTTON      "Dn",IDC_FILTERDEF_FILTER_DOWN,160,45,25,14\r
     PUSHBUTTON      "Find",IDC_FILTERDEF_FILTER_REGEX,5,110,35,14\r
@@ -321,28 +275,25 @@ BEGIN
     PUSHBUTTON      "Del",IDC_FILTERDEF_FILTER_DELETE,160,75,25,14\r
 END\r
 \r
-IDD_FILTERDEF_ADD_REGEX DIALOG DISCARDABLE  0, 0, 159, 119\r
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+IDD_FILTERDEF_ADD_REGEX DIALOG 0, 0, 159, 119\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Find filter"\r
 FONT 9, "Tahoma"\r
 BEGIN\r
     DEFPUSHBUTTON   "OK",IDOK,45,100,50,14\r
     PUSHBUTTON      "CANCEL",IDCANCEL,100,100,50,14\r
     LTEXT           "Search str:",IDC_FILTERDEF_ADD_REGEX_LABEL,5,10,36,8\r
-    COMBOBOX        IDC_FILTERDEF_REGEX_SEARCHSTR,50,10,100,80,CBS_DROPDOWN | \r
-                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
+    COMBOBOX        IDC_FILTERDEF_REGEX_SEARCHSTR,50,10,100,80,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
     CONTROL         "Case sensitive",IDC_FILTERDEF_REGEX_CASESENSITIVE,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,35,77,10\r
     CONTROL         "Include encrypted memo",IDC_FILTERDEF_REGEX_CRYPTMEMO,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,50,78,10\r
-    CONTROL         "Find to file name",IDC_FILTERDEF_REGEX_FILENAME,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,65,85,10\r
-    CONTROL         "Invert match",IDC_FILTERDEF_REGEX_NEGATE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,80,83,10\r
+    CONTROL         "Find to file name",IDC_FILTERDEF_REGEX_FILENAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,65,85,10\r
+    CONTROL         "Invert match",IDC_FILTERDEF_REGEX_NEGATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,80,83,10\r
 END\r
 \r
-IDD_FILTERDEF_ADD_LIMIT DIALOG DISCARDABLE  0, 0, 149, 74\r
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+IDD_FILTERDEF_ADD_LIMIT DIALOG 0, 0, 149, 74\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Number filter"\r
 FONT 9, "Tahoma"\r
 BEGIN\r
@@ -352,96 +303,108 @@ BEGIN
     EDITTEXT        IDC_FILTERDEF_LIMIT_NUMLIMIT,75,10,40,14,ES_AUTOHSCROLL\r
 END\r
 \r
-IDD_FILTERDEF_ADD_TIMESTAMP DIALOG DISCARDABLE  0, 0, 159, 93\r
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+IDD_FILTERDEF_ADD_TIMESTAMP DIALOG 0, 0, 159, 93\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Timestamp filter"\r
 FONT 9, "Tahoma"\r
 BEGIN\r
     EDITTEXT        IDC_FILTERDEF_TS_DELTADAY,25,10,30,14,ES_AUTOHSCROLL\r
-    CONTROL         "Newer",IDC_FILTERDEF_TS_NEWER,"Button",\r
-                    BS_AUTORADIOBUTTON,35,35,46,10\r
-    CONTROL         "Older",IDC_FILTERDEF_TS_OLDER,"Button",\r
-                    BS_AUTORADIOBUTTON,35,50,41,10\r
+    CONTROL         "Newer",IDC_FILTERDEF_TS_NEWER,"Button",BS_AUTORADIOBUTTON,35,35,46,10\r
+    CONTROL         "Older",IDC_FILTERDEF_TS_OLDER,"Button",BS_AUTORADIOBUTTON,35,50,41,10\r
     DEFPUSHBUTTON   "OK",IDOK,45,75,50,14\r
     PUSHBUTTON      "CANCEL",IDCANCEL,100,75,50,14\r
-    LTEXT           "days before",IDC_FILTERDEF_ADD_TIMESTAMP_BASEPOINT,60,\r
-                    15,55,8\r
+    LTEXT           "days before",IDC_FILTERDEF_ADD_TIMESTAMP_BASEPOINT,60,15,55,8\r
 END\r
 \r
-IDD_FILTERDEF_ADD_SORT DIALOG DISCARDABLE  0, 0, 159, 93\r
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+IDD_FILTERDEF_ADD_SORT DIALOG 0, 0, 159, 93\r
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Sort filter"\r
 FONT 9, "Tahoma"\r
 BEGIN\r
     DEFPUSHBUTTON   "OK",IDOK,45,75,50,14\r
     PUSHBUTTON      "CANCEL",IDCANCEL,100,75,50,14\r
-    COMBOBOX        IDC_FILTERDEF_SORT_TYPE,55,15,95,85,CBS_DROPDOWNLIST | \r
-                    WS_VSCROLL | WS_TABSTOP\r
+    COMBOBOX        IDC_FILTERDEF_SORT_TYPE,55,15,95,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
     LTEXT           "Sort Type:",IDC_FILTERDEF_ADD_SORT_LABEL,5,15,45,8\r
 END\r
 \r
-IDD_FILTERDEF_VIEWTYPE DIALOG DISCARDABLE  0, 0, 156, 130\r
-STYLE WS_CHILD | WS_BORDER\r
+IDD_FILTERDEF_VIEWTYPE DIALOG 0, 0, 156, 130\r
+STYLE DS_SETFONT | WS_CHILD | WS_BORDER\r
 FONT 9, "Tahoma"\r
 BEGIN\r
-    COMBOBOX        IDC_FILTERDEF_VIEW_TYPE,30,30,100,45,CBS_DROPDOWNLIST | \r
-                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
+    COMBOBOX        IDC_FILTERDEF_VIEW_TYPE,30,30,100,45,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
     LTEXT           " ",IDC_FILTERDEF_VIEWTYPE_LABEL,10,15,85,8\r
 END\r
 \r
-IDD_PROPTAB_DEFNOTE DIALOG DISCARDABLE  0, 0, 181, 140\r
-STYLE WS_CHILD | WS_BORDER\r
+IDD_PROPTAB_DEFNOTE DIALOG 0, 0, 181, 140\r
+STYLE DS_SETFONT | WS_CHILD | WS_BORDER\r
 FONT 9, "Tahoma"\r
 BEGIN\r
-    EDITTEXT        IDC_PROPTAB_DEFNOTE_PATH,5,50,170,12,ES_AUTOHSCROLL | \r
-                    ES_READONLY\r
-    PUSHBUTTON      "Use selected",IDC_PROPTAB_DEFNOTE_SETCURRENT,95,70,80,\r
-                    14\r
+    EDITTEXT        IDC_PROPTAB_DEFNOTE_PATH,5,50,170,12,ES_AUTOHSCROLL | ES_READONLY\r
+    PUSHBUTTON      "Use selected",IDC_PROPTAB_DEFNOTE_SETCURRENT,95,70,80,14\r
     PUSHBUTTON      "Use blank",IDC_PROPTAB_DEFNOTE_SETBLANK,95,90,80,14\r
     LTEXT           "Default note",IDC_PROPTAB_DEFNOTE_LABEL,5,35,170,8\r
     CONTROL         "Open the note last opened",IDC_PROPTAB_DEFNOTE_USELAST,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,10,160,10\r
 END\r
 \r
-IDD_BOOKMARK_EDIT DIALOG DISCARDABLE  0, 0, 194, 136\r
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+IDD_BOOKMARK_EDIT DIALOG 0, 0, 194, 136\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Edit bookmark"\r
 FONT 9, "Tahoma"\r
 BEGIN\r
     DEFPUSHBUTTON   "OK",IDOK,80,115,50,14\r
     PUSHBUTTON      "CANCEL",IDCANCEL,135,115,50,14\r
-    CONTROL         "List1",IDC_BMEDIT_LIST,"SysListView32",LVS_REPORT | \r
-                    WS_BORDER | WS_TABSTOP,25,5,165,105\r
+    CONTROL         "List1",IDC_BMEDIT_LIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,25,5,165,105\r
     PUSHBUTTON      "Delete",IDC_BMEDIT_DELETE,5,115,50,14\r
     PUSHBUTTON      "Up",IDC_BMEDIT_UP,5,25,15,14\r
     PUSHBUTTON      "Dn",IDC_BMEDIT_DOWN,5,45,15,14\r
 END\r
 \r
-IDD_PROPTAB_EXTAPP DIALOG DISCARDABLE  0, 0, 206, 136\r
-STYLE WS_CHILD | WS_BORDER\r
-FONT 9, "Tahoma"\r
+IDD_PROPTAB_EXTAPP DIALOGEX 0, 0, 206, 136\r
+STYLE DS_SETFONT | WS_CHILD | WS_BORDER\r
+FONT 9, "Tahoma", 0, 0, 0x0\r
 BEGIN\r
     EDITTEXT        IDC_PROP_EXTAPP_PATH_EXTAPP1,10,35,120,12,ES_AUTOHSCROLL\r
     LTEXT           "Application1",IDC_PROP_EXTAPP_TTL_EXTAPP1,5,20,65,8\r
     EDITTEXT        IDC_PROP_EXTAPP_PATH_EXTAPP2,10,70,120,12,ES_AUTOHSCROLL\r
     LTEXT           "Application2",IDC_PROP_EXTAPP_TTL_EXTAPP2,5,55,60,8\r
-    CONTROL         "Use file association",IDC_PROP_EXTAPP_USEASSOC,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,5,5,90,10\r
-    EDITTEXT        IDC_PROP_EXTAPP_CAUTION,5,90,195,40,ES_MULTILINE | \r
-                    ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN\r
+    CONTROL         "Use file association",IDC_PROP_EXTAPP_USEASSOC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,5,90,10\r
+    EDITTEXT        IDC_PROP_EXTAPP_CAUTION,5,90,195,40,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN\r
     PUSHBUTTON      "...",IDC_PROPTAB_EXTAPP_CHOOSE1,140,35,20,12\r
     PUSHBUTTON      "...",IDC_PROPTAB_EXTAPP_CHOOSE2,140,70,20,12\r
 END\r
 \r
-IDD_PROPTAB_CODEPAGE DIALOG DISCARDABLE  0, 0, 187, 161\r
-STYLE WS_CHILD\r
-FONT 9, "\82l\82r \82o\83S\83V\83b\83N"\r
+IDD_PROPTAB_CODEPAGE DIALOGEX 0, 0, 187, 161\r
+STYLE DS_SETFONT | WS_CHILD | WS_BORDER\r
+FONT 9, "Tahoma", 0, 0, 0x0\r
 BEGIN\r
     LTEXT           "Codepage:",IDC_PROPTAB_CODEPAGE_LABEL,5,10,115,9\r
-    COMBOBOX        IDC_PROPTAB_CODEPAGE_CODEPAGE,10,25,160,125,\r
-                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
-    EDITTEXT        IDC_PROPTAB_CODEPAGE_NOTICE,10,55,160,95,ES_MULTILINE | \r
-                    ES_AUTOVSCROLL | ES_READONLY\r
+    COMBOBOX        IDC_PROPTAB_CODEPAGE_CODEPAGE,10,25,160,125,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+    EDITTEXT        IDC_PROPTAB_CODEPAGE_NOTICE,10,55,160,95,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY\r
+END\r
+\r
+IDD_PROPTAB_COLOR DIALOGEX 0, 0, 208, 171\r
+STYLE DS_SETFONT | WS_POPUP | WS_SYSMENU\r
+FONT 9, "Tahoma", 0, 0, 0x00\r
+BEGIN\r
+    LTEXT           "Foreground",IDC_PROPTAB_COLOR_FG,6,12,66,8\r
+    LTEXT           "Background",IDC_PROPTAB_COLOR_BG,6,30,66,8\r
+    LTEXT           "End of line",IDC_PROPTAB_COLOR_EOL,6,48,66,8\r
+    LTEXT           "End of line(folding)",IDC_PROPTAB_COLOR_LEOL,6,65,66,8\r
+    LTEXT           "Tab",IDC_PROPTAB_COLOR_TAB,7,83,65,8\r
+    LTEXT           "End of file",IDC_PROPTAB_COLOR_EOF,6,100,66,8\r
+    LTEXT           "",IDC_PROPTAB_COLOR_FG_C,78,12,30,12,WS_BORDER\r
+    LTEXT           "",IDC_PROPTAB_COLOR_BG_C,78,28,30,12,WS_BORDER\r
+    LTEXT           "",IDC_PROPTAB_COLOR_EOL_C,78,45,30,12,WS_BORDER\r
+    LTEXT           "",IDC_PROPTAB_COLOR_LEOL_C,78,64,30,12,WS_BORDER\r
+    LTEXT           "",IDC_PROPTAB_COLOR_TAB_C,78,81,30,12,WS_BORDER\r
+    LTEXT           "",IDC_PROPTAB_COLOR_EOF_C,78,100,30,12,WS_BORDER\r
+    PUSHBUTTON      "...",IDC_PROPTAB_COLOR_BTN_FG,114,11,18,14\r
+    PUSHBUTTON      "...",IDC_PROPTAB_COLOR_BTN_BG,114,27,18,14\r
+    PUSHBUTTON      "...",IDC_PROPTAB_COLOR_BTN_EOL,114,43,18,14\r
+    PUSHBUTTON      "...",IDC_PROPTAB_COLOR_BTN_LEOL,114,61,18,14\r
+    PUSHBUTTON      "...",IDC_PROPTAB_COLOR_BTN_TAB,114,80,18,14\r
+    PUSHBUTTON      "...",IDC_PROPTAB_COLOR_BTN_EOF,114,99,18,14\r
 END\r
 \r
 \r
@@ -451,7 +414,7 @@ END
 //\r
 \r
 #ifdef APSTUDIO_INVOKED\r
-GUIDELINES DESIGNINFO DISCARDABLE \r
+GUIDELINES DESIGNINFO\r
 BEGIN\r
     IDD_PASSWORD, DIALOG\r
     BEGIN\r
@@ -469,6 +432,10 @@ BEGIN
         BOTTOMMARGIN, 153\r
     END\r
 \r
+    IDD_PROPTAB_FOLDER, DIALOG\r
+    BEGIN\r
+    END\r
+\r
     IDD_PROPTAB_PASS_TIMEOUT, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
@@ -636,6 +603,14 @@ BEGIN
         TOPMARGIN, 7\r
         BOTTOMMARGIN, 154\r
     END\r
+\r
+    IDD_PROPTAB_COLOR, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 201\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 164\r
+    END\r
 END\r
 #endif    // APSTUDIO_INVOKED\r
 \r
@@ -647,14 +622,14 @@ END
 \r
 // Icon with lowest ID value placed first to ensure application icon\r
 // remains consistent on all systems.\r
-IDI_TOMBO               ICON    DISCARDABLE     "../../../Src/image/Tombo.ICO"\r
+IDI_TOMBO               ICON                    "../../../Src/image/Tombo.ICO"\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Accelerator\r
 //\r
 \r
-IDR_ACCEL_SELECT ACCELERATORS DISCARDABLE \r
+IDR_ACCEL_SELECT ACCELERATORS\r
 BEGIN\r
     "8",            IDM_SEARCH_PREV,        VIRTKEY, CONTROL, NOINVERT\r
     "9",            IDM_SEARCH_NEXT,        VIRTKEY, CONTROL, NOINVERT\r
@@ -671,7 +646,7 @@ BEGIN
     VK_F3,          IDM_SEARCH_PREV,        VIRTKEY, SHIFT, NOINVERT\r
 END\r
 \r
-IDR_ACCEL_DETAIL ACCELERATORS DISCARDABLE \r
+IDR_ACCEL_DETAIL ACCELERATORS\r
 BEGIN\r
     "1",            IDM_INSDATE1,           VIRTKEY, CONTROL, NOINVERT\r
     "2",            IDM_INSDATE2,           VIRTKEY, CONTROL, NOINVERT\r
@@ -689,7 +664,7 @@ BEGIN
     "Z",            IDM_UNDO,               VIRTKEY, CONTROL, NOINVERT\r
 END\r
 \r
-#endif    // \93ú\96{\8cê resources\r
+#endif    // \93ú\96{\8cê (\93ú\96{) resources\r
 /////////////////////////////////////////////////////////////////////////////\r
 \r
 \r

diff --git a/Win32/Tombo/res/resource.h b/Win32/Tombo/res/resource.h
index 195cd39..e780fa1 100644 (file)
--- a/Win32/Tombo/res/resource.h
+++ b/Win32/Tombo/res/resource.h
@@ -1,5 +1,5 @@
 //{{NO_DEPENDENCIES}}\r
-// Microsoft Developer Studio generated include file.\r
+// Microsoft Visual C++ generated include file.\r
 // Used by Tombo.rc\r
 //\r
 #define IDS_PROPTAB_FOLDER              1\r
@@ -74,6 +74,7 @@
 #define IDD_PROPTAB_EXTAPP              148\r
 #define IDD_LANG_DLG                    149\r
 #define IDD_PROPTAB_CODEPAGE            150\r
+#define IDD_PROPTAB_COLOR               151\r
 #define IDC_PASS                        1000\r
 #define IDC_PROP_PASSWORD_DESC          1001\r
 #define IDC_PASS_TIMEOUT                1002\r
@@ -186,6 +187,25 @@
 #define IDC_PROPTAB_CODEPAGE_LABEL      1104\r
 #define IDC_PROPTAB_CODEPAGE_CODEPAGE   1105\r
 #define IDC_PROPTAB_CODEPAGE_NOTICE     1106\r
+#define IDC_PROPTAB_COLOR_FG            1107\r
+#define IDC_PROPTAB_COLOR_BG            1108\r
+#define IDC_PROPTAB_COLOR_EOL           1109\r
+#define IDC_PROPTAB_COLOR_LEOL          1110\r
+#define IDC_PROPTAB_COLOR_TAB           1111\r
+#define IDC_PROPTAB_COLOR_EOF           1112\r
+#define IDC_PROPTAB_COLOR_FG_C          1113\r
+#define IDC_PROPTAB_COLOR_BG_C          1114\r
+#define IDC_PROPTAB_COLOR_EOL_C         1115\r
+#define IDC_PROPTAB_COLOR_LEOL_C        1116\r
+#define IDC_PROPTAB_COLOR_TAB_C         1117\r
+#define IDC_PROPTAB_COLOR_EOF_C         1118\r
+#define IDC_PROPTAB_COLOR_BTN_FG        1120\r
+#define IDC_PROPTAB_COLOR_BTN_BG        1121\r
+#define IDC_PROPTAB_COLOR_BTN_EOL       1122\r
+#define IDC_PROPTAB_COLOR_BTN_LEOL      1123\r
+#define IDC_PROPTAB_COLOR_BTN_TAB       1124\r
+#define IDC_PROPTAB_COLOR_BTN_TAB2      1125\r
+#define IDC_PROPTAB_COLOR_BTN_EOF       1125\r
 #define IDM_EXIT                        40001\r
 #define IDM_NEWMEMO                     40002\r
 #define IDM_RETURNLIST                  40003\r
@@ -227,9 +247,9 @@
 // \r
 #ifdef APSTUDIO_INVOKED\r
 #ifndef APSTUDIO_READONLY_SYMBOLS\r
-#define _APS_NEXT_RESOURCE_VALUE        151\r
+#define _APS_NEXT_RESOURCE_VALUE        152\r
 #define _APS_NEXT_COMMAND_VALUE         40039\r
-#define _APS_NEXT_CONTROL_VALUE         1107\r
+#define _APS_NEXT_CONTROL_VALUE         1121\r
 #define _APS_NEXT_SYMED_VALUE           116\r
 #endif\r
 #endif\r