summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleo2005-12-20 22:12:46 +0000
committerleo2005-12-20 22:12:46 +0000
commit2bb4077086d23164941750e9cecf5a40889a7b40 (patch)
treed152b2e0ee9bf61c8a4f7f4f38ba7bd129103b84
parent98f3bd8740246fe88c3db3278fe533dc2f368d12 (diff)
Remove Piecesbar Combobox toggle option (always on now).
git-svn-id: http://svn.leocad.org/trunk@444 c7d43263-9d01-0410-8a33-9dba5d9f93d6
-rw-r--r--win/LeoCAD.rc5
-rw-r--r--win/Mainfrm.cpp10
-rw-r--r--win/Piecebar.cpp14
-rw-r--r--win/Piecebar.h1
-rw-r--r--win/Prefpage.cpp6
-rw-r--r--win/Prefpage.h1
-rw-r--r--win/Stdafx.h2
-rw-r--r--win/resource.h1
8 files changed, 9 insertions, 31 deletions
diff --git a/win/LeoCAD.rc b/win/LeoCAD.rc
index eebc1b1..b61424a 100644
--- a/win/LeoCAD.rc
+++ b/win/LeoCAD.rc
@@ -365,7 +365,6 @@ BEGIN
MENUITEM "Edit Category...", ID_PIECEBAR_EDITCATEGORY
MENUITEM SEPARATOR
MENUITEM "Group Pieces", ID_PIECEBAR_GROUP
- MENUITEM "Show ComboBox", ID_PIECEBAR_COMBOBOX
MENUITEM "Show Numbers", ID_PIECEBAR_NUMBERS
MENUITEM "Show Subparts", ID_PIECEBAR_SUBPARTS
MENUITEM SEPARATOR
@@ -979,14 +978,12 @@ BEGIN
CONTROL "Slider1",IDC_GENDLG_MOUSE,"msctls_trackbar32",TBS_BOTH |
TBS_NOTICKS | WS_TABSTOP,76,99,31,10
GROUPBOX "Pieces Toolbar",IDC_STATIC,146,7,92,70
- CONTROL "Show subparts",IDC_GENDLG_SUBPARTS,"Button",
+ CONTROL "Show sub-pieces",IDC_GENDLG_SUBPARTS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,152,19,81,8
CONTROL "Show piece numbers",IDC_GENDLG_NUMBERS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,152,32,81,8
CONTROL "Sort pieces by group",IDC_GENDLG_GROUP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,152,45,81,8
- CONTROL "Show combobox",IDC_GENDLG_COMBO,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,152,58,81,8
CONTROL "Check for updates on startup",IDC_GENDLG_UPDATES,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,11,113,119,8
END
diff --git a/win/Mainfrm.cpp b/win/Mainfrm.cpp
index 83579b6..78b4b52 100644
--- a/win/Mainfrm.cpp
+++ b/win/Mainfrm.cpp
@@ -474,10 +474,9 @@ LONG CMainFrame::OnPopupClose(UINT /*lParam*/, LONG /*wParam*/)
LONG CMainFrame::UpdateSettings(UINT /*lParam*/, LONG /*wParam*/)
{
- int i = theApp.GetProfileInt("Settings", "Piecebar Options", PIECEBAR_GROUP|PIECEBAR_COMBO);
+ int i = theApp.GetProfileInt("Settings", "Piecebar Options", PIECEBAR_GROUP);
m_wndPiecesBar.m_bSubParts = (i & PIECEBAR_SUBPARTS) != 0;
m_wndPiecesBar.m_bGroups = (i & PIECEBAR_GROUP) != 0;
- m_wndPiecesBar.m_bCombo = (i & PIECEBAR_COMBO) != 0;
m_wndPiecesBar.m_bNumbers = (i & PIECEBAR_PARTNUMBERS) != 0;
RECT rc;
@@ -550,10 +549,6 @@ void CMainFrame::OnPieceBar(UINT nID)
{
m_wndPiecesBar.m_bNumbers = !m_wndPiecesBar.m_bNumbers;
} break;
- case ID_PIECEBAR_COMBOBOX:
- {
- m_wndPiecesBar.m_bCombo = !m_wndPiecesBar.m_bCombo;
- } break;
case ID_PIECEBAR_SUBPARTS:
{
m_wndPiecesBar.m_bSubParts = !m_wndPiecesBar.m_bSubParts;
@@ -574,7 +569,6 @@ void CMainFrame::OnPieceBar(UINT nID)
UINT u = 0;
if (m_wndPiecesBar.m_bSubParts) u |= PIECEBAR_SUBPARTS;
if (m_wndPiecesBar.m_bGroups) u |= PIECEBAR_GROUP;
- if (m_wndPiecesBar.m_bCombo) u |= PIECEBAR_COMBO;
if (m_wndPiecesBar.m_bNumbers) u |= PIECEBAR_PARTNUMBERS;
theApp.WriteProfileInt("Settings", "Piecebar Options", u);
}
@@ -587,8 +581,6 @@ void CMainFrame::OnUpdatePieceBar(CCmdUI* pCmdUI)
pCmdUI->SetCheck(m_wndPiecesBar.m_bGroups); break;
case ID_PIECEBAR_NUMBERS:
pCmdUI->SetCheck(m_wndPiecesBar.m_bNumbers); break;
- case ID_PIECEBAR_COMBOBOX:
- pCmdUI->SetCheck(m_wndPiecesBar.m_bCombo); break;
case ID_PIECEBAR_SUBPARTS:
pCmdUI->SetCheck(m_wndPiecesBar.m_bSubParts); break;
}
diff --git a/win/Piecebar.cpp b/win/Piecebar.cpp
index 7395301..fd70ad6 100644
--- a/win/Piecebar.cpp
+++ b/win/Piecebar.cpp
@@ -22,10 +22,9 @@ static char THIS_FILE[] = __FILE__;
CPiecesBar::CPiecesBar()
{
- int i = AfxGetApp()->GetProfileInt("Settings", "Piecebar Options", PIECEBAR_GROUP|PIECEBAR_COMBO);
+ int i = AfxGetApp()->GetProfileInt("Settings", "Piecebar Options", PIECEBAR_GROUP);
m_bSubParts = (i & PIECEBAR_SUBPARTS) != 0;
m_bGroups = (i & PIECEBAR_GROUP) != 0;
- m_bCombo = (i & PIECEBAR_COMBO) != 0;
m_bNumbers = (i & PIECEBAR_PARTNUMBERS) != 0;
m_nCurGroup = 1;
@@ -625,11 +624,8 @@ void CPiecesBar::OnSize(UINT nType, int cx, int cy)
int off = 31;
m_wndColorsList.SetWindowPos (NULL, (cx-210)/2, cy-off, 212, 26, SWP_NOZORDER);
- if (m_bCombo)
- {
- off += 30;
- m_wndPiecesCombo.SetWindowPos (NULL, 5, cy-off, cx-10, 140, SWP_NOZORDER);
- }
+ off += 30;
+ m_wndPiecesCombo.SetWindowPos (NULL, 5, cy-off, cx-10, 140, SWP_NOZORDER);
if (m_bGroups)
{
@@ -666,8 +662,8 @@ void CPiecesBar::OnSize(UINT nType, int cx, int cy)
else
m_wndPiecesList.DeleteColumn (1);
- m_wndPiecesList.SetColumnWidth (0, rect.right - rect.left - GetSystemMetrics(SM_CXVSCROLL) -2);
- m_wndPiecesCombo.ShowWindow ((m_bCombo) ? SW_SHOW : SW_HIDE);
+ m_wndPiecesList.SetColumnWidth(0, rect.right - rect.left - GetSystemMetrics(SM_CXVSCROLL) -2);
+ m_wndPiecesCombo.ShowWindow(SW_SHOW);
m_wndPiecesList.ShowWindow(FALSE);
diff --git a/win/Piecebar.h b/win/Piecebar.h
index ef43760..48d7e32 100644
--- a/win/Piecebar.h
+++ b/win/Piecebar.h
@@ -83,7 +83,6 @@ public:
void CreateGroupsBar();
BOOL m_bSubParts;
BOOL m_bGroups;
- BOOL m_bCombo;
BOOL m_bNumbers;
CPiecesList m_wndPiecesList;
CColorsList m_wndColorsList;
diff --git a/win/Prefpage.cpp b/win/Prefpage.cpp
index b872003..cb1e21c 100644
--- a/win/Prefpage.cpp
+++ b/win/Prefpage.cpp
@@ -33,7 +33,6 @@ CPreferencesGeneral::CPreferencesGeneral() : CPropertyPage(CPreferencesGeneral::
m_bGroup = FALSE;
m_strFolder = _T("");
m_bAutoSave = FALSE;
- m_bCombo = FALSE;
m_strUser = _T("");
m_Updates = FALSE;
//}}AFX_DATA_INIT
@@ -55,7 +54,6 @@ void CPreferencesGeneral::DoDataExchange(CDataExchange* pDX)
DDX_Check(pDX, IDC_GENDLG_GROUP, m_bGroup);
DDX_Text(pDX, IDC_GENDLG_FOLDER, m_strFolder);
DDX_Check(pDX, IDC_GENDLG_AUTOSAVE, m_bAutoSave);
- DDX_Check(pDX, IDC_GENDLG_COMBO, m_bCombo);
DDX_Text(pDX, IDC_GENDLG_USER, m_strUser);
DDV_MaxChars(pDX, m_strUser, 100);
DDX_Check(pDX, IDC_GENDLG_UPDATES, m_Updates);
@@ -89,10 +87,9 @@ void CPreferencesGeneral::SetOptions(int nSaveInterval, int nMouse, const char*
m_strUser = strUser;
m_Updates = AfxGetApp()->GetProfileInt("Settings", "CheckUpdates", 1);
- int i = AfxGetApp()->GetProfileInt("Settings", "Piecebar Options", PIECEBAR_GROUP|PIECEBAR_COMBO);
+ int i = AfxGetApp()->GetProfileInt("Settings", "Piecebar Options", PIECEBAR_GROUP);
m_bSubparts = (i & PIECEBAR_SUBPARTS) != 0;
m_bGroup = (i & PIECEBAR_GROUP) != 0;
- m_bCombo = (i & PIECEBAR_COMBO) != 0;
m_bNumbers = (i & PIECEBAR_PARTNUMBERS) != 0;
}
@@ -107,7 +104,6 @@ void CPreferencesGeneral::GetOptions(int* nSaveTime, int* nMouse, char* strFolde
int i = 0;
if (m_bSubparts) i |= PIECEBAR_SUBPARTS;
if (m_bGroup) i |= PIECEBAR_GROUP;
- if (m_bCombo) i |= PIECEBAR_COMBO;
if (m_bNumbers) i |= PIECEBAR_PARTNUMBERS;
AfxGetApp()->WriteProfileInt("Settings", "Piecebar Options", i);
diff --git a/win/Prefpage.h b/win/Prefpage.h
index 2dda1e1..04149b2 100644
--- a/win/Prefpage.h
+++ b/win/Prefpage.h
@@ -30,7 +30,6 @@ public:
BOOL m_bGroup;
CString m_strFolder;
BOOL m_bAutoSave;
- BOOL m_bCombo;
CString m_bUser;
CString m_strUser;
BOOL m_Updates;
diff --git a/win/Stdafx.h b/win/Stdafx.h
index 7614a2c..98a0915 100644
--- a/win/Stdafx.h
+++ b/win/Stdafx.h
@@ -51,7 +51,7 @@
#define PIECEBAR_SUBPARTS 0x02 // Show subparts
#define PIECEBAR_GROUP 0x04 // Group pieces
//#define PIECEBAR_ZOOMPREVIEW 0x08 // Zoom piece preview
-#define PIECEBAR_COMBO 0x10 // Show combobox
+//#define PIECEBAR_COMBO 0x10 // Show combobox
#define PIECEBAR_PARTNUMBERS 0x20 // Show part numbers
//{{AFX_INSERT_LOCATION}}
diff --git a/win/resource.h b/win/resource.h
index bad6599..974ab32 100644
--- a/win/resource.h
+++ b/win/resource.h
@@ -498,7 +498,6 @@
#define ID_FILE_EXPORT_POVRAY 32835
#define ID_PIECEBAR_GROUP 32837
#define ID_PIECEBAR_NUMBERS 32839
-#define ID_PIECEBAR_COMBOBOX 32840
#define ID_PIECEBAR_SUBPARTS 32841
#define ID_PIECE_ARRAY 32842
#define ID_PIECE_MINIFIGWIZARD 32843