More changes for updated theming

CP_Main.rc

@@ -1297,6 +1297,44 @@ Close_Black_32_32       PNG                     "res\\Close_Black_32_32.png"
 
 NewWindowIcon_24_14     PNG                     "res\\NewWindowIcon_24_14.png"
 
+system_menu_2_48        PNG                     "res\\system_menu_2_48.png"
+
+system_menu_2_36        PNG                     "res\\system_menu_2_36.png"
+
+system_menu_2_30        PNG                     "res\\system_menu_2_30.png"
+
+system_menu_2_24        PNG                     "res\\system_menu_2_24.png"
+
+open_folder_48          PNG                     "res\\open_folder_48.png"
+
+open_folder_36          PNG                     "res\\open_folder_36.png"
+
+open_folder_30          PNG                     "res\\open_folder_30.png"
+
+open_folder_24          PNG                     "res\\open_folder_24.png"
+
+ChevronLeft_Black_16_16 PNG                     "res\\ChevronLeft_Black_16_16.png"
+
+ChevronLeft_Black_20_20 PNG                     "res\\ChevronLeft_Black_20_20.png"
+
+ChevronLeft_Black_24_24 PNG                     "res\\ChevronLeft_Black_24_24.png"
+
+ChevronLeft_Black_32_32 PNG                     "res\\ChevronLeft_Black_32_32.png"
+
+NewWindowIcon_48        PNG                     "res\\NewWindowIcon_48.png"
+
+NewWindowIcon_36        PNG                     "res\\NewWindowIcon_36.png"
+
+NewWindowIcon_30        PNG                     "res\\NewWindowIcon_30.png"
+
+return_16               PNG                     "res\\return_16.png"
+
+return_20               PNG                     "res\\return_20.png"
+
+return_24               PNG                     "res\\return_24.png"
+
+return_32               PNG                     "res\\return_32.png"
+
 
 /////////////////////////////////////////////////////////////////////////////
 //

CP_Main.vcxproj

@@ -1389,6 +1389,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="SymbolEdit.cpp" />
     <ClCompile Include="SystemTray.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -1892,6 +1893,7 @@
     <ClInclude Include="SpecialPasteOptions.h" />
     <ClInclude Include="sqlite\sqlite3.h" />
     <ClInclude Include="sqlite\sqlite3ext.h" />
+    <ClInclude Include="SymbolEdit.h" />
     <ClInclude Include="ToolTipEx.h" />
     <ClInclude Include="TrayWnd.h" />
     <ClInclude Include="UAC_Helper.h" />
@@ -2002,6 +2004,10 @@
     <None Include="res\bmp00001.bmp" />
     <None Include="res\bmp00002.bmp" />
     <None Include="res\bmp00003.bmp" />
+    <None Include="res\ChevronLeft_Black_16_16.png" />
+    <None Include="res\ChevronLeft_Black_20_20.png" />
+    <None Include="res\ChevronLeft_Black_24_24.png" />
+    <None Include="res\ChevronLeft_Black_32_32.png" />
     <None Include="res\ChevronRight_Black_16_16.png" />
     <None Include="res\ChevronRight_Black_20_20.png" />
     <None Include="res\ChevronRight_Black_24_24.png" />
@@ -2067,12 +2073,25 @@
     <None Include="res\maximize_16_16.png" />
     <None Include="res\maximize_8_8.png" />
     <None Include="res\NewWindowIcon_24_14.png" />
+    <None Include="res\NewWindowIcon_30.png" />
+    <None Include="res\NewWindowIcon_36.png" />
+    <None Include="res\NewWindowIcon_48.png" />
+    <None Include="res\Open Folder-24.png" />
+    <None Include="res\Open Folder-32.png" />
     <None Include="res\opened_folder_16_16.png" />
     <None Include="res\opened_folder_20_20.png" />
     <None Include="res\opened_folder_24_24.png" />
     <None Include="res\opened_folder_32_32.png" />
     <None Include="res\open_fol.bmp" />
     <None Include="res\Ditto2.ico" />
