updated search bmp files to support different text percentages

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

CP_Main.rc

@@ -87,6 +87,12 @@ IDB_BACK_FOCUSED        BITMAP                  "res\\back2.bmp"
 IDR_EDIT_WND            BITMAP                  "res\\mainfram.bmp"
 IDB_BITMAP_SEARCH_NORMAL BITMAP                  "res\\search_normal.bmp"
 IDB_BITMAP_SEARCH_CLOSE BITMAP                  "res\\search_close.bmp"
+IDB_BITMAP_SEARCH_NORMAL_125 BITMAP                  "res\\search_normal_125.bmp"
+IDB_BITMAP_SEARCH_CLOSE_125 BITMAP                  "res\\search_close_125.bmp"
+IDB_BITMAP_SEARCH_CLOSE_150 BITMAP                  "res\\search_close_150.bmp"
+IDB_BITMAP_SEARCH_NORMAL_150 BITMAP                  "res\\search_normal_150.bmp"
+IDB_BITMAP_SEARCH_CLOSE_200 BITMAP                  "res\\search_close_200.bmp"
+IDB_BITMAP_SEARCH_NORMAL_200 BITMAP                  "res\\search_normal_200.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
 //

CP_Main.vcxproj

@@ -1872,10 +1872,15 @@
     <None Include="res\back2.bmp" />
     <None Include="res\bitmap1.bmp" />
     <None Include="res\bitmap2.bmp" />
+    <None Include="res\bitmap_s.bmp" />
     <None Include="res\bmp00001.bmp" />
     <None Include="res\bmp00002.bmp" />
     <None Include="res\bmp00003.bmp" />
     <None Include="res\bmp00004.bmp" />
+    <None Include="res\bmp00005.bmp" />
+    <None Include="res\bmp00006.bmp" />
+    <None Include="res\bmp00007.bmp" />
+    <None Include="res\bmp00008.bmp" />
     <None Include="res\closed_f.bmp" />
     <None Include="res\CP_Main.ico" />
     <None Include="res\CP_Main.rc2" />
@@ -1889,6 +1894,9 @@
     <None Include="res\Ditto2.ico" />
     <None Include="res\search_close.bmp" />
     <None Include="res\search_normal.bmp" />
+    <None Include="res\search_normal_125.bmp" />
+    <None Include="res\search_normal_150.bmp" />
+    <None Include="res\search_normal_200.bmp" />
     <None Include="res\Toolbar.bmp" />
     <None Include="res\toolbar1.bmp" />
     <CustomBuild Include="RulerRichEditCtrl\toolbar.bmp">

CP_Main.vcxproj.filters

@@ -782,6 +782,14 @@
     <None Include="res\search_normal.bmp">
       <Filter>res</Filter>
     </None>
+    <None Include="res\bitmap_s.bmp" />
+    <None Include="res\bmp00005.bmp" />
+    <None Include="res\bmp00006.bmp" />
+    <None Include="res\bmp00007.bmp" />
+    <None Include="res\bmp00008.bmp" />
+    <None Include="res\search_normal_200.bmp" />
+    <None Include="res\search_normal_125.bmp" />
+    <None Include="res\search_normal_150.bmp" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="sqlite">

CP_Main_10.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CP_Main", "CP_Main.vcxproj", "{86BF16D0-77B0-8955-B18E-4F78C3083D5E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CP_Main", "CP_Main.vcxproj", "{77E04351-211B-0727-72AE-6A4194C23945}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F08A8736-1116-4166-AF88-CF533E41E958} = {F08A8736-1116-4166-AF88-CF533E41E958}
 		{CF8F6379-5340-4494-8E59-2807ADF37B95} = {CF8F6379-5340-4494-8E59-2807ADF37B95}
