summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/defines.h2
-rw-r--r--common/project.cpp2
-rw-r--r--linux/dialogs.cpp23
-rw-r--r--win/LeoCAD.rc14
-rw-r--r--win/Prefpage.cpp8
-rw-r--r--win/Prefpage.h3
6 files changed, 12 insertions, 40 deletions
diff --git a/common/defines.h b/common/defines.h
index c00a06a..84a8e56 100644
--- a/common/defines.h
+++ b/common/defines.h
@@ -162,7 +162,7 @@ int stricmp(const char* str1, const char* str2);
#define LC_DRAW_LOCK_Z 0x0400 // Lock Z
#define LC_DRAW_LOCK_XYZ (LC_DRAW_LOCK_X | LC_DRAW_LOCK_Y | LC_DRAW_LOCK_Z)
#define LC_DRAW_MOVEAXIS 0x0800 // Move on fixed axis
-#define LC_DRAW_PREVIEW 0x1000 // Show piece position
+//#define LC_DRAW_PREVIEW 0x1000 // Show piece position
#define LC_DRAW_CM_UNITS 0x2000 // Use centimeters
#define LC_DRAW_3DMOUSE 0x4000 // Mouse moves in all directions
diff --git a/common/project.cpp b/common/project.cpp
index 7c402b1..f6d3239 100644
--- a/common/project.cpp
+++ b/common/project.cpp
@@ -316,7 +316,7 @@ void Project::LoadDefaults(bool cameras)
m_nDetail = Sys_ProfileLoadInt ("Default", "Detail", LC_DET_BRICKEDGES);
SystemUpdateRenderingMode((m_nDetail & LC_DET_BACKGROUND) != 0, (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 | LC_DRAW_PREVIEW);
+ 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);
SystemUpdateSnap(m_nSnap);
m_nMoveSnap = 0x0304;
SystemUpdateSnap(m_nMoveSnap, m_nAngleSnap);
diff --git a/linux/dialogs.cpp b/linux/dialogs.cpp
index aa9a158..0321107 100644
--- a/linux/dialogs.cpp
+++ b/linux/dialogs.cpp
@@ -1530,9 +1530,9 @@ typedef struct
GtkWidget *det_edges, *det_dither, *det_lighting, *det_smooth;
GtkWidget *det_antialias, *det_linear, *det_fast;
GtkWidget *det_solid, *det_hidden, *det_background, *det_width;
- GtkWidget *draw_grid, *draw_gridunits, *draw_axis, *draw_preview;
+ GtkWidget *draw_grid, *draw_gridunits, *draw_axis;
GtkWidget *draw_snapx, *draw_snapy, *draw_snapz, *draw_angle;
- GtkWidget *draw_anglesnap, *draw_centimeter, *draw_collision;
+ GtkWidget *draw_anglesnap, *draw_centimeter;
GtkWidget *draw_move, *draw_fixed;
GtkWidget *draw_lockx, *draw_locky, *draw_lockz;
GtkWidget *scn_solid, *scn_gradient, *scn_image, *scn_imagename;
@@ -1563,7 +1563,7 @@ static void preferencesdlg_ok (GtkWidget *widget, gpointer data)
int grid_size, angle_snap;
if (GTK_TOGGLE_BUTTON (s->draw_grid)->active) snap |= LC_DRAW_GRID;
if (GTK_TOGGLE_BUTTON (s->draw_axis)->active) snap |= LC_DRAW_AXIS;
- if (GTK_TOGGLE_BUTTON (s->draw_preview)->active) snap |= LC_DRAW_PREVIEW;
+// if (GTK_TOGGLE_BUTTON (s->draw_preview)->active) snap |= LC_DRAW_PREVIEW;
if (GTK_TOGGLE_BUTTON (s->draw_snapx)->active) snap |= LC_DRAW_SNAP_X;
if (GTK_TOGGLE_BUTTON (s->draw_snapy)->active) snap |= LC_DRAW_SNAP_Y;
if (GTK_TOGGLE_BUTTON (s->draw_snapz)->active) snap |= LC_DRAW_SNAP_Z;
@@ -1626,7 +1626,7 @@ static void preferencesdlg_default (GtkWidget *widget, gpointer data)
int grid_size, angle_snap;
if (GTK_TOGGLE_BUTTON (s->draw_grid)->active) snap |= LC_DRAW_GRID;
if (GTK_TOGGLE_BUTTON (s->draw_axis)->active) snap |= LC_DRAW_AXIS;
- if (GTK_TOGGLE_BUTTON (s->draw_preview)->active) snap |= LC_DRAW_PREVIEW;
+// if (GTK_TOGGLE_BUTTON (s->draw_preview)->active) snap |= LC_DRAW_PREVIEW;
if (GTK_TOGGLE_BUTTON (s->draw_snapx)->active) snap |= LC_DRAW_SNAP_X;
if (GTK_TOGGLE_BUTTON (s->draw_snapy)->active) snap |= LC_DRAW_SNAP_Y;
if (GTK_TOGGLE_BUTTON (s->draw_snapz)->active) snap |= LC_DRAW_SNAP_Z;
@@ -1819,11 +1819,6 @@ int preferencesdlg_execute(void* param)
gtk_table_attach (GTK_TABLE (table), s.draw_axis, 0, 1, 1, 2,
(GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), 0, 0);
- s.draw_preview = gtk_check_button_new_with_label ("Preview position");
- gtk_widget_show (s.draw_preview);
- gtk_table_attach (GTK_TABLE (table), s.draw_preview, 0, 1, 2, 3,
- (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), 0, 0);
-
s.draw_snapx = gtk_check_button_new_with_label ("Snap X");
gtk_widget_show (s.draw_snapx);
gtk_table_attach (GTK_TABLE (table), s.draw_snapx, 0, 1, 3, 4,
@@ -1863,12 +1858,6 @@ int preferencesdlg_execute(void* param)
gtk_table_attach (GTK_TABLE (table), s.draw_centimeter, 0, 1, 7, 8,
(GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), 0, 0);
- s.draw_collision = gtk_check_button_new_with_label ("Collision detection");
- gtk_widget_show (s.draw_collision);
- gtk_table_attach (GTK_TABLE (table), s.draw_collision, 1, 2, 0, 1,
- (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), 0, 0);
- gtk_widget_set_sensitive (s.draw_collision, FALSE);
-
s.draw_move = gtk_check_button_new_with_label ("Switch to move after insert");
gtk_widget_show (s.draw_move);
gtk_table_attach (GTK_TABLE (table), s.draw_move, 1, 2, 1, 2,
@@ -2115,8 +2104,8 @@ int preferencesdlg_execute(void* param)
(opts->nSnap & LC_DRAW_GRID) ? TRUE : FALSE);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (s.draw_axis),
(opts->nSnap & LC_DRAW_AXIS) ? TRUE : FALSE);
- gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (s.draw_preview),
- (opts->nSnap & LC_DRAW_PREVIEW) ? TRUE : FALSE);
+// gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (s.draw_preview),
+// (opts->nSnap & LC_DRAW_PREVIEW) ? TRUE : FALSE);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (s.draw_snapx),
(opts->nSnap & LC_DRAW_SNAP_X) ? TRUE : FALSE);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (s.draw_snapy),
diff --git a/win/LeoCAD.rc b/win/LeoCAD.rc
index 4ce66da..3398ff2 100644
--- a/win/LeoCAD.rc
+++ b/win/LeoCAD.rc
@@ -993,8 +993,8 @@ BEGIN
LTEXT "units",IDC_STATIC,76,7,16,8
CONTROL "Axis icon",IDC_AIDDLG_AXIS,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,20,42,8
- CONTROL "Preview position",IDC_AIDDLG_PREVIEW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,33,64,8
+ CONTROL "Centimeter units",IDC_AIDDLG_CENTIMETERS,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,33,70,8
CONTROL "Snap X",IDC_AIDDLG_SNAPX,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,46,42,8
CONTROL "Snap Y",IDC_AIDDLG_SNAPY,"Button",BS_AUTOCHECKBOX |
@@ -1005,10 +1005,8 @@ 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 "Centimeter units",IDC_AIDDLG_CENTIMETERS,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,98,70,8
- CONTROL "Collision detection",IDC_AIDDLG_COLLISION,"Button",
- BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,122,7,111,8
+ CONTROL "Mouse always moves in 3D",IDC_AIDDLG_3DMOUSE,"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
CONTROL "Fixed direction keys",IDC_AIDDLG_FIXEDKEYS,"Button",
@@ -1019,8 +1017,6 @@ BEGIN
WS_TABSTOP,122,59,111,8
CONTROL "Lock Z",IDC_AIDDLG_LOCKZ,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,122,72,111,8
- CONTROL "Mouse always moves in 3D",IDC_AIDDLG_3DMOUSE,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,122,85,111,8
END
IDD_PREFDETAIL DIALOG DISCARDABLE 0, 0, 240, 114
@@ -1040,8 +1036,6 @@ BEGIN
BS_AUTOCHECKBOX | WS_TABSTOP,7,59,97,8
CONTROL "Linear filtering",IDC_DETDLG_LINEAR,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,72,97,8
- CONTROL "Screen door transparency",IDC_DETDLG_NOALPHA,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,85,97,8
CONTROL "Fast rendering",IDC_DETDLG_FAST,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,120,7,96,8
CONTROL "Draw solid boxes",IDC_DETDLG_SOLID,"Button",
diff --git a/win/Prefpage.cpp b/win/Prefpage.cpp
index ed40138..f0ff261 100644
--- a/win/Prefpage.cpp
+++ b/win/Prefpage.cpp
@@ -140,7 +140,6 @@ CPreferencesDetail::CPreferencesDetail() : CPropertyPage(CPreferencesDetail::IDD
m_bFast = FALSE;
m_bHidden = FALSE;
m_bSolid = FALSE;
- m_bNoAlpha = FALSE;
//}}AFX_DATA_INIT
}
@@ -164,7 +163,6 @@ void CPreferencesDetail::DoDataExchange(CDataExchange* pDX)
DDX_Check(pDX, IDC_DETDLG_FAST, m_bFast);
DDX_Check(pDX, IDC_DETDLG_HIDDEN, m_bHidden);
DDX_Check(pDX, IDC_DETDLG_SOLID, m_bSolid);
- DDX_Check(pDX, IDC_DETDLG_NOALPHA, m_bNoAlpha);
//}}AFX_DATA_MAP
}
@@ -244,7 +242,6 @@ CPreferencesDrawing::CPreferencesDrawing() : CPropertyPage(CPreferencesDrawing::
m_nAngle = 0;
m_bAxis = FALSE;
m_bCentimeters = FALSE;
- m_bCollision = FALSE;
m_bFixed = FALSE;
m_bGrid = FALSE;
m_nGridSize = 0;
@@ -252,7 +249,6 @@ CPreferencesDrawing::CPreferencesDrawing() : CPropertyPage(CPreferencesDrawing::
m_bLockY = FALSE;
m_bLockZ = FALSE;
m_bMove = FALSE;
- m_bPreview = FALSE;
m_bSnapA = FALSE;
m_bSnapX = FALSE;
m_bSnapY = FALSE;
@@ -273,7 +269,6 @@ void CPreferencesDrawing::DoDataExchange(CDataExchange* pDX)
DDV_MinMaxInt(pDX, m_nAngle, 1, 180);
DDX_Check(pDX, IDC_AIDDLG_AXIS, m_bAxis);
DDX_Check(pDX, IDC_AIDDLG_CENTIMETERS, m_bCentimeters);
- DDX_Check(pDX, IDC_AIDDLG_COLLISION, m_bCollision);
DDX_Check(pDX, IDC_AIDDLG_FIXEDKEYS, m_bFixed);
DDX_Check(pDX, IDC_AIDDLG_GRID, m_bGrid);
DDX_Text(pDX, IDC_AIDDLG_GRIDSIZE, m_nGridSize);
@@ -281,7 +276,6 @@ void CPreferencesDrawing::DoDataExchange(CDataExchange* pDX)
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_PREVIEW, m_bPreview);
DDX_Check(pDX, IDC_AIDDLG_SNAPA, m_bSnapA);
DDX_Check(pDX, IDC_AIDDLG_SNAPX, m_bSnapX);
DDX_Check(pDX, IDC_AIDDLG_SNAPY, m_bSnapY);
@@ -311,7 +305,6 @@ void CPreferencesDrawing::SetOptions(unsigned long dwSnap, unsigned short nAngle
m_bLockY = (dwSnap & LC_DRAW_LOCK_Y) != 0;
m_bLockZ = (dwSnap & LC_DRAW_LOCK_Z) != 0;
m_bMove = (dwSnap & LC_DRAW_MOVE) != 0;
- m_bPreview = (dwSnap & LC_DRAW_PREVIEW) != 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;
@@ -334,7 +327,6 @@ void CPreferencesDrawing::GetOptions(unsigned long* dwSnap, unsigned short* nAng
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_bPreview) *dwSnap |= LC_DRAW_PREVIEW;
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 4231f51..bf3a6b5 100644
--- a/win/Prefpage.h
+++ b/win/Prefpage.h
@@ -86,7 +86,6 @@ public:
BOOL m_bFast;
BOOL m_bHidden;
BOOL m_bSolid;
- BOOL m_bNoAlpha;
//}}AFX_DATA
@@ -130,7 +129,6 @@ public:
int m_nAngle;
BOOL m_bAxis;
BOOL m_bCentimeters;
- BOOL m_bCollision;
BOOL m_bFixed;
BOOL m_bGrid;
int m_nGridSize;
@@ -138,7 +136,6 @@ public:
BOOL m_bLockY;
BOOL m_bLockZ;
BOOL m_bMove;
- BOOL m_bPreview;
BOOL m_bSnapA;
BOOL m_bSnapX;
BOOL m_bSnapY;