Made Xnote function less prominent visible in the application.

Changed some text to amke it more clear for users what Xnote does.
Added a link to the website I introduced.

Hi Jan
I'll be happy to publish new beta releases regularly.
Feel free to increase the size of the About box to allow you to put your text and link into it.
XNote Reference check: that would be great.
Maybe only show the XNote settings info in the CamStudio Recorder display area if XNote/MotionControl are connected? The less people have to try and figure out, the better ;o)
Cheers
Nick :o)

Author: janhgm

CamStudio/Recorder/AnnotationEffectsOptions.cpp

@@ -33,6 +33,8 @@ void CAnnotationEffectsOptionsDlg::DoDataExchange(CDataExchange* pDX)
 	DDX_Control(pDX, IDC_EDIT_IMAGE_PATH, m_ctlImagePath);
 	DDX_Text(pDX, IDC_EDIT_TIMESTAMP_FORMAT, m_timestamp.text);
 
+	DDX_Control(pDX, IDC_BUTTON_XNOTEREMOTECONTROLMODE, m_CheckBoxXnoteRemoteControlMode );
+
 	DDX_Text(pDX, IDC_EDIT_XNOTECAMERADELAYINMILLISEC, m_ulXnoteCameraDelayInMilliSec  );
 	DDX_Control(pDX, IDC_BUTTON_XNOTEDISPLAYCAMERADELAYMODE, m_CheckBoxXnoteDisplayCameraDelayMode );
 
@@ -57,6 +59,7 @@ void CAnnotationEffectsOptionsDlg::DoDataExchange(CDataExchange* pDX)
 	//TRACE("## -----------------------------------------------\n" );
 
 	// Init Checkboxes according the correct state
+	m_CheckBoxXnoteRemoteControlMode.SetCheck( m_bXnoteRemoteControlMode ? 1 : 0 );
 	m_CheckBoxXnoteDisplayCameraDelayMode.SetCheck( m_bXnoteDisplayCameraDelayMode ? 1 : 0 );
 	m_CheckBoxXnoteRecordDurationLimitMode.SetCheck( m_bXnoteRecordDurationLimitMode ? 1 : 0 ); 
 
@@ -69,7 +72,9 @@ BEGIN_MESSAGE_MAP(CAnnotationEffectsOptionsDlg, CDialog)
 
 	ON_EN_CHANGE(IDC_EDIT_TIMESTAMP_FORMAT, &CAnnotationEffectsOptionsDlg::OnEnChangeEditTimestampFormat)
 	ON_BN_CLICKED(IDC_BUTTON_TIMESTAMP_FORMAT_OPTIONS, OnBnClickedButtonTimestampFormatOptions)
-	
+
+	ON_BN_CLICKED(IDC_BUTTON_XNOTEREMOTECONTROLMODE, &CAnnotationEffectsOptionsDlg::OnBnClickedButtonXnoteRemoteControlMode)
+
 	ON_EN_CHANGE(IDC_EDIT_XNOTECAMERADELAYINMILLISEC, &CAnnotationEffectsOptionsDlg::OnEnChangeEditXNoteCameraDelayInMilliSec)
 	ON_BN_CLICKED(IDC_BUTTON_XNOTEDISPLAYCAMERADELAYMODE, &CAnnotationEffectsOptionsDlg::OnBnClickedXNoteDisplayCameraDelayMode)
 
@@ -185,9 +190,11 @@ void CAnnotationEffectsOptionsDlg::OnBnClickedOk()
 	}
 
 	// Convert values that are defined by buttons again to bools or other values.
+	m_bXnoteRemoteControlMode = m_CheckBoxXnoteRemoteControlMode.GetCheck() ? true : false ;
 	m_bXnoteDisplayCameraDelayMode = m_CheckBoxXnoteDisplayCameraDelayMode.GetCheck() ? true : false ;
 	m_bXnoteRecordDurationLimitMode = m_CheckBoxXnoteRecordDurationLimitMode.GetCheck() ? true : false ;
 
+	Invalidate();
 	OnOK();
 }
 
