Merge branch 'master' of ssh://git.code.sf.net/p/ditto-cp/ditto

DittoSetup/BuildDitto.bld

@@ -1226,7 +1226,8 @@ DittoSetup_%versionFileName%.exe]]></Ext>
 			<indent type='3'>2</indent>
 			<name>Choco Push</name>
 			<outputfrom type='3'>1</outputfrom>
-			<retries>5</retries>
+			<retries>10</retries>
+			<retrypause>2</retrypause>
 			<startin>%workDir%\DittoSetup\Chocolatey</startin>
 		</step>
 		<step action='Group'>
@@ -2022,7 +2023,8 @@ DittoSetup_%versionFileName%.exe]]></Ext>
 			<indent type='3'>2</indent>
 			<name>Choco Push</name>
 			<outputfrom type='3'>1</outputfrom>
-			<retries>5</retries>
+			<retries>10</retries>
+			<retrypause>2</retrypause>
 			<startin>%workDir%\DittoSetup\Chocolatey.install</startin>
 		</step>
 		<step action='Group'>
@@ -2847,7 +2849,8 @@ DittoPortable_%versionFileName%.zip]]></Ext>
 			<indent type='3'>2</indent>
 			<name>Choco Push</name>
 			<outputfrom type='3'>1</outputfrom>
-			<retries>5</retries>
+			<retries>10</retries>
+			<retrypause>2</retrypause>
 			<startin>%workDir%\DittoSetup\Chocolatey-Portable</startin>
 		</step>
 		<step action='Group'>

Options.cpp

@@ -2763,4 +2763,14 @@ BOOL CGetSetOptions::GetUpdateClipOrderOnCtrlC()
 void CGetSetOptions::SetUpdateClipOrderOnCtrlC(BOOL val)
 {
 	SetProfileLong("UpdateClipOrderOnCtrlC", val);
+}
+
+BOOL CGetSetOptions::GetMaxToolTipLines()
+{
+	return GetProfileLong("MaxToolTipLines", 30);
+}
+
+void CGetSetOptions::SetMaxToolTipLines(int val)
+{
+	SetProfileLong("MaxToolTipLines", val);
 }

Options.h

@@ -613,6 +613,9 @@ public:
 
 	static BOOL GetUpdateClipOrderOnCtrlC();
 	static void SetUpdateClipOrderOnCtrlC(BOOL val);
+
+	static BOOL GetMaxToolTipLines();
+	static void SetMaxToolTipLines(int val);
 };
 
 // global for easy access and for initialization of fast access variables

QPasteWnd.cpp

@@ -26,6 +26,7 @@
 #include "CF_UnicodeTextAggregator.h"
 #include "CF_TextAggregator.h"
 #include "htmlformataggregator.h"
+#include "shared/Tokenizer.h""
 
 #ifdef _DEBUG
     #define new DEBUG_NEW
@@ -5365,7 +5366,20 @@ void CQPasteWnd::OnGetToolTipText(NMHDR *pNMHDR, LRESULT *pResult)
         CppSQLite3Query q = theApp.m_db.execQueryEx(_T("SELECT lID, mText, lDate, lShortCut, clipOrder, clipGroupOrder, stickyClipOrder, stickyClipGroupOrder, lDontAutoDelete, QuickPasteText, lastPasteDate, globalShortCut, lParentID FROM Main WHERE lID = %d"), id);
         if(q.eof() == false)
         {
-            cs = q.getStringField(1);
+            CString clipText = q.getStringField(1);
+
+			int lines = 0;
+			int maxLines = CGetSetOptions::GetMaxToolTipLines();
+			CTokenizer tokenizer(clipText, "\r\n");
+			CString token;
+			while (tokenizer.Next(token))
+			{
+				cs += token + "\r\n";
+				if (lines > 30)
+					break;
+				lines++;
+			}
+
             cs += "\n\n";
             #ifdef _DEBUG
                 cs += StrF(_T("(Index = %d) (DB ID = %d) (Seq = %f) (Group Seq = %f) (Sticky Seq = %f) (Sticky Group Seq = %f)\n"),