Skip to content

Commit

Permalink
upgrade to v1.10.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@binbyu
binbyu committed Dec 10, 2021
1 parent 7dfbc75 commit ecf593b
Show file tree
Hide file tree
Showing 376 changed files with 112,668 additions and 61,672 deletions.
560 changes: 267 additions & 293 deletions README.md
View file

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions Reader.sln
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29728.190
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Reader", "Reader\Reader.vcxproj", "{C82E797A-2F83-4F40-93D5-8ADB39AD7879}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C82E797A-2F83-4F40-93D5-8ADB39AD7879}.Debug|Win32.ActiveCfg = Debug|Win32
{C82E797A-2F83-4F40-93D5-8ADB39AD7879}.Debug|Win32.Build.0 = Debug|Win32
{C82E797A-2F83-4F40-93D5-8ADB39AD7879}.Release|Win32.ActiveCfg = Release|Win32
{C82E797A-2F83-4F40-93D5-8ADB39AD7879}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29728.190
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Reader", "Reader\Reader.vcxproj", "{C82E797A-2F83-4F40-93D5-8ADB39AD7879}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C82E797A-2F83-4F40-93D5-8ADB39AD7879}.Debug|Win32.ActiveCfg = Debug|Win32
{C82E797A-2F83-4F40-93D5-8ADB39AD7879}.Debug|Win32.Build.0 = Debug|Win32
{C82E797A-2F83-4F40-93D5-8ADB39AD7879}.Release|Win32.ActiveCfg = Release|Win32
{C82E797A-2F83-4F40-93D5-8ADB39AD7879}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
320 changes: 161 additions & 159 deletions Reader/Advset.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,159 +1,161 @@
#include "stdafx.h"
#include "resource.h"
#include "Advset.h"
#include "Editctrl.h"
#include "Book.h"
#include <regex>


static chapter_rule_t *g_rule = NULL;
static BOOL g_bChanged = FALSE;
static INT_PTR CALLBACK ADV_DlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);

extern LRESULT OnOpenItem(HWND hWnd, int item_id, BOOL forced);
extern int MessageBox_(HWND, UINT, UINT, UINT);

void ADV_OpenDlg(HINSTANCE hInst, HWND hWnd, chapter_rule_t *rule, void *book)
{
g_rule = rule;
g_bChanged = FALSE;
Book *b = (Book*)book;
if (EC_IsEditMode())
{
EC_LeaveEditMode();
}
DialogBox(hInst, MAKEINTRESOURCE(IDD_ADVSET), hWnd, ADV_DlgProc);
if (g_bChanged)
{
// reload book
OnOpenItem(hWnd, 0, TRUE);
}
}

