summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorleo2005-02-22 20:05:41 +0000
committerleo2005-02-22 20:05:41 +0000
commit9f9d07d14769dccec618df0e80002d2360030adb (patch)
tree90d9ffbd63041aac6a7af65cbf06472cc7d51d9f /win
parent8d3bb5afb6b6185140c9dd209a3690f7db08ccef (diff)
Swapped View and Piece menu position.
git-svn-id: http://svn.leocad.org/trunk@383 c7d43263-9d01-0410-8a33-9dba5d9f93d6
Diffstat (limited to 'win')
-rw-r--r--win/LeoCAD.rc38
-rw-r--r--win/System.cpp12
2 files changed, 25 insertions, 25 deletions
diff --git a/win/LeoCAD.rc b/win/LeoCAD.rc
index 7abcf2a..8a7685b 100644
--- a/win/LeoCAD.rc
+++ b/win/LeoCAD.rc
@@ -275,25 +275,6 @@ BEGIN
MENUITEM "Select Invert", ID_EDIT_SELECTINVERT
MENUITEM "Select By Name...", ID_EDIT_SELECTBYNAME
END
- POPUP "&Piece"
- BEGIN
- MENUITEM "Insert\tIns", ID_PIECE_INSERT
- MENUITEM "Delete\tDel", ID_PIECE_DELETE
- MENUITEM "Minifig Wizard...", ID_PIECE_MINIFIGWIZARD
- MENUITEM "Array...", ID_PIECE_ARRAY
- MENUITEM "Mirror...", ID_PIECE_MIRROR
- MENUITEM "Copy Keys", ID_PIECE_COPYKEYS
- MENUITEM SEPARATOR
- MENUITEM "Group...", ID_PIECE_GROUP
- MENUITEM "Ungroup", ID_PIECE_UNGROUP
- MENUITEM "Remove From Group", ID_PIECE_DETACH
- MENUITEM "Add To Group", ID_PIECE_ATTACH
- MENUITEM "Edit Groups...", ID_PIECE_EDITGROUPS
- MENUITEM SEPARATOR
- MENUITEM "Hide Selected", ID_PIECE_HIDESELECTED
- MENUITEM "Hide Unselected", ID_PIECE_HIDEUNSELECTED
- MENUITEM "Unhide All", ID_PIECE_UNHIDEALL
- END
POPUP "&View"
BEGIN
MENUITEM "P&references...", ID_VIEW_PREFERENCES
@@ -346,6 +327,25 @@ BEGIN
MENUITEM "&Full Screen\tCtrl+F", ID_VIEW_FULLSCREEN
MENUITEM "New View", ID_VIEW_NEWVIEW
END
+ POPUP "&Piece"
+ BEGIN
+ MENUITEM "Insert\tIns", ID_PIECE_INSERT
+ MENUITEM "Delete\tDel", ID_PIECE_DELETE
+ MENUITEM "Minifig Wizard...", ID_PIECE_MINIFIGWIZARD
+ MENUITEM "Array...", ID_PIECE_ARRAY
+ MENUITEM "Mirror...", ID_PIECE_MIRROR
+ MENUITEM "Copy Keys", ID_PIECE_COPYKEYS
+ MENUITEM SEPARATOR
+ MENUITEM "Group...", ID_PIECE_GROUP
+ MENUITEM "Ungroup", ID_PIECE_UNGROUP
+ MENUITEM "Remove From Group", ID_PIECE_DETACH
+ MENUITEM "Add To Group", ID_PIECE_ATTACH
+ MENUITEM "Edit Groups...", ID_PIECE_EDITGROUPS
+ MENUITEM SEPARATOR
+ MENUITEM "Hide Selected", ID_PIECE_HIDESELECTED
+ MENUITEM "Hide Unselected", ID_PIECE_HIDEUNSELECTED
+ MENUITEM "Unhide All", ID_PIECE_UNHIDEALL
+ END
POPUP "&Help"
BEGIN
MENUITEM "&Help Topics", ID_HELP_FINDER
diff --git a/win/System.cpp b/win/System.cpp
index cf19926..af1710e 100644
--- a/win/System.cpp
+++ b/win/System.cpp
@@ -429,7 +429,7 @@ void SystemInit()
// Viewport menu.
void SystemUpdateViewport(int nNew, int nOld)
{
- CMenu* pMenu = GetMainMenu(3)->GetSubMenu(12);
+ CMenu* pMenu = GetMainMenu(2)->GetSubMenu(12);
pMenu->CheckMenuItem(nOld + ID_VIEWPORT01, MF_BYCOMMAND | MF_UNCHECKED);
pMenu->CheckMenuItem(nNew + ID_VIEWPORT01, MF_BYCOMMAND | MF_CHECKED);
}
@@ -592,7 +592,7 @@ void SystemUpdateSelected(unsigned long flags)
pCtrl = &pBar->GetToolBarCtrl();
pCtrl->EnableButton(ID_PIECE_ARRAY, flags & LC_SEL_PIECE ? TRUE : FALSE);
pCtrl->EnableButton(ID_PIECE_MIRROR, flags & LC_SEL_PIECE ? TRUE : FALSE);
- pMenu = GetMainMenu(2);
+ pMenu = GetMainMenu(3);
pMenu->EnableMenuItem(ID_PIECE_DELETE, MF_BYCOMMAND |
(flags & (LC_SEL_PIECE|LC_SEL_CAMERA|LC_SEL_LIGHT) ? MF_ENABLED : (MF_DISABLED | MF_GRAYED)));
pMenu->EnableMenuItem(ID_PIECE_COPYKEYS, MF_BYCOMMAND |
@@ -638,7 +638,7 @@ void SystemUpdateTime(bool bAnimation, int nTime, int nTotal)
pCtrl->EnableButton(ID_VIEW_STEP_LAST, nTime != nTotal ? TRUE : FALSE);
// Main menu
- CBMPMenu* pMainMenu = (CBMPMenu*)GetMainMenu(3)->GetSubMenu(14);
+ CBMPMenu* pMainMenu = (CBMPMenu*)GetMainMenu(2)->GetSubMenu(14);
pMainMenu->EnableMenuItem(ID_VIEW_STEP_NEXT, MF_BYCOMMAND |
(nTime < nTotal ? MF_ENABLED : (MF_DISABLED | MF_GRAYED)));
@@ -734,7 +734,7 @@ void SystemUpdateAnimation(bool bAnimation, bool bAddKeys)
// Menu
char* txt;
- CMenu* pMenu = GetMainMenu(2);
+ CMenu* pMenu = GetMainMenu(3);
UINT nState = pMenu->GetMenuState(ID_PIECE_COPYKEYS, MF_BYCOMMAND);
nState &= ~(MF_BITMAP|MF_OWNERDRAW|MF_SEPARATOR);
@@ -749,7 +749,7 @@ void SystemUpdateAnimation(bool bAnimation, bool bAddKeys)
void SystemUpdateCurrentCamera(Camera* pOld, Camera* pNew, Camera* pCamera)
{
- CBMPMenu* pMainMenu = (CBMPMenu*)GetMainMenu(3)->GetSubMenu(13);
+ CBMPMenu* pMainMenu = (CBMPMenu*)GetMainMenu(2)->GetSubMenu(13);
CMenu* pPopupMenu = menuPopups.GetSubMenu(1)->GetSubMenu(3);
int i;
@@ -774,7 +774,7 @@ void SystemUpdateCurrentCamera(Camera* pOld, Camera* pNew, Camera* pCamera)
// Update the list of cameras
void SystemUpdateCameraMenu(Camera* pCamera)
{
- CBMPMenu* pMainMenu = (CBMPMenu*)GetMainMenu(3)->GetSubMenu(13);
+ CBMPMenu* pMainMenu = (CBMPMenu*)GetMainMenu(2)->GetSubMenu(13);
CMenu* pPopupMenu = menuPopups.GetSubMenu(1)->GetSubMenu(3);
Camera* pFirst = pCamera;
char tmp[90];