@@ -228,23 +235,6 @@ int CAnnotationEffectsOptionsDlg::OnCreate(LPCREATESTRUCT lpCreateStruct)
 		m_cXnoteDisplayFormatString = CString( cTmpBuff );
 	}
 
-/*
-	// janhgm ..  this code is now obsolete....
-	// Check if options are defined. Apply defaults, otherwise nothing will be seen.
-	if ( m_xnote.textColor == m_xnote.backgroundColor )
-	{
-		m_xnote.backgroundColor = RGB(255,255,255);
-		m_xnote.textColor = RGB(0,0,0);
-		m_xnote.logfont.lfHeight = 12;
-		m_xnote.text = m_cXnoteDisplayFormatString;
-	}
-
-	// Todo
-	// Set here al the values and action you want to msut be doen before windows are launched.
-	// Update text in Formatpreview(Timestamp) and FormatXnotepreview
-	//CAnnotationEffectsOptionsDlg::OnEnChangeFormatpreview();
-	//CAnnotationEffectsOptionsDlg::OnEnChangeFormatXnotepreview();
-*/
 	return 0;
 }
 
@@ -350,3 +340,8 @@ void CAnnotationEffectsOptionsDlg::OnEnChangeFormatpreview()
 	}
 
 }
+
+void CAnnotationEffectsOptionsDlg::OnBnClickedButtonXnoteRemoteControlMode()
+{
+	// TODO: Add your control notification handler code here
+}

CamStudio/Recorder/AnnotationEffectsOptions.h

@@ -36,6 +36,9 @@ class CAnnotationEffectsOptionsDlg : public CDialog
 	TextAttributes	m_xnote;
 	ULONG	m_ulXnoteCameraDelayInMilliSec;
 
+	CButton m_CheckBoxXnoteRemoteControlMode;
+	bool	m_bXnoteRemoteControlMode;		// A bool but says if exteral conttol functions as Xnote Stopwatch and Video Motion Alerter are enabled.
+
 	CButton m_CheckBoxXnoteDisplayCameraDelayMode;
 	bool	m_bXnoteDisplayCameraDelayMode;			// A bool but dialog requires that checkbox is a CButton.
 
@@ -67,6 +70,7 @@ class CAnnotationEffectsOptionsDlg : public CDialog
 	afx_msg void OnEnChangeFormatpreview();
 
 	afx_msg void OnEnChangeEditXNoteCameraDelayInMilliSec();
+	afx_msg void OnBnClickedButtonXnoteRemoteControlMode();
 	afx_msg void OnBnClickedXNoteDisplayCameraDelayMode();
 
 	afx_msg void OnEnChangeEditXnoteRecordDurationLimitInMilliSec();

CamStudio/Recorder/Camstudio4XNote.h

@@ -5,7 +5,7 @@
 
 // Define CAMSTUDIO4XNOTE if this is a custom build release for Xnote Stopwatch users (2010/05/28, Janhgm)
 // Setting this defines will preconfigure a few innitial settings
-#define CAMSTUDIO4XNOTE
+// #define CAMSTUDIO4XNOTE
 
 
 // Stopwatch sources applications

CamStudio/Recorder/Profile.cpp

@@ -851,8 +851,10 @@ void CProfile::InitSections()
 	// Xnote Stopwatch 
 #ifdef CAMSTUDIO4XNOTE
 	Add(m_SectionXNote, XNOTEANNOTATION, "xnoteAnnotation", true);
+	Add(m_SectionXNote, XNOTEREMOTECONTROL, "xnoteRemoteControl", true);		
 #else
 	Add(m_SectionXNote, XNOTEANNOTATION, "xnoteAnnotation", false);
+	Add(m_SectionXNote, XNOTEREMOTECONTROL, "xnoteRemoteControl", false);		
 #endif
 	Add(m_SectionXNote, XNOTEDISPLAYCAMERADELAY, "xnoteDisplayCameraDelay", true);		
 	Add(m_SectionXNote, XNOTECAMERADELAYINMILLISEC, "xnoteCameraDelayInMilliSec", 175UL);		

CamStudio/Recorder/Profile.h

@@ -199,6 +199,7 @@ enum eLegacySettings
 
 	// XNote
 	, XNOTEANNOTATION