static INT_PTR CALLBACK ADV_DlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{
static int s_rule = 0;

switch (message)
{
case WM_INITDIALOG:
s_rule = g_rule->rule;
if (s_rule == 0) // default
{
SendMessage(GetDlgItem(hDlg, IDC_RADIO_CPT_DEFAULT), BM_SETCHECK, BST_CHECKED, NULL);
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_KEYWORD), FALSE);
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_REGEX), FALSE);
}
else if (s_rule == 1) // keyword
{
SendMessage(GetDlgItem(hDlg, IDC_RADIO_CPT_KEYWORD), BM_SETCHECK, BST_CHECKED, NULL);
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_KEYWORD), TRUE);
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_REGEX), FALSE);
}
else if (s_rule == 2) // regex
{
SendMessage(GetDlgItem(hDlg, IDC_RADIO_CPT_REGEX), BM_SETCHECK, BST_CHECKED, NULL);
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_KEYWORD), FALSE);
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_REGEX), TRUE);
}
SetDlgItemText(hDlg, IDC_EDIT_CPT_KEYWORD, g_rule->keyword);
SetDlgItemText(hDlg, IDC_EDIT_CPT_REGEX, g_rule->regex);
return (INT_PTR)FALSE;
case WM_COMMAND:
switch (LOWORD(wParam))
{
case IDOK:
{
TCHAR temp[256] = {0};
if (s_rule == 1)
{
GetDlgItemText(hDlg, IDC_EDIT_CPT_KEYWORD, temp, 255);
if (!temp[0])
{
MessageBox_(hDlg, IDS_EMPTY_KEYWORD, IDS_ERROR, MB_OK|MB_ICONWARNING);
SetFocus(GetDlgItem(hDlg, IDC_EDIT_CPT_KEYWORD));
return (INT_PTR)FALSE;
}
else
{
if (wcscmp(g_rule->keyword, temp) != 0)
{
g_bChanged = TRUE;
}
}
}
else if (s_rule == 2)
{
GetDlgItemText(hDlg, IDC_EDIT_CPT_REGEX, temp, 255);
if (!temp[0])
{
MessageBox_(hDlg, IDS_EMPTY_REGEX, IDS_ERROR, MB_OK|MB_ICONWARNING);
SetFocus(GetDlgItem(hDlg, IDC_EDIT_CPT_REGEX));
return (INT_PTR)FALSE;
}
else
{
// check regex
try
{
std::wregex e(temp);
}
catch (...)
{
MessageBox_(hDlg, IDS_INVALID_REGEX, IDS_ERROR, MB_OK|MB_ICONWARNING);
SetFocus(GetDlgItem(hDlg, IDC_EDIT_CPT_REGEX));
return (INT_PTR)FALSE;
}

if (wcscmp(g_rule->regex, temp) != 0)
{
g_bChanged = TRUE;
}
}
}

GetDlgItemText(hDlg, IDC_EDIT_CPT_KEYWORD, g_rule->keyword, 255);
GetDlgItemText(hDlg, IDC_EDIT_CPT_REGEX, g_rule->regex, 255);
if (s_rule != g_rule->rule)
{
g_rule->rule = s_rule;
g_bChanged = TRUE;
}
if (g_bChanged)
{
// call book to update chapter
EndDialog(hDlg, LOWORD(wParam));
return (INT_PTR)TRUE;
}
EndDialog(hDlg, LOWORD(wParam));
return (INT_PTR)FALSE;
}
break;
case IDCANCEL:
EndDialog(hDlg, LOWORD(wParam));
return (INT_PTR)FALSE;
break;
case IDC_RADIO_CPT_DEFAULT:
s_rule = 0;
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_KEYWORD), FALSE);
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_REGEX), FALSE);
break;
case IDC_RADIO_CPT_KEYWORD:
s_rule = 1;
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_KEYWORD), TRUE);
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_REGEX), FALSE);
break;
case IDC_RADIO_CPT_REGEX:
s_rule = 2;
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_KEYWORD), FALSE);
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_REGEX), TRUE);
break;
default:
break;
}
break;
default:
break;
}
return (INT_PTR)FALSE;
}
#include "stdafx.h"
#include "resource.h"
#include "Advset.h"
#include "Editctrl.h"
#include "Book.h"
#include <regex>


static chapter_rule_t *g_rule = NULL;
static BOOL g_bChanged = FALSE;
static INT_PTR CALLBACK ADV_DlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);

extern Book *_Book;
extern LRESULT OnOpenItem(HWND hWnd, int item_id, BOOL forced);
extern int MessageBox_(HWND, UINT, UINT, UINT);

void ADV_OpenDlg(HINSTANCE hInst, HWND hWnd, chapter_rule_t *rule, void *book)
{
g_rule = rule;
g_bChanged = FALSE;
if (EC_IsEditMode())
{
EC_LeaveEditMode();
}
DialogBox(hInst, MAKEINTRESOURCE(IDD_ADVSET), hWnd, ADV_DlgProc);
if (g_bChanged)
{
// reload book
if (_Book && _Book->GetBookType() == book_text)
OnOpenItem(hWnd, 0, TRUE);
}
}