+    <None Include="res\open_folder_24.png" />
+    <None Include="res\open_folder_30.png" />
+    <None Include="res\open_folder_36.png" />
+    <None Include="res\open_folder_48.png" />
+    <None Include="res\return_16.png" />
+    <None Include="res\return_20.png" />
+    <None Include="res\return_24.png" />
+    <None Include="res\return_32.png" />
     <None Include="res\search_close.bmp" />
     <None Include="res\search_close_125.bmp" />
     <None Include="res\search_close_150.bmp" />
@@ -2089,6 +2108,14 @@
     <None Include="res\system_menu_16_16.png" />
     <None Include="res\system_menu_20_20.png" />
     <None Include="res\system_menu_24_24.png" />
+    <None Include="res\system_menu_2_24.png" />
+    <None Include="res\system_menu_2_30.png" />
+    <None Include="res\system_menu_2_32_32.png" />
+    <None Include="res\system_menu_2_36.png" />
+    <None Include="res\system_menu_2_40_40.png" />
+    <None Include="res\system_menu_2_48.png" />
+    <None Include="res\system_menu_2_48_48.png" />
+    <None Include="res\system_menu_2_64_64.png" />
     <None Include="res\system_menu_32_32.png" />
     <None Include="res\Toolbar.bmp" />
     <None Include="res\toolbar1.bmp" />

CP_Main.vcxproj.filters

@@ -412,6 +412,7 @@
     <ClCompile Include="NTray.cpp">
       <Filter>source</Filter>
     </ClCompile>
+    <ClCompile Include="SymbolEdit.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="sqlite\CppSQLite3.h">
@@ -876,6 +877,7 @@
     <ClInclude Include="NTray.h">
       <Filter>header</Filter>
     </ClInclude>
+    <ClInclude Include="SymbolEdit.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="CP_Main.rc">
@@ -1180,6 +1182,31 @@
     <None Include="res\Close_Black_24_24.png" />
     <None Include="res\Close_Black_32_32.png" />
     <None Include="res\NewWindowIcon_24_14.png" />
+    <None Include="res\system_menu_2_32_32.png" />
+    <None Include="res\system_menu_2_64_64.png" />
+    <None Include="res\system_menu_2_48_48.png" />
+    <None Include="res\system_menu_2_40_40.png" />
+    <None Include="res\Open Folder-32.png" />
+    <None Include="res\Open Folder-24.png" />
+    <None Include="res\system_menu_2_48.png" />
+    <None Include="res\system_menu_2_36.png" />
+    <None Include="res\system_menu_2_30.png" />
+    <None Include="res\system_menu_2_24.png" />
+    <None Include="res\open_folder_48.png" />
+    <None Include="res\open_folder_36.png" />
+    <None Include="res\open_folder_30.png" />
+    <None Include="res\open_folder_24.png" />
+    <None Include="res\ChevronLeft_Black_16_16.png" />
+    <None Include="res\ChevronLeft_Black_20_20.png" />
+    <None Include="res\ChevronLeft_Black_24_24.png" />
+    <None Include="res\ChevronLeft_Black_32_32.png" />
+    <None Include="res\NewWindowIcon_48.png" />
+    <None Include="res\NewWindowIcon_36.png" />
+    <None Include="res\NewWindowIcon_30.png" />
+    <None Include="res\return_16.png" />
+    <None Include="res\return_20.png" />
+    <None Include="res\return_24.png" />
+    <None Include="res\return_32.png" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="sqlite">

DittoWindow.cpp

@@ -51,12 +51,12 @@ void CDittoWindow::DoCreate(CWnd *pWnd)
 	
 	m_closeButton.LoadStdImageDPI(Close_Black_16_16, Close_Black_20_20, Close_Black_24_24, Close_Black_32_32, _T("PNG"));
 	m_chevronRightButton.LoadStdImageDPI(ChevronRight_Black_16_16, ChevronRight_Black_24_24, ChevronRight_Black_24_24, ChevronRight_Black_32_32, _T("PNG"));
