updates to Delete clip data window, fixed moving selection by up/down keys when focus is in search box

git-svn-id: svn://svn.code.sf.net/p/ditto-cp/code/trunk@702 595ec19a-5cb4-439b-94a8-42fb3063c22c

CP_Main.rc

@@ -177,6 +177,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Global Hot Keys",             ID_FIRST_GLOBALHOTKEYS
         MENUITEM "Delete Clip Data",            ID_FIRST_DELETECLIPDATA
+        MENUITEM SEPARATOR
         MENUITEM "Import Clip(s)",              ID_FIRST_IMPORT
         MENUITEM "New Clip",                    ID_FIRST_NEWCLIP
         MENUITEM SEPARATOR
@@ -770,19 +771,19 @@ CAPTION "Delete Clip Data"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,618,294,50,14
-    CONTROL         "",IDC_LIST2,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP,137,24,531,264
-    CONTROL         "",IDC_TIME_CREATE_START,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_TABSTOP | 0x8,63,61,60,15
-    CONTROL         "",IDC_DATE_CREATE_START,"SysDateTimePick32",DTS_RIGHTALIGN | WS_TABSTOP,7,61,53,15
-    COMBOBOX        IDC_COMBO_DATA_FORMAT,7,182,116,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "",IDC_LIST2,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP,137,31,531,257
+    CONTROL         "",IDC_TIME_CREATE_START,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_DISABLED | WS_TABSTOP | 0x8,63,61,60,15
+    CONTROL         "",IDC_DATE_CREATE_START,"SysDateTimePick32",DTS_RIGHTALIGN | WS_DISABLED | WS_TABSTOP,7,61,53,15
+    COMBOBOX        IDC_COMBO_DATA_FORMAT,7,182,116,30,CBS_DROPDOWN | CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
     EDITTEXT        IDC_EDIT_CLIP_TITLE,7,28,115,14,ES_AUTOHSCROLL | WS_DISABLED
-    CONTROL         "",IDC_TIME_CREATE_END,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_TABSTOP | 0x8,63,85,59,15
-    CONTROL         "",IDC_DATE_CREATE_END,"SysDateTimePick32",DTS_RIGHTALIGN | WS_TABSTOP,7,85,53,15
+    CONTROL         "",IDC_TIME_CREATE_END,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_DISABLED | WS_TABSTOP | 0x8,63,85,59,15
+    CONTROL         "",IDC_DATE_CREATE_END,"SysDateTimePick32",DTS_RIGHTALIGN | WS_DISABLED | WS_TABSTOP,7,85,53,15
     CONTROL         "Clip Title",IDC_CHECK_CLIP_TITLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,18,43,10
     CONTROL         "Create Date Range",IDC_CHECK_CREATE_DATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,51,78,10
-    CONTROL         "",IDC_TIME_USE_START,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_TABSTOP | 0x8,63,121,59,15
-    CONTROL         "",IDC_DATE_USE_START,"SysDateTimePick32",DTS_RIGHTALIGN | WS_TABSTOP,7,121,53,15
-    CONTROL         "",IDC_TIME_USE_END,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_TABSTOP | 0x8,63,145,58,15
-    CONTROL         "",IDC_DATE_USE_END,"SysDateTimePick32",DTS_RIGHTALIGN | WS_TABSTOP,7,145,53,15
+    CONTROL         "",IDC_TIME_USE_START,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_DISABLED | WS_TABSTOP | 0x8,63,121,59,15
+    CONTROL         "",IDC_DATE_USE_START,"SysDateTimePick32",DTS_RIGHTALIGN | WS_DISABLED | WS_TABSTOP,7,121,53,15
+    CONTROL         "",IDC_TIME_USE_END,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_DISABLED | WS_TABSTOP | 0x8,63,145,58,15
+    CONTROL         "",IDC_DATE_USE_END,"SysDateTimePick32",DTS_RIGHTALIGN | WS_DISABLED | WS_TABSTOP,7,145,53,15
     CONTROL         "Last Used Range",IDC_CHECK_LAST_USE_DATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,111,70,10
     CONTROL         "Clipboard Data Format",IDC_CHECK_DATA_FORMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,171,88,10
     PUSHBUTTON      "Search",IDC_BUTTON_SEARCH,73,202,50,14
