From 038821512e047b23e3c41981ddf98ae27ff4e81f Mon Sep 17 00:00:00 2001 From: nathancorvussolis Date: Tue, 23 Jun 2015 01:41:13 +0900 Subject: [PATCH] =?UTF-8?q?Google=20CGI=20API=E3=81=A8=E3=81=AE=E9=80=9A?= =?UTF-8?q?=E4=BF=A1=E3=81=A7=E5=8F=97=E4=BF=A1=E3=82=BF=E3=82=A4=E3=83=A0?= =?UTF-8?q?=E3=82=A2=E3=82=A6=E3=83=88=E3=81=8C=E5=8A=B9=E3=81=84=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=83=90=E3=82=B0?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.TXT | 4 ++-- crvskkserv/crvskkserv.cpp | 35 +++++++++++++++++++++++++++++ crvskkserv/crvskkserv.h | 8 +++---- crvskkserv/search_google_cgiapi.cpp | 4 ++-- 4 files changed, 43 insertions(+), 8 deletions(-) diff --git a/README.TXT b/README.TXT index 99f0297..87509d1 100644 --- a/README.TXT +++ b/README.TXT @@ -1,7 +1,7 @@  ------------------------------------------------------------------------------- - crvskkserv 2.1.0 + crvskkserv 2.1.1 ------------------------------------------------------------------------------- @@ -12,7 +12,7 @@ SKK辞書サーバです。IPv4、IPv6に対応しています。 タスクトレイのアイコンから設定ダイアログを開き、ポートと辞書を設定して下さい。 辞書は、SKK辞書ファイル、SKK辞書サーバ、Google CGI API for Japanese Input に -対応しています。 +対応しています。辞書の最大数は64個です。 改行LFでEUC-JIS-2004やUTF-8(BOMなし)等ASCIIと互換性のある文字コードのSKK辞書 ファイルが使用できます。 diff --git a/crvskkserv/crvskkserv.cpp b/crvskkserv/crvskkserv.cpp index 07865d9..68ddfdb 100644 --- a/crvskkserv/crvskkserv.cpp +++ b/crvskkserv/crvskkserv.cpp @@ -264,6 +264,13 @@ INT_PTR CALLBACK DlgProcSKKServ(HWND hDlg, UINT message, WPARAM wParam, LPARAM l ListView_SetColumnWidth(hWndListView, 0, LVSCW_AUTOSIZE); ListView_EnsureVisible(hWndListView, index, FALSE); + if(ListView_GetItemCount(hWndListView) >= MAX_DICNUM) + { + EnableWindow(GetDlgItem(hPDlg, IDC_BUTTON_SKK_DIC_ADD), FALSE); + EnableWindow(GetDlgItem(hPDlg, IDC_BUTTON_SKKSERV_ADD), FALSE); + EnableWindow(GetDlgItem(hPDlg, IDC_BUTTON_GOOGLECGIAPI_ADD), FALSE); + } + EndDialog(hDlg, 0); break; @@ -354,6 +361,13 @@ INT_PTR CALLBACK DlgProcGoogleCGIAPI(HWND hDlg, UINT message, WPARAM wParam, LPA ListView_SetColumnWidth(hWndListView, 0, LVSCW_AUTOSIZE); ListView_EnsureVisible(hWndListView, index, FALSE); + if(ListView_GetItemCount(hWndListView) >= MAX_DICNUM) + { + EnableWindow(GetDlgItem(hPDlg, IDC_BUTTON_SKK_DIC_ADD), FALSE); + EnableWindow(GetDlgItem(hPDlg, IDC_BUTTON_SKKSERV_ADD), FALSE); + EnableWindow(GetDlgItem(hPDlg, IDC_BUTTON_GOOGLECGIAPI_ADD), FALSE); + } + EndDialog(hDlg, 0); break; @@ -426,6 +440,13 @@ INT_PTR CALLBACK DlgProcConfig(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP } ListView_SetColumnWidth(hWndListView, 0, LVSCW_AUTOSIZE); + + if(ListView_GetItemCount(hWndListView) >= MAX_DICNUM) + { + EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_SKK_DIC_ADD), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_SKKSERV_ADD), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_GOOGLECGIAPI_ADD), FALSE); + } return (INT_PTR)TRUE; case WM_COMMAND: @@ -525,6 +546,13 @@ INT_PTR CALLBACK DlgProcConfig(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP ListView_SetItemState(hWndListView, index, LVIS_FOCUSED | LVIS_SELECTED, 0x000F); ListView_SetColumnWidth(hWndListView, 0, LVSCW_AUTOSIZE); ListView_EnsureVisible(hWndListView, index, FALSE); + + if(ListView_GetItemCount(hWndListView) >= MAX_DICNUM) + { + EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_SKK_DIC_ADD), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_SKKSERV_ADD), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_GOOGLECGIAPI_ADD), FALSE); + } } return (INT_PTR)TRUE; @@ -542,6 +570,13 @@ INT_PTR CALLBACK DlgProcConfig(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP { ListView_DeleteItem(hWndListView, index); ListView_SetColumnWidth(hWndListView, 0, LVSCW_AUTOSIZE); + + if(ListView_GetItemCount(hWndListView) < MAX_DICNUM) + { + EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_SKK_DIC_ADD), TRUE); + EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_SKKSERV_ADD), TRUE); + EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_GOOGLECGIAPI_ADD), TRUE); + } } return (INT_PTR)TRUE; diff --git a/crvskkserv/crvskkserv.h b/crvskkserv/crvskkserv.h index fb01f77..e15e5b7 100644 --- a/crvskkserv/crvskkserv.h +++ b/crvskkserv/crvskkserv.h @@ -2,13 +2,13 @@ #pragma once #define RC_PRODUCT "crvskkserv" -#define RC_VERSION "2.1.0" -#define RC_VERSION_D 2,1,0,0 -#define RC_TITLE "crvskkserv (ver. 2.1.0)" +#define RC_VERSION "2.1.1" +#define RC_VERSION_D 2,1,1,0 +#define RC_TITLE "crvskkserv (ver. 2.1.1)" #define RC_AUTHOR "nathancorvussolis" #define APP_TITLE L"crvskkserv" -#define APP_VERSION L"2.1.0" +#define APP_VERSION L"2.1.1" #define RES_VER RC_PRODUCT "/" RC_VERSION " " #define REQ_END '0' diff --git a/crvskkserv/search_google_cgiapi.cpp b/crvskkserv/search_google_cgiapi.cpp index bc0eb01..7015329 100644 --- a/crvskkserv/search_google_cgiapi.cpp +++ b/crvskkserv/search_google_cgiapi.cpp @@ -114,8 +114,8 @@ void search_google_cgiapi(DICINFO &dicinfo, const std::string &key, std::string if(hInet != NULL) { InternetSetOptionW(hInet, INTERNET_OPTION_CONNECT_TIMEOUT, &dwTimeout, sizeof(dwTimeout)); - InternetSetOptionW(hInet, INTERNET_OPTION_DATA_SEND_TIMEOUT, &dwTimeout, sizeof(dwTimeout)); - InternetSetOptionW(hInet, INTERNET_OPTION_DATA_RECEIVE_TIMEOUT, &dwTimeout, sizeof(dwTimeout)); + InternetSetOptionW(hInet, INTERNET_OPTION_SEND_TIMEOUT, &dwTimeout, sizeof(dwTimeout)); + InternetSetOptionW(hInet, INTERNET_OPTION_RECEIVE_TIMEOUT, &dwTimeout, sizeof(dwTimeout)); hUrl = InternetOpenUrlW(hInet, url, NULL, 0, 0, 0); if(hUrl != NULL)