- Update to v2.5b1

Author: felfert

CamStudio/EffectsOptions.cpp

@@ -0,0 +1,73 @@
+// EffectsOptions.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "vscap.h"
+#include "EffectsOptions.h"
+#include ".\effectsoptions.h"
+
+
+// CEffectsOptions dialog
+
+IMPLEMENT_DYNAMIC(CEffectsOptions, CDialog)
+CEffectsOptions::CEffectsOptions(CWnd* pParent /*=NULL*/)
+	: CDialog(CEffectsOptions::IDD, pParent)
+//	, m_Position(TOP_LEFT)
+{
+}
+
+CEffectsOptions::~CEffectsOptions()
+{
+}
+
+void CEffectsOptions::DoDataExchange(CDataExchange* pDX)
+{
+	int* pPos = (int*)(&m_params.position);
+	int& pos = *pPos;
+	CDialog::DoDataExchange(pDX);
+	//DDX_Radio(pDX, IDC_RADIO_TOP_LEFT, m_Position);
+	DDX_Radio(pDX, IDC_RADIO_TOP_LEFT, pos);
+}
+
+
+BEGIN_MESSAGE_MAP(CEffectsOptions, CDialog)
+	ON_BN_CLICKED(IDC_BUTTON_BACKGROUND_COLOR, OnBnClickedButtonBackgroundColor)
+	ON_BN_CLICKED(IDC_BUTTON_TEXT_COLOR, OnBnClickedButtonTextColor)
+	ON_BN_CLICKED(IDC_BUTTON_FONT, OnBnClickedButtonFont)
+END_MESSAGE_MAP()
+
+
+// CEffectsOptions message handlers
+
+void CEffectsOptions::OnBnClickedButtonBackgroundColor()
+{
+	// TODO: Add your control notification handler code here
+	CColorDialog dlg;
+	dlg.m_cc.Flags |= CC_FULLOPEN | CC_RGBINIT;
+	dlg.m_cc.rgbResult = m_params.backgroundColor;
+	if(dlg.DoModal() == IDOK){
+		m_params.backgroundColor = dlg.GetColor();
+	}
+}
+
+void CEffectsOptions::OnBnClickedButtonTextColor()
+{
+	// TODO: Add your control notification handler code here
+	CColorDialog dlg;
+	dlg.m_cc.Flags |= CC_FULLOPEN | CC_RGBINIT;
+	dlg.m_cc.rgbResult = m_params.textColor;
+	if(dlg.DoModal() == IDOK){
+		m_params.textColor = dlg.GetColor();
+	}
+}
+
+
+void CEffectsOptions::OnBnClickedButtonFont()
+{
+	// TODO: Add your control notification handler code here
+	CFontDialog dlg(&m_params.logfont);
+	if(dlg.DoModal() == IDOK){
+		memcpy(&m_params.logfont, dlg.m_cf.lpLogFont, sizeof(LOGFONT));
+		m_params.isFontSelected = 1;
+	}
+}

CamStudio/EffectsOptions.h

@@ -0,0 +1,60 @@
+#pragma once
+//#include "annotationeffectsoptions.h"
+
+
+// CEffectsOptions dialog
+
+enum Position {
+	TOP_LEFT = 0,
+	TOP_CENTER = 1,
+	TOP_RIGHT = 2,
+	CENTER_LEFT = 3,
+	CENTER_CENTER = 4,
+	CENTER_RIGHT = 5,
+	BOTTOM_LEFT = 6,
+	BOTTOM_CENTER = 7,
+	BOTTOM_RIGHT = 8,
+};
+
+struct TextAttributes
+{
+	Position position;
+	CString text;
+	COLORREF backgroundColor;
+	COLORREF textColor;
+	int isFontSelected;
+	LOGFONT logfont;
+	const TextAttributes& operator=(const TextAttributes& obj)
+	{
+		text = obj.text;
+		memcpy(&logfont, &obj.logfont, sizeof(LOGFONT));
+		isFontSelected = obj.isFontSelected;
+		backgroundColor = obj.backgroundColor;
+		textColor = obj.textColor;
+		position = obj.position;
+		return *this;
+	}
+};
+
+class CEffectsOptions : public CDialog
+{
+	DECLARE_DYNAMIC(CEffectsOptions)
+
+public:
+	CEffectsOptions(CWnd* pParent = NULL);   // standard constructor
+	virtual ~CEffectsOptions();
+
+// Dialog Data
+	enum { IDD = IDD_EFFECTS_OPTIONS };
+
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+
+	DECLARE_MESSAGE_MAP()
+public:
+	afx_msg void OnBnClickedButtonBackgroundColor();
+	afx_msg void OnBnClickedButtonTextColor();
+	afx_msg void OnBnClickedButtonFont();
+	//int m_Position;
+	TextAttributes m_params;
+};

CamStudio/EffectsOptions2.cpp

@@ -0,0 +1,34 @@
+// EffectsOptions2.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "vscap.h"
+#include "EffectsOptions2.h"
+
+
+// CEffectsOptions2 dialog
+
+IMPLEMENT_DYNAMIC(CEffectsOptions2, CDialog)
+CEffectsOptions2::CEffectsOptions2(CWnd* pParent /*=NULL*/)
+	: CDialog(CEffectsOptions2::IDD, pParent)
+{
+}
+
+CEffectsOptions2::~CEffectsOptions2()
+{
+}
+
+void CEffectsOptions2::DoDataExchange(CDataExchange* pDX)
+{
+	int* pPos = (int*)(&m_params.position);
+	int& pos = *pPos;
+	CDialog::DoDataExchange(pDX);
+	DDX_Radio(pDX, IDC_RADIO_TOP_LEFT, pos);
+}
+
+
+BEGIN_MESSAGE_MAP(CEffectsOptions2, CDialog)
+END_MESSAGE_MAP()
+
+
+// CEffectsOptions2 message handlers

CamStudio/EffectsOptions2.h

@@ -0,0 +1,36 @@
+#pragma once
+
+#include "EffectsOptions.h"
+
+struct ImageAttributes
+{
+	Position position;
+	CString text;
+	const ImageAttributes& operator=(const ImageAttributes& obj)
+	{
+		text = obj.text;
+		position = obj.position;
+		return *this;
+	}
+};
+
+// CEffectsOptions2 dialog
+
+class CEffectsOptions2 : public CDialog
+{
+	DECLARE_DYNAMIC(CEffectsOptions2)
+
+public:
+	CEffectsOptions2(CWnd* pParent = NULL);   // standard constructor
+	virtual ~CEffectsOptions2();
+
+// Dialog Data
+	enum { IDD = IDD_EFFECTS_OPTIONS2 };
+
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+
+	DECLARE_MESSAGE_MAP()
+public:
+	ImageAttributes m_params;
+};