-	m_chevronLeftButton.LoadStdImageDPI(IDB_CHEVRON_LEFT_8_8, IDB_CHEVRON_LEFT_10_10, IDB_CHEVRON_LEFT_12_12, IDB_CHEVRON_LEFT_16_16, _T("PNG"));
+	m_chevronLeftButton.LoadStdImageDPI(ChevronLeft_Black_16_16, ChevronLeft_Black_24_24, ChevronLeft_Black_24_24, ChevronLeft_Black_32_32, _T("PNG"));
 	m_chevronTopButton.LoadStdImageDPI(IDB_CHEVRON_TOP_8_8, IDB_CHEVRON_TOP_10_10, IDB_CHEVRON_TOP_12_12, IDB_CHEVRON_TOP_16_16, _T("PNG"));
 	m_chevronBottomButton.LoadStdImageDPI(IDB_CHEVRON_BOTTOM_8_8, IDB_CHEVRON_BOTTOM_10_10, IDB_CHEVRON_BOTTOM_12_12, IDB_CHEVRON_BOTTOM_16_16, _T("PNG"));
 	m_maximizeButton.LoadStdImageDPI(IDB_MAXIMIZE_8_8, IDB_MAXIMIZE_10_10, IDB_MAXIMIZE_12_12, IDB_MAXIMIZE_16_16, _T("PNG"));
 
-	m_windowIcon.LoadStdImageDPI(NewWindowIcon_24_14, NewWindowIcon_24_14, NewWindowIcon_24_14, NewWindowIcon_24_14, _T("PNG"));
+	m_windowIcon.LoadStdImageDPI(NewWindowIcon_24_14, NewWindowIcon_30, NewWindowIcon_36, NewWindowIcon_48, _T("PNG"));
 }
 
 void CDittoWindow::DoNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp)
@@ -582,8 +582,15 @@ void CDittoWindow::DrawChevronBtn(CWindowDC &dc, CWnd *pWnd)
 	{
 		return;
 	}
-
-	m_chevronRightButton.Draw(&dc, pWnd, m_crChevronBT.left, m_crChevronBT.top, false, m_bMouseDownOnChevron);
+		
+	if(this->m_bMinimized)
+	{
+		m_chevronLeftButton.Draw(&dc, pWnd, m_crChevronBT.left, m_crChevronBT.top, m_bMouseOverChevron, m_bMouseDownOnChevron);
+	}
+	else
+	{
+		m_chevronRightButton.Draw(&dc, pWnd, m_crChevronBT.left, m_crChevronBT.top, m_bMouseOverChevron, m_bMouseDownOnChevron);
+	}
 }
 
 void CDittoWindow::DrawWindowIcon(CWindowDC &dc, CWnd *pWnd)

QListCtrl.cpp

@@ -502,13 +502,19 @@ void CQListCtrl::OnCustomdrawList(NMHDR* pNMHDR, LRESULT* pResult)
 			crHotKey.top += theApp.m_metrics.ScaleX(1 + extraFromClipWasPaste);
 			
 			HFONT hOldFont = (HFONT)pDC->SelectObject(m_SmallFont);
-			
+			COLORREF localOldTextColor = pDC->SetTextColor(g_Opt.m_Theme.ListSmallQuickPasteIndexColor());
+
+			CPen pen(PS_SOLID, 0, g_Opt.m_Theme.ListSmallQuickPasteIndexColor());
+			CPen* pOldPen = pDC->SelectObject(&pen);
+						
 			pDC->DrawText(cs, crHotKey, DT_BOTTOM);
 			
 			pDC->MoveTo(CPoint(rcItem.left + theApp.m_metrics.ScaleX(8 + extraFromClipWasPaste), rcItem.top));
 			pDC->LineTo(CPoint(rcItem.left + theApp.m_metrics.ScaleX(8 + extraFromClipWasPaste), rcItem.bottom));
 			
 			pDC->SelectObject(hOldFont);
+			pDC->SetTextColor(localOldTextColor);
+			pDC->SelectObject(pOldPen);
 		}
 		
 		// restore the previous values		

QPasteWnd.cpp

@@ -76,6 +76,7 @@ CQPasteWnd::~CQPasteWnd()
 
 BEGIN_MESSAGE_MAP(CQPasteWnd, CWndEx)
 //{{AFX_MSG_MAP(CQPasteWnd)
