set select item correctly on delete of clip data, fixed tab order issues on all screens

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

CP_Main.rc

@@ -382,15 +382,6 @@ BEGIN
     CONTROL         "Enable Quick Paste Transparency",IDC_TRANSPARENCY,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,67,155,10
     EDITTEXT        IDC_TRANS_PERC,177,66,19,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "Font",IDC_BUTTON_FONT,18,160,143,17
-    PUSHBUTTON      "Default Font",IDC_BUTTON_DEFAULT_FAULT,164,163,70,12
-    CONTROL         "At Caret",IDC_AT_CARET,"Button",BS_AUTORADIOBUTTON,22,195,93,10
-    CONTROL         "At Cursor",IDC_AT_CURSOR,"Button",BS_AUTORADIOBUTTON,22,205,97,10
-    CONTROL         "At Previous Position",IDC_AT_PREVIOUS,"Button",BS_AUTORADIOBUTTON,22,215,117,10
-    LTEXT           "%",IDC_STATIC,199,66,8,12,SS_CENTERIMAGE
-    GROUPBOX        "Popup Positioning",IDC_STATIC_POPUP,10,186,138,41
-    LTEXT           "  * = Don't Auto Delete\n  s = Shortcut exists\n G = Item is a Group\n  ! = Item is attached to a Group",IDC_STATIC_LEG,158,196,154,36
-    GROUPBOX        "List Item Prefix Legend",IDC_STATIC_LEGEND,153,186,165,50
     CONTROL         "Show thumbnails (for CF_DIB types) (Could Increase Memory Usage and Display Speed)",IDC_SHOW_THUMBNAILS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,79,335,10
     CONTROL         "Draw RTF Text in List (for RTF types) (Could Increase Memory Usage an Display Speed)",IDC_DRAW_RTF,
@@ -402,9 +393,18 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,119,335,10
     CONTROL         "Prompt when deleting clips",IDC_CHECK_PROMPT_DELETE_CLIP,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,128,335,10
-    LTEXT           "Theme",IDC_STATIC_THEME,18,142,36,12,SS_CENTERIMAGE
     COMBOBOX        IDC_COMBO_THEME,59,142,130,95,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "About Theme",IDC_BUTTON_THEME,198,142,106,12
+    PUSHBUTTON      "Font",IDC_BUTTON_FONT,18,160,143,17
+    PUSHBUTTON      "Default Font",IDC_BUTTON_DEFAULT_FAULT,164,163,70,12
+    CONTROL         "At Caret",IDC_AT_CARET,"Button",BS_AUTORADIOBUTTON,22,195,93,10
+    CONTROL         "At Cursor",IDC_AT_CURSOR,"Button",BS_AUTORADIOBUTTON,22,205,97,10
+    CONTROL         "At Previous Position",IDC_AT_PREVIOUS,"Button",BS_AUTORADIOBUTTON,22,215,117,10
+    LTEXT           "%",IDC_STATIC,199,66,8,12,SS_CENTERIMAGE
+    GROUPBOX        "Popup Positioning",IDC_STATIC_POPUP,10,186,138,41
+    LTEXT           "  * = Don't Auto Delete\n  s = Shortcut exists\n G = Item is a Group\n  ! = Item is attached to a Group",IDC_STATIC_LEG,158,196,154,36
+    GROUPBOX        "List Item Prefix Legend",IDC_STATIC_LEGEND,153,186,165,50
+    LTEXT           "Theme",IDC_STATIC_THEME,18,142,36,12,SS_CENTERIMAGE
 END
 
 IDD_OPTIONS_KEYSTROKES DIALOGEX 0, 0, 350, 206
@@ -414,6 +414,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     CONTROL         "HotKey1",IDC_HOTKEY,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,91,13,80,14
     CONTROL         "Win",IDC_CHECK_WIN_DITTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,174,13,33,14
+    LTEXT           "Send custom strokes Per Application",IDC_STATIC_CUSTOM_KEYS,210,16,133,8
+    CONTROL         "",IDC_HOTKEY_TEXT_ONLY,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,91,33,80,14
+    CONTROL         "Win",IDC_CHECK_WIN_TEXT_ONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,174,33,33,14
     CONTROL         "HotKey1",IDC_HOTKEY1,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,66,80,80,14
     CONTROL         "Win",IDC_CHECK_WIN1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,80,33,14
     CONTROL         "HotKey1",IDC_HOTKEY2,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,66,95,80,14
