Michel2/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad.git synced 2026-07-28 04:07:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properties Pane improvements.

Browse Source
This commit is contained in:
nobody
2012-01-20 03:27:25 +00:00
parent ca7007613d
commit b5c75c7d6f
6 changed files with 23 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/LeoCAD.rc
+3 -1
View File
@@ -316,7 +316,8 @@ BEGIN
MENUITEM "&Standard", ID_VIEW_TOOLBAR
MENUITEM "&Drawing", ID_VIEW_TOOLS_BAR
MENUITEM "&Animation", ID_VIEW_ANIMATION_BAR
MENUITEM "Pie&ces", ID_VIEW_PIECES_BAR
MENUITEM "&Pieces", ID_VIEW_PIECES_BAR
MENUITEM "P&roperties", ID_VIEW_PROPERTIES_BAR
MENUITEM "&Modify", ID_VIEW_MODIFY_BAR
MENUITEM "S&tatus Bar", ID_VIEW_STATUS_BAR
END
@@ -1777,6 +1778,7 @@ BEGIN
ID_VIEW_PIECES_BAR "Show or hide the pieces toolbar\nToggle PiecesBar"
ID_VIEW_TOOLS_BAR "Show or hide the drawing toolbar\nToggle DrawingBar"
ID_VIEW_ANIMATION_BAR "Show or hide the animation toolbar\nToggle AnimationBar"
ID_VIEW_PROPERTIES_BAR "Show or hide the properties toolbar\nToggle ToolBar"
ID_VIEW_MODIFY_BAR "Show or hide the modify dialog\nToggle Modify Dialog"
END
win/Leocad.sln
+6 -6
View File
@@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LeoCAD", "LeoCAD.vcxproj",
ProjectSection(ProjectDependencies) = postProject
{03C3A022-452E-40B3-BFD3-095713E5FFA2} = {03C3A022-452E-40B3-BFD3-095713E5FFA2}
{A7D39990-9822-4302-9709-08D03ADF1170} = {A7D39990-9822-4302-9709-08D03ADF1170}
{FD1D14C6-AC21-C31D-3D2B-592043BD5ECB} = {FD1D14C6-AC21-C31D-3D2B-592043BD5ECB}
{E4253912-37B8-C33E-42BB-4D178F0BBE9C} = {E4253912-37B8-C33E-42BB-4D178F0BBE9C}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng\libpng.vcxproj", "{03C3A022-452E-40B3-BFD3-095713E5FFA2}"
@@ -17,7 +17,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng\libpng.vcx
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib\zlib.vcxproj", "{A7D39990-9822-4302-9709-08D03ADF1170}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeglib", "jpeglib\jpeglib.vcxproj", "{FD1D14C6-AC21-C31D-3D2B-592043BD5ECB}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeglib", "jpeglib\jpeglib.vcxproj", "{E4253912-37B8-C33E-42BB-4D178F0BBE9C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -41,10 +41,10 @@ Global
{A7D39990-9822-4302-9709-08D03ADF1170}.Debug|Win32.Build.0 = Debug|Win32
{A7D39990-9822-4302-9709-08D03ADF1170}.Release|Win32.ActiveCfg = Release|Win32
{A7D39990-9822-4302-9709-08D03ADF1170}.Release|Win32.Build.0 = Release|Win32
{FD1D14C6-AC21-C31D-3D2B-592043BD5ECB}.Debug|Win32.ActiveCfg = Debug|Win32
{FD1D14C6-AC21-C31D-3D2B-592043BD5ECB}.Debug|Win32.Build.0 = Debug|Win32
{FD1D14C6-AC21-C31D-3D2B-592043BD5ECB}.Release|Win32.ActiveCfg = Release|Win32
{FD1D14C6-AC21-C31D-3D2B-592043BD5ECB}.Release|Win32.Build.0 = Release|Win32
{E4253912-37B8-C33E-42BB-4D178F0BBE9C}.Debug|Win32.ActiveCfg = Debug|Win32
{E4253912-37B8-C33E-42BB-4D178F0BBE9C}.Debug|Win32.Build.0 = Debug|Win32
{E4253912-37B8-C33E-42BB-4D178F0BBE9C}.Release|Win32.ActiveCfg = Release|Win32
{E4253912-37B8-C33E-42BB-4D178F0BBE9C}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
win/Mainfrm.cpp
+6 -35
View File
@@ -121,10 +121,12 @@ BEGIN_MESSAGE_MAP(CMainFrame, CFrameWndEx)
ON_COMMAND_EX(ID_VIEW_ANIMATION_BAR, &CFrameWndEx::OnPaneCheck)
ON_COMMAND_EX(ID_VIEW_TOOLS_BAR, &CFrameWndEx::OnPaneCheck)
ON_COMMAND_EX(ID_VIEW_PIECES_BAR, &CFrameWndEx::OnPaneCheck)
ON_COMMAND_EX(ID_VIEW_PROPERTIES_BAR, &CFrameWndEx::OnPaneCheck)
ON_COMMAND_EX(ID_VIEW_MODIFY_BAR, &CFrameWndEx::OnPaneCheck)
ON_UPDATE_COMMAND_UI(ID_VIEW_ANIMATION_BAR, &CFrameWndEx::OnUpdatePaneMenu)
ON_UPDATE_COMMAND_UI(ID_VIEW_TOOLS_BAR, &CFrameWndEx::OnUpdatePaneMenu)
ON_UPDATE_COMMAND_UI(ID_VIEW_PIECES_BAR, &CFrameWndEx::OnUpdatePaneMenu)
ON_UPDATE_COMMAND_UI(ID_VIEW_PROPERTIES_BAR, &CFrameWndEx::OnUpdatePaneMenu)
ON_UPDATE_COMMAND_UI(ID_VIEW_MODIFY_BAR, &CFrameWndEx::OnUpdatePaneMenu)
ON_UPDATE_COMMAND_UI_RANGE(ID_ACTION_SELECT, ID_ACTION_ROLL, OnUpdateAction)
ON_UPDATE_COMMAND_UI_RANGE(ID_SNAP_SNAPX, ID_SNAP_SNAPNONE, OnUpdateSnap)
@@ -247,7 +249,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
VERIFY(m_wndInvisibleToolBar.LoadToolBar(IDR_INVISIBLE));
}
if (!m_wndProperties.Create("Properties", this, CRect(0, 0, 200, 200), TRUE, ID_VIEW_MODIFY_BAR+1, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | CBRS_RIGHT | CBRS_FLOAT_MULTI))
if (!m_wndProperties.Create("Properties", this, CRect(0, 0, 200, 200), TRUE, ID_VIEW_PROPERTIES_BAR, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | CBRS_RIGHT | CBRS_FLOAT_MULTI))
{
TRACE0("Failed to create Properties window\n");
return FALSE; // failed to create
@@ -270,6 +272,8 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
main_window->SetXID (this);
theApp.LoadState(this);
// console.SetWindowCallback (&mainframe_console_func, m_wndSplitter.GetPane (1, 0));
return 0;
@@ -525,43 +529,10 @@ LONG CMainFrame::UpdateSettings(UINT /*lParam*/, LONG /*wParam*/)
void CMainFrame::OnClose()
{
if (m_lpfnCloseProc != NULL && !(*m_lpfnCloseProc)(this))
return;
if (!lcGetActiveProject()->SaveModified())
return;
if (GetStyle() & WS_VISIBLE)
{
// save window size and position when destroyed
WINDOWPLACEMENT wp;
char szBuf[60];
if (m_pwndFullScrnBar)
{
m_pwndFullScrnBar->DestroyWindow();
delete m_pwndFullScrnBar;
m_wndStatusBar.ShowWindow(SW_SHOWNORMAL);
wp = m_wpPrev;
}
else
{
wp.length = sizeof(wp);
GetWindowPlacement(&wp);
}
wsprintf(szBuf,"%d, %d, %d, %d", wp.rcNormalPosition.top, wp.rcNormalPosition.right,
wp.rcNormalPosition.bottom, wp.rcNormalPosition.left);
theApp.WriteProfileString("Settings","Window Position", szBuf);
theApp.WriteProfileInt("Settings", "Window Status", wp.showCmd);
SaveBarState("Toolbars");
theApp.WriteProfileInt(_T("Settings"), _T("ToolBarVersion"), TOOLBAR_VERSION);
}
AfxGetApp()->HideApplication();
GetActiveDocument()->OnCloseDocument();
AfxPostQuitMessage(0);
CFrameWndEx::OnClose();
}
void CMainFrame::OnSetFocus(CWnd* pOldWnd)
win/propertiespane.cpp
+3 -3
View File
@@ -113,7 +113,7 @@ void CPropertiesPane::InitPropList()
m_wndPropList.SetVSDotNetLook();
m_wndPropList.MarkModifiedProperties();
SetEmpty();
SetEmpty(true);
}
void CPropertiesPane::Update(Object* Focus)
@@ -147,9 +147,9 @@ void CPropertiesPane::Update(Object* Focus)
}
}
void CPropertiesPane::SetEmpty()
void CPropertiesPane::SetEmpty(bool Force)
{
if (!mObject)
if (!mObject && !Force)
return;
m_wndPropList.RemoveAll();
win/propertiespane.h
+1 -1
View File
@@ -19,7 +19,7 @@ protected:
void InitPropList();
void SetPropListFont();
void SetEmpty();
void SetEmpty(bool Force = false);
void SetPiece(Object* Focus);
void SetCamera(Object* Focus);
void SetLight(Object* Focus);
win/resource.h
+4 -2
View File
@@ -662,10 +662,12 @@
#define ID_VIEW_RESETVIEWS 33174
#define ID_VIEW_TOOLBARS 33175
#define ID_VIEW_SPLIT_HORIZONTALLY 33177
#define ID_TOOLBARS_PROPERTIES 33178
#define ID_VIEW_PIECES_BAR 59425
#define ID_VIEW_TOOLS_BAR 59426
#define ID_VIEW_ANIMATION_BAR 59427
#define ID_VIEW_MODIFY_BAR 59428
#define ID_VIEW_PROPERTIES_BAR 59428
#define ID_VIEW_MODIFY_BAR 59429
// Next default values for new objects
//
@@ -673,7 +675,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 242
#define _APS_NEXT_COMMAND_VALUE 33178
#define _APS_NEXT_COMMAND_VALUE 33179
#define _APS_NEXT_CONTROL_VALUE 1247
#define _APS_NEXT_SYMED_VALUE 121
#endif