+	, XNOTEREMOTECONTROL
 	, XNOTECAMERADELAYINMILLISEC
 	, XNOTEDISPLAYCAMERADELAY
 	, XNOTERECORDDURATIONLIMITINMILLISEC
@@ -1048,34 +1049,38 @@ struct sXNoteOpts
 	// settings here are the ones that are initially used for dialog screen..!
 	sXNoteOpts()
 #ifdef CAMSTUDIO4XNOTE
-		: m_bAnnotation(true)						// True, because I did not managed to read info from config	
+		: m_bAnnotation(true)							// True, because I did not managed to read info from config	
+		, m_bXnoteRemoteControlMode(true)				// Default On: We want that externals as Xnote and Video motion alerts are recognoized by Camstudio.
 #else
-		: m_bAnnotation(false)						// False, default as it should be with stand Camstudio
+		: m_bAnnotation(false)							// False, default as it should be with stand Camstudio
+		, m_bXnoteRemoteControlMode(false)				// Default Off: Minimize the Xnote effects in standard Camstudio
 #endif
 		, m_taXNote(BOTTOM_LEFT)
 		, m_bXnoteDisplayCameraDelayMode(true)			// Default On: Show used delay in capture
-		, m_ulXnoteCameraDelayInMilliSec(175UL)		// Average delay, default 175 ms
+		, m_ulXnoteCameraDelayInMilliSec(175UL)			// Average delay, default 175 ms
 		, m_cXnoteDisplayFormatString("(0000)..00:00:00.000")	// Default (Delay) hh:mm:ss.ttt, Not really a format. As long as the timer is not running this will be showed
 		, m_bXnoteRecordDurationLimitMode(true)			// Default On: Show used delay in capture
 		, m_ulXnoteRecordDurationLimitInMilliSec(1750UL)		// Average recording duration, default 1750 ms. Required otherwise recording lenght is zero
-		, m_ulStartXnoteTickCounter(0)				// A non persistent member
-		, m_ulSnapXnoteTickCounter(0)				// A non persistent member
-		, m_cSnapXnoteTimesString("")				// A non persistent member
+		, m_ulStartXnoteTickCounter(0)					// A non persistent member
+		, m_ulSnapXnoteTickCounter(0)					// A non persistent member
+		, m_cSnapXnoteTimesString("")					// A non persistent member
 	{
 	}
 	sXNoteOpts(const sXNoteOpts& rhs)
 // copy ala sVideoOpts
 #ifdef CAMSTUDIO4XNOTE
 		: m_bAnnotation(true)							// True, because I did not managed to read info from config	
+		, m_bXnoteRemoteControlMode(true)			// Default On: We want that externals as Xnote and Video motion alerts are recognoized by Camstudio.
 #else
 		: m_bAnnotation(false)							// False, default as it should be with stand Camstudio
+		, m_bXnoteRemoteControlMode(false)		// Default Off: Minimize the Xnote effects in standard Camstudio
 #endif
 		, m_taXNote(BOTTOM_LEFT)
-		, m_bXnoteDisplayCameraDelayMode(true)				// Default On: Show used delay in capture
+		, m_bXnoteDisplayCameraDelayMode(true)			// Default On: Show used delay in capture
 		, m_ulXnoteCameraDelayInMilliSec(175UL)			// Average delay, default 175 ms
 		, m_cXnoteDisplayFormatString("(0000)..00:00:00.000")	// Default hh:mm:ss.ttt, Not really a format. As long as the timer is not running this will be showed
 		, m_bXnoteRecordDurationLimitMode(true)			// Default On: Show used delay in capture
-		, m_ulXnoteRecordDurationLimitInMilliSec(1750UL)		// Average recordin duration, default 1750 ms
+		, m_ulXnoteRecordDurationLimitInMilliSec(1750UL)	// Average recordin duration, default 1750 ms
 		, m_ulStartXnoteTickCounter(0UL)				// A non persistent member
 		, m_ulSnapXnoteTickCounter(0UL)					// A non persistent member
 		, m_cSnapXnoteTimesString("")					// A non persistent member