@@ -434,9 +437,9 @@ BEGIN
     CONTROL         "Win",IDC_CHECK_WIN9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,309,125,27,14
     CONTROL         "HotKey1",IDC_HOTKEY10,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,229,140,80,14
     CONTROL         "Win",IDC_CHECK_WIN10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,309,140,27,14
-    GROUPBOX        "Global Hot Keys for Last Ten Items Copied",IDC_STATIC_GROUP,7,56,336,105
     CONTROL         "Send Paste (Otherwise it will just load the item on the clipboard)",IDC_CHECK_SEND_PASTE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,66,324,13
+    GROUPBOX        "Global Hot Keys for Last Ten Items Copied",IDC_STATIC_GROUP,7,56,336,105
     LTEXT           "Activate Ditto",IDC_STATIC_ACTIVATE,19,13,71,14,SS_CENTERIMAGE
     RTEXT           "Position 1",IDC_STATIC_1,16,80,42,14,SS_CENTERIMAGE
     RTEXT           "Position 2",IDC_STATIC_2,16,95,42,14,SS_CENTERIMAGE
@@ -449,9 +452,6 @@ BEGIN
     RTEXT           "Position 9",IDC_STATIC_9,181,125,42,14,SS_CENTERIMAGE
     RTEXT           "Position 10",IDC_STATIC_10,181,140,42,14,SS_CENTERIMAGE
     LTEXT           "Check the ""Win"" Button to include the windows keyboard key in your hot key.",IDC_STATIC_WIN,7,165,336,25
-    LTEXT           "Send custom strokes Per Application",IDC_STATIC_CUSTOM_KEYS,210,16,133,8
-    CONTROL         "",IDC_HOTKEY_TEXT_ONLY,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,91,33,80,14
-    CONTROL         "Win",IDC_CHECK_WIN_TEXT_ONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,174,33,33,14
     LTEXT           "Text Only Paste",IDC_STATIC_ACTIVATE2,19,33,71,14,SS_CENTERIMAGE
 END
 
@@ -462,15 +462,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL         "Start Ditto on System Startup",IDC_START_ON_STARTUP,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,15,138,10
+    PUSHBUTTON      "Compact and Repair Database",IDC_BT_COMPACT_AND_REPAIR,170,14,105,11
     CONTROL         "Display Icon in System Tray",IDC_DISPLAY_IN_SYSTEMTRAY,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,28,321,10
     CONTROL         "Maximum Number of Saved Copies",IDC_MAXIMUM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,41,144,10
     EDITTEXT        IDC_MAX_SAVED_COPIES,167,41,27,12,ES_AUTOHSCROLL
     CONTROL         "Paste Entries Expire after",IDC_EXPIRE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,54,140,10
     EDITTEXT        IDC_EXPIRE_AFTER,167,53,27,12,ES_AUTOHSCROLL
-    LTEXT           "Days",IDC_STATIC_DAYS,201,53,51,12,SS_CENTERIMAGE
-    PUSHBUTTON      "Compact and Repair Database",IDC_BT_COMPACT_AND_REPAIR,170,14,105,11
-    CONTROL         "Set Database Path",IDC_SET_DB_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,79,320,10
+    COMBOBOX        IDC_COMBO_LANGUAGE,65,65,130,95,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "About Language",IDC_BUTTON_ABOUT,204,65,106,12
     EDITTEXT        IDC_PATH,23,89,248,12,ES_AUTOHSCROLL
     PUSHBUTTON      "....",IDC_GET_PATH,272,89,14,12
     CONTROL         "Allow Duplicates",IDC_ALLOW_DUPLICATES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,105,320,10
@@ -490,15 +490,15 @@ BEGIN
     LTEXT           "Maximum Clip Size in Bytes",IDC_STATIC_MAX_SIZE,23,189,137,8
     EDITTEXT        IDC_EDIT_MAX_SIZE,164,187,59,12,ES_AUTOHSCROLL
     LTEXT           "(Leave blank for no limit)",IDC_STATIC_NO_LIMIT,232,189,112,8
-    LTEXT           "Lanuage",IDC_STATIC_LANGUAGE,23,65,36,12,SS_CENTERIMAGE
-    COMBOBOX        IDC_COMBO_LANGUAGE,65,65,130,95,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Ignore copies that occur X milliseconds from the last copy (1000 ms = 1 sec)",IDC_STATIC_SAVE_DELAY,23,202,278,11
     EDITTEXT        IDC_EDIT_SAVE_DELAY,306,201,38,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "About Language",IDC_BUTTON_ABOUT,204,65,106,12
-    CONTROL         "Ensure Ditto is always connected to the clipboard",IDC_ENSURE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,215,306,10
     LTEXT           "Multi-Paste clip separator ([LF] = line feed)",IDC_STATIC_CLIP_SEPARATOR,23,229,161,8
     EDITTEXT        IDC_EDIT_CLIP_SEPARATOR,187,227,106,12,ES_AUTOHSCROLL
+    CONTROL         "Ensure Ditto is always connected to the clipboard",IDC_ENSURE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,215,306,10
+    LTEXT           "Days",IDC_STATIC_DAYS,201,53,51,12,SS_CENTERIMAGE
+    CONTROL         "Set Database Path",IDC_SET_DB_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,79,320,10
+    LTEXT           "Lanuage",IDC_STATIC_LANGUAGE,23,65,36,12,SS_CENTERIMAGE
 END
 
 IDD_SELECT_DB DIALOGEX 0, 0, 276, 46
@@ -548,18 +548,18 @@ BEGIN
     LTEXT           "Since Last Start",IDC_STATIC_13,145,152,100,8
 END
 
-IDD_ADD_TYPE DIALOG 0, 0, 293, 231
+IDD_ADD_TYPE DIALOGEX 0, 0, 293, 231
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Add Supported Type"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    PUSHBUTTON      "Cancel",IDCANCEL,236,210,50,14
     LISTBOX         IDC_LIST1,7,15,113,174,LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_EDIT1,135,15,91,14,ES_AUTOHSCROLL
-    LISTBOX         IDC_LIST2,135,43,97,146,LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Add",IDC_ADD_1,7,191,44,11
+    EDITTEXT        IDC_EDIT1,135,15,91,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Add",IDC_ADD_2,231,15,44,11
+    LISTBOX         IDC_LIST2,135,43,97,146,LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Add",IDC_ADD_3,130,191,44,11
+    PUSHBUTTON      "Cancel",IDCANCEL,236,210,50,14
     LTEXT           "Custom Type",IDC_STATIC_2,135,7,81,8
     LTEXT           "Currently on the Clipboard",IDC_STATIC_3,135,35,132,8
     LTEXT           "Main Types",IDC_STATIC_1,7,7,80,8
@@ -570,22 +570,20 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFR
 CAPTION "Copy Properties"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
+    CONTROL         "",IDC_RICHEDIT1,"RICHEDIT",TCS_HOTTRACK | TCS_VERTICAL | TCS_FOCUSONBUTTONDOWN | TCS_MULTISELECT | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,66,244,75
     CONTROL         "HotKey1",IDC_HOTKEY,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,44,7,82,13
-    EDITTEXT        IDC_DATE,165,7,86,13,ES_AUTOHSCROLL | NOT WS_TABSTOP
-    COMBOBOX        IDC_COMBO1,77,39,174,128,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_EDIT_QUICK_PASTE,77,56,174,13,ES_AUTOHSCROLL
-    CONTROL         "",IDC_RICHEDIT1,"RICHEDIT",TCS_HOTTRACK | TCS_VERTICAL | TCS_FOCUSONBUTTONDOWN | TCS_MULTISELECT | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,79,244,62
-    DEFPUSHBUTTON   "OK",IDOK,148,199,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,201,199,50,14
+    EDITTEXT        IDC_DATE,165,7,86,13,ES_AUTOHSCROLL | WS_DISABLED | NOT WS_TABSTOP
     CONTROL         "&Never Auto Delete",IDC_NEVER_AUTO_DELETE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,23,149,10
+    COMBOBOX        IDC_COMBO1,77,39,174,128,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LISTBOX         IDC_COPY_DATA,7,153,244,43,LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Delete",IDC_DELETE_COPY_DATA,7,201,42,12
-    LTEXT           "Item Title",IDC_STATIC_TITLE,7,68,168,8
+    DEFPUSHBUTTON   "OK",IDOK,148,199,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,201,199,50,14
+    LTEXT           "Item Title",IDC_STATIC_TITLE,7,56,168,8
     RTEXT           "Date",IDC_STATIC_DATE,131,7,31,13,SS_CENTERIMAGE
     LTEXT           "Hot Key",IDC_STATIC_HOT_KEY,7,7,35,13,SS_CENTERIMAGE
     LTEXT           "Copy Formats",IDC_STATIC_FORMATS,7,142,226,8
     LTEXT           "Move To Group",IDC_STATIC_MOVE_TO_GROUP,8,40,67,9
-    LTEXT           "Quick Paste Text",IDC_STATIC,7,56,62,13,SS_CENTERIMAGE
 END
 
 IDD_ABOUT DIALOGEX 0, 0, 329, 153
@@ -603,10 +601,10 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
 CAPTION "Ditto"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
+    EDITTEXT        IDC_NAME,7,11,172,12,ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK",IDOK,75,28,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,129,28,50,14
     LTEXT           "Name",IDC_STATIC,7,1,59,10
-    EDITTEXT        IDC_NAME,7,11,172,12,ES_AUTOHSCROLL
 END
 
 IDD_OPTIONS_FRIENDS DIALOGEX 0, 0, 353, 247
@@ -614,18 +612,18 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
 CAPTION "Friends"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    CONTROL         "List1",IDC_LIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,7,159,339,68
-    LTEXT           "If Send All Copies is selected then all copies from this computer will be sent to the other computer.  If that is not selected then it will just be in the right click menu to send a copy to that computer.",IDC_STATIC_6,7,126,339,28
     EDITTEXT        IDC_EDIT_PLACE_ON_CLIPBOARD,96,39,210,13,ES_AUTOHSCROLL
-    LTEXT           "IP/Computer Names seperated by commas",IDC_STATIC_2,7,37,84,17
-    LTEXT           "When you recieve a sent copy if their ip or computer name is in this list then it will be put on the clipboard.  Otherwise it will be in the saved clips to use at a later time.",IDC_STATIC_1,7,10,339,26
-    CONTROL         "Log Send Receive Commands",IDC_CHECK_LOG_SEND_RECIEVE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,232,339,12
     CONTROL         "Disable Recieving Clips",IDC_CHECK_DISABLE_FRIENDS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,95,53,146,10
-    LTEXT           "Network Password",IDC_STATIC_3,7,69,79,9
     EDITTEXT        IDC_EDIT_PASSWORD,96,66,210,13,ES_AUTOHSCROLL
     EDITTEXT        IDC_EDIT_ADDITIONAL,95,110,210,12,ES_AUTOHSCROLL
+    CONTROL         "List1",IDC_LIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,7,159,339,68
+    CONTROL         "Log Send Receive Commands",IDC_CHECK_LOG_SEND_RECIEVE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,232,339,12
+    LTEXT           "If Send All Copies is selected then all copies from this computer will be sent to the other computer.  If that is not selected then it will just be in the right click menu to send a copy to that computer.",IDC_STATIC_6,7,126,339,28
+    LTEXT           "IP/Computer Names seperated by commas",IDC_STATIC_2,7,37,84,17
+    LTEXT           "When you recieve a sent copy if their ip or computer name is in this list then it will be put on the clipboard.  Otherwise it will be in the saved clips to use at a later time.",IDC_STATIC_1,7,10,339,26
+    LTEXT           "Network Password",IDC_STATIC_3,7,69,79,9
     LTEXT           "If you are receiving clips from computers where your network password does not match, enter additional network passwords separated by commas",IDC_STATIC_4,7,83,339,22
     LTEXT           "Receive Passwords",IDC_STATIC_5,7,112,79,9
 END
@@ -635,14 +633,14 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
 CAPTION "Friend Details"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,89,58,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,146,58,50,14
+    EDITTEXT        IDC_EDIT_IP,47,20,83,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_DESCRIPTION,47,39,149,13,ES_AUTOHSCROLL
     CONTROL         "Send All Copies to this friend",IDC_CHECK_SEND_ALL,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,47,7,105,10
+    DEFPUSHBUTTON   "OK",IDOK,89,58,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,146,58,50,14
     LTEXT           "IP/Name",IDC_STATIC_1,7,23,30,8
-    EDITTEXT        IDC_EDIT_IP,47,20,83,13,ES_AUTOHSCROLL
     LTEXT           "Description",IDC_STATIC_2,7,41,36,8
-    EDITTEXT        IDC_EDIT_DESCRIPTION,47,39,149,13,ES_AUTOHSCROLL
 END
 
 IDD_MOVE_TO_GROUP DIALOGEX 0, 0, 254, 177
