diff --git a/common/defines.h b/common/defines.h index 435f4c07..edcb685f 100644 --- a/common/defines.h +++ b/common/defines.h @@ -126,7 +126,7 @@ int stricmp(const char* str1, const char* str2); #define LC_DRAW_SNAP_Z 0x0020 // Snap Z #define LC_DRAW_SNAP_XYZ (LC_DRAW_SNAP_X | LC_DRAW_SNAP_Y | LC_DRAW_SNAP_Z) #define LC_DRAW_GLOBAL_SNAP 0x0040 // Don't allow relative snap. -#define LC_DRAW_MOVE 0x0080 // Switch to move after insert +//#define LC_DRAW_MOVE 0x0080 // Switch to move after insert #define LC_DRAW_LOCK_X 0x0100 // Lock X #define LC_DRAW_LOCK_Y 0x0200 // Lock Y #define LC_DRAW_LOCK_Z 0x0400 // Lock Z diff --git a/common/project.cpp b/common/project.cpp index 3817e6d2..7e2ba7e8 100644 --- a/common/project.cpp +++ b/common/project.cpp @@ -266,7 +266,7 @@ void Project::LoadDefaults(bool cameras) m_nDetail = Sys_ProfileLoadInt ("Default", "Detail", LC_DET_BRICKEDGES); SystemUpdateRenderingMode((m_nDetail & LC_DET_FAST) != 0); m_nAngleSnap = (unsigned short)Sys_ProfileLoadInt ("Default", "Angle", 30); - m_nSnap = Sys_ProfileLoadInt ("Default", "Snap", LC_DRAW_SNAP_A | LC_DRAW_SNAP_X | LC_DRAW_SNAP_Y | LC_DRAW_SNAP_Z | LC_DRAW_MOVE); + m_nSnap = Sys_ProfileLoadInt ("Default", "Snap", LC_DRAW_SNAP_A | LC_DRAW_SNAP_X | LC_DRAW_SNAP_Y | LC_DRAW_SNAP_Z); SystemUpdateSnap(m_nSnap); m_nMoveSnap = 0x0304; SystemUpdateSnap(m_nMoveSnap, m_nAngleSnap); @@ -7771,7 +7771,8 @@ void Project::OnLeftButtonDown(View* view, int x, int y, bool bControl, bool bSh SystemPieceComboAdd(m_pCurPiece->m_strDescription); SystemUpdateFocus(pPiece); - SetAction(LC_ACTION_SELECT); + if (!bControl) + SetAction(LC_ACTION_SELECT); } else if (Action == LC_ACTION_LIGHT) { diff --git a/version.mk b/version.mk index c62b4d61..16d584e0 100644 --- a/version.mk +++ b/version.mk @@ -1,5 +1,5 @@ MAJOR := 0 -MINOR := 77 +MINOR := 78 PATCHLVL := 0 VERSIONTAG := VERSION := $(MAJOR).$(MINOR).$(PATCHLVL) diff --git a/win/LeoCAD.rc b/win/LeoCAD.rc index 15c353cf..69d08a35 100644 --- a/win/LeoCAD.rc +++ b/win/LeoCAD.rc @@ -856,8 +856,7 @@ BEGIN EDITTEXT IDC_AIDDLG_ANGLE,63,105,24,12,ES_AUTOHSCROLL LTEXT "degrees",IDC_STATIC,91,107,27,8 CONTROL "Don't allow relative snap",IDC_AIDDLG_GLOBAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,11,130,8 - CONTROL "Switch to move after inserting",IDC_AIDDLG_MOVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,27,130,8 - CONTROL "Fixed direction keys",IDC_AIDDLG_FIXEDKEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,43,130,8 + CONTROL "Fixed direction keys",IDC_AIDDLG_FIXEDKEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,27,130,8 CONTROL "Lock X",IDC_AIDDLG_LOCKX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,59,130,8 CONTROL "Lock Y",IDC_AIDDLG_LOCKY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,75,130,8 CONTROL "Lock Z",IDC_AIDDLG_LOCKZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,91,130,8 @@ -1733,7 +1732,7 @@ END STRINGTABLE BEGIN ID_ACTION_SELECT "Select objects (hold CTRL down or drag the mouse to select multiple objects)\nSelect" - ID_ACTION_INSERT "Add pieces to the project\nInsert" + ID_ACTION_INSERT "Add pieces to the project (hold CTRL down to keep adding pieces)\nInsert" ID_ACTION_LIGHT "Add a positional light source\nPositional Light" ID_ACTION_SPOTLIGHT "Add a spotlight\nSpotlight" ID_ACTION_CAMERA "Create a camera\nCamera" diff --git a/win/Prefpage.cpp b/win/Prefpage.cpp index 5e62d9d7..592f5e44 100644 --- a/win/Prefpage.cpp +++ b/win/Prefpage.cpp @@ -201,7 +201,6 @@ CPreferencesDrawing::CPreferencesDrawing() : CPropertyPage(CPreferencesDrawing:: m_bLockX = FALSE; m_bLockY = FALSE; m_bLockZ = FALSE; - m_bMove = FALSE; m_bSnapA = FALSE; m_bSnapX = FALSE; m_bSnapY = FALSE; @@ -228,7 +227,6 @@ void CPreferencesDrawing::DoDataExchange(CDataExchange* pDX) DDX_Check(pDX, IDC_AIDDLG_LOCKX, m_bLockX); DDX_Check(pDX, IDC_AIDDLG_LOCKY, m_bLockY); DDX_Check(pDX, IDC_AIDDLG_LOCKZ, m_bLockZ); - DDX_Check(pDX, IDC_AIDDLG_MOVE, m_bMove); DDX_Check(pDX, IDC_AIDDLG_SNAPA, m_bSnapA); DDX_Check(pDX, IDC_AIDDLG_SNAPX, m_bSnapX); DDX_Check(pDX, IDC_AIDDLG_SNAPY, m_bSnapY); @@ -256,7 +254,6 @@ void CPreferencesDrawing::SetOptions(unsigned long dwSnap, unsigned short nAngle m_bLockX = (dwSnap & LC_DRAW_LOCK_X) != 0; m_bLockY = (dwSnap & LC_DRAW_LOCK_Y) != 0; m_bLockZ = (dwSnap & LC_DRAW_LOCK_Z) != 0; - m_bMove = (dwSnap & LC_DRAW_MOVE) != 0; m_bSnapA = (dwSnap & LC_DRAW_SNAP_A) != 0; m_bSnapX = (dwSnap & LC_DRAW_SNAP_X) != 0; m_bSnapY = (dwSnap & LC_DRAW_SNAP_Y) != 0; @@ -277,7 +274,6 @@ void CPreferencesDrawing::GetOptions(unsigned long* dwSnap, unsigned short* nAng if (m_bLockX) *dwSnap |= LC_DRAW_LOCK_X; if (m_bLockY) *dwSnap |= LC_DRAW_LOCK_Y; if (m_bLockZ) *dwSnap |= LC_DRAW_LOCK_Z; - if (m_bMove) *dwSnap |= LC_DRAW_MOVE; if (m_bSnapA) *dwSnap |= LC_DRAW_SNAP_A; if (m_bSnapX) *dwSnap |= LC_DRAW_SNAP_X; if (m_bSnapY) *dwSnap |= LC_DRAW_SNAP_Y; diff --git a/win/Prefpage.h b/win/Prefpage.h index 86b201b5..69573d39 100644 --- a/win/Prefpage.h +++ b/win/Prefpage.h @@ -125,7 +125,6 @@ public: BOOL m_bLockX; BOOL m_bLockY; BOOL m_bLockZ; - BOOL m_bMove; BOOL m_bSnapA; BOOL m_bSnapX; BOOL m_bSnapY; diff --git a/win/config.h b/win/config.h index 496b43b8..0b3b699e 100644 --- a/win/config.h +++ b/win/config.h @@ -6,10 +6,10 @@ #define _CONFIG_H_ #define LC_VERSION_MAJOR 0 -#define LC_VERSION_MINOR 77 +#define LC_VERSION_MINOR 78 #define LC_VERSION_PATCH 0 #define LC_VERSION_OSNAME "Windows" -#define LC_VERSION_TEXT "0.77" +#define LC_VERSION_TEXT "0.78" #define LC_VERSION_TAG "" #define LC_INSTALL_PREFIX "C:\\leocad" #define LC_POINTER_TO_INT(p) ((lcint32)(p))