+ON_WM_ERASEBKGND()
 ON_WM_CREATE()
 ON_WM_SIZE()
 ON_WM_SETFOCUS()
@@ -306,13 +307,14 @@ 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.SetPromptText(_T("Search"));
 	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);
+	//m_search.SetBorder(rcEditArea);
 
 	CRect rcCloseArea(theApp.m_metrics.ScaleX(85), theApp.m_metrics.ScaleY(3), theApp.m_metrics.ScaleX(99), theApp.m_metrics.ScaleY(15));
-	m_search.SetButtonArea(rcCloseArea);
+	//m_search.SetButtonArea(rcCloseArea);
 
     // Create the header control
     if(!m_lstHeader.Create(WS_TABSTOP | WS_CHILD | WS_VISIBLE | LVS_NOCOLUMNHEADER | LVS_REPORT | LVS_SHOWSELALWAYS | LVS_OWNERDATA | LVS_OWNERDRAWFIXED, CRect(0, 0, 0, 0), this, ID_LIST_HEADER))
@@ -330,31 +332,28 @@ int CQPasteWnd::OnCreate(LPCREATESTRUCT lpCreateStruct)
 
     m_ShowGroupsFolderBottom.Create(NULL, WS_CHILD | BS_OWNERDRAW | WS_TABSTOP, CRect(0, 0, 0, 0), this, ID_SHOW_GROUPS_BOTTOM);
     //m_ShowGroupsFolderBottom.LoadBitmaps(IDB_CLOSED_FOLDER, IDB_CLOSED_FOLDER_PRESSED, IDB_CLOSED_FOLDER_FOCUSED);
-	m_ShowGroupsFolderBottom.LoadStdImageDPI(IDB_OPEN_FOLDER_16_16, IDB_OPEN_FOLDER_20_20, IDB_OPEN_FOLDER_24_24, IDB_OPEN_FOLDER_32_32, _T("PNG"));
+	m_ShowGroupsFolderBottom.LoadStdImageDPI(open_folder_24, open_folder_30, open_folder_36, open_folder_48, _T("PNG"));
     m_ShowGroupsFolderBottom.ShowWindow(SW_SHOW);
 	m_ShowGroupsFolderBottom.SetToolTipText(theApp.m_Language.GetString(_T("GroupsTooltip"), _T("Groups")));
 	m_ShowGroupsFolderBottom.ModifyStyle(WS_TABSTOP, 0);
 
     m_BackButton.Create(NULL, WS_CHILD | BS_OWNERDRAW | WS_TABSTOP, CRect(0, 0, 0, 0), this, ID_BACK_BUTTON);
-	m_BackButton.LoadStdImageDPI(IDB_LEFT_ARROW_16_16, IDB_LEFT_ARROW_20_20, IDB_LEFT_ARROW_24_24, IDB_LEFT_ARROW_32_32, _T("PNG"));
+	m_BackButton.LoadStdImageDPI(return_16, return_20, return_24, return_32, _T("PNG"));
 	m_BackButton.ModifyStyle(WS_TABSTOP, 0);
     m_BackButton.ShowWindow(SW_SHOW);
 
 	m_systemMenu.Create(NULL, WS_CHILD | BS_OWNERDRAW | WS_TABSTOP, CRect(0, 0, 0, 0), this, ID_SYSTEM_BUTTON);
 	//m_systemMenu.LoadStdImageDPI(IDB_HAMBURGER_16_16, IDB_HAMBURGER_20_20, IDB_HAMBURGER_24_24, IDB_HAMBURGER_32_32, _T("PNG"));
-	m_systemMenu.LoadStdImageDPI(IDB_SYSTEM_MENU_16_16, IDB_SYSTEM_MENU_20_20, IDB_SYSTEM_MENU_24_24, IDB_SYSTEM_MENU_32_32, _T("PNG"));
+	m_systemMenu.LoadStdImageDPI(system_menu_2_24, system_menu_2_30, system_menu_2_36, system_menu_2_48, _T("PNG"));
 	m_systemMenu.ModifyStyle(WS_TABSTOP, 0);
 	m_systemMenu.ShowWindow(SW_SHOW);
 		
     m_stGroup.Create(_T(""), WS_CHILD | WS_VISIBLE, CRect(0, 0, 0, 0), this, ID_GROUP_TEXT);
 	