@@ -678,35 +676,35 @@ BEGIN
     CONTROL         "Win",IDC_WIN_COPY_1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,16,33,14
     CONTROL         "",IDC_PASTE_1,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,32,80,14
     CONTROL         "Win",IDC_WIN_PASTE_1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,32,33,14
-    LTEXT           "Copy",IDC_STATIC_COPY_1,19,16,42,14,SS_CENTERIMAGE
-    LTEXT           "Paste",IDC_STATIC_PASTE_1,19,32,43,14,SS_CENTERIMAGE
     CONTROL         "",IDC_CUT_1,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,47,80,14
     CONTROL         "Win",IDC_WIN_CUT_1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,47,33,14
-    LTEXT           "Cut",IDC_STATIC_CUT_1,19,47,43,14,SS_CENTERIMAGE
-    GROUPBOX        "Copy Buffer 1",IDC_BUFFER_GROUP_1,7,7,273,61
     CONTROL         "Play Sound on Copy",IDC_PLAY_SOUND_1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,179,16,80,14
     CONTROL         "",IDC_COPY_2,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,81,80,14
     CONTROL         "Win",IDC_WIN_COPY_2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,81,33,14
     CONTROL         "",IDC_PASTE_2,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,97,80,14
     CONTROL         "Win",IDC_WIN_PASTE_2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,97,33,14
-    LTEXT           "Copy",IDC_STATIC_COPY_2,19,81,42,14,SS_CENTERIMAGE
-    LTEXT           "Paste",IDC_STATIC_PASTE_2,19,97,43,14,SS_CENTERIMAGE
     CONTROL         "",IDC_CUT_2,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,112,80,14
     CONTROL         "Win",IDC_WIN_CUT_2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,112,33,14
-    LTEXT           "Cut",IDC_STATIC_CUT_2,19,112,43,14,SS_CENTERIMAGE
-    GROUPBOX        "Copy Buffer 2",IDC_BUFFER_GROUP_2,7,72,273,61
     CONTROL         "Play Sound on Copy",IDC_PLAY_SOUND_2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,179,81,80,14
     CONTROL         "",IDC_COPY_3,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,148,80,14
     CONTROL         "Win",IDC_WIN_COPY_3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,148,33,14
     CONTROL         "",IDC_PASTE_3,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,164,80,14
     CONTROL         "Win",IDC_WIN_PASTE_3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,164,33,14
-    LTEXT           "Copy",IDC_STATIC_COPY_3,19,148,42,14,SS_CENTERIMAGE
-    LTEXT           "Paste",IDC_STATIC_PASTE_3,19,164,43,14,SS_CENTERIMAGE
     CONTROL         "",IDC_CUT_3,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,63,179,80,14
     CONTROL         "Win",IDC_WIN_CUT_3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,179,33,14
+    CONTROL         "Play Sound on Copy",IDC_PLAY_SOUND_3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,179,148,80,14
+    LTEXT           "Copy",IDC_STATIC_COPY_1,19,16,42,14,SS_CENTERIMAGE
+    LTEXT           "Paste",IDC_STATIC_PASTE_1,19,32,43,14,SS_CENTERIMAGE
+    LTEXT           "Cut",IDC_STATIC_CUT_1,19,47,43,14,SS_CENTERIMAGE
+    GROUPBOX        "Copy Buffer 1",IDC_BUFFER_GROUP_1,7,7,273,61
+    LTEXT           "Copy",IDC_STATIC_COPY_2,19,81,42,14,SS_CENTERIMAGE
+    LTEXT           "Paste",IDC_STATIC_PASTE_2,19,97,43,14,SS_CENTERIMAGE
+    LTEXT           "Cut",IDC_STATIC_CUT_2,19,112,43,14,SS_CENTERIMAGE
+    GROUPBOX        "Copy Buffer 2",IDC_BUFFER_GROUP_2,7,72,273,61
+    LTEXT           "Copy",IDC_STATIC_COPY_3,19,148,42,14,SS_CENTERIMAGE
+    LTEXT           "Paste",IDC_STATIC_PASTE_3,19,164,43,14,SS_CENTERIMAGE
     LTEXT           "Cut",IDC_STATIC_CUT_3,19,179,43,14,SS_CENTERIMAGE
     GROUPBOX        "Copy Buffer 3",IDC_BUFFER_GROUP_3,7,139,273,61