@@ -1090,6 +1095,7 @@ struct sXNoteOpts
 		m_bAnnotation = rhs.m_bAnnotation;
 		m_taXNote = rhs.m_taXNote;
 
+		m_bXnoteRemoteControlMode= rhs.m_bXnoteRemoteControlMode;
 		m_bXnoteDisplayCameraDelayMode = rhs.m_bXnoteDisplayCameraDelayMode;
 		m_ulXnoteCameraDelayInMilliSec = rhs.m_ulXnoteCameraDelayInMilliSec;
 		m_cXnoteDisplayFormatString = rhs.m_cXnoteDisplayFormatString;
@@ -1116,6 +1122,7 @@ struct sXNoteOpts
 		VERIFY(cProfile.Read(XNOTEANNOTATION, m_bAnnotation));
 		VERIFY(cProfile.Read(XNOTETEXTATTRIBUTES, m_taXNote));
 
+		VERIFY(cProfile.Read(XNOTEREMOTECONTROL, m_bXnoteRemoteControlMode));
 		VERIFY(cProfile.Read(XNOTEDISPLAYCAMERADELAY, m_bXnoteDisplayCameraDelayMode));
 		VERIFY(cProfile.Read(XNOTECAMERADELAYINMILLISEC, m_ulXnoteCameraDelayInMilliSec));
 		VERIFY(cProfile.Read(XNOTEDISPLAYFORMATSTRING, m_cXnoteDisplayFormatString));
@@ -1137,6 +1144,7 @@ struct sXNoteOpts
 		//TRACE("## ----------------------------------------------------------------------------\n");			
 		//TRACE("## m_bAnnotation : [%d]\n", m_bAnnotation   );
 		//TRACE("## m_taXNote.text : [%s]\n", m_taXNote.text.GetString()   );
+		//TRACE("## m_bXnoteRemoteControlMode: [%d]\n", m_bXnoteRemoteControlMode  );
 		//TRACE("## m_bXnoteDisplayCameraDelayMode : [%d]\n", m_bXnoteDisplayCameraDelayMode   );
 		//TRACE("## m_ulXnoteCameraDelayInMilliSec : [%lu]\n", m_ulXnoteCameraDelayInMilliSec   );
 		//TRACE("## m_cXnoteDisplayFormatString : [%s]\n", m_cXnoteDisplayFormatString   );
@@ -1152,6 +1160,7 @@ struct sXNoteOpts
 		//TRACE("## ----------------------------------------------------------------------------\n");			
 		//TRACE("## m_bAnnotation : [%d]\n", m_bAnnotation   );
 		//TRACE("## m_taXNote.text : [%s]\n", m_taXNote.text.GetString()   );
+		//TRACE("## m_bXnoteRemoteControlMode: [%d]\n", m_bXnoteRemoteControlMode  );
 		//TRACE("## m_bXnoteDisplayCameraDelayMode : [%d]\n", m_bXnoteDisplayCameraDelayMode   );
 		//TRACE("## m_ulXnoteCameraDelayInMilliSec : [%lu]\n", m_ulXnoteCameraDelayInMilliSec   );
 		//TRACE("## m_cXnoteDisplayFormatString : [%s]\n", m_cXnoteDisplayFormatString   );
@@ -1174,6 +1183,7 @@ struct sXNoteOpts
 		VERIFY(cProfile.Write(XNOTEANNOTATION, m_bAnnotation));
 		VERIFY(cProfile.Write(XNOTETEXTATTRIBUTES, m_taXNote));
 
+		VERIFY(cProfile.Write(XNOTEREMOTECONTROL, m_bXnoteRemoteControlMode));
 		VERIFY(cProfile.Write(XNOTEDISPLAYCAMERADELAY, m_bXnoteDisplayCameraDelayMode));
 		VERIFY(cProfile.Write(XNOTECAMERADELAYINMILLISEC, m_ulXnoteCameraDelayInMilliSec));
 		VERIFY(cProfile.Write(XNOTEDISPLAYFORMATSTRING, m_cXnoteDisplayFormatString));
@@ -1188,6 +1198,9 @@ struct sXNoteOpts
 	bool	m_bAnnotation;
 	TextAttributes m_taXNote;
 
