- Removed focus dll, found this only worked with same app time 64bit or 32bit so it would only sometimes work.

- Removed option for order of list, found this had been broke for over a year, easier to just remove it

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

CP_Main.rc

@@ -228,11 +228,6 @@ BEGIN
                 MENUITEM "Bottom",                      32781,MFT_STRING,MFS_ENABLED
                 MENUITEM "Left",                        32782,MFT_STRING,MFS_ENABLED
             END
-            POPUP "Order",                          65535,MFT_STRING,MFS_ENABLED
-            BEGIN
-                MENUITEM "Ascending (Latest on the Top)", 32795,MFT_STRING,MFS_ENABLED
-                MENUITEM "Descending (Latest on the Bottom)", 32797,MFT_STRING,MFS_ENABLED
-            END
             POPUP "Double Clicking on Caption",     65535,MFT_STRING,MFS_ENABLED
             BEGIN
                 MENUITEM "Toggles Always on Top",       32814,MFT_STRING,MFS_ENABLED
@@ -370,42 +365,40 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
 CAPTION "Quick Paste"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    CONTROL         "History Starts at the Top of the list (vs. Bottom)",IDC_HISTORY_START_TOP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,8,335,10
     CONTROL         "Use Ctrl - Num for first ten copy hot keys",IDC_CTRL_CLICK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,19,335,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,8,335,10
     CONTROL         "Show text for first ten copy hot keys",IDC_SHOW_TEXT_FOR_FIRST_TEN_HOT_KEYS,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,30,335,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,19,335,10
     CONTROL         "Show leading whitespace",IDC_DESC_SHOW_LEADING_WHITESPACE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,41,335,10
-    LTEXT           "Text Lines per Clip",IDC_STATIC_LINES,18,54,93,8
-    EDITTEXT        IDC_LINES_ROW,114,52,19,12,ES_AUTOHSCROLL
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,30,335,10
+    LTEXT           "Text Lines per Clip",IDC_STATIC_LINES,18,43,93,8
+    EDITTEXT        IDC_LINES_ROW,114,41,19,12,ES_AUTOHSCROLL
     CONTROL         "Enable Quick Paste Transparency",IDC_TRANSPARENCY,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,67,155,10
-    EDITTEXT        IDC_TRANS_PERC,177,66,19,12,ES_AUTOHSCROLL
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,56,155,10
+    EDITTEXT        IDC_TRANS_PERC,177,55,19,12,ES_AUTOHSCROLL
     CONTROL         "Show thumbnails (for CF_DIB types) (Could Increase Memory Usage and Display Speed)",IDC_SHOW_THUMBNAILS,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,79,335,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,68,335,10
     CONTROL         "Draw RTF Text in List (for RTF types) (Could Increase Memory Usage an Display Speed)",IDC_DRAW_RTF,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,89,335,10
-    CONTROL         "Find As You Type",IDC_CHECK_FIND_AS_YOU_TYPE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,99,335,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,78,335,10
+    CONTROL         "Find As You Type",IDC_CHECK_FIND_AS_YOU_TYPE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,88,335,10
     CONTROL         "Ensure Entire Window is Visible",IDC_CHECK_ENTIRE_WINDOW_IS_VISIBLE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,109,335,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,98,335,10
     CONTROL         "Show Clips That are in Groups in Main List",IDC_CHECK_SHOW_ALL_IN_MAIN_LIST,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,119,335,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,108,335,10
     CONTROL         "Prompt when deleting clips",IDC_CHECK_PROMPT_DELETE_CLIP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,128,335,10
