summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleo2001-03-23 21:36:41 +0000
committerleo2001-03-23 21:36:41 +0000
commit1fb9b7fceb4e531f6c0dcdb989584b329b5e5107 (patch)
tree6770fb3a35bcc2213074a4162c4b91e5f15908f1
parent86a640b8111add87c17d95844896c4f34b7920da (diff)
Added an option to save HTML files with .html extension instead of .htm.
git-svn-id: http://svn.leocad.org/trunk@259 c7d43263-9d01-0410-8a33-9dba5d9f93d6
-rw-r--r--common/defines.h1
-rw-r--r--common/project.cpp57
-rw-r--r--common/typedefs.h1
-rw-r--r--docs/CHANGES.txt1
-rw-r--r--win/Htmldlg.cpp2
-rw-r--r--win/Htmldlg.h1
-rw-r--r--win/LeoCAD.rc12
-rw-r--r--win/Leocad.clw24
-rw-r--r--win/System.cpp18
-rw-r--r--win/resource.h3
10 files changed, 72 insertions, 48 deletions
diff --git a/common/defines.h b/common/defines.h
index 230f6b8..1bb7057 100644
--- a/common/defines.h
+++ b/common/defines.h
@@ -179,6 +179,7 @@ unsigned long SwapLONG(unsigned long x)
#define LC_HTML_LISTEND 0x08
#define LC_HTML_LISTSTEP 0x10
#define LC_HTML_HIGHLIGHT 0x20
+#define LC_HTML_HTMLEXT 0x40
// Bounding box owner (FIXME: cleanup)
typedef enum { LC_PIECE, LC_CAMERA, LC_CAMERA_TARGET,
diff --git a/common/project.cpp b/common/project.cpp
index cd4636d..692a6cc 100644
--- a/common/project.cpp
+++ b/common/project.cpp
@@ -3438,11 +3438,12 @@ void Project::HandleCommand(LC_COMMANDS id, unsigned long nParam)
opts.listend = (ul & LC_HTML_LISTEND) != 0;
opts.liststep = (ul & LC_HTML_LISTSTEP) != 0;
opts.highlight = (ul & LC_HTML_HIGHLIGHT) != 0;
+ opts.htmlext = (ul & LC_HTML_HTMLEXT) != 0;
if (SystemDoDialog(LC_DLG_HTML, &opts))
{
FILE* f;
- char* ext, fn[LC_MAXPATH];
+ char *ext, *htmlext, fn[LC_MAXPATH];
int i;
unsigned short last = GetLastStep();
@@ -3454,6 +3455,7 @@ void Project::HandleCommand(LC_COMMANDS id, unsigned long nParam)
if (opts.listend) ul |= LC_HTML_LISTEND;
if (opts.liststep) ul |= LC_HTML_LISTSTEP;
if (opts.highlight) ul |= LC_HTML_HIGHLIGHT;
+ if (opts.htmlext) ul |= LC_HTML_HTMLEXT;
Sys_ProfileSaveInt ("Default", "HTML Options", ul);
// Save image options
@@ -3477,6 +3479,11 @@ void Project::HandleCommand(LC_COMMANDS id, unsigned long nParam)
case LC_IMAGE_PNG: ext = ".png"; break;
}
+ if (opts.htmlext)
+ htmlext = ".html";
+ else
+ htmlext = ".htm";
+
i = strlen (opts.path);
if (i && opts.path[i] != '/' && opts.path[i] != '\\')
strcat (opts.path, "/");
@@ -3509,11 +3516,11 @@ void Project::HandleCommand(LC_COMMANDS id, unsigned long nParam)
if (opts.singlepage)
{
- strcpy(fn, opts.path);
- strcat(fn, m_strTitle);
- strcat(fn, ".htm");
- f = fopen(fn, "wt");
- fprintf(f, "<HTML>\n<HEAD>\n<TITLE>Instructions for %s</TITLE>\n</HEAD>\n<BR>\n<CENTER>\n", m_strTitle);
+ strcpy (fn, opts.path);
+ strcat (fn, m_strTitle);
+ strcat (fn, htmlext);
+ f = fopen (fn, "wt");
+ fprintf (f, "<HTML>\n<HEAD>\n<TITLE>Instructions for %s</TITLE>\n</HEAD>\n<BR>\n<CENTER>\n", m_strTitle);
for (i = 1; i <= last; i++)
{
@@ -3534,18 +3541,19 @@ void Project::HandleCommand(LC_COMMANDS id, unsigned long nParam)
{
if (opts.index)
{
- strcpy(fn, opts.path);
- strcat(fn, m_strTitle);
- strcat(fn, "-index.htm");
- f = fopen(fn, "wt");
+ strcpy (fn, opts.path);
+ strcat (fn, m_strTitle);
+ strcat (fn, "-index");
+ strcat (fn, htmlext);
+ f = fopen (fn, "wt");
fprintf(f, "<HTML>\n<HEAD>\n<TITLE>Instructions for %s</TITLE>\n</HEAD>\n<BR>\n<CENTER>\n", m_strTitle);
for (i = 1; i <= last; i++)
- fprintf(f, "<A HREF=\"%s-%02d.htm\">Step %d<BR>\n</A>", m_strTitle, i, i);
+ fprintf(f, "<A HREF=\"%s-%02d%s\">Step %d<BR>\n</A>", m_strTitle, i, htmlext, i);
if (opts.listend)
- fprintf(f, "<A HREF=\"%s-pieces.htm\">Pieces Used</A><BR>\n", m_strTitle);
+ fprintf(f, "<A HREF=\"%s-pieces%s\">Pieces Used</A><BR>\n", m_strTitle, htmlext);
fputs("</CENTER>\n<BR><HR><BR><B><I>Created by <A HREF=\"http://www.leocad.org\">LeoCAD</A></B></I><BR></HTML>\n", f);
fclose(f);
@@ -3554,7 +3562,7 @@ void Project::HandleCommand(LC_COMMANDS id, unsigned long nParam)
// Create each step
for (i = 1; i <= last; i++)
{
- sprintf(fn, "%s%s-%02d.htm", opts.path, m_strTitle, i);
+ sprintf(fn, "%s%s-%02d%s", opts.path, m_strTitle, i, htmlext);
f = fopen(fn, "wt");
fprintf(f, "<HTML>\n<HEAD>\n<TITLE>%s - Step %02d</TITLE>\n</HEAD>\n<BR>\n<CENTER>\n", m_strTitle, i);
@@ -3566,16 +3574,16 @@ void Project::HandleCommand(LC_COMMANDS id, unsigned long nParam)
fputs("</CENTER>\n<BR><HR><BR>", f);
if (i != 1)
- fprintf(f, "<A HREF=\"%s-%02d.htm\">Previous</A> ", m_strTitle, i-1);
+ fprintf(f, "<A HREF=\"%s-%02d%s\">Previous</A> ", m_strTitle, i-1, htmlext);
if (opts.index)
- fprintf(f, "<A HREF=\"%s-index.htm\">Index</A> ", m_strTitle);
+ fprintf(f, "<A HREF=\"%s-index%s\">Index</A> ", m_strTitle, htmlext);
if (i != last)
- fprintf(f, "<A HREF=\"%s-%02d.htm\">Next</A>", m_strTitle, i+1);
+ fprintf(f, "<A HREF=\"%s-%02d%s\">Next</A>", m_strTitle, i+1, htmlext);
else
if (opts.listend)
- fprintf(f, "<A HREF=\"%s-pieces.htm\">Pieces Used</A>", m_strTitle);
+ fprintf(f, "<A HREF=\"%s-pieces%s\">Pieces Used</A>", m_strTitle, htmlext);
fputs("<BR></HTML>\n",f);
fclose(f);
@@ -3583,19 +3591,20 @@ void Project::HandleCommand(LC_COMMANDS id, unsigned long nParam)
if (opts.listend)
{
- strcpy(fn, opts.path);
- strcat(fn, m_strTitle);
- strcat(fn, "-pieces.htm");
- f = fopen(fn, "wt");
- fprintf(f, "<HTML>\n<HEAD>\n<TITLE>Pieces used by %s</TITLE>\n</HEAD>\n<BR>\n<CENTER>\n", m_strTitle);
+ strcpy (fn, opts.path);
+ strcat (fn, m_strTitle);
+ strcat (fn, "-pieces");
+ strcat (fn, htmlext);
+ f = fopen (fn, "wt");
+ fprintf (f, "<HTML>\n<HEAD>\n<TITLE>Pieces used by %s</TITLE>\n</HEAD>\n<BR>\n<CENTER>\n", m_strTitle);
CreateHTMLPieceList(f, 0, opts.images, ext);
fputs("</CENTER>\n<BR><HR><BR>", f);
- fprintf(f, "<A HREF=\"%s-%02d.htm\">Previous</A> ", m_strTitle, i-1);
+ fprintf(f, "<A HREF=\"%s-%02d%s\">Previous</A> ", m_strTitle, i-1, htmlext);
if (opts.index)
- fprintf(f, "<A HREF=\"%s-index.htm\">Index</A> ", m_strTitle);
+ fprintf(f, "<A HREF=\"%s-index%s\">Index</A> ", m_strTitle, htmlext);
fputs("<BR></HTML>\n",f);
fclose(f);
diff --git a/common/typedefs.h b/common/typedefs.h
index 96772ed..c595756 100644
--- a/common/typedefs.h
+++ b/common/typedefs.h
@@ -249,6 +249,7 @@ typedef struct
bool listend;
bool liststep;
bool highlight;
+ bool htmlext;
LC_IMAGEDLG_OPTS imdlg;
} LC_HTMLDLG_OPTS;
diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index cc0c2dd..ad0755d 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -2,6 +2,7 @@ This is a changelog for developers only, not for ordinary users.
23/03/2001
- Update object keys when adding/removing steps.
+ - Added an option to save HTML files with .html extension instead of .htm.
21/03/2001
- Improved Linux About dialog.
diff --git a/win/Htmldlg.cpp b/win/Htmldlg.cpp
index 7e73511..88864e7 100644
--- a/win/Htmldlg.cpp
+++ b/win/Htmldlg.cpp
@@ -30,6 +30,7 @@ CHTMLDlg::CHTMLDlg(void* param, CWnd* pParent /*=NULL*/)
m_bListEnd = FALSE;
m_bListStep = FALSE;
m_bHighlight = FALSE;
+ m_bHtmlExt = FALSE;
//}}AFX_DATA_INIT
}
@@ -45,6 +46,7 @@ void CHTMLDlg::DoDataExchange(CDataExchange* pDX)
DDX_Check(pDX, IDC_HTMDLG_LIST_END, m_bListEnd);
DDX_Check(pDX, IDC_HTMDLG_LIST_STEP, m_bListStep);
DDX_Check(pDX, IDC_HTMDLG_HIGHLIGHT, m_bHighlight);
+ DDX_Check(pDX, IDC_HTMLDLG_HTMLEXT, m_bHtmlExt);
//}}AFX_DATA_MAP
}
diff --git a/win/Htmldlg.h b/win/Htmldlg.h
index fb4af17..de5b4f2 100644
--- a/win/Htmldlg.h
+++ b/win/Htmldlg.h
@@ -26,6 +26,7 @@ public:
BOOL m_bListEnd;
BOOL m_bListStep;
BOOL m_bHighlight;
+ BOOL m_bHtmlExt;
//}}AFX_DATA
diff --git a/win/LeoCAD.rc b/win/LeoCAD.rc
index 5b1b219..cc01cb0 100644
--- a/win/LeoCAD.rc
+++ b/win/LeoCAD.rc
@@ -924,7 +924,7 @@ BEGIN
WS_GROUP
END
-IDD_HTML DIALOG DISCARDABLE 0, 0, 187, 159
+IDD_HTML DIALOG DISCARDABLE 0, 0, 187, 172
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "HTML Options"
FONT 8, "MS Sans Serif"
@@ -946,9 +946,11 @@ BEGIN
104,60,8
CONTROL "Highlight new pieces",IDC_HTMDLG_HIGHLIGHT,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,128,84,8
- LTEXT "Output folder",IDC_STATIC,7,143,46,8
- EDITTEXT IDC_HTMDLG_OUTPUT,56,142,112,10,ES_AUTOHSCROLL
- PUSHBUTTON "...",IDC_HTMDLG_BROWSEFOLDER,172,142,8,10
+ CONTROL "Use .html extension",IDC_HTMLDLG_HTMLEXT,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,140,100,8
+ LTEXT "Output folder",IDC_STATIC,7,156,46,8
+ EDITTEXT IDC_HTMDLG_OUTPUT,55,155,112,10,ES_AUTOHSCROLL
+ PUSHBUTTON "...",IDC_HTMDLG_BROWSEFOLDER,172,155,8,10
DEFPUSHBUTTON "OK",IDOK,139,11,41,14
PUSHBUTTON "Cancel",IDCANCEL,139,28,41,14
PUSHBUTTON "Images...",IDC_HTMDLG_IMAGEOPTIONS,139,45,41,14
@@ -1499,7 +1501,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 180
TOPMARGIN, 7
- BOTTOMMARGIN, 152
+ BOTTOMMARGIN, 165
END
IDD_PROGRESS, DIALOG
diff --git a/win/Leocad.clw b/win/Leocad.clw
index 2f88430..ec8bce1 100644
--- a/win/Leocad.clw
+++ b/win/Leocad.clw
@@ -2,7 +2,7 @@
[General Info]
Version=1
-LastClass=CCADView
+LastClass=CHTMLDlg
LastTemplate=CHeaderCtrl
NewFileInclude1=#include "stdafx.h"
NewFileInclude2=#include "leocad.h"
@@ -80,7 +80,7 @@ Resource17=IDD_SELECT_OBJECTS
Resource18=IDD_ARRAY
Resource19=IDD_STEP
Resource20=IDD_MINIFIG
-Resource21=IDD_HTML
+Resource21=IDR_MAINFRAME
Resource22=IDD_PROGRESS
Resource23=IDR_PIECEEDITOR
Resource24=IDD_PREFGENERAL
@@ -97,7 +97,7 @@ Resource34=IDD_SAVEPICTUREDLG_TEMPLATE
Resource35=IDD_PIECEEDITOR
Class50=CGroupEditTree
Class51=CSortHeaderCtrl
-Resource36=IDR_MAINFRAME
+Resource36=IDD_HTML
[CLS:CAboutDlg]
Type=0
@@ -191,6 +191,9 @@ Type=0
BaseClass=CDialog
HeaderFile=Htmldlg.h
ImplementationFile=Htmldlg.cpp
+Filter=D
+VirtualFilter=dWC
+LastObject=CHTMLDlg
[CLS:CImageDlg]
Type=0
@@ -569,7 +572,7 @@ Control3=IDCANCEL,button,1342242816
[DLG:IDD_HTML]
Type=1
Class=CHTMLDlg
-ControlCount=15
+ControlCount=16
Control1=IDC_STATIC,button,1342177287
Control2=IDC_HTMDLG_SINGLEPAGE,button,1342308361
Control3=IDC_HTMDLG_ONESTEP,button,1342177289
@@ -579,12 +582,13 @@ Control6=IDC_HTMDLG_LIST_STEP,button,1342242819
Control7=IDC_HTMDLG_LIST_END,button,1342242819
Control8=IDC_HTMDLG_LISTIMAGES,button,1476591619
Control9=IDC_HTMDLG_HIGHLIGHT,button,1342242819
-Control10=IDC_STATIC,static,1342308352
-Control11=IDC_HTMDLG_OUTPUT,edit,1350631552
-Control12=IDC_HTMDLG_BROWSEFOLDER,button,1342242816
-Control13=IDOK,button,1342242817
-Control14=IDCANCEL,button,1342242816
-Control15=IDC_HTMDLG_IMAGEOPTIONS,button,1342242816
+Control10=IDC_HTMLDLG_HTMLEXT,button,1342242819
+Control11=IDC_STATIC,static,1342308352
+Control12=IDC_HTMDLG_OUTPUT,edit,1350631552
+Control13=IDC_HTMDLG_BROWSEFOLDER,button,1342242816
+Control14=IDOK,button,1342242817
+Control15=IDCANCEL,button,1342242816
+Control16=IDC_HTMDLG_IMAGEOPTIONS,button,1342242816
[DLG:IDD_IMAGE]
Type=1
diff --git a/win/System.cpp b/win/System.cpp
index c26e71d..1c20773 100644
--- a/win/System.cpp
+++ b/win/System.cpp
@@ -1173,14 +1173,15 @@ bool SystemDoDialog(int nMode, void* param)
LC_HTMLDLG_OPTS* opts = (LC_HTMLDLG_OPTS*)param;
CHTMLDlg dlg(&opts->imdlg);
- dlg.m_nLayout = opts->singlepage ? 0 : 1;
- dlg.m_bIndex = opts->index;
- dlg.m_bImages = opts->images;
- dlg.m_bListEnd = opts->listend;
- dlg.m_bListStep = opts->liststep;
- dlg.m_bHighlight = opts->highlight;
-
- if (dlg.DoModal() == IDOK)
+ dlg.m_nLayout = opts->singlepage ? 0 : 1;
+ dlg.m_bIndex = opts->index;
+ dlg.m_bImages = opts->images;
+ dlg.m_bListEnd = opts->listend;
+ dlg.m_bListStep = opts->liststep;
+ dlg.m_bHighlight = opts->highlight;
+ dlg.m_bHtmlExt = opts->htmlext;
+
+ if (dlg.DoModal() == IDOK)
{
strcpy(opts->path, dlg.m_strFolder);
opts->singlepage = (dlg.m_nLayout == 0);
@@ -1189,6 +1190,7 @@ bool SystemDoDialog(int nMode, void* param)
opts->listend = dlg.m_bListEnd == TRUE;
opts->liststep = dlg.m_bListStep == TRUE;
opts->highlight = dlg.m_bHighlight == TRUE;
+ opts->htmlext = dlg.m_bHtmlExt == TRUE;
return true;
}
} break;
diff --git a/win/resource.h b/win/resource.h
index 0f3b12f..779ebab 100644
--- a/win/resource.h
+++ b/win/resource.h
@@ -395,6 +395,7 @@
#define IDC_MF_HEADANGLE 1221
#define IDC_MF_NECKANGLE 1222
#define IDC_MF_ARMLANGLE 1223
+#define IDC_HTMLDLG_HTMLEXT 1223
#define IDC_MF_ARMRANGLE 1224
#define IDC_MF_HANDLANGLE 1225
#define IDC_MF_HANDRANGLE 1226
@@ -649,7 +650,7 @@
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 234
#define _APS_NEXT_COMMAND_VALUE 33155
-#define _APS_NEXT_CONTROL_VALUE 1223
+#define _APS_NEXT_CONTROL_VALUE 1224
#define _APS_NEXT_SYMED_VALUE 121
#endif
#endif