+	bool	m_bXnoteRemoteControlMode;
+	CButton m_CheckBoxXnoteRemoteControlMode;
+
 	bool	m_bXnoteDisplayCameraDelayMode;
 	ULONG	m_ulXnoteCameraDelayInMilliSec;
 	CButton m_CheckBoxXnoteDisplayCameraDelayMode;

CamStudio/Recorder/Recorder.cpp

@@ -58,6 +58,9 @@ class CAboutDlg : public CDialog
 	virtual BOOL OnInitDialog();
 private:
 	CStatic m_ctrlStaticVersion;
+public:
+	afx_msg void OnStnClickedStaticVersion();
+	afx_msg void OnBnClickedButtonlink3();
 };
 
 CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
@@ -79,6 +82,8 @@ BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
 	ON_BN_CLICKED(IDC_BUTTONLINK, OnButtonlink)
 	ON_BN_CLICKED(IDC_BUTTONLINK2, OnBnClickedButtonlink2)
 	//}}AFX_MSG_MAP
+	ON_STN_CLICKED(IDC_STATIC_VERSION, &CAboutDlg::OnStnClickedStaticVersion)
+	ON_BN_CLICKED(IDC_BUTTONLINK3, &CAboutDlg::OnBnClickedButtonlink3)
 END_MESSAGE_MAP()
 
 BEGIN_EVENTSINK_MAP(CAboutDlg, CDialog)
@@ -92,13 +97,19 @@ BOOL CAboutDlg::OnInitDialog()
 	// only needs to be done once.
 	CString strBuffer;
 	CString strVersionInfo;
-	strVersionInfo.Format("v%s", CURRENT_VERSION_NUMBER );
+	strVersionInfo.Format("v%s\n", CURRENT_VERSION_NUMBER );
 	CString strReleaseInfo;
-	strReleaseInfo.Format("\nBuild on SVN release: r%s", CURRENT_SVN_RELEASE_NUMBER );
+	strReleaseInfo.Format("Build on SVN release: r%s\n", CURRENT_SVN_RELEASE_NUMBER );
 
+    // CamStudio Recorder <VERSION><RELEASE><XNOTESTOPWATCHSUPPORT><BUGFIXES><COPYRIGHT-1><COPYRIGHT-2>
 	m_ctrlStaticVersion.GetWindowText(strBuffer);
 	strBuffer.Replace("<VERSION>", _T(strVersionInfo) );
 	strBuffer.Replace("<RELEASE>", _T(strReleaseInfo) );
+	strBuffer.Replace("<XNOTESTOPWATCHSUPPORT>", "\nXNoteStopwatch support coded by JanHgm (www.jahoma.nl/timereg)\n" );
+	strBuffer.Replace("<BUGFIXES>", "Bugfixes and additional features added by Nick the Geek and others.\n" );
+	strBuffer.Replace("<COPYRIGHT-1>", "\nCopyright © 2001 RenderSoft Software and Web Publishing\n" );
+	strBuffer.Replace("<COPYRIGHT-2>", "Copyright © 2008 CamStudio Group && Contributors\n" );
+
 	m_ctrlStaticVersion.SetWindowText(strBuffer);
 
 	return TRUE;  // return TRUE unless you set the focus to a control
@@ -114,7 +125,7 @@ void CAboutDlg::OnBnClickedButtonlink2()
 void CAboutDlg::OnButtonlink()
 {
 	// TODO: Add your control notification handler code here
-	::PostMessage(hWndGlobal,WM_COMMAND,ID_HELP_WEBSITE,0);
+	::PostMessage(hWndGlobal,WM_COMMAND,ID_CAMSTUDIO4XNOTE_WEBSITE,0);
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -369,3 +380,14 @@ bool CRecorderApp::RegisterWindowClass()
 	return true;
 }
 
+
+void CAboutDlg::OnStnClickedStaticVersion()
+{
+	// TODO: Add your control notification handler code here
+}
+
+void CAboutDlg::OnBnClickedButtonlink3()
+{
+	// TODO: Add your control notification handler code here
+	::PostMessage(hWndGlobal,WM_COMMAND,ID_HELP_WEBSITE,0);
+}