@@ -23,14 +23,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{86BF16D0-77B0-8955-B18E-4F78C3083D5E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{86BF16D0-77B0-8955-B18E-4F78C3083D5E}.Debug|Win32.Build.0 = Debug|Win32
-		{86BF16D0-77B0-8955-B18E-4F78C3083D5E}.Debug|x64.ActiveCfg = Debug|x64
-		{86BF16D0-77B0-8955-B18E-4F78C3083D5E}.Debug|x64.Build.0 = Debug|x64
-		{86BF16D0-77B0-8955-B18E-4F78C3083D5E}.Release|Win32.ActiveCfg = Release|Win32
-		{86BF16D0-77B0-8955-B18E-4F78C3083D5E}.Release|Win32.Build.0 = Release|Win32
-		{86BF16D0-77B0-8955-B18E-4F78C3083D5E}.Release|x64.ActiveCfg = Release|x64
-		{86BF16D0-77B0-8955-B18E-4F78C3083D5E}.Release|x64.Build.0 = Release|x64
+		{77E04351-211B-0727-72AE-6A4194C23945}.Debug|Win32.ActiveCfg = Debug|Win32
+		{77E04351-211B-0727-72AE-6A4194C23945}.Debug|Win32.Build.0 = Debug|Win32
+		{77E04351-211B-0727-72AE-6A4194C23945}.Debug|x64.ActiveCfg = Debug|x64
+		{77E04351-211B-0727-72AE-6A4194C23945}.Debug|x64.Build.0 = Debug|x64
+		{77E04351-211B-0727-72AE-6A4194C23945}.Release|Win32.ActiveCfg = Release|Win32
+		{77E04351-211B-0727-72AE-6A4194C23945}.Release|Win32.Build.0 = Release|Win32
+		{77E04351-211B-0727-72AE-6A4194C23945}.Release|x64.ActiveCfg = Release|x64
+		{77E04351-211B-0727-72AE-6A4194C23945}.Release|x64.Build.0 = Release|x64
 		{CF8F6379-5340-4494-8E59-2807ADF37B95}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CF8F6379-5340-4494-8E59-2807ADF37B95}.Debug|Win32.Build.0 = Debug|Win32
 		{CF8F6379-5340-4494-8E59-2807ADF37B95}.Debug|x64.ActiveCfg = Debug|x64

QPasteWnd.cpp

@@ -226,7 +226,7 @@ int CQPasteWnd::OnCreate(LPCREATESTRUCT lpCreateStruct)
     SetWindowText(_T(QPASTE_TITLE));
 
     m_search.Create(WS_TABSTOP | WS_CHILD | WS_VISIBLE | ES_MULTILINE, CRect(0, 0, 0, 0), this, ID_EDIT_SEARCH);
-	m_search.SetBitmaps(IDB_BITMAP_SEARCH_NORMAL, IDB_BITMAP_SEARCH_CLOSE);
+	SetSearchImages();
 
 	CRect rcEditArea(theApp.m_metrics.ScaleX(4), theApp.m_metrics.ScaleY(2), theApp.m_metrics.ScaleX(20), theApp.m_metrics.ScaleY(2));
 	m_search.SetBorder(rcEditArea);
@@ -297,6 +297,35 @@ int CQPasteWnd::OnCreate(LPCREATESTRUCT lpCreateStruct)
     return 0;
 }
 
+void CQPasteWnd::SetSearchImages()
+{
+	int iSourceImageDPIToUse = 96; // We will assume 96 by default.
+
+	if (theApp.m_metrics.GetDPIX() > 144) 
+		iSourceImageDPIToUse = 192;
+	else if (theApp.m_metrics.GetDPIX() > 120) 
+		iSourceImageDPIToUse = 144;
+	else if (theApp.m_metrics.GetDPIX() > 96) 
+		iSourceImageDPIToUse = 120;
+
+	// Now select the right resource to load.
+	switch(iSourceImageDPIToUse)
+	{
+	case 120: 
+		m_search.SetBitmaps(IDB_BITMAP_SEARCH_NORMAL_125, IDB_BITMAP_SEARCH_CLOSE_125);
+		break;
+	case 144: 
+		m_search.SetBitmaps(IDB_BITMAP_SEARCH_NORMAL_150, IDB_BITMAP_SEARCH_CLOSE_150);
+		break;
+	case 192: 
+		m_search.SetBitmaps(IDB_BITMAP_SEARCH_NORMAL_200, IDB_BITMAP_SEARCH_CLOSE_200);
+		break;						
+	default: // default to 96 DPI
+		m_search.SetBitmaps(IDB_BITMAP_SEARCH_NORMAL, IDB_BITMAP_SEARCH_CLOSE);
+		break;
+	}
+}
+
 void CQPasteWnd::OnSize(UINT nType, int cx, int cy)
 {
     CWndEx::OnSize(nType, cx, cy);
@@ -338,7 +367,7 @@ void CQPasteWnd::MoveControls()
 	}
 
     int nWidth = cx;
-	int listBoxBottomOffset = theApp.m_metrics.ScaleY(30);
+	int listBoxBottomOffset = theApp.m_metrics.ScaleY(22);
 	
 	int extraSize = 0;
 

QPasteWnd.h

@@ -165,6 +165,7 @@ public:
 	void SaveWindowSize();
 	void SelectFocusID();
 	void HideMenuGroup(CMenu* menu, CString text);
+	void SetSearchImages();
 
     // Generated message map functions
 protected: