Handle shift mouse wheel to scroll horizontal, reset folder path in description window

DittoSetup/BuildDitto.bld

@@ -459,15 +459,15 @@ header("Pragma: no-cache");
 <br>
 <b>Ditto beta, version %version%</b>
 <br><br>
-<a href="DittoSetup_%versionFileName%.exe">Ditto Setup</a><br>
-<a href="DittoSetup_64bit_%versionFileName%.exe">Ditto Setup 64bit</a><br>
-<a href="DittoPortable_%versionFileName%.zip">Ditto Portable</a><br>
-<a href="DittoPortable_64bit_%versionFileName%.zip">Ditto Portable 64</a><br>
-<a href="Ditto_%versionFileName%.appx">Ditto Windows App</a><br>
+<a href="files\DittoSetup_%versionFileName%.exe">Ditto Setup</a><br>
+<a href="files\DittoSetup_64bit_%versionFileName%.exe">Ditto Setup 64bit</a><br>
+<a href="files\DittoPortable_%versionFileName%.zip">Ditto Portable</a><br>
+<a href="files\DittoPortable_64bit_%versionFileName%.zip">Ditto Portable 64</a><br>
+<a href="files\Ditto_%versionFileName%.appx">Ditto Windows App</a><br>
 
 <br>
-<a href="DittoDebug_%versionFileName%.7z">Ditto Debug Files</a><br>
-<a href="DittoSource_%versionFileName%.zip">Ditto Source</a><br>
+<a href="files\DittoDebug_%versionFileName%.7z">Ditto Debug Files</a><br>
+<a href="files\DittoSource_%versionFileName%.zip">Ditto Source</a><br>
 
 <br>
 
@@ -537,7 +537,24 @@ var sc_security="b3f57099";
 			<TransferType type='3'>1</TransferType>
 			<UserName>sabrogden,ditto-cp</UserName>
 			<indent type='3'>1</indent>
-			<name>Copy to beta folder</name>
+			<name>Copy install files</name>
+		</step>
+		<step action='FTP'>
+			<Ext>*.php</Ext>
+			<Filename>%workDir%\DittoSetup\output\</Filename>
+			<Incremental type='11'>-1</Incremental>
+			<Logging type='3'>6</Logging>
+			<Password encrypted='1'>amkwNSREZkNXUFp3JmFRMlkc1ehlfY06mdLEVJHqyXdFbT0D5VqgTJGtkZ7P6mdnGca+n6FwXTNm9GfdZyIEMg==</Password>
+			<Percent>10</Percent>
+			<Port>22</Port>
+			<Retries>0</Retries>
+			<Server>web.sourceforge.net</Server>
+			<ServerPath>/home/groups/d/di/ditto-cp/htdocs/beta</ServerPath>
+			<Timeout>30</Timeout>
+			<TransferType type='3'>1</TransferType>
+			<UserName>sabrogden,ditto-cp</UserName>
+			<indent type='3'>1</indent>
+			<name>Copy beta web pages</name>
 		</step></steps>
 	<steps type='1'>
 		<step action='Group'>

MainFrm.cpp

@@ -860,9 +860,9 @@ BOOL CMainFrame::PreTranslateMessage(MSG *pMsg)
 				
 			}
 		}
-		
-		//if (GetKeyState(VK_SHIFT) & 0x8000)
-		//	pMsg->message = WM_MOUSEHWHEEL;
+
+		if (GetKeyState(VK_SHIFT) & 0x8000)
+			pMsg->message = WM_MOUSEHWHEEL;
 	}
 
     return CFrameWnd::PreTranslateMessage(pMsg);

QListCtrl.cpp

@@ -130,6 +130,7 @@ BEGIN_MESSAGE_MAP(CQListCtrl, CListCtrl)
 	ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTA, 0, 0xFFFF, OnToolTipText)
 	ON_WM_KILLFOCUS()
 	ON_WM_MEASUREITEM_REFLECT()
+	ON_WM_MOUSEHWHEEL()
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
@@ -802,9 +803,10 @@ BOOL CQListCtrl::PreTranslateMessage(MSG* pMsg)
 	{
 	case WM_KEYDOWN:
 		if(HandleKeyDown(pMsg->wParam, pMsg->lParam))
-			return TRUE;
-		
+			return TRUE;		
 		break; // end case WM_KEYDOWN
+	case WM_MOUSEWHEEL:
+		break;
 
 	case WM_VSCROLL:
 		ASSERT(FALSE);
@@ -997,7 +999,7 @@ bool CQListCtrl::ShowFullDescription(bool bFromAuto, bool fromNextPrev)
 		m_pToolTip->SetGdiplusBitmap(NULL);
 		m_pToolTip->SetRTFText("");
 		m_pToolTip->SetToolTipText(_T(""));
-		
+		m_pToolTip->SetFolderPath(_T(""));		
 	}
 	
 	if(VALID_TOOLTIP)
@@ -1710,4 +1712,18 @@ void CQListCtrl::SetDpiInfo(CDPI *dpi)
 	lstrcpy(lf.lfFaceName, _T("Small Font"));
 
 	m_SmallFont = ::CreateFontIndirect(&lf);
-}
+}
+
+void CQListCtrl::OnMouseHWheel(UINT nFlags, short zDelta, CPoint pt)
+{
+	if (zDelta < 0)
+	{
+		this->SendMessage(WM_HSCROLL, SB_LINERIGHT, NULL);
+	}
+	else
+	{
+		this->SendMessage(WM_HSCROLL, SB_LINELEFT, NULL);
+	}
+
+	//CListCtrl::OnMouseHWheel(nFlags, zDelta, pt);
+}

QListCtrl.h

@@ -220,6 +220,7 @@ protected:
 	DECLARE_MESSAGE_MAP()
 public:
 	afx_msg void OnKillFocus(CWnd* pNewWnd);
+	afx_msg void OnMouseHWheel(UINT nFlags, short zDelta, CPoint pt);
 };
 
 /////////////////////////////////////////////////////////////////////////////

QPasteWnd.cpp

@@ -2803,26 +2803,7 @@ BOOL CQPasteWnd::PreTranslateMessage(MSG *pMsg)
 		{
 		}
 	}
-		break;
-	case WM_MBUTTONDBLCLK:
-		break;
-	case WM_LBUTTONDOWN:
-		break;
-
-	/*case WM_LBUTTONDBLCLK:
-	{
-		MSG msg;
-		msg.lParam = 0;
-		msg.wParam = VK_MOUSE_DOUBLE_CLICK;
-		msg.message = WM_KEYDOWN;
-		if (CheckActions(&msg))
-		{
-			return 0;
-		}
-	}
-		break;*/
-	case WM_NOTIFY:
-		break;
+	break;
 	default:
 		if (CheckActions(pMsg))
 		{
@@ -6504,7 +6485,7 @@ void CQPasteWnd::OnNMClickList1(NMHDR *pNMHDR, LRESULT *pResult)
 void CQPasteWnd::OnNMDblclkList1(NMHDR *pNMHDR, LRESULT *pResult)
 {
 	LPNMITEMACTIVATE pNMItemActivate = reinterpret_cast<LPNMITEMACTIVATE>(pNMHDR);
-	
+
 	MSG msg;
 	msg.lParam = 0;
 	msg.wParam = VK_MOUSE_DOUBLE_CLICK;

ToolTipEx.cpp

@@ -65,6 +65,7 @@ BEGIN_MESSAGE_MAP(CToolTipEx, CWnd)
 	ON_MESSAGE(WM_DPICHANGED, OnDpiChanged)
 	ON_WM_MOVING()
 	ON_WM_ENTERSIZEMOVE()
+	ON_WM_HSCROLL()
 END_MESSAGE_MAP()
 
 
@@ -500,6 +501,7 @@ BOOL CToolTipEx::OnMsg(MSG *pMsg)
             }
 
 		case WM_MOUSEWHEEL:
+		case WM_MOUSEHWHEEL:
 		{
 			if (m_imageViewer.m_pGdiplusBitmap)
 			{
@@ -1268,9 +1270,20 @@ void CToolTipEx::OnEnMsgfilterRichedit21(NMHDR *pNMHDR, LRESULT *pResult)
 		{
 			//handle click on the rich text control when it doesn't have focus
 			//set focus so the first click is handled by the rich text control
-			case WM_MOUSEACTIVATE:
-				m_RichEdit.SetFocus();
-				break;
+		case WM_MOUSEACTIVATE:
+			m_RichEdit.SetFocus();
+			break;
+		case WM_MOUSEHWHEEL:			
+			int delta = GET_WHEEL_DELTA_WPARAM(pMsgFilter->wParam);
+			if (delta < 0)
+			{			
+				m_RichEdit.SendMessage(WM_HSCROLL, SB_LINERIGHT, NULL);
+			}
+			else
+			{
+				m_RichEdit.SendMessage(WM_HSCROLL, SB_LINELEFT, NULL);
+			}
+			break;
 		}
 	}
 
@@ -1336,3 +1349,10 @@ void CToolTipEx::OnEnterSizeMove()
 
 	CWnd::OnEnterSizeMove();
 }
+
+
+void CToolTipEx::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
+{
+	int x = 9;
+	//m_scrollHelper.OnHScroll(nSBCode, nPos, pScrollBar);
+}

ToolTipEx.h

@@ -143,4 +143,5 @@ public:
 	afx_msg LRESULT OnDpiChanged(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnMoving(UINT fwSide, LPRECT pRect);
 	afx_msg void OnEnterSizeMove();
+	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
 };