summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
Diffstat (limited to 'win')
-rw-r--r--win/LeoCAD.dsp23
-rw-r--r--win/LeoCAD.rc24
-rw-r--r--win/res/toolsbar.bmpbin2398 -> 2518 bytes
-rw-r--r--win/resource.h40
4 files changed, 68 insertions, 19 deletions
diff --git a/win/LeoCAD.dsp b/win/LeoCAD.dsp
index ddf0f5b..c82006a 100644
--- a/win/LeoCAD.dsp
+++ b/win/LeoCAD.dsp
@@ -69,7 +69,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Gi /GX /ZI /Od /I "../common" /I "../win" /D "_DEBUG" /D "WIN32" /D "LC_WINDOWS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /Gi /GX /ZI /Od /I "../common" /I "../win" /D "_DEBUG" /D "WIN32" /D "LC_WINDOWS" /D "LC_DEBUG" /Yu"stdafx.h" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -130,6 +130,10 @@ SOURCE=.\Cadview.cpp
# End Source File
# Begin Source File
+SOURCE=.\categdlg.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Clrpick.cpp
# End Source File
# Begin Source File
@@ -388,6 +392,10 @@ SOURCE=.\CADView.h
# End Source File
# Begin Source File
+SOURCE=.\categdlg.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Clrpick.h
# End Source File
# Begin Source File
@@ -1152,6 +1160,19 @@ SOURCE=..\common\curve.cpp
# End Source File
# Begin Source File
+SOURCE=..\common\debug.cpp
+
+!IF "$(CFG)" == "LeoCAD - Win32 Release"
+
+!ELSEIF "$(CFG)" == "LeoCAD - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=..\Common\file.cpp
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
diff --git a/win/LeoCAD.rc b/win/LeoCAD.rc
index 0958847..6251874 100644
--- a/win/LeoCAD.rc
+++ b/win/LeoCAD.rc
@@ -143,6 +143,7 @@ BEGIN
BUTTON ID_ACTION_CAMERA
SEPARATOR
BUTTON ID_ACTION_SELECT
+ BUTTON ID_ACTION_SELECT_REGION
BUTTON ID_ACTION_MOVE
BUTTON ID_ACTION_ROTATE
BUTTON ID_ACTION_REMOVE
@@ -1424,6 +1425,20 @@ BEGIN
GROUPBOX "Offset",IDC_STATIC,105,7,80,68
END
+IDD_CATEGORY DIALOG DISCARDABLE 0, 0, 205, 67
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Category"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "Name",IDC_STATIC,7,9,26,8
+ EDITTEXT IDC_CATDLG_NAME,45,7,100,12,ES_AUTOHSCROLL
+ LTEXT "Keywords",IDC_STATIC,7,26,33,8
+ EDITTEXT IDC_CATDLG_KEYWORDS,45,24,100,36,ES_MULTILINE |
+ ES_AUTOVSCROLL
+ DEFPUSHBUTTON "OK",IDOK,157,7,41,14
+ PUSHBUTTON "Cancel",IDCANCEL,157,26,41,14
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
@@ -1694,6 +1709,14 @@ BEGIN
TOPMARGIN, 7
BOTTOMMARGIN, 75
END
+
+ IDD_CATEGORY, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 198
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 60
+ END
END
#endif // APSTUDIO_INVOKED
@@ -2096,6 +2119,7 @@ STRINGTABLE DISCARDABLE
BEGIN
ID_FILE_IMPORTPIECE "Import a piece from LDraw"
ID_VIEW_NEWVIEW "Creates a new view window"
+ ID_ACTION_SELECT_REGION "Select objects with the mouse\nSelect Region"
END
#endif // English (U.S.) resources
diff --git a/win/res/toolsbar.bmp b/win/res/toolsbar.bmp
index 84ad134..721346d 100644
--- a/win/res/toolsbar.bmp
+++ b/win/res/toolsbar.bmp
Binary files differ
diff --git a/win/resource.h b/win/resource.h
index b5cd772..ebf83ec 100644
--- a/win/resource.h
+++ b/win/resource.h
@@ -137,6 +137,7 @@
#define IDD_LIBRARY_TEXTURES 234
#define IDD_PREFKEYBOARD 235
#define IDD_TRANSFORM 236
+#define IDD_CATEGORY 237
#define IDC_SELDLG_LIST 1000
#define IDC_SELDLG_ALL 1001
#define IDC_SELDLG_NONE 1002
@@ -383,6 +384,7 @@
#define IDC_MF_HANDR 1211
#define IDC_TEROPT_FLAT 1211
#define IDC_TRANSDLG_GY 1211
+#define IDC_CATDLG_KEYWORDS 1211
#define IDC_MF_TOOLL 1212
#define IDC_EDIT2 1212
#define IDC_SCNDLG_SOLID 1212
@@ -444,6 +446,7 @@
#define IDC_MF_SHOERSPIN 1245
#define IDC_TRANSDLG_GX 1245
#define IDC_TRANSDLG_OX 1246
+#define IDC_CATDLG_NAME 1246
#define ID_EDIT_SELECTALL 32772
#define ID_EDIT_SELECTNONE 32773
#define ID_EDIT_SELECTINVERT 32774
@@ -456,21 +459,22 @@
#define ID_VIEW_STEP_CHOOSE 32784
#define ID_VIEW_STEP_INSERT 32785
#define ID_ACTION_SELECT 32788
-#define ID_ACTION_INSERT 32789
-#define ID_ACTION_LIGHT 32790
-#define ID_ACTION_SPOTLIGHT 32791
-#define ID_ACTION_CAMERA 32792
-#define ID_ACTION_MOVE 32793
-#define ID_ACTION_ROTATE 32794
-#define ID_ACTION_REMOVE 32795
-#define ID_ACTION_PAINT 32796
-#define ID_ACTION_ZOOM 32797
-#define ID_ACTION_ZOOM_REGION 32798
-#define ID_ACTION_PAN 32799
-#define ID_ACTION_ROTATE_VIEW 32800
-#define ID_ACTION_ROLL 32801
-#define ID_ACTION_ZOOM_EXTENTS 32802
-#define ID_ZOOM_EXTENTS 32802
+#define ID_ACTION_SELECT_REGION 32789
+#define ID_ACTION_INSERT 32790
+#define ID_ACTION_LIGHT 32791
+#define ID_ACTION_SPOTLIGHT 32792
+#define ID_ACTION_CAMERA 32793
+#define ID_ACTION_MOVE 32794
+#define ID_ACTION_ROTATE 32795
+#define ID_ACTION_REMOVE 32796
+#define ID_ACTION_PAINT 32797
+#define ID_ACTION_ZOOM 32798
+#define ID_ACTION_ZOOM_REGION 32799
+#define ID_ACTION_PAN 32800
+#define ID_ACTION_ROTATE_VIEW 32801
+#define ID_ACTION_ROLL 32802
+#define ID_ACTION_ZOOM_EXTENTS 32803
+#define ID_ZOOM_EXTENTS 32807
#define ID_PIECE_GROUP 32808
#define ID_PIECE_UNGROUP 32809
#define ID_VIEW_PREFERENCES 32810
@@ -677,9 +681,9 @@
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 237
-#define _APS_NEXT_COMMAND_VALUE 33158
-#define _APS_NEXT_CONTROL_VALUE 1246
+#define _APS_NEXT_RESOURCE_VALUE 238
+#define _APS_NEXT_COMMAND_VALUE 33159
+#define _APS_NEXT_CONTROL_VALUE 1247
#define _APS_NEXT_SYMED_VALUE 121
#endif
#endif