-
     //Set the z-order
     m_lstHeader.SetWindowPos(this, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
     m_search.SetWindowPos(&m_lstHeader, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
     m_ShowGroupsFolderBottom.SetWindowPos(&m_search, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
-	
-
 
     //LVS_EX_FLATSB
     m_lstHeader.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP);
@@ -370,14 +369,15 @@ int CQPasteWnd::OnCreate(LPCREATESTRUCT lpCreateStruct)
         m_Alpha.SetWindowHandle(m_hWnd);
     #endif 
 
-	m_TitleFont.CreateFont(theApp.m_metrics.PointsToPixels(10), 0, -900, 0, 400, FALSE, FALSE, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_SWISS, _T("Arial"));
 
-    m_SearchFont.CreatePointFont(80, _T("Arial Unicode MS"));
-
-	m_groupFont.CreateFont(-theApp.m_metrics.PointsToPixels(8), 0, 0, 0, 400, 0, 1, 0, DEFAULT_CHARSET, 3, 2, 1, 34, _T("MS Sans Serif"));	
+    m_SearchFont.CreatePointFont(130, _T("Segoe UI"));
+	m_groupFont.CreateFont(-theApp.m_metrics.PointsToPixels(8), 0, 0, 0, 400, 0, 1, 0, DEFAULT_CHARSET, 3, 2, 1, 34, _T("Segoe UI"));	
 
     m_search.SetFont(&m_SearchFont);
+	m_search.SetPromptFont(m_SearchFont);
 	m_stGroup.SetFont(&m_groupFont);	
+
+	m_stGroup.SetBkColor(g_Opt.m_Theme.MainWindowBG());
 	
     UpdateFont();
 	
@@ -470,31 +470,31 @@ void CQPasteWnd::LoadShortcuts()
 
 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;
-	}
+	//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)
@@ -524,10 +524,10 @@ void CQPasteWnd::MoveControls()
         m_stGroup.ShowWindow(SW_SHOW);
         m_BackButton.ShowWindow(SW_SHOW);
 
-		m_BackButton.MoveWindow(theApp.m_metrics.ScaleX(2), theApp.m_metrics.ScaleY(1), theApp.m_metrics.ScaleX(16), theApp.m_metrics.ScaleY(16));
-		m_stGroup.MoveWindow(theApp.m_metrics.ScaleX(24), theApp.m_metrics.ScaleY(1), cx - theApp.m_metrics.ScaleX(20), theApp.m_metrics.ScaleY(16));
+		m_BackButton.MoveWindow(theApp.m_metrics.ScaleX(2), theApp.m_metrics.ScaleY(2), theApp.m_metrics.ScaleX(16), theApp.m_metrics.ScaleY(16));
+		m_stGroup.MoveWindow(theApp.m_metrics.ScaleX(24), theApp.m_metrics.ScaleY(2), cx - theApp.m_metrics.ScaleX(20), theApp.m_metrics.ScaleY(16));
 
-		topOfListBox = theApp.m_metrics.ScaleY(16);
+		topOfListBox = theApp.m_metrics.ScaleY(20);
 	}
 	else
 	{
@@ -535,12 +535,12 @@ void CQPasteWnd::MoveControls()
 		m_stGroup.ShowWindow(SW_HIDE);
 	}
 	
-	int searchRowStart = 22;
+	int searchRowStart = 33;
 
-	if(g_Opt.m_bShowPersistent)
+	/*if(g_Opt.m_bShowPersistent)
 	{
 		searchRowStart = 41;
-	}
+	}*/
 
     int nWidth = cx;
 	int listBoxBottomOffset = theApp.m_metrics.ScaleY(searchRowStart);
@@ -554,27 +554,27 @@ void CQPasteWnd::MoveControls()
 
 		CRgn rgnRect;
 		CRect r;
-		m_lstHeader.GetWindowRect(&r);
+		m_lstHeader.GetWindowRect(&r) ;
 
 		rgnRect.CreateRectRgn(0, 0, cx, (cy - listBoxBottomOffset-topOfListBox)+1);
 
 		m_lstHeader.SetWindowRgn(rgnRect, TRUE);
 	}
 
