Make sure copy to group window is top most, updated text for save/copy to group in properties

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

CP_Main.rc

@@ -648,36 +648,36 @@ BEGIN
     LTEXT           "Main Types",IDC_STATIC_1,7,7,80,8
 END
 
-IDD_COPY_PROPERTIES DIALOGEX 0, 0, 277, 282
+IDD_COPY_PROPERTIES DIALOGEX 0, 0, 293, 282
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "Copy Properties"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    CONTROL         "HotKey1",IDC_HOTKEY,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,51,7,82,13
-    EDITTEXT        IDC_DATE,51,38,82,13,ES_AUTOHSCROLL | WS_DISABLED | NOT WS_TABSTOP
-    CONTROL         "&Never Auto Delete",IDC_NEVER_AUTO_DELETE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,137,40,105,10
-    COMBOBOX        IDC_COMBO1,73,91,197,128,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LISTBOX         IDC_COPY_DATA,7,205,263,43,LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "HotKey1",IDC_HOTKEY,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,51,7,94,13
+    EDITTEXT        IDC_DATE,51,38,93,13,ES_AUTOHSCROLL | WS_DISABLED | NOT WS_TABSTOP
+    CONTROL         "&Never Auto Delete",IDC_NEVER_AUTO_DELETE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,149,40,105,10
+    COMBOBOX        IDC_COMBO1,71,91,215,128,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LISTBOX         IDC_COPY_DATA,7,205,279,43,LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Delete",IDC_DELETE_COPY_DATA,6,248,42,12
     DEFPUSHBUTTON   "OK",IDOK,163,261,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,220,261,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,236,261,50,14
     LTEXT           "Item Title",IDC_STATIC_TITLE,7,108,168,8
     LTEXT           "Date Added",IDC_STATIC_DATE,8,38,43,13,SS_CENTERIMAGE
     LTEXT           "Hot Key",IDC_STATIC_HOT_KEY,7,7,35,13,SS_CENTERIMAGE
     LTEXT           "Copy Formats",IDC_STATIC_FORMATS,7,194,226,8
     LTEXT           "Move To Group",IDC_STATIC_MOVE_TO_GROUP,8,92,62,9
-    EDITTEXT        IDC_EDIT_QUICK_PASTE,73,72,197,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_QUICK_PASTE,71,72,215,13,ES_AUTOHSCROLL
     LTEXT           "Quick Paste Text",IDC_STATIC_QUICK_PASTE,7,72,62,13,SS_CENTERIMAGE
-    CONTROL         "Hotkey available globally",IDC_HOT_KEY_GLOBAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,171,7,100,14
-    CONTROL         "Win",IDC_CHECK_WIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,137,7,33,14
-    EDITTEXT        IDC_DATE_LAST_USED,51,54,82,13,ES_AUTOHSCROLL | WS_DISABLED | NOT WS_TABSTOP
+    CONTROL         "Hotkey available globally",IDC_HOT_KEY_GLOBAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,183,7,100,14
+    CONTROL         "Win",IDC_CHECK_WIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,149,7,33,14
+    EDITTEXT        IDC_DATE_LAST_USED,51,54,93,13,ES_AUTOHSCROLL | WS_DISABLED | NOT WS_TABSTOP
     LTEXT           "Last Used",IDC_STATIC_DATE2,8,54,43,13,SS_CENTERIMAGE
-    EDITTEXT        IDC_EDIT_PROPERTIES,7,119,263,74,ES_MULTILINE | ES_AUTOHSCROLL
-    CONTROL         "",IDC_HOTKEY_MOVE_TO_GROUP,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,64,23,69,13
-    LTEXT           "Move To Group",IDC_STATIC_HOT_KEY_MOVE_TO_GROUP,7,23,51,13,SS_CENTERIMAGE
+    EDITTEXT        IDC_EDIT_PROPERTIES,7,119,279,74,ES_MULTILINE | ES_AUTOHSCROLL
+    CONTROL         "",IDC_HOTKEY_MOVE_TO_GROUP,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,79,23,66,13
+    LTEXT           "Save/Move To Group",IDC_STATIC_HOT_KEY_MOVE_TO_GROUP,7,23,70,13,SS_CENTERIMAGE
     CONTROL         "Hotkey available globally",IDC_HOT_KEY_GLOBAL_MOVE_TO_GROUP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,171,23,100,14
-    CONTROL         "Win",IDC_CHECK_WIN_MOVE_TO_GROUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,137,23,33,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,183,23,100,14
+    CONTROL         "Win",IDC_CHECK_WIN_MOVE_TO_GROUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,149,23,33,14
 END
 
 IDD_ABOUT DIALOGEX 0, 0, 337, 206
@@ -966,7 +966,7 @@ BEGIN
     IDD_COPY_PROPERTIES, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 270
+        RIGHTMARGIN, 286
         TOPMARGIN, 7
         BOTTOMMARGIN, 275
     END

HotKeys.cpp

@@ -14,7 +14,7 @@ CHotKey::CHotKey(CString name, DWORD defKey, bool bUnregOnShowDitto, HotKeyType
 	m_bUnRegisterOnShowDitto(bUnregOnShowDitto),
 	m_clipId(0)
 {
-	m_Atom = ::GlobalAddAtom(m_Name);
+	m_Atom = ::GlobalAddAtom(StrF(_T("%s_%d"), m_Name, hkType));
 	ASSERT(m_Atom);
 	m_Key = (DWORD)g_Opt.GetProfileLong(m_Name, (long) defKey);
 	m_globalId = m_nextId;

MainFrm.cpp

@@ -1267,12 +1267,11 @@ LRESULT CMainFrame::OnShowMsgWindow(WPARAM wParam, LPARAM lParam)
 
 	m_pPopupWindow = new CDittoPopupWindow();
 	m_pPopupWindow->Create(CRect(r.right - 400, r.bottom - 100, r.right - 10, r.bottom - 10), this);		
+	::SetWindowPos(m_pPopupWindow->m_hWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_SHOWWINDOW);
 	m_pPopupWindow->SetWindowText(_T("Saved clip to group"));
 	m_pPopupWindow->ShowWindow(SW_SHOW);
 	m_pPopupWindow->SetCopyToGroupId(clipId);
-	m_pPopupWindow->UpdateText(*pMsg);
-
-	::SetWindowPos(m_pPopupWindow->m_hWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_SHOWWINDOW);
+	m_pPopupWindow->UpdateText(*pMsg);	
 
 	SetTimer(CLOSE_POPUP_MSG_WND, 2500, 0);