summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorleo1999-12-08 00:37:13 +0000
committerleo1999-12-08 00:37:13 +0000
commit212f7e96ee4a5a6b87abb51e85c9a92febc0078b (patch)
tree5bb0554028190685b5f0087e4771410d092dc4ec /win
parentf5edc7c4976d67e5d1c6bf37cf1a6687d9f22f0e (diff)
Added support for saving PNG files
git-svn-id: http://svn.leocad.org/trunk@27 c7d43263-9d01-0410-8a33-9dba5d9f93d6
Diffstat (limited to 'win')
-rw-r--r--win/LeoCAD.dsp11
-rw-r--r--win/LeoCAD.rc30
-rw-r--r--win/Leocad.clw27
-rw-r--r--win/System.cpp14
-rw-r--r--win/resource.h1
5 files changed, 41 insertions, 42 deletions
diff --git a/win/LeoCAD.dsp b/win/LeoCAD.dsp
index 9c163b7..64193c9 100644
--- a/win/LeoCAD.dsp
+++ b/win/LeoCAD.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "./libpng./zlib" /I "../common" /I "../win" /I "./jpeglib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../common" /I "../win" /I "./jpeglib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -52,7 +52,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 vfw32.lib glu32.lib opengl32.lib jpeglib.lib 3dsftk.lib /nologo /subsystem:windows /map /machine:I386 /libpath:"./jpeglib/release" /libpath:"./3dsftk/release"
+# ADD LINK32 vfw32.lib glu32.lib opengl32.lib jpeglib.lib 3dsftk.lib libpng.lib zlib.lib /nologo /subsystem:windows /map /machine:I386 /libpath:"./jpeglib/release" /libpath:"./3dsftk/release" /libpath:"./libpng/release" /libpath:"./zlib/release"
!ELSEIF "$(CFG)" == "LeoCAD - Win32 Debug"
@@ -207,13 +207,6 @@ InputPath=.\hlp\LeoCAD.hpj
# Begin Source File
SOURCE=.\Leocad.rc
-
-!IF "$(CFG)" == "LeoCAD - Win32 Release"
-
-!ELSEIF "$(CFG)" == "LeoCAD - Win32 Debug"
-
-!ENDIF
-
# End Source File
# Begin Source File
diff --git a/win/LeoCAD.rc b/win/LeoCAD.rc
index b503e63..8083caa 100644
--- a/win/LeoCAD.rc
+++ b/win/LeoCAD.rc
@@ -1132,12 +1132,12 @@ BEGIN
LTEXT "Clip",IDC_MODDLG_PLANESSTATIC,40,77,15,8
END
-IDD_IMAGE DIALOG DISCARDABLE 0, 0, 212, 142
+IDD_IMAGE DIALOG DISCARDABLE 0, 0, 212, 155
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Image Options"
FONT 8, "MS Sans Serif"
BEGIN
- GROUPBOX "Pictures",IDC_STATIC,7,7,104,55
+ GROUPBOX "Pictures",IDC_STATIC,7,7,104,56
CONTROL "Single",IDC_IMGDLG_SINGLE,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,18,21,35,8
CONTROL "Multiple",IDC_IMGDLG_MULTIPLE,"Button",
@@ -1146,19 +1146,21 @@ BEGIN
EDITTEXT IDC_IMGDLG_FROM,46,44,20,10,ES_AUTOHSCROLL
LTEXT "To",IDC_STATIC,70,45,12,8
EDITTEXT IDC_IMGDLG_TO,83,44,20,10,ES_AUTOHSCROLL
- GROUPBOX "Dimensions",IDC_STATIC,7,65,104,45
- LTEXT "Width",IDC_STATIC,18,79,24,8
- EDITTEXT IDC_IMGDLG_WIDTH,49,78,20,10,ES_AUTOHSCROLL
- LTEXT "Height",IDC_STATIC,18,93,24,8
- EDITTEXT IDC_IMGDLG_HEIGHT,49,92,20,10,ES_AUTOHSCROLL
- GROUPBOX "Format",IDC_STATIC,124,7,81,128
+ GROUPBOX "Dimensions",IDC_STATIC,7,70,104,54
+ LTEXT "Width",IDC_STATIC,18,85,24,8
+ EDITTEXT IDC_IMGDLG_WIDTH,49,84,20,10,ES_AUTOHSCROLL
+ LTEXT "Height",IDC_STATIC,18,104,24,8
+ EDITTEXT IDC_IMGDLG_HEIGHT,49,103,20,10,ES_AUTOHSCROLL
+ GROUPBOX "Format",IDC_STATIC,124,7,81,141
CONTROL "Bitmap",IDC_IMGDLG_BMP,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,135,21,41,8
CONTROL "GIF",IDC_IMGDLG_GIF,"Button",BS_AUTORADIOBUTTON,135,45,
41,8
CONTROL "JPEG",IDC_IMGDLG_JPG,"Button",BS_AUTORADIOBUTTON,135,69,
41,8
- CONTROL "AVI",IDC_IMGDLG_AVI,"Button",BS_AUTORADIOBUTTON,135,105,
+ CONTROL "PNG",IDC_IMGDLG_PNG,"Button",BS_AUTORADIOBUTTON,135,104,
+ 41,8
+ CONTROL "AVI",IDC_IMGDLG_AVI,"Button",BS_AUTORADIOBUTTON,135,117,
41,8
CONTROL "High color",IDC_IMGDLG_HIGHCOLOR,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,144,33,49,8
@@ -1168,10 +1170,10 @@ BEGIN
BS_AUTOCHECKBOX | WS_TABSTOP,144,81,47,8
LTEXT "Quality",IDC_STATIC,144,93,26,9
EDITTEXT IDC_IMGDLG_QUALITY,172,92,20,10,ES_AUTOHSCROLL
- LTEXT "Pause",IDC_STATIC,144,117,26,9
- EDITTEXT IDC_IMGDLG_PAUSE,172,116,20,10,ES_AUTOHSCROLL
- DEFPUSHBUTTON "OK",IDOK,16,121,41,14
- PUSHBUTTON "Cancel",IDCANCEL,62,121,41,14
+ LTEXT "Pause",IDC_STATIC,144,129,26,9
+ EDITTEXT IDC_IMGDLG_PAUSE,172,128,20,10,ES_AUTOHSCROLL
+ DEFPUSHBUTTON "OK",IDOK,16,134,41,14
+ PUSHBUTTON "Cancel",IDCANCEL,62,134,41,14
END
IDD_SAVEDLG_TEMPLATE DIALOG DISCARDABLE 0, 0, 280, 22
@@ -1507,7 +1509,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 205
TOPMARGIN, 7
- BOTTOMMARGIN, 135
+ BOTTOMMARGIN, 148
END
IDD_EXPORTPOV, DIALOG
diff --git a/win/Leocad.clw b/win/Leocad.clw
index d71f04f..1a171a1 100644
--- a/win/Leocad.clw
+++ b/win/Leocad.clw
@@ -88,7 +88,7 @@ Resource25=IDD_PREFSCENE
Resource26=IDD_PREFPRINT
Resource27=IDD_OPENDLG_TEMPLATE
Resource28=IDD_EDIT_GROUPS
-Resource29=IDD_IMAGE
+Resource29=IDR_TOOLSBAR
Resource30=IDD_SAVEDLG_TEMPLATE
Resource31=IDD_EXPORTPOV
Resource32=IDD_SAVEPICTUREDLG_TEMPLATE
@@ -97,7 +97,7 @@ Resource34=IDD_LIBRARY
Resource35=IDD_TERRAIN
Class50=CGroupEditTree
Class51=CSortHeaderCtrl
-Resource36=IDR_TOOLSBAR
+Resource36=IDD_IMAGE
[CLS:CAboutDlg]
Type=0
@@ -557,7 +557,7 @@ Control15=IDC_HTMDLG_IMAGEOPTIONS,button,1342242816
[DLG:IDD_IMAGE]
Type=1
Class=CImageDlg
-ControlCount=26
+ControlCount=27
Control1=IDC_STATIC,button,1342177287
Control2=IDC_IMGDLG_SINGLE,button,1342308361
Control3=IDC_IMGDLG_MULTIPLE,button,1342177289
@@ -574,16 +574,17 @@ Control13=IDC_STATIC,button,1342177287
Control14=IDC_IMGDLG_BMP,button,1342308361
Control15=IDC_IMGDLG_GIF,button,1342177289
Control16=IDC_IMGDLG_JPG,button,1342177289
-Control17=IDC_IMGDLG_AVI,button,1342177289
-Control18=IDC_IMGDLG_HIGHCOLOR,button,1342242819
-Control19=IDC_IMGDLG_TRANSPARENT,button,1342242819
-Control20=IDC_IMGDLG_PROGRESSIVE,button,1342242819
-Control21=IDC_STATIC,static,1342308352
-Control22=IDC_IMGDLG_QUALITY,edit,1350631552
-Control23=IDC_STATIC,static,1342308352
-Control24=IDC_IMGDLG_PAUSE,edit,1350631552
-Control25=IDOK,button,1342242817
-Control26=IDCANCEL,button,1342242816
+Control17=IDC_IMGDLG_PNG,button,1342177289
+Control18=IDC_IMGDLG_AVI,button,1342177289
+Control19=IDC_IMGDLG_HIGHCOLOR,button,1342242819
+Control20=IDC_IMGDLG_TRANSPARENT,button,1342242819
+Control21=IDC_IMGDLG_PROGRESSIVE,button,1342242819
+Control22=IDC_STATIC,static,1342308352
+Control23=IDC_IMGDLG_QUALITY,edit,1350631552
+Control24=IDC_STATIC,static,1342308352
+Control25=IDC_IMGDLG_PAUSE,edit,1350631552
+Control26=IDOK,button,1342242817
+Control27=IDCANCEL,button,1342242816
[DLG:IDD_LIBRARY]
Type=1
diff --git a/win/System.cpp b/win/System.cpp
index b40b998..3e9ad46 100644
--- a/win/System.cpp
+++ b/win/System.cpp
@@ -1137,15 +1137,17 @@ bool SystemDoDialog(int nMode, void* param)
if ((strcmp(ext, "jpg") == 0) || (strcmp(ext, "jpeg") == 0) ||
(strcmp(ext, "bmp") == 0) || (strcmp(ext, "gif") == 0) ||
- (strcmp(ext, "avi") == 0))
+ (strcmp(ext, "png") == 0) || (strcmp(ext, "avi") == 0))
return true;
}
- switch(opts->imopts.format)
+
+ switch (opts->imopts.format)
{
- case 0: strcat(opts->filename, ".bmp"); break;
- case 1: strcat(opts->filename, ".gif"); break;
- case 2: strcat(opts->filename, ".jpg"); break;
- case 3: strcat(opts->filename, ".avi"); break;
+ case LC_IMAGE_BMP: strcat(opts->filename, ".bmp"); break;
+ case LC_IMAGE_GIF: strcat(opts->filename, ".gif"); break;
+ case LC_IMAGE_JPG: strcat(opts->filename, ".jpg"); break;
+ case LC_IMAGE_PNG: strcat(opts->filename, ".png"); break;
+ case LC_IMAGE_AVI: strcat(opts->filename, ".avi"); break;
}
return true;
diff --git a/win/resource.h b/win/resource.h
index ea6c4f6..59b87a0 100644
--- a/win/resource.h
+++ b/win/resource.h
@@ -325,6 +325,7 @@
#define IDC_IMGDLG_FROM 1162
#define IDC_IMGDLG_TO 1163
#define IDC_SAVEPICTURE_OPTIONS 1164
+#define IDC_IMGDLG_PNG 1164
#define IDC_MODDLG_STEPTO 1165
#define IDC_MODDLG_FOVSTATIC 1166
#define IDC_EDITORSTATIC 1167