-	m_lstHeader.MoveWindow(0, topOfListBox, cx+extraSize, cy - listBoxBottomOffset-topOfListBox + extraSize);
-	m_search.MoveWindow(theApp.m_metrics.ScaleX(20), cy - theApp.m_metrics.ScaleY(searchRowStart-1), cx - theApp.m_metrics.ScaleX(40), theApp.m_metrics.ScaleY(20));
+	m_lstHeader.MoveWindow(0, topOfListBox, cx+extraSize, cy - listBoxBottomOffset-topOfListBox + extraSize+1);
+	m_search.MoveWindow(theApp.m_metrics.ScaleX(40), cy - theApp.m_metrics.ScaleY(searchRowStart-5), cx - theApp.m_metrics.ScaleX(90), theApp.m_metrics.ScaleY(23));
 
-	m_systemMenu.MoveWindow(cx - theApp.m_metrics.ScaleX(18), cy - theApp.m_metrics.ScaleY(searchRowStart - 3), theApp.m_metrics.ScaleX(16), theApp.m_metrics.ScaleY(16));
+	m_systemMenu.MoveWindow(cx - theApp.m_metrics.ScaleX(28), cy - theApp.m_metrics.ScaleX(28), theApp.m_metrics.ScaleX(24), theApp.m_metrics.ScaleY(24));
 
-	m_ShowGroupsFolderBottom.MoveWindow(theApp.m_metrics.ScaleX(2), cy - theApp.m_metrics.ScaleY(searchRowStart-3), theApp.m_metrics.ScaleX(17), theApp.m_metrics.ScaleY(17));
+	m_ShowGroupsFolderBottom.MoveWindow(theApp.m_metrics.ScaleX(2), cy - theApp.m_metrics.ScaleX(28), theApp.m_metrics.ScaleX(24), theApp.m_metrics.ScaleY(24));
 