@@ -793,7 +794,7 @@ BEGIN
     LTEXT           "To Delete Size:",IDC_STATIC_TO_DELETE_TEXT,207,300,49,8
     LTEXT           "Size",IDC_STATIC_TO_DELETE_SIZE,259,300,39,8
     PUSHBUTTON      "Apply",IDC_BUTTON_APPLY,561,295,49,13
-    LTEXT           "Each clip in Ditto is made of multiple clipboard items, all clipboard items in Ditto are listed below",IDC_STATIC,279,7,389,15
+    LTEXT           "Each clip in Ditto is made of multiple clipboard items, all clipboard items in Ditto are listed below.  Press delete to remove the entry, click the apply button to permanently remove entry from Ditto",IDC_STATIC,138,7,530,20
 END
 
 

DeleteClipData.cpp

@@ -74,6 +74,7 @@ BEGIN_MESSAGE_MAP(CDeleteClipData, CDialog)
 	ON_BN_CLICKED(IDC_CHECK_CLIP_TITLE, &CDeleteClipData::OnBnClickedCheckClipTitle)
 	ON_BN_CLICKED(IDC_BUTTON_APPLY, &CDeleteClipData::OnBnClickedButtonApply)
 	ON_BN_CLICKED(IDCANCEL, &CDeleteClipData::OnBnClickedCancel)
+	ON_WM_TIMER()
 END_MESSAGE_MAP()
 
 BOOL CDeleteClipData::OnInitDialog()
@@ -95,7 +96,7 @@ BOOL CDeleteClipData::OnInitDialog()
 
 	InitListCtrlCols();
 
-	LoadItems();
+	SetTimer(1, 500, 0);
 
 	SetDbSize();
 
@@ -131,6 +132,7 @@ void CDeleteClipData::LoadItems()
 	m_data.clear();	
 	m_filteredOut.clear();
 	m_toDelete.clear();
+	UpdateToDeleteSize();
 
 	CppSQLite3Query q = theApp.m_db.execQueryEx(_T("SELECT Main.lID, Main.mText, Main.lDate, Main.lastPasteDate, "
 														  _T("Data.lID AS DataID, Data.strClipBoardFormat, length(Data.ooData) AS DataLength ")
@@ -485,7 +487,7 @@ void CDeleteClipData::OnBnClickedCheckClipTitle()
 
 void CDeleteClipData::OnBnClickedButtonApply()
 {
-	if(MessageBox(_T("Delete items?"), _T(""), MB_YESNO) == IDYES)
+	if(MessageBox(_T("Delete items?  This cannot be undone!"), _T(""), MB_YESNO|MB_ICONWARNING) == IDYES)
 	{
 		ApplyDelete();
 	}
@@ -515,9 +517,7 @@ void CDeleteClipData::ApplyDelete()
 		}
 		CATCH_SQLITE_EXCEPTION
 	}
-
 	
-
 	SetDbSize();
 	LoadItems();
 	FilterItems();
@@ -527,3 +527,17 @@ void CDeleteClipData::OnBnClickedCancel()
 {
 	DestroyWindow();
 }
+
+
+void CDeleteClipData::OnTimer(UINT_PTR nIDEvent)
+{
+	switch(nIDEvent)
+	{
+	case 1:
+		LoadItems();
+		KillTimer(1);
+		break;
+	}
+
+	CDialog::OnTimer(nIDEvent);
+}

DeleteClipData.h

@@ -98,4 +98,5 @@ public:
 	afx_msg void OnBnClickedCheckClipTitle();
 	afx_msg void OnBnClickedButtonApply();
 	afx_msg void OnBnClickedCancel();
+	afx_msg void OnTimer(UINT_PTR nIDEvent);
 };

QPasteWnd.cpp

@@ -3828,7 +3828,12 @@ LRESULT CQPasteWnd::OnUpDown(WPARAM wParam, LPARAM lParam)
 		msg.wParam = wParam;
 		msg.message = WM_KEYDOWN;
 
+		//workaround for applying up/down keys, normally these are only done if you are still holding down modifers, fake this out
+		m_bModifersMoveActive = true;
+
 		CheckActions(&msg);
+
+		m_bModifersMoveActive = false;
     }
 
     return TRUE;