From 766ca9f994fd89124867572da0728b0e9b8dfdd3 Mon Sep 17 00:00:00 2001
From: lltcggie <lltcggie@gmail.com>
Date: Thu, 4 Feb 2016 17:22:19 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=82=B9=E3=83=88=E3=83=93=E3=83=A5?=
 =?UTF-8?q?=E3=83=BC=E3=82=92=E4=BD=BF=E3=81=A3=E3=81=9F=E7=94=BB=E5=83=8F?=
 =?UTF-8?q?=E5=87=BA=E5=8A=9B=E8=A8=AD=E5=AE=9A=E5=AE=9F=E8=A3=85=EF=BC=88?=
 =?UTF-8?q?=E9=80=94=E4=B8=AD=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 waifu2x-caffe-gui/Resource.rc | Bin 11780 -> 12498 bytes
 waifu2x-caffe-gui/Source.cpp  |  58 ++++++++++++++++++++++++++++++++++
 waifu2x-caffe-gui/resource.h  | Bin 5586 -> 5770 bytes
 3 files changed, 58 insertions(+)

diff --git a/waifu2x-caffe-gui/Resource.rc b/waifu2x-caffe-gui/Resource.rc
index 335976e4ab71a47f97975a49a07ed0c598fc45b3..fbee6c0ae81b78a8057186c921af20d967b4880f 100644
GIT binary patch
delta 458
zcma)2%}N4c6g}f)O!%|Wz;H8~;i4IG{2PN>jQE2zXsB6%AQ2HQqacEyO^axIcP-nt
z31;KgN3bWTH>fx0I9lr#-#s(;oO{mq-G|}($y-AU+OSdZ_O$f`KTFt_%TP>qB6%6>
z@p;Fa>Z%g*Nf@Z0ER)EVMAH?;l4kl;vAx&yc|e94O>t$ql9I2;l4?FZ%V&6P)j%0J
zMi{VAU@gq5SaC}<J$&z?g&z7Cp@Rb-d#Drp?6=XRK281>S8#E`dW`|`3^#PilQY;K
zP%%Q6bNh7Za#qJ3&o5I)jc$GZJE&6SQom5-7Q+skEylHpbu|7g4t?vYZ(AeNmEBA-
zIe$`-;d#ue#kG})WfbLmIp*mbABt*oO;*<Qa@nye3G+oBm1xSL_Yp5UyU;AN!^{!U
Y!SQ?nqG;KFs3yUrl4F+X1vUff4}{xR_y7O^

delta 109
zcmcbV*b=kBjf2&U!H~glvp0vb1gj~7C4>3oLT=&7HoQiYcPNNJL^fYkU}oe7OETy%
zSTLAPKFF&-nNP`r(P*-}QZl2(=G98+Oq0K{@oiqF_J9#+q5*@+<d0gSn-^%DW8S<?
HSB4n?;4B@4

diff --git a/waifu2x-caffe-gui/Source.cpp b/waifu2x-caffe-gui/Source.cpp
index 11160c5..85b15c8 100644
--- a/waifu2x-caffe-gui/Source.cpp
+++ b/waifu2x-caffe-gui/Source.cpp
@@ -1372,6 +1372,37 @@ public:
 		SetWindowText(GetDlgItem(hWnd, IDC_COMBO_OUTPUT_DEPTH), boost::lexical_cast<tstring>(output_depth).c_str());
 
 		SetDepthAndQuality();
+
+		LVCOLUMN col;
+		col.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM;
+		col.fmt = LVCFMT_LEFT;
+
+		col.iSubItem = 0;
+		col.cx = 100;
+		col.pszText = TEXT("値");
+		ListView_InsertColumn(GetDlgItem(hWnd, IDC_LIST_OUT_SETTING), 0, &col);
+
+
+		col.iSubItem = 1;
+		col.cx = 100;
+		col.pszText = TEXT("名前");
+		ListView_InsertColumn(GetDlgItem(hWnd, IDC_LIST_OUT_SETTING), 1, &col);
+
+		LVITEM item = {0};
+		item.mask = LVIF_TEXT;
+		for (int iCount = 0; iCount < 3; iCount++)
+		{
+			item.pszText = L"aaaaaa";
+			item.iItem = iCount;
+			item.iSubItem = 0;
+			ListView_InsertItem(GetDlgItem(hWnd, IDC_LIST_OUT_SETTING), &item);
+
+			item.pszText = L"b";
+			item.iItem = iCount;
+			item.iSubItem = 1;
+			ListView_SetItem(GetDlgItem(hWnd, IDC_LIST_OUT_SETTING), &item);
+		}
+
 	}
 
 	void Cancel(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData)
@@ -1693,6 +1724,33 @@ int WINAPI WinMain(HINSTANCE hInstance,
 	cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::LangChange, &cDialogEvent), NULL, IDC_COMBO_LANG);
 	cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::OutExtChange, &cDialogEvent), NULL, IDC_COMBO_OUT_EXT);
 
+	
+	cDialog.SetEventCallBack([](HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData)
+	{
+		if (((LPNMHDR)lParam)->idFrom == IDC_LIST_OUT_SETTING)
+		{
+			if (((LPNMLISTVIEW)lParam)->hdr.code == NM_DBLCLK)
+			{
+				// リストビューの項目をダブルクリックしたら編集開始
+
+				LPNMITEMACTIVATE lpnmitem = (LPNMITEMACTIVATE)lParam;
+				if (lpnmitem->iItem >= 0 && lpnmitem->iSubItem >= 0)
+					ListView_EditLabel(GetDlgItem(hWnd, IDC_LIST_OUT_SETTING), lpnmitem->iItem);
+			}
+			else if (((LPNMLISTVIEW)lParam)->hdr.code == LVN_ENDLABELEDIT)
+			{
+				// 編集が終わったら項目に反映
+				HWND hEdit = ListView_GetEditControl(GetDlgItem(hWnd, IDC_LIST_OUT_SETTING));
+
+				TCHAR buf[100];
+				GetWindowText(hEdit, buf, _countof(buf));
+				buf[_countof(buf) - 1] = TEXT('\0');
+
+				ListView_SetItemText(GetDlgItem(hWnd, IDC_LIST_OUT_SETTING), ((LV_DISPINFO *)lParam)->item.iItem, 0, buf);
+			}
+		}
+	}, NULL, WM_NOTIFY);
+
 	// ダイアログのイベントで実行する関数の登録
 	cDialog.SetEventCallBack(SetClassFunc(DialogEvent::Create, &cDialogEvent), NULL, WM_INITDIALOG);
 	cDialog.SetEventCallBack(SetClassFunc(DialogEvent::OnDialogEnd, &cDialogEvent), NULL, WM_CLOSE);
diff --git a/waifu2x-caffe-gui/resource.h b/waifu2x-caffe-gui/resource.h
index 1b0242355afd3c1599efb9602d470d4025edfb0f..240144521a245c7d803b29eb4d2a5ccde0301546 100644
GIT binary patch
delta 92
zcmcbl-KD!BPk3?#zXZPzgC|2ULkL4WgFizkL&)UaJnEA#FtIV4G8jx&WRm5C$(v3N
kWY>kt7;VlJ)@Pioz$7+#oya0a)5-Eo;y{+j<Qma105~`oO#lD@

delta 36
scmeCuy`;S%Pk6JMh!*4IBaC8`6~sg)SBds9n=qJ94iwd#Y$6s00NNi4yZ`_I