-	if (g_Opt.m_bShowPersistent &&
+	/*if (g_Opt.m_bShowPersistent &&
 		g_Opt.m_bShowAlwaysOnTopWarning)
 	{
 		m_alwaysOnToWarningStatic.ShowWindow(SW_SHOW);
 		m_alwaysOnToWarningStatic.MoveWindow(theApp.m_metrics.ScaleX(2), cy - theApp.m_metrics.ScaleY(18), cx - theApp.m_metrics.ScaleY(4), theApp.m_metrics.ScaleY(17));
 	}
-	else
+	else*/
 	{
 		m_alwaysOnToWarningStatic.ShowWindow(SW_HIDE);
 	}
@@ -5301,21 +5301,21 @@ LRESULT CQPasteWnd::OnShowHideScrollBar(WPARAM wParam, LPARAM lParam)
 //	
 //}
 
-//BOOL CQPasteWnd::OnEraseBkgnd(CDC* pDC)
-//{
-//	CRect rect;
-//	GetClientRect(&rect);
-//	CBrush myBrush(RGB(255, 0, 0));    // dialog background color
-//	CBrush *pOld = pDC->SelectObject(&myBrush);
-//	BOOL bRes  = pDC->PatBlt(0, 0, rect.Width(), rect.Height(), PATCOPY);
-//	pDC->SelectObject(pOld);    // restore old brush
-//	return bRes;                       // CDialog::OnEraseBkgnd(pDC);
-//
-//	//return TRUE;
-//	// TODO: Add your message handler code here and/or call default
-//
-//	//return CWndEx::OnEraseBkgnd(pDC);
-//}
+BOOL CQPasteWnd::OnEraseBkgnd(CDC* pDC)
+{
+	CRect rect;
+	GetClientRect(&rect);
+	CBrush myBrush(g_Opt.m_Theme.MainWindowBG());    // dialog background color
+	CBrush *pOld = pDC->SelectObject(&myBrush);
+	BOOL bRes  = pDC->PatBlt(0, 0, rect.Width(), rect.Height(), PATCOPY);
+	pDC->SelectObject(pOld);    // restore old brush
+	return bRes;                       // CDialog::OnEraseBkgnd(pDC);
+
+	//return TRUE;
+	// TODO: Add your message handler code here and/or call default
+
+	//return CWndEx::OnEraseBkgnd(pDC);
+}
 
 void CQPasteWnd::OnQuickoptionsShowintaskbar()
 {

QPasteWnd.h

@@ -17,7 +17,7 @@
 #include "GdipButton.h"
 #include "SpecialPasteOptions.h"
 #include "ClipIds.h"
-
+#include "SymbolEdit.h"
 class CMainTable
 {
 public:
@@ -125,8 +125,8 @@ public:
     CQListCtrl m_lstHeader;
 
     CAlphaBlend m_Alpha;
-    CFont m_TitleFont;
-	CEditWithButton m_search;
+	//CEditWithButton m_search;
+	CSymbolEdit m_search;
     CFont m_SearchFont;
     bool m_bHideWnd;
     CString m_strSQLSearch;
@@ -473,4 +473,5 @@ public:
 	afx_msg void OnUpdateStickyclipsRemovestickysetting(CCmdUI *pCmdUI);
 	afx_msg void OnSpecialpastePaste32927();
 	afx_msg void OnUpdateSpecialpastePaste32927(CCmdUI *pCmdUI);
+	afx_msg BOOL OnEraseBkgnd(CDC* pDC);
 };

Resource.h

@@ -125,6 +125,27 @@
 #define Close_Black_32_32               266
 #define IDB_PNG6                        267
 #define NewWindowIcon_24_14             267
+#define IDB_PNG10                       273
+#define system_menu_2_48                274
+#define system_menu_2_36                275
+#define system_menu_2_30                276
+#define system_menu_2_24                277
+#define open_folder_48                  278
+#define open_folder_36                  279
+#define open_folder_30                  280
+#define open_folder_24                  281
+#define ChevronLeft_Black_16_16         282
+#define ChevronLeft_Black_20_20         283
+#define ChevronLeft_Black_24_24         284
+#define ChevronLeft_Black_32_32         285
+#define NewWindowIcon_48                286
+#define NewWindowIcon_36                287
+#define NewWindowIcon_30                288
+#define return_16                       289
+#define return_20                       290
+#define return_24                       291
+#define IDB_PNG14                       292
+#define return_32                       292
 #define IDC_PATH                        1000
 #define IDC_GET_PATH                    1001
 #define IDC_SELECT_SOUND                1002
@@ -603,7 +624,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        268
+#define _APS_NEXT_RESOURCE_VALUE        293
 #define _APS_NEXT_COMMAND_VALUE         32929
 #define _APS_NEXT_CONTROL_VALUE         2146
 #define _APS_NEXT_SYMED_VALUE           104

Theme.cpp

@@ -27,6 +27,8 @@ CTheme::CTheme(void)
 	m_ListBoxSelectedText = RGB(0, 0, 0);
 	m_ListBoxSelectedNoFocusText = RGB(0, 0, 0);
 	m_clipPastedColor = RGB(0, 255, 0);
+	m_listSmallQuickPasteIndexColor = RGB(180, 180, 180);
+	m_mainWindowBG = RGB(240, 240, 240);
 }
 
 CTheme::~CTheme(void)

Theme.h

@@ -29,6 +29,8 @@ public:
 	COLORREF ListBoxSelectedNoFocusText() const { return m_ListBoxSelectedNoFocusText; }
 	COLORREF ClipPastedColor() const { return m_clipPastedColor; }
 
+	COLORREF ListSmallQuickPasteIndexColor() const { return m_listSmallQuickPasteIndexColor;  }
+	COLORREF MainWindowBG() const { return m_mainWindowBG; }
 
 	CString Notes() const { return m_csNotes; }
 	CString Author() const { return m_csAuthor; }
@@ -57,7 +59,8 @@ protected:
 	COLORREF m_ListBoxSelectedText;
 	COLORREF m_ListBoxSelectedNoFocusText;	
 	COLORREF m_clipPastedColor;
-
+	COLORREF m_listSmallQuickPasteIndexColor;
+	COLORREF m_mainWindowBG;
 
 	CString m_csLastError;
 	long m_lFileVersion;