Browse Source

*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/ditto-cp/code/trunk@268 595ec19a-5cb4-439b-94a8-42fb3063c22c
sabrogden 20 years ago
parent
commit
58ea97343f
5 changed files with 23 additions and 5 deletions
  1. 4 4
      CP_Main.rc
  2. 2 1
      ClipboardViewer.cpp
  3. BIN
      EncryptDecrypt.lib
  4. BIN
      EncryptDecryptD.lib
  5. 17 0
      QListCtrl.cpp

+ 4 - 4
CP_Main.rc

@@ -773,8 +773,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,6,0
- PRODUCTVERSION 2,6,6,0
+ FILEVERSION 2,6,7,0
+ PRODUCTVERSION 2,6,7,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -792,14 +792,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "Ditto\0"
-            VALUE "FileVersion", "2, 6, 6, 0\0"
+            VALUE "FileVersion", "2, 6, 7, 0\0"
             VALUE "InternalName", "CP_Main\0"
             VALUE "LegalCopyright", "Copyright (C) 2003\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "Ditto\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Ditto\0"
-            VALUE "ProductVersion", "2, 6, 6, 0\0"
+            VALUE "ProductVersion", "2, 6, 7, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

+ 2 - 1
ClipboardViewer.cpp

@@ -21,7 +21,8 @@ CClipboardViewer::CClipboardViewer(CCopyThread* pHandler) :
 	m_bPinging(false),
 	m_bHandlingClipChange(false),
 	m_bIsConnected(false),
-	m_bConnect(false)
+	m_bConnect(false),
+	m_lLastCopy(0)
 {
 
 }

BIN
EncryptDecrypt.lib


BIN
EncryptDecryptD.lib


+ 17 - 0
QListCtrl.cpp

@@ -824,6 +824,23 @@ BOOL CQListCtrl::HandleKeyDown(WPARAM wParam, LPARAM lParam)
 		GetParent()->SendMessage(NM_SELECT_INDEX, index, 0);
 		return TRUE;
 	}
+
+	if(VK_NUMPAD0 <= vk && vk <= VK_NUMPAD9)
+	{
+		// if <Ctrl> is required but is absent, then break
+		if( g_Opt.m_bUseCtrlNumAccel && !(GetKeyState(VK_CONTROL) & 0x8000) )
+			return FALSE;
+		
+		int index = vk - VK_NUMPAD0;
+		// '0' is actually 10 in the ditto window
+		if(index == 0)
+			index = 10;
+		
+		// translate num 1-10 into the actual index (based upon m_bStartTop)
+		index = GetFirstTenIndex(index);
+		GetParent()->SendMessage(NM_SELECT_INDEX, index, 0);
+		return TRUE;
+	}
 	
 	switch( vk )
 	{