static INT_PTR CALLBACK ADV_DlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{
static int s_rule = 0;

switch (message)
{
case WM_INITDIALOG:
s_rule = g_rule->rule;
if (s_rule == 0) // default
{
SendMessage(GetDlgItem(hDlg, IDC_RADIO_CPT_DEFAULT), BM_SETCHECK, BST_CHECKED, NULL);
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_KEYWORD), FALSE);
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_REGEX), FALSE);
}
else if (s_rule == 1) // keyword
{
SendMessage(GetDlgItem(hDlg, IDC_RADIO_CPT_KEYWORD), BM_SETCHECK, BST_CHECKED, NULL);
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_KEYWORD), TRUE);
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_REGEX), FALSE);
}
else if (s_rule == 2) // regex
{
SendMessage(GetDlgItem(hDlg, IDC_RADIO_CPT_REGEX), BM_SETCHECK, BST_CHECKED, NULL);
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_KEYWORD), FALSE);
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_REGEX), TRUE);
}
SetDlgItemText(hDlg, IDC_EDIT_CPT_KEYWORD, g_rule->keyword);
SetDlgItemText(hDlg, IDC_EDIT_CPT_REGEX, g_rule->regex);
SetFocus(GetDlgItem(hDlg, IDOK));
return (INT_PTR)FALSE;
case WM_COMMAND:
switch (LOWORD(wParam))
{
case IDOK:
{
TCHAR temp[256] = {0};
if (s_rule == 1)
{
GetDlgItemText(hDlg, IDC_EDIT_CPT_KEYWORD, temp, 255);
if (!temp[0])
{
MessageBox_(hDlg, IDS_EMPTY_KEYWORD, IDS_ERROR, MB_OK|MB_ICONWARNING);
SetFocus(GetDlgItem(hDlg, IDC_EDIT_CPT_KEYWORD));
return (INT_PTR)FALSE;
}
else
{
if (wcscmp(g_rule->keyword, temp) != 0)
{
g_bChanged = TRUE;
}
}
}
else if (s_rule == 2)
{
GetDlgItemText(hDlg, IDC_EDIT_CPT_REGEX, temp, 255);
if (!temp[0])
{
MessageBox_(hDlg, IDS_EMPTY_REGEX, IDS_ERROR, MB_OK|MB_ICONWARNING);
SetFocus(GetDlgItem(hDlg, IDC_EDIT_CPT_REGEX));
return (INT_PTR)FALSE;
}
else
{
// check regex
try
{
std::wregex e(temp);
}
catch (...)
{
MessageBox_(hDlg, IDS_INVALID_REGEX, IDS_ERROR, MB_OK|MB_ICONWARNING);
SetFocus(GetDlgItem(hDlg, IDC_EDIT_CPT_REGEX));
return (INT_PTR)FALSE;
}

if (wcscmp(g_rule->regex, temp) != 0)
{
g_bChanged = TRUE;
}
}
}

GetDlgItemText(hDlg, IDC_EDIT_CPT_KEYWORD, g_rule->keyword, 255);
GetDlgItemText(hDlg, IDC_EDIT_CPT_REGEX, g_rule->regex, 255);
if (s_rule != g_rule->rule)
{
g_rule->rule = s_rule;
g_bChanged = TRUE;
}
if (g_bChanged)
{
// call book to update chapter
EndDialog(hDlg, LOWORD(wParam));
return (INT_PTR)TRUE;
}
EndDialog(hDlg, LOWORD(wParam));
return (INT_PTR)FALSE;
}
break;
case IDCANCEL:
EndDialog(hDlg, LOWORD(wParam));
return (INT_PTR)FALSE;
break;
case IDC_RADIO_CPT_DEFAULT:
s_rule = 0;
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_KEYWORD), FALSE);
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_REGEX), FALSE);
break;
case IDC_RADIO_CPT_KEYWORD:
s_rule = 1;
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_KEYWORD), TRUE);
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_REGEX), FALSE);
break;
case IDC_RADIO_CPT_REGEX:
s_rule = 2;
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_KEYWORD), FALSE);
EnableWindow(GetDlgItem(hDlg, IDC_EDIT_CPT_REGEX), TRUE);
break;
default:
break;
}
break;
default:
break;
}
return (INT_PTR)FALSE;
}
14 changes: 7 additions & 7 deletions Reader/Advset.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef __ADV_SET_H__
#define __ADV_SET_H__

#include "types.h"

void ADV_OpenDlg(HINSTANCE hInst, HWND hWnd, chapter_rule_t *rule, void *book);

#ifndef __ADV_SET_H__
#define __ADV_SET_H__

#include "types.h"

void ADV_OpenDlg(HINSTANCE hInst, HWND hWnd, chapter_rule_t *rule, void *book);

#endif
Loading

0 comments on commit ecf593b

Please sign in to comment.