Updates to bottom icons for new theming

QPasteWnd.cpp

@@ -562,9 +562,9 @@ void CQPasteWnd::MoveControls()
 	}
 
 	m_lstHeader.MoveWindow(0, topOfListBox, cx+extraSize, cy - listBoxBottomOffset-topOfListBox + extraSize+1);
-	m_search.MoveWindow(theApp.m_metrics.ScaleX(32), cy - theApp.m_metrics.ScaleY(searchRowStart-5), cx - theApp.m_metrics.ScaleX(68), theApp.m_metrics.ScaleY(23));
+	m_search.MoveWindow(theApp.m_metrics.ScaleX(34), cy - theApp.m_metrics.ScaleY(searchRowStart-5), cx - theApp.m_metrics.ScaleX(70), theApp.m_metrics.ScaleY(23));
 
-	m_systemMenu.MoveWindow(cx - theApp.m_metrics.ScaleX(32), cy - theApp.m_metrics.ScaleX(28), theApp.m_metrics.ScaleX(24), theApp.m_metrics.ScaleY(24));
+	m_systemMenu.MoveWindow(cx - theApp.m_metrics.ScaleX(30), cy - theApp.m_metrics.ScaleX(28), theApp.m_metrics.ScaleX(24), theApp.m_metrics.ScaleY(24));
 
 	m_ShowGroupsFolderBottom.MoveWindow(theApp.m_metrics.ScaleX(4), cy - theApp.m_metrics.ScaleX(28), theApp.m_metrics.ScaleX(24), theApp.m_metrics.ScaleY(24));
 
@@ -1084,11 +1084,7 @@ void CQPasteWnd::RefreshNc()
 
 void CQPasteWnd::UpdateStatus(bool bRepaintImmediately)
 {
-	return;
-    CString title = m_Title;
-    CString prev;
-
-    GetWindowText(prev);
+    CString title = m_Title;    
 
     CString cs;
     cs.Format(_T(" - %d/%d"), m_lstHeader.GetSelectedCount(), m_lstHeader.GetItemCount());
@@ -1128,11 +1124,9 @@ void CQPasteWnd::UpdateStatus(bool bRepaintImmediately)
         title += theApp.m_Language.GetString("No_Target", "No target");
     }
 
-    if(title != prev)
-    {
+    SetToolTipText(title);
 		//SetCustomWindowTitle(title);
-        //RefreshNc();
-    }
+        //RefreshNc();    
 }
 
 BOOL CQPasteWnd::FillList(CString csSQLSearch /*=""*/)

Resource.h

@@ -96,6 +96,7 @@
 #define IDB_IN_FOLDER_24_24             227
 #define IDB_IN_FOLDER_20_20             228
 #define IDB_IN_FOLDER_16_16             229
+#define IDB_FOLDER_WHITE_16             229
 #define IDB_KEY_32_32                   230
 #define IDB_KEY_24_24                   231
 #define IDB_KEY_20_20                   232
@@ -154,6 +155,7 @@
 #define IDI_ICON2                       297
 #define IDB_PNG11                       298
 #define search_close_16                 298
+#define IDB_FOLDER                      300
 #define IDC_PATH                        1000
 #define IDC_GET_PATH                    1001
 #define IDC_SELECT_SOUND                1002
@@ -632,7 +634,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        299
+#define _APS_NEXT_RESOURCE_VALUE        301
 #define _APS_NEXT_COMMAND_VALUE         32929
 #define _APS_NEXT_CONTROL_VALUE         2146
 #define _APS_NEXT_SYMED_VALUE           104

WndEx.cpp

@@ -102,6 +102,12 @@ int CWndEx::OnCreate(LPCREATESTRUCT lpCreateStruct)
 	SetCaptionColorActive(false, TRUE);
 	m_DittoWindow.SetCaptionOn(this, CGetSetOptions::GetCaptionPos(), true);
 	SetAutoMaxDelay(CGetSetOptions::GetAutoMaxDelay());
+
+	m_toolTip.Create(this);
+	CRect r;
+	GetWindowRect(&r);
+	ScreenToClient(&r);
+	m_toolTip.AddTool(this, _T("Ditto"), r, 1);
 	
 	return 0;
 }
@@ -315,6 +321,7 @@ void CWndEx::OnNcMouseMove(UINT nHitTest, CPoint point)
 
 BOOL CWndEx::PreTranslateMessage(MSG* pMsg) 
 {
+	m_toolTip.RelayEvent(pMsg);
 	m_DittoWindow.DoPreTranslateMessage(pMsg);
 	
 	return CWnd::PreTranslateMessage(pMsg);
@@ -367,7 +374,6 @@ void CWndEx::OnWindowPosChanging(WINDOWPOS* lpwndpos)
 	}
 }
 
-
 void CWndEx::OnSize(UINT nType, int cx, int cy)
 {
 	CWnd::OnSize(nType, cx, cy);
@@ -375,8 +381,12 @@ void CWndEx::OnSize(UINT nType, int cx, int cy)
 	m_DittoWindow.DoSetRegion(this);
 }
 
-
 void CWndEx::OnInitMenuPopup(CMenu *pPopupMenu, UINT nIndex, BOOL bSysMenu)
 {
 	OnInitMenuPopupEx(pPopupMenu, nIndex, bSysMenu, this);
-} 
+} 
+
+void CWndEx::SetToolTipText(CString text)
+{
+	m_toolTip.UpdateTipText(text, this, 1);
+}

WndEx.h

@@ -45,6 +45,8 @@ public:
 
 	void SetCustomWindowTitle(CString title) { m_DittoWindow.m_customWindowTitle = title;  m_DittoWindow.m_useCustomWindowTitle = true; }
 
+	void SetToolTipText(CString text);
+
 protected:
 	CDittoWindow m_DittoWindow;
 	CRect m_crFullSizeWindow;
@@ -52,6 +54,7 @@ protected:
 	COleDateTime m_TimeMinimized;
 	COleDateTime m_TimeMaximized;
 	int m_lDelayMaxSeconds;
+	CToolTipCtrl m_toolTip;
 
 // Implementation
 public: