changes to max clip size

[SAB]


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

CP_Main.rc

@@ -529,7 +529,7 @@ BEGIN
                     IDC_STATIC,7,159,336,25
 END
 
-IDD_OPTIONS_GENERAL DIALOG DISCARDABLE  0, 0, 309, 225
+IDD_OPTIONS_GENERAL DIALOG DISCARDABLE  0, 0, 295, 242
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "General"
 FONT 8, "MS Sans Serif"
@@ -556,7 +556,7 @@ BEGIN
     CONTROL         "Set Database Path",IDC_SET_DB_PATH,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,23,79,76,10
     EDITTEXT        IDC_PATH,23,89,248,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "....",IDC_GET_PATH,288,89,14,12
+    PUSHBUTTON      "....",IDC_GET_PATH,274,89,14,12
     CONTROL         "Allow Duplicates",IDC_ALLOW_DUPLICATES,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,23,118,68,10
     CONTROL         "Update Clip Time On Paste",IDC_UPDATE_TIME_ON_PASTE,
@@ -571,14 +571,14 @@ BEGIN
                     WS_TABSTOP,23,153,135,10
     LTEXT           "On copy play the sound",IDC_STATIC,24,177,81,10
     EDITTEXT        IDC_EDIT_PLAY_SOUND,105,177,145,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "....",IDC_SELECT_SOUND,288,177,14,12
+    PUSHBUTTON      "....",IDC_SELECT_SOUND,274,177,14,12
     PUSHBUTTON      "Play",IDC_BUTTON_PLAY,251,177,19,12
     CONTROL         "Paste Clip in active window after selection",
                     IDC_SEND_PASTE_MESSAGE,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,23,190,148,10
-    LTEXT           "Maximum Clip Size in Kilobytes",IDC_STATIC,23,202,96,8
-    EDITTEXT        IDC_EDIT_MAX_SIZE,121,201,26,12,ES_AUTOHSCROLL
-    LTEXT           "(Leave blank for no limit)",IDC_STATIC,151,202,78,8
+    LTEXT           "Maximum Clip Size in Bytes",IDC_STATIC,23,202,88,8
+    EDITTEXT        IDC_EDIT_MAX_SIZE,112,201,59,12,ES_AUTOHSCROLL
+    LTEXT           "(Leave blank for no limit)",IDC_STATIC,176,202,78,8
 END
 
 IDD_SELECT_DB DIALOG DISCARDABLE  0, 0, 276, 46
@@ -850,9 +850,9 @@ BEGIN
     IDD_OPTIONS_GENERAL, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 302
+        RIGHTMARGIN, 288
         TOPMARGIN, 7
-        BOTTOMMARGIN, 217
+        BOTTOMMARGIN, 234
     END
 
     IDD_SELECT_DB, DIALOG

Misc.cpp

@@ -487,7 +487,7 @@ BOOL CGetSetOptions::m_bSendPasteMessageAfterSelection;
 BOOL CGetSetOptions::m_bFindAsYouType;
 BOOL CGetSetOptions::m_bEnsureEntireWindowCanBeSeen;
 BOOL CGetSetOptions::m_bShowAllClipsInMainList;
-long CGetSetOptions::m_lMaxClipSizeInKs;
+long CGetSetOptions::m_lMaxClipSizeInBytes;
 
 CGetSetOptions g_Opt;
 
@@ -520,7 +520,7 @@ CGetSetOptions::CGetSetOptions()
 	m_bFindAsYouType = GetFindAsYouType();
 	m_bEnsureEntireWindowCanBeSeen = GetEnsureEntireWindowCanBeSeen();
 	m_bShowAllClipsInMainList = GetShowAllClipsInMainList();
-	m_lMaxClipSizeInKs = GetMaxClipSizeInKs() * 1024;
+	m_lMaxClipSizeInBytes = GetMaxClipSizeInBytes();
 
 	GetExtraNetworkPassword(true);
 	
@@ -1344,15 +1344,15 @@ BOOL CGetSetOptions::GetShowAllClipsInMainList()
 	return GetProfileLong("ShowAllClipsInMainList", TRUE);
 }
 
-long CGetSetOptions::GetMaxClipSizeInKs()
+long CGetSetOptions::GetMaxClipSizeInBytes()
 {
-	return GetProfileLong("MaxClipSizeInKs", 0);
+	return GetProfileLong("MaxClipSizeInBytes", 0);
 }
 
-void CGetSetOptions::SetMaxClipSizeInKs(long lK)
+void CGetSetOptions::SetMaxClipSizeInBytes(long lSize)
 {
-	m_lMaxClipSizeInKs = lK * 1024;
-	SetProfileLong("MaxClipSizeInKs", lK);
+	m_lMaxClipSizeInBytes = lSize;
+	SetProfileLong("MaxClipSizeInBytes", lSize);
 }
 
 /*------------------------------------------------------------------*\

Misc.h

@@ -347,9 +347,9 @@ public:
 	static void		SetExtraNetworkPassword(CString csPassword);
 	static CString	GetExtraNetworkPassword(bool bFillArray);
 
-	static long		m_lMaxClipSizeInKs;
-	static long		GetMaxClipSizeInKs();
-	static void		SetMaxClipSizeInKs(long lK);
+	static long		m_lMaxClipSizeInBytes;
+	static long		GetMaxClipSizeInBytes();
+	static void		SetMaxClipSizeInBytes(long lSize);
 
 	static CStringArray m_csNetworkPasswordArray;
 

OptionsGeneral.cpp

@@ -94,10 +94,10 @@ BOOL COptionsGeneral::OnInitDialog()
 	m_btHideDittoOnHotKey.SetCheck(g_Opt.m_HideDittoOnHotKeyIfAlreadyShown);
 	m_btSendPasteMessage.SetCheck(g_Opt.m_bSendPasteMessageAfterSelection);
 
-	if(g_Opt.m_lMaxClipSizeInKs > 0)
+	if(g_Opt.m_lMaxClipSizeInBytes > 0)
 	{
 		CString csMax;
-		csMax.Format("%d", g_Opt.m_lMaxClipSizeInKs/1024);
+		csMax.Format("%d", g_Opt.m_lMaxClipSizeInBytes);
 		m_MaxClipSize.SetWindowText(csMax);
 	}
 
@@ -149,7 +149,7 @@ BOOL COptionsGeneral::OnApply()
 
 	CString csMax;
 	m_MaxClipSize.GetWindowText(csMax);
-	g_Opt.SetMaxClipSizeInKs(atoi(csMax));
+	g_Opt.SetMaxClipSizeInBytes(atoi(csMax));
 
 	if(m_btSetDatabasePath.GetCheck() == BST_CHECKED)
 	{

ProcessCopy.cpp

@@ -326,11 +326,11 @@ bool CClip::LoadFromClipboard( CClipTypes* pClipTypes )
 			nSize = GlobalSize( cf.m_hgData );
 			if( nSize > 0 )
 			{
-				if(g_Opt.m_lMaxClipSizeInKs > 0 &&
-					nSize > g_Opt.m_lMaxClipSizeInKs)
+				if(g_Opt.m_lMaxClipSizeInBytes > 0 &&
+					nSize > g_Opt.m_lMaxClipSizeInBytes)
 				{
 					CString cs;
-					cs.Format("Maximum clip size reached max size = %d, clip size = %d", g_Opt.m_lMaxClipSizeInKs, nSize);
+					cs.Format("Maximum clip size reached max size = %d, clip size = %d", g_Opt.m_lMaxClipSizeInBytes, nSize);
 					Log(cs);
 
 					EXIT_LoadFromClipboard(false);