-    COMBOBOX        IDC_COMBO_THEME,59,142,130,95,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "About Theme",IDC_BUTTON_THEME,198,142,106,12
-    PUSHBUTTON      "Font",IDC_BUTTON_FONT,18,160,143,17
-    PUSHBUTTON      "Default Font",IDC_BUTTON_DEFAULT_FAULT,164,163,70,12
-    CONTROL         "At Caret",IDC_AT_CARET,"Button",BS_AUTORADIOBUTTON,22,195,93,10
-    CONTROL         "At Cursor",IDC_AT_CURSOR,"Button",BS_AUTORADIOBUTTON,22,205,97,10
-    CONTROL         "At Previous Position",IDC_AT_PREVIOUS,"Button",BS_AUTORADIOBUTTON,22,215,117,10
-    LTEXT           "%",IDC_STATIC,199,66,8,12,SS_CENTERIMAGE
-    GROUPBOX        "Popup Positioning",IDC_STATIC_POPUP,10,186,138,41
-    LTEXT           "  * = Don't Auto Delete\n  s = Shortcut exists\n G = Item is a Group\n  ! = Item is attached to a Group",IDC_STATIC_LEG,158,196,154,36
-    GROUPBOX        "List Item Prefix Legend",IDC_STATIC_LEGEND,153,186,165,50
-    LTEXT           "Theme",IDC_STATIC_THEME,18,142,36,12,SS_CENTERIMAGE
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,117,335,10
+    COMBOBOX        IDC_COMBO_THEME,59,131,130,95,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "About Theme",IDC_BUTTON_THEME,198,131,106,12
+    PUSHBUTTON      "Font",IDC_BUTTON_FONT,18,149,143,17
+    PUSHBUTTON      "Default Font",IDC_BUTTON_DEFAULT_FAULT,164,152,70,12
+    CONTROL         "At Caret",IDC_AT_CARET,"Button",BS_AUTORADIOBUTTON,22,184,93,10
+    CONTROL         "At Cursor",IDC_AT_CURSOR,"Button",BS_AUTORADIOBUTTON,22,194,97,10
+    CONTROL         "At Previous Position",IDC_AT_PREVIOUS,"Button",BS_AUTORADIOBUTTON,22,204,117,10
+    LTEXT           "%",IDC_STATIC,199,55,8,12,SS_CENTERIMAGE
+    GROUPBOX        "Popup Positioning",IDC_STATIC_POPUP,10,175,138,41
+    LTEXT           "  * = Don't Auto Delete\n  s = Shortcut exists\n G = Item is a Group\n  ! = Item is attached to a Group",IDC_STATIC_LEG,158,185,154,36
+    GROUPBOX        "List Item Prefix Legend",IDC_STATIC_LEGEND,153,175,165,50
+    LTEXT           "Theme",IDC_STATIC_THEME,18,131,36,12,SS_CENTERIMAGE
 END
 
 IDD_OPTIONS_KEYSTROKES DIALOGEX 0, 0, 350, 206

ClipIds.cpp

@@ -31,7 +31,7 @@ HGLOBAL CClipIDs::Render(UINT cfType)
 	if(cfType == CF_TEXT)
 	{
 		CCF_TextAggregator CFText(SepA);
-		if(AggregateData(CFText, CF_TEXT, g_Opt.m_bMultiPasteReverse && g_Opt.m_bHistoryStartTop))
+		if(AggregateData(CFText, CF_TEXT, g_Opt.m_bMultiPasteReverse))
 		{
 			return CFText.GetHGlobal();
 		}
@@ -39,7 +39,7 @@ HGLOBAL CClipIDs::Render(UINT cfType)
 	else if(cfType == CF_UNICODETEXT)
 	{
 		CCF_UnicodeTextAggregator CFUnicodeText(SepW);
-		if(AggregateData(CFUnicodeText, CF_UNICODETEXT, g_Opt.m_bMultiPasteReverse && g_Opt.m_bHistoryStartTop))
+		if(AggregateData(CFUnicodeText, CF_UNICODETEXT, g_Opt.m_bMultiPasteReverse))
 		{
 			return CFUnicodeText.GetHGlobal();
 		}
@@ -47,7 +47,7 @@ HGLOBAL CClipIDs::Render(UINT cfType)
 	else if(cfType == CF_HDROP)
 	{
 		CCF_HDropAggregator HDrop;
-		if(AggregateData(HDrop, CF_HDROP, g_Opt.m_bMultiPasteReverse && g_Opt.m_bHistoryStartTop))
+		if(AggregateData(HDrop, CF_HDROP, g_Opt.m_bMultiPasteReverse))
 		{
 			return HDrop.GetHGlobal();
 		}
@@ -55,7 +55,7 @@ HGLOBAL CClipIDs::Render(UINT cfType)
 	else if(cfType == theApp.m_HTML_Format)
 	{
 		CHTMLFormatAggregator Html(SepA);
-		if(AggregateData(Html, theApp.m_HTML_Format, g_Opt.m_bMultiPasteReverse && g_Opt.m_bHistoryStartTop))
+		if(AggregateData(Html, theApp.m_HTML_Format, g_Opt.m_bMultiPasteReverse))
 		{
 			return Html.GetHGlobal();
 		}
@@ -63,7 +63,7 @@ HGLOBAL CClipIDs::Render(UINT cfType)
 	else if(cfType == theApp.m_RTFFormat)
 	{
 		CRichTextAggregator RichText(SepA);
-		if(AggregateData(RichText, theApp.m_RTFFormat, g_Opt.m_bMultiPasteReverse && g_Opt.m_bHistoryStartTop))
+		if(AggregateData(RichText, theApp.m_RTFFormat, g_Opt.m_bMultiPasteReverse))
 		{
 			return RichText.GetHGlobal();
 		}

DittoSetup/DittoSetup_10.iss

@@ -57,13 +57,11 @@ Name: RunAtStartup; Description: Run Ditto on Windows Startup
 [Files]
 #ifdef bit64
 	Source: ..\Release64\Ditto.exe; DestDir: {app}; DestName: Ditto.exe; Flags: ignoreversion;
-	Source: ..\Release64\focus64.dll; DestDir: {app}; BeforeInstall: BeforeFocusInstall(); Flags: ignoreversion restartreplace
 	Source: ..\Release64\Addins\DittoUtil.dll; DestDir: {app}\Addins; Flags: ignoreversion
 	Source: mfc-crt64\*; DestDir: {app}      
 #endif
 #ifndef bit64
 	Source: ..\Release\Ditto.exe; DestDir: {app}; DestName: Ditto.exe; Flags: ignoreversion;
-	Source: ..\Release\focus.dll; DestDir: {app}; BeforeInstall: BeforeFocusInstall(); Flags: ignoreversion restartreplace
 	Source: ..\Addins\DittoUtil\Release\DittoUtil.dll; DestDir: {app}\Addins; Flags: ignoreversion
 	Source: mfc-crt_10\*; DestDir: {app}
 #endif
@@ -103,22 +101,6 @@ Root: HKCR; Subkey: Ditto\shell\open\command; ValueType: string; ValueName: ; Va
 
 
 [Code]
-procedure BeforeFocusInstall();
-var
-  sDir: String;
-begin
-    sDir := ExpandConstant('{app}');
-
-    DeleteFile(sDir+'\focus.dll')
-    DeleteFile(sDir+'\focus.dll.old')
-    DeleteFile(sDir+'\focus.dll.old.old')
-    DeleteFile(sDir+'\focus.dll.old.old.old')
-
-    RenameFile(sDir+'\focus.dll', sDir+'\focus.dll.old')
-    RenameFile(sDir+'\focus.dll', sDir+'\focus.dll.old.old')
-    RenameFile(sDir+'\focus.dll', sDir+'\focus.dll.old.old.old')
-end;
-
 procedure BeforeLanguageInstall();
 var
   sDir: String;

MainFrm.cpp

@@ -9,7 +9,6 @@
 #include "CopyProperties.h"
 #include "InternetUpdate.h"
 #include ".\mainfrm.h"
-#include "focusdll\focusdll.h"
 #include "HyperLink.h"
 #include "tinyxml\tinyxml.h"
 #include "Path.h"
@@ -84,12 +83,6 @@ CMainFrame::CMainFrame()
 
 CMainFrame::~CMainFrame()
 {
-    if(g_Opt.m_bUseHookDllForFocus)
-    {
-        Log(_T("Unloading focus dll for tracking focus changes"));
-        StopMonitoringFocusChanges();
-    }
-
     CGetSetOptions::SetMainHWND(0);
 }
 
@@ -112,16 +105,8 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 
     SetWindowText(_T(""));
 
-    if(g_Opt.m_bUseHookDllForFocus)
-    {
-        Log(_T("Loading hook dll to track focus changes"));
-        MonitorFocusChanges(m_hWnd, WM_FOCUS_CHANGED);
-    }
-    else
-    {
-        Log(_T("Setting polling timer to track focus"));
-        SetTimer(ACTIVE_WINDOW_TIMER, g_Opt.FocusWndTimerTimeout(), 0);
-    }
+    Log(_T("Setting polling timer to track focus"));
+    SetTimer(ACTIVE_WINDOW_TIMER, g_Opt.FocusWndTimerTimeout(), 0);
 
     SetWindowText(_T("Ditto"));
 
@@ -618,10 +603,7 @@ BOOL CMainFrame::PreTranslateMessage(MSG *pMsg)
     // target before mouse messages change the focus
     if(theApp.m_bShowingQuickPaste && WM_MOUSEFIRST <= pMsg->message && pMsg->message <= WM_MOUSELAST)
     {
-        if(g_Opt.m_bUseHookDllForFocus == false)
-        {
-            theApp.m_activeWnd.TrackActiveWnd(NULL, false);
-        }
+        theApp.m_activeWnd.TrackActiveWnd(NULL, false);
     }
 
     return CFrameWnd::PreTranslateMessage(pMsg);

OleClipSource.cpp

@@ -62,7 +62,7 @@ BOOL COleClipSource::DoImmediateRender()
 	{
 		CStringA SepA = CTextConvert::ConvertToChar(g_Opt.GetMultiPasteSeparator());
 		CCF_TextAggregator CFText(SepA);
-		if(m_ClipIDs.AggregateData(CFText, CF_TEXT, g_Opt.m_bMultiPasteReverse && g_Opt.m_bHistoryStartTop))
+		if(m_ClipIDs.AggregateData(CFText, CF_TEXT, g_Opt.m_bMultiPasteReverse))
 		{
 			CacheGlobalData(CF_TEXT, CFText.GetHGlobal());
 			bProcessedMult = TRUE;
@@ -70,7 +70,7 @@ BOOL COleClipSource::DoImmediateRender()
 
 		CStringW SepW = CTextConvert::ConvertToUnicode(g_Opt.GetMultiPasteSeparator());
 		CCF_UnicodeTextAggregator CFUnicodeText(SepW);
-		if(m_ClipIDs.AggregateData(CFUnicodeText, CF_UNICODETEXT, g_Opt.m_bMultiPasteReverse && g_Opt.m_bHistoryStartTop))
+		if(m_ClipIDs.AggregateData(CFUnicodeText, CF_UNICODETEXT, g_Opt.m_bMultiPasteReverse))
 		{
 			CacheGlobalData(CF_UNICODETEXT, CFUnicodeText.GetHGlobal());
 			bProcessedMult = TRUE;
@@ -79,21 +79,21 @@ BOOL COleClipSource::DoImmediateRender()
 		if(m_bOnlyPaste_CF_TEXT == false)
 		{
 			CCF_HDropAggregator HDrop;
-			if(m_ClipIDs.AggregateData(HDrop, CF_HDROP, g_Opt.m_bMultiPasteReverse && g_Opt.m_bHistoryStartTop))
+			if(m_ClipIDs.AggregateData(HDrop, CF_HDROP, g_Opt.m_bMultiPasteReverse))
 			{
 				CacheGlobalData(CF_HDROP, HDrop.GetHGlobal());
 				bProcessedMult = TRUE;
 			}
 
 			CRichTextAggregator RichText(SepA);
-			if(m_ClipIDs.AggregateData(RichText, theApp.m_RTFFormat, g_Opt.m_bMultiPasteReverse && g_Opt.m_bHistoryStartTop))
+			if(m_ClipIDs.AggregateData(RichText, theApp.m_RTFFormat, g_Opt.m_bMultiPasteReverse))
 			{
 				CacheGlobalData(theApp.m_RTFFormat, RichText.GetHGlobal());
 				bProcessedMult = TRUE;
 			}
 
 			CHTMLFormatAggregator Html(SepA);
-			if(m_ClipIDs.AggregateData(Html, theApp.m_HTML_Format, g_Opt.m_bMultiPasteReverse && g_Opt.m_bHistoryStartTop))
+			if(m_ClipIDs.AggregateData(Html, theApp.m_HTML_Format, g_Opt.m_bMultiPasteReverse))
 			{
 				CacheGlobalData(theApp.m_HTML_Format, Html.GetHGlobal());
 				bProcessedMult = TRUE;

Options.cpp

@@ -26,7 +26,6 @@ BOOL CGetSetOptions::m_bAllowDuplicates;
 BOOL CGetSetOptions::m_bUpdateTimeOnPaste;
 BOOL CGetSetOptions::m_bSaveMultiPaste;
 BOOL CGetSetOptions::m_bShowPersistent;
-BOOL CGetSetOptions::m_bHistoryStartTop;
 long CGetSetOptions::m_bDescTextSize;
 BOOL CGetSetOptions::m_bDescShowLeadingWhiteSpace;
 BOOL CGetSetOptions::m_bAllwaysShowDescription;
@@ -37,7 +36,6 @@ CSendClients CGetSetOptions::m_SendClients[MAX_SEND_CLIENTS];
 long CGetSetOptions::m_lAutoSendClientCount;
 CString CGetSetOptions::m_csIPListToPutOnClipboard;
 BOOL CGetSetOptions::m_bLogSendReceiveErrors;
-BOOL CGetSetOptions::m_bUseHookDllForFocus;
 BOOL CGetSetOptions::m_HideDittoOnHotKeyIfAlreadyShown;
 long CGetSetOptions::m_lPort;
 BOOL CGetSetOptions::m_bDrawThumbnail;
@@ -123,7 +121,6 @@ void CGetSetOptions::LoadSettings()
 	m_bUpdateTimeOnPaste = GetUpdateTimeOnPaste();
 	m_bSaveMultiPaste = GetSaveMultiPaste();
 	m_bShowPersistent = GetShowPersistent();
-	m_bHistoryStartTop = GetHistoryStartTop();
 	m_bDescTextSize = GetDescTextSize();
 	m_bDescShowLeadingWhiteSpace = GetDescShowLeadingWhiteSpace();
 	m_bAllwaysShowDescription = GetAllwaysShowDescription();
@@ -132,25 +129,6 @@ void CGetSetOptions::LoadSettings()
 	m_bSendPasteOnFirstTenHotKeys = GetSendPasteOnFirstTenHotKeys();
 	m_csIPListToPutOnClipboard = GetListToPutOnClipboard();
 	m_bLogSendReceiveErrors = GetLogSendReceiveErrors();
-	
-	if(IsRunningLimited() == false)
-	{
-		//If running from U3 then we can't use the hook dll because we are unable
-		//to delete the hook dll, it's loaded by other processes
-		if(m_bU3)
-		{
-			m_bUseHookDllForFocus = GetProfileLong("UseHookDllForFocus", FALSE);
-		}
-		else
-		{
-			m_bUseHookDllForFocus = GetProfileLong("UseHookDllForFocus", FALSE);
-		}
-	}
-	else
-	{
-		m_bUseHookDllForFocus = false;
-	}
-
 	m_HideDittoOnHotKeyIfAlreadyShown = GetHideDittoOnHotKeyIfAlreadyShown();
 	m_lPort = GetPort();
 	m_bDrawThumbnail = GetDrawThumbnail();
@@ -264,7 +242,6 @@ void CGetSetOptions::ConverSettingsToIni()
 	SetUpdateTimeOnPaste(GetUpdateTimeOnPaste());
 	SetSaveMultiPaste(GetSaveMultiPaste());
 	SetShowPersistent(GetShowPersistent());
-	SetHistoryStartTop(GetHistoryStartTop());
 	SetShowTextForFirstTenHotKeys(GetShowTextForFirstTenHotKeys());
 	SetMainHWND(GetMainHWND());
 	SetCaptionPos(GetCaptionPos());
@@ -1077,16 +1054,6 @@ BOOL CGetSetOptions::GetShowPersistent()
 	return GetProfileLong("ShowPersistent", 0); 
 }
 
-void CGetSetOptions::SetHistoryStartTop(BOOL bVal)	
-{	
-	SetProfileLong("HistoryStartTop", bVal); 
-	m_bHistoryStartTop = bVal; 
-}
-BOOL CGetSetOptions::GetHistoryStartTop()			
-{	
-	return GetProfileLong("HistoryStartTop", TRUE); 
-}
-
 void CGetSetOptions::SetShowTextForFirstTenHotKeys(BOOL bVal)	
 {	
 	SetProfileLong("ShowTextForFirstTenHotKeys", bVal);			

Options.h

@@ -195,10 +195,6 @@ public:
 	static void		SetShowPersistent(BOOL bVal);
 	static BOOL		GetShowPersistent();
 
-	static BOOL		m_bHistoryStartTop;
-	static void		SetHistoryStartTop(BOOL bVal);
-	static BOOL		GetHistoryStartTop();
-
 	static void		SetShowTextForFirstTenHotKeys(BOOL bVal);
 	static BOOL		GetShowTextForFirstTenHotKeys();
 
@@ -249,8 +245,6 @@ public:
 	static void		SetLogSendReceiveErrors(BOOL bOption);
 	static BOOL		GetLogSendReceiveErrors();
 
-	static BOOL		m_bUseHookDllForFocus;
-
 	static BOOL		m_HideDittoOnHotKeyIfAlreadyShown;
 	static BOOL		GetHideDittoOnHotKeyIfAlreadyShown();
 	static void		SetHideDittoOnHotKeyIfAlreadyShown(BOOL bVal);

OptionsQuickPaste.cpp

@@ -53,7 +53,6 @@ void COptionsQuickPaste::DoDataExchange(CDataExchange* pDX)
 	DDX_Control(pDX, IDC_TRANS_PERC, m_eTransparencyPercent);
 	DDX_Control(pDX, IDC_TRANSPARENCY, m_btEnableTransparency);
 	DDX_Control(pDX, IDC_CTRL_CLICK, m_btUseCtrlNum);
-	DDX_Control(pDX, IDC_HISTORY_START_TOP, m_btHistoryStartTop);
 	DDX_Control(pDX, IDC_DESC_SHOW_LEADING_WHITESPACE, m_btDescShowLeadingWhiteSpace);
 	//}}AFX_DATA_MAP
 	DDX_Control(pDX, IDC_CHECK_PROMPT_DELETE_CLIP, m_PromptForDelete);
@@ -96,7 +95,6 @@ BOOL COptionsQuickPaste::OnInitDialog()
 		CheckDlgButton(IDC_AT_PREVIOUS, BST_CHECKED);
 
 	m_btDescShowLeadingWhiteSpace.SetCheck(g_Opt.m_bDescShowLeadingWhiteSpace);
-	m_btHistoryStartTop.SetCheck(g_Opt.m_bHistoryStartTop);
 	m_btUseCtrlNum.SetCheck(CGetSetOptions::GetUseCtrlNumForFirstTenHotKeys());
 
 	m_btShowText.SetCheck(CGetSetOptions::GetShowTextForFirstTenHotKeys());
@@ -138,7 +136,6 @@ BOOL COptionsQuickPaste::OnApply()
 		CGetSetOptions::SetQuickPastePosition(POS_AT_PREVIOUS);
 
 	g_Opt.SetDescShowLeadingWhiteSpace( m_btDescShowLeadingWhiteSpace.GetCheck() );
-	g_Opt.SetHistoryStartTop( m_btHistoryStartTop.GetCheck() );
 	CGetSetOptions::SetUseCtrlNumForFirstTenHotKeys(m_btUseCtrlNum.GetCheck());
 	CGetSetOptions::SetShowTextForFirstTenHotKeys(m_btShowText.GetCheck());
 	CGetSetOptions::SetDrawThumbnail(m_btShowThumbnails.GetCheck());

OptionsQuickPaste.h

@@ -37,7 +37,6 @@ public:
 	CNumberEdit	m_eTransparencyPercent;
 	CButton	m_btEnableTransparency;
 	CButton	m_btUseCtrlNum;
-	CButton m_btHistoryStartTop;
 	CButton m_btDescShowLeadingWhiteSpace;
 	//}}AFX_DATA
 

QPasteWnd.cpp

@@ -166,8 +166,6 @@ ON_COMMAND(ID_VIEWCAPTIONBARON_TOP, OnViewcaptionbaronTop)
 ON_COMMAND(ID_MENU_AUTOHIDE, OnMenuAutohide)
 ON_COMMAND(ID_MENU_VIEWFULLDESCRIPTION, OnMenuViewfulldescription)
 ON_COMMAND(ID_MENU_ALLWAYSONTOP, OnMenuAllwaysontop)
-ON_COMMAND(ID_SORT_ASCENDING, OnSortAscending)
-ON_COMMAND(ID_SORT_DESCENDING, OnSortDescending)
 ON_COMMAND(ID_MENU_NEWGROUP, OnMenuNewGroup)
 ON_COMMAND(ID_MENU_NEWGROUPSELECTION, OnMenuNewGroupSelection)
 ON_MESSAGE(NM_GROUP_TREE_MESSAGE, OnGroupTreeMessage)
@@ -540,21 +538,10 @@ bool CQPasteWnd::Add(const CString &csHeader, const CString &csText, int nID)
 {
     int nNewIndex;
 
-    if(g_Opt.m_bHistoryStartTop)
-    {
-        // Insert the item in the list control
-        if((nNewIndex = m_lstHeader.InsertItem(m_lstHeader.GetItemCount(), csHeader)) == -1)
-        {
-            return false;
-        }
-    }
-    else
-    {
-        if((nNewIndex = m_lstHeader.InsertItem(m_lstHeader.GetItemCount(), csHeader)) == -1)
-        {
-            return false;
-        }
-    }
+    if((nNewIndex = m_lstHeader.InsertItem(m_lstHeader.GetItemCount(), csHeader)) == -1)
+	{
+		return false;
+	}
 
     m_lstHeader.SetItemData(nNewIndex, nID);
 
@@ -905,15 +892,9 @@ BOOL CQPasteWnd::FillList(CString csSQLSearch /*=""*/)
     // History Group
     if(theApp.m_GroupID < 0)
     {
-        m_lstHeader.m_bStartTop = g_Opt.m_bHistoryStartTop;
-        if(g_Opt.m_bHistoryStartTop)
-        {
-            csSort = "Main.bIsGroup ASC, Main.clipOrder DESC";
-        }
-        else
-        {
-            csSort = "Main.bIsGroup ASC, Main.clipOrder ASC";
-        }
+        m_lstHeader.m_bStartTop = true;
+        
+		csSort = "Main.bIsGroup ASC, Main.clipOrder DESC";
 
         if(g_Opt.m_bShowAllClipsInMainList)
         {
@@ -929,15 +910,8 @@ BOOL CQPasteWnd::FillList(CString csSQLSearch /*=""*/)
     {
         m_lstHeader.m_bStartTop = true;
 
-        if(g_Opt.m_bHistoryStartTop)
-        {
-            csSort = "Main.bIsGroup DESC, Main.clipGroupOrder DESC";
-        }
-        else
-        {
-            csSort = "Main.bIsGroup ASC, Main.clipGroupOrder ASC";
-        }
-
+        csSort = "Main.bIsGroup DESC, Main.clipGroupOrder DESC";
+        
         if(theApp.m_GroupID >= 0)
         {
             strFilter.Format(_T("Main.lParentID = %d"), theApp.m_GroupID);
@@ -1242,15 +1216,6 @@ void CQPasteWnd::SetMenuChecks(CMenu *pMenu)
         pMenu->CheckMenuItem(ID_MENU_AUTOHIDE, MF_CHECKED);
     }
 
-    if(g_Opt.m_bHistoryStartTop)
-    {
-        pMenu->CheckMenuItem(ID_SORT_ASCENDING, MF_CHECKED);
-    }
-    else
-    {
-        pMenu->CheckMenuItem(ID_SORT_DESCENDING, MF_CHECKED);
-    }
-
     switch(CGetSetOptions::GetCaptionPos())
     {
         case 1:
@@ -1654,7 +1619,6 @@ void CQPasteWnd::OnMenuAutohide()
 {
     bool bAutoHide = !CGetSetOptions::GetAutoHide();
     CGetSetOptions::SetAutoHide(bAutoHide);
-    SetAutoHide(bAutoHide);
 }
 
 void CQPasteWnd::OnMenuViewfulldescription()
@@ -1667,18 +1631,6 @@ void CQPasteWnd::OnMenuAllwaysontop()
     theApp.ShowPersistent(!g_Opt.m_bShowPersistent);
 }
 
-void CQPasteWnd::OnSortAscending()
-{
-    g_Opt.SetHistoryStartTop(TRUE);
-    FillList();
-}
-
-void CQPasteWnd::OnSortDescending()
-{
-    g_Opt.SetHistoryStartTop(FALSE);
-    FillList();
-}
-
 void CQPasteWnd::OnMenuNewGroup()
 {
     NewGroup(false);

QPasteWnd.h

@@ -275,8 +275,6 @@ protected:
     afx_msg void OnMenuAutohide();
     afx_msg void OnMenuViewfulldescription();
     afx_msg void OnMenuAllwaysontop();
-    afx_msg void OnSortAscending();
-    afx_msg void OnSortDescending();
     afx_msg void OnMenuNewGroup();
     afx_msg void OnMenuNewGroupSelection();
     afx_msg void OnBackButton();

WndEx.cpp

@@ -19,7 +19,6 @@ static char THIS_FILE[] = __FILE__;
 #define CLOSE_HEIGHT		11
 #define CLOSE_BORDER		2
 #define TIMER_AUTO_MAX		5
-#define TIMER_AUTO_MIN		6
 
 CWndEx::CWndEx()
 {	
@@ -100,7 +99,6 @@ int CWndEx::OnCreate(LPCREATESTRUCT lpCreateStruct)
 	m_DittoWindow.m_bDrawMinimize = false;
 	m_DittoWindow.m_bDrawMaximize = false;
 
-	SetAutoHide(CGetSetOptions::GetAutoHide());
 	SetCaptionColorActive(false, theApp.GetConnectCV());
 	m_DittoWindow.SetCaptionOn(this, CGetSetOptions::GetCaptionPos(), true);
 	SetAutoMaxDelay(CGetSetOptions::GetAutoMaxDelay());
@@ -133,18 +131,6 @@ bool CWndEx::SetCaptionColorActive(BOOL bPersistant, BOOL ConnectedToClipboard)
 	return bResult;
 }
 
-void CWndEx::SetAutoHide(BOOL bAutoHide)
-{
-	if(bAutoHide)
-	{
-		SetTimer(TIMER_AUTO_MIN, 500, NULL);
-	}
-	else
-	{
-		KillTimer(TIMER_AUTO_MIN);
-	}
-}
-
 void CWndEx::SetCaptionOn(int nPos, bool bOnstartup)
 {
 	m_DittoWindow.SetCaptionOn(this, nPos, bOnstartup);
@@ -366,29 +352,6 @@ void CWndEx::OnTimer(UINT_PTR nIDEvent)
 		KillTimer(TIMER_AUTO_MAX);
 		m_bMaxSetTimer = false;
 	}
-	else if(nIDEvent == TIMER_AUTO_MIN)
-	{
-		if((m_DittoWindow.m_bMinimized == false) && (g_Opt.m_bShowPersistent))
-		{
-			CPoint cp;
-			CRect cr;
-			
-			GetCursorPos(&cp);
-			GetWindowRect(&cr);
-			
-			if(cr.PtInRect(cp) == false)        
-			{
-				//hook dll
-				if(g_Opt.m_bUseHookDllForFocus)
-				{
-					if(theApp.m_activeWnd.DittoHasFocus() == false)
-					{
-						MinMaxWindow(FORCE_MIN);
-					}
-				}
-			}
-		}
-	}
 	
 	CWnd::OnTimer(nIDEvent);
 }

WndEx.h

@@ -36,7 +36,6 @@ public:
 public:
 	void InvalidateNc();
 	void SetCaptionOn(int nPos, bool bOnstartup = false);
-	void SetAutoHide(BOOL bAutoHide);
 	void MinMaxWindow(long lOption = SWAP_MIN_MAX);
 	void GetWindowRectEx(LPRECT lpRect);
 	bool SetCaptionColorActive(BOOL bPersistant, BOOL ConnectedToClipboard);