-    CONTROL         "Play Sound on Copy",IDC_PLAY_SOUND_3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,179,148,80,14
 END
 
 
@@ -812,6 +810,10 @@ BEGIN
         BOTTOMMARGIN, 39
     END
 
+    IDD_OPTIONS_STATS, DIALOG
+    BEGIN
+    END
+
     IDD_ADD_TYPE, DIALOG
     BEGIN
         LEFTMARGIN, 7

CopyProperties.cpp

@@ -40,7 +40,6 @@ void CCopyProperties::DoDataExchange(CDataExchange* pDX)
 {
 	CDialog::DoDataExchange(pDX);
 	//{{AFX_DATA_MAP(CCopyProperties)
-	DDX_Control(pDX, IDC_EDIT_QUICK_PASTE, m_QuickPasteText);
 	DDX_Control(pDX, IDC_RICHEDIT1, m_RichEdit);
 	DDX_Control(pDX, IDC_COMBO1, m_GroupCombo);
 	DDX_Control(pDX, IDC_HOTKEY, m_HotKey);
@@ -136,8 +135,6 @@ void CCopyProperties::LoadDataFromCClip(CClip &Clip)
 	m_HotKey.SetHotKey(LOBYTE(Clip.m_lShortCut), HIBYTE(Clip.m_lShortCut));
 	m_HotKey.SetRules(HKCOMB_A, 0);
 
-	m_QuickPasteText.SetWindowText(Clip.m_csQuickPaste);
-
 	CString cs;
 	CClipFormat* pCF;
 	int nCount = Clip.m_Formats.GetSize();
@@ -155,6 +152,15 @@ void CCopyProperties::LoadDataFromCClip(CClip &Clip)
 				m_lCopyData.SetItemData(nIndex, pCF->m_lDBID);
 		}
 	}
+
+	int selectedRow = m_lCopyData.GetCount()-1;
+	if(selectedRow >= 0 && selectedRow < m_lCopyData.GetCount())
+	{
+		m_lCopyData.SetSel(selectedRow);
+		m_lCopyData.SetCurSel(selectedRow);
+		m_lCopyData.SetCaretIndex(selectedRow);
+		m_lCopyData.SetAnchorIndex(selectedRow);
+	}
 }
 
 void CCopyProperties::OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized) 
@@ -232,10 +238,6 @@ void CCopyProperties::LoadDataIntoCClip(CClip &Clip)
 	Clip.m_Desc = m_RichEdit.GetText();
 	Clip.m_Desc.Replace(_T("'"), _T("''"));
 
-	m_QuickPasteText.GetWindowText(Clip.m_csQuickPaste);
-	Clip.m_csQuickPaste.MakeUpper();
-	Clip.m_csQuickPaste.Replace(_T("'"), _T("''"));
-
 	//remove any other that have the same quick paste text
 	if(Clip.m_csQuickPaste.IsEmpty() == FALSE)
 	{
@@ -273,8 +275,23 @@ void CCopyProperties::OnDeleteCopyData()
 		//Get the selected itemdata
 		for(int i = 0; i < nCount; i++)
 		{
-			m_DeletedData.Add(m_lCopyData.GetItemData(items[i]));
-			m_lCopyData.DeleteString(items[i]);
+			int row = items[i];
+			m_DeletedData.Add(m_lCopyData.GetItemData(row));
+			m_lCopyData.DeleteString(row);
+
+			int newRow = row-1;
+			if(newRow < 0)
+			{
+				newRow = 0;
+			}
+
+			if(newRow >= 0 && newRow < m_lCopyData.GetCount())
+			{
+				m_lCopyData.SetSel(newRow);
+				m_lCopyData.SetCurSel(newRow);
+				m_lCopyData.SetCaretIndex(newRow);
+				m_lCopyData.SetAnchorIndex(newRow);
+			}
 		}		
 	}
 }

CopyProperties.h

@@ -24,7 +24,6 @@ public:
 // Dialog Data
 	//{{AFX_DATA(CCopyProperties)
 	enum { IDD = IDD_COPY_PROPERTIES };
-	CEdit	m_QuickPasteText;
 	CRichEditCtrlEx	m_RichEdit;
 	CGroupCombo	m_GroupCombo;
 	CHotKeyCtrl	m_HotKey;