From 7803446ca9074a258ca0184aa9c317c47e2b8523 Mon Sep 17 00:00:00 2001 From: leo Date: Mon, 6 Mar 2006 01:17:19 +0000 Subject: Added an option to disable relative snap. git-svn-id: http://svn.leocad.org/trunk@516 c7d43263-9d01-0410-8a33-9dba5d9f93d6 --- win/LeoCAD.rc | 8 ++------ win/Prefpage.cpp | 4 ++++ win/Prefpage.h | 1 + win/resource.h | 2 ++ 4 files changed, 9 insertions(+), 6 deletions(-) (limited to 'win') diff --git a/win/LeoCAD.rc b/win/LeoCAD.rc index a6e9074..0ed73bc 100644 --- a/win/LeoCAD.rc +++ b/win/LeoCAD.rc @@ -327,9 +327,8 @@ BEGIN BEGIN MENUITEM "Insert\tIns", ID_PIECE_INSERT MENUITEM "Delete\tDel", ID_PIECE_DELETE - MENUITEM "Transform...", ID_PIECE_TRANSFORM MENUITEM "Array...", ID_PIECE_ARRAY - MENUITEM "Mirror...", ID_PIECE_MIRROR + MENUITEM "Mirror...", ID_PIECE_MIRROR, GRAYED MENUITEM "Minifig Wizard...", ID_PIECE_MINIFIGWIZARD MENUITEM "Copy Keys", ID_PIECE_COPYKEYS MENUITEM SEPARATOR @@ -477,9 +476,6 @@ BEGIN END POPUP "8" BEGIN - MENUITEM "2 Buttons", ID_LOCK_2BUTTONS - MENUITEM "3D Movement", ID_LOCK_3DMOVEMENT - MENUITEM SEPARATOR MENUITEM "Lock X", ID_LOCK_LOCKX MENUITEM "Lock Y", ID_LOCK_LOCKY MENUITEM "Lock Z", ID_LOCK_LOCKZ @@ -1010,7 +1006,7 @@ BEGIN WS_TABSTOP,7,85,49,8 EDITTEXT IDC_AIDDLG_ANGLE,57,84,20,10,ES_AUTOHSCROLL LTEXT "degrees",IDC_STATIC,79,85,27,8 - CONTROL "Mouse always moves in 3D",IDC_AIDDLG_3DMOUSE,"Button", + CONTROL "Don't allow relative snap",IDC_AIDDLG_GLOBAL,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,122,7,111,8 CONTROL "Switch to move after inserting",IDC_AIDDLG_MOVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,122,20,111,8 diff --git a/win/Prefpage.cpp b/win/Prefpage.cpp index 72f37fa..78e8b7d 100644 --- a/win/Prefpage.cpp +++ b/win/Prefpage.cpp @@ -253,6 +253,7 @@ CPreferencesDrawing::CPreferencesDrawing() : CPropertyPage(CPreferencesDrawing:: m_bSnapX = FALSE; m_bSnapY = FALSE; m_bSnapZ = FALSE; + m_bGlobal = FALSE; //}}AFX_DATA_INIT } @@ -279,6 +280,7 @@ void CPreferencesDrawing::DoDataExchange(CDataExchange* pDX) DDX_Check(pDX, IDC_AIDDLG_SNAPX, m_bSnapX); DDX_Check(pDX, IDC_AIDDLG_SNAPY, m_bSnapY); DDX_Check(pDX, IDC_AIDDLG_SNAPZ, m_bSnapZ); + DDX_Check(pDX, IDC_AIDDLG_GLOBAL, m_bGlobal); //}}AFX_DATA_MAP } @@ -306,6 +308,7 @@ void CPreferencesDrawing::SetOptions(unsigned long dwSnap, unsigned short nAngle m_bSnapX = (dwSnap & LC_DRAW_SNAP_X) != 0; m_bSnapY = (dwSnap & LC_DRAW_SNAP_Y) != 0; m_bSnapZ = (dwSnap & LC_DRAW_SNAP_Z) != 0; + m_bGlobal = (dwSnap & LC_DRAW_GLOBAL_SNAP) != 0; } void CPreferencesDrawing::GetOptions(unsigned long* dwSnap, unsigned short* nAngle, unsigned short* nGrid) @@ -326,6 +329,7 @@ void CPreferencesDrawing::GetOptions(unsigned long* dwSnap, unsigned short* nAng if (m_bSnapX) *dwSnap |= LC_DRAW_SNAP_X; if (m_bSnapY) *dwSnap |= LC_DRAW_SNAP_Y; if (m_bSnapZ) *dwSnap |= LC_DRAW_SNAP_Z; + if (m_bGlobal) *dwSnap |= LC_DRAW_GLOBAL_SNAP; } ///////////////////////////////////////////////////////////////////////////// diff --git a/win/Prefpage.h b/win/Prefpage.h index effda4a..c811ea8 100644 --- a/win/Prefpage.h +++ b/win/Prefpage.h @@ -140,6 +140,7 @@ public: BOOL m_bSnapX; BOOL m_bSnapY; BOOL m_bSnapZ; + BOOL m_bGlobal; //}}AFX_DATA diff --git a/win/resource.h b/win/resource.h index 88fbb74..328ded0 100644 --- a/win/resource.h +++ b/win/resource.h @@ -217,6 +217,7 @@ #define IDC_GENDLG_GROUP 1077 #define IDC_SCNDLG_FLOORSKY 1077 #define IDC_SCNDLG_TERRAIN 1077 +#define IDC_AIDDLG_SNAPX2 1077 #define IDC_GENDLG_SUBPARTS 1078 #define IDC_SCNDLG_SKYGRADIENT 1078 #define IDC_GENDLG_AUTOSAVE 1079 @@ -245,6 +246,7 @@ #define IDC_PROP_SUM_COMMENTS 1091 #define IDC_DETDLG_DITHER 1091 #define IDC_AIDDLG_3DMOUSE 1091 +#define IDC_AIDDLG_GLOBAL 1091 #define IDC_PROP_GEN_CREATED 1092 #define IDC_DETDLG_LIGHTING 1092 #define IDC_PROP_GEN_MODIFIED 1093 -- cgit v1.2.3