[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 1308
Date : Tue Jun 13 11:58:53 BST 2006
Changed paths:
M /Trunk/XaraLX/wxOil/xsepsops.cpp
M /Trunk/XaraLX/wxOil/xsepsops.h
Ran normalise.pl on 2 new files
Diff:
Index: Trunk/XaraLX/wxOil/xsepsops.h
===================================================================
--- Trunk/XaraLX/wxOil/xsepsops.h (revision 1307)
+++ Trunk/XaraLX/wxOil/xsepsops.h (revision 1308)
@@ -1,38 +1,134 @@
-// $Header: /camelot/winoil/XSEPSOPS.H 3 1/06/95 14:03 Markn $
-// Header for dlg that controls the XS EPS options
-
-#ifndef INC_XSEPSOPS
-#define INC_XSEPSOPS
-
-/********************************************************************************************
-
-> class XSEPSExportOptions : public CDialog
-
- Author: Markn
- Created: 26/5/95
- Purpose: This gets options relevant to the export of XS EPS
- SeeAlso:
-
-********************************************************************************************/
-
-class XSEPSExportOptions : public CDialog
-{
-public:
- XSEPSExportOptions::XSEPSExportOptions();
- virtual ~XSEPSExportOptions() { }
-
- virtual void OnOK();
- virtual BOOL OnInitDialog();
-
-protected:
- //{{AFX_MSG(XSEPSExportOptions)
- afx_msg BOOL OnCommand(UINT GadgetID);
- //}}AFX_MSG
- DECLARE_MESSAGE_MAP()
-
-private:
- DECLARE_DYNAMIC(XSEPSExportOptions)
-};
-
-
-#endif // INC_XSEPSOPS
+// $Id: wxOil/xsepsops.h, 1, 01-Jan-2006, Anonymous $
+/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
+================================XARAHEADERSTART===========================
+
+ Xara LX, a vector drawing and manipulation program.
+ Copyright (C) 1993-2006 Xara Group Ltd.
+ Copyright on certain contributions may be held in joint with their
+ respective authors. See AUTHORS file for details.
+
+LICENSE TO USE AND MODIFY SOFTWARE
+----------------------------------
+
+This file is part of Xara LX.
+
+Xara LX is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 2 as published
+by the Free Software Foundation.
+
+Xara LX and its component source files are distributed in the hope
+that it will be useful, but WITHOUT ANY WARRANTY; without even the
+implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with Xara LX (see the file GPL in the root directory of the
+distribution); if not, write to the Free Software Foundation, Inc., 51
+Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+ADDITIONAL RIGHTS
+-----------------
+
+Conditional upon your continuing compliance with the GNU General Public
+License described above, Xara Group Ltd grants to you certain additional
+rights.
+
+The additional rights are to use, modify, and distribute the software
+together with the wxWidgets library, the wxXtra library, and the "CDraw"
+library and any other such library that any version of Xara LX relased
+by Xara Group Ltd requires in order to compile and execute, including
+the static linking of that library to XaraLX. In the case of the
+"CDraw" library, you may satisfy obligation under the GNU General Public
+License to provide source code by providing a binary copy of the library
+concerned and a copy of the license accompanying it.
+
+Nothing in this section restricts any of the rights you have under
+the GNU General Public License.
+
+
+SCOPE OF LICENSE
+----------------
+
+This license applies to this program (XaraLX) and its constituent source
+files only, and does not necessarily apply to other Xara products which may
+in part share the same code base, and are subject to their own licensing
+terms.
+
+This license does not apply to files in the wxXtra directory, which
+are built into a separate library, and are subject to the wxWindows
+license contained within that directory in the file "WXXTRA-LICENSE".
+
+This license does not apply to the binary libraries (if any) within
+the "libs" directory, which are subject to a separate license contained
+within that directory in the file "LIBS-LICENSE".
+
+
+ARRANGEMENTS FOR CONTRIBUTION OF MODIFICATIONS
+----------------------------------------------
+
+Subject to the terms of the GNU Public License (see above), you are
+free to do whatever you like with your modifications. However, you may
+(at your option) wish contribute them to Xara's source tree. You can
+find details of how to do this at:
+ http://www.xaraxtreme.org/developers/
+
+Prior to contributing your modifications, you will need to complete our
+contributor agreement. This can be found at:
+ http://www.xaraxtreme.org/developers/contribute/
+
+Please note that Xara will not accept modifications which modify any of
+the text between the start and end of this header (marked
+XARAHEADERSTART and XARAHEADEREND).
+
+
+MARKS
+-----
+
+Xara, Xara LX, Xara X, Xara X/Xtreme, Xara Xtreme, the Xtreme and Xara
+designs are registered or unregistered trademarks, design-marks, and/or
+service marks of Xara Group Ltd. All rights in these marks are reserved.
+
+
+ Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
+ http://www.xara.com/
+
+=================================XARAHEADEREND============================
+ */
+// Header for dlg that controls the XS EPS options
+
+#ifndef INC_XSEPSOPS
+#define INC_XSEPSOPS
+
+/********************************************************************************************
+
+> class XSEPSExportOptions : public CDialog
+
+ Author: Mark_Neves (Xara Group Ltd) <camelotdev@xxxxxxxx>
+ Created: 26/5/95
+ Purpose: This gets options relevant to the export of XS EPS
+ SeeAlso:
+
+********************************************************************************************/
+
+class XSEPSExportOptions : public CDialog
+{
+public:
+ XSEPSExportOptions::XSEPSExportOptions();
+ virtual ~XSEPSExportOptions() { }
+
+ virtual void OnOK();
+ virtual BOOL OnInitDialog();
+
+protected:
+ //{{AFX_MSG(XSEPSExportOptions)
+ afx_msg BOOL OnCommand(UINT32 GadgetID);
+ //}}AFX_MSG
+ DECLARE_MESSAGE_MAP()
+
+private:
+ DECLARE_DYNAMIC(XSEPSExportOptions)
+};
+
+
+#endif // INC_XSEPSOPS
Index: Trunk/XaraLX/wxOil/xsepsops.cpp
===================================================================
--- Trunk/XaraLX/wxOil/xsepsops.cpp (revision 1307)
+++ Trunk/XaraLX/wxOil/xsepsops.cpp (revision 1308)
@@ -1,162 +1,258 @@
-// $Header: /Camelot/winoil/xsepsops.cpp 2 23/03/04 12:01p Alex $
-//
-// XSEPSExportOptions - implements the options relevant to the export of XS EPS
-
-/*
-*/
-
-#include "camtypes.h"
-#include "xsepsops.h"
-#include "printdlg.h"
-#include "mainfrm.h"
-#include "epsfiltr.h"
-#include "markn.h"
-#include "resource.h"
-#include "helpuser.h"
-
-DECLARE_SOURCE("$Revision: 2 $");
-
-//---------------------------------
-
-BEGIN_MESSAGE_MAP(XSEPSExportOptions,CDialog)
- //{{AFX_MSG_MAP(CPrintDialog)
- ON_COMMAND_EX(IDC_XSEPSOPSHELP, OnCommand)
- //}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-IMPLEMENT_DYNAMIC(XSEPSExportOptions,CDialog)
-
-//---------------------------------
-
-#define new CAM_DEBUG_NEW
-
-/********************************************************************************************
-
-> XSEPSExportOptions::XSEPSExportOptions()
-
- Author: Markn
- Created: 30/5/95
- Inputs: -
- Returns: -
- Purpose: Constructs the dlg.
- SeeAlso: -
-
-********************************************************************************************/
-
-XSEPSExportOptions::XSEPSExportOptions() : CDialog(IDD_XSEPSOPS, GetMainFrame())
-{
-}
-
-
-/********************************************************************************************
-
-> BOOL XSEPSExportOptions::OnInitDialog()
-
- Author: Markn
- Created: 30/5/95
- Inputs: -
- Returns: TRUE if OK, FALSE otherwise
- Purpose: Inits the dialog's controls, and calls the base classes OnInitDialog() function
- SeeAlso: -
-
-********************************************************************************************/
-
-BOOL XSEPSExportOptions::OnInitDialog()
-{
- if (CDialog::OnInitDialog())
- {
- TCHAR s[256];
- wsprintf(s, TEXT("%d"), (int) EPSFilter::XSEPSExportDPI);
- SetDlgItemText(IDC_DPIEDIT, s);
-
- /*
- CheckDlgButton(IDC_PSLEVELAUTO, EPSFilter::XSEPSExportPSType == 0);
- CheckDlgButton(IDC_PSLEVEL1, EPSFilter::XSEPSExportPSType == 1);
- CheckDlgButton(IDC_PSLEVEL2, EPSFilter::XSEPSExportPSType == 2);
- */
-
- CheckDlgButton(IDC_EXPORTTEXTASCURVES, EPSFilter::XSEPSExportTextAsCurves);
-
- return TRUE;
- }
- else
- return FALSE;
-}
-
-/********************************************************************************************
-
-> void XSEPSExportOptions::OnOK()
-
- Author: Markn
- Created: 31/5/95
- Inputs: -
- Returns: -
- Purpose: Overrides the default OnOK() func so that we can check the values set by the user.
- If dodgy values have been put in, the user is warned.
- SeeAlso: -
-
-********************************************************************************************/
-
-void XSEPSExportOptions::OnOK()
-{
- // DPI ed field
- BOOL TranslatedOK;
- UINT DPI = GetDlgItemInt(IDC_DPIEDIT,&TranslatedOK,FALSE);
- if (!TranslatedOK || DPI < 10)
- DPI = 10;
-
- if (DPI > 600)
- DPI = 600;
-
- if (DPI > 300)
- {
- int b = InformWarning(IDS_EXPORT_BIGDPI,IDS_OK,IDS_CANCEL);
- if (b != 1)
- return;
- }
-
- /*
- // Job 10463: remove PS Level bits - default to Level 2
- int ps = 0;
- if (IsDlgButtonChecked(IDC_PSLEVEL1))
- ps = 1;
- if (IsDlgButtonChecked(IDC_PSLEVEL2))
- ps = 2;
- */
-
- EPSFilter::XSEPSExportDPI = DPI;
- // EPSFilter::XSEPSExportPSType = ps;
-
- EPSFilter::XSEPSExportTextAsCurves = IsDlgButtonChecked(IDC_EXPORTTEXTASCURVES);
-
- CDialog::OnOK();
-}
-
-/********************************************************************************************
-
-> BOOL XSEPSExportOptions::OnCommand()
-
- Author: Markn
- Created: 1/6/95
- Inputs: -
- Returns: TRUE if all ok, FALSE if an error occurs
- Purpose: Called when something happends to one of our controls
-
- Only used to trap Help button events, at the moment
-
- SeeAlso: -
-
-********************************************************************************************/
-
-BOOL XSEPSExportOptions::OnCommand(UINT GadgetID)
-{
- switch (GadgetID)
- {
- case IDC_XSEPSOPSHELP:
- HelpUser(*this);
- break;
- }
-
- return TRUE;
-}
-
+// $Id: wxOil/xsepsops.cpp, 1, 01-Jan-2006, Anonymous $
+/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
+================================XARAHEADERSTART===========================
+
+ Xara LX, a vector drawing and manipulation program.
+ Copyright (C) 1993-2006 Xara Group Ltd.
+ Copyright on certain contributions may be held in joint with their
+ respective authors. See AUTHORS file for details.
+
+LICENSE TO USE AND MODIFY SOFTWARE
+----------------------------------
+
+This file is part of Xara LX.
+
+Xara LX is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 2 as published
+by the Free Software Foundation.
+
+Xara LX and its component source files are distributed in the hope
+that it will be useful, but WITHOUT ANY WARRANTY; without even the
+implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with Xara LX (see the file GPL in the root directory of the
+distribution); if not, write to the Free Software Foundation, Inc., 51
+Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+ADDITIONAL RIGHTS
+-----------------
+
+Conditional upon your continuing compliance with the GNU General Public
+License described above, Xara Group Ltd grants to you certain additional
+rights.
+
+The additional rights are to use, modify, and distribute the software
+together with the wxWidgets library, the wxXtra library, and the "CDraw"
+library and any other such library that any version of Xara LX relased
+by Xara Group Ltd requires in order to compile and execute, including
+the static linking of that library to XaraLX. In the case of the
+"CDraw" library, you may satisfy obligation under the GNU General Public
+License to provide source code by providing a binary copy of the library
+concerned and a copy of the license accompanying it.
+
+Nothing in this section restricts any of the rights you have under
+the GNU General Public License.
+
+
+SCOPE OF LICENSE
+----------------
+
+This license applies to this program (XaraLX) and its constituent source
+files only, and does not necessarily apply to other Xara products which may
+in part share the same code base, and are subject to their own licensing
+terms.
+
+This license does not apply to files in the wxXtra directory, which
+are built into a separate library, and are subject to the wxWindows
+license contained within that directory in the file "WXXTRA-LICENSE".
+
+This license does not apply to the binary libraries (if any) within
+the "libs" directory, which are subject to a separate license contained
+within that directory in the file "LIBS-LICENSE".
+
+
+ARRANGEMENTS FOR CONTRIBUTION OF MODIFICATIONS
+----------------------------------------------
+
+Subject to the terms of the GNU Public License (see above), you are
+free to do whatever you like with your modifications. However, you may
+(at your option) wish contribute them to Xara's source tree. You can
+find details of how to do this at:
+ http://www.xaraxtreme.org/developers/
+
+Prior to contributing your modifications, you will need to complete our
+contributor agreement. This can be found at:
+ http://www.xaraxtreme.org/developers/contribute/
+
+Please note that Xara will not accept modifications which modify any of
+the text between the start and end of this header (marked
+XARAHEADERSTART and XARAHEADEREND).
+
+
+MARKS
+-----
+
+Xara, Xara LX, Xara X, Xara X/Xtreme, Xara Xtreme, the Xtreme and Xara
+designs are registered or unregistered trademarks, design-marks, and/or
+service marks of Xara Group Ltd. All rights in these marks are reserved.
+
+
+ Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
+ http://www.xara.com/
+
+=================================XARAHEADEREND============================
+ */
+//
+// XSEPSExportOptions - implements the options relevant to the export of XS EPS
+
+/*
+*/
+
+#include "camtypes.h"
+#include "xsepsops.h"
+//#include "printdlg.h"
+#include "mainfrm.h"
+#include "epsfiltr.h"
+//#include "markn.h"
+//#include "resource.h"
+#include "helpuser.h"
+
+DECLARE_SOURCE("$Revision: 2 $");
+
+//---------------------------------
+
+BEGIN_MESSAGE_MAP(XSEPSExportOptions,CDialog)
+ //{{AFX_MSG_MAP(CPrintDialog)
+ ON_COMMAND_EX(_R(IDC_XSEPSOPSHELP), OnCommand)
+ //}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+IMPLEMENT_DYNAMIC(XSEPSExportOptions,CDialog)
+
+//---------------------------------
+
+#define new CAM_DEBUG_NEW
+
+/********************************************************************************************
+
+> XSEPSExportOptions::XSEPSExportOptions()
+
+ Author: Mark_Neves (Xara Group Ltd) <camelotdev@xxxxxxxx>
+ Created: 30/5/95
+ Inputs: -
+ Returns: -
+ Purpose: Constructs the dlg.
+ SeeAlso: -
+
+********************************************************************************************/
+
+XSEPSExportOptions::XSEPSExportOptions() : CDialog(_R(IDD_XSEPSOPS), GetMainFrame())
+{
+}
+
+
+/********************************************************************************************
+
+> BOOL XSEPSExportOptions::OnInitDialog()
+
+ Author: Mark_Neves (Xara Group Ltd) <camelotdev@xxxxxxxx>
+ Created: 30/5/95
+ Inputs: -
+ Returns: TRUE if OK, FALSE otherwise
+ Purpose: Inits the dialog's controls, and calls the base classes OnInitDialog() function
+ SeeAlso: -
+
+********************************************************************************************/
+
+BOOL XSEPSExportOptions::OnInitDialog()
+{
+ if (CDialog::OnInitDialog())
+ {
+ TCHAR s[256];
+ wsprintf(s, TEXT("%d"), (INT32) EPSFilter::XSEPSExportDPI);
+ SetDlgItemText(_R(IDC_DPIEDIT), s);
+
+ /*
+ CheckDlgButton(_R(IDC_PSLEVELAUTO), EPSFilter::XSEPSExportPSType == 0);
+ CheckDlgButton(_R(IDC_PSLEVEL1), EPSFilter::XSEPSExportPSType == 1);
+ CheckDlgButton(_R(IDC_PSLEVEL2), EPSFilter::XSEPSExportPSType == 2);
+ */
+
+ CheckDlgButton(_R(IDC_EXPORTTEXTASCURVES), EPSFilter::XSEPSExportTextAsCurves);
+
+ return TRUE;
+ }
+ else
+ return FALSE;
+}
+
+/********************************************************************************************
+
+> void XSEPSExportOptions::OnOK()
+
+ Author: Mark_Neves (Xara Group Ltd) <camelotdev@xxxxxxxx>
+ Created: 31/5/95
+ Inputs: -
+ Returns: -
+ Purpose: Overrides the default OnOK() func so that we can check the values set by the user.
+ If dodgy values have been put in, the user is warned.
+ SeeAlso: -
+
+********************************************************************************************/
+
+void XSEPSExportOptions::OnOK()
+{
+ // DPI ed field
+ BOOL TranslatedOK;
+ UINT32 DPI = GetDlgItemInt(_R(IDC_DPIEDIT),&TranslatedOK,FALSE);
+ if (!TranslatedOK || DPI < 10)
+ DPI = 10;
+
+ if (DPI > 600)
+ DPI = 600;
+
+ if (DPI > 300)
+ {
+ INT32 b = InformWarning(_R(IDS_EXPORT_BIGDPI),_R(IDS_OK),_R(IDS_CANCEL));
+ if (b != 1)
+ return;
+ }
+
+ /*
+ // Job 10463: remove PS Level bits - default to Level 2
+ INT32 ps = 0;
+ if (IsDlgButtonChecked(_R(IDC_PSLEVEL1)))
+ ps = 1;
+ if (IsDlgButtonChecked(_R(IDC_PSLEVEL2)))
+ ps = 2;
+ */
+
+ EPSFilter::XSEPSExportDPI = DPI;
+ // EPSFilter::XSEPSExportPSType = ps;
+
+ EPSFilter::XSEPSExportTextAsCurves = IsDlgButtonChecked(_R(IDC_EXPORTTEXTASCURVES));
+
+ CDialog::OnOK();
+}
+
+/********************************************************************************************
+
+> BOOL XSEPSExportOptions::OnCommand()
+
+ Author: Mark_Neves (Xara Group Ltd) <camelotdev@xxxxxxxx>
+ Created: 1/6/95
+ Inputs: -
+ Returns: TRUE if all ok, FALSE if an error occurs
+ Purpose: Called when something happends to one of our controls
+
+ Only used to trap Help button events, at the moment
+
+ SeeAlso: -
+
+********************************************************************************************/
+
+BOOL XSEPSExportOptions::OnCommand(UINT32 GadgetID)
+{
+ switch (GadgetID)
+ {
+ case _R(IDC_XSEPSOPSHELP):
+ HelpUser(*this);
+ break;
+ }
+
+ return TRUE;
+}
+
Xara