summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorleo2001-03-23 21:36:41 +0000
committerleo2001-03-23 21:36:41 +0000
commit1fb9b7fceb4e531f6c0dcdb989584b329b5e5107 (patch)
tree6770fb3a35bcc2213074a4162c4b91e5f15908f1 /win
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
Diffstat (limited to 'win')
-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
6 files changed, 36 insertions, 24 deletions
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