From c1daa3a71356d74e91452ac440d2e1c8d7fd07e3 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:08:26 +0000 Subject: Utilisateur : Fcolin Date : 14/03/00 Heure : 9:26 Créé (vss 1) --- IvyProbe/ETSLayout.cpp | 2873 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2873 insertions(+) create mode 100644 IvyProbe/ETSLayout.cpp (limited to 'IvyProbe') diff --git a/IvyProbe/ETSLayout.cpp b/IvyProbe/ETSLayout.cpp new file mode 100644 index 0000000..fa62a7b --- /dev/null +++ b/IvyProbe/ETSLayout.cpp @@ -0,0 +1,2873 @@ +//////////////////////////////////////////// +// ___ ____ _________________ // +// / _/_ _// _______________/ // +// / _/ / / / / ___ ___ ____ // +// /__/ /_/ / / / // _/_ _/ // +// _________/ / / / // _/ / / // +// __(c) 1998-9_/ /___//_/ /_/ // +// // +//////////////////////////////////////////// +// all rights reserved // +//////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// ETSLayoutDialog +// +// A class for smart layouting of Dialogs and such +// +// USAGE: See LayoutMgr.html +// +// AUTHOR: Erwin Tratar +// +// DISCLAIMER: +// +// This Sourcecode and all accompaning material is ©1998-1999 Erwin Tratar. +// All rights reserved. +// +// The source code may be used in compiled form in any way you desire +// (including usage in commercial applications), providing that your +// application adds essential code (i.e. it is not only a wrapper) to the +// functionality found here +// +// Redistribution of the sourcecode itself, publication in any media or +// inclusion in a library requires the authors expressed written consent. +// You may not sale this code for profit. +// +// THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY. USE IT +// AT YOUR OWN RISK! THE AUTHOR ACCEPTS NO LIABILITY FOR ANY DAMAGE/LOSS OF +// BUSINESS THAT THIS PRODUCT MAY CAUSE. +// +// +// HISTORY: +// 1998/05/1 Initial Release +// 1998/05/13 Added ability to have a Pane with a control +// 1998/05/13 Added better support for TabControls +// 1998/05/14 automatically set Icon to IDR_MAINFRAME +// 1998/05/19 no flicker on restoring position in OnInitialUpdate +// Changed procedure for load/save, see constructor +// 1998/10/02 Added support for Maximum (tracking) size +// 1998/10/02 Much improved handling regarding RELATIVE/GREEDY +// /w critical minimum size +// 1998/10/02 turn on/off gripper at lower right corner +// 1998/10/05 Support for user defined minimum size for items +// (was hardcoded 5 before) +// 1998/10/07 Fix for FormViews +// 1998/10/31 Support for SECDialogBar/CDialogBar +// 1998/10/31 simplified interface +// 1998/10/31 Advanced positioning options +// 1998/10/31 Added paneNull for empty Pane (former: NULL) +// 1998/11/20 Swapped ETSLayoutDialog constructor parameters +// 1998/11/20 Added Pane::addItemSpaceBetween +// [Leo Zelevinsky] +// 1998/11/24 Added fixup for greedy panes +// 1998/11/24 addItemSpaceBetween now subtracts 2*nDefaultBorder +// 1998/11/24 addGrowing() added as a shortcut for a paneNull +// 1998/11/24 simplified interface: no more PaneBase:: / Pane:: +// needed +// 1998/11/24 added FILL_* Modes +// 1998/11/24 improved maximum size handling for greedy panes +// 1998/11/25 Fixup of greedy panes caused infinite loop in some +// cases +// 1999/01/07 addItemSpaceLike() added +// 1999/04/03 Fixed ETSLayoutFormView memory leak +// 1999/04/07 Fixed ALIGN_xCENTER +// 1999/04/08 New simple stream-interface added +// 1999/04/09 Added support for an empty Status-Bar for resizing +// instead of a gripper in the lower right corner +// [Andreas Kapust] +// 1999/04/11 New code for much less flickering, OnEraseBkgnd() +// overidden for this task +// 1999/05/12 Split Layout code into understandable pieces and adding +// a lot of comments +// 1999/06/20 ABSOLUTE_X + ALIGN_FILL_X expands item if there is any +// left space (after all Abs/Rel/Greedy processing is done) +// 1999/10/06 Changed Load() and Save() to use WINDOWPLACEMENT +// [Keith Bussell] +// 1999/11/18 Added possibility to add panes of the same orientation +// to another pane. This merges both panes in one big +// pane with the same orientation +// 1999/11/18 Added support for BCGDialogBar (only with BCG > 4.52!) +// 1999/11/25 Addes support for PropertyPages/Sheets. Uses some code +// of a code submission from Anreas Kapust +// 1999/11/25 Renamed classes to ETSLayoutXXX +// 1999/11/25 Use CreateRoot() and Root() instead of m_pRootPane in +// derived class. +// 1999/11/26 Added autopointer support. No need to use normal pointers +// when defining layout anymore. Changed m_pRootPane to +// m_RootPane +// 1999/11/26 Bug in Fixup Greedy II with multiple GREEDY panes and one +// of them min/max limited +// 1999/11/28 Fixed PaneTab::getConstrainVert() for ABSOLUTE_VERT +// 1999/11/28 Fixed itemFixed() +// 1999/11/28 Changed DWORD modeResize Arguments to layModeResize for +// better type safety. Added typesafe operator| +// 1999/12/04 Don't reposition window in UpdateLayout if it's a child +// (as a child Dialog or PropertyPage) +// 1999/12/04 Erase Backgroung with GCL_HBRBACKGROUND (if available) +// 1999/12/04 itemSpaceXXX() adds a NORESIZE item instead of ABSOLUTE_XXX +// this will fix unwanted growing in secondary direction +// 1999/12/10 Erase Backgroung within TabCtrl was 'fixed' badly. Reverted to +// old working code +// 2000/02/02 When the Dialog is child of a View the class works correctly +// now [Didier BULTIAUW] +// 2000/02/15 Combo-Boxes were not working correctly (in all modes!) + + +#define OEMRESOURCE +#include + +#include "stdafx.h" +#include "ETSLayout.h" + +#ifndef OBM_SIZE +#define OBM_SIZE 32766 +// taken from WinresRc.h +// if not used for any reason +#endif + +#ifdef _DEBUG +#define new DEBUG_NEW +#undef THIS_FILE +static char THIS_FILE[] = __FILE__; +#endif + +static UINT auIDStatusBar[] = +{ + ID_SEPARATOR +}; + +const int ERASE_GROUP_BORDER = 10; +const int FIXUP_CUTOFF = 5; +const int TAB_SPACE = 5; + +// the _NULL-Pane +CWnd* ETSLayoutMgr::paneNull = 0; + +void ETSLayoutMgr::Layout(CRect& rcClient) +{ + // Does nothing, use DECLARE_LAYOUT in derived class + // see DialogMgr.h +} + + +ETSLayoutMgr::CPane ETSLayoutMgr::pane( layOrientation orientation, ETSLayoutMgr::layResizeMode modeResize /*=GREEDY*/, + int sizeBorder /*=nDefaultBorder*/, int sizeExtraBorder /*=0*/, + int sizeSecondary /*=0*/) +{ + Pane* pPane = new Pane ( this, orientation, sizeBorder, sizeExtraBorder ); + pPane->m_sizeSecondary = sizeSecondary; + pPane->m_modeResize = modeResize; + + return CPane(pPane); +} + +ETSLayoutMgr::CPane ETSLayoutMgr::paneTab( CTabCtrl* pTab, layOrientation orientation, + ETSLayoutMgr::layResizeMode modeResize /*=GREEDY*/, int sizeBorder /*=nDefaultBorder*/, + int sizeExtraBorder /*=0*/, int sizeSecondary /*=0*/) +{ + Pane* pPane = new PaneTab ( pTab, this, orientation, sizeBorder, sizeExtraBorder ); + pPane->m_sizeSecondary = sizeSecondary; + pPane->m_modeResize = modeResize; + + return CPane(pPane); +} + + +ETSLayoutMgr::CPane ETSLayoutMgr::paneCtrl( CWnd* pCtrl, layOrientation orientation, + ETSLayoutMgr::layResizeMode modeResize /*=GREEDY*/, int sizeBorder /*=nDefaultBorder*/, + int sizeExtraBorder /*=0*/, int sizeTopExtra /*=0*/, + int sizeSecondary /*=0*/) +{ + Pane* pPane = new PaneCtrl ( pCtrl, this, orientation, sizeBorder, sizeExtraBorder, sizeTopExtra ); + pPane->m_sizeSecondary = sizeSecondary; + pPane->m_modeResize = modeResize; + + return CPane(pPane); +} + +ETSLayoutMgr::CPane ETSLayoutMgr::paneCtrl( UINT nID, layOrientation orientation, ETSLayoutMgr::layResizeMode modeResize /*=GREEDY*/, + int sizeBorder /*=nDefaultBorder*/, int sizeExtraBorder /*=0*/, + int sizeTopExtra /*=0*/, int sizeSecondary /*=0*/) +{ + Pane* pPane = new PaneCtrl ( nID, this, orientation, sizeBorder, sizeExtraBorder, sizeTopExtra ); + pPane->m_sizeSecondary = sizeSecondary; + pPane->m_modeResize = modeResize; + + return CPane(pPane); +} + + +ETSLayoutMgr::CPaneBase ETSLayoutMgr::item(UINT nID, ETSLayoutMgr::layResizeMode modeResize /*=GREEDY*/, int sizeX /*=0*/, int sizeY /*=0*/, + int sizeXMin /*=-1*/, int sizeYMin /*=-1*/) +{ + return new PaneItem( nID, this, modeResize, sizeX, sizeY, sizeXMin, sizeYMin); +} + +ETSLayoutMgr::CPaneBase ETSLayoutMgr::item(CWnd* pWnd, ETSLayoutMgr::layResizeMode modeResize /*=GREEDY*/, + int sizeX /*=0*/, int sizeY /*=0*/, int sizeXMin /*=-1*/, + int sizeYMin /*=-1*/) +{ + return new PaneItem( pWnd, this, modeResize, sizeX, sizeY, sizeXMin, sizeYMin); +} + +ETSLayoutMgr::CPaneBase ETSLayoutMgr::itemFixed(layOrientation orientation, int sizePrimary) +{ + CPaneBase p = new PaneItem(paneNull, this, NORESIZE, (orientation==HORIZONTAL)?sizePrimary:0, (orientation==VERTICAL)?sizePrimary:0); + return p; +} + +ETSLayoutMgr::CPaneBase ETSLayoutMgr::itemGrowing(layOrientation orientation) +{ + return new PaneItem(paneNull, this, (orientation==HORIZONTAL)?ABSOLUTE_VERT:ABSOLUTE_HORZ, 0, 0, -nDefaultBorder, -nDefaultBorder); +} + +ETSLayoutMgr::CPaneBase ETSLayoutMgr::itemSpaceBetween( layOrientation orientation, CWnd* pWndFirst, CWnd* pWndSecond ) +{ + if( orientation == HORIZONTAL ) { + // I'm interested in horizontal spacing + + CRect rLeft, rRight; + pWndFirst->GetWindowRect(&rLeft); + pWndSecond->GetWindowRect(&rRight); + + int sizeX = rRight.left - rLeft.right; + + if( sizeX < 0 ) { + // compare top to top + sizeX = rRight.left - rLeft.left; + } + else { + sizeX -= 2*nDefaultBorder; + } + + return new PaneItem(paneNull, this, NORESIZE, sizeX, 0); + } + else { + // I'm interested in vertical spacing + CRect rTop, rBot; + pWndFirst->GetWindowRect(&rTop); + pWndSecond->GetWindowRect(&rBot); + + int sizeY = rBot.top - rTop.bottom; + + if( sizeY < 0 ) { + // compare top to top + sizeY = sizeY = rBot.top - rTop.top; + } + else { + sizeY -= 2*nDefaultBorder; + } + + return new PaneItem(paneNull, this, NORESIZE, 0, sizeY); + } +} + + +ETSLayoutMgr::CPaneBase ETSLayoutMgr::itemSpaceBetween( layOrientation orientation, UINT nIDFirst, UINT nIDSecond ) +{ + CWnd *pFirst = GetWnd()->GetDlgItem(nIDFirst); + CWnd *pSecond = GetWnd()->GetDlgItem(nIDSecond); + + ASSERT( pFirst && pSecond ); + + return itemSpaceBetween( orientation, pFirst, pSecond ); +} + + +ETSLayoutMgr::CPaneBase ETSLayoutMgr::itemSpaceLike( layOrientation orientation, CWnd* pWnd ) +{ + CRect rRect; + pWnd->GetWindowRect(&rRect); + + if( orientation == HORIZONTAL ) { + // I'm interested in horizontal spacing + return new PaneItem(paneNull, this, NORESIZE, rRect.Width(), 0); + } + else { + // I'm interested in vertical spacing + return new PaneItem(paneNull, this, NORESIZE, 0, rRect.Height() ); + } + +} + + +ETSLayoutMgr::CPaneBase ETSLayoutMgr::itemSpaceLike( layOrientation orientation, UINT nID ) +{ + CWnd *pWnd = GetWnd()->GetDlgItem(nID); + ASSERT( pWnd ); + + return itemSpaceLike( orientation, pWnd ); +} + + + +ETSLayoutMgr::~ETSLayoutMgr() +{ +} + +void ETSLayoutMgr::UpdateLayout() +{ + if(!m_RootPane) + return; + + // Check constraints + CRect rcClient = GetRect(); + + if( m_pWnd->IsKindOf( RUNTIME_CLASS( CDialog ) ) && !(m_pWnd->GetStyle()&WS_CHILD) ) { + CRect rcWindow; + m_pWnd->GetWindowRect(rcWindow); + + // Added by Didier BULTIAUW + CWnd* parentWnd = m_pWnd->GetParent(); + if( (parentWnd != 0) && parentWnd->IsKindOf(RUNTIME_CLASS(CView)) ) + { + CRect rcParent; + parentWnd->GetWindowRect(rcParent); + rcWindow.OffsetRect(-rcParent.left,-rcParent.top); + } + // end add + + CRect rcBorder = rcWindow; + rcBorder -= rcClient; + + // Min and Max info + int minWidth = m_RootPane->getMinConstrainHorz() + rcBorder.Width() + 2*m_sizeRootBorders.cx; + int minHeight = m_RootPane->getMinConstrainVert() + rcBorder.Height() + 2*m_sizeRootBorders.cy; + int maxWidth = m_RootPane->getMaxConstrainHorz(); + if(maxWidth != -1) { + maxWidth += rcBorder.Width() + 2*m_sizeRootBorders.cx; + maxWidth = max(maxWidth, minWidth); + } + int maxHeight = m_RootPane->getMaxConstrainVert(); + if(maxHeight != -1) { + maxHeight += rcBorder.Height() + 2*m_sizeRootBorders.cy; + maxHeight = max(maxHeight, minHeight); + } + + if(rcWindow.Width() < minWidth) + rcWindow.right = rcWindow.left + minWidth; + if(rcWindow.Height() < minHeight) + rcWindow.bottom = rcWindow.top + minHeight; + + if(maxWidth != -1 && rcWindow.Width() > maxWidth) + rcWindow.right = rcWindow.left + maxWidth; + if(maxHeight != -1 && rcWindow.Height() > maxHeight) + rcWindow.bottom = rcWindow.top + maxHeight; + + m_pWnd->MoveWindow(rcWindow); + } + // Do the Layout + rcClient = GetRect(); + + // Add a Border around the rootPane + rcClient.top += m_sizeRootBorders.cy; + rcClient.bottom -= m_sizeRootBorders.cy; + rcClient.left += m_sizeRootBorders.cx; + rcClient.right -= m_sizeRootBorders.cx; + + if(GetWnd()->IsWindowVisible()) { + // Avoid ugly artifacts + //GetWnd()->SetRedraw(FALSE); + Layout(rcClient); + //GetWnd()->SetRedraw(TRUE); + } + else + Layout(rcClient); + + GetWnd()->Invalidate(); +} + + +bool ETSLayoutMgr::Save(LPCTSTR lpstrRegKey) +{ + CRect rcWnd; + + if(IsWindow(GetWnd()->m_hWnd)) + { + WINDOWPLACEMENT wp; + if(GetWnd()->GetWindowPlacement(&wp)) + { + // Make sure we don't pop up + // minimized the next time + if(wp.showCmd != SW_SHOWMAXIMIZED) + wp.showCmd = SW_SHOWNORMAL; + + AfxGetApp()->WriteProfileBinary(lpstrRegKey, + "WindowPlacement", + reinterpret_cast(&wp), sizeof(wp)); + } + } + return true; +} + +bool ETSLayoutMgr::Load(LPCTSTR lpstrRegKey) +{ + LPBYTE pbtData = 0; + UINT nSize = 0; + if(AfxGetApp()->GetProfileBinary(lpstrRegKey, + "WindowPlacement", &pbtData, &nSize)) + { + WINDOWPLACEMENT* pwp = + reinterpret_cast(pbtData); + + ASSERT(nSize == sizeof(WINDOWPLACEMENT)); + if(nSize == sizeof(WINDOWPLACEMENT)) + GetWnd()->SetWindowPlacement(reinterpret_cast(pbtData)); + + delete [] pbtData; + } + return true; +} + + +void ETSLayoutMgr::EraseBkgnd(CDC* pDC) +{ + CRect rcClient; + GetWnd()->GetClientRect( rcClient ); + + CRgn rgn; + rgn.CreateRectRgnIndirect(rcClient); + + CRgn rgnRect; + rgnRect.CreateRectRgn(0,0,0,0); + + CRect rcChild; + CWnd* pWndChild = GetWnd()->GetWindow( GW_CHILD ); + + TCHAR szClassName[ MAX_PATH ]; + + CRect rcClip; + pDC->GetClipBox(&rcClip); + + while( pWndChild ) { + + pWndChild->GetWindowRect(rcChild); + GetWnd()->ScreenToClient( rcChild ); + + rgnRect.SetRectRgn( rcChild ); + + ::GetClassName( pWndChild->GetSafeHwnd(), szClassName, MAX_PATH ); + DWORD dwStyle = pWndChild->GetStyle(); + + // doesn't make sense for hidden children + if( dwStyle & WS_VISIBLE ) { + + if( _tcscmp(szClassName,"Button")==0 && (dwStyle & BS_GROUPBOX) ) { + // it is a group-box, ignore completely + } + else if( _tcscmp(szClassName,"SysTabControl32")==0 ) { + // ignore Tab-Control's inside rect + static_cast(pWndChild)->AdjustRect(FALSE,rcChild); + + CRgn rgnContent; + rgnContent.CreateRectRgnIndirect(rcChild); + + rgnRect.CombineRgn( &rgnRect, &rgnContent, RGN_DIFF ); + rgn.CombineRgn( &rgn, &rgnRect, RGN_DIFF ); + } + else { + rgn.CombineRgn( &rgn, &rgnRect, RGN_DIFF ); + } + } + + pWndChild = pWndChild->GetNextWindow(); + } + + + HBRUSH hBrBack = (HBRUSH) ::GetClassLong(GetWnd()->GetSafeHwnd(), GCL_HBRBACKGROUND) ; + if( hBrBack == 0 ) + hBrBack = ::GetSysColorBrush(COLOR_BTNFACE); + + pDC->FillRgn( &rgn, + CBrush::FromHandle( hBrBack ) + ); + +} + +///////////////////////////////////////////////////////////////////////////// +// ETSLayoutMgr::PaneItem implementation + + +ETSLayoutMgr::PaneItem::PaneItem(CWnd* pWnd, ETSLayoutMgr* pMgr, ETSLayoutMgr::layResizeMode modeResize/*=GREEDY*/ + , int sizeX/*=0*/, int sizeY/*=0*/ + , int sizeXMin/*=-1*/, int sizeYMin/*=-1*/ ) : PaneBase( pMgr ) +{ + m_modeResize = modeResize; + m_hwndCtrl = pWnd->GetSafeHwnd(); + + m_sizeX = 0; + m_sizeY = 0; + + m_bComboSpecial = false; + + m_sizeXMin = sizeXMin; + m_sizeYMin = sizeYMin; + + if(!m_hwndCtrl) { // only Dummy! + m_sizeX = sizeX; + m_sizeY = sizeY; + } + else { + CRect rcControl; + ::GetWindowRect(m_hwndCtrl, &rcControl); + + if(sizeX == 0) { + m_sizeX = rcControl.Width(); + } + else { + m_sizeX = sizeX; + } + if( m_sizeXMin == -1 ) { + // do not make smaller than current size + m_sizeXMin = rcControl.Width(); + } + + if(sizeY == 0) { + m_sizeY = rcControl.Height(); + } + else { + m_sizeY = sizeY; + } + if( m_sizeYMin == -1 ) { + // do not make smaller than current size + m_sizeYMin = rcControl.Height(); + } + + TCHAR szClassName[ MAX_PATH ]; + ::GetClassName( m_hwndCtrl, szClassName, MAX_PATH ); + + // special treatment for combo-boxes + if( _tcscmp(szClassName,"ComboBox")==0 ) { + m_bComboSpecial = true; + } + } +} + +ETSLayoutMgr::PaneItem::PaneItem( UINT nID, ETSLayoutMgr* pMgr, ETSLayoutMgr::layResizeMode modeResize/*=GREEDY*/ + , int sizeX/*=0*/, int sizeY/*=0*/ + , int sizeXMin/*=-1*/, int sizeYMin/*=-1*/ ) : PaneBase( pMgr ) +{ + CWnd* pWnd = pMgr->GetWnd()->GetDlgItem(nID); + m_hwndCtrl = pWnd->GetSafeHwnd(); + + m_sizeX = 0; + m_sizeY = 0; + + m_bComboSpecial = false; + + m_modeResize = modeResize; + + m_sizeXMin = sizeXMin; + m_sizeYMin = sizeYMin; + + if(!m_hwndCtrl) { // only Dummy! + m_sizeX = sizeX; + m_sizeY = sizeY; + } + else { + CRect rcControl; + ::GetWindowRect(m_hwndCtrl, &rcControl); + + if(sizeX == 0) { + m_sizeX = rcControl.Width(); + } + else { + m_sizeX = sizeX; + } + if( m_sizeXMin == -1 ) { + // do not make smaller than current size + m_sizeXMin = rcControl.Width(); + } + + if(sizeY == 0) { + m_sizeY = rcControl.Height(); + } + else { + m_sizeY = sizeY; + } + if( m_sizeYMin == -1 ) { + // do not make smaller than current size + m_sizeYMin = rcControl.Height(); + } + + TCHAR szClassName[ MAX_PATH ]; + ::GetClassName( m_hwndCtrl, szClassName, MAX_PATH ); + + // special treatment for combo-boxes + if( _tcscmp(szClassName,"ComboBox")==0 ) { + m_bComboSpecial = true; + } + } +} + +int ETSLayoutMgr::PaneItem::getConstrainHorz(int sizeParent) +{ + if( m_modeResize & ABSOLUTE_HORZ) { + return m_sizeX; + } + if(m_modeResize & RELATIVE_HORZ) { + return (sizeParent * m_sizeX) / 100; + } + return -1; +} + +int ETSLayoutMgr::PaneItem::getConstrainVert(int sizeParent) +{ + if(m_modeResize & ABSOLUTE_VERT) { + return m_sizeY; + } + if(m_modeResize & RELATIVE_VERT) { + return (sizeParent * m_sizeY) / 100; + } + return -1; +} + +int ETSLayoutMgr::PaneItem::getMinConstrainHorz() +{ + if(m_modeResize & ABSOLUTE_HORZ) { + return m_sizeX; + } + return max(nMinConstrain,m_sizeXMin); +} + +int ETSLayoutMgr::PaneItem::getMinConstrainVert() +{ + if(m_modeResize & ABSOLUTE_VERT) { + return m_sizeY; + } + return max(nMinConstrain,m_sizeYMin); +} + +int ETSLayoutMgr::PaneItem::getMaxConstrainHorz() +{ + if(m_modeResize & ABSOLUTE_HORZ) { + return m_sizeX; + } + return -1; +} + +int ETSLayoutMgr::PaneItem::getMaxConstrainVert() +{ + if(m_modeResize & ABSOLUTE_VERT) { + return m_sizeY; + } + return -1; +} + +bool ETSLayoutMgr::PaneItem::resizeTo(CRect& rcNewArea) +{ + if(m_hwndCtrl) { + + CRect rcWnd; + ::GetWindowRect( m_hwndCtrl, rcWnd ); + + if( !(m_modeResize & ALIGN_FILL_HORZ) && m_modeResize & ABSOLUTE_HORZ ) { + + + if( (m_modeResize & ALIGN_HCENTER) == ALIGN_HCENTER ) { + rcNewArea.OffsetRect( (rcNewArea.Width() - rcWnd.Width())/2, 0 ); + } + else if( m_modeResize & ALIGN_RIGHT ) { + rcNewArea.OffsetRect( rcNewArea.Width() - rcWnd.Width(), 0 ); + } + + rcNewArea.right = rcNewArea.left + rcWnd.Width(); + } + if( !(m_modeResize & ALIGN_FILL_VERT) && m_modeResize & ABSOLUTE_VERT ) { + + + if( (m_modeResize & ALIGN_VCENTER) == ALIGN_VCENTER ) { + rcNewArea.OffsetRect( 0, (rcNewArea.Height()-rcWnd.Height())/2 ); + } + else if( m_modeResize & ALIGN_BOTTOM ) { + rcNewArea.OffsetRect( 0, rcNewArea.Height() - rcWnd.Height()); + } + + rcNewArea.bottom = rcNewArea.top + rcWnd.Height(); + + } + + DWORD dwStyle = ::GetWindowLong( m_hwndCtrl, GWL_STYLE ); + + // special treatment for combo-boxes + if( m_bComboSpecial && (dwStyle & CBS_DROPDOWN) ) { + // keep height (though only fully visible when dropped down) + rcNewArea.bottom = rcNewArea.top + rcWnd.Height(); + } + + ::MoveWindow( m_hwndCtrl, rcNewArea.left, rcNewArea.top, rcNewArea.Width(), rcNewArea.Height(), true ); + + if( m_bComboSpecial && !(dwStyle & CBS_DROPDOWN) && !(dwStyle & CBS_NOINTEGRALHEIGHT) ) { + + // Keep CB Size = Edit + LB ( if not CBS_NOINTEGRALHEIGHT) + + ::GetWindowRect( m_hwndCtrl, rcWnd ); + + CRect rcListBox; + HWND hwndListBox = ::GetDlgItem(m_hwndCtrl, 1000); // ListBox of CB + if( hwndListBox != 0 ) + { + ::GetWindowRect( hwndListBox, rcListBox ); + rcWnd.bottom = rcListBox.bottom; + + rcNewArea.bottom = rcNewArea.top + rcWnd.Height(); + + ::MoveWindow( m_hwndCtrl, rcNewArea.left, rcNewArea.top, rcNewArea.Width(), rcNewArea.Height(), true ); + } + } + + ::RedrawWindow(m_hwndCtrl,0,0, RDW_INVALIDATE | RDW_UPDATENOW ); + + } + return true; +} + + +///////////////////////////////////////////////////////////////////////////// +// ETSLayoutMgr::PaneTab implementation + + +ETSLayoutMgr::PaneTab::PaneTab( CTabCtrl* pTab, ETSLayoutMgr* pMgr, layOrientation orientation, int sizeBorder /*= nDefaultBorder*/, int sizeExtraBorder /*= 0*/ ) +: ETSLayoutMgr::Pane(pMgr, orientation, sizeBorder, sizeExtraBorder) +{ + ASSERT(pTab); + m_pTab = pTab; +} + +int ETSLayoutMgr::PaneTab::getConstrainHorz(int sizeParent) +{ + CRect rcTab; + m_pTab->AdjustRect(TRUE, &rcTab); + + if(rcTab.Width() > sizeParent) + return rcTab.Width(); + + return Pane::getConstrainHorz(sizeParent /*- rcTab.Width()*/); +} + +int ETSLayoutMgr::PaneTab::getConstrainVert(int sizeParent) +{ + CRect rcTab; + m_pTab->AdjustRect(TRUE, &rcTab); + + if( m_modeResize & ABSOLUTE_VERT ) { + return m_sizeSecondary + rcTab.Height(); + } + + if(rcTab.Height() > sizeParent) + return rcTab.Height(); + + return Pane::getConstrainVert(sizeParent /*- rcTab.Height()*/); +} + +int ETSLayoutMgr::PaneTab::getMinConstrainHorz() +{ + CRect rcTab(0,0,0,0); + m_pTab->AdjustRect(TRUE, &rcTab); + + return Pane::getMinConstrainHorz() + rcTab.Width() ; +} + +int ETSLayoutMgr::PaneTab::getMinConstrainVert() +{ + CRect rcTab(0,0,0,0); + m_pTab->AdjustRect(TRUE, &rcTab); + + return Pane::getMinConstrainVert() + rcTab.Height(); +} + +int ETSLayoutMgr::PaneTab::getMaxConstrainHorz() +{ + CRect rcTab(0,0,0,0); + m_pTab->AdjustRect(TRUE, &rcTab); + + int paneMax = Pane::getMaxConstrainHorz(); + return (paneMax != -1) ? paneMax + rcTab.Width() : -1; +} + +int ETSLayoutMgr::PaneTab::getMaxConstrainVert() +{ + CRect rcTab(0,0,0,0); + m_pTab->AdjustRect(TRUE, &rcTab); + + int paneMax = Pane::getMaxConstrainVert(); + return (paneMax != -1) ? paneMax + rcTab.Height() : -1; +} + +bool ETSLayoutMgr::PaneTab::resizeTo(CRect& rcNewArea) +{ + m_pTab->MoveWindow(rcNewArea); + m_pTab->AdjustRect(FALSE,rcNewArea); + + return Pane::resizeTo(rcNewArea); +} + +///////////////////////////////////////////////////////////////////////////// +// ETSLayoutMgr::PaneCtrl implementation + + +ETSLayoutMgr::PaneCtrl::PaneCtrl( CWnd* pCtrl, ETSLayoutMgr* pMgr, layOrientation orientation, int sizeBorder /*= nDefaultBorder*/, int sizeExtraBorder /*= 0*/, int sizeTopExtra /*= 0*/ ) +: ETSLayoutMgr::Pane(pMgr, orientation, sizeBorder, sizeExtraBorder) +{ + m_sizeTopExtra = sizeTopExtra; + + ASSERT(pCtrl); + m_hwndCtrl = pCtrl->GetSafeHwnd(); +} + +ETSLayoutMgr::PaneCtrl::PaneCtrl( UINT nID, ETSLayoutMgr* pMgr, layOrientation orientation, int sizeBorder /*= nDefaultBorder*/, int sizeExtraBorder /*= 0*/, int sizeTopExtra /*= 0*/ ) +: ETSLayoutMgr::Pane(pMgr, orientation, sizeBorder, sizeExtraBorder) +{ + m_sizeTopExtra = sizeTopExtra; + + m_hwndCtrl = ::GetDlgItem(pMgr->GetWnd()->GetSafeHwnd(), nID); + ASSERT(m_hwndCtrl); +} + +int ETSLayoutMgr::PaneCtrl::getConstrainHorz(int sizeParent) +{ + return Pane::getConstrainHorz(sizeParent) ; +} + +int ETSLayoutMgr::PaneCtrl::getConstrainVert(int sizeParent) +{ + return Pane::getConstrainVert(sizeParent); +} + +int ETSLayoutMgr::PaneCtrl::getMinConstrainHorz() +{ + return Pane::getMinConstrainHorz(); +} + +int ETSLayoutMgr::PaneCtrl::getMinConstrainVert() +{ + return Pane::getMinConstrainVert() + m_sizeTopExtra; +} + +int ETSLayoutMgr::PaneCtrl::getMaxConstrainHorz() +{ + int paneMax = Pane::getMaxConstrainHorz(); + return ( paneMax == -1) ? -1 : paneMax ; +} + +int ETSLayoutMgr::PaneCtrl::getMaxConstrainVert() +{ + int paneMax = Pane::getMaxConstrainVert(); + return ( paneMax == -1) ? -1 : paneMax + m_sizeTopExtra; +} + +bool ETSLayoutMgr::PaneCtrl::resizeTo(CRect& rcNewArea) +{ + ::MoveWindow(m_hwndCtrl, rcNewArea.left, rcNewArea.top, rcNewArea.Width(), rcNewArea.Height(), true); + ::RedrawWindow(m_hwndCtrl,0,0, RDW_INVALIDATE | RDW_UPDATENOW |RDW_ERASE); + rcNewArea.top += m_sizeTopExtra; + return Pane::resizeTo(rcNewArea); +} + +///////////////////////////////////////////////////////////////////////////// +// ETSLayoutMgr::Pane implementation + +ETSLayoutMgr::Pane::Pane( ETSLayoutMgr* pMgr, layOrientation orientation, int sizeBorder /* = nDefaultBorder */, int sizeExtraBorder /*= 0*/) +: PaneBase(pMgr) +{ + m_Orientation = orientation; + m_sizeBorder = sizeBorder; + m_sizeSecondary = 0; + m_modeResize = 0; + m_sizeExtraBorder= sizeExtraBorder; +} + + +ETSLayoutMgr::Pane::~Pane() +{ +} + + +bool ETSLayoutMgr::Pane::addItem( CWnd* pWnd, ETSLayoutMgr::layResizeMode modeResize /*=GREEDY*/, int sizeX /*=0*/, int sizeY /*=0*/, int sizeXMin /*=0*/, int sizeYMin /*=0*/) +{ + CPaneBase pItem = new PaneItem( pWnd, m_pMgr, modeResize, sizeX, sizeY, sizeXMin, sizeYMin); + return addPane( pItem ); +} + +bool ETSLayoutMgr::Pane::addItem( UINT nID, ETSLayoutMgr::layResizeMode modeResize /*=GREEDY*/, int sizeX /*=0*/, int sizeY /*=0*/, int sizeXMin /*=0*/, int sizeYMin /*=0*/) +{ + CPaneBase pItem = new PaneItem( nID, m_pMgr, modeResize, sizeX, sizeY, sizeXMin, sizeYMin); + return addPane( pItem ); +} + +bool ETSLayoutMgr::Pane::addItemFixed(int size) +{ + CPaneBase pNewItem = m_pMgr->itemFixed(m_Orientation, size); + return addPane( pNewItem ); +} + +bool ETSLayoutMgr::Pane::addItemGrowing() +{ + CPaneBase pNewItem = m_pMgr->itemGrowing(m_Orientation); + return addPane( pNewItem ); +} + +bool ETSLayoutMgr::Pane::addItemSpaceBetween( CWnd* pWndFirst, CWnd* pWndSecond ) +{ + CPaneBase pNewItem = m_pMgr->itemSpaceBetween(m_Orientation, pWndFirst, pWndSecond); + return addPane( pNewItem ); +} + +bool ETSLayoutMgr::Pane::addItemSpaceBetween( UINT nIDFirst, UINT nIDSecond ) +{ + CPaneBase pNewItem = m_pMgr->itemSpaceBetween(m_Orientation, nIDFirst, nIDSecond); + return addPane( pNewItem ); +} + +bool ETSLayoutMgr::Pane::addItemSpaceLike( CWnd* pWnd ) +{ + CPaneBase pNewItem = m_pMgr->itemSpaceLike(m_Orientation, pWnd); + return addPane( pNewItem ); +} + +bool ETSLayoutMgr::Pane::addItemSpaceLike( UINT nID ) +{ + CPaneBase pNewItem = m_pMgr->itemSpaceLike(m_Orientation, nID); + return addPane( pNewItem ); +} + +bool ETSLayoutMgr::Pane::addPane( CPane pSubpane, ETSLayoutMgr::layResizeMode modeResize, int sizeSecondary /* = 0 */) +{ + if( pSubpane->getOrientation() == m_Orientation) + { + // wrap in subpane of opposite orientation + CPane pPaneWrap = new Pane(m_pMgr, m_Orientation==HORIZONTAL?VERTICAL:HORIZONTAL,0,0); + pPaneWrap->addPane( pSubpane ); + + addPane( pPaneWrap, modeResize, sizeSecondary ); + } + else + { + pSubpane->m_modeResize = modeResize; + + if(m_Orientation==HORIZONTAL && (modeResize & ABSOLUTE_HORZ) ) { + if(sizeSecondary == 0) { + pSubpane->m_sizeSecondary = pSubpane->getMinConstrainHorz(); + } + } + else if(m_Orientation==HORIZONTAL && (modeResize & RELATIVE_HORZ) ) { + pSubpane->m_sizeSecondary = sizeSecondary; + } + else if(m_Orientation==VERTICAL && (modeResize & ABSOLUTE_VERT) ) { + if(sizeSecondary == 0) { + pSubpane->m_sizeSecondary = pSubpane->getMinConstrainVert(); + } + } + else if(m_Orientation==VERTICAL && (modeResize & RELATIVE_VERT) ) { + pSubpane->m_sizeSecondary = sizeSecondary; + } + + m_paneItems.Add(pSubpane); + } + + return true; +} + +bool ETSLayoutMgr::Pane::addPane( CPaneBase pItem ) +{ + m_paneItems.Add(pItem); + return true; +} + +int ETSLayoutMgr::Pane::getConstrainHorz(int sizeParent) +{ + ASSERT( m_Orientation == VERTICAL); + + if( m_modeResize & RELATIVE_HORZ ) { + return (sizeParent * m_sizeSecondary) / 100; + } + else if( m_modeResize & ABSOLUTE_HORZ ){ + return m_sizeSecondary; + } + else + return 0; +} + + +int ETSLayoutMgr::Pane::getConstrainVert(int sizeParent) +{ + ASSERT( m_Orientation == HORIZONTAL); + + if( m_modeResize & RELATIVE_VERT ) { + return (sizeParent * m_sizeSecondary) / 100; + } + else if( m_modeResize & ABSOLUTE_VERT ) { + return m_sizeSecondary; + } + else { + return 0; + } +} + +int ETSLayoutMgr::Pane::getMaxConstrainHorz() +{ + if(m_Orientation == HORIZONTAL) { + int nMaxConstr = -1; + for(int i=0; igetMaxConstrainHorz(); + if(nConstrain == -1) + return -1; + + nMaxConstr += nConstrain; + } + return (nMaxConstr == -1) ? -1 : nMaxConstr + (m_paneItems.GetUpperBound()*m_sizeBorder) + 2*m_sizeExtraBorder; + } + else if( m_modeResize & ABSOLUTE_HORZ && m_sizeSecondary!=0) { + return m_sizeSecondary; // + 2*m_sizeExtraBorder; + } + else { + int nMaxConstr = -1; + for(int i=0; igetMaxConstrainHorz(); + + if( nConstrain == -1) + return -1; + else + nMaxConstr = max(nMaxConstr, nConstrain); + + } + return (nMaxConstr == -1) ? -1 : nMaxConstr + 2*m_sizeExtraBorder; + } +} + +int ETSLayoutMgr::Pane::getMaxConstrainVert() +{ + if(m_Orientation == VERTICAL) { + int nMaxConstr = -1; + for(int i=0; igetMaxConstrainVert(); + if(nConstrain == -1) + return -1; + + nMaxConstr += nConstrain; + } + return (nMaxConstr == -1) ? -1 : nMaxConstr + (m_paneItems.GetUpperBound()*m_sizeBorder) + 2*m_sizeExtraBorder; + } + else if( m_modeResize & ABSOLUTE_VERT && m_sizeSecondary!=0) { + return m_sizeSecondary; // + 2*m_sizeExtraBorder; + } + else { + int nMaxConstr = -1; + for(int i=0; igetMaxConstrainVert(); + + if( nConstrain == -1) + return -1; + else + nMaxConstr = max(nMaxConstr, nConstrain); + + } + return (nMaxConstr == -1) ? -1 : nMaxConstr + 2*m_sizeExtraBorder; + } +} + +int ETSLayoutMgr::Pane::getMinConstrainHorz() +{ + if(m_Orientation == HORIZONTAL) { + int nMaxConstr = 0; + for(int i=0; igetMinConstrainHorz()); + } + return nMaxConstr + (m_paneItems.GetUpperBound()*m_sizeBorder) + 2*m_sizeExtraBorder; + } + else if( m_modeResize & ABSOLUTE_HORZ && m_sizeSecondary!=0) { + return m_sizeSecondary; // + 2*m_sizeExtraBorder; + } + else { + int nMaxConstr = 0; + for(int i=0; igetMinConstrainHorz(); + nMaxConstr = max(nMaxConstr, nConstrain); + } + return nMaxConstr + 2*m_sizeExtraBorder; + } +} + +int ETSLayoutMgr::Pane::getMinConstrainVert() +{ + if(m_Orientation == VERTICAL) { + int nMaxConstr = 0; + for(int i=0; igetMinConstrainVert()); + } + return nMaxConstr + (m_paneItems.GetUpperBound()*m_sizeBorder) + 2*m_sizeExtraBorder; + } + else if( m_modeResize & ABSOLUTE_VERT && m_sizeSecondary!=0) { + return m_sizeSecondary; // + 2*m_sizeExtraBorder; + } + else { + int nMaxConstr = 0; + for(int i=0; igetMinConstrainVert(); + nMaxConstr = max(nMaxConstr, nConstrain); + } + return nMaxConstr + 2*m_sizeExtraBorder; + } +} + + +int ETSLayoutMgr::Pane::resizeToAbsolute(int& availSpace, CArray& sizePrimary, + CArray& sizeMin, CArray& sizeMax) +{ + // count all greedy items as returnvalue + int nGreedy = 0; + + // first, subtract all absoulute items from available space + for(int i=0; imodeResize() & ABSOLUTE_HORZ) { + availSpace -= (sizePrimary[i] = pItem->getConstrainHorz(0)); + } + + // count Greedy items for later + if(!(pItem->modeResize() & ABSOLUTE_HORZ) && !(pItem->modeResize() & RELATIVE_HORZ)) { + nGreedy++; + } + + sizeMin[i] = pItem->getMinConstrainHorz(); + sizeMax[i] = pItem->getMaxConstrainHorz(); + } + else { + + // for absolute items subtract their size from available space + if(pItem->modeResize() & ABSOLUTE_VERT) { + availSpace -= (sizePrimary[i] = pItem->getConstrainVert(0)); + } + + // count Greedy items for later + if(!(pItem->modeResize() & ABSOLUTE_VERT) && !(pItem->modeResize() & RELATIVE_VERT)) { + nGreedy++; + } + + sizeMin[i] = pItem->getMinConstrainVert(); + sizeMax[i] = pItem->getMaxConstrainVert(); + } + + } + + // Must not be negative !! + availSpace = max(availSpace, 0); + + return nGreedy; +} + +bool ETSLayoutMgr::Pane::resizeToRelative(int& availSpace, CArray& sizePrimary, + CArray& sizeMin, CArray& sizeMax) +{ + // Then all relative items as percentage of left space (as of now after + // all absolute items are subtracted + + int availRel = availSpace; // At the beginning all of remaining space is available. We want all + // operation to be relative to the left space at this moment, so we + // save this amount here. Then we safly can lower availSpace + + int relDiff = 0; // The cumulated difference between first proposed size and + // eventual maximum/minimum size. This amount has to be + // saved in some other place (i.e. where relativ items/subpane + // are not limited by min/max + + int relLeft = 0; // The cumulated amout of space that can be saved by + // shrinking the items/panes up to the minimum + + int relCount = 0; // Actually allocated item/subpane's cumulated primary sizes + // of non-limited items/subpanes (these can be modified in fixup) + // needed for equally distribution of differences amoung non-limited + // relative items/subpanes + + for(int i=0; imodeResize() & RELATIVE_HORZ) + || + (m_Orientation==VERTICAL && pItem->modeResize() & RELATIVE_VERT) ) + { + // minimum item/subpane size in primary direction (pixels) + int nSizeRelMin = sizeMin[i]; + + // maximum item/subpane size in primary direction (pixels) + int nSizeRelMax = sizeMax[i]; + + // Relative size in primary direction (pixels) + int nSizeRel = (m_Orientation==HORIZONTAL) + ? + (pItem->getConstrainHorz(availRel)) + : + (pItem->getConstrainVert(availRel)); + + if( nSizeRel < nSizeRelMin) { + // The item/pane is shrinked too small! + // We will grow it to it's minimum-size. In order not to modify + // this item later when fixing up set the size to the negative + // minimum size + sizePrimary[i] = -nSizeRelMin; + + // As we grew one item/subpane we have to shrink another one. + // We keep count on how much space we needed to grow the item + // to it's minimum size + relDiff += ( nSizeRelMin - nSizeRel ); + } + else if( nSizeRelMax != -1 && nSizeRel > nSizeRelMax) { + // if there's a maximum size (nSizeRelMax != -1) and our item/subpane + // is to be resized over that amount correct it. In order not to modify + // this item later when fixing up set the size to the negative + // maximum size + sizePrimary[i] = -nSizeRelMax; + + // As we shrinked one item/subpane we have to grow another one. + // We keep count on how much space we needed to grow the item + // to it's maximum size. + relDiff += ( nSizeRelMax - nSizeRel ); + } + else { + // this is the normal case: neither are we minimum limited nor maximum + // limited + + // As this item/subpane is larger that it's minimum we could later (if + // necessary for fixup) shrink it for the difference amount of pixels + relLeft += ( nSizeRel - nSizeRelMin ); + + // Set the primary size of this item/pane. Can later be modified by fixup + sizePrimary[i] = nSizeRel; + + // Add this item/subpane's primary size to the count of already allocated + // cumulated size of non-limited items/subpanes (these can be modified in fixup) + relCount += nSizeRel; + } + + // decrease available space by used space in this step + availSpace -= nSizeRel; + } + } + + // We now have the situation that some items/subpanes had to be adjusted for cumulated + // relDiff pixels (positive value means more space taken than indicated by percentage of + // left space). On the other hand we have some items/subpanes which were not limited (in + // their current dimensions) but could be if necessary up to relLeft pixels. + if(relLeft < relDiff && availSpace >= (relDiff-relLeft) ){ + + // If it's not possible to shrink other (relative) panes in order to distribute the + // difference because the left for shrinking (relLeft) is too small we need to aquire + // more space from the globally left space (if available at all) + availSpace -= (relDiff-relLeft); + relDiff = relLeft; + } + + // At this point we should have some space left (at least not be negative with the leftover + // space) and on the other hand there's enough space for the limit-difference to be distributed + ASSERT( availSpace >= 0 && relLeft >= relDiff); + + // Fixup Relative: + // Distribute (if anecessary) relDiff on other (not limited) relative items/subpanes + // (if available - if not later just grow the limited panes) + while( relDiff != 0 && relCount >= 0 ) { + + // in every iteration there must be some space distributed (of the difference) or it could + // come to endless looping. Save the amount of space actually distributed in this iteration + int relDist = 0; + + for(i=0; imodeResize() & RELATIVE_HORZ) && sizePrimary[i] > 0) + || + (m_Orientation==VERTICAL && (pItem->modeResize() & RELATIVE_VERT) && sizePrimary[i] > 0) ) + { + // keep a flag for termination of this iteration + bool bLast = false; + + // the difference should be distributed amoung all non-limited items/subpanes equally. + // nDiff is the amount for the current item/subpane + int nDiff = (relDiff * sizePrimary[i]) / relCount; + + // if it's a too small value just add it to the current pane and break iteration + if( abs(relDiff) <= FIXUP_CUTOFF ) { + // take it all in this step + nDiff = relDiff; + + // set break flag + bLast = true; + } + + // calculate the new size for the current item/subpane + int nNewSize = sizePrimary[i] - nDiff; + + if( nNewSize < sizeMin[i] ) { + // oh, we are limited here. Revise our plan: + + // Not all of the space could be saved, add the actually possible space + // to the sum + relDist += ( sizePrimary[i] - sizeMin[i] ); + + // set it to the minimum possible size + sizePrimary[i] = -sizeMin[i]; + + // as this item/subpane is now limited it's occupied space doesn't count + // for relCount anymore + relCount-= ( sizePrimary[i] ); + } + else { + // account the difference of the sizes in relDist and set new size + relDist += ( sizePrimary[i] - nNewSize ); + sizePrimary[i] = nNewSize; + + // if it's the last one break now + if(bLast) + break; + } + } + } + // Distributed some relDiff-space in every iteration + ASSERT(relDist != 0); + relDiff -= relDist; + } + + // Fixup Relative: invert all negative (limited) sized to correct value + for(i=0; imodeResize() & RELATIVE_HORZ) && sizePrimary[i] < 0) + || + (m_Orientation==VERTICAL && (pItem->modeResize() & RELATIVE_VERT) && sizePrimary[i] < 0) ) + { + sizePrimary[i] *= -1; + } + } + + return true; +} + +bool ETSLayoutMgr::Pane::resizeToGreedy(int& availSpace, int nGreedy, CArray& sizePrimary, + CArray& sizeMin, CArray& sizeMax) +{ + // Now resize all Greedy items/subpanes equally among the remaining space + int greedyDiff = 0; // The cumulated difference between first proposed size and + // eventual maximum/minimum size. This amount has to be + // saved in some other place (i.e. where items/subpane + // are not limited by min/max + + int greedyLeft = 0; // The cumulated amount of space that can be saved by + // shrinking the items/panes up to the minimum + + int greedyCount = 0; // Actually allocated item/subpane's cumulated primary sizes + // of non-limited items/subpanes (these can be modified in fixup) + // needed for equally distribution of differences amoung non-limited + // items/subpanes + + for(int i=0; imodeResize()&ABSOLUTE_HORZ) + && !(pItem->modeResize()&RELATIVE_HORZ) + ) + || + (m_Orientation==VERTICAL + && !(pItem->modeResize()&ABSOLUTE_VERT) + && !(pItem->modeResize()&RELATIVE_VERT) + ) + ) + { + + // All greedy items get an equal portion of the left space + int nSize = availSpace / nGreedy; + + // minimum item/subpane size in primary direction (pixels) + int nSizeMin = sizeMin[i]; + + // maximum item/subpane size in primary direction (pixels) + int nSizeMax = sizeMax[i]; + + + // the last gets the all of the remaining space + if( nGreedy == 1 ) + nSize = availSpace; + + if( nSize < nSizeMin) { + // The item/pane is shrinked too small! + // We will grow it to it's minimum-size. In order not to modify + // this item later when fixing up set the size to the negative + // minimum size + sizePrimary[i] = -nSizeMin; + + // As we grew one item/subpane we have to shrink another one. + // We keep count on how much space we needed to grow the item + // to it's minimum size + greedyDiff += ( nSizeMin - nSize ); + } + else if( nSizeMax != -1 && nSize > nSizeMax) { + // if there's a maximum size (nSizeRelMax != -1) and our item/subpane + // is to be resized over that amount correct it. In order not to modify + // this item later when fixing up set the size to the negative + // maximum size + sizePrimary[i] = -nSizeMax; + + // As we shrinked one item/subpane we have to grow another one. + // We keep count on how much space we needed to grow the item + // to it's maximum size. + greedyDiff += ( nSizeMax - nSize ); + } + else { + + // this is the normal case: neither are we minimum limited nor maximum + // limited + + // As this item/subpane is larger that it's minimum we could later (if + // necessary for fixup) shrink it for the difference amount of pixels + greedyLeft += ( nSize - nSizeMin ); + + // Set the primary size of this item/pane. Can later be modified by fixup + sizePrimary[i] = nSize; + + // Add this item/subpane's primary size to the count of already allocated + // cumulated size of non-limited items/subpanes (these can be modified in fixup) + greedyCount += nSize; + } + + // decrease available space by used space in this step + availSpace -= nSize; + + // one greedy item/subpane complete + --nGreedy; + } + } + + + // Fixup Greedy I + // Distribute (if anecessary) greedyDiff on other (not limited) greedy items/subpanes + // (if available - if not later just grow the limited panes) + + // at least on not limited item present + bool bAtLeastOne = true; + + while( bAtLeastOne && greedyDiff != 0 && greedyCount > 0) { + + // in every iteration there must be some space distributed (of the difference) or it could + // come to endless looping. Save the amount of space actually distributed in this iteration + int greedyDist = 0; + + // at least on not limited item present + bAtLeastOne = false; + + for(i=0; imodeResize()&ABSOLUTE_HORZ) + && !(pItem->modeResize()&RELATIVE_HORZ) + && sizePrimary[i] > 0 + ) + || + (m_Orientation==VERTICAL + && !(pItem->modeResize()&ABSOLUTE_VERT) + && !(pItem->modeResize()&RELATIVE_VERT) + && sizePrimary[i] > 0 + ) + ) + { + // keep a flag for termination of this iteration + bool bLast = false; + + // the difference should be distributed among all non-limited items/subpanes equally. + // nDiff is the amount for the current item/subpane + int nDiff = (greedyDiff * sizePrimary[i]) / greedyCount; + + // if it's a too small value just add it to the current pane and break iteration + if( abs(greedyDiff) <= FIXUP_CUTOFF || nDiff == 0) { + // take it all in this step + nDiff = greedyDiff; + + // set break flag + bLast = true; + } + + // calculate the new size for the current item/subpane + int nNewSize = sizePrimary[i] - nDiff; + + if( nNewSize < sizeMin[i] ) { + // oh, we are limited here. Revise our plan: + + if( sizePrimary[i] != sizeMin[i] ) + bAtLeastOne = true; + + // Not all of the space could be saved, add the actually possible space + // to the sum + greedyDist += ( sizePrimary[i] - sizeMin[i] ); + + // set it to the minimum possible size + sizePrimary[i] = sizeMin[i]; + + // as this item/subpane is now limited its occupied space doesn't count + // for relCount anymore + greedyCount -= ( sizePrimary[i] ); + } + else { + // yes, there is one + bAtLeastOne = true; + + // account the difference of the sizes in relDist and set new size + greedyDist += ( sizePrimary[i] - nNewSize ); + sizePrimary[i] = nNewSize; + + // if it's the last one break now + if(bLast) + break; + } + } + } + // Distributed some greedyDiff-space in every iteration + ASSERT(!bAtLeastOne || greedyDist != 0 || greedyCount<=0); + greedyDiff -= greedyDist; + } + + + // Fixup Greedy II + if( greedyDiff < 0 ) { + // still difference, some space left + + // are there any items which are minimum-limited where we can give more space? + for(i=0; imodeResize()&ABSOLUTE_HORZ) + && !(pItem->modeResize()&RELATIVE_HORZ) + ) + || + (m_Orientation==VERTICAL + && !(pItem->modeResize()&ABSOLUTE_VERT) + && !(pItem->modeResize()&RELATIVE_VERT) + ) + ) + { + if( sizePrimary[i] == -sizeMin[i] ) { + // fill this one up as much as possible + if( sizeMax[i] == -1) { + // all fits in + sizePrimary[i] += greedyDiff; + greedyDiff = 0; + } + else { + sizePrimary[i] += -min( -greedyDiff, sizeMax[i]-sizeMin[i]); + greedyDiff -= -min( -greedyDiff, sizeMax[i]-sizeMin[i]); + } + } + } + } + } + + + // Fixup Greedy III: invert all negative (limited) sized to correct value + for(i=0; imodeResize() & ABSOLUTE_HORZ) + && !(pItem->modeResize() & RELATIVE_HORZ) + && sizePrimary[i] < 0 + && sizeMin[i] >= 0 + ) + || + (m_Orientation==VERTICAL + && !(pItem->modeResize() & ABSOLUTE_VERT) + && !(pItem->modeResize() & RELATIVE_VERT) + && sizePrimary[i] < 0 + && sizeMin[i] >= 0 + ) + ) + { + if(sizePrimary[i] < 0) + sizePrimary[i] *= -1; + } + } + + return true; +} + + +bool ETSLayoutMgr::Pane::resizeTo(CRect& rcNewArea) +{ + // There must be some items or subpanes + ASSERT(m_paneItems.GetSize()); + + // This Array holds the size in primary direction for each item/subpane + CArray sizePrimary; + sizePrimary.SetSize(m_paneItems.GetSize()); + + // This Array holds information about the minimum size in primary direction + CArray sizeMin; + sizeMin.SetSize(m_paneItems.GetSize()); + + // This Array holds information about the maximum size in primary direction + CArray sizeMax; + sizeMax.SetSize(m_paneItems.GetSize()); + + + // How much space is actually available, subtract all borders between items + int availSpace = (m_Orientation == HORIZONTAL ? rcNewArea.Width() : rcNewArea.Height() ) - (m_paneItems.GetUpperBound()*m_sizeBorder); + + // If there is some Extra border (on top/bottem resp. left/right) subtract it too + availSpace -= 2*m_sizeExtraBorder; + + // Add the extra Border to top/bottem resp. left/right + if(m_Orientation == HORIZONTAL) { + rcNewArea.top += m_sizeExtraBorder; + rcNewArea.bottom -= m_sizeExtraBorder; + } + else { + rcNewArea.left += m_sizeExtraBorder; + rcNewArea.right -= m_sizeExtraBorder; + } + + // Counts the number of greedy items/subpanes + int nGreedy = resizeToAbsolute(availSpace, sizePrimary, sizeMin, sizeMax ); + + if(nGreedy == -1) + return false; + + if(! resizeToRelative(availSpace, sizePrimary, sizeMin, sizeMax ) ) + return false; + + if(! resizeToGreedy(availSpace, nGreedy, sizePrimary, sizeMin, sizeMax ) ) + return false; + + + // If there is any left space and there are ALIGN_FILL_* Items to assign it + // equally among them + if( availSpace > 0 ) { + // Count possible Items + int nFillItems = 0; + + for(int i=0; imodeResize() & ABSOLUTE_HORZ ) + && (pItem->modeResize() & ALIGN_FILL_HORZ) + + || + + (pItem->modeResize() & ABSOLUTE_VERT ) + && (pItem->modeResize() & ALIGN_FILL_VERT) + ) + { + ++nFillItems; + } + } + + if( nFillItems > 0 ) { + // okay, there are nFillItems, make them all availSpace/nFillItems bigger + for(int i=0; imodeResize() & ABSOLUTE_HORZ ) + && (pItem->modeResize() & ALIGN_FILL_HORZ) + + || + + (pItem->modeResize() & ABSOLUTE_VERT ) + && (pItem->modeResize() & ALIGN_FILL_VERT) + ) + { + + if( nFillItems == 1 ) { + // the last one gets all the rest + sizePrimary[i] += availSpace; + availSpace = 0; + --nFillItems; + } + else { + sizePrimary[i] += availSpace/nFillItems; + availSpace -= availSpace/nFillItems; + --nFillItems; + } + + } + } + } + + } + + // Now reposition all items: + + // starting offset + int nOffset = (m_Orientation==HORIZONTAL ? rcNewArea.left : rcNewArea.top ) + m_sizeExtraBorder; + for(int i=0; iresizeTo( rcPane ); + + // go to the next position (old pos + size + border) + ASSERT(sizePrimary[i] >= 0); + nOffset += m_sizeBorder + sizePrimary[i]; + } + + + return true; +} + + +///////////////////////////////////////////////////////////////////////////// +// ETSLayoutDialog dialog + +#pragma warning(disable: 4355) +ETSLayoutDialog::ETSLayoutDialog(UINT nID, CWnd* pParent /*=NULL*/, LPCTSTR strName /*=NULL*/, bool bGripper /*=true*/) + : CBaseDialog(nID, pParent), ETSLayoutMgr( this ) +{ + //{{AFX_DATA_INIT(ETSLayoutDialog) + // NOTE: the ClassWizard will add member initialization here + //}}AFX_DATA_INIT + m_bGripper = bGripper; + + if(strName) + m_strRegStore = strName; +} +#pragma warning(default: 4355) + +BEGIN_MESSAGE_MAP(ETSLayoutDialog, CBaseDialog) + //{{AFX_MSG_MAP(ETSLayoutDialog) + ON_WM_SIZE() + ON_WM_GETMINMAXINFO() + ON_WM_ERASEBKGND() + ON_WM_DESTROY() + //}}AFX_MSG_MAP +END_MESSAGE_MAP() + + +///////////////////////////////////////////////////////////////////////////// +// ETSLayoutDialog message handlers + +BOOL ETSLayoutDialog::OnEraseBkgnd(CDC* pDC) +{ + EraseBkgnd(pDC); + return true; +} + +void ETSLayoutDialog::OnSize(UINT nType, int cx, int cy) +{ + CBaseDialog::OnSize(nType, cx, cy); + + if( abs(cx) + abs(cy) > 0) + { + // Reposition Size Marker + // Re-Layout all controls + UpdateLayout(); + RepositionBars(AFX_IDW_CONTROLBAR_FIRST, AFX_IDW_CONTROLBAR_LAST, 0); + } + +} + +void ETSLayoutDialog::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI) +{ + if(m_RootPane.IsValid()) { + CRect rcClient = GetRect(); + + CRect rcWnd; + GetWindowRect(rcWnd); + + // How much do Window and Client differ + int nDiffHorz = rcWnd.Width() - rcClient.Width(); + int nDiffVert = rcWnd.Height() - rcClient.Height(); + + // Take into account that there is a border around the rootPane + lpMMI->ptMinTrackSize = CPoint(m_RootPane->getMinConstrainHorz() + nDiffHorz + 2*m_sizeRootBorders.cx, + m_RootPane->getMinConstrainVert() + nDiffVert + 2*m_sizeRootBorders.cy); + + int maxWidth = m_RootPane->getMaxConstrainHorz(); + int maxHeight = m_RootPane->getMaxConstrainVert(); + + if( maxWidth != -1 ) { + lpMMI->ptMaxTrackSize.x = maxWidth + nDiffHorz + 2*m_sizeRootBorders.cx; + lpMMI->ptMaxSize.x = maxWidth + nDiffHorz + 2*m_sizeRootBorders.cx; + } + + if( maxHeight != -1 ) { + lpMMI->ptMaxTrackSize.y = maxHeight + nDiffVert + 2*m_sizeRootBorders.cy; + lpMMI->ptMaxSize.y = maxHeight + nDiffVert + 2*m_sizeRootBorders.cy; + } + } +} + + +CRect ETSLayoutDialog::GetRect() +{ + CRect r; + GetClientRect(r); + + if( m_bGripper ) + { + if( ::IsWindow(m_StatusBar.GetSafeHwnd()) ) + { + CRect rcSizeIcon; + m_StatusBar.GetWindowRect( rcSizeIcon); + r.bottom -= (rcSizeIcon.Height() - m_sizeRootBorders.cy - 5); + } + } + + return r; +} + + +BOOL ETSLayoutDialog::OnInitDialog() +{ + CBaseDialog::OnInitDialog(); + + if(!m_strRegStore.IsEmpty()) { + Load(m_strRegStore); + } + +#ifdef _AUTO_SET_ICON + POSITION pos = AfxGetApp()->GetFirstDocTemplatePosition(); + if(pos) { + + class ETSPseudoDocTemplate : public CDocTemplate + { + friend class ETSLayoutDialog; + }; + + ETSPseudoDocTemplate* pDocT = (ETSPseudoDocTemplate*) AfxGetApp()->GetNextDocTemplate(pos); + SetIcon( AfxGetApp()->LoadIcon(pDocT->m_nIDResource) ,FALSE); + } +#endif + + // Sizing icon + if(m_bGripper) + { + if(m_StatusBar.Create(m_pWnd)) + { + m_StatusBar.SetIndicators(auIDStatusBar, sizeof(auIDStatusBar) / sizeof(UINT)); + m_StatusBar.SetWindowText(""); + m_StatusBar.SetPaneStyle( 0, SBPS_STRETCH | SBPS_NOBORDERS ); + m_pWnd -> RepositionBars(AFX_IDW_CONTROLBAR_FIRST, AFX_IDW_CONTROLBAR_LAST, 0); + } + else + AfxMessageBox("Error - Statusbar"); + + } + return TRUE; // return TRUE unless you set the focus to a control + // EXCEPTION: OCX Property Pages should return FALSE +} + +void ETSLayoutDialog::OnDestroy() +{ + // Store size/position + if(!m_strRegStore.IsEmpty()) { + Save(m_strRegStore); + } + + // manually delete layout definition if object is reused + m_RootPane = 0; + + CBaseDialog::OnDestroy(); +} + +///////////////////////////////////////////////////////////////////////////// +// ETSLayoutDialog dialog + +#pragma warning(disable: 4355) +#ifdef CS_HELP +ETSLayoutDialogBar::ETSLayoutDialogBar(UINT nID ) + : CBaseDialogBar( nID ), ETSLayoutMgr( this ) +#else +ETSLayoutDialogBar::ETSLayoutDialogBar() + : ETSLayoutMgr( this ) +#endif +{ + //{{AFX_DATA_INIT(ETSLayoutDialogBar) + // NOTE: the ClassWizard will add member initialization here + //}}AFX_DATA_INIT + m_bInitialized = false; + setRootBorders(0,0); +} +#pragma warning(default: 4355) + +BEGIN_MESSAGE_MAP(ETSLayoutDialogBar, CBaseDialogBar) + //{{AFX_MSG_MAP(ETSLayoutDialogBar) + ON_WM_SIZE() + ON_WM_GETMINMAXINFO() + ON_WM_DESTROY() + ON_WM_ERASEBKGND() + ON_MESSAGE(WM_INITDIALOG, OnInitDialog) + //}}AFX_MSG_MAP +END_MESSAGE_MAP() + + +///////////////////////////////////////////////////////////////////////////// +// ETSLayoutDialogBar message handlers + +LRESULT ETSLayoutDialogBar::OnInitDialog(WPARAM, LPARAM) +{ + Default(); + Initialize(); + return TRUE; +} + +CSize ETSLayoutDialogBar::CalcDynamicLayout(int nLength, DWORD dwMode) +{ + CSize sizeRet = CBaseDialogBar::CalcDynamicLayout(nLength, dwMode); + + CSize sizeMin = sizeRet; + CSize sizeMax = sizeRet; + + if(m_RootPane.IsValid()) { + CRect rcClient = GetRect(); + + CRect rcWnd; + GetWindowRect(rcWnd); + + // How much do Window and Client differ + CSize sizeDiff( rcWnd.Width() - rcClient.Width(), rcWnd.Height() - rcClient.Height()); + + // Take into account that there is a border around the rootPane + sizeMin = CSize(m_RootPane->getMinConstrainHorz() + sizeDiff.cx + 2*m_sizeRootBorders.cx, + m_RootPane->getMinConstrainVert() + sizeDiff.cy + 2*m_sizeRootBorders.cy); + + + int maxWidth = m_RootPane->getMaxConstrainHorz(); + int maxHeight = m_RootPane->getMaxConstrainVert(); + + if( maxWidth != -1 ) { + sizeMax.cx = maxWidth + sizeDiff.cy + 2*m_sizeRootBorders.cx; + } + + if( maxHeight != -1 ) { + sizeMax.cy = maxHeight + sizeDiff.cy + 2*m_sizeRootBorders.cy; + } + } + + if( IsFloating() || !(dwMode&LM_HORZ)) + { + sizeRet.cx = min( sizeRet.cx, sizeMax.cx ); + } + if( IsFloating() || (dwMode&LM_HORZ)) + { + sizeRet.cy = min( sizeRet.cy, sizeMax.cy ); + } + + sizeRet.cx = max( sizeRet.cx, sizeMin.cx ); + sizeRet.cy = max( sizeRet.cy, sizeMin.cy ); + + return sizeRet; +} + +BOOL ETSLayoutDialogBar::OnEraseBkgnd(CDC* pDC) +{ + EraseBkgnd(pDC); + return true; +} + + +void ETSLayoutDialogBar::OnSize(UINT nType, int cx, int cy) +{ + CBaseDialogBar::OnSize(nType, cx, cy); + + if( abs(cx) + abs(cy) > 0) + { + // Re-Layout all controls + UpdateLayout(); + } + RepositionBars(AFX_IDW_CONTROLBAR_FIRST, AFX_IDW_CONTROLBAR_LAST, 0); + +} + + +CRect ETSLayoutDialogBar::GetRect() +{ + CRect r; + GetClientRect(r); + + if( IsFloating() ) + r.DeflateRect(4,4); + + return r; +} + + +void ETSLayoutDialogBar::OnDestroy() +{ + // Store size/position on your own! + CBaseDialogBar::OnDestroy(); +} + + + +///////////////////////////////////////////////////////////////////////////// +// ETSLayoutFormView dialog + +IMPLEMENT_DYNAMIC(ETSLayoutFormView, CFormView) + +#pragma warning(disable: 4355) +ETSLayoutFormView::ETSLayoutFormView(UINT nID, LPCTSTR strName /*=NULL*/) + : CBaseFormView(nID), ETSLayoutMgr( this ) +{ + if(strName) + m_strRegStore = strName; +} +#pragma warning(default: 4355) + +BEGIN_MESSAGE_MAP(ETSLayoutFormView, CBaseFormView) + //{{AFX_MSG_MAP(ETSLayoutFormView) + ON_WM_SIZE() + ON_WM_GETMINMAXINFO() + ON_WM_ERASEBKGND() + //}}AFX_MSG_MAP +END_MESSAGE_MAP() + + +///////////////////////////////////////////////////////////////////////////// +// ETSLayoutFormView message handlers + +BOOL ETSLayoutFormView::OnEraseBkgnd(CDC* pDC) +{ + EraseBkgnd(pDC); + return true; +} + + +void ETSLayoutFormView::OnSize(UINT nType, int cx, int cy) +{ +// CBaseFormView::OnSize(nType, cx, cy); + SetScrollSizes(MM_TEXT, CSize(cx,cy)); + if( abs(cx) + abs(cy) > 0) { + // Re-Layout all controls + UpdateLayout(); + } +// MoveWindow(0,0,cx,cy); +} + +/* +void ETSLayoutFormView::UpdateLayout() +{ + ETSLayoutMgr::UpdateLayout(); + + if(m_RootPane.IsValid()) { + // Force MainFrame to re-layout + CFrameWnd* pFrame = static_cast(GetParent()); + if(pFrame) { + + CRect rcWnd; + pFrame->GetWindowRect(rcWnd); + pFrame->MoveWindow(rcWnd); + pFrame->RecalcLayout(); + + } + return; + } +} +*/ + +void ETSLayoutFormView::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI) +{ + // To use this you'll have to modify your CMainFrame: + // + // 1) Add a handler for WM_GETMINMAXINFO() + // 2) Let this handler be: + // void CMainFrame::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI) + // { + // CFrameWnd::OnGetMinMaxInfo(lpMMI); + // + // if( GetActiveView() && GetActiveView()->IsKindOf( RUNTIME_CLASS(ETSLayoutFormView) ) ) { + // GetActiveView()->SendMessage( WM_GETMINMAXINFO, 0, (LPARAM) lpMMI ); + // } + // } + // 3) Add "#include "dialogmgr.h" to MainFrm.cpp + + if(m_RootPane.IsValid()) { + CRect rcClient = GetRect(); + + CRect rcWnd; + GetParent()->GetWindowRect(rcWnd); + + // How much do Window and Client differ + rcWnd-=rcClient; + + // Take into account that there is a border around the rootPane + lpMMI->ptMinTrackSize = CPoint(m_RootPane->getMinConstrainHorz() + rcWnd.Width() + 2*m_sizeRootBorders.cx, + m_RootPane->getMinConstrainVert() + rcWnd.Height() + 2*m_sizeRootBorders.cy); + + int maxWidth = m_RootPane->getMaxConstrainHorz(); + int maxHeight = m_RootPane->getMaxConstrainVert(); + + if( maxWidth != -1 ) { + lpMMI->ptMaxTrackSize.x = maxWidth + rcWnd.Width()+ 2*m_sizeRootBorders.cx; + lpMMI->ptMaxSize.x = maxWidth + rcWnd.Width()+ 2*m_sizeRootBorders.cx; + } + + if( maxHeight != -1 ) { + lpMMI->ptMaxTrackSize.y = maxHeight + rcWnd.Height() + 2*m_sizeRootBorders.cy; + lpMMI->ptMaxSize.y = maxHeight + rcWnd.Height() + 2*m_sizeRootBorders.cy; + } + } +} + +ETSLayoutFormView::~ETSLayoutFormView() +{ + // Cleanup +} + + +///////////////////////////////////////////////////////////////////////////// +// ETSLayoutPropertyPage + +#ifdef CS_HELP + IMPLEMENT_DYNCREATE(ETSLayoutPropertyPage, ETSCSHelpPropPage) +#else + IMPLEMENT_DYNCREATE(ETSLayoutPropertyPage, CPropertyPage) +#endif + +#pragma warning(disable: 4355) +ETSLayoutPropertyPage::ETSLayoutPropertyPage( ) : ETSLayoutMgr( this ) +{ + m_bLockMove = false; +} + +ETSLayoutPropertyPage::ETSLayoutPropertyPage( UINT nIDTemplate, UINT nIDCaption /*= 0*/ ) + : CBasePropertyPage(nIDTemplate, nIDCaption), ETSLayoutMgr( this ) +{ + m_bLockMove = false; +} + +ETSLayoutPropertyPage::ETSLayoutPropertyPage( LPCTSTR lpszTemplateName, UINT nIDCaption /*= 0*/ ) + : CBasePropertyPage(lpszTemplateName, nIDCaption), ETSLayoutMgr( this ) +{ + m_bLockMove = false; +} +#pragma warning(default: 4355) + +ETSLayoutPropertyPage::~ETSLayoutPropertyPage() +{ +} + + +BEGIN_MESSAGE_MAP(ETSLayoutPropertyPage, CBasePropertyPage) + //{{AFX_MSG_MAP(ETSLayoutPropertyPage) + ON_WM_SIZE() + ON_WM_GETMINMAXINFO() + ON_WM_ERASEBKGND() + ON_WM_WINDOWPOSCHANGING() + ON_WM_DESTROY() + //}}AFX_MSG_MAP +END_MESSAGE_MAP() + + +///////////////////////////////////////////////////////////////////////////// +// Behandlungsroutinen für Nachrichten ETSLayoutPropertyPage + + +void ETSLayoutPropertyPage::OnWindowPosChanging( WINDOWPOS* lpwndpos ) +{ + // In WizardMode the System calls SetWindowPos with the + // original size at every activation. This could cause + // some flicker in certain circumstances. Therefore we lock + // moving the page and unlock it only if _we_ move the page + if( m_bLockMove) + { + lpwndpos->flags |= SWP_NOMOVE | SWP_NOSIZE; + } + CBasePropertyPage::OnWindowPosChanging( lpwndpos ); +} + +BOOL ETSLayoutPropertyPage::OnEraseBkgnd(CDC* pDC) +{ + EraseBkgnd(pDC); + return true; +} + +void ETSLayoutPropertyPage::OnDestroy() +{ + // manually delete layout definition if object is reused + m_RootPane = 0; + + CBasePropertyPage::OnDestroy(); +} + +void ETSLayoutPropertyPage::OnSize(UINT nType, int cx, int cy) +{ + CBasePropertyPage::OnSize(nType, cx, cy); + + if( abs(cx) + abs(cy) > 0) + { + // Re-Layout all controls + UpdateLayout(); + } +} + +void ETSLayoutPropertyPage::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI) +{ + if(m_RootPane.IsValid()) { + CRect rcClient = GetRect(); + + CRect rcWnd; + GetWindowRect(rcWnd); + + // How much do Window and Client differ + int nDiffHorz = rcWnd.Width() - rcClient.Width(); + int nDiffVert = rcWnd.Height() - rcClient.Height(); + + // Take into account that there is a border around the rootPane + lpMMI->ptMinTrackSize = CPoint(m_RootPane->getMinConstrainHorz() + nDiffHorz + 2*m_sizeRootBorders.cx, + m_RootPane->getMinConstrainVert() + nDiffVert + 2*m_sizeRootBorders.cy); + + int maxWidth = m_RootPane->getMaxConstrainHorz(); + int maxHeight = m_RootPane->getMaxConstrainVert(); + + if( maxWidth != -1 ) { + lpMMI->ptMaxTrackSize.x = maxWidth + nDiffHorz + 2*m_sizeRootBorders.cx; + lpMMI->ptMaxSize.x = maxWidth + nDiffHorz + 2*m_sizeRootBorders.cx; + } + + if( maxHeight != -1 ) { + lpMMI->ptMaxTrackSize.y = maxHeight + nDiffVert + 2*m_sizeRootBorders.cy; + lpMMI->ptMaxSize.y = maxHeight + nDiffVert + 2*m_sizeRootBorders.cy; + } + } +} + + +CRect ETSLayoutPropertyPage::GetRect() +{ + CRect r; + GetClientRect(r); + return r; +} + + +BOOL ETSLayoutPropertyPage::OnInitDialog() +{ + CBasePropertyPage::OnInitDialog(); + UpdateLayout(); + + ETSLayoutPropertySheet* pSheet = (ETSLayoutPropertySheet*) GetParent(); + + ASSERT_KINDOF( ETSLayoutPropertySheet, pSheet); + if(pSheet) + { + if(pSheet->IsWizard()) + { + m_bLockMove = true; + } + } + + return TRUE; +} + +BOOL ETSLayoutPropertyPage::OnSetActive() +{ + ETSLayoutPropertySheet* pSheet = (ETSLayoutPropertySheet*) GetParent(); + + ASSERT_KINDOF( ETSLayoutPropertySheet, pSheet); + if(pSheet) + { + if(pSheet->IsWizard()) + { + // In WizardMode the System calls SetWindowPos with the + // original size on Page Activation. This will position the + // page at the correct position + m_bLockMove = false; + MoveWindow(pSheet->m_rcPage); + m_bLockMove = true; + } + } + + UpdateLayout(); + + return CBasePropertyPage::OnSetActive(); +} + +///////////////////////////////////////////////////////////////////////////// +// ETSLayoutPropertySheet + +IMPLEMENT_DYNAMIC(ETSLayoutPropertySheet, CPropertySheet) + +#pragma warning(disable: 4355) +ETSLayoutPropertySheet::ETSLayoutPropertySheet(UINT nIDCaption, CWnd* pParentWnd, UINT iSelectPage, + LPCTSTR strName /*=NULL*/, bool bGripper/*=true*/) + : CPropertySheet(nIDCaption, pParentWnd, iSelectPage), ETSLayoutMgr( this ) +{ + Init(strName, bGripper); +} + +ETSLayoutPropertySheet::ETSLayoutPropertySheet(LPCTSTR pszCaption, CWnd* pParentWnd, UINT iSelectPage, + LPCTSTR strName /*=NULL*/, bool bGripper/*=true*/) + : CPropertySheet(pszCaption, pParentWnd, iSelectPage), ETSLayoutMgr( this ) +{ + Init(strName, bGripper); +} +#pragma warning(default: 4355) + +void ETSLayoutPropertySheet::Init(LPCTSTR strName, bool bGripper) +{ + m_bGripper = bGripper; + if(strName) + m_strRegStore = strName; + + m_bAutoDestroy = false; + m_bAutoDestroyPages = false; + m_bModelessButtons = false; +} + +ETSLayoutPropertySheet::~ETSLayoutPropertySheet() +{ +} + + +BEGIN_MESSAGE_MAP(ETSLayoutPropertySheet, CPropertySheet) + //{{AFX_MSG_MAP(ETSLayoutPropertySheet) + ON_WM_CREATE() + ON_WM_SIZE() + ON_WM_GETMINMAXINFO() + ON_WM_DESTROY() + ON_WM_ERASEBKGND() + //}}AFX_MSG_MAP +END_MESSAGE_MAP() + +///////////////////////////////////////////////////////////////////////////// +// Behandlungsroutinen für Nachrichten ETSLayoutPropertySheet + +BOOL ETSLayoutPropertySheet::OnEraseBkgnd(CDC* pDC) +{ + EraseBkgnd(pDC); + return true; +} + + +int ETSLayoutPropertySheet::OnCreate(LPCREATESTRUCT lpCreateStruct) +{ + if (CPropertySheet::OnCreate(lpCreateStruct) == -1) + return -1; + + ModifyStyle(0,WS_THICKFRAME| WS_SYSMENU |WS_CLIPCHILDREN); + return 0; +} + + +void ETSLayoutPropertySheet::Resize(int cx, int cy) +{ + if( abs(cx) + abs(cy) > 0 && m_RootPane.IsValid() ) + { + UpdateLayout(); + + if(IsWizard()) + { + // manual reposition of the FINISH button + // can not be done with normaly layouting because it + // shares position with the NEXT button + CWnd *pWndFinish; + pWndFinish=GetDlgItem(ID_WIZFINISH); + + if(pWndFinish) + { + CRect rcWnd; + GetDlgItem(ID_WIZNEXT)->GetWindowRect(&rcWnd); + ScreenToClient(&rcWnd); + pWndFinish->MoveWindow(rcWnd); + pWndFinish->RedrawWindow(0,0, RDW_INVALIDATE | RDW_UPDATENOW ); + } + } + + // reposition Gripper + if(m_bGripper) + RepositionBars(AFX_IDW_CONTROLBAR_FIRST, AFX_IDW_CONTROLBAR_LAST, 0); + + CPropertyPage* pPage = (CPropertyPage*)GetActivePage(); + + if(pPage) + { + CRect rcWnd; + GetTabControl()->GetWindowRect(&rcWnd); + ScreenToClient(&rcWnd); + + if(!IsWizard()) { + // get inside of tab + GetTabControl()->AdjustRect(FALSE, &rcWnd); + } + else + { + rcWnd.bottom += 5; + } + + // we need this size in WizardMode in order to + // reposition newly activated page correctly + m_rcPage = rcWnd; + + if( IsWizard() && pPage->IsKindOf(RUNTIME_CLASS(ETSLayoutPropertyPage)) ) + { + ETSLayoutPropertyPage* pEtsPage = reinterpret_cast(pPage); + + pEtsPage->m_bLockMove = false; + pEtsPage->MoveWindow(m_rcPage); + pEtsPage->m_bLockMove = true; + } + else + { + pPage->MoveWindow(m_rcPage); + } + + } + + if(IsWindowVisible()) + { + RedrawWindow(0,0, RDW_INVALIDATE|RDW_UPDATENOW ); + + if(!IsWizard()) + GetTabControl()->RedrawWindow(0,0, RDW_INVALIDATE|RDW_UPDATENOW ); + } + } +} + +void ETSLayoutPropertySheet::OnSize(UINT nType, int cx, int cy) +{ + CPropertySheet::OnSize(nType, cx, cy); + Resize(cx,cy); +} + +// IDs of all PropertySheet controls +long _PropertySheetIDs[] = +{ + ID_WIZBACK, + ID_WIZNEXT, + IDOK, + IDCANCEL, + ID_APPLY_NOW, + IDHELP +}; + + +BOOL ETSLayoutPropertySheet::OnInitDialog() +{ + BOOL bRet = CPropertySheet::OnInitDialog(); + + ASSERT(!m_RootPane); + + // Save initial rect + GetWindowRect(&m_rcStart); + + CPropertyPage* pPage = CPropertySheet::GetActivePage(); + ASSERT(pPage); + + CRect rcPage; + pPage->GetClientRect(&rcPage); + + CreateRoot(VERTICAL); + ASSERT(m_RootPane); + + // Add Tabcontrol to root pane + m_ItemTab = item( GetTabControl(), GREEDY, 0, 0, 0, 0); + m_RootPane << m_ItemTab; + + // Tabcontrol is invisible in WizardMode + if(IsWizard()) + { + GetTabControl()->ShowWindow(false); + } + + // add horizontal line in WizardMode + if(IsWizard() && GetDlgItem(ID_WIZFINISH+1)) + { + m_RootPane << item(ID_WIZFINISH+1, ABSOLUTE_VERT, 0, 0, 0, 0); + } + + if( IsWizard() || !m_bModeless || m_bModelessButtons ) + { + // No spaces in WizardMode in order to keep BACK & NEXT together + CPane bottomPane = pane(HORIZONTAL, ABSOLUTE_VERT, IsWizard() ? 0 : 5); + + // first item greedy to keep others right + bottomPane->addItem (paneNull, GREEDY); + + + // add all Controls to the layouting + bool bFirst = true; + for(int i = 0; i < (sizeof(_PropertySheetIDs) / sizeof(long)) ; i++) + { + CWnd* pWnd = GetDlgItem(_PropertySheetIDs[i]); + + if(pWnd) + { + + if(!(m_psh.dwFlags & PSH_HASHELP) && _PropertySheetIDs[i] == IDHELP) + { + // don't insert + continue; + } + + if((m_psh.dwFlags & PSH_NOAPPLYNOW) && _PropertySheetIDs[i] == ID_APPLY_NOW) + { + // don't insert + continue; + } + + // space before first one and between BACK & NEXT + if( IsWizard() ) + { + if( !bFirst && !(_PropertySheetIDs[i]==ID_WIZNEXT) ) + { + bottomPane->addItem(paneNull, NORESIZE,12,0,0,0); + } + } + + pWnd->ShowWindow(true); + bottomPane->addItem(_PropertySheetIDs[i], NORESIZE); + bFirst = false; + } + } + + // add bottom (button) pane + m_RootPane << bottomPane; + } + + + + // some Space between Buttons und Gripper + if(m_bGripper) + { + m_RootPane->addItem(paneNull, ABSOLUTE_VERT,0,2); + + if(m_StatusBar.Create(m_pWnd)) + { + m_StatusBar.SetIndicators(auIDStatusBar, + sizeof(auIDStatusBar) / sizeof(UINT)); + m_StatusBar.SetWindowText(""); + RepositionBars(AFX_IDW_CONTROLBAR_FIRST, AFX_IDW_CONTROLBAR_LAST, 0); + } + else + { + AfxMessageBox("Error - Statusbar"); + } + } + + if(!m_strRegStore.IsEmpty()) + { + Load(m_strRegStore); + } + + Resize(1,1); // Fix. for 95/98/NT difference + + CRect rcWnd; + GetWindowRect( & rcWnd ); + MoveWindow( rcWnd ); + + return bRet; +} + + +void ETSLayoutPropertySheet::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI) +{ + if(m_RootPane.IsValid() && GetTabControl() != 0 ) + { + CRect rcWnd; + GetWindowRect(rcWnd); + + CRect rcClient = GetRect(); + rcWnd-=rcClient; + + // ask for MinMax of all pages + CSize sizePageMax(0,0); + CSize sizePageMin(0,0); + for( int nPage=0; nPageGetSafeHwnd()) ) + { + pPage->SendMessage(WM_GETMINMAXINFO, 0, (LPARAM) &mmi); + + if(mmi.ptMaxTrackSize.x != 0) + { + sizePageMax.cx = min(sizePageMax.cx, mmi.ptMaxTrackSize.x); + } + if(mmi.ptMaxTrackSize.y != 0) + { + sizePageMax.cy = min(sizePageMax.cy, mmi.ptMaxTrackSize.y); + } + if(mmi.ptMinTrackSize.x != 0) + { + sizePageMin.cx = max(sizePageMin.cx, mmi.ptMinTrackSize.x); + } + if(mmi.ptMinTrackSize.y != 0) + { + sizePageMin.cy = max(sizePageMin.cy, mmi.ptMinTrackSize.y); + } + } + } + } + static_cast( m_ItemTab.GetPaneBase() )->m_sizeXMin = sizePageMin.cx; + static_cast( m_ItemTab.GetPaneBase() )->m_sizeYMin = sizePageMin.cy; + + // calculate the needed size of the tabctrl in non-wizard-mode + CRect rcItem(0,0,0,0); + if(!IsWizard()) + { + GetTabControl()->AdjustRect( TRUE, rcItem ); + } + + lpMMI->ptMinTrackSize.x = m_RootPane->getMinConstrainHorz() + rcWnd.Width() + 2*m_sizeRootBorders.cx + + rcItem.Width(); + + lpMMI->ptMinTrackSize.y = m_RootPane->getMinConstrainVert() + rcWnd.Height() + 2*m_sizeRootBorders.cy + + rcItem.Height(); + + // never smaller than inital size! + lpMMI->ptMinTrackSize.x = max(lpMMI->ptMinTrackSize.x, m_rcStart.Width() ); + lpMMI->ptMinTrackSize.y = max(lpMMI->ptMinTrackSize.y, m_rcStart.Height() ); + + // Rest like ETSLayoutMgr + + int maxWidth = m_RootPane->getMaxConstrainHorz(); + int maxHeight = m_RootPane->getMaxConstrainVert(); + + if( maxWidth != -1 ) + { + lpMMI->ptMaxSize.x = sizePageMax.cx + rcWnd.Width()+ 2*m_sizeRootBorders.cx + rcItem.Width() ; + } + + if( maxHeight != -1 ) + { + lpMMI->ptMaxSize.y = sizePageMax.cy + rcWnd.Height() + 2*m_sizeRootBorders.cy + rcItem.Width() ; + } + + lpMMI->ptMaxTrackSize = lpMMI->ptMaxSize; + + } +} + + +void ETSLayoutPropertySheet::OnDestroy() +{ + // Store size/position + if(!m_strRegStore.IsEmpty()) + { + Save(m_strRegStore); + } + m_RootPane = 0; + + CPropertySheet::OnDestroy(); +} + +void ETSLayoutPropertySheet::PostNcDestroy() +{ + if(m_bAutoDestroyPages) + { + // walk all pages and destry them + for( int nPage=0; nPageRelease(); +} + +void ETSLayoutMgr::CPaneBase::operator=( PaneBase* pPane ) +{ + if(m_pPaneHolder) + { + m_pPaneHolder->Release(); + m_pPaneHolder = 0; + } + + if( pPane != 0 ) + m_pPaneHolder = new PaneHolder( pPane ); +} + +void ETSLayoutMgr::CPaneBase::operator=( const CPaneBase& other ) +{ + ASSERT( other.m_pPaneHolder ); + + if(m_pPaneHolder) + { + m_pPaneHolder->Release(); + m_pPaneHolder = 0; + } + + other.m_pPaneHolder->AddRef(); + m_pPaneHolder = other.m_pPaneHolder; +} + +ETSLayoutMgr::PaneBase* ETSLayoutMgr::CPaneBase::operator->() const +{ + ASSERT(m_pPaneHolder); + + if(!m_pPaneHolder) + return 0; + + return (m_pPaneHolder->m_pPane); +} + + + +ETSLayoutMgr::CPane::CPane( ) +{ +} + +ETSLayoutMgr::CPane::CPane( Pane* pPane ) : ETSLayoutMgr::CPaneBase( static_cast(pPane) ) +{ +} + +ETSLayoutMgr::CPane::CPane( const CPane& other ) +{ + operator=(other); +} + +ETSLayoutMgr::CPane::~CPane() +{ +} + +void ETSLayoutMgr::CPane::operator=( Pane* pPane ) +{ + CPaneBase::operator=(pPane); +} + +void ETSLayoutMgr::CPane::operator=( const ETSLayoutMgr::CPane& other ) +{ + ASSERT( other.m_pPaneHolder ); + + if(m_pPaneHolder) + { + m_pPaneHolder->Release(); + m_pPaneHolder = 0; + } + + other.m_pPaneHolder->AddRef(); + m_pPaneHolder = other.m_pPaneHolder; +} + +ETSLayoutMgr::Pane* ETSLayoutMgr::CPane::operator->() const +{ + ASSERT(m_pPaneHolder); + + if(!m_pPaneHolder) + return 0; + + return reinterpret_cast(m_pPaneHolder->m_pPane); +} + +ETSLayoutMgr::CPaneBase ETSLayoutMgr::CPane::ConvertBase() const +{ + ASSERT(m_pPaneHolder); + return CPaneBase( m_pPaneHolder->m_pPane ); +} + +ETSLayoutMgr::CPane& ETSLayoutMgr::CPane::operator<< ( const ETSLayoutMgr::CPane pPane ) +{ + GetPane()->addPane( pPane, (ETSLayoutMgr::layResizeMode)pPane->m_modeResize, pPane->m_sizeSecondary); + return (*this); +} + +ETSLayoutMgr::CPane& ETSLayoutMgr::CPane::operator<< ( const ETSLayoutMgr::CPaneBase pItem ) +{ + GetPane()->addPane( pItem ); + return (*this); +} -- cgit v1.1 From 789bc690bf2a350d08514dce166f02d4888a7440 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:08:27 +0000 Subject: Utilisateur : Fcolin Date : 13/01/03 Heure : 15:28 Archivé dans $/Bus/IvyProbe Commentaire: (vss 2) --- IvyProbe/ETSLayout.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/ETSLayout.cpp b/IvyProbe/ETSLayout.cpp index fa62a7b..e7f52bb 100644 --- a/IvyProbe/ETSLayout.cpp +++ b/IvyProbe/ETSLayout.cpp @@ -1748,7 +1748,7 @@ bool ETSLayoutMgr::Pane::resizeTo(CRect& rcNewArea) #pragma warning(disable: 4355) ETSLayoutDialog::ETSLayoutDialog(UINT nID, CWnd* pParent /*=NULL*/, LPCTSTR strName /*=NULL*/, bool bGripper /*=true*/) - : CBaseDialog(nID, pParent), ETSLayoutMgr( this ) + : CDialog(nID, pParent), ETSLayoutMgr( this ) { //{{AFX_DATA_INIT(ETSLayoutDialog) // NOTE: the ClassWizard will add member initialization here @@ -1760,7 +1760,7 @@ ETSLayoutDialog::ETSLayoutDialog(UINT nID, CWnd* pParent /*=NULL*/, LPCTSTR strN } #pragma warning(default: 4355) -BEGIN_MESSAGE_MAP(ETSLayoutDialog, CBaseDialog) +BEGIN_MESSAGE_MAP(ETSLayoutDialog, CDialog) //{{AFX_MSG_MAP(ETSLayoutDialog) ON_WM_SIZE() ON_WM_GETMINMAXINFO() @@ -1917,7 +1917,7 @@ ETSLayoutDialogBar::ETSLayoutDialogBar() } #pragma warning(default: 4355) -BEGIN_MESSAGE_MAP(ETSLayoutDialogBar, CBaseDialogBar) +BEGIN_MESSAGE_MAP(ETSLayoutDialogBar, CDialogBar) //{{AFX_MSG_MAP(ETSLayoutDialogBar) ON_WM_SIZE() ON_WM_GETMINMAXINFO() @@ -2034,14 +2034,14 @@ IMPLEMENT_DYNAMIC(ETSLayoutFormView, CFormView) #pragma warning(disable: 4355) ETSLayoutFormView::ETSLayoutFormView(UINT nID, LPCTSTR strName /*=NULL*/) - : CBaseFormView(nID), ETSLayoutMgr( this ) + : CFormView(nID), ETSLayoutMgr( this ) { if(strName) m_strRegStore = strName; } #pragma warning(default: 4355) -BEGIN_MESSAGE_MAP(ETSLayoutFormView, CBaseFormView) +BEGIN_MESSAGE_MAP(ETSLayoutFormView, CFormView) //{{AFX_MSG_MAP(ETSLayoutFormView) ON_WM_SIZE() ON_WM_GETMINMAXINFO() @@ -2164,7 +2164,7 @@ ETSLayoutPropertyPage::ETSLayoutPropertyPage( UINT nIDTemplate, UINT nIDCaption } ETSLayoutPropertyPage::ETSLayoutPropertyPage( LPCTSTR lpszTemplateName, UINT nIDCaption /*= 0*/ ) - : CBasePropertyPage(lpszTemplateName, nIDCaption), ETSLayoutMgr( this ) + : CPropertyPage(lpszTemplateName, nIDCaption), ETSLayoutMgr( this ) { m_bLockMove = false; } @@ -2175,7 +2175,7 @@ ETSLayoutPropertyPage::~ETSLayoutPropertyPage() } -BEGIN_MESSAGE_MAP(ETSLayoutPropertyPage, CBasePropertyPage) +BEGIN_MESSAGE_MAP(ETSLayoutPropertyPage, CPropertyPage) //{{AFX_MSG_MAP(ETSLayoutPropertyPage) ON_WM_SIZE() ON_WM_GETMINMAXINFO() @@ -2485,7 +2485,7 @@ BOOL ETSLayoutPropertySheet::OnInitDialog() pPage->GetClientRect(&rcPage); CreateRoot(VERTICAL); - ASSERT(m_RootPane); + //ASSERT(m_RootPane); // Add Tabcontrol to root pane m_ItemTab = item( GetTabControl(), GREEDY, 0, 0, 0, 0); -- cgit v1.1 From 3dfc319868dcadc1da4b88f126ff5c3cdab760c7 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:08:29 +0000 Subject: Utilisateur : Fcolin Date : 9/04/04 Heure : 16:31 Archivé dans $/Bus/IvyProbe Commentaire: (vss 3) --- IvyProbe/ETSLayout.cpp | 368 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 275 insertions(+), 93 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/ETSLayout.cpp b/IvyProbe/ETSLayout.cpp index e7f52bb..921e129 100644 --- a/IvyProbe/ETSLayout.cpp +++ b/IvyProbe/ETSLayout.cpp @@ -4,7 +4,7 @@ // / _/ / / / / ___ ___ ____ // // /__/ /_/ / / / // _/_ _/ // // _________/ / / / // _/ / / // -// __(c) 1998-9_/ /___//_/ /_/ // +// (c) 1998-2000_/ /___//_/ /_/ // // // //////////////////////////////////////////// // all rights reserved // @@ -106,12 +106,42 @@ // 1999/12/04 Erase Backgroung with GCL_HBRBACKGROUND (if available) // 1999/12/04 itemSpaceXXX() adds a NORESIZE item instead of ABSOLUTE_XXX // this will fix unwanted growing in secondary direction +// +// Version: 1.0 [1999/12/04] Initial Article on CodeProject +// // 1999/12/10 Erase Backgroung within TabCtrl was 'fixed' badly. Reverted to // old working code // 2000/02/02 When the Dialog is child of a View the class works correctly // now [Didier BULTIAUW] // 2000/02/15 Combo-Boxes were not working correctly (in all modes!) - +// 2000/02/17 aligned SpinButton Controls (with buddy) now handled +// automatically +// !! do not add such a control to the layout !! it is always +// reattached to its buddy. +// 2000/02/17 changed some cotrol class names to the defined constants +// +// Version: 1.1 [2000/02/17] +// +// 2000/02/25 Fixed auto alignment of SpinButton Controls to only affect +// visible ones +// 2000/02/27 Put all the classes into the namespace 'ETSLayout' +// 2000/03/07 Fixed growing Dialog after minimizing and restoring +// 2000/05/22 Whole Statusbar (Gripper) is not excluded anymore in EraseBkgnd() +// instead only the triangular Gripper is excluded +// 2000/05/31 Fix for PropertySheets with PSH_WIZARDHASFINISH [Thömmi] +// 2000/05/31 Fix for UpDown-Controls with EditCtrl Buddy in PropertyPages. +// These were not repositioned every time the page is being show +// until the first resize +// 2000/07/28 Problems with resizing ActiveX Controls fixed [Micheal Chapman] +// 2000/07/28 Some strings were not properly wrapped with _T() +// 2000/08/03 Check for BS_GROUPBOX was not correct as BS_GROUPBOX is more than one Bit +// 2000/08/03 New override AddMainArea added to ETSLayoutPropertySheet in order to +// have a hook for additional controls in a PropertySheet (besides the Tab) +// 2000/08/03 New override AddButtons added to ETSLayoutPropertySheet in order to +// have a hook for additional controls in the bottem pane of a PropertySheet +// 2000/08/03 Removed the need for DECLARE_LAYOUT +// +// Version: 1.2 [2000/08/05] #define OEMRESOURCE #include @@ -119,6 +149,10 @@ #include "stdafx.h" #include "ETSLayout.h" +using namespace ETSLayout; +#pragma warning(disable: 4097 4610 4510 4100) + + #ifndef OBM_SIZE #define OBM_SIZE 32766 // taken from WinresRc.h @@ -145,8 +179,8 @@ CWnd* ETSLayoutMgr::paneNull = 0; void ETSLayoutMgr::Layout(CRect& rcClient) { - // Does nothing, use DECLARE_LAYOUT in derived class - // see DialogMgr.h + if(rcClient.Height() && rcClient.Width() && m_RootPane.IsValid()) \ + m_RootPane->resizeTo(rcClient); \ } @@ -374,6 +408,30 @@ void ETSLayoutMgr::UpdateLayout() else Layout(rcClient); + // Take special care of SpinButtons (Up-Down Controls) with Buddy set, enumerate + // all childs: + CWnd* pWndChild = GetWnd()->GetWindow(GW_CHILD); + TCHAR szClassName[ MAX_PATH ]; + while(pWndChild) + { + ::GetClassName( pWndChild->GetSafeHwnd(), szClassName, MAX_PATH ); + DWORD dwStyle = pWndChild->GetStyle(); + + // is it a SpinButton? + if( _tcscmp(szClassName, UPDOWN_CLASS)==0 && ::IsWindowVisible(pWndChild->GetSafeHwnd()) ) { + HWND hwndBuddy = (HWND)::SendMessage( pWndChild->GetSafeHwnd(), UDM_GETBUDDY, 0, 0); + if( hwndBuddy != 0 && (dwStyle&(UDS_ALIGNRIGHT|UDS_ALIGNLEFT)) != 0 ) + { + // reset Buddy + ::SendMessage( pWndChild->GetSafeHwnd(), UDM_SETBUDDY, (WPARAM)hwndBuddy, 0); + } + } + + + pWndChild = pWndChild->GetWindow(GW_HWNDNEXT); + } + + GetWnd()->Invalidate(); } @@ -393,7 +451,7 @@ bool ETSLayoutMgr::Save(LPCTSTR lpstrRegKey) wp.showCmd = SW_SHOWNORMAL; AfxGetApp()->WriteProfileBinary(lpstrRegKey, - "WindowPlacement", + _T("WindowPlacement"), reinterpret_cast(&wp), sizeof(wp)); } } @@ -405,7 +463,7 @@ bool ETSLayoutMgr::Load(LPCTSTR lpstrRegKey) LPBYTE pbtData = 0; UINT nSize = 0; if(AfxGetApp()->GetProfileBinary(lpstrRegKey, - "WindowPlacement", &pbtData, &nSize)) + _T("WindowPlacement"), &pbtData, &nSize)) { WINDOWPLACEMENT* pwp = reinterpret_cast(pbtData); @@ -427,6 +485,7 @@ void ETSLayoutMgr::EraseBkgnd(CDC* pDC) CRgn rgn; rgn.CreateRectRgnIndirect(rcClient); + //TRACE("CreateRgn (%d,%d,%d,%d)\n", rcClient.left, rcClient.top, rcClient.right, rcClient.bottom ); CRgn rgnRect; rgnRect.CreateRectRgn(0,0,0,0); @@ -436,9 +495,8 @@ void ETSLayoutMgr::EraseBkgnd(CDC* pDC) TCHAR szClassName[ MAX_PATH ]; - CRect rcClip; - pDC->GetClipBox(&rcClip); - + pDC->SelectClipRgn(NULL); + while( pWndChild ) { pWndChild->GetWindowRect(rcChild); @@ -451,11 +509,12 @@ void ETSLayoutMgr::EraseBkgnd(CDC* pDC) // doesn't make sense for hidden children if( dwStyle & WS_VISIBLE ) { - - if( _tcscmp(szClassName,"Button")==0 && (dwStyle & BS_GROUPBOX) ) { + + // Fix: BS_GROUPBOX is more than one Bit, extend check to (dwStyle & BS_GROUPBOX)==BS_GROUPBOX [ET] + if( _tcscmp(szClassName,_T("Button"))==0 && (dwStyle & BS_GROUPBOX)==BS_GROUPBOX ) { // it is a group-box, ignore completely } - else if( _tcscmp(szClassName,"SysTabControl32")==0 ) { + else if( _tcscmp(szClassName,WC_TABCONTROL )==0 ) { // ignore Tab-Control's inside rect static_cast(pWndChild)->AdjustRect(FALSE,rcChild); @@ -465,6 +524,19 @@ void ETSLayoutMgr::EraseBkgnd(CDC* pDC) rgnRect.CombineRgn( &rgnRect, &rgnContent, RGN_DIFF ); rgn.CombineRgn( &rgn, &rgnRect, RGN_DIFF ); } + else if( _tcscmp(szClassName,STATUSCLASSNAME)==0 ) { + + CPoint ptTriangleGrip[3]; + ptTriangleGrip[0] = CPoint(rcChild.right,rcChild.top); + ptTriangleGrip[1] = CPoint(rcChild.right,rcChild.bottom); + ptTriangleGrip[2] = CPoint(rcChild.right-rcChild.Height(),rcChild.bottom); + + CRgn rgnGripper; + rgnGripper.CreatePolygonRgn(ptTriangleGrip,3, WINDING); + + rgn.CombineRgn( &rgn, &rgnGripper, RGN_DIFF ); + + } else { rgn.CombineRgn( &rgn, &rgnRect, RGN_DIFF ); } @@ -537,7 +609,7 @@ ETSLayoutMgr::PaneItem::PaneItem(CWnd* pWnd, ETSLayoutMgr* pMgr, ETSLayoutMgr::l ::GetClassName( m_hwndCtrl, szClassName, MAX_PATH ); // special treatment for combo-boxes - if( _tcscmp(szClassName,"ComboBox")==0 ) { + if( _tcscmp(szClassName,_T("ComboBox"))==0 || _tcscmp(szClassName,WC_COMBOBOXEX)==0) { m_bComboSpecial = true; } } @@ -594,7 +666,7 @@ ETSLayoutMgr::PaneItem::PaneItem( UINT nID, ETSLayoutMgr* pMgr, ETSLayoutMgr::la ::GetClassName( m_hwndCtrl, szClassName, MAX_PATH ); // special treatment for combo-boxes - if( _tcscmp(szClassName,"ComboBox")==0 ) { + if( _tcscmp(szClassName,_T("ComboBox"))==0 || _tcscmp(szClassName,WC_COMBOBOXEX)==0) { m_bComboSpecial = true; } } @@ -695,7 +767,9 @@ bool ETSLayoutMgr::PaneItem::resizeTo(CRect& rcNewArea) rcNewArea.bottom = rcNewArea.top + rcWnd.Height(); } - ::MoveWindow( m_hwndCtrl, rcNewArea.left, rcNewArea.top, rcNewArea.Width(), rcNewArea.Height(), true ); + // FIX: ::MoveWindow would case problems with some ActiveX Controls [Micheal Chapman] + CWnd* pTempWnd = CWnd::FromHandle( m_hwndCtrl ); + pTempWnd->MoveWindow( rcNewArea.left, rcNewArea.top, rcNewArea.Width(), rcNewArea.Height() ); if( m_bComboSpecial && !(dwStyle & CBS_DROPDOWN) && !(dwStyle & CBS_NOINTEGRALHEIGHT) ) { @@ -712,7 +786,9 @@ bool ETSLayoutMgr::PaneItem::resizeTo(CRect& rcNewArea) rcNewArea.bottom = rcNewArea.top + rcWnd.Height(); - ::MoveWindow( m_hwndCtrl, rcNewArea.left, rcNewArea.top, rcNewArea.Width(), rcNewArea.Height(), true ); + // FIX: ::MoveWindow would case problems with some ActiveX Controls [Micheal Chapman] + CWnd* pTempWnd = CWnd::FromHandle( m_hwndCtrl ); + pTempWnd->MoveWindow( rcNewArea.left, rcNewArea.top, rcNewArea.Width(), rcNewArea.Height(), true ); } } @@ -858,8 +934,11 @@ int ETSLayoutMgr::PaneCtrl::getMaxConstrainVert() bool ETSLayoutMgr::PaneCtrl::resizeTo(CRect& rcNewArea) { - ::MoveWindow(m_hwndCtrl, rcNewArea.left, rcNewArea.top, rcNewArea.Width(), rcNewArea.Height(), true); - ::RedrawWindow(m_hwndCtrl,0,0, RDW_INVALIDATE | RDW_UPDATENOW |RDW_ERASE); + // FIX: ::MoveWindow would case problems with some ActiveX Controls [Micheal Chapman] + CWnd* pTempWnd = CWnd::FromHandle( m_hwndCtrl ); + pTempWnd->MoveWindow( rcNewArea.left, rcNewArea.top, rcNewArea.Width(), rcNewArea.Height(), true ); + + ::RedrawWindow(m_hwndCtrl,0,0, RDW_INVALIDATE | RDW_UPDATENOW |RDW_ERASE); rcNewArea.top += m_sizeTopExtra; return Pane::resizeTo(rcNewArea); } @@ -1276,7 +1355,7 @@ bool ETSLayoutMgr::Pane::resizeToRelative(int& availSpace, CArray& size // At this point we should have some space left (at least not be negative with the leftover // space) and on the other hand there's enough space for the limit-difference to be distributed - ASSERT( availSpace >= 0 && relLeft >= relDiff); +// ASSERT( availSpace >= 0 && relLeft >= relDiff); // Fixup Relative: // Distribute (if anecessary) relDiff on other (not limited) relative items/subpanes @@ -1342,8 +1421,11 @@ bool ETSLayoutMgr::Pane::resizeToRelative(int& availSpace, CArray& size } } // Distributed some relDiff-space in every iteration - ASSERT(relDist != 0); +// ASSERT(relDist != 0); relDiff -= relDist; + + if( relDist == 0 ) + break; } // Fixup Relative: invert all negative (limited) sized to correct value @@ -1748,7 +1830,7 @@ bool ETSLayoutMgr::Pane::resizeTo(CRect& rcNewArea) #pragma warning(disable: 4355) ETSLayoutDialog::ETSLayoutDialog(UINT nID, CWnd* pParent /*=NULL*/, LPCTSTR strName /*=NULL*/, bool bGripper /*=true*/) - : CDialog(nID, pParent), ETSLayoutMgr( this ) + : CBaseDialog(nID, pParent), ETSLayoutMgr( this ) { //{{AFX_DATA_INIT(ETSLayoutDialog) // NOTE: the ClassWizard will add member initialization here @@ -1796,30 +1878,34 @@ void ETSLayoutDialog::OnSize(UINT nType, int cx, int cy) void ETSLayoutDialog::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI) { if(m_RootPane.IsValid()) { + CRect rcClient = GetRect(); + if( rcClient.Height() > 0 || rcClient.Width() > 0 ) + { - CRect rcWnd; - GetWindowRect(rcWnd); - - // How much do Window and Client differ - int nDiffHorz = rcWnd.Width() - rcClient.Width(); - int nDiffVert = rcWnd.Height() - rcClient.Height(); + CRect rcWnd; + GetWindowRect(rcWnd); + + // How much do Window and Client differ + int nDiffHorz = rcWnd.Width() - rcClient.Width(); + int nDiffVert = rcWnd.Height() - rcClient.Height(); - // Take into account that there is a border around the rootPane - lpMMI->ptMinTrackSize = CPoint(m_RootPane->getMinConstrainHorz() + nDiffHorz + 2*m_sizeRootBorders.cx, - m_RootPane->getMinConstrainVert() + nDiffVert + 2*m_sizeRootBorders.cy); + // Take into account that there is a border around the rootPane + lpMMI->ptMinTrackSize = CPoint(m_RootPane->getMinConstrainHorz() + nDiffHorz + 2*m_sizeRootBorders.cx, + m_RootPane->getMinConstrainVert() + nDiffVert + 2*m_sizeRootBorders.cy); - int maxWidth = m_RootPane->getMaxConstrainHorz(); - int maxHeight = m_RootPane->getMaxConstrainVert(); + int maxWidth = m_RootPane->getMaxConstrainHorz(); + int maxHeight = m_RootPane->getMaxConstrainVert(); - if( maxWidth != -1 ) { - lpMMI->ptMaxTrackSize.x = maxWidth + nDiffHorz + 2*m_sizeRootBorders.cx; - lpMMI->ptMaxSize.x = maxWidth + nDiffHorz + 2*m_sizeRootBorders.cx; - } + if( maxWidth != -1 ) { + lpMMI->ptMaxTrackSize.x = maxWidth + nDiffHorz + 2*m_sizeRootBorders.cx; + lpMMI->ptMaxSize.x = maxWidth + nDiffHorz + 2*m_sizeRootBorders.cx; + } - if( maxHeight != -1 ) { - lpMMI->ptMaxTrackSize.y = maxHeight + nDiffVert + 2*m_sizeRootBorders.cy; - lpMMI->ptMaxSize.y = maxHeight + nDiffVert + 2*m_sizeRootBorders.cy; + if( maxHeight != -1 ) { + lpMMI->ptMaxTrackSize.y = maxHeight + nDiffVert + 2*m_sizeRootBorders.cy; + lpMMI->ptMaxSize.y = maxHeight + nDiffVert + 2*m_sizeRootBorders.cy; + } } } } @@ -1848,6 +1934,9 @@ BOOL ETSLayoutDialog::OnInitDialog() { CBaseDialog::OnInitDialog(); + // Ensure that the dialog is resizable + this->ModifyStyle(0, WS_THICKFRAME); + if(!m_strRegStore.IsEmpty()) { Load(m_strRegStore); } @@ -1872,12 +1961,12 @@ BOOL ETSLayoutDialog::OnInitDialog() if(m_StatusBar.Create(m_pWnd)) { m_StatusBar.SetIndicators(auIDStatusBar, sizeof(auIDStatusBar) / sizeof(UINT)); - m_StatusBar.SetWindowText(""); + m_StatusBar.SetWindowText(_T("")); m_StatusBar.SetPaneStyle( 0, SBPS_STRETCH | SBPS_NOBORDERS ); m_pWnd -> RepositionBars(AFX_IDW_CONTROLBAR_FIRST, AFX_IDW_CONTROLBAR_LAST, 0); } else - AfxMessageBox("Error - Statusbar"); + AfxMessageBox(_T("Error - Statusbar")); } return TRUE; // return TRUE unless you set the focus to a control @@ -1938,6 +2027,25 @@ LRESULT ETSLayoutDialogBar::OnInitDialog(WPARAM, LPARAM) return TRUE; } +void ETSLayoutDialogBar::UpdateLayout() +{ + ETSLayoutMgr::UpdateLayout(); + + if(m_RootPane.IsValid()) { + CRect rcClient = GetRect(); + + CRect rcWnd; + GetWindowRect(rcWnd); + + // How much do Window and Client differ + CSize sizeDiff( rcWnd.Width() - rcClient.Width(), rcWnd.Height() - rcClient.Height()); + + // Take into account that there is a border around the rootPane +// m_szMin = CSize(m_RootPane->getMinConstrainHorz() + sizeDiff.cx + 2*m_sizeRootBorders.cx, +// m_RootPane->getMinConstrainVert() + sizeDiff.cy + 2*m_sizeRootBorders.cy); + } +} + CSize ETSLayoutDialogBar::CalcDynamicLayout(int nLength, DWORD dwMode) { CSize sizeRet = CBaseDialogBar::CalcDynamicLayout(nLength, dwMode); @@ -1955,8 +2063,8 @@ CSize ETSLayoutDialogBar::CalcDynamicLayout(int nLength, DWORD dwMode) CSize sizeDiff( rcWnd.Width() - rcClient.Width(), rcWnd.Height() - rcClient.Height()); // Take into account that there is a border around the rootPane - sizeMin = CSize(m_RootPane->getMinConstrainHorz() + sizeDiff.cx + 2*m_sizeRootBorders.cx, - m_RootPane->getMinConstrainVert() + sizeDiff.cy + 2*m_sizeRootBorders.cy); +// sizeMin = CSize(m_RootPane->getMinConstrainHorz() + sizeDiff.cx + 2*m_sizeRootBorders.cx, +// m_RootPane->getMinConstrainVert() + sizeDiff.cy + 2*m_sizeRootBorders.cy); int maxWidth = m_RootPane->getMaxConstrainHorz(); @@ -2034,7 +2142,7 @@ IMPLEMENT_DYNAMIC(ETSLayoutFormView, CFormView) #pragma warning(disable: 4355) ETSLayoutFormView::ETSLayoutFormView(UINT nID, LPCTSTR strName /*=NULL*/) - : CFormView(nID), ETSLayoutMgr( this ) + : CBaseFormView(nID), ETSLayoutMgr( this ) { if(strName) m_strRegStore = strName; @@ -2155,18 +2263,21 @@ ETSLayoutFormView::~ETSLayoutFormView() ETSLayoutPropertyPage::ETSLayoutPropertyPage( ) : ETSLayoutMgr( this ) { m_bLockMove = false; + m_bResetBuddyOnNextTimeVisible = true; } ETSLayoutPropertyPage::ETSLayoutPropertyPage( UINT nIDTemplate, UINT nIDCaption /*= 0*/ ) : CBasePropertyPage(nIDTemplate, nIDCaption), ETSLayoutMgr( this ) { m_bLockMove = false; + m_bResetBuddyOnNextTimeVisible = true; } ETSLayoutPropertyPage::ETSLayoutPropertyPage( LPCTSTR lpszTemplateName, UINT nIDCaption /*= 0*/ ) - : CPropertyPage(lpszTemplateName, nIDCaption), ETSLayoutMgr( this ) + : CBasePropertyPage(lpszTemplateName, nIDCaption), ETSLayoutMgr( this ) { m_bLockMove = false; + m_bResetBuddyOnNextTimeVisible = true; } #pragma warning(default: 4355) @@ -2182,6 +2293,7 @@ BEGIN_MESSAGE_MAP(ETSLayoutPropertyPage, CPropertyPage) ON_WM_ERASEBKGND() ON_WM_WINDOWPOSCHANGING() ON_WM_DESTROY() + ON_WM_WINDOWPOSCHANGED() //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -2190,6 +2302,54 @@ END_MESSAGE_MAP() // Behandlungsroutinen für Nachrichten ETSLayoutPropertyPage + +void ETSLayoutPropertyPage::OnWindowPosChanged(WINDOWPOS FAR* lpwndpos) +{ + CBasePropertyPage::OnWindowPosChanged(lpwndpos); + + // This code is needed in order to reset the buddy after this page has + // been activated. At least on Win2k this is not done thru normal resizing, + // as the page is not visible when first layouted. And without the page + // being visible it's not possible to tell if the attached buddy is visible + // or not (at least I don't know any way to do so) + + if( ::IsWindowVisible( GetWnd()->GetSafeHwnd() ) ) + { + if( m_bResetBuddyOnNextTimeVisible ) + { + // Take special care of SpinButtons (Up-Down Controls) with Buddy set, enumerate + // all childs: + CWnd* pWndChild = GetWnd()->GetWindow(GW_CHILD); + TCHAR szClassName[ MAX_PATH ]; + while(pWndChild) + { + ::GetClassName( pWndChild->GetSafeHwnd(), szClassName, MAX_PATH ); + DWORD dwStyle = pWndChild->GetStyle(); + + // is it a SpinButton? + if( _tcscmp(szClassName, UPDOWN_CLASS)==0 && ::IsWindowVisible(pWndChild->GetSafeHwnd()) ) { + HWND hwndBuddy = (HWND)::SendMessage( pWndChild->GetSafeHwnd(), UDM_GETBUDDY, 0, 0); + if( hwndBuddy != 0 && (dwStyle&(UDS_ALIGNRIGHT|UDS_ALIGNLEFT)) != 0 ) + { + // reset Buddy + ::SendMessage( pWndChild->GetSafeHwnd(), UDM_SETBUDDY, (WPARAM)hwndBuddy, 0); + } + } + + + pWndChild = pWndChild->GetWindow(GW_HWNDNEXT); + } + + m_bResetBuddyOnNextTimeVisible = false; + } + } + else + { + // has been hidden again + m_bResetBuddyOnNextTimeVisible = true; + } +} + void ETSLayoutPropertyPage::OnWindowPosChanging( WINDOWPOS* lpwndpos ) { // In WizardMode the System calls SetWindowPos with the @@ -2372,7 +2532,7 @@ int ETSLayoutPropertySheet::OnCreate(LPCREATESTRUCT lpCreateStruct) if (CPropertySheet::OnCreate(lpCreateStruct) == -1) return -1; - ModifyStyle(0,WS_THICKFRAME| WS_SYSMENU |WS_CLIPCHILDREN); + ModifyStyle(0,WS_THICKFRAME| WS_SYSMENU); return 0; } @@ -2383,7 +2543,8 @@ void ETSLayoutPropertySheet::Resize(int cx, int cy) { UpdateLayout(); - if(IsWizard()) + // Fix for PSH_WIZARDHASFINISH [Thömmi] + if (IsWizard() && !(m_psh.dwFlags & PSH_WIZARDHASFINISH) ) { // manual reposition of the FINISH button // can not be done with normaly layouting because it @@ -2462,18 +2623,76 @@ long _PropertySheetIDs[] = { ID_WIZBACK, ID_WIZNEXT, + ID_WIZFINISH, IDOK, IDCANCEL, ID_APPLY_NOW, IDHELP }; +void ETSLayoutPropertySheet::AddMainArea(CPane paneRoot, CPaneBase itemTab) +{ + // the default is: Whole main Area is covered by the TabCtrl + paneRoot << itemTab; +} + +void ETSLayoutPropertySheet::AddButtons(CPane paneBottom) +{ + // first item greedy to keep others right + paneBottom->addItem (paneNull, GREEDY); + + + // add all Controls to the layouting + bool bFirst = true; + for(int i = 0; i < (sizeof(_PropertySheetIDs) / sizeof(long)) ; i++) + { + // Prevent movement of finish button, if it is not shown explicitly [Thömmi] + if( IsWizard() + && _PropertySheetIDs[i] == ID_WIZFINISH + && !(m_psh.dwFlags & PSH_WIZARDHASFINISH) ) + { + continue; + } + + CWnd* pWnd = GetDlgItem(_PropertySheetIDs[i]); + + if(pWnd) + { + + if(!(m_psh.dwFlags & PSH_HASHELP) && _PropertySheetIDs[i] == IDHELP) + { + // don't insert + continue; + } + + if((m_psh.dwFlags & PSH_NOAPPLYNOW) && _PropertySheetIDs[i] == ID_APPLY_NOW) + { + // don't insert + continue; + } + + // space before first one and between BACK & NEXT + if( IsWizard() ) + { + if( !bFirst && !(_PropertySheetIDs[i]==ID_WIZNEXT) ) + { + paneBottom->addItem(paneNull, NORESIZE,12,0,0,0); + } + } + + pWnd->ShowWindow(true); + paneBottom->addItem(_PropertySheetIDs[i], NORESIZE); + bFirst = false; + } + } + +} BOOL ETSLayoutPropertySheet::OnInitDialog() { BOOL bRet = CPropertySheet::OnInitDialog(); - ASSERT(!m_RootPane); + //ASSERT(!m_RootPane); // Save initial rect GetWindowRect(&m_rcStart); @@ -2489,7 +2708,7 @@ BOOL ETSLayoutPropertySheet::OnInitDialog() // Add Tabcontrol to root pane m_ItemTab = item( GetTabControl(), GREEDY, 0, 0, 0, 0); - m_RootPane << m_ItemTab; + AddMainArea(m_RootPane, m_ItemTab); // Tabcontrol is invisible in WizardMode if(IsWizard()) @@ -2508,48 +2727,11 @@ BOOL ETSLayoutPropertySheet::OnInitDialog() // No spaces in WizardMode in order to keep BACK & NEXT together CPane bottomPane = pane(HORIZONTAL, ABSOLUTE_VERT, IsWizard() ? 0 : 5); - // first item greedy to keep others right - bottomPane->addItem (paneNull, GREEDY); - - - // add all Controls to the layouting - bool bFirst = true; - for(int i = 0; i < (sizeof(_PropertySheetIDs) / sizeof(long)) ; i++) - { - CWnd* pWnd = GetDlgItem(_PropertySheetIDs[i]); - - if(pWnd) - { - - if(!(m_psh.dwFlags & PSH_HASHELP) && _PropertySheetIDs[i] == IDHELP) - { - // don't insert - continue; - } - - if((m_psh.dwFlags & PSH_NOAPPLYNOW) && _PropertySheetIDs[i] == ID_APPLY_NOW) - { - // don't insert - continue; - } - - // space before first one and between BACK & NEXT - if( IsWizard() ) - { - if( !bFirst && !(_PropertySheetIDs[i]==ID_WIZNEXT) ) - { - bottomPane->addItem(paneNull, NORESIZE,12,0,0,0); - } - } - - pWnd->ShowWindow(true); - bottomPane->addItem(_PropertySheetIDs[i], NORESIZE); - bFirst = false; - } - } - - // add bottom (button) pane - m_RootPane << bottomPane; + AddButtons(bottomPane); + // add bottom (button) pane if any controls were added + if(bottomPane->m_paneItems.GetSize() > 0) { + m_RootPane << bottomPane; + } } @@ -2563,12 +2745,12 @@ BOOL ETSLayoutPropertySheet::OnInitDialog() { m_StatusBar.SetIndicators(auIDStatusBar, sizeof(auIDStatusBar) / sizeof(UINT)); - m_StatusBar.SetWindowText(""); + m_StatusBar.SetWindowText(_T("")); RepositionBars(AFX_IDW_CONTROLBAR_FIRST, AFX_IDW_CONTROLBAR_LAST, 0); } else { - AfxMessageBox("Error - Statusbar"); + AfxMessageBox(_T("Error - Statusbar")); } } -- cgit v1.1 From 0e34d281c7df993cf5f72d60c16f5205d0fc06ac Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:08:31 +0000 Subject: Utilisateur : Fcolin Date : 18/11/05 Heure : 11:46 Archivé dans $/Bus/IvyProbe Commentaire: (vss 4) --- IvyProbe/ETSLayout.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/ETSLayout.cpp b/IvyProbe/ETSLayout.cpp index 921e129..994c5ce 100644 --- a/IvyProbe/ETSLayout.cpp +++ b/IvyProbe/ETSLayout.cpp @@ -545,8 +545,10 @@ void ETSLayoutMgr::EraseBkgnd(CDC* pDC) pWndChild = pWndChild->GetNextWindow(); } - - HBRUSH hBrBack = (HBRUSH) ::GetClassLong(GetWnd()->GetSafeHwnd(), GCL_HBRBACKGROUND) ; + HBRUSH hBrBack = 0; +#ifdef GCL_HBRBACKGROUND + hBrBack = (HBRUSH) ::GetClassLong(GetWnd()->GetSafeHwnd(), GCL_HBRBACKGROUND) ; +#endif if( hBrBack == 0 ) hBrBack = ::GetSysColorBrush(COLOR_BTNFACE); @@ -1366,7 +1368,7 @@ bool ETSLayoutMgr::Pane::resizeToRelative(int& availSpace, CArray& size // come to endless looping. Save the amount of space actually distributed in this iteration int relDist = 0; - for(i=0; i& size } // Fixup Relative: invert all negative (limited) sized to correct value - for(i=0; imodeResize() & RELATIVE_HORZ) && sizePrimary[i] < 0) || @@ -1555,7 +1557,7 @@ bool ETSLayoutMgr::Pane::resizeToGreedy(int& availSpace, int nGreedy, CArray +// +// DISCLAIMER: +// +// This Sourcecode and all accompaning material is ©1998-1999 Erwin Tratar. +// All rights reserved. +// +// The source code may be used in compiled form in any way you desire +// (including usage in commercial applications), providing that your +// application adds essential code (i.e. it is not only a wrapper) to the +// functionality found here +// +// Redistribution of the sourcecode itself, publication in any media or +// inclusion in a library requires the authors expressed written consent. +// You may not sale this code for profit. +// +// THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY. USE IT +// AT YOUR OWN RISK! THE AUTHOR ACCEPTS NO LIABILITY FOR ANY DAMAGE/LOSS OF +// BUSINESS THAT THIS PRODUCT MAY CAUSE. + + +#if !defined(ETS_LAYOUTMGR_INCLUDED_) +#define ETS_LAYOUTMGR_INCLUDED_ + +#if _MSC_VER >= 1000 +#pragma once +#endif // _MSC_VER >= 1000 +// DialogMgr.h : header file +// + +#ifdef CS_HELP + typedef ETSCSHelpDialog CBaseDialog; + typedef ETSCSHelpFormView CBaseFormView; + typedef ETSCSHelpDlgBar CBaseDialogBar; + typedef ETSCSHelpPropPage CBasePropertyPage; +#else + typedef CDialog CBaseDialog; + typedef CFormView CBaseFormView; + typedef CDialogBar CBaseDialogBar; + typedef CPropertyPage CBasePropertyPage; +#endif + +// Support for CBCGDialogBar instead of CDialogBar available +// you just have to change the typedef to CBaseDialogBar + +#ifndef ETSGUI_EXT_CLASS +#define ETSGUI_EXT_CLASS +#endif + +#include + +// Support for CBCGDialogBar instead of CDialogBar + +/** + * Controls whether the Icon is automatically set to IDR_MAINFRAME + */ +#define _AUTO_SET_ICON + + +/** + * Use this helper in your derived class as usually + * + * example: [MyDerivedClass.h] + * + * CMyDerivedClass::CMyDerivedClass() + * { + * DECLARE_LAYOUT(); + * ... + * + * FUNCTION: Connects the layout mechanism to your class + */ +#define DECLARE_LAYOUT() \ +virtual void Layout(CRect& rcClient) \ + { \ + if(rcClient.Height() && rcClient.Width() && m_RootPane.IsValid()) \ + m_RootPane->resizeTo(rcClient); \ + } + +/** + * This is a NOOP now + */ +#define IMPLEMENT_LAYOUT() + +/** + * This is the default border size between the panes. You + * may override it in Pane constructor, but it is the + * fixed border around the root pane + */ +const int nDefaultBorder = 5; + +/** + * The minimum size for not ABSOLUTE_XXX items + */ +const int nMinConstrain = 5; + +class ETSGUI_EXT_CLASS ETSLayoutMgr +{ +public: + + enum layResizeMode { + GREEDY = 0, // Will eat up as much as it can + ABSOLUTE_HORZ = 1 << 0, // Horizontal size is absolute + RELATIVE_HORZ = 1 << 1, // Horizontal size in percent + ABSOLUTE_VERT = 1 << 2, // Vertical size is absolute + RELATIVE_VERT = 1 << 3, // Vertical size in percent + + NORESIZE = ABSOLUTE_HORZ | ABSOLUTE_VERT, + + SIZE_MASK = NORESIZE, + + ALIGN_LEFT = 1 << 4, // following only for NORESIZE + ALIGN_RIGHT = 1 << 5, + ALIGN_TOP = 1 << 6, + ALIGN_BOTTOM = 1 << 7, + + ALIGN_HCENTER = ALIGN_LEFT | ALIGN_RIGHT, + ALIGN_VCENTER = ALIGN_TOP | ALIGN_BOTTOM, + + ALIGN_CENTER = ALIGN_HCENTER | ALIGN_VCENTER, + + ALIGN_FILL_HORZ = 1 << 8, + ALIGN_FILL_VERT = 1 << 9, + ALIGN_FILL = ALIGN_FILL_HORZ | ALIGN_FILL_VERT, + +/* TRACKER_LEFT = 1 << 10, // not yet. May allow tracking of borders + TRACKER_RIGHT = 1 << 11, // between items in the future + TRACKER_TOP = 1 << 12, + TRACKER_BOTTOM = 1 << 13, +*/ + }; + + enum layOrientation { + HORIZONTAL, + VERTICAL + }; + + /** + * This is the base class for all kind of panes. + */ + class ETSGUI_EXT_CLASS PaneBase { + friend class ETSLayoutMgr; + friend class CPaneBase; + friend class CPane; + + public: + + /** + * Informs the caller how much of the given space this pane would + * like to receive in horizontal direction + */ + virtual int getConstrainHorz(int sizeParent) = 0; + + + /** + * Informs the caller how much of the given space this pane would + * like to receive in vertical direction + */ + virtual int getConstrainVert(int sizeParent) = 0; + + /** + * Informs the caller how much of the given space this pane + * minimally need. This would be an absolute Value if + * the mode contains ABSOLUTE_HORZ or an explicit minimum + * value, else nMinConstrain + */ + virtual int getMinConstrainHorz() = 0; + /** + * Informs the caller if there is an restriction for maximum + * space this pane needs. Return -1 for unrestricted (GREEDY + * or RELATIVE) + */ + virtual int getMaxConstrainHorz() = 0; + + /** + * Informs the caller how much of the given space this pane + * minimally need. This would be an absolute Value if + * the mode contains ABSOLUTE_VERT or an explicit minimum + * value, else nMinConstrain + */ + virtual int getMinConstrainVert() = 0; + + /** + * Informs the caller if there is an restriction for maximum + * space this pane needs. Return -1 for unrestricted (GREEDY + * or RELATIVE) + */ + virtual int getMaxConstrainVert() = 0; + + /** + * This will do the actual resize operation after the + * caller computed a new area for this pane + */ + virtual bool resizeTo(CRect& rcNewArea) = 0; + + /** + * Constructor needed pointer to LayoutManager + */ + PaneBase( ETSLayoutMgr* pMgr ) { m_pMgr = pMgr; }; + + /** + * Virtual destructor needed in Container operations + */ + virtual ~PaneBase() {}; + + /** + * Returs the Resize Mode of this pane + */ + DWORD modeResize() { return m_modeResize; }; + + protected: + /** + * How this Item will be resized, a combination of the flags above + */ + DWORD m_modeResize; + + /** + * A pointer to the holding LayoutManager derivate + */ + ETSLayoutMgr* m_pMgr; + }; + + /** + * CPaneBase represents an autopointer to a PaneBase. Use this and you won't have to worry + * about cleaning up any Panes. Also this autopointer lets you return Pane objects + * from function without using pointers (at least you won't see them :) ) + */ + struct ETSGUI_EXT_CLASS PaneHolder + { + PaneHolder(PaneBase* pPane ); + ~PaneHolder(); + + void AddRef(); + void Release(); + + PaneBase* m_pPane; + long m_nRefCount; + }; + + class ETSGUI_EXT_CLASS CPaneBase + { + protected: + PaneHolder* m_pPaneHolder; + + public: + // Standardconstructor + CPaneBase( ); + CPaneBase( PaneBase* pPane ); + CPaneBase( const CPaneBase& other ); + + ~CPaneBase(); + + void operator=( PaneBase* pPane ); + void operator=( const CPaneBase& other ); + PaneBase* operator->() const; + PaneBase* GetPaneBase() { return operator->(); } + + bool IsValid() { return (m_pPaneHolder != 0); } + operator !() { return (m_pPaneHolder == 0); } + + }; + + class Pane; + class ETSGUI_EXT_CLASS CPane : public CPaneBase + { + public: + // Standardconstructor + CPane( ); + CPane( Pane* pPane ); + CPane( const CPane& other ); + + ~CPane(); + + void operator=( Pane* pPane ); + void operator=( const CPane& other ); + Pane* operator->() const; + Pane* GetPane() { return operator->(); } + + CPaneBase ConvertBase() const; + + CPane& operator<< ( const CPane pPane ); + CPane& operator<< ( const CPaneBase pItem ); + }; + + + + /** + * PaneItem represents a single control + */ + class ETSGUI_EXT_CLASS PaneItem : public PaneBase { + friend class ETSLayoutMgr; + friend class Pane; + protected: + /** + * Creates a new PaneItem from an Control. If sizeX or sizeY are 0 + * and modeResize is ABSOLUTE will copy the current dimensions of + * the control to m_sizeX/Y. So the appearance does not change + * from the Dialog Editor + */ + PaneItem( CWnd* pWnd, ETSLayoutMgr* pMgr, layResizeMode modeResize = GREEDY, int sizeX=0, int sizeY=0, int sizeXMin=0, int sizeYMin=0); + + /** + * If your control is not mapped you can name it by its ChildID. Pass + * the pMgr to receive the CWnd* of nID. + * The rest as stated above + */ + PaneItem( UINT nID, ETSLayoutMgr* pMgr, layResizeMode modeResize = GREEDY, int sizeX=0, int sizeY=0, int sizeXMin=0, int sizeYMin=0); + + + public: + /** + * see PaneBase + */ + virtual int getConstrainHorz(int sizeParent); + virtual int getConstrainVert(int sizeParent); + virtual int getMinConstrainHorz(); + virtual int getMinConstrainVert(); + virtual int getMaxConstrainHorz(); + virtual int getMaxConstrainVert(); + virtual bool resizeTo(CRect& rcNewArea); + + bool isDummy() { return (m_hwndCtrl == 0); } + + protected: + friend class ETSLayoutPropertySheet; + + /** + * The horizontal size of the control (see m_modeResize) + */ + int m_sizeX; + int m_sizeXMin; + + /** + * The vertical size of the control (see m_modeResize) + */ + int m_sizeY; + int m_sizeYMin; + + /** + * Child Control pointer + */ + HWND m_hwndCtrl; + + /** + * Combo box needs special treatment + */ + bool m_bComboSpecial; + }; + + + /** + * This class encapsulates a Subpane (and indeed the root Pane too) + * it is a container of PaneBase* which it will recursivly resize + */ + class ETSGUI_EXT_CLASS Pane : public PaneBase { + friend class ETSLayoutMgr; + friend class CPaneBase; + friend class CPane; + + protected: + /** + * Tell the pane in which direction it is positioned. A HORIZONTAL pane + * arranges it's subpanes from left to right, a VERTICAL from top to bottom + */ + Pane( ETSLayoutMgr* pMgr, layOrientation orientation, int sizeBorder = nDefaultBorder, int sizeExtraBorder = 0 ); + + public: + /** + * If your control is not mapped you can name it by its ChildID. Pass + * the pMgr to receive the CWnd* of nID. + * The rest as stated above + */ + bool addItem( UINT nID, layResizeMode modeResize = GREEDY, int sizeX=0, int sizeY=0, int sizeXMin=-1, int sizeYMin=-1); + + /** + * Creates a new PaneItem from an Control. If sizeX or sizeY are 0 + * and modeResize is ABSOLUTE will copy the current dimensions of + * the control to m_sizeX/Y. So the appearance does not change + * from the Dialog Editor + */ + bool addItem( CWnd* pWnd, layResizeMode modeResize = GREEDY, int sizeX=0, int sizeY=0, int sizeXMin=-1, int sizeYMin=-1); + + + /** + * Add a whitespace Item (paneNull) of variable size with + * a minimum size of 0 + */ + bool addItemGrowing(); + + /** + * Add a whitespace Item (paneNull) with fixed size + */ + bool addItemFixed(int size); + + /** + * Add a whitespace Item (paneNull) of fixed size based on the + * current layout (as in the dialog template). Based on the layout + * of the pane vertical or horizontal spacing is considered + * + * First argument is the left (top) item for a HORIZONTAL (VERTICAL) pane + */ + bool addItemSpaceBetween( CWnd* pWndFirst, CWnd* pWndSecond ); + bool addItemSpaceBetween( UINT nIDFirst, UINT nIDSecond ); + + + /** + * Add a whitespace Item (paneNull) of fixed size based on the + * size of another item + */ + bool addItemSpaceLike( CWnd* pWnd ); + bool addItemSpaceLike( UINT nID ); + + + /** + * Add an item to the pane, appending at the end. This may be either obtained + * by a call to ETSLayoutMgr::item() or one of the ETSLayoutMgr::paneXXX() calls + */ + bool addPane( CPaneBase pItem ); + bool addPane( CPane pSubpane, layResizeMode modeResize, int sizeSecondary /* = 0 */); + + virtual int getConstrainHorz(int sizeParent); + virtual int getConstrainVert(int sizeParent); + virtual int getMinConstrainHorz(); + virtual int getMinConstrainVert(); + virtual int getMaxConstrainHorz(); + virtual int getMaxConstrainVert(); + virtual bool resizeTo(CRect& rcNewArea); + + /** + * The destructor takes care of destroying all Subpanes and items + */ + virtual ~Pane(); + + /** + * Access to the orientation of this pane + */ + layOrientation getOrientation() { return m_Orientation; }; + + + protected: + + int resizeToAbsolute(int& availSpace, CArray& sizePrimary, + CArray& sizeMin, CArray& sizeMax); + + bool resizeToRelative(int& availSpace, CArray& sizePrimary, + CArray& sizeMin, CArray& sizeMax); + + bool resizeToGreedy( int& availSpace, int nGreedy, CArray& sizePrimary, + CArray& sizeMin, CArray& sizeMax); + + /** + * The orientation of the pane. Keep in mind that all subpanes + * must have the complementary orientation, i.e. a VERTICAL + * pane must have all HORIZONTAL SubPanes (or normal Items + * of course) + */ + layOrientation m_Orientation; + + /** + * This array holds the pointers to the Items/SubPanes + */ + CArray m_paneItems; + + /** + * The secondary constrain + */ + int m_sizeSecondary; + + /** + * Size of gap between childs + */ + int m_sizeBorder; + int m_sizeExtraBorder; + }; + + + /** + * This class encapsulates a Subpane which is a Tab + * it will use calls to AdjustRect to position it's + * childs + */ + class ETSGUI_EXT_CLASS PaneTab : public Pane + { + friend class ETSLayoutMgr; + + protected: + /** + * Tell the pane in which direction it is positioned. A HORIZONTAL pane + * arranges it's subpanes from left to right, a VERTICAL from top to bottom + */ + PaneTab( CTabCtrl* pTab, ETSLayoutMgr* pMgr, layOrientation orientation, int sizeBorder = nDefaultBorder, int sizeExtraBorder = 0 ); + + public: + virtual int getConstrainHorz(int sizeParent); + virtual int getConstrainVert(int sizeParent); + virtual int getMinConstrainHorz(); + virtual int getMinConstrainVert(); + virtual int getMaxConstrainHorz(); + virtual int getMaxConstrainVert(); + virtual bool resizeTo(CRect& rcNewArea); + + private: + CTabCtrl* m_pTab; + }; + + /** + * This class encapsulates a Subpane which is a Static + * it will use calls to AdjustRect to position it's + * childs + */ + class ETSGUI_EXT_CLASS PaneCtrl : public Pane + { + friend class ETSLayoutMgr; + protected: + /** + * Tell the pane in which direction it is positioned. A HORIZONTAL pane + * arranges it's subpanes from left to right, a VERTICAL from top to bottom + */ + PaneCtrl( CWnd* pCtrl, ETSLayoutMgr* pMgr, layOrientation orientation, int sizeBorder = nDefaultBorder, int sizeExtraBorder = 0, int sizeTopExtra = 0); + PaneCtrl( UINT nID, ETSLayoutMgr* pMgr, layOrientation orientation, int sizeBorder = nDefaultBorder, int sizeExtraBorder = 0, int sizeTopExtra = 0 ); + + public: + + virtual int getConstrainHorz(int sizeParent); + virtual int getConstrainVert(int sizeParent); + virtual int getMinConstrainHorz(); + virtual int getMinConstrainVert(); + virtual int getMaxConstrainHorz(); + virtual int getMaxConstrainVert(); + virtual bool resizeTo(CRect& rcNewArea); + + private: + HWND m_hwndCtrl; + int m_sizeTopExtra; + }; + + + + + ETSLayoutMgr(CWnd* pWnd) { m_pWnd = pWnd; m_sizeRootBorders = CSize(5,5); }; + virtual ~ETSLayoutMgr(); + + virtual CRect GetRect() { CRect r; m_pWnd->GetClientRect(r); return r; }; + CWnd* m_pWnd; + CWnd* GetWnd() { return m_pWnd; }; + void setRootBorders(int cx, int cy) { m_sizeRootBorders = CSize(cx,cy); }; + + /** + * Pass this for a pseudo Pane with no content + */ + static CWnd* paneNull; + + /** + * Loads the current position and size from the registry using a supplied + * key. Will be loaded with AfxGetApp()->WriteProfileXXX(). You may + * specify a subfolder (e.g. Load( _T("MyDialog\\Layout") ); ). Will + * load the following keys: + * + * - lpstrRegKey+"SizeX"; + * - lpstrRegKey+"SizeY"; + * - lpstrRegKey+"PosX"; + * - lpstrRegKey+"PosY"; + * + * Is automatically called during OnActivate() if key specified in + * constructor. + */ + bool Load(LPCTSTR lpstrRegKey); + + /** + * Store the current position and size to the registry using a supplied + * key. Will be stored with AfxGetApp()->WriteProfileXXX(). You may + * specify a subfolder (e.g. Save( _T("MyDialog\\Layout") ); ). Will + * create the following keys: + * + * - lpstrRegKey+"SizeX"; + * - lpstrRegKey+"SizeY"; + * - lpstrRegKey+"PosX"; + * - lpstrRegKey+"PosY"; + * + * Is automatically called during DestroyWindow() if key specified in + * constructor. + */ + bool Save(LPCTSTR lpstrRegKey); + + /** + * Updates the layout after you specify the new + * layout + */ + virtual void UpdateLayout(); + virtual void UpdateLayout(CPane p) { + if(m_RootPane.IsValid()) + { + // free old root + m_RootPane = 0; + } + m_RootPane = p; + UpdateLayout(); + } + + /** + * Does the actual Layout, called from OnSize() + * Default implementation does nothing, use + * IMPLEMENT_LAYOUT in your derived class (see above) + */ + virtual void Layout(CRect& rcClient); + + + /** + * Erasing only the these parts of the client area where + * there is no child window. Extra-code for group-boxes + * included! + */ + void EraseBkgnd(CDC* pDC); + + /** + * Helperfunctions for the stream-interface. For usage see sample Application + * and/or documentation. + */ + + /** + * Create a new Pane. You may specify the resize + * mode for both directions. If you add modes for the secondary direction + * (i.e. *_VERT for a HORIZONTAL pane) then sizeSecondary is used as it's + * size. If you do not specify sizeSecondary and the mode is ABSOLUTE_VERT + * it will be computed as the maximum Height of all SubPanes (the same is + * true for VERTICAL panes and subpanes with *_HORZ) + */ + CPane pane( layOrientation orientation, layResizeMode modeResize = GREEDY, int sizeBorder = nDefaultBorder, int sizeExtraBorder = 0, int sizeSecondary = 0); + + /** + * Create one of the special control panes. Parameter are like pane(). For + * additional information see documentation + */ + CPane paneTab( CTabCtrl* pTab, layOrientation orientation, layResizeMode modeResize = GREEDY, int sizeBorder = nDefaultBorder, int sizeExtraBorder = 0, int sizeSecondary = 0); + CPane paneCtrl( UINT nID, layOrientation orientation, layResizeMode modeResize = GREEDY, int sizeBorder = nDefaultBorder, int sizeExtraBorder = 0, int sizeTopExtra = 0, int sizeSecondary = 0); + CPane paneCtrl( CWnd* pCtrl, layOrientation orientation, layResizeMode modeResize = GREEDY, int sizeBorder = nDefaultBorder, int sizeExtraBorder = 0, int sizeTopExtra = 0, int sizeSecondary = 0); + + /** + * Creates a new PaneItem for an Control. If sizeX or sizeY are 0 + * and modeResize is ABSOLUTE will copy the current dimensions of + * the control to m_sizeX/Y. So the appearance does not change + * from the Dialog Editor. size*Min = -1 means: do not make smaller + * than in Dialog Template. + */ + CPaneBase item(UINT nID, layResizeMode modeResize = GREEDY, int sizeX =0, int sizeY =0, int sizeXMin =-1, int sizeYMin =-1); + CPaneBase item(CWnd* pWnd, layResizeMode modeResize = GREEDY, int sizeX =0, int sizeY =0, int sizeXMin =-1, int sizeYMin =-1); + + + /** + * Add a whitespace Item (paneNull) of variable size with + * a minimum size of 0 + */ + CPaneBase itemGrowing(layOrientation orientation); + + /** + * Add a whitespace Item (paneNull) with fixed size + */ + CPaneBase itemFixed(layOrientation orientation, int sizePrimary); + + /** + * Add a whitespace Item (paneNull) of fixed size based on the + * current layout (as in the dialog template). Based on the layout + * of the pane vertical or horizontal spacing is considered + * + * First argument is the left (top) item for a HORIZONTAL (VERTICAL) pane + */ + CPaneBase itemSpaceBetween( layOrientation orientation, CWnd* pWndFirst, CWnd* pWndSecond ); + CPaneBase itemSpaceBetween( layOrientation orientation, UINT nIDFirst, UINT nIDSecond ); + + /** + * Add a whitespace Item (paneNull) of fixed size based on the + * size of another item + */ + CPaneBase itemSpaceLike( layOrientation orientation, CWnd* pWnd ); + CPaneBase itemSpaceLike( layOrientation orientation, UINT nID ); + +protected: + /** + * This holds the root pane. Fill in InitDialog() + */ + CPane m_RootPane; + + /** + * Create a root pane + */ + CPane CreateRoot(layOrientation orientation, int sizeBorder = nDefaultBorder, int sizeExtraBorder = 0 ) + { + if(m_RootPane.IsValid()) + { + // free old root + m_RootPane = 0; + } + m_RootPane = new Pane( this, orientation, sizeBorder, sizeExtraBorder); + return m_RootPane; + } + + /** + * Key in Registry where to store Size + */ + CString m_strRegStore; + + /** + * Borders around root + */ + CSize m_sizeRootBorders; +}; + +inline ETSLayoutMgr::layResizeMode operator|(const ETSLayoutMgr::layResizeMode m1, + const ETSLayoutMgr::layResizeMode m2) + { return (ETSLayoutMgr::layResizeMode)( (DWORD)m1|(DWORD)m2); } + + +/** + * Base class for the Layout function. Derive your own class + * from this or derive it from CDialog and modify _all_ + * references to CDialog to ETSLayoutDialog + */ +class ETSGUI_EXT_CLASS ETSLayoutDialog : public CBaseDialog, protected ETSLayoutMgr +{ +// Construction +public: + ETSLayoutDialog(UINT nID, CWnd* pParent = NULL, LPCTSTR strName = NULL, bool bGripper = true); // standard constructor + +// Dialog Data + //{{AFX_DATA(ETSLayoutDialog) + //}}AFX_DATA + + +// Overrides + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(ETSLayoutDialog) + //}}AFX_VIRTUAL + +// Implementation +protected: + // Generated message map functions + //{{AFX_MSG(ETSLayoutDialog) + afx_msg void OnSize(UINT nType, int cx, int cy); + afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI); + afx_msg BOOL OnEraseBkgnd(CDC* pDC); + virtual BOOL OnInitDialog(); + afx_msg void OnDestroy(); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() + + virtual CRect GetRect(); + + bool m_bGripper; + CStatusBar m_StatusBar; +}; + + +/** + * Base class for the Layout function. Derive your own class + * from this or derive it from CDialog and modify _all_ + * references to CFormView to ETSLayoutFormView + */ +class ETSGUI_EXT_CLASS ETSLayoutFormView : public CBaseFormView, public ETSLayoutMgr +{ +// Construction + DECLARE_DYNAMIC(ETSLayoutFormView) +public: + ETSLayoutFormView(UINT nID, LPCTSTR strName = NULL); // standard constructor + virtual ~ETSLayoutFormView(); + +// virtual void UpdateLayout(); + + +// Overrides + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(ETSLayoutDialog) + //}}AFX_VIRTUAL + +// Implementation +protected: + + // Generated message map functions + //{{AFX_MSG(ETSLayoutDialog) + afx_msg void OnSize(UINT nType, int cx, int cy); + afx_msg BOOL OnEraseBkgnd(CDC* pDC); + afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() +}; + + +/** + * Base class for the Layout function. Derive your own class + * from this or derive it from CBCGDialogBar/CDialogBar and + * modify _all_ references to CBCGDialogBar/CDialogBar to + * ETSLayoutDialogBar + */ +class ETSGUI_EXT_CLASS ETSLayoutDialogBar : public CBaseDialogBar, protected ETSLayoutMgr +{ +// Construction +public: +#ifdef CS_HELP + ETSLayoutDialogBar(UINT nID); +#else + ETSLayoutDialogBar(); +#endif + + +// Overrides + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(ETSLayoutDialogBar) + virtual CSize CalcDynamicLayout(int nLength, DWORD dwMode); + //}}AFX_VIRTUAL + + /** + * Override this to define Layout + */ + virtual BOOL Initialize() { return false; }; + +// Implementation +protected: + // Generated message map functions + //{{AFX_MSG(ETSLayoutDialogBar) + afx_msg void OnSize(UINT nType, int cx, int cy); + afx_msg void OnDestroy(); + afx_msg BOOL OnEraseBkgnd(CDC* pDC); + //}}AFX_MSG + LRESULT OnInitDialog(WPARAM, LPARAM); + DECLARE_MESSAGE_MAP() + + virtual CRect GetRect(); + bool m_bInitialized; +}; + + + +/************************************************** + ** ! the code is only tested for modal sheets ! ** + **************************************************/ + + +/** + * Resizable PropertySheet. Use this class standalone + * or as your base class (instead CProptertySheet) + */ +class ETSGUI_EXT_CLASS ETSLayoutPropertySheet : public CPropertySheet, protected ETSLayoutMgr +{ + DECLARE_DYNAMIC(ETSLayoutPropertySheet) + DECLARE_LAYOUT() + +// Construction +public: + ETSLayoutPropertySheet(UINT nIDCaption, CWnd *pParentWnd = NULL, UINT iSelectPage = 0, LPCTSTR strName=NULL, bool bGripper=true); + ETSLayoutPropertySheet(LPCTSTR pszCaption, CWnd *pParentWnd = NULL, UINT iSelectPage = 0, LPCTSTR strName=NULL, bool bGripper=true); + +// Operationen +public: + void SetAutoDestroy() { m_bAutoDestroy = true; } + void SetAutoDestroyPages() { m_bAutoDestroyPages = true; } + void ModelessWithButtons() { m_bModelessButtons = true; } +// Overrides + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(ETSLayoutPropertySheet) + public: + virtual BOOL OnInitDialog(); + virtual void PostNcDestroy(); + //}}AFX_VIRTUAL + +// Implementation +public: + virtual ~ETSLayoutPropertySheet(); + + // Generated message map functions +protected: + //{{AFX_MSG(ETSLayoutPropertySheet) + afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); + afx_msg void OnSize(UINT nType, int cx, int cy); + afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI); + afx_msg void OnDestroy(); + afx_msg BOOL OnEraseBkgnd(CDC* pDC); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() + + void Resize(int cx, int cy); + +friend class ETSLayoutPropertyPage; + + void Init(LPCTSTR strName, bool bGripper); + CRect m_rcStart; + CRect m_rcPage; + bool m_bGripper; + CStatusBar m_StatusBar; + CPaneBase m_ItemTab; + bool m_bAutoDestroy; + bool m_bAutoDestroyPages; + bool m_bModelessButtons; +}; + +/** + * Base class for the Layout function. Derive your own class + * from this or derive it from CPropertyPage and + * modify _all_ references to CPropertyPage to + * ETSLayoutPropertyPage + */ +class ETSGUI_EXT_CLASS ETSLayoutPropertyPage : public CBasePropertyPage, protected ETSLayoutMgr +{ +friend class ETSLayoutPropertySheet; + + DECLARE_DYNCREATE(ETSLayoutPropertyPage) + +// Konstruktion +public: + ETSLayoutPropertyPage( ); + ETSLayoutPropertyPage( UINT nIDTemplate, UINT nIDCaption = 0 ); + ETSLayoutPropertyPage( LPCTSTR lpszTemplateName, UINT nIDCaption = 0 ); + + ~ETSLayoutPropertyPage(); + + +// Overrides + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(ETSLayoutPropertyPage) + public: + virtual BOOL OnSetActive(); + //}}AFX_VIRTUAL + +// Implementation +protected: + // Generated message map functions + //{{AFX_MSG(ETSLayoutPropertyPage) + afx_msg void OnSize(UINT nType, int cx, int cy); + afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI); + virtual BOOL OnInitDialog(); + afx_msg BOOL OnEraseBkgnd(CDC* pDC); + afx_msg void OnWindowPosChanging( WINDOWPOS* lpwndpos ); + afx_msg void OnDestroy(); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() + + virtual CRect GetRect(); + bool m_bLockMove; +}; + + + +//{{AFX_INSERT_LOCATION}} +// Microsoft Developer Studio will insert additional declarations immediately before the previous line. + +#endif // !defined(ETS_LAYOUTMGR_INCLUDED_) -- cgit v1.1 From fcc74cd15b9c82be4e12e6efdab2844c0a20dc76 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:08:35 +0000 Subject: Utilisateur : Fcolin Date : 9/04/04 Heure : 16:31 Archivé dans $/Bus/IvyProbe Commentaire: (vss 2) --- IvyProbe/ETSLayout.h | 53 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/ETSLayout.h b/IvyProbe/ETSLayout.h index 9ff5693..b532c56 100644 --- a/IvyProbe/ETSLayout.h +++ b/IvyProbe/ETSLayout.h @@ -4,7 +4,7 @@ // / _/ / / / / ___ ___ ____ // // /__/ /_/ / / / // _/_ _/ // // _________/ / / / // _/ / / // -// __(c) 1998-9_/ /___//_/ /_/ // +// (c) 1998-2000_/ /___//_/ /_/ // // // //////////////////////////////////////////// // all rights reserved // @@ -46,6 +46,8 @@ #endif // _MSC_VER >= 1000 // DialogMgr.h : header file // +namespace ETSLayout +{ #ifdef CS_HELP typedef ETSCSHelpDialog CBaseDialog; @@ -58,8 +60,9 @@ typedef CDialogBar CBaseDialogBar; typedef CPropertyPage CBasePropertyPage; #endif +} -// Support for CBCGDialogBar instead of CDialogBar available +// Support for CBCGDialogBar instead of CDialogBar available: // you just have to change the typedef to CBaseDialogBar #ifndef ETSGUI_EXT_CLASS @@ -74,30 +77,22 @@ * Controls whether the Icon is automatically set to IDR_MAINFRAME */ #define _AUTO_SET_ICON - /** - * Use this helper in your derived class as usually - * - * example: [MyDerivedClass.h] - * - * CMyDerivedClass::CMyDerivedClass() - * { - * DECLARE_LAYOUT(); - * ... - * - * FUNCTION: Connects the layout mechanism to your class + * Forward class declarations */ -#define DECLARE_LAYOUT() \ -virtual void Layout(CRect& rcClient) \ - { \ - if(rcClient.Height() && rcClient.Width() && m_RootPane.IsValid()) \ - m_RootPane->resizeTo(rcClient); \ - } +class ETSLayoutDialog; +class ETSLayoutDialogBar; +class ETSLayoutFormView; +class ETSLayoutMgr; +class ETSLayoutPropertyPage; +class ETSLayoutPropertySheet; + /** - * This is a NOOP now + * These are NOOPs now */ +#define DECLARE_LAYOUT() #define IMPLEMENT_LAYOUT() /** @@ -374,7 +369,8 @@ public: friend class ETSLayoutMgr; friend class CPaneBase; friend class CPane; - + friend class ETSLayoutPropertySheet; + protected: /** * Tell the pane in which direction it is positioned. A HORIZONTAL pane @@ -733,7 +729,7 @@ inline ETSLayoutMgr::layResizeMode operator|(const ETSLayoutMgr::layResizeMode m * from this or derive it from CDialog and modify _all_ * references to CDialog to ETSLayoutDialog */ -class ETSGUI_EXT_CLASS ETSLayoutDialog : public CBaseDialog, protected ETSLayoutMgr +class ETSGUI_EXT_CLASS ETSLayoutDialog : public ETSLayout::CBaseDialog, protected ETSLayoutMgr { // Construction public: @@ -773,7 +769,7 @@ protected: * from this or derive it from CDialog and modify _all_ * references to CFormView to ETSLayoutFormView */ -class ETSGUI_EXT_CLASS ETSLayoutFormView : public CBaseFormView, public ETSLayoutMgr +class ETSGUI_EXT_CLASS ETSLayoutFormView : public ETSLayout::CBaseFormView, public ETSLayoutMgr { // Construction DECLARE_DYNAMIC(ETSLayoutFormView) @@ -808,7 +804,7 @@ protected: * modify _all_ references to CBCGDialogBar/CDialogBar to * ETSLayoutDialogBar */ -class ETSGUI_EXT_CLASS ETSLayoutDialogBar : public CBaseDialogBar, protected ETSLayoutMgr +class ETSGUI_EXT_CLASS ETSLayoutDialogBar : public ETSLayout::CBaseDialogBar, protected ETSLayoutMgr { // Construction public: @@ -829,6 +825,7 @@ public: * Override this to define Layout */ virtual BOOL Initialize() { return false; }; + virtual void UpdateLayout(); // Implementation protected: @@ -859,7 +856,6 @@ protected: class ETSGUI_EXT_CLASS ETSLayoutPropertySheet : public CPropertySheet, protected ETSLayoutMgr { DECLARE_DYNAMIC(ETSLayoutPropertySheet) - DECLARE_LAYOUT() // Construction public: @@ -872,6 +868,9 @@ public: void SetAutoDestroyPages() { m_bAutoDestroyPages = true; } void ModelessWithButtons() { m_bModelessButtons = true; } // Overrides + virtual void AddMainArea(CPane paneRoot, CPaneBase itemTab); + virtual void AddButtons(CPane paneBottom); + // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(ETSLayoutPropertySheet) public: @@ -915,7 +914,7 @@ friend class ETSLayoutPropertyPage; * modify _all_ references to CPropertyPage to * ETSLayoutPropertyPage */ -class ETSGUI_EXT_CLASS ETSLayoutPropertyPage : public CBasePropertyPage, protected ETSLayoutMgr +class ETSGUI_EXT_CLASS ETSLayoutPropertyPage : public ETSLayout::CBasePropertyPage, protected ETSLayoutMgr { friend class ETSLayoutPropertySheet; @@ -947,11 +946,13 @@ protected: afx_msg BOOL OnEraseBkgnd(CDC* pDC); afx_msg void OnWindowPosChanging( WINDOWPOS* lpwndpos ); afx_msg void OnDestroy(); + afx_msg void OnWindowPosChanged(WINDOWPOS FAR* lpwndpos); //}}AFX_MSG DECLARE_MESSAGE_MAP() virtual CRect GetRect(); bool m_bLockMove; + bool m_bResetBuddyOnNextTimeVisible; }; -- cgit v1.1 From a1d3578395e6bf404a017e8157882fc4e441e71c Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:08:37 +0000 Subject: Utilisateur : Fcolin Date : 18/11/05 Heure : 11:46 Archivé dans $/Bus/IvyProbe Commentaire: (vss 3) --- IvyProbe/ETSLayout.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/ETSLayout.h b/IvyProbe/ETSLayout.h index b532c56..3bdc0da 100644 --- a/IvyProbe/ETSLayout.h +++ b/IvyProbe/ETSLayout.h @@ -269,7 +269,7 @@ public: PaneBase* GetPaneBase() { return operator->(); } bool IsValid() { return (m_pPaneHolder != 0); } - operator !() { return (m_pPaneHolder == 0); } + bool operator !() { return (m_pPaneHolder == 0); } }; -- cgit v1.1 From ef2674c77032ad6fa7bc30049d588576ed9163ec Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:08:39 +0000 Subject: Utilisateur : Fcolin Date : 14/03/00 Heure : 14:07 Créé (vss 1) --- IvyProbe/HistoryEdit.cpp | 82 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 IvyProbe/HistoryEdit.cpp (limited to 'IvyProbe') diff --git a/IvyProbe/HistoryEdit.cpp b/IvyProbe/HistoryEdit.cpp new file mode 100644 index 0000000..cdb1f0f --- /dev/null +++ b/IvyProbe/HistoryEdit.cpp @@ -0,0 +1,82 @@ +/* + * HistoryEdit.cpp + * + * Description: + * CHistoryEdit implementation + * + * A CEdit subclass that allows you to display a text history + * of events. + * + * Author: + * Ravi Bhavnani (ravib@datablast.net) + * + * Revision History: + * 15 Mar 1998 rab Original version + */ + +#include "stdafx.h" +#include "HistoryEdit.h" + +#ifdef _DEBUG +#define new DEBUG_NEW +#undef THIS_FILE +static char THIS_FILE[] = __FILE__; +#endif + +///////////////////////////////////////////////////////////////////////////// +// CHistoryEdit + +CHistoryEdit::CHistoryEdit() +{ + m_bSelectable = FALSE; +} + +CHistoryEdit::~CHistoryEdit() +{ +} + +BEGIN_MESSAGE_MAP(CHistoryEdit, CEdit) + //{{AFX_MSG_MAP(CHistoryEdit) + ON_WM_SETFOCUS() + //}}AFX_MSG_MAP +END_MESSAGE_MAP() + +///////////////////////////////////////////////////////////////////////////// +// CHistoryEdit operations + +void CHistoryEdit::AppendString + (CString str) +// +// Purpose: +// Appends a text string to the history buffer. +// +// Returns: +// None. +// +{ +CString strBuffer; // current contents of edit control + + // Append string + GetWindowText (strBuffer); + if (!strBuffer.IsEmpty()) + strBuffer += "\r\n"; + strBuffer += str; + SetWindowText (strBuffer); + + // Scroll the edit control + LineScroll (GetLineCount(), 0); +} + +///////////////////////////////////////////////////////////////////////////// +// CHistoryEdit message handlers + +void CHistoryEdit::OnSetFocus(CWnd* pOldWnd) +{ + // Don't allow user to select text + if (m_bSelectable) + CEdit::OnSetFocus (pOldWnd); + else + pOldWnd->SetFocus(); +} + +// End EditHistroy.cpp \ No newline at end of file -- cgit v1.1 From 90c8b869cad1f5b0a3212d4a06dd1180e0abb881 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:08:42 +0000 Subject: Utilisateur : Fcolin Date : 14/03/00 Heure : 14:07 Créé (vss 1) --- IvyProbe/HistoryEdit.h | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 IvyProbe/HistoryEdit.h (limited to 'IvyProbe') diff --git a/IvyProbe/HistoryEdit.h b/IvyProbe/HistoryEdit.h new file mode 100644 index 0000000..7e2a112 --- /dev/null +++ b/IvyProbe/HistoryEdit.h @@ -0,0 +1,65 @@ +/* + * HistoryEdit.h + * + * Description: + * CHistoryEdit interface + * + * A CEdit subclass that allows you to display a scrolling history + * of text entries. + * + * Author: + * Ravi Bhavnani (ravib@datablast.net) + * + * Revision History: + * 15 Mar 1998 rab Original version + */ + +#ifndef _HistoryEdit_h_ +#define _HistoryEdit_h_ + +///////////////////////////////////////////////////////////////////////////// +// CHistoryEdit window + +class CHistoryEdit : public CEdit +{ +// Construction +public: + CHistoryEdit(); + +// Attributes +public: + +// Operations +public: + void AppendString (CString str); + BOOL IsSelectable() { return m_bSelectable; } + void AllowSelection (BOOL bAllowSelect) { m_bSelectable = bAllowSelect; } + +// Overrides + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(CHistoryEdit) + //}}AFX_VIRTUAL + +// Implementation +public: + virtual ~CHistoryEdit(); + + // Generated message map functions +protected: + //{{AFX_MSG(CHistoryEdit) + afx_msg void OnSetFocus(CWnd* pOldWnd); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() + +protected: + BOOL m_bSelectable; // flag: user can select text in control +}; + +///////////////////////////////////////////////////////////////////////////// + +//{{AFX_INSERT_LOCATION}} +// Microsoft Developer Studio will insert additional declarations immediately before the previous line. + +#endif + +// End HistoryEdit.h \ No newline at end of file -- cgit v1.1 From 6fb054266e7c43885881887a8f717bd762a4e3be Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:08:49 +0000 Subject: Utilisateur : Fcolin Date : 23/01/04 Heure : 14:18 Créé Commentaire: (vss 1) --- IvyProbe/InstIvyProbe/InstIvy.vdproj | 795 +++++++++++++++++++++++++++++++++++ 1 file changed, 795 insertions(+) create mode 100644 IvyProbe/InstIvyProbe/InstIvy.vdproj (limited to 'IvyProbe') diff --git a/IvyProbe/InstIvyProbe/InstIvy.vdproj b/IvyProbe/InstIvyProbe/InstIvy.vdproj new file mode 100644 index 0000000..389bdf1 --- /dev/null +++ b/IvyProbe/InstIvyProbe/InstIvy.vdproj @@ -0,0 +1,795 @@ +"DeployProject" +{ +"VSVersion" = "3:701" +"ProjectType" = "8:{2C2AF0D9-9B47-4FE5-BEF2-169778172667}" +"IsWebType" = "8:FALSE" +"ProjectName" = "8:InstIvyProbe" +"LanguageId" = "3:1036" +"CodePage" = "3:1252" +"UILanguageId" = "3:1036" +"SccProjectName" = "8:SAK" +"SccLocalPath" = "8:SAK" +"SccAuxPath" = "8:SAK" +"SccProvider" = "8:SAK" + "Hierarchy" + { + "Entry" + { + "MsmKey" = "8:_0088293C6A2C43C2B498B6990246F26D" + "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0276FC79DC124BFD9F646E903DA13A3D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_CE403128DFF0A5ADE28CDD21A4FA625C" + "OwnerKey" = "8:_0276FC79DC124BFD9F646E903DA13A3D" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_EBC1E4E12A6A4272A4D45B939944839E" + "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_EBC1E4E12A6A4272A4D45B939944839E" + "OwnerKey" = "8:_0276FC79DC124BFD9F646E903DA13A3D" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_EC83C83518AD43C0AF167831168E4416" + "OwnerKey" = "8:_0276FC79DC124BFD9F646E903DA13A3D" + "MsmSig" = "8:_UNDEFINED" + } + } + "Configurations" + { + "Debug" + { + "DisplayName" = "8:Debug" + "IsDebugOnly" = "11:TRUE" + "IsReleaseOnly" = "11:FALSE" + "OutputFilename" = "8:Debug\\InstIvy.msi" + "PackageFilesAs" = "3:2" + "PackageFileSize" = "3:-2147483648" + "CabType" = "3:1" + "Compression" = "3:2" + "SignOutput" = "11:FALSE" + "CertificateFile" = "8:" + "PrivateKeyFile" = "8:" + "TimeStampServer" = "8:" + "InstallerBootstrapper" = "3:2" + } + "Release" + { + "DisplayName" = "8:Release" + "IsDebugOnly" = "11:FALSE" + "IsReleaseOnly" = "11:TRUE" + "OutputFilename" = "8:Release\\InstIvyProbe.msi" + "PackageFilesAs" = "3:2" + "PackageFileSize" = "3:-2147483648" + "CabType" = "3:1" + "Compression" = "3:2" + "SignOutput" = "11:FALSE" + "CertificateFile" = "8:" + "PrivateKeyFile" = "8:" + "TimeStampServer" = "8:" + "InstallerBootstrapper" = "3:1" + } + } + "Deployable" + { + "CustomAction" + { + } + "DefaultFeature" + { + "Name" = "8:DefaultFeature" + "Title" = "8:" + "Description" = "8:" + } + "ExternalPersistence" + { + "LaunchCondition" + { + } + } + "Feature" + { + } + "File" + { + "{A582A373-4685-4296-BEFE-614B80A702C3}:_CE403128DFF0A5ADE28CDD21A4FA625C" + { + "SourcePath" = "8:WSOCK32.dll" + "TargetName" = "8:WSOCK32.dll" + "Tag" = "8:" + "Folder" = "8:_8C785282719E44848328E169496E2F49" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + } + "FileType" + { + } + "Folder" + { + "{78BAF5CE-F2E5-45BE-83BC-DB6AF387E941}:_6810FE826BCA47699640BBE149228D19" + { + "Name" = "8:#1916" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:DesktopFolder" + "Folders" + { + } + } + "{78BAF5CE-F2E5-45BE-83BC-DB6AF387E941}:_7E2D48F81BBB4C3E85E07FE19427A508" + { + "Name" = "8:#1919" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:ProgramMenuFolder" + "Folders" + { + } + } + "{58C0ADA3-3CEA-43BD-A3B3-2EA121BC8217}:_8C785282719E44848328E169496E2F49" + { + "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]" + "Name" = "8:#1925" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:TARGETDIR" + "Folders" + { + } + } + } + "LaunchCondition" + { + } + "Locator" + { + } + "MsiBootstrapper" + { + "LangId" = "3:1036" + } + "Product" + { + "Name" = "8:Microsoft Visual Studio" + "ProductName" = "8:IvyProbe" + "ProductCode" = "8:{3C66BD6E-59BA-414B-9051-C66F305DC0CD}" + "PackageCode" = "8:{0A1F09BB-96BD-4EBE-B109-183904AEA43B}" + "UpgradeCode" = "8:{FF452596-4F4B-4240-847F-38D0FA88DBB0}" + "RestartWWWService" = "11:FALSE" + "RemovePreviousVersions" = "11:FALSE" + "DetectNewerInstalledVersion" = "11:TRUE" + "ProductVersion" = "8:1.0.0" + "Manufacturer" = "8:CENA" + "ARPHELPTELEPHONE" = "8:" + "ARPHELPLINK" = "8:" + "Title" = "8:IvyProbe" + "Subject" = "8:" + "ARPCONTACT" = "8:CENA" + "Keywords" = "8:" + "ARPCOMMENTS" = "8:" + "ARPURLINFOABOUT" = "8:" + "ARPPRODUCTICON" = "8:" + "ARPIconIndex" = "3:0" + "SearchPath" = "8:" + "UseSystemSearchPath" = "11:TRUE" + } + "Registry" + { + "HKLM" + { + "Keys" + { + "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_3CFCEFACEAB64F9DA1C4D0BF5DB65AF2" + { + "Name" = "8:Software" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_30BD5DA559A740258BDEE3A9A52D6355" + { + "Name" = "8:[Manufacturer]" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + } + "Values" + { + } + } + } + "Values" + { + } + } + } + } + "HKCU" + { + "Keys" + { + "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_8D5BE70E7653487A9D35B4DAFC2995D0" + { + "Name" = "8:Software" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_58B700D8E98A4CE9BF8CF67ADA0B9C99" + { + "Name" = "8:[Manufacturer]" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + } + "Values" + { + } + } + } + "Values" + { + } + } + } + } + "HKCR" + { + "Keys" + { + } + } + "HKU" + { + "Keys" + { + } + } + "HKPU" + { + "Keys" + { + } + } + } + "Sequences" + { + } + "Shortcut" + { + } + "UserInterface" + { + "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_022345F0521F463B86815C734F1947EA" + { + "Name" = "8:#1901" + "Sequence" = "3:2" + "Attributes" = "3:2" + "Dialogs" + { + "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_DFD3FCE52AD84DFA98F21EA2D4E5300C" + { + "Sequence" = "3:100" + "DisplayName" = "8:Progression" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminProgressDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "ShowProgress" + { + "Name" = "8:ShowProgress" + "DisplayName" = "8:#1009" + "Description" = "8:#1109" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_1E6A5A56054A4B9287DEFFDCBE6D9F4B" + { + "Name" = "8:#1902" + "Sequence" = "3:1" + "Attributes" = "3:3" + "Dialogs" + { + "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_FCFBFF119DAD44FAAA795641018FC42F" + { + "Sequence" = "3:100" + "DisplayName" = "8:Terminé" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdFinishedDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "UpdateText" + { + "Name" = "8:UpdateText" + "DisplayName" = "8:#1058" + "Description" = "8:#1158" + "Type" = "3:15" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1258" + "DefaultValue" = "8:#1258" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{B654A020-6903-4E6A-A86C-75DC463DB54B}:_39324675C5D24D6FB11A1F89C6A50838" + { + "UseDynamicProperties" = "11:FALSE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdBasicDialogs.wim" + } + "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_7BA271C57B2945AB90EA4E3B81F2352C" + { + "Name" = "8:#1902" + "Sequence" = "3:2" + "Attributes" = "3:3" + "Dialogs" + { + "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_BCB663D68120404AAE84380C98DEDD48" + { + "Sequence" = "3:100" + "DisplayName" = "8:Terminé" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminFinishedDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_A791F39DCDF943EFB51C225AB3BA8A50" + { + "Name" = "8:#1901" + "Sequence" = "3:1" + "Attributes" = "3:2" + "Dialogs" + { + "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_97F78B3941544772A5EC49812DAD11D5" + { + "Sequence" = "3:100" + "DisplayName" = "8:Progression" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdProgressDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "ShowProgress" + { + "Name" = "8:ShowProgress" + "DisplayName" = "8:#1009" + "Description" = "8:#1109" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_CDE881ABAB7C4726B526DDBA45B4BDE1" + { + "Name" = "8:#1900" + "Sequence" = "3:1" + "Attributes" = "3:1" + "Dialogs" + { + "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_B620B069BE064ABA87B90550DA692268" + { + "Sequence" = "3:300" + "DisplayName" = "8:Confirmer l'installation" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdConfirmDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_C345A4ECF4334C0299B1BF93AF8DD68B" + { + "Sequence" = "3:100" + "DisplayName" = "8:Bienvenue" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdWelcomeDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "CopyrightWarning" + { + "Name" = "8:CopyrightWarning" + "DisplayName" = "8:#1002" + "Description" = "8:#1102" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1202" + "DefaultValue" = "8:#1202" + "UsePlugInResources" = "11:TRUE" + } + "Welcome" + { + "Name" = "8:Welcome" + "DisplayName" = "8:#1003" + "Description" = "8:#1103" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1203" + "DefaultValue" = "8:#1203" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_DA4D7E682468404D838C7F08BA4E6124" + { + "Sequence" = "3:200" + "DisplayName" = "8:Dossier d'installation" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdFolderDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{B654A020-6903-4E6A-A86C-75DC463DB54B}:_F349BA4DD2FF4C538D17E0E5A2E0CF02" + { + "UseDynamicProperties" = "11:FALSE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdUserInterface.wim" + } + "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_F6158F17384D4EE89AE7C515234C4964" + { + "Name" = "8:#1900" + "Sequence" = "3:2" + "Attributes" = "3:1" + "Dialogs" + { + "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_7F57E9802DDD47E7BB8A93A6650F6889" + { + "Sequence" = "3:300" + "DisplayName" = "8:Confirmer l'installation" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminConfirmDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_A37E56D6E5634F64BA1D3DEF6558A9B1" + { + "Sequence" = "3:100" + "DisplayName" = "8:Bienvenue" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminWelcomeDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "CopyrightWarning" + { + "Name" = "8:CopyrightWarning" + "DisplayName" = "8:#1002" + "Description" = "8:#1102" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1202" + "DefaultValue" = "8:#1202" + "UsePlugInResources" = "11:TRUE" + } + "Welcome" + { + "Name" = "8:Welcome" + "DisplayName" = "8:#1003" + "Description" = "8:#1103" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1203" + "DefaultValue" = "8:#1203" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_CC824A96BD584085B9BF72FA74944CD7" + { + "Sequence" = "3:200" + "DisplayName" = "8:Dossier d'installation" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminFolderDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + } + "MergeModule" + { + "{35A69C6E-5BA4-440D-803D-762B59A45393}:_0088293C6A2C43C2B498B6990246F26D" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:vc_user_mfc71_rtl_x86_---.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } + "{35A69C6E-5BA4-440D-803D-762B59A45393}:_EBC1E4E12A6A4272A4D45B939944839E" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } + "{35A69C6E-5BA4-440D-803D-762B59A45393}:_EC83C83518AD43C0AF167831168E4416" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:vc_user_stl71_rtl_x86_---.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } + } + "ProjectOutput" + { + "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_0276FC79DC124BFD9F646E903DA13A3D" + { + "SourcePath" = "8:..\\..\\C++\\Bus\\Ivy\\Release\\Ivy.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_8C785282719E44848328E169496E2F49" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{9BD87B7A-517E-4900-B3EA-A358885CD876}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_57A5694E20F44D878FE43630B5B52BF5" + { + "SourcePath" = "8:..\\..\\Program Files\\Release\\IvyProbe.exe" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_8C785282719E44848328E169496E2F49" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + } + "VJSharpPlugin" + { + } + } +} -- cgit v1.1 From e6c8f97de1714aeaf420f62fbbcbcbc6711fc568 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:08:51 +0000 Subject: Utilisateur : Fcolin Date : 23/01/04 Heure : 14:19 Archivé dans $/InstIvyProbe Commentaire: (vss 2) --- IvyProbe/InstIvyProbe/InstIvy.vdproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/InstIvyProbe/InstIvy.vdproj b/IvyProbe/InstIvyProbe/InstIvy.vdproj index 389bdf1..d7c0e13 100644 --- a/IvyProbe/InstIvyProbe/InstIvy.vdproj +++ b/IvyProbe/InstIvyProbe/InstIvy.vdproj @@ -195,12 +195,12 @@ "RemovePreviousVersions" = "11:FALSE" "DetectNewerInstalledVersion" = "11:TRUE" "ProductVersion" = "8:1.0.0" - "Manufacturer" = "8:CENA" + "Manufacturer" = "8:CENA PII" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" "Title" = "8:IvyProbe" "Subject" = "8:" - "ARPCONTACT" = "8:CENA" + "ARPCONTACT" = "8:CENA PII" "Keywords" = "8:" "ARPCOMMENTS" = "8:" "ARPURLINFOABOUT" = "8:" -- cgit v1.1 From 25057acc4a0f394fa9ba2088d34b262dfabe57d0 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:08:52 +0000 Subject: Utilisateur : Fcolin Date : 9/04/04 Heure : 16:35 Archivé dans $/Bus/IvyProbe/InstIvyProbe Commentaire: (vss 3) --- IvyProbe/InstIvyProbe/InstIvy.vdproj | 76 ++++++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 24 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/InstIvyProbe/InstIvy.vdproj b/IvyProbe/InstIvyProbe/InstIvy.vdproj index d7c0e13..870f6f5 100644 --- a/IvyProbe/InstIvyProbe/InstIvy.vdproj +++ b/IvyProbe/InstIvyProbe/InstIvy.vdproj @@ -3,7 +3,7 @@ "VSVersion" = "3:701" "ProjectType" = "8:{2C2AF0D9-9B47-4FE5-BEF2-169778172667}" "IsWebType" = "8:FALSE" -"ProjectName" = "8:InstIvyProbe" +"ProjectName" = "8:Install" "LanguageId" = "3:1036" "CodePage" = "3:1252" "UILanguageId" = "3:1036" @@ -15,44 +15,44 @@ { "Entry" { - "MsmKey" = "8:_0088293C6A2C43C2B498B6990246F26D" - "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "MsmKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0276FC79DC124BFD9F646E903DA13A3D" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_641B2A5C0F3C40F1A43EBACE5A05A8FE" + "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "MsmKey" = "8:_740A387FD38C478F8BE46DD1967CFE61" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_CE403128DFF0A5ADE28CDD21A4FA625C" - "OwnerKey" = "8:_0276FC79DC124BFD9F646E903DA13A3D" + "OwnerKey" = "8:_740A387FD38C478F8BE46DD1967CFE61" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EBC1E4E12A6A4272A4D45B939944839E" + "MsmKey" = "8:_E7885381EBD8450FB013F7D503C988CB" "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EBC1E4E12A6A4272A4D45B939944839E" - "OwnerKey" = "8:_0276FC79DC124BFD9F646E903DA13A3D" + "MsmKey" = "8:_E7885381EBD8450FB013F7D503C988CB" + "OwnerKey" = "8:_740A387FD38C478F8BE46DD1967CFE61" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EC83C83518AD43C0AF167831168E4416" - "OwnerKey" = "8:_0276FC79DC124BFD9F646E903DA13A3D" + "MsmKey" = "8:_EAB15F657FA44BBEA153E32B0CA46731" + "OwnerKey" = "8:_740A387FD38C478F8BE46DD1967CFE61" "MsmSig" = "8:_UNDEFINED" } } @@ -79,7 +79,7 @@ "DisplayName" = "8:Release" "IsDebugOnly" = "11:FALSE" "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:Release\\InstIvyProbe.msi" + "OutputFilename" = "8:..\\..\\..\\..\\Install\\IvyProbe.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -188,13 +188,13 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:IvyProbe" - "ProductCode" = "8:{3C66BD6E-59BA-414B-9051-C66F305DC0CD}" - "PackageCode" = "8:{0A1F09BB-96BD-4EBE-B109-183904AEA43B}" + "ProductCode" = "8:{2B7D1859-E738-4EC8-9D0C-7C51D267F7BE}" + "PackageCode" = "8:{D093C886-AB21-4B3B-923D-648D6D52A9FE}" "UpgradeCode" = "8:{FF452596-4F4B-4240-847F-38D0FA88DBB0}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:FALSE" "DetectNewerInstalledVersion" = "11:TRUE" - "ProductVersion" = "8:1.0.0" + "ProductVersion" = "8:1.1.0" "Manufacturer" = "8:CENA PII" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" @@ -686,7 +686,7 @@ } "MergeModule" { - "{35A69C6E-5BA4-440D-803D-762B59A45393}:_0088293C6A2C43C2B498B6990246F26D" + "{35A69C6E-5BA4-440D-803D-762B59A45393}:_641B2A5C0F3C40F1A43EBACE5A05A8FE" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" @@ -700,7 +700,7 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{35A69C6E-5BA4-440D-803D-762B59A45393}:_EBC1E4E12A6A4272A4D45B939944839E" + "{35A69C6E-5BA4-440D-803D-762B59A45393}:_E7885381EBD8450FB013F7D503C988CB" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" @@ -714,7 +714,7 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{35A69C6E-5BA4-440D-803D-762B59A45393}:_EC83C83518AD43C0AF167831168E4416" + "{35A69C6E-5BA4-440D-803D-762B59A45393}:_EAB15F657FA44BBEA153E32B0CA46731" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" @@ -731,9 +731,9 @@ } "ProjectOutput" { - "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_0276FC79DC124BFD9F646E903DA13A3D" + "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_57A5694E20F44D878FE43630B5B52BF5" { - "SourcePath" = "8:..\\..\\C++\\Bus\\Ivy\\Release\\Ivy.dll" + "SourcePath" = "8:..\\..\\..\\..\\Program Files\\Release\\IvyProbe.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -753,15 +753,15 @@ "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{9BD87B7A-517E-4900-B3EA-A358885CD876}" + "OutputProjectGuid" = "8:{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { } } - "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_57A5694E20F44D878FE43630B5B52BF5" + "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_740A387FD38C478F8BE46DD1967CFE61" { - "SourcePath" = "8:..\\..\\Program Files\\Release\\IvyProbe.exe" + "SourcePath" = "8:..\\..\\Ivy\\Release\\Ivy.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -781,6 +781,34 @@ "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{84E0039A-6721-4B18-9792-E9AE4274AC0E}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_B619C71BCF024E7FBF55B2FECBD581F4" + { + "SourcePath" = "8:" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_8C785282719E44848328E169496E2F49" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:ContentFiles" "OutputProjectGuid" = "8:{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" -- cgit v1.1 From 03517bb225923313cd4a07b453681aff0ad45896 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:08:55 +0000 Subject: Utilisateur : Fcolin Date : 4/01/05 Heure : 17:31 Archivé dans $/Bus/IvyProbe/InstIvyProbe Commentaire: (vss 4) --- IvyProbe/InstIvyProbe/InstIvy.vdproj | 148 ++++++++++++----------------------- 1 file changed, 50 insertions(+), 98 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/InstIvyProbe/InstIvy.vdproj b/IvyProbe/InstIvyProbe/InstIvy.vdproj index 870f6f5..d1d223b 100644 --- a/IvyProbe/InstIvyProbe/InstIvy.vdproj +++ b/IvyProbe/InstIvyProbe/InstIvy.vdproj @@ -15,46 +15,28 @@ { "Entry" { - "MsmKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_1CA310AF2FDF5EAD53AB0FBF6465B9E3" + "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_641B2A5C0F3C40F1A43EBACE5A05A8FE" + "MsmKey" = "8:_42C15A47159F1A326ACC1442FEE5A1FA" "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_740A387FD38C478F8BE46DD1967CFE61" + "MsmKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CE403128DFF0A5ADE28CDD21A4FA625C" - "OwnerKey" = "8:_740A387FD38C478F8BE46DD1967CFE61" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E7885381EBD8450FB013F7D503C988CB" + "MsmKey" = "8:_B243ED47D69336DC2A0939257105AD26" "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } - "Entry" - { - "MsmKey" = "8:_E7885381EBD8450FB013F7D503C988CB" - "OwnerKey" = "8:_740A387FD38C478F8BE46DD1967CFE61" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_EAB15F657FA44BBEA153E32B0CA46731" - "OwnerKey" = "8:_740A387FD38C478F8BE46DD1967CFE61" - "MsmSig" = "8:_UNDEFINED" - } } "Configurations" { @@ -113,10 +95,10 @@ } "File" { - "{A582A373-4685-4296-BEFE-614B80A702C3}:_CE403128DFF0A5ADE28CDD21A4FA625C" + "{A582A373-4685-4296-BEFE-614B80A702C3}:_1CA310AF2FDF5EAD53AB0FBF6465B9E3" { - "SourcePath" = "8:WSOCK32.dll" - "TargetName" = "8:WSOCK32.dll" + "SourcePath" = "8:MSVCR71D.dll" + "TargetName" = "8:MSVCR71D.dll" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" "Condition" = "8:" @@ -129,7 +111,47 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_42C15A47159F1A326ACC1442FEE5A1FA" + { + "SourcePath" = "8:MSVCP71D.dll" + "TargetName" = "8:MSVCP71D.dll" + "Tag" = "8:" + "Folder" = "8:_8C785282719E44848328E169496E2F49" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_B243ED47D69336DC2A0939257105AD26" + { + "SourcePath" = "8:MFC71D.DLL" + "TargetName" = "8:MFC71D.DLL" + "Tag" = "8:" + "Folder" = "8:_8C785282719E44848328E169496E2F49" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } @@ -686,54 +708,12 @@ } "MergeModule" { - "{35A69C6E-5BA4-440D-803D-762B59A45393}:_641B2A5C0F3C40F1A43EBACE5A05A8FE" - { - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:TRUE" - "SourcePath" = "8:vc_user_mfc71_rtl_x86_---.msm" - "Properties" - { - } - "LanguageId" = "3:0" - "Exclude" = "11:FALSE" - "Folder" = "8:" - "Feature" = "8:" - "IsolateTo" = "8:" - } - "{35A69C6E-5BA4-440D-803D-762B59A45393}:_E7885381EBD8450FB013F7D503C988CB" - { - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:TRUE" - "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm" - "Properties" - { - } - "LanguageId" = "3:0" - "Exclude" = "11:FALSE" - "Folder" = "8:" - "Feature" = "8:" - "IsolateTo" = "8:" - } - "{35A69C6E-5BA4-440D-803D-762B59A45393}:_EAB15F657FA44BBEA153E32B0CA46731" - { - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:TRUE" - "SourcePath" = "8:vc_user_stl71_rtl_x86_---.msm" - "Properties" - { - } - "LanguageId" = "3:0" - "Exclude" = "11:FALSE" - "Folder" = "8:" - "Feature" = "8:" - "IsolateTo" = "8:" - } } "ProjectOutput" { "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_57A5694E20F44D878FE43630B5B52BF5" { - "SourcePath" = "8:..\\..\\..\\..\\Program Files\\Release\\IvyProbe.exe" + "SourcePath" = "8:..\\..\\..\\..\\Program Files\\Debug\\IvyProbe.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -759,34 +739,6 @@ { } } - "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_740A387FD38C478F8BE46DD1967CFE61" - { - "SourcePath" = "8:..\\..\\Ivy\\Release\\Ivy.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_8C785282719E44848328E169496E2F49" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "ProjectOutputGroupRegister" = "3:1" - "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{84E0039A-6721-4B18-9792-E9AE4274AC0E}" - "ShowKeyOutput" = "11:TRUE" - "ExcludeFilters" - { - } - } "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_B619C71BCF024E7FBF55B2FECBD581F4" { "SourcePath" = "8:" -- cgit v1.1 From 0b54c52e0f383e606182644605fb19198b35ada0 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:08:57 +0000 Subject: Utilisateur : Fcolin Date : 4/01/05 Heure : 17:49 Archivé dans $/Bus/IvyProbe/InstIvyProbe Commentaire: (vss 5) --- IvyProbe/InstIvyProbe/InstIvy.vdproj | 148 +++++++++++++++++++++++------------ 1 file changed, 98 insertions(+), 50 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/InstIvyProbe/InstIvy.vdproj b/IvyProbe/InstIvyProbe/InstIvy.vdproj index d1d223b..f2a90d5 100644 --- a/IvyProbe/InstIvyProbe/InstIvy.vdproj +++ b/IvyProbe/InstIvyProbe/InstIvy.vdproj @@ -15,14 +15,14 @@ { "Entry" { - "MsmKey" = "8:_1CA310AF2FDF5EAD53AB0FBF6465B9E3" + "MsmKey" = "8:_23E96E753EDE45A589E0E7CFB598B6C2" "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_42C15A47159F1A326ACC1442FEE5A1FA" - "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "MsmKey" = "8:_23E96E753EDE45A589E0E7CFB598B6C2" + "OwnerKey" = "8:_F532513605F14AF0805D02C68D73096A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -33,10 +33,28 @@ } "Entry" { - "MsmKey" = "8:_B243ED47D69336DC2A0939257105AD26" + "MsmKey" = "8:_895C8AF2F25941B8A9C3D14DB4F392DB" "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_C3FE25FF1A854AF188FC46F575194D34" + "OwnerKey" = "8:_F532513605F14AF0805D02C68D73096A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_CE403128DFF0A5ADE28CDD21A4FA625C" + "OwnerKey" = "8:_F532513605F14AF0805D02C68D73096A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_F532513605F14AF0805D02C68D73096A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -95,30 +113,10 @@ } "File" { - "{A582A373-4685-4296-BEFE-614B80A702C3}:_1CA310AF2FDF5EAD53AB0FBF6465B9E3" - { - "SourcePath" = "8:MSVCR71D.dll" - "TargetName" = "8:MSVCR71D.dll" - "Tag" = "8:" - "Folder" = "8:_8C785282719E44848328E169496E2F49" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{A582A373-4685-4296-BEFE-614B80A702C3}:_42C15A47159F1A326ACC1442FEE5A1FA" + "{A582A373-4685-4296-BEFE-614B80A702C3}:_CE403128DFF0A5ADE28CDD21A4FA625C" { - "SourcePath" = "8:MSVCP71D.dll" - "TargetName" = "8:MSVCP71D.dll" + "SourcePath" = "8:WSOCK32.dll" + "TargetName" = "8:WSOCK32.dll" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" "Condition" = "8:" @@ -131,27 +129,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{A582A373-4685-4296-BEFE-614B80A702C3}:_B243ED47D69336DC2A0939257105AD26" - { - "SourcePath" = "8:MFC71D.DLL" - "TargetName" = "8:MFC71D.DLL" - "Tag" = "8:" - "Folder" = "8:_8C785282719E44848328E169496E2F49" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } @@ -211,7 +189,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:IvyProbe" "ProductCode" = "8:{2B7D1859-E738-4EC8-9D0C-7C51D267F7BE}" - "PackageCode" = "8:{D093C886-AB21-4B3B-923D-648D6D52A9FE}" + "PackageCode" = "8:{B0D9A2F9-46EC-4A56-863C-8217C453B10C}" "UpgradeCode" = "8:{FF452596-4F4B-4240-847F-38D0FA88DBB0}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:FALSE" @@ -708,12 +686,54 @@ } "MergeModule" { + "{35A69C6E-5BA4-440D-803D-762B59A45393}:_23E96E753EDE45A589E0E7CFB598B6C2" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } + "{35A69C6E-5BA4-440D-803D-762B59A45393}:_895C8AF2F25941B8A9C3D14DB4F392DB" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:vc_user_mfc71_rtl_x86_---.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } + "{35A69C6E-5BA4-440D-803D-762B59A45393}:_C3FE25FF1A854AF188FC46F575194D34" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:vc_user_stl71_rtl_x86_---.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } } "ProjectOutput" { "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_57A5694E20F44D878FE43630B5B52BF5" { - "SourcePath" = "8:..\\..\\..\\..\\Program Files\\Debug\\IvyProbe.exe" + "SourcePath" = "8:..\\..\\..\\..\\Program Files\\Release\\IvyProbe.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -767,6 +787,34 @@ { } } + "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_F532513605F14AF0805D02C68D73096A" + { + "SourcePath" = "8:..\\..\\Ivy\\Release\\Ivy.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_8C785282719E44848328E169496E2F49" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{84E0039A-6721-4B18-9792-E9AE4274AC0E}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } } "VJSharpPlugin" { -- cgit v1.1 From 598c867a8beaf09676e8c68db9cb1cbef686c99f Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:08:58 +0000 Subject: Utilisateur : Fcolin Date : 6/01/05 Heure : 10:41 Archivé dans $/Bus/IvyProbe/InstIvyProbe Commentaire: (vss 6) --- IvyProbe/InstIvyProbe/InstIvy.vdproj | 130 +++++++++++++++++++++-------------- 1 file changed, 77 insertions(+), 53 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/InstIvyProbe/InstIvy.vdproj b/IvyProbe/InstIvyProbe/InstIvy.vdproj index f2a90d5..9df9500 100644 --- a/IvyProbe/InstIvyProbe/InstIvy.vdproj +++ b/IvyProbe/InstIvyProbe/InstIvy.vdproj @@ -3,7 +3,7 @@ "VSVersion" = "3:701" "ProjectType" = "8:{2C2AF0D9-9B47-4FE5-BEF2-169778172667}" "IsWebType" = "8:FALSE" -"ProjectName" = "8:Install" +"ProjectName" = "8:InstallIvyProbe" "LanguageId" = "3:1036" "CodePage" = "3:1252" "UILanguageId" = "3:1036" @@ -15,32 +15,38 @@ { "Entry" { - "MsmKey" = "8:_23E96E753EDE45A589E0E7CFB598B6C2" + "MsmKey" = "8:_1CA310AF2FDF5EAD53AB0FBF6465B9E3" "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_23E96E753EDE45A589E0E7CFB598B6C2" + "MsmKey" = "8:_1CA310AF2FDF5EAD53AB0FBF6465B9E3" "OwnerKey" = "8:_F532513605F14AF0805D02C68D73096A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_42C15A47159F1A326ACC1442FEE5A1FA" + "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_895C8AF2F25941B8A9C3D14DB4F392DB" - "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "MsmKey" = "8:_42C15A47159F1A326ACC1442FEE5A1FA" + "OwnerKey" = "8:_F532513605F14AF0805D02C68D73096A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C3FE25FF1A854AF188FC46F575194D34" - "OwnerKey" = "8:_F532513605F14AF0805D02C68D73096A" + "MsmKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B243ED47D69336DC2A0939257105AD26" + "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -113,6 +119,66 @@ } "File" { + "{A582A373-4685-4296-BEFE-614B80A702C3}:_1CA310AF2FDF5EAD53AB0FBF6465B9E3" + { + "SourcePath" = "8:MSVCR71D.dll" + "TargetName" = "8:MSVCR71D.dll" + "Tag" = "8:" + "Folder" = "8:_8C785282719E44848328E169496E2F49" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_42C15A47159F1A326ACC1442FEE5A1FA" + { + "SourcePath" = "8:MSVCP71D.dll" + "TargetName" = "8:MSVCP71D.dll" + "Tag" = "8:" + "Folder" = "8:_8C785282719E44848328E169496E2F49" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{A582A373-4685-4296-BEFE-614B80A702C3}:_B243ED47D69336DC2A0939257105AD26" + { + "SourcePath" = "8:MFC71D.DLL" + "TargetName" = "8:MFC71D.DLL" + "Tag" = "8:" + "Folder" = "8:_8C785282719E44848328E169496E2F49" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{A582A373-4685-4296-BEFE-614B80A702C3}:_CE403128DFF0A5ADE28CDD21A4FA625C" { "SourcePath" = "8:WSOCK32.dll" @@ -686,54 +752,12 @@ } "MergeModule" { - "{35A69C6E-5BA4-440D-803D-762B59A45393}:_23E96E753EDE45A589E0E7CFB598B6C2" - { - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:TRUE" - "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm" - "Properties" - { - } - "LanguageId" = "3:0" - "Exclude" = "11:FALSE" - "Folder" = "8:" - "Feature" = "8:" - "IsolateTo" = "8:" - } - "{35A69C6E-5BA4-440D-803D-762B59A45393}:_895C8AF2F25941B8A9C3D14DB4F392DB" - { - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:TRUE" - "SourcePath" = "8:vc_user_mfc71_rtl_x86_---.msm" - "Properties" - { - } - "LanguageId" = "3:0" - "Exclude" = "11:FALSE" - "Folder" = "8:" - "Feature" = "8:" - "IsolateTo" = "8:" - } - "{35A69C6E-5BA4-440D-803D-762B59A45393}:_C3FE25FF1A854AF188FC46F575194D34" - { - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:TRUE" - "SourcePath" = "8:vc_user_stl71_rtl_x86_---.msm" - "Properties" - { - } - "LanguageId" = "3:0" - "Exclude" = "11:FALSE" - "Folder" = "8:" - "Feature" = "8:" - "IsolateTo" = "8:" - } } "ProjectOutput" { "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_57A5694E20F44D878FE43630B5B52BF5" { - "SourcePath" = "8:..\\..\\..\\..\\Program Files\\Release\\IvyProbe.exe" + "SourcePath" = "8:..\\..\\..\\..\\Program Files\\Debug\\IvyProbe.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -789,7 +813,7 @@ } "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_F532513605F14AF0805D02C68D73096A" { - "SourcePath" = "8:..\\..\\Ivy\\Release\\Ivy.dll" + "SourcePath" = "8:..\\..\\Ivy\\Debug\\Ivy.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" -- cgit v1.1 From 5735fc81980dd1f0c505a36fd3fc8ff8a2105aea Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:01 +0000 Subject: Utilisateur : Fcolin Date : 6/01/05 Heure : 10:52 Archivé dans $/Bus/IvyProbe/InstIvyProbe Commentaire: (vss 7) --- IvyProbe/InstIvyProbe/InstIvy.vdproj | 188 +++++++++-------------------------- 1 file changed, 46 insertions(+), 142 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/InstIvyProbe/InstIvy.vdproj b/IvyProbe/InstIvyProbe/InstIvy.vdproj index 9df9500..5c7e842 100644 --- a/IvyProbe/InstIvyProbe/InstIvy.vdproj +++ b/IvyProbe/InstIvyProbe/InstIvy.vdproj @@ -15,50 +15,20 @@ { "Entry" { - "MsmKey" = "8:_1CA310AF2FDF5EAD53AB0FBF6465B9E3" - "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1CA310AF2FDF5EAD53AB0FBF6465B9E3" - "OwnerKey" = "8:_F532513605F14AF0805D02C68D73096A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_42C15A47159F1A326ACC1442FEE5A1FA" - "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_42C15A47159F1A326ACC1442FEE5A1FA" - "OwnerKey" = "8:_F532513605F14AF0805D02C68D73096A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B243ED47D69336DC2A0939257105AD26" + "MsmKey" = "8:_B14AED86FE884C009F4AC9751AD4D18D" "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CE403128DFF0A5ADE28CDD21A4FA625C" - "OwnerKey" = "8:_F532513605F14AF0805D02C68D73096A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_F532513605F14AF0805D02C68D73096A" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_D8C594BE1B9D4DAF9249260CD8F3983A" + "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } } @@ -119,86 +89,6 @@ } "File" { - "{A582A373-4685-4296-BEFE-614B80A702C3}:_1CA310AF2FDF5EAD53AB0FBF6465B9E3" - { - "SourcePath" = "8:MSVCR71D.dll" - "TargetName" = "8:MSVCR71D.dll" - "Tag" = "8:" - "Folder" = "8:_8C785282719E44848328E169496E2F49" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{A582A373-4685-4296-BEFE-614B80A702C3}:_42C15A47159F1A326ACC1442FEE5A1FA" - { - "SourcePath" = "8:MSVCP71D.dll" - "TargetName" = "8:MSVCP71D.dll" - "Tag" = "8:" - "Folder" = "8:_8C785282719E44848328E169496E2F49" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{A582A373-4685-4296-BEFE-614B80A702C3}:_B243ED47D69336DC2A0939257105AD26" - { - "SourcePath" = "8:MFC71D.DLL" - "TargetName" = "8:MFC71D.DLL" - "Tag" = "8:" - "Folder" = "8:_8C785282719E44848328E169496E2F49" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{A582A373-4685-4296-BEFE-614B80A702C3}:_CE403128DFF0A5ADE28CDD21A4FA625C" - { - "SourcePath" = "8:WSOCK32.dll" - "TargetName" = "8:WSOCK32.dll" - "Tag" = "8:" - "Folder" = "8:_8C785282719E44848328E169496E2F49" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } } "FileType" { @@ -369,6 +259,20 @@ } "Shortcut" { + "{478F747B-8505-45D1-9AAE-8C3B645C26E3}:_B5814460213041F499A85C9521ED219F" + { + "Name" = "8:IvyProbe" + "Arguments" = "8:" + "Description" = "8:" + "ShowCmd" = "3:1" + "IconIndex" = "3:0" + "Transitive" = "11:FALSE" + "Target" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "Folder" = "8:_7E2D48F81BBB4C3E85E07FE19427A508" + "WorkingFolder" = "8:_8C785282719E44848328E169496E2F49" + "Icon" = "8:" + "Feature" = "8:" + } } "UserInterface" { @@ -752,12 +656,40 @@ } "MergeModule" { + "{35A69C6E-5BA4-440D-803D-762B59A45393}:_B14AED86FE884C009F4AC9751AD4D18D" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } + "{35A69C6E-5BA4-440D-803D-762B59A45393}:_D8C594BE1B9D4DAF9249260CD8F3983A" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:vc_user_mfc71_rtl_x86_---.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } } "ProjectOutput" { "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_57A5694E20F44D878FE43630B5B52BF5" { - "SourcePath" = "8:..\\..\\..\\..\\Program Files\\Debug\\IvyProbe.exe" + "SourcePath" = "8:..\\..\\..\\..\\Program Files\\Release\\IvyProbe.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -811,34 +743,6 @@ { } } - "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_F532513605F14AF0805D02C68D73096A" - { - "SourcePath" = "8:..\\..\\Ivy\\Debug\\Ivy.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_8C785282719E44848328E169496E2F49" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "ProjectOutputGroupRegister" = "3:1" - "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{84E0039A-6721-4B18-9792-E9AE4274AC0E}" - "ShowKeyOutput" = "11:TRUE" - "ExcludeFilters" - { - } - } } "VJSharpPlugin" { -- cgit v1.1 From caeb9e5f63e90c02f6ba44a96615bc66b75dd6bf Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:02 +0000 Subject: Utilisateur : Fcolin Date : 2/12/05 Heure : 10:00 Archivé dans $/Bus/IvyProbe/InstIvyProbe Commentaire: (vss 8) --- IvyProbe/InstIvyProbe/InstIvy.vdproj | 316 ++++++++++++++++++++++++++++------- 1 file changed, 255 insertions(+), 61 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/InstIvyProbe/InstIvy.vdproj b/IvyProbe/InstIvyProbe/InstIvy.vdproj index 5c7e842..5de0f4d 100644 --- a/IvyProbe/InstIvyProbe/InstIvy.vdproj +++ b/IvyProbe/InstIvyProbe/InstIvy.vdproj @@ -1,7 +1,7 @@ "DeployProject" { -"VSVersion" = "3:701" -"ProjectType" = "8:{2C2AF0D9-9B47-4FE5-BEF2-169778172667}" +"VSVersion" = "3:800" +"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}" "IsWebType" = "8:FALSE" "ProjectName" = "8:InstallIvyProbe" "LanguageId" = "3:1036" @@ -15,22 +15,64 @@ { "Entry" { - "MsmKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "MsmKey" = "8:_1074423A2F6F490CA85D9B808D40BAA0" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1D801A7EE44D49369F603CD8C484C564" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B14AED86FE884C009F4AC9751AD4D18D" + "MsmKey" = "8:_286F2393B0174197984735489436A6A0" "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D8C594BE1B9D4DAF9249260CD8F3983A" + "MsmKey" = "8:_286F2393B0174197984735489436A6A0" + "OwnerKey" = "8:_1D801A7EE44D49369F603CD8C484C564" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_286F2393B0174197984735489436A6A0" + "OwnerKey" = "8:_1074423A2F6F490CA85D9B808D40BAA0" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_36DE29478DD946ED8B923C81E77CAD23" "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_CDD2F450AD2043DCAB5947901229278C" + "OwnerKey" = "8:_36DE29478DD946ED8B923C81E77CAD23" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_CE403128DFF0A5ADE28CDD21A4FA625C" + "OwnerKey" = "8:_1074423A2F6F490CA85D9B808D40BAA0" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DF4A3CC201874ECCAFED12A9ACE93481" + "OwnerKey" = "8:_286F2393B0174197984735489436A6A0" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -49,6 +91,17 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + } + } } "Release" { @@ -65,6 +118,17 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:1" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:FALSE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + } + } } } "Deployable" @@ -84,18 +148,35 @@ { } } - "Feature" - { - } "File" { + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CE403128DFF0A5ADE28CDD21A4FA625C" + { + "SourcePath" = "8:WSOCK32.dll" + "TargetName" = "8:WSOCK32.dll" + "Tag" = "8:" + "Folder" = "8:_8C785282719E44848328E169496E2F49" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } } "FileType" { } "Folder" { - "{78BAF5CE-F2E5-45BE-83BC-DB6AF387E941}:_6810FE826BCA47699640BBE149228D19" + "{1525181F-901A-416C-8A58-119130FE478E}:_6810FE826BCA47699640BBE149228D19" { "Name" = "8:#1916" "AlwaysCreate" = "11:FALSE" @@ -106,7 +187,7 @@ { } } - "{78BAF5CE-F2E5-45BE-83BC-DB6AF387E941}:_7E2D48F81BBB4C3E85E07FE19427A508" + "{1525181F-901A-416C-8A58-119130FE478E}:_7E2D48F81BBB4C3E85E07FE19427A508" { "Name" = "8:#1919" "AlwaysCreate" = "11:FALSE" @@ -115,11 +196,22 @@ "Property" = "8:ProgramMenuFolder" "Folders" { + "{9EF0B969-E518-4E46-987F-47570745A589}:_E78B932249794DE1A6AD0A860FBA7DA8" + { + "Name" = "8:SDER PII" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_F25DEE7C682F4C46A5C9D75BC2CEDD0A" + "Folders" + { + } + } } } - "{58C0ADA3-3CEA-43BD-A3B3-2EA121BC8217}:_8C785282719E44848328E169496E2F49" + "{3C67513D-01DD-4637-8A68-80971EB9504F}:_8C785282719E44848328E169496E2F49" { - "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]" + "DefaultLocation" = "8:[ProgramFiles64Folder][Manufacturer]\\[ProductName]" "Name" = "8:#1925" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" @@ -144,19 +236,20 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:IvyProbe" - "ProductCode" = "8:{2B7D1859-E738-4EC8-9D0C-7C51D267F7BE}" - "PackageCode" = "8:{B0D9A2F9-46EC-4A56-863C-8217C453B10C}" + "ProductCode" = "8:{F526A4E7-6E14-4D82-8C87-F483AEE19CEC}" + "PackageCode" = "8:{349D7642-CCBC-4876-933A-8364F38A2A46}" "UpgradeCode" = "8:{FF452596-4F4B-4240-847F-38D0FA88DBB0}" "RestartWWWService" = "11:FALSE" - "RemovePreviousVersions" = "11:FALSE" + "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" - "ProductVersion" = "8:1.1.0" - "Manufacturer" = "8:CENA PII" + "InstallAllUsers" = "11:TRUE" + "ProductVersion" = "8:1.1.1" + "Manufacturer" = "8:SDER PII" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" "Title" = "8:IvyProbe" "Subject" = "8:" - "ARPCONTACT" = "8:CENA PII" + "ARPCONTACT" = "8:SDER PII" "Keywords" = "8:" "ARPCOMMENTS" = "8:" "ARPURLINFOABOUT" = "8:" @@ -164,6 +257,10 @@ "ARPIconIndex" = "3:0" "SearchPath" = "8:" "UseSystemSearchPath" = "11:TRUE" + "TargetPlatform" = "3:1" + "PreBuildEvent" = "8:" + "PostBuildEvent" = "8:" + "RunPostBuildEvent" = "3:0" } "Registry" { @@ -171,7 +268,7 @@ { "Keys" { - "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_3CFCEFACEAB64F9DA1C4D0BF5DB65AF2" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_3CFCEFACEAB64F9DA1C4D0BF5DB65AF2" { "Name" = "8:Software" "Condition" = "8:" @@ -180,7 +277,7 @@ "Transitive" = "11:FALSE" "Keys" { - "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_30BD5DA559A740258BDEE3A9A52D6355" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_30BD5DA559A740258BDEE3A9A52D6355" { "Name" = "8:[Manufacturer]" "Condition" = "8:" @@ -205,7 +302,7 @@ { "Keys" { - "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_8D5BE70E7653487A9D35B4DAFC2995D0" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_8D5BE70E7653487A9D35B4DAFC2995D0" { "Name" = "8:Software" "Condition" = "8:" @@ -214,7 +311,7 @@ "Transitive" = "11:FALSE" "Keys" { - "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_58B700D8E98A4CE9BF8CF67ADA0B9C99" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_58B700D8E98A4CE9BF8CF67ADA0B9C99" { "Name" = "8:[Manufacturer]" "Condition" = "8:" @@ -259,7 +356,7 @@ } "Shortcut" { - "{478F747B-8505-45D1-9AAE-8C3B645C26E3}:_B5814460213041F499A85C9521ED219F" + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_B5814460213041F499A85C9521ED219F" { "Name" = "8:IvyProbe" "Arguments" = "8:" @@ -268,7 +365,7 @@ "IconIndex" = "3:0" "Transitive" = "11:FALSE" "Target" = "8:_57A5694E20F44D878FE43630B5B52BF5" - "Folder" = "8:_7E2D48F81BBB4C3E85E07FE19427A508" + "Folder" = "8:_E78B932249794DE1A6AD0A860FBA7DA8" "WorkingFolder" = "8:_8C785282719E44848328E169496E2F49" "Icon" = "8:" "Feature" = "8:" @@ -276,17 +373,17 @@ } "UserInterface" { - "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_022345F0521F463B86815C734F1947EA" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_022345F0521F463B86815C734F1947EA" { "Name" = "8:#1901" "Sequence" = "3:2" "Attributes" = "3:2" "Dialogs" { - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_DFD3FCE52AD84DFA98F21EA2D4E5300C" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_DFD3FCE52AD84DFA98F21EA2D4E5300C" { "Sequence" = "3:100" - "DisplayName" = "8:Progression" + "DisplayName" = "8:Progress" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdAdminProgressDlg.wid" @@ -320,17 +417,17 @@ } } } - "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_1E6A5A56054A4B9287DEFFDCBE6D9F4B" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_1E6A5A56054A4B9287DEFFDCBE6D9F4B" { "Name" = "8:#1902" "Sequence" = "3:1" "Attributes" = "3:3" "Dialogs" { - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_FCFBFF119DAD44FAAA795641018FC42F" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_FCFBFF119DAD44FAAA795641018FC42F" { "Sequence" = "3:100" - "DisplayName" = "8:Terminé" + "DisplayName" = "8:Finished" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdFinishedDlg.wid" @@ -364,23 +461,23 @@ } } } - "{B654A020-6903-4E6A-A86C-75DC463DB54B}:_39324675C5D24D6FB11A1F89C6A50838" + "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_39324675C5D24D6FB11A1F89C6A50838" { "UseDynamicProperties" = "11:FALSE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdBasicDialogs.wim" } - "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_7BA271C57B2945AB90EA4E3B81F2352C" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_7BA271C57B2945AB90EA4E3B81F2352C" { "Name" = "8:#1902" "Sequence" = "3:2" "Attributes" = "3:3" "Dialogs" { - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_BCB663D68120404AAE84380C98DEDD48" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_BCB663D68120404AAE84380C98DEDD48" { "Sequence" = "3:100" - "DisplayName" = "8:Terminé" + "DisplayName" = "8:Finished" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdAdminFinishedDlg.wid" @@ -401,17 +498,17 @@ } } } - "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_A791F39DCDF943EFB51C225AB3BA8A50" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_A791F39DCDF943EFB51C225AB3BA8A50" { "Name" = "8:#1901" "Sequence" = "3:1" "Attributes" = "3:2" "Dialogs" { - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_97F78B3941544772A5EC49812DAD11D5" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_97F78B3941544772A5EC49812DAD11D5" { "Sequence" = "3:100" - "DisplayName" = "8:Progression" + "DisplayName" = "8:Progress" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdProgressDlg.wid" @@ -445,17 +542,17 @@ } } } - "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_CDE881ABAB7C4726B526DDBA45B4BDE1" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_CDE881ABAB7C4726B526DDBA45B4BDE1" { "Name" = "8:#1900" "Sequence" = "3:1" "Attributes" = "3:1" "Dialogs" { - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_B620B069BE064ABA87B90550DA692268" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_B620B069BE064ABA87B90550DA692268" { "Sequence" = "3:300" - "DisplayName" = "8:Confirmer l'installation" + "DisplayName" = "8:Confirm Installation" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdConfirmDlg.wid" @@ -474,10 +571,10 @@ } } } - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_C345A4ECF4334C0299B1BF93AF8DD68B" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_C345A4ECF4334C0299B1BF93AF8DD68B" { "Sequence" = "3:100" - "DisplayName" = "8:Bienvenue" + "DisplayName" = "8:Welcome" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdWelcomeDlg.wid" @@ -522,10 +619,10 @@ } } } - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_DA4D7E682468404D838C7F08BA4E6124" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_DA4D7E682468404D838C7F08BA4E6124" { "Sequence" = "3:200" - "DisplayName" = "8:Dossier d'installation" + "DisplayName" = "8:Installation Folder" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdFolderDlg.wid" @@ -542,27 +639,40 @@ "Setting" = "3:1" "UsePlugInResources" = "11:TRUE" } + "InstallAllUsersVisible" + { + "Name" = "8:InstallAllUsersVisible" + "DisplayName" = "8:#1059" + "Description" = "8:#1159" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } } } } } - "{B654A020-6903-4E6A-A86C-75DC463DB54B}:_F349BA4DD2FF4C538D17E0E5A2E0CF02" + "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_F349BA4DD2FF4C538D17E0E5A2E0CF02" { "UseDynamicProperties" = "11:FALSE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdUserInterface.wim" } - "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_F6158F17384D4EE89AE7C515234C4964" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_F6158F17384D4EE89AE7C515234C4964" { "Name" = "8:#1900" "Sequence" = "3:2" "Attributes" = "3:1" "Dialogs" { - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_7F57E9802DDD47E7BB8A93A6650F6889" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_7F57E9802DDD47E7BB8A93A6650F6889" { "Sequence" = "3:300" - "DisplayName" = "8:Confirmer l'installation" + "DisplayName" = "8:Confirm Installation" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdAdminConfirmDlg.wid" @@ -581,10 +691,10 @@ } } } - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_A37E56D6E5634F64BA1D3DEF6558A9B1" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A37E56D6E5634F64BA1D3DEF6558A9B1" { "Sequence" = "3:100" - "DisplayName" = "8:Bienvenue" + "DisplayName" = "8:Welcome" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdAdminWelcomeDlg.wid" @@ -629,10 +739,10 @@ } } } - "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_CC824A96BD584085B9BF72FA74944CD7" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_CC824A96BD584085B9BF72FA74944CD7" { "Sequence" = "3:200" - "DisplayName" = "8:Dossier d'installation" + "DisplayName" = "8:Installation Folder" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" "SourcePath" = "8:\\VsdAdminFolderDlg.wid" @@ -656,30 +766,58 @@ } "MergeModule" { - "{35A69C6E-5BA4-440D-803D-762B59A45393}:_B14AED86FE884C009F4AC9751AD4D18D" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_286F2393B0174197984735489436A6A0" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm" + "SourcePath" = "8:Microsoft_VC80_CRT_x86_x64.msm" "Properties" { } "LanguageId" = "3:0" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "Folder" = "8:" "Feature" = "8:" "IsolateTo" = "8:" } - "{35A69C6E-5BA4-440D-803D-762B59A45393}:_D8C594BE1B9D4DAF9249260CD8F3983A" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_36DE29478DD946ED8B923C81E77CAD23" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:vc_user_mfc71_rtl_x86_---.msm" + "SourcePath" = "8:Microsoft_VC80_MFC_x86_x64.msm" "Properties" { } "LanguageId" = "3:0" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_CDD2F450AD2043DCAB5947901229278C" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:policy_8_0_microsoft_vc80_mfc_x86_x64.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:TRUE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_DF4A3CC201874ECCAFED12A9ACE93481" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86_x64.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:TRUE" "Folder" = "8:" "Feature" = "8:" "IsolateTo" = "8:" @@ -687,9 +825,65 @@ } "ProjectOutput" { - "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_57A5694E20F44D878FE43630B5B52BF5" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1074423A2F6F490CA85D9B808D40BAA0" + { + "SourcePath" = "8:..\\..\\x64\\release\\Ivy.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_8C785282719E44848328E169496E2F49" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{9BD87B7A-517E-4900-B3EA-A358885CD876}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1D801A7EE44D49369F603CD8C484C564" + { + "SourcePath" = "8:..\\..\\x64\\release\\pcre.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_8C785282719E44848328E169496E2F49" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_57A5694E20F44D878FE43630B5B52BF5" { - "SourcePath" = "8:..\\..\\..\\..\\Program Files\\Release\\IvyProbe.exe" + "SourcePath" = "8:..\\..\\x64\\release\\IvyProbe.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -715,7 +909,7 @@ { } } - "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_B619C71BCF024E7FBF55B2FECBD581F4" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B619C71BCF024E7FBF55B2FECBD581F4" { "SourcePath" = "8:" "TargetName" = "8:" -- cgit v1.1 From 04bd56d5f703163e492d89ea1f24c38089654fe4 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:04 +0000 Subject: Utilisateur : Fcolin Date : 22/12/05 Heure : 10:09 Archivé dans $/Bus/IvyProbe/InstIvyProbe Commentaire: (vss 9) --- IvyProbe/InstIvyProbe/InstIvy.vdproj | 100 ++++++++++------------------------- 1 file changed, 27 insertions(+), 73 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/InstIvyProbe/InstIvy.vdproj b/IvyProbe/InstIvyProbe/InstIvy.vdproj index 5de0f4d..8bac0e9 100644 --- a/IvyProbe/InstIvyProbe/InstIvy.vdproj +++ b/IvyProbe/InstIvyProbe/InstIvy.vdproj @@ -15,62 +15,44 @@ { "Entry" { - "MsmKey" = "8:_1074423A2F6F490CA85D9B808D40BAA0" + "MsmKey" = "8:_2BA590EA79FA40D288D4C357A0EB663F" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1D801A7EE44D49369F603CD8C484C564" + "MsmKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_286F2393B0174197984735489436A6A0" - "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "MsmKey" = "8:_A15C3CE7ECAA48B1AA5AE1373459D91D" + "OwnerKey" = "8:_2BA590EA79FA40D288D4C357A0EB663F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_286F2393B0174197984735489436A6A0" - "OwnerKey" = "8:_1D801A7EE44D49369F603CD8C484C564" + "MsmKey" = "8:_A15C3CE7ECAA48B1AA5AE1373459D91D" + "OwnerKey" = "8:_B874F2E999A34E8B88657D3AE68328DD" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_286F2393B0174197984735489436A6A0" - "OwnerKey" = "8:_1074423A2F6F490CA85D9B808D40BAA0" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_36DE29478DD946ED8B923C81E77CAD23" - "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "MsmKey" = "8:_B874F2E999A34E8B88657D3AE68328DD" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CDD2F450AD2043DCAB5947901229278C" - "OwnerKey" = "8:_36DE29478DD946ED8B923C81E77CAD23" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_CE403128DFF0A5ADE28CDD21A4FA625C" - "OwnerKey" = "8:_1074423A2F6F490CA85D9B808D40BAA0" + "OwnerKey" = "8:_B874F2E999A34E8B88657D3AE68328DD" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DF4A3CC201874ECCAFED12A9ACE93481" - "OwnerKey" = "8:_286F2393B0174197984735489436A6A0" + "MsmKey" = "8:_E82995808C8A47FBA63F06A4DDCB57BB" + "OwnerKey" = "8:_A15C3CE7ECAA48B1AA5AE1373459D91D" "MsmSig" = "8:_UNDEFINED" } } @@ -766,25 +748,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_286F2393B0174197984735489436A6A0" - { - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_CRT_x86_x64.msm" - "Properties" - { - } - "LanguageId" = "3:0" - "Exclude" = "11:TRUE" - "Folder" = "8:" - "Feature" = "8:" - "IsolateTo" = "8:" - } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_36DE29478DD946ED8B923C81E77CAD23" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_A15C3CE7ECAA48B1AA5AE1373459D91D" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_MFC_x86_x64.msm" + "SourcePath" = "8:Microsoft_VC80_DebugCRT_x86_x64.msm" "Properties" { } @@ -794,25 +762,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_CDD2F450AD2043DCAB5947901229278C" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_E82995808C8A47FBA63F06A4DDCB57BB" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_mfc_x86_x64.msm" - "Properties" - { - } - "LanguageId" = "3:0" - "Exclude" = "11:TRUE" - "Folder" = "8:" - "Feature" = "8:" - "IsolateTo" = "8:" - } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_DF4A3CC201874ECCAFED12A9ACE93481" - { - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86_x64.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_debugcrt_x86_x64.msm" "Properties" { } @@ -825,9 +779,9 @@ } "ProjectOutput" { - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1074423A2F6F490CA85D9B808D40BAA0" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2BA590EA79FA40D288D4C357A0EB663F" { - "SourcePath" = "8:..\\..\\x64\\release\\Ivy.dll" + "SourcePath" = "8:..\\x64\\Release\\pcre.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -847,15 +801,15 @@ "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{9BD87B7A-517E-4900-B3EA-A358885CD876}" + "OutputProjectGuid" = "8:{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1D801A7EE44D49369F603CD8C484C564" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_57A5694E20F44D878FE43630B5B52BF5" { - "SourcePath" = "8:..\\..\\x64\\release\\pcre.dll" + "SourcePath" = "8:..\\x64\\Release\\IvyProbe.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -875,15 +829,15 @@ "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}" + "OutputProjectGuid" = "8:{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_57A5694E20F44D878FE43630B5B52BF5" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B619C71BCF024E7FBF55B2FECBD581F4" { - "SourcePath" = "8:..\\..\\x64\\release\\IvyProbe.exe" + "SourcePath" = "8:" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -902,16 +856,16 @@ "IsolateTo" = "8:" "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Built" + "OutputGroupCanonicalName" = "8:ContentFiles" "OutputProjectGuid" = "8:{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B619C71BCF024E7FBF55B2FECBD581F4" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B874F2E999A34E8B88657D3AE68328DD" { - "SourcePath" = "8:" + "SourcePath" = "8:..\\x64\\Release\\Ivy.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -930,8 +884,8 @@ "IsolateTo" = "8:" "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:ContentFiles" - "OutputProjectGuid" = "8:{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{84E0039A-6721-4B18-9792-E9AE4274AC0E}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { -- cgit v1.1 From a02b3a6d2deb7651e3222e3a264d7e0a9d8dba82 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:06 +0000 Subject: Utilisateur : Fcolin Date : 20/01/06 Heure : 13:50 Archivé dans $/Bus/IvyProbe/InstIvyProbe Commentaire: (vss 10) --- IvyProbe/InstIvyProbe/InstIvy.vdproj | 118 ++++++++++++++++++++++++----------- 1 file changed, 82 insertions(+), 36 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/InstIvyProbe/InstIvy.vdproj b/IvyProbe/InstIvyProbe/InstIvy.vdproj index 8bac0e9..1cdc4de 100644 --- a/IvyProbe/InstIvyProbe/InstIvy.vdproj +++ b/IvyProbe/InstIvyProbe/InstIvy.vdproj @@ -15,44 +15,62 @@ { "Entry" { - "MsmKey" = "8:_2BA590EA79FA40D288D4C357A0EB663F" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_068231B255BA4CF597D465240FC17EE1" + "OwnerKey" = "8:_2BA590EA79FA40D288D4C357A0EB663F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "MsmKey" = "8:_068231B255BA4CF597D465240FC17EE1" + "OwnerKey" = "8:_0734E8B2079B44C29422ACB2369ED265" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_068231B255BA4CF597D465240FC17EE1" + "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0734E8B2079B44C29422ACB2369ED265" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A15C3CE7ECAA48B1AA5AE1373459D91D" - "OwnerKey" = "8:_2BA590EA79FA40D288D4C357A0EB663F" + "MsmKey" = "8:_190806647E074EEF9E45C86F55A5A133" + "OwnerKey" = "8:_4ADFF1F09F0546128EC1C3BB7C613885" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A15C3CE7ECAA48B1AA5AE1373459D91D" - "OwnerKey" = "8:_B874F2E999A34E8B88657D3AE68328DD" + "MsmKey" = "8:_2BA590EA79FA40D288D4C357A0EB663F" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B874F2E999A34E8B88657D3AE68328DD" + "MsmKey" = "8:_4ADFF1F09F0546128EC1C3BB7C613885" + "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CE403128DFF0A5ADE28CDD21A4FA625C" - "OwnerKey" = "8:_B874F2E999A34E8B88657D3AE68328DD" + "MsmKey" = "8:_B55CE2FB9EEF4AD9B35B004A1D1724F4" + "OwnerKey" = "8:_068231B255BA4CF597D465240FC17EE1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E82995808C8A47FBA63F06A4DDCB57BB" - "OwnerKey" = "8:_A15C3CE7ECAA48B1AA5AE1373459D91D" + "MsmKey" = "8:_CE403128DFF0A5ADE28CDD21A4FA625C" + "OwnerKey" = "8:_0734E8B2079B44C29422ACB2369ED265" "MsmSig" = "8:_UNDEFINED" } } @@ -90,7 +108,7 @@ "DisplayName" = "8:Release" "IsDebugOnly" = "11:FALSE" "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:..\\..\\..\\..\\Install\\IvyProbe.msi" + "OutputFilename" = "8:..\\..\\..\\..\\Install\\IvyProbex86.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -148,7 +166,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } @@ -193,7 +211,7 @@ } "{3C67513D-01DD-4637-8A68-80971EB9504F}:_8C785282719E44848328E169496E2F49" { - "DefaultLocation" = "8:[ProgramFiles64Folder][Manufacturer]\\[ProductName]" + "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]" "Name" = "8:#1925" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" @@ -219,7 +237,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:IvyProbe" "ProductCode" = "8:{F526A4E7-6E14-4D82-8C87-F483AEE19CEC}" - "PackageCode" = "8:{349D7642-CCBC-4876-933A-8364F38A2A46}" + "PackageCode" = "8:{F9355FAA-63EF-4457-A276-E1F3DB043C16}" "UpgradeCode" = "8:{FF452596-4F4B-4240-847F-38D0FA88DBB0}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" @@ -239,7 +257,7 @@ "ARPIconIndex" = "3:0" "SearchPath" = "8:" "UseSystemSearchPath" = "11:TRUE" - "TargetPlatform" = "3:1" + "TargetPlatform" = "3:0" "PreBuildEvent" = "8:" "PostBuildEvent" = "8:" "RunPostBuildEvent" = "3:0" @@ -748,30 +766,58 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_A15C3CE7ECAA48B1AA5AE1373459D91D" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_068231B255BA4CF597D465240FC17EE1" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_DebugCRT_x86_x64.msm" + "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" "Properties" { } "LanguageId" = "3:0" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "Folder" = "8:" "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_E82995808C8A47FBA63F06A4DDCB57BB" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_190806647E074EEF9E45C86F55A5A133" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_debugcrt_x86_x64.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_mfc_x86.msm" "Properties" { } "LanguageId" = "3:0" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_4ADFF1F09F0546128EC1C3BB7C613885" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:Microsoft_VC80_MFC_x86.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_B55CE2FB9EEF4AD9B35B004A1D1724F4" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" "Folder" = "8:" "Feature" = "8:" "IsolateTo" = "8:" @@ -779,9 +825,9 @@ } "ProjectOutput" { - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2BA590EA79FA40D288D4C357A0EB663F" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0734E8B2079B44C29422ACB2369ED265" { - "SourcePath" = "8:..\\x64\\Release\\pcre.dll" + "SourcePath" = "8:..\\..\\release\\Ivy.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -801,15 +847,15 @@ "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}" + "OutputProjectGuid" = "8:{9BD87B7A-517E-4900-B3EA-A358885CD876}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_57A5694E20F44D878FE43630B5B52BF5" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2BA590EA79FA40D288D4C357A0EB663F" { - "SourcePath" = "8:..\\x64\\Release\\IvyProbe.exe" + "SourcePath" = "8:..\\..\\release\\pcre.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -829,15 +875,15 @@ "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}" + "OutputProjectGuid" = "8:{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B619C71BCF024E7FBF55B2FECBD581F4" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_57A5694E20F44D878FE43630B5B52BF5" { - "SourcePath" = "8:" + "SourcePath" = "8:c:\\users\\fcolin\\program files\\release\\IvyProbe.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -856,16 +902,16 @@ "IsolateTo" = "8:" "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:ContentFiles" + "OutputGroupCanonicalName" = "8:Built" "OutputProjectGuid" = "8:{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B874F2E999A34E8B88657D3AE68328DD" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B619C71BCF024E7FBF55B2FECBD581F4" { - "SourcePath" = "8:..\\x64\\Release\\Ivy.dll" + "SourcePath" = "8:" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -884,8 +930,8 @@ "IsolateTo" = "8:" "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{84E0039A-6721-4B18-9792-E9AE4274AC0E}" + "OutputGroupCanonicalName" = "8:ContentFiles" + "OutputProjectGuid" = "8:{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { -- cgit v1.1 From 66a671b5da7e327cd83f78eccd140976302aa814 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:08 +0000 Subject: Utilisateur : Fcolin Date : 1/08/06 Heure : 13:14 Archivé dans $/Bus/IvyProbe/InstIvyProbe Commentaire: (vss 11) --- IvyProbe/InstIvyProbe/InstIvy.vdproj | 64 ++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/InstIvyProbe/InstIvy.vdproj b/IvyProbe/InstIvyProbe/InstIvy.vdproj index 1cdc4de..f8f2940 100644 --- a/IvyProbe/InstIvyProbe/InstIvy.vdproj +++ b/IvyProbe/InstIvyProbe/InstIvy.vdproj @@ -15,62 +15,62 @@ { "Entry" { - "MsmKey" = "8:_068231B255BA4CF597D465240FC17EE1" - "OwnerKey" = "8:_2BA590EA79FA40D288D4C357A0EB663F" + "MsmKey" = "8:_0734E8B2079B44C29422ACB2369ED265" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_068231B255BA4CF597D465240FC17EE1" - "OwnerKey" = "8:_0734E8B2079B44C29422ACB2369ED265" + "MsmKey" = "8:_2BA590EA79FA40D288D4C357A0EB663F" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_068231B255BA4CF597D465240FC17EE1" - "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "MsmKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0734E8B2079B44C29422ACB2369ED265" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_827AA27AD2624E259C908F24DBF828D8" + "OwnerKey" = "8:_9320DA3A60974545BD98E0A01DFE532C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_190806647E074EEF9E45C86F55A5A133" - "OwnerKey" = "8:_4ADFF1F09F0546128EC1C3BB7C613885" + "MsmKey" = "8:_9320DA3A60974545BD98E0A01DFE532C" + "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2BA590EA79FA40D288D4C357A0EB663F" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_CE403128DFF0A5ADE28CDD21A4FA625C" + "OwnerKey" = "8:_0734E8B2079B44C29422ACB2369ED265" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4ADFF1F09F0546128EC1C3BB7C613885" - "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "MsmKey" = "8:_EC3961DD6B5E49BCB884EC87E514AEF7" + "OwnerKey" = "8:_0734E8B2079B44C29422ACB2369ED265" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_EC3961DD6B5E49BCB884EC87E514AEF7" + "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B55CE2FB9EEF4AD9B35B004A1D1724F4" - "OwnerKey" = "8:_068231B255BA4CF597D465240FC17EE1" + "MsmKey" = "8:_EC3961DD6B5E49BCB884EC87E514AEF7" + "OwnerKey" = "8:_2BA590EA79FA40D288D4C357A0EB663F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CE403128DFF0A5ADE28CDD21A4FA625C" - "OwnerKey" = "8:_0734E8B2079B44C29422ACB2369ED265" + "MsmKey" = "8:_F639FAEF00B1428EBDF34009FAD86322" + "OwnerKey" = "8:_EC3961DD6B5E49BCB884EC87E514AEF7" "MsmSig" = "8:_UNDEFINED" } } @@ -123,7 +123,7 @@ "Enabled" = "11:FALSE" "PromptEnabled" = "11:TRUE" "PrerequisitesLocation" = "2:1" - "Url" = "8:" + "Url" = "8:http://www.tls.cena.fr/products/ivy/download/packages" "ComponentsUrl" = "8:" "Items" { @@ -237,7 +237,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:IvyProbe" "ProductCode" = "8:{F526A4E7-6E14-4D82-8C87-F483AEE19CEC}" - "PackageCode" = "8:{F9355FAA-63EF-4457-A276-E1F3DB043C16}" + "PackageCode" = "8:{C9CEBC1A-1557-4483-8966-25FEA160F725}" "UpgradeCode" = "8:{FF452596-4F4B-4240-847F-38D0FA88DBB0}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" @@ -246,11 +246,11 @@ "ProductVersion" = "8:1.1.1" "Manufacturer" = "8:SDER PII" "ARPHELPTELEPHONE" = "8:" - "ARPHELPLINK" = "8:" + "ARPHELPLINK" = "8:http://www.tls.cena.fr/products/ivy" "Title" = "8:IvyProbe" "Subject" = "8:" "ARPCONTACT" = "8:SDER PII" - "Keywords" = "8:" + "Keywords" = "8:Ivy" "ARPCOMMENTS" = "8:" "ARPURLINFOABOUT" = "8:" "ARPPRODUCTICON" = "8:" @@ -259,7 +259,7 @@ "UseSystemSearchPath" = "11:TRUE" "TargetPlatform" = "3:0" "PreBuildEvent" = "8:" - "PostBuildEvent" = "8:" + "PostBuildEvent" = "8:\"$(ProjectDir)..\\..\\UpdateIvyWeb.bat\" \"$(BuiltOuputPath)\"" "RunPostBuildEvent" = "3:0" } "Registry" @@ -766,11 +766,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_068231B255BA4CF597D465240FC17EE1" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_827AA27AD2624E259C908F24DBF828D8" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_mfc_x86.msm" "Properties" { } @@ -780,11 +780,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_190806647E074EEF9E45C86F55A5A133" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_9320DA3A60974545BD98E0A01DFE532C" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_mfc_x86.msm" + "SourcePath" = "8:Microsoft_VC80_MFC_x86.msm" "Properties" { } @@ -794,11 +794,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_4ADFF1F09F0546128EC1C3BB7C613885" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_EC3961DD6B5E49BCB884EC87E514AEF7" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_MFC_x86.msm" + "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" "Properties" { } @@ -808,7 +808,7 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_B55CE2FB9EEF4AD9B35B004A1D1724F4" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_F639FAEF00B1428EBDF34009FAD86322" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" -- cgit v1.1 From f61bc571655accd5856df46a7de945d6dda25909 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:11 +0000 Subject: Utilisateur : Fcolin Date : 10/11/06 Heure : 13:43 Archivé dans $/Bus/IvyProbe/InstIvyProbe Commentaire: (vss 12) --- IvyProbe/InstIvyProbe/InstIvy.vdproj | 58 ++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/InstIvyProbe/InstIvy.vdproj b/IvyProbe/InstIvyProbe/InstIvy.vdproj index f8f2940..8e3adc6 100644 --- a/IvyProbe/InstIvyProbe/InstIvy.vdproj +++ b/IvyProbe/InstIvyProbe/InstIvy.vdproj @@ -21,56 +21,56 @@ } "Entry" { - "MsmKey" = "8:_2BA590EA79FA40D288D4C357A0EB663F" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_1486B93EEEB04B74B1C24F8566ED3577" + "OwnerKey" = "8:_2E1B70E1D3E34BF1B830A2B513C59F8D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "MsmKey" = "8:_2BA590EA79FA40D288D4C357A0EB663F" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_827AA27AD2624E259C908F24DBF828D8" - "OwnerKey" = "8:_9320DA3A60974545BD98E0A01DFE532C" + "MsmKey" = "8:_2E1B70E1D3E34BF1B830A2B513C59F8D" + "OwnerKey" = "8:_0734E8B2079B44C29422ACB2369ED265" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9320DA3A60974545BD98E0A01DFE532C" + "MsmKey" = "8:_2E1B70E1D3E34BF1B830A2B513C59F8D" "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CE403128DFF0A5ADE28CDD21A4FA625C" - "OwnerKey" = "8:_0734E8B2079B44C29422ACB2369ED265" + "MsmKey" = "8:_2E1B70E1D3E34BF1B830A2B513C59F8D" + "OwnerKey" = "8:_2BA590EA79FA40D288D4C357A0EB663F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EC3961DD6B5E49BCB884EC87E514AEF7" - "OwnerKey" = "8:_0734E8B2079B44C29422ACB2369ED265" + "MsmKey" = "8:_3F76C1261811461981DF48D8B1A436DC" + "OwnerKey" = "8:_CFEFAFB2A3984CD79CCF8A0E2486954C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EC3961DD6B5E49BCB884EC87E514AEF7" - "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "MsmKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EC3961DD6B5E49BCB884EC87E514AEF7" - "OwnerKey" = "8:_2BA590EA79FA40D288D4C357A0EB663F" + "MsmKey" = "8:_CE403128DFF0A5ADE28CDD21A4FA625C" + "OwnerKey" = "8:_0734E8B2079B44C29422ACB2369ED265" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_F639FAEF00B1428EBDF34009FAD86322" - "OwnerKey" = "8:_EC3961DD6B5E49BCB884EC87E514AEF7" + "MsmKey" = "8:_CFEFAFB2A3984CD79CCF8A0E2486954C" + "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } } @@ -166,7 +166,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" + "Exclude" = "11:TRUE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } @@ -237,7 +237,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:IvyProbe" "ProductCode" = "8:{F526A4E7-6E14-4D82-8C87-F483AEE19CEC}" - "PackageCode" = "8:{C9CEBC1A-1557-4483-8966-25FEA160F725}" + "PackageCode" = "8:{95A8A0F5-3264-46D3-986E-49849DEAA566}" "UpgradeCode" = "8:{FF452596-4F4B-4240-847F-38D0FA88DBB0}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" @@ -766,11 +766,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_827AA27AD2624E259C908F24DBF828D8" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1486B93EEEB04B74B1C24F8566ED3577" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_mfc_x86.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86_x64.msm" "Properties" { } @@ -780,11 +780,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_9320DA3A60974545BD98E0A01DFE532C" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_2E1B70E1D3E34BF1B830A2B513C59F8D" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_MFC_x86.msm" + "SourcePath" = "8:Microsoft_VC80_CRT_x86_x64.msm" "Properties" { } @@ -794,11 +794,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_EC3961DD6B5E49BCB884EC87E514AEF7" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_3F76C1261811461981DF48D8B1A436DC" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_mfc_x86_x64.msm" "Properties" { } @@ -808,11 +808,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_F639FAEF00B1428EBDF34009FAD86322" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_CFEFAFB2A3984CD79CCF8A0E2486954C" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm" + "SourcePath" = "8:Microsoft_VC80_MFC_x86_x64.msm" "Properties" { } @@ -827,7 +827,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0734E8B2079B44C29422ACB2369ED265" { - "SourcePath" = "8:..\\..\\release\\Ivy.dll" + "SourcePath" = "8:..\\..\\x64\\release\\Ivy.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -855,7 +855,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2BA590EA79FA40D288D4C357A0EB663F" { - "SourcePath" = "8:..\\..\\release\\pcre.dll" + "SourcePath" = "8:..\\..\\x64\\release\\pcre.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -883,7 +883,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_57A5694E20F44D878FE43630B5B52BF5" { - "SourcePath" = "8:c:\\users\\fcolin\\program files\\release\\IvyProbe.exe" + "SourcePath" = "8:..\\..\\x64\\release\\IvyProbe.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" -- cgit v1.1 From d9e0258f42f6d5b3a3511effc009aac3216c8339 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:12 +0000 Subject: Utilisateur : Fcolin Date : 20/11/06 Heure : 18:38 Archivé dans $/Bus/IvyProbe/InstIvyProbe Commentaire: (vss 13) --- IvyProbe/InstIvyProbe/InstIvy.vdproj | 70 ++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/InstIvyProbe/InstIvy.vdproj b/IvyProbe/InstIvyProbe/InstIvy.vdproj index 8e3adc6..4723fde 100644 --- a/IvyProbe/InstIvyProbe/InstIvy.vdproj +++ b/IvyProbe/InstIvyProbe/InstIvy.vdproj @@ -15,44 +15,44 @@ { "Entry" { - "MsmKey" = "8:_0734E8B2079B44C29422ACB2369ED265" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_0BD6F02CECD440B69ED6C192591DACC5" + "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1486B93EEEB04B74B1C24F8566ED3577" - "OwnerKey" = "8:_2E1B70E1D3E34BF1B830A2B513C59F8D" + "MsmKey" = "8:_0DEC983A1D87453191CA274F5F2176F4" + "OwnerKey" = "8:_2BA590EA79FA40D288D4C357A0EB663F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2BA590EA79FA40D288D4C357A0EB663F" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_0DEC983A1D87453191CA274F5F2176F4" + "OwnerKey" = "8:_60AC32E483D448BD9E9F46857BA217C9" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2E1B70E1D3E34BF1B830A2B513C59F8D" - "OwnerKey" = "8:_0734E8B2079B44C29422ACB2369ED265" + "MsmKey" = "8:_0DEC983A1D87453191CA274F5F2176F4" + "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2E1B70E1D3E34BF1B830A2B513C59F8D" - "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "MsmKey" = "8:_1EFC5F9E826F4C7E822FFAE03114C84F" + "OwnerKey" = "8:_0DEC983A1D87453191CA274F5F2176F4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2E1B70E1D3E34BF1B830A2B513C59F8D" - "OwnerKey" = "8:_2BA590EA79FA40D288D4C357A0EB663F" + "MsmKey" = "8:_28A6C3696FE941E1BA95263704863C73" + "OwnerKey" = "8:_0BD6F02CECD440B69ED6C192591DACC5" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_3F76C1261811461981DF48D8B1A436DC" - "OwnerKey" = "8:_CFEFAFB2A3984CD79CCF8A0E2486954C" + "MsmKey" = "8:_2BA590EA79FA40D288D4C357A0EB663F" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -63,14 +63,14 @@ } "Entry" { - "MsmKey" = "8:_CE403128DFF0A5ADE28CDD21A4FA625C" - "OwnerKey" = "8:_0734E8B2079B44C29422ACB2369ED265" + "MsmKey" = "8:_60AC32E483D448BD9E9F46857BA217C9" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_CFEFAFB2A3984CD79CCF8A0E2486954C" - "OwnerKey" = "8:_57A5694E20F44D878FE43630B5B52BF5" + "MsmKey" = "8:_CE403128DFF0A5ADE28CDD21A4FA625C" + "OwnerKey" = "8:_60AC32E483D448BD9E9F46857BA217C9" "MsmSig" = "8:_UNDEFINED" } } @@ -166,7 +166,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } @@ -766,11 +766,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1486B93EEEB04B74B1C24F8566ED3577" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_0BD6F02CECD440B69ED6C192591DACC5" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86_x64.msm" + "SourcePath" = "8:Microsoft_VC80_MFC_x86_x64.msm" "Properties" { } @@ -780,7 +780,7 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_2E1B70E1D3E34BF1B830A2B513C59F8D" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_0DEC983A1D87453191CA274F5F2176F4" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" @@ -794,11 +794,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_3F76C1261811461981DF48D8B1A436DC" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1EFC5F9E826F4C7E822FFAE03114C84F" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_mfc_x86_x64.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86_x64.msm" "Properties" { } @@ -808,11 +808,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_CFEFAFB2A3984CD79CCF8A0E2486954C" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_28A6C3696FE941E1BA95263704863C73" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_MFC_x86_x64.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_mfc_x86_x64.msm" "Properties" { } @@ -825,9 +825,9 @@ } "ProjectOutput" { - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0734E8B2079B44C29422ACB2369ED265" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2BA590EA79FA40D288D4C357A0EB663F" { - "SourcePath" = "8:..\\..\\x64\\release\\Ivy.dll" + "SourcePath" = "8:..\\x64\\Release\\pcre.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -847,15 +847,15 @@ "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{9BD87B7A-517E-4900-B3EA-A358885CD876}" + "OutputProjectGuid" = "8:{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2BA590EA79FA40D288D4C357A0EB663F" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_57A5694E20F44D878FE43630B5B52BF5" { - "SourcePath" = "8:..\\..\\x64\\release\\pcre.dll" + "SourcePath" = "8:..\\x64\\Release\\IvyProbe.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -875,15 +875,15 @@ "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{D79FC143-498E-4342-B2C7-BDAD1B8D0E6B}" + "OutputProjectGuid" = "8:{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_57A5694E20F44D878FE43630B5B52BF5" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_60AC32E483D448BD9E9F46857BA217C9" { - "SourcePath" = "8:..\\..\\x64\\release\\IvyProbe.exe" + "SourcePath" = "8:..\\x64\\Release\\Ivy.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8C785282719E44848328E169496E2F49" @@ -903,7 +903,7 @@ "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}" + "OutputProjectGuid" = "8:{84E0039A-6721-4B18-9792-E9AE4274AC0E}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { -- cgit v1.1 From 807481fc60708fdb8482ac8373d2f2262c6a3bec Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:15 +0000 Subject: Utilisateur : Fcolin Date : 23/01/04 Heure : 14:18 Créé Commentaire: (vss 1) --- IvyProbe/InstIvyProbe/InstIvy.vdproj.vspscc | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 IvyProbe/InstIvyProbe/InstIvy.vdproj.vspscc (limited to 'IvyProbe') diff --git a/IvyProbe/InstIvyProbe/InstIvy.vdproj.vspscc b/IvyProbe/InstIvyProbe/InstIvy.vdproj.vspscc new file mode 100644 index 0000000..7b71a95 --- /dev/null +++ b/IvyProbe/InstIvyProbe/InstIvy.vdproj.vspscc @@ -0,0 +1,10 @@ +"" +{ +"FILE_VERSION" = "9237" +"ENLISTMENT_CHOICE" = "NEVER" +"PROJECT_FILE_RELATIVE_PATH" = "" +"NUMBER_OF_EXCLUDED_FILES" = "0" +"ORIGINAL_PROJECT_FILE_PATH" = "" +"NUMBER_OF_NESTED_PROJECTS" = "0" +"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" +} -- cgit v1.1 From 179334803ebf8c0a72789f7b4bc80bde747d5592 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:17 +0000 Subject: Utilisateur : Fcolin Date : 18/12/98 Heure : 18:48 Créé (vss 1) --- IvyProbe/IvyProbe.cpp | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 IvyProbe/IvyProbe.cpp (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.cpp b/IvyProbe/IvyProbe.cpp new file mode 100644 index 0000000..68259e6 --- /dev/null +++ b/IvyProbe/IvyProbe.cpp @@ -0,0 +1,83 @@ +// Test.cpp : Defines the class behaviors for the application. +// + +#include "stdafx.h" +#include "Test.h" +#include "TestDlg.h" + +#ifdef _DEBUG +#define new DEBUG_NEW +#undef THIS_FILE +static char THIS_FILE[] = __FILE__; +#endif + +///////////////////////////////////////////////////////////////////////////// +// CTestApp + +BEGIN_MESSAGE_MAP(CTestApp, CWinApp) + //{{AFX_MSG_MAP(CTestApp) + // NOTE - the ClassWizard will add and remove mapping macros here. + // DO NOT EDIT what you see in these blocks of generated code! + //}}AFX_MSG + ON_COMMAND(ID_HELP, CWinApp::OnHelp) +END_MESSAGE_MAP() + +///////////////////////////////////////////////////////////////////////////// +// CTestApp construction + +CTestApp::CTestApp() +{ + // TODO: add construction code here, + // Place all significant initialization in InitInstance +} + +///////////////////////////////////////////////////////////////////////////// +// The one and only CTestApp object + +CTestApp theApp; + +///////////////////////////////////////////////////////////////////////////// +// CTestApp initialization + +BOOL CTestApp::InitInstance() +{ + // CG: The following block was added by the Windows Sockets component. + { + if (!AfxSocketInit()) + { + AfxMessageBox(CG_IDS_SOCKETS_INIT_FAILED); + return FALSE; + } + + } + AfxEnableControlContainer(); + + // Standard initialization + // If you are not using these features and wish to reduce the size + // of your final executable, you should remove from the following + // the specific initialization routines you do not need. + +#ifdef _AFXDLL + Enable3dControls(); // Call this when using MFC in a shared DLL +#else + Enable3dControlsStatic(); // Call this when linking to MFC statically +#endif + + CTestDlg dlg; + m_pMainWnd = &dlg; + int nResponse = dlg.DoModal(); + if (nResponse == IDOK) + { + // TODO: Place code here to handle when the dialog is + // dismissed with OK + } + else if (nResponse == IDCANCEL) + { + // TODO: Place code here to handle when the dialog is + // dismissed with Cancel + } + + // Since the dialog has been closed, return FALSE so that we exit the + // application, rather than start the application's message pump. + return FALSE; +} -- cgit v1.1 From e6a2d8e3d46e0ce4a5d94a261066ffcdfd76ecda Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:18 +0000 Subject: Utilisateur : Fcolin Date : 19/02/01 Heure : 10:39 Archivé dans $/Bus/Test (vss 2) --- IvyProbe/IvyProbe.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.cpp b/IvyProbe/IvyProbe.cpp index 68259e6..e0afcfb 100644 --- a/IvyProbe/IvyProbe.cpp +++ b/IvyProbe/IvyProbe.cpp @@ -16,6 +16,7 @@ static char THIS_FILE[] = __FILE__; BEGIN_MESSAGE_MAP(CTestApp, CWinApp) //{{AFX_MSG_MAP(CTestApp) + ON_COMMAND(ID_APP_ABOUT, OnAppAbout) // NOTE - the ClassWizard will add and remove mapping macros here. // DO NOT EDIT what you see in these blocks of generated code! //}}AFX_MSG @@ -56,12 +57,13 @@ BOOL CTestApp::InitInstance() // If you are not using these features and wish to reduce the size // of your final executable, you should remove from the following // the specific initialization routines you do not need. - +#ifndef UNDER_CE #ifdef _AFXDLL Enable3dControls(); // Call this when using MFC in a shared DLL #else Enable3dControlsStatic(); // Call this when linking to MFC statically #endif +#endif CTestDlg dlg; m_pMainWnd = &dlg; @@ -81,3 +83,9 @@ BOOL CTestApp::InitInstance() // application, rather than start the application's message pump. return FALSE; } +// App command to run the dialog +void CTestApp::OnAppAbout() +{ + CAboutDlg aboutDlg; + aboutDlg.DoModal(); +} -- cgit v1.1 From 2e62a1c09769fbbc11af46310f1ac4f429294298 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:20 +0000 Subject: Utilisateur : Fcolin Date : 13/01/03 Heure : 15:28 Archivé dans $/Bus/IvyProbe Commentaire: (vss 3) --- IvyProbe/IvyProbe.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.cpp b/IvyProbe/IvyProbe.cpp index e0afcfb..00eca87 100644 --- a/IvyProbe/IvyProbe.cpp +++ b/IvyProbe/IvyProbe.cpp @@ -59,9 +59,9 @@ BOOL CTestApp::InitInstance() // the specific initialization routines you do not need. #ifndef UNDER_CE #ifdef _AFXDLL - Enable3dControls(); // Call this when using MFC in a shared DLL + //Enable3dControls(); // Call this when using MFC in a shared DLL #else - Enable3dControlsStatic(); // Call this when linking to MFC statically + //Enable3dControlsStatic(); // Call this when linking to MFC statically #endif #endif -- cgit v1.1 From be6b2906b41ec652689fa946e84d70fc1f882df4 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:22 +0000 Subject: Utilisateur : Fcolin Date : 21/02/03 Heure : 16:31 Archivé dans $/Bus/IvyProbe Commentaire: (vss 4) --- IvyProbe/IvyProbe.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.cpp b/IvyProbe/IvyProbe.cpp index 00eca87..f201abc 100644 --- a/IvyProbe/IvyProbe.cpp +++ b/IvyProbe/IvyProbe.cpp @@ -2,8 +2,8 @@ // #include "stdafx.h" -#include "Test.h" -#include "TestDlg.h" +#include "IvyProbe.h" +#include "IvyProbeDlg.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -14,7 +14,7 @@ static char THIS_FILE[] = __FILE__; ///////////////////////////////////////////////////////////////////////////// // CTestApp -BEGIN_MESSAGE_MAP(CTestApp, CWinApp) +BEGIN_MESSAGE_MAP(CIvyProbeApp, CWinApp) //{{AFX_MSG_MAP(CTestApp) ON_COMMAND(ID_APP_ABOUT, OnAppAbout) // NOTE - the ClassWizard will add and remove mapping macros here. @@ -26,7 +26,7 @@ END_MESSAGE_MAP() ///////////////////////////////////////////////////////////////////////////// // CTestApp construction -CTestApp::CTestApp() +CIvyProbeApp::CIvyProbeApp() { // TODO: add construction code here, // Place all significant initialization in InitInstance @@ -35,12 +35,12 @@ CTestApp::CTestApp() ///////////////////////////////////////////////////////////////////////////// // The one and only CTestApp object -CTestApp theApp; +CIvyProbeApp theApp; ///////////////////////////////////////////////////////////////////////////// // CTestApp initialization -BOOL CTestApp::InitInstance() +BOOL CIvyProbeApp::InitInstance() { // CG: The following block was added by the Windows Sockets component. { @@ -51,7 +51,7 @@ BOOL CTestApp::InitInstance() } } - AfxEnableControlContainer(); + //AfxEnableControlContainer(); // Standard initialization // If you are not using these features and wish to reduce the size @@ -60,12 +60,13 @@ BOOL CTestApp::InitInstance() #ifndef UNDER_CE #ifdef _AFXDLL //Enable3dControls(); // Call this when using MFC in a shared DLL + InitCommonControls(); #else //Enable3dControlsStatic(); // Call this when linking to MFC statically #endif #endif - CTestDlg dlg; + CIvyProbeDlg dlg; m_pMainWnd = &dlg; int nResponse = dlg.DoModal(); if (nResponse == IDOK) @@ -84,7 +85,7 @@ BOOL CTestApp::InitInstance() return FALSE; } // App command to run the dialog -void CTestApp::OnAppAbout() +void CIvyProbeApp::OnAppAbout() { CAboutDlg aboutDlg; aboutDlg.DoModal(); -- cgit v1.1 From b85b4621a4e9c6103a56aaf80a3215b93b93b517 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:24 +0000 Subject: Utilisateur : Fcolin Date : 26/02/03 Heure : 16:40 Archivé dans $/Bus/IvyProbe Commentaire: suppression bouton clock start (vss 5) --- IvyProbe/IvyProbe.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.cpp b/IvyProbe/IvyProbe.cpp index f201abc..2365dd4 100644 --- a/IvyProbe/IvyProbe.cpp +++ b/IvyProbe/IvyProbe.cpp @@ -42,6 +42,9 @@ CIvyProbeApp theApp; BOOL CIvyProbeApp::InitInstance() { + InitCommonControls(); + CWinApp::InitInstance(); + // CG: The following block was added by the Windows Sockets component. { if (!AfxSocketInit()) @@ -60,7 +63,6 @@ BOOL CIvyProbeApp::InitInstance() #ifndef UNDER_CE #ifdef _AFXDLL //Enable3dControls(); // Call this when using MFC in a shared DLL - InitCommonControls(); #else //Enable3dControlsStatic(); // Call this when linking to MFC statically #endif -- cgit v1.1 From 8b4407ef34db1f87fffbd42d160a1e66904b17e8 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:26 +0000 Subject: Utilisateur : Fcolin Date : 1/06/05 Heure : 16:45 Archivé dans $/Bus/IvyProbe Commentaire: (vss 6) --- IvyProbe/IvyProbe.cpp | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.cpp b/IvyProbe/IvyProbe.cpp index 2365dd4..df84f85 100644 --- a/IvyProbe/IvyProbe.cpp +++ b/IvyProbe/IvyProbe.cpp @@ -54,19 +54,6 @@ BOOL CIvyProbeApp::InitInstance() } } - //AfxEnableControlContainer(); - - // Standard initialization - // If you are not using these features and wish to reduce the size - // of your final executable, you should remove from the following - // the specific initialization routines you do not need. -#ifndef UNDER_CE -#ifdef _AFXDLL - //Enable3dControls(); // Call this when using MFC in a shared DLL -#else - //Enable3dControlsStatic(); // Call this when linking to MFC statically -#endif -#endif CIvyProbeDlg dlg; m_pMainWnd = &dlg; -- cgit v1.1 From 10329c3fb58c6d56f2ea28c40072737e2274d5d4 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:29 +0000 Subject: Utilisateur : Fcolin Date : 18/12/98 Heure : 18:48 Créé (vss 1) --- IvyProbe/IvyProbe.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 IvyProbe/IvyProbe.h (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.h b/IvyProbe/IvyProbe.h new file mode 100644 index 0000000..d70c177 --- /dev/null +++ b/IvyProbe/IvyProbe.h @@ -0,0 +1,49 @@ +// Test.h : main header file for the TEST application +// + +#if !defined(AFX_TEST_H__F7F08FEE_E653_11D0_AE3E_080009F92591__INCLUDED_) +#define AFX_TEST_H__F7F08FEE_E653_11D0_AE3E_080009F92591__INCLUDED_ + +#if _MSC_VER >= 1000 +#pragma once +#endif // _MSC_VER >= 1000 + +#ifndef __AFXWIN_H__ + #error include 'stdafx.h' before including this file for PCH +#endif + +#include "resource.h" // main symbols + +///////////////////////////////////////////////////////////////////////////// +// CTestApp: +// See Test.cpp for the implementation of this class +// + +class CTestApp : public CWinApp +{ +public: + CTestApp(); + +// Overrides + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(CTestApp) + public: + virtual BOOL InitInstance(); + //}}AFX_VIRTUAL + +// Implementation + + //{{AFX_MSG(CTestApp) + // NOTE - the ClassWizard will add and remove member functions here. + // DO NOT EDIT what you see in these blocks of generated code ! + //}}AFX_MSG + DECLARE_MESSAGE_MAP() +}; + + +///////////////////////////////////////////////////////////////////////////// + +//{{AFX_INSERT_LOCATION}} +// Microsoft Developer Studio will insert additional declarations immediately before the previous line. + +#endif // !defined(AFX_TEST_H__F7F08FEE_E653_11D0_AE3E_080009F92591__INCLUDED_) -- cgit v1.1 From b969f81a2eccdedbf79cb6c850ece8e6a1d873bd Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:30 +0000 Subject: Utilisateur : Fcolin Date : 19/02/01 Heure : 10:39 Archivé dans $/Bus/Test (vss 2) --- IvyProbe/IvyProbe.h | 1 + 1 file changed, 1 insertion(+) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.h b/IvyProbe/IvyProbe.h index d70c177..c1042a2 100644 --- a/IvyProbe/IvyProbe.h +++ b/IvyProbe/IvyProbe.h @@ -34,6 +34,7 @@ public: // Implementation //{{AFX_MSG(CTestApp) + afx_msg void OnAppAbout(); // NOTE - the ClassWizard will add and remove member functions here. // DO NOT EDIT what you see in these blocks of generated code ! //}}AFX_MSG -- cgit v1.1 From 37533c5f88162d5eca205853b54c5d1be59fd012 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:32 +0000 Subject: Utilisateur : Fcolin Date : 21/02/03 Heure : 16:31 Archivé dans $/Bus/IvyProbe Commentaire: (vss 3) --- IvyProbe/IvyProbe.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.h b/IvyProbe/IvyProbe.h index c1042a2..998fd04 100644 --- a/IvyProbe/IvyProbe.h +++ b/IvyProbe/IvyProbe.h @@ -19,10 +19,10 @@ // See Test.cpp for the implementation of this class // -class CTestApp : public CWinApp +class CIvyProbeApp : public CWinApp { public: - CTestApp(); + CIvyProbeApp(); // Overrides // ClassWizard generated virtual function overrides -- cgit v1.1 From 463b38558ef9be23aff66c36112184db5518f68d Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:35 +0000 Subject: Utilisateur : Fcolin Date : 18/12/98 Heure : 18:48 Créé (vss 1) --- IvyProbe/IvyProbe.rc | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 224 insertions(+) create mode 100644 IvyProbe/IvyProbe.rc (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.rc b/IvyProbe/IvyProbe.rc new file mode 100644 index 0000000..7d994fc --- /dev/null +++ b/IvyProbe/IvyProbe.rc @@ -0,0 +1,224 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// French (France) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) +#ifdef _WIN32 +LANGUAGE LANG_FRENCH, SUBLANG_FRENCH +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#define _AFX_NO_SPLITTER_RESOURCES\r\n" + "#define _AFX_NO_OLE_RESOURCES\r\n" + "#define _AFX_NO_TRACKER_RESOURCES\r\n" + "#define _AFX_NO_PROPERTY_RESOURCES\r\n" + "\r\n" + "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)\r\n" + "#ifdef _WIN32\r\n" + "LANGUAGE 12, 1\r\n" + "#pragma code_page(1252)\r\n" + "#endif\r\n" + "#include ""res\\Test.rc2"" // non-Microsoft Visual C++ edited resources\r\n" + "#include ""l.fra\\afxres.rc"" // Standard components\r\n" + "#endif\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDR_MAINFRAME ICON DISCARDABLE "res\\Test.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 55 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "A propos de Test" +FONT 8, "MS Sans Serif" +BEGIN + ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20 + LTEXT "Test version 1.0",IDC_STATIC,40,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 1997",IDC_STATIC,40,25,119,8 + DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP +END + +IDD_TEST_DIALOG DIALOGEX 0, 0, 185, 149 +STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Test" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "QUIT",IDOK,128,14,50,14 + EDITTEXT IDC_BUSNUMBER,13,14,46,14,ES_AUTOHSCROLL | ES_WANTRETURN | + ES_NUMBER + PUSHBUTTON "Start",IDC_START,71,14,44,14 + CONTROL "Slider1",IDC_SLIDER0,"msctls_trackbar32",TBS_VERT | + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,16,91,10,51 + CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_VERT | + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,30,91,10,51 + CONTROL "Slider1",IDC_SLIDER3,"msctls_trackbar32",TBS_VERT | + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,58,91,10,51 + CONTROL "Slider1",IDC_SLIDER4,"msctls_trackbar32",TBS_VERT | + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,72,91,10,51 + CONTROL "Slider1",IDC_SLIDER5,"msctls_trackbar32",TBS_VERT | + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,86,91,10,51 + CONTROL "Slider1",IDC_SLIDER6,"msctls_trackbar32",TBS_VERT | + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,100,91,10,51 + CONTROL "Slider1",IDC_SLIDER7,"msctls_trackbar32",TBS_VERT | + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,114,91,10,51 + CONTROL "Slider1",IDC_SLIDER2,"msctls_trackbar32",TBS_VERT | + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,44,91,10,51 + EDITTEXT IDC_TEXT,7,36,171,52,ES_MULTILINE | ES_AUTOVSCROLL | + ES_AUTOHSCROLL | ES_READONLY +END + + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,0,1 + PRODUCTVERSION 1,0,0,1 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040C04B0" + BEGIN + VALUE "CompanyName", "\0" + VALUE "FileDescription", "Application MFC Test\0" + VALUE "FileVersion", "1, 0, 0, 1\0" + VALUE "InternalName", "Test\0" + VALUE "LegalCopyright", "Copyright (C) 1997\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "Test.EXE\0" + VALUE "ProductName", "Application Test\0" + VALUE "ProductVersion", "1, 0, 0, 1\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Traduction", 0x40c, 1200 + END +END + +#endif // !_MAC + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 210 + TOPMARGIN, 7 + BOTTOMMARGIN, 48 + END + + IDD_TEST_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 178 + TOPMARGIN, 7 + BOTTOMMARGIN, 142 + END +END +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ABOUTBOX "&A propos de Test..." + CG_IDS_SOCKETS_INIT_FAILED "Windows sockets initialization failed." +END + +#endif // French (France) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#define _AFX_NO_SPLITTER_RESOURCES +#define _AFX_NO_OLE_RESOURCES +#define _AFX_NO_TRACKER_RESOURCES +#define _AFX_NO_PROPERTY_RESOURCES + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) +#ifdef _WIN32 +LANGUAGE 12, 1 +#pragma code_page(1252) +#endif +#include "res\Test.rc2" // non-Microsoft Visual C++ edited resources +#include "l.fra\afxres.rc" // Standard components +#endif +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + -- cgit v1.1 From 3a04c6aee7a5b559268024c10f5854287615b62e Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:36 +0000 Subject: Utilisateur : Fcolin Date : 22/12/98 Heure : 16:54 Archivé dans $/Bus/Test Commentaire: modif ligne message a emettre (vss 2) --- IvyProbe/IvyProbe.rc | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.rc b/IvyProbe/IvyProbe.rc index 7d994fc..fd0ef46 100644 --- a/IvyProbe/IvyProbe.rc +++ b/IvyProbe/IvyProbe.rc @@ -83,35 +83,37 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP END -IDD_TEST_DIALOG DIALOGEX 0, 0, 185, 149 +IDD_TEST_DIALOG DIALOGEX 0, 0, 185, 195 STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW CAPTION "Test" FONT 8, "MS Sans Serif" BEGIN - DEFPUSHBUTTON "QUIT",IDOK,128,14,50,14 + PUSHBUTTON "QUIT",IDOK,128,14,50,14 EDITTEXT IDC_BUSNUMBER,13,14,46,14,ES_AUTOHSCROLL | ES_WANTRETURN | ES_NUMBER PUSHBUTTON "Start",IDC_START,71,14,44,14 CONTROL "Slider1",IDC_SLIDER0,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,16,91,10,51 + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,31,92,10,51 CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,30,91,10,51 + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,45,92,10,51 CONTROL "Slider1",IDC_SLIDER3,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,58,91,10,51 + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,73,92,10,51 CONTROL "Slider1",IDC_SLIDER4,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,72,91,10,51 + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,87,92,10,51 CONTROL "Slider1",IDC_SLIDER5,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,86,91,10,51 + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,92,10,51 CONTROL "Slider1",IDC_SLIDER6,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,100,91,10,51 + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,115,92,10,51 CONTROL "Slider1",IDC_SLIDER7,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,114,91,10,51 + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,129,92,10,51 CONTROL "Slider1",IDC_SLIDER2,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,44,91,10,51 + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,59,92,10,51 EDITTEXT IDC_TEXT,7,36,171,52,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MSG,7,147,171,13,ES_MULTILINE | ES_AUTOVSCROLL | + ES_AUTOHSCROLL | ES_WANTRETURN END @@ -179,7 +181,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 178 TOPMARGIN, 7 - BOTTOMMARGIN, 142 + BOTTOMMARGIN, 188 END END #endif // APSTUDIO_INVOKED -- cgit v1.1 From fe1e735f29344487ef9eea71531a1a1048239998 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:38 +0000 Subject: Utilisateur : Fcolin Date : 16/03/99 Heure : 16:22 Archivé dans $/Bus/Test (vss 3) --- IvyProbe/IvyProbe.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.rc b/IvyProbe/IvyProbe.rc index fd0ef46..d6c4699 100644 --- a/IvyProbe/IvyProbe.rc +++ b/IvyProbe/IvyProbe.rc @@ -90,10 +90,10 @@ EXSTYLE WS_EX_APPWINDOW CAPTION "Test" FONT 8, "MS Sans Serif" BEGIN - PUSHBUTTON "QUIT",IDOK,128,14,50,14 - EDITTEXT IDC_BUSNUMBER,13,14,46,14,ES_AUTOHSCROLL | ES_WANTRETURN | + PUSHBUTTON "QUIT",IDOK,160,15,21,14 + EDITTEXT IDC_BUSNUMBER,5,14,125,14,ES_AUTOHSCROLL | ES_WANTRETURN | ES_NUMBER - PUSHBUTTON "Start",IDC_START,71,14,44,14 + PUSHBUTTON "Start",IDC_START,135,15,19,14 CONTROL "Slider1",IDC_SLIDER0,"msctls_trackbar32",TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,31,92,10,51 CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_VERT | -- cgit v1.1 From d8d315cf5a79bd7bcb2284baf2d981ba1f46364d Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:40 +0000 Subject: Utilisateur : Fcolin Date : 6/01/00 Heure : 11:15 Archivé dans $/Bus/Test Commentaire: ajout bind to msg (vss 4) --- IvyProbe/IvyProbe.rc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.rc b/IvyProbe/IvyProbe.rc index d6c4699..f6c07d2 100644 --- a/IvyProbe/IvyProbe.rc +++ b/IvyProbe/IvyProbe.rc @@ -112,8 +112,12 @@ BEGIN TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,59,92,10,51 EDITTEXT IDC_TEXT,7,36,171,52,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MSG,7,147,171,13,ES_MULTILINE | ES_AUTOVSCROLL | + EDITTEXT IDC_MSG,29,147,149,13,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN + EDITTEXT IDC_BIND,29,169,149,13,ES_MULTILINE | ES_AUTOVSCROLL | + ES_AUTOHSCROLL | ES_WANTRETURN + LTEXT "Bind:",IDC_STATIC,7,169,16,8 + LTEXT "Msg:",IDC_STATIC,7,148,14,12 END -- cgit v1.1 From dfb076b5747af6197f7b9bf2b67a62bbaf01e140 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:42 +0000 Subject: Utilisateur : Fcolin Date : 14/03/00 Heure : 11:49 Archivé dans $/Bus/Test Commentaire: modif boite resize et combo box (vss 5) --- IvyProbe/IvyProbe.rc | 60 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 23 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.rc b/IvyProbe/IvyProbe.rc index f6c07d2..6fe385e 100644 --- a/IvyProbe/IvyProbe.rc +++ b/IvyProbe/IvyProbe.rc @@ -83,41 +83,42 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP END -IDD_TEST_DIALOG DIALOGEX 0, 0, 185, 195 -STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_TEST_DIALOG DIALOGEX 0, 0, 157, 205 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW CAPTION "Test" FONT 8, "MS Sans Serif" BEGIN - PUSHBUTTON "QUIT",IDOK,160,15,21,14 - EDITTEXT IDC_BUSNUMBER,5,14,125,14,ES_AUTOHSCROLL | ES_WANTRETURN | + EDITTEXT IDC_BUSNUMBER,7,14,120,14,ES_AUTOHSCROLL | ES_WANTRETURN | ES_NUMBER - PUSHBUTTON "Start",IDC_START,135,15,19,14 + PUSHBUTTON "Start",IDC_START,131,15,19,14 CONTROL "Slider1",IDC_SLIDER0,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,31,92,10,51 + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,7,90,10,51 CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,45,92,10,51 + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,21,90,10,51 CONTROL "Slider1",IDC_SLIDER3,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,73,92,10,51 + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,49,90,10,51 CONTROL "Slider1",IDC_SLIDER4,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,87,92,10,51 + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,63,90,10,51 CONTROL "Slider1",IDC_SLIDER5,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,92,10,51 + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,77,90,10,51 CONTROL "Slider1",IDC_SLIDER6,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,115,92,10,51 + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,91,90,10,51 CONTROL "Slider1",IDC_SLIDER7,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,129,92,10,51 + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,105,90,10,51 CONTROL "Slider1",IDC_SLIDER2,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,59,92,10,51 - EDITTEXT IDC_TEXT,7,36,171,52,ES_MULTILINE | ES_AUTOVSCROLL | + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,35,90,10,51 + EDITTEXT IDC_TEXT,7,36,140,52,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MSG,29,147,149,13,ES_MULTILINE | ES_AUTOVSCROLL | - ES_AUTOHSCROLL | ES_WANTRETURN - EDITTEXT IDC_BIND,29,169,149,13,ES_MULTILINE | ES_AUTOVSCROLL | - ES_AUTOHSCROLL | ES_WANTRETURN - LTEXT "Bind:",IDC_STATIC,7,169,16,8 - LTEXT "Msg:",IDC_STATIC,7,148,14,12 + LTEXT "Bind:",IDC_STATIC_BIND,7,172,16,8 + LTEXT "Msg:",IDC_STATIC_MSG,7,148,16,12 + COMBOBOX IDC_MSG,26,146,100,82,CBS_DROPDOWN | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Send",IDC_SEND,128,145,21,14 + PUSHBUTTON "Bind",IDC_BIND,129,170,21,14 + COMBOBOX IDC_REGEXP,26,171,100,66,CBS_DROPDOWN | CBS_SORT | + WS_VSCROLL | WS_TABSTOP END @@ -183,9 +184,9 @@ BEGIN IDD_TEST_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 178 + RIGHTMARGIN, 150 TOPMARGIN, 7 - BOTTOMMARGIN, 188 + BOTTOMMARGIN, 198 END END #endif // APSTUDIO_INVOKED @@ -193,6 +194,19 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Dialog Info +// + +IDD_TEST_DIALOG DLGINIT +BEGIN + IDC_REGEXP, 0x403, 5, 0 +0x2e28, 0x292a, "\000" + 0 +END + + +///////////////////////////////////////////////////////////////////////////// +// // String Table // -- cgit v1.1 From 9b89bfb02369fae8d44316dce3aafa071a17cfff Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:44 +0000 Subject: Utilisateur : Fcolin Date : 16/03/00 Heure : 9:27 Archivé dans $/Bus/Test (vss 6) --- IvyProbe/IvyProbe.rc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.rc b/IvyProbe/IvyProbe.rc index 6fe385e..c8e8970 100644 --- a/IvyProbe/IvyProbe.rc +++ b/IvyProbe/IvyProbe.rc @@ -90,8 +90,7 @@ EXSTYLE WS_EX_APPWINDOW CAPTION "Test" FONT 8, "MS Sans Serif" BEGIN - EDITTEXT IDC_BUSNUMBER,7,14,120,14,ES_AUTOHSCROLL | ES_WANTRETURN | - ES_NUMBER + EDITTEXT IDC_BUSNUMBER,7,14,120,14,ES_AUTOHSCROLL PUSHBUTTON "Start",IDC_START,131,15,19,14 CONTROL "Slider1",IDC_SLIDER0,"msctls_trackbar32",TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,7,90,10,51 @@ -109,8 +108,6 @@ BEGIN TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,105,90,10,51 CONTROL "Slider1",IDC_SLIDER2,"msctls_trackbar32",TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,35,90,10,51 - EDITTEXT IDC_TEXT,7,36,140,52,ES_MULTILINE | ES_AUTOVSCROLL | - ES_AUTOHSCROLL | ES_READONLY LTEXT "Bind:",IDC_STATIC_BIND,7,172,16,8 LTEXT "Msg:",IDC_STATIC_MSG,7,148,16,12 COMBOBOX IDC_MSG,26,146,100,82,CBS_DROPDOWN | CBS_SORT | @@ -119,6 +116,8 @@ BEGIN PUSHBUTTON "Bind",IDC_BIND,129,170,21,14 COMBOBOX IDC_REGEXP,26,171,100,66,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_TEXT,7,36,143,53,ES_MULTILINE | ES_AUTOVSCROLL | + ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL END -- cgit v1.1 From abaf38bf54043da9aeb1f30359ccbb80939237a3 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:46 +0000 Subject: Utilisateur : Fcolin Date : 14/09/01 Heure : 15:21 Archivé dans $/Bus/Test (vss 7) --- IvyProbe/IvyProbe.rc | 55 ++++++++++++++++++++++------------------------------ 1 file changed, 23 insertions(+), 32 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.rc b/IvyProbe/IvyProbe.rc index c8e8970..37084b3 100644 --- a/IvyProbe/IvyProbe.rc +++ b/IvyProbe/IvyProbe.rc @@ -83,41 +83,32 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP END -IDD_TEST_DIALOG DIALOGEX 0, 0, 157, 205 +IDD_TEST_DIALOG DIALOGEX 0, 0, 158, 165 STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW CAPTION "Test" FONT 8, "MS Sans Serif" BEGIN - EDITTEXT IDC_BUSNUMBER,7,14,120,14,ES_AUTOHSCROLL - PUSHBUTTON "Start",IDC_START,131,15,19,14 - CONTROL "Slider1",IDC_SLIDER0,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,7,90,10,51 - CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,21,90,10,51 - CONTROL "Slider1",IDC_SLIDER3,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,49,90,10,51 - CONTROL "Slider1",IDC_SLIDER4,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,63,90,10,51 - CONTROL "Slider1",IDC_SLIDER5,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,77,90,10,51 - CONTROL "Slider1",IDC_SLIDER6,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,91,90,10,51 - CONTROL "Slider1",IDC_SLIDER7,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,105,90,10,51 - CONTROL "Slider1",IDC_SLIDER2,"msctls_trackbar32",TBS_VERT | - TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,35,90,10,51 - LTEXT "Bind:",IDC_STATIC_BIND,7,172,16,8 - LTEXT "Msg:",IDC_STATIC_MSG,7,148,16,12 - COMBOBOX IDC_MSG,26,146,100,82,CBS_DROPDOWN | CBS_SORT | + EDITTEXT IDC_BUSNUMBER,2,14,120,14,ES_AUTOHSCROLL + PUSHBUTTON "Start",IDC_START,135,15,19,14 + LTEXT "Bind:",IDC_STATIC_BIND,2,142,16,8 + LTEXT "Msg:",IDC_STATIC_MSG,2,118,16,12 + COMBOBOX IDC_MSG,26,115,100,82,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Send",IDC_SEND,128,145,21,14 - PUSHBUTTON "Bind",IDC_BIND,129,170,21,14 - COMBOBOX IDC_REGEXP,26,171,100,66,CBS_DROPDOWN | CBS_SORT | + DEFPUSHBUTTON "Send",IDC_SEND,128,115,21,14 + PUSHBUTTON "Bind",IDC_BIND,133,139,21,14 + COMBOBOX IDC_REGEXP,26,142,100,66,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_TEXT,7,36,143,53,ES_MULTILINE | ES_AUTOVSCROLL | + EDITTEXT IDC_TEXT,2,31,152,53,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL + PUSHBUTTON "<<",IDC_CLOCK_FAST_BACKWARD,2,93,17,14 + PUSHBUTTON "<",IDC_CLOCK_BACKWARD,24,93,17,14 + PUSHBUTTON ">",IDC_CLOCK_START,68,93,17,14 + PUSHBUTTON "||",IDC_CLOCK_PAUSE,46,93,17,14 + PUSHBUTTON ">>",IDC_CLOCK_FORWARD,112,92,17,14 + PUSHBUTTON ">>>",IDC_CLOCK_FAST_FORWARD,134,92,17,14 + PUSHBUTTON ">:",IDC_CLOCK_RATE,90,92,17,14 END @@ -182,10 +173,10 @@ BEGIN IDD_TEST_DIALOG, DIALOG BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 150 - TOPMARGIN, 7 - BOTTOMMARGIN, 198 + LEFTMARGIN, 2 + RIGHTMARGIN, 154 + TOPMARGIN, 1 + BOTTOMMARGIN, 161 END END #endif // APSTUDIO_INVOKED @@ -198,8 +189,8 @@ END IDD_TEST_DIALOG DLGINIT BEGIN - IDC_REGEXP, 0x403, 5, 0 -0x2e28, 0x292a, "\000" + IDC_REGEXP, 0x403, 2, 0 +0x0028, 0 END -- cgit v1.1 From 155f5a275062f69077e2f183b1529d8e21dc32b5 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:48 +0000 Subject: Utilisateur : Fcolin Date : 27/03/02 Heure : 12:29 Archivé dans $/Bus/Test Commentaire: Add file load and save for message (vss 8) --- IvyProbe/IvyProbe.rc | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.rc b/IvyProbe/IvyProbe.rc index 37084b3..efbcb92 100644 --- a/IvyProbe/IvyProbe.rc +++ b/IvyProbe/IvyProbe.rc @@ -88,18 +88,19 @@ STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW CAPTION "Test" +MENU IDR_MENU1 FONT 8, "MS Sans Serif" BEGIN EDITTEXT IDC_BUSNUMBER,2,14,120,14,ES_AUTOHSCROLL PUSHBUTTON "Start",IDC_START,135,15,19,14 LTEXT "Bind:",IDC_STATIC_BIND,2,142,16,8 LTEXT "Msg:",IDC_STATIC_MSG,2,118,16,12 - COMBOBOX IDC_MSG,26,115,100,82,CBS_DROPDOWN | CBS_SORT | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MSG,26,115,100,82,CBS_DROPDOWN | WS_VSCROLL | + WS_TABSTOP DEFPUSHBUTTON "Send",IDC_SEND,128,115,21,14 PUSHBUTTON "Bind",IDC_BIND,133,139,21,14 - COMBOBOX IDC_REGEXP,26,142,100,66,CBS_DROPDOWN | CBS_SORT | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_REGEXP,26,142,100,66,CBS_DROPDOWN | WS_VSCROLL | + WS_TABSTOP EDITTEXT IDC_TEXT,2,31,152,53,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL PUSHBUTTON "<<",IDC_CLOCK_FAST_BACKWARD,2,93,17,14 @@ -189,14 +190,29 @@ END IDD_TEST_DIALOG DLGINIT BEGIN - IDC_REGEXP, 0x403, 2, 0 -0x0028, + IDC_REGEXP, 0x403, 5, 0 +0x2e28, 0x292a, "\000" 0 END ///////////////////////////////////////////////////////////////////////////// // +// Menu +// + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "File" + BEGIN + MENUITEM "Save", FILE_SAVE + MENUITEM "Load", FILE_LOAD + END +END + + +///////////////////////////////////////////////////////////////////////////// +// // String Table // -- cgit v1.1 From 9537a137710e3ed788f3c761ba8e619355bc543f Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:50 +0000 Subject: Utilisateur : Fcolin Date : 13/01/03 Heure : 15:28 Archivé dans $/Bus/IvyProbe Commentaire: (vss 9) --- IvyProbe/IvyProbe.rc | 51 +++++++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 28 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.rc b/IvyProbe/IvyProbe.rc index efbcb92..8336ea0 100644 --- a/IvyProbe/IvyProbe.rc +++ b/IvyProbe/IvyProbe.rc @@ -1,4 +1,4 @@ -//Microsoft Developer Studio generated resource script. +// Microsoft Visual C++ generated resource script. // #include "resource.h" @@ -13,7 +13,7 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// French (France) resources +// Français (France) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) #ifdef _WIN32 @@ -27,18 +27,18 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH // TEXTINCLUDE // -1 TEXTINCLUDE DISCARDABLE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE DISCARDABLE +2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE DISCARDABLE +3 TEXTINCLUDE BEGIN "#define _AFX_NO_SPLITTER_RESOURCES\r\n" "#define _AFX_NO_OLE_RESOURCES\r\n" @@ -65,15 +65,15 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDR_MAINFRAME ICON DISCARDABLE "res\\Test.ico" +IDR_MAINFRAME ICON "res\\Test.ico" ///////////////////////////////////////////////////////////////////////////// // // Dialog // -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 55 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_ABOUTBOX DIALOG 0, 0, 217, 55 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "A propos de Test" FONT 8, "MS Sans Serif" BEGIN @@ -84,12 +84,12 @@ BEGIN END IDD_TEST_DIALOG DIALOGEX 0, 0, 158, 165 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW -CAPTION "Test" +CAPTION "IvyProbe" MENU IDR_MENU1 -FONT 8, "MS Sans Serif" +//FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN EDITTEXT IDC_BUSNUMBER,2,14,120,14,ES_AUTOHSCROLL PUSHBUTTON "Start",IDC_START,135,15,19,14 @@ -113,7 +113,6 @@ BEGIN END -#ifndef _MAC ///////////////////////////////////////////////////////////////////////////// // // Version @@ -136,15 +135,13 @@ BEGIN BEGIN BLOCK "040C04B0" BEGIN - VALUE "CompanyName", "\0" - VALUE "FileDescription", "Application MFC Test\0" - VALUE "FileVersion", "1, 0, 0, 1\0" - VALUE "InternalName", "Test\0" - VALUE "LegalCopyright", "Copyright (C) 1997\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "Test.EXE\0" - VALUE "ProductName", "Application Test\0" - VALUE "ProductVersion", "1, 0, 0, 1\0" + VALUE "FileDescription", "Application MFC Test" + VALUE "FileVersion", "1, 0, 0, 1" + VALUE "InternalName", "Test" + VALUE "LegalCopyright", "Copyright (C) 1997" + VALUE "OriginalFilename", "Test.EXE" + VALUE "ProductName", "Application Test" + VALUE "ProductVersion", "1, 0, 0, 1" END END BLOCK "VarFileInfo" @@ -153,8 +150,6 @@ BEGIN END END -#endif // !_MAC - ///////////////////////////////////////////////////////////////////////////// // @@ -162,7 +157,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE +GUIDELINES DESIGNINFO BEGIN IDD_ABOUTBOX, DIALOG BEGIN @@ -201,7 +196,7 @@ END // Menu // -IDR_MENU1 MENU DISCARDABLE +IDR_MENU1 MENU BEGIN POPUP "File" BEGIN @@ -216,13 +211,13 @@ END // String Table // -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_ABOUTBOX "&A propos de Test..." CG_IDS_SOCKETS_INIT_FAILED "Windows sockets initialization failed." END -#endif // French (France) resources +#endif // Français (France) resources ///////////////////////////////////////////////////////////////////////////// -- cgit v1.1 From 14f30024ed1f99b888f8e075180c9281884d3cdc Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:52 +0000 Subject: Utilisateur : Fcolin Date : 9/04/04 Heure : 16:31 Archivé dans $/Bus/IvyProbe Commentaire: (vss 10) --- IvyProbe/IvyProbe.rc | 71 ++++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 35 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.rc b/IvyProbe/IvyProbe.rc index 8336ea0..354e89e 100644 --- a/IvyProbe/IvyProbe.rc +++ b/IvyProbe/IvyProbe.rc @@ -50,7 +50,7 @@ BEGIN "LANGUAGE 12, 1\r\n" "#pragma code_page(1252)\r\n" "#endif\r\n" - "#include ""res\\Test.rc2"" // non-Microsoft Visual C++ edited resources\r\n" + "#include ""res\\IvyProbe.rc2"" // non-Microsoft Visual C++ edited resources\r\n" "#include ""l.fra\\afxres.rc"" // Standard components\r\n" "#endif\0" END @@ -65,51 +65,45 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDR_MAINFRAME ICON "res\\Test.ico" +IDR_MAINFRAME ICON "res\\IvyProbe.ico" ///////////////////////////////////////////////////////////////////////////// // // Dialog // -IDD_ABOUTBOX DIALOG 0, 0, 217, 55 +IDD_ABOUTBOX DIALOGEX 0, 0, 217, 55 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "A propos de Test" -FONT 8, "MS Sans Serif" +CAPTION "A propos de IvyProbe" +FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20 - LTEXT "Test version 1.0",IDC_STATIC,40,10,119,8,SS_NOPREFIX + LTEXT "IvyProbe version 1.1",IDC_STATIC,40,10,119,8, + SS_NOPREFIX LTEXT "Copyright (C) 1997",IDC_STATIC,40,25,119,8 DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP END -IDD_TEST_DIALOG DIALOGEX 0, 0, 158, 165 +IDD_IVYPROBE_DIALOG DIALOGEX 0, 0, 163, 152 STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW CAPTION "IvyProbe" MENU IDR_MENU1 -//FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN EDITTEXT IDC_BUSNUMBER,2,14,120,14,ES_AUTOHSCROLL - PUSHBUTTON "Start",IDC_START,135,15,19,14 - LTEXT "Bind:",IDC_STATIC_BIND,2,142,16,8 - LTEXT "Msg:",IDC_STATIC_MSG,2,118,16,12 - COMBOBOX IDC_MSG,26,115,100,82,CBS_DROPDOWN | WS_VSCROLL | + PUSHBUTTON "Start",IDC_START,130,15,25,14 + LTEXT "Bind:",IDC_STATIC_BIND,2,135,17,8 + LTEXT "Msg:",IDC_STATIC_MSG,2,117,17,12 + COMBOBOX IDC_MSG,27,117,100,82,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Send",IDC_SEND,128,115,21,14 - PUSHBUTTON "Bind",IDC_BIND,133,139,21,14 - COMBOBOX IDC_REGEXP,26,142,100,66,CBS_DROPDOWN | WS_VSCROLL | + DEFPUSHBUTTON "Send",IDC_SEND,128,116,27,14 + PUSHBUTTON "Bind",IDC_BIND,128,132,27,14 + COMBOBOX IDC_REGEXP,27,133,100,66,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_TEXT,2,31,152,53,ES_MULTILINE | ES_AUTOVSCROLL | - ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL - PUSHBUTTON "<<",IDC_CLOCK_FAST_BACKWARD,2,93,17,14 - PUSHBUTTON "<",IDC_CLOCK_BACKWARD,24,93,17,14 - PUSHBUTTON ">",IDC_CLOCK_START,68,93,17,14 - PUSHBUTTON "||",IDC_CLOCK_PAUSE,46,93,17,14 - PUSHBUTTON ">>",IDC_CLOCK_FORWARD,112,92,17,14 - PUSHBUTTON ">>>",IDC_CLOCK_FAST_FORWARD,134,92,17,14 - PUSHBUTTON ">:",IDC_CLOCK_RATE,90,92,17,14 + EDITTEXT IDC_TEXT,2,31,153,82,ES_MULTILINE | ES_AUTOVSCROLL | + ES_AUTOHSCROLL | ES_NOHIDESEL | ES_READONLY | WS_VSCROLL END @@ -133,20 +127,20 @@ VS_VERSION_INFO VERSIONINFO BEGIN BLOCK "StringFileInfo" BEGIN - BLOCK "040C04B0" + BLOCK "040c04b0" BEGIN - VALUE "FileDescription", "Application MFC Test" + VALUE "FileDescription", "Application IvyProbe" VALUE "FileVersion", "1, 0, 0, 1" VALUE "InternalName", "Test" VALUE "LegalCopyright", "Copyright (C) 1997" - VALUE "OriginalFilename", "Test.EXE" - VALUE "ProductName", "Application Test" + VALUE "OriginalFilename", "IvyProbe.exe" + VALUE "ProductName", "IvyProbe" VALUE "ProductVersion", "1, 0, 0, 1" END END BLOCK "VarFileInfo" BEGIN - VALUE "Traduction", 0x40c, 1200 + VALUE "Translation", 0x40c, 1200 END END @@ -167,12 +161,12 @@ BEGIN BOTTOMMARGIN, 48 END - IDD_TEST_DIALOG, DIALOG + IDD_IVYPROBE_DIALOG, DIALOG BEGIN LEFTMARGIN, 2 - RIGHTMARGIN, 154 + RIGHTMARGIN, 155 TOPMARGIN, 1 - BOTTOMMARGIN, 161 + BOTTOMMARGIN, 148 END END #endif // APSTUDIO_INVOKED @@ -183,7 +177,7 @@ END // Dialog Info // -IDD_TEST_DIALOG DLGINIT +IDD_IVYPROBE_DIALOG DLGINIT BEGIN IDC_REGEXP, 0x403, 5, 0 0x2e28, 0x292a, "\000" @@ -208,12 +202,19 @@ END ///////////////////////////////////////////////////////////////////////////// // +// RT_MANIFEST +// + +IDR_MANIFEST RT_MANIFEST "res\\IvyProbe.manifest" + +///////////////////////////////////////////////////////////////////////////// +// // String Table // STRINGTABLE BEGIN - IDS_ABOUTBOX "&A propos de Test..." + IDS_ABOUTBOX "&A propos de IvyProbe..." CG_IDS_SOCKETS_INIT_FAILED "Windows sockets initialization failed." END @@ -237,7 +238,7 @@ END LANGUAGE 12, 1 #pragma code_page(1252) #endif -#include "res\Test.rc2" // non-Microsoft Visual C++ edited resources +#include "res\IvyProbe.rc2" // non-Microsoft Visual C++ edited resources #include "l.fra\afxres.rc" // Standard components #endif ///////////////////////////////////////////////////////////////////////////// -- cgit v1.1 From 60d4af6dbd1c4eb910205f694e35baa54c45e8bc Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:55 +0000 Subject: Utilisateur : Fcolin Date : 9/08/06 Heure : 16:02 Archivé dans $/Bus/IvyProbe Commentaire: (vss 11) --- IvyProbe/IvyProbe.rc | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.rc b/IvyProbe/IvyProbe.rc index 354e89e..6896394 100644 --- a/IvyProbe/IvyProbe.rc +++ b/IvyProbe/IvyProbe.rc @@ -13,7 +13,7 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Français (France) resources +// French (France) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) #ifdef _WIN32 @@ -78,32 +78,27 @@ CAPTION "A propos de IvyProbe" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20 - LTEXT "IvyProbe version 1.1",IDC_STATIC,40,10,119,8, - SS_NOPREFIX + LTEXT "IvyProbe version 1.1",IDC_STATIC,40,10,119,8,SS_NOPREFIX LTEXT "Copyright (C) 1997",IDC_STATIC,40,25,119,8 DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP END IDD_IVYPROBE_DIALOG DIALOGEX 0, 0, 163, 152 -STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | - WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW CAPTION "IvyProbe" MENU IDR_MENU1 FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - EDITTEXT IDC_BUSNUMBER,2,14,120,14,ES_AUTOHSCROLL + EDITTEXT IDC_BUSNUMBER,4,14,120,14,ES_AUTOHSCROLL PUSHBUTTON "Start",IDC_START,130,15,25,14 - LTEXT "Bind:",IDC_STATIC_BIND,2,135,17,8 - LTEXT "Msg:",IDC_STATIC_MSG,2,117,17,12 - COMBOBOX IDC_MSG,27,117,100,82,CBS_DROPDOWN | WS_VSCROLL | - WS_TABSTOP + LTEXT "Bind:",IDC_STATIC_BIND,4,135,17,8 + LTEXT "Msg:",IDC_STATIC_MSG,4,117,17,12 + COMBOBOX IDC_MSG,27,117,100,82,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Send",IDC_SEND,128,116,27,14 PUSHBUTTON "Bind",IDC_BIND,128,132,27,14 - COMBOBOX IDC_REGEXP,27,133,100,66,CBS_DROPDOWN | WS_VSCROLL | - WS_TABSTOP - EDITTEXT IDC_TEXT,2,31,153,82,ES_MULTILINE | ES_AUTOVSCROLL | - ES_AUTOHSCROLL | ES_NOHIDESEL | ES_READONLY | WS_VSCROLL + COMBOBOX IDC_REGEXP,27,133,100,66,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_TEXT,4,31,151,82,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | ES_READONLY | WS_VSCROLL END @@ -163,7 +158,7 @@ BEGIN IDD_IVYPROBE_DIALOG, DIALOG BEGIN - LEFTMARGIN, 2 + LEFTMARGIN, 4 RIGHTMARGIN, 155 TOPMARGIN, 1 BOTTOMMARGIN, 148 @@ -194,8 +189,10 @@ IDR_MENU1 MENU BEGIN POPUP "File" BEGIN - MENUITEM "Save", FILE_SAVE - MENUITEM "Load", FILE_LOAD + MENUITEM "Save Msg", FILE_SAVE + MENUITEM "Load Msg", FILE_LOAD + MENUITEM "Save Bindings", ID_FILE_SAVEBINDINGS + MENUITEM "Load Bindings", ID_FILE_LOADBINDINGS END END @@ -218,7 +215,7 @@ BEGIN CG_IDS_SOCKETS_INIT_FAILED "Windows sockets initialization failed." END -#endif // Français (France) resources +#endif // French (France) resources ///////////////////////////////////////////////////////////////////////////// -- cgit v1.1 From 21902db0a855e80e6196f9de26d006c85033f49f Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:57 +0000 Subject: Utilisateur : Fcolin Date : 10/02/04 Heure : 17:21 Créé Commentaire: (vss 1) --- IvyProbe/IvyProbe.sln | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 IvyProbe/IvyProbe.sln (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.sln b/IvyProbe/IvyProbe.sln new file mode 100644 index 0000000..22e0629 --- /dev/null +++ b/IvyProbe/IvyProbe.sln @@ -0,0 +1,42 @@ +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IvyProbe", "IvyProbe.vcproj", "{B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Install", "InstIvy\InstIvy.vdproj", "{61A08759-9E99-481F-811D-204553D27E75}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Global + GlobalSection(SourceCodeControl) = preSolution + SccNumberOfProjects = 3 + SccProjectUniqueName0 = IvyProbe.vcproj + SccLocalPath0 = . + CanCheckoutShared = false + SccProjectUniqueName1 = InstIvy\\InstIvy.vdproj + SccProjectName1 = \u0022$/InstIvyProbe\u0022,\u0020IPFAAAAA + SccLocalPath1 = InstIvy + CanCheckoutShared = false + SccLocalPath2 = . + CanCheckoutShared = false + SolutionUniqueID = {CFBC3463-2A25-4A65-99D7-92F0A19DACAB} + EndGlobalSection + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Debug.ActiveCfg = Debug|Win32 + {B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Debug.Build.0 = Debug|Win32 + {B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Release.ActiveCfg = Release|Win32 + {B7F7F0F7-9029-4D1A-8CB4-C42DAF86A21C}.Release.Build.0 = Release|Win32 + {61A08759-9E99-481F-811D-204553D27E75}.Debug.ActiveCfg = Debug + {61A08759-9E99-481F-811D-204553D27E75}.Debug.Build.0 = Debug + {61A08759-9E99-481F-811D-204553D27E75}.Release.ActiveCfg = Release + {61A08759-9E99-481F-811D-204553D27E75}.Release.Build.0 = Release + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal -- cgit v1.1 From 54cd4082bd37482695e2bc2b60a526c0a55fca7e Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:09:59 +0000 Subject: Utilisateur : Fcolin Date : 10/06/02 Heure : 11:34 Créé Commentaire: (vss 1) --- IvyProbe/IvyProbe.vcproj | 205 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) create mode 100644 IvyProbe/IvyProbe.vcproj (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.vcproj b/IvyProbe/IvyProbe.vcproj new file mode 100644 index 0000000..a2a89fc --- /dev/null +++ b/IvyProbe/IvyProbe.vcproj @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.1 From c9c311fa8364e77feaaccf37f31e3fa3585b9e65 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:01 +0000 Subject: Utilisateur : Fcolin Date : 10/06/02 Heure : 13:14 Archivé dans $/Bus/Test Commentaire: (vss 2) --- IvyProbe/IvyProbe.vcproj | 1 - 1 file changed, 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.vcproj b/IvyProbe/IvyProbe.vcproj index a2a89fc..fd395ad 100644 --- a/IvyProbe/IvyProbe.vcproj +++ b/IvyProbe/IvyProbe.vcproj @@ -24,7 +24,6 @@ Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" - RuntimeLibrary="1" UsePrecompiledHeader="3" PrecompiledHeaderThrough="stdafx.h" PrecompiledHeaderFile=".\Debug/Test.pch" -- cgit v1.1 From 24138c5c4cdd7eafc51139877e4ba293a75566cf Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:02 +0000 Subject: Utilisateur : Fcolin Date : 2/07/02 Heure : 15:21 Archivé dans $/Bus/Test Commentaire: (vss 3) --- IvyProbe/IvyProbe.vcproj | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.vcproj b/IvyProbe/IvyProbe.vcproj index fd395ad..ef16f4f 100644 --- a/IvyProbe/IvyProbe.vcproj +++ b/IvyProbe/IvyProbe.vcproj @@ -19,11 +19,14 @@ IntermediateDirectory=".\Debug" ConfigurationType="1" UseOfMFC="2" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + + + -- cgit v1.1 From c5922079b58ea16396e450c376ed77ae65614ad9 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:05 +0000 Subject: Utilisateur : Fcolin Date : 3/10/02 Heure : 10:50 Archivé dans $/Bus/Test Commentaire: (vss 4) --- IvyProbe/IvyProbe.vcproj | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.vcproj b/IvyProbe/IvyProbe.vcproj index ef16f4f..a2a89fc 100644 --- a/IvyProbe/IvyProbe.vcproj +++ b/IvyProbe/IvyProbe.vcproj @@ -19,14 +19,12 @@ IntermediateDirectory=".\Debug" ConfigurationType="1" UseOfMFC="2" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="FALSE"> - - - -- cgit v1.1 From 30805533c3cbb4e9a718930b584ba70580e3cbb2 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:06 +0000 Subject: Utilisateur : Fcolin Date : 3/10/02 Heure : 12:09 Archivé dans $/Bus/Test Commentaire: (vss 5) --- IvyProbe/IvyProbe.vcproj | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.vcproj b/IvyProbe/IvyProbe.vcproj index a2a89fc..3195334 100644 --- a/IvyProbe/IvyProbe.vcproj +++ b/IvyProbe/IvyProbe.vcproj @@ -2,7 +2,7 @@ @@ -70,7 +70,7 @@ + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "C:\users\fcolin\Program Files\$(OutDir)" + +"/> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "C:\users\fcolin\Program Files\$(OutDir)" + +"/> + RelativePath="ETSLayout.cpp"> @@ -140,12 +147,14 @@ Name="Debug|Win32"> @@ -163,7 +172,7 @@ Name="Header Files" Filter="h;hpp;hxx;hm;inl"> + RelativePath="ETSLayout.h"> -- cgit v1.1 From da6d688aed1e2eb8847f4c18ae0b4cdf0f96123f Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:12 +0000 Subject: Utilisateur : Fcolin Date : 9/04/04 Heure : 16:31 Archivé dans $/Bus/IvyProbe Commentaire: (vss 8) --- IvyProbe/IvyProbe.vcproj | 76 ++++++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 31 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.vcproj b/IvyProbe/IvyProbe.vcproj index 96d73a8..0d1aa35 100644 --- a/IvyProbe/IvyProbe.vcproj +++ b/IvyProbe/IvyProbe.vcproj @@ -1,8 +1,9 @@ - + + Name="VCPostBuildEventTool"/> + + + + Name="VCPostBuildEventTool"/> + + + + + + RelativePath=".\ETSLayout.cpp"> + + + + - - - - @@ -172,22 +179,22 @@ Name="Header Files" Filter="h;hpp;hxx;hm;inl"> + RelativePath=".\ETSLayout.h"> + RelativePath="IvyProbe.h"> + RelativePath="IvyProbeDlg.h"> + RelativePath=".\Resource.h"> + RelativePath=".\StdAfx.h"> @@ -197,16 +204,23 @@ Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"> + RelativePath="res\IvyProbe.ico"> + + + RelativePath="IvyProbe.rc"> + RelativePath="res\IvyProbe.rc2"> + + -- cgit v1.1 From 027ec854a16e688a6d9566840b948153ecbc37ed Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:15 +0000 Subject: Utilisateur : Fcolin Date : 3/03/05 Heure : 14:10 Archivé dans $/Bus/IvyProbe Commentaire: (vss 9) --- IvyProbe/IvyProbe.vcproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.vcproj b/IvyProbe/IvyProbe.vcproj index 0d1aa35..51eb42d 100644 --- a/IvyProbe/IvyProbe.vcproj +++ b/IvyProbe/IvyProbe.vcproj @@ -24,7 +24,7 @@ @@ -86,7 +87,7 @@ + Keyword="MFCProj" + > + Name="Win32" + /> + + + + ATLMinimizesCRunTimeLibraryUsage="false" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> + + + Name="VCPreLinkEventTool" + /> + SuppressStartupBanner="true" + AdditionalLibraryDirectories="" + GenerateDebugInformation="true" + SubSystem="2" + /> + + + + + + + + + + + + + + + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="3" + TypeLibraryName=".\Debug/Test.tlb" + /> - + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\Ivy;"..\..\..\pcre-6.4"" + PreprocessorDefinitions="USE_ETS" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="stdafx.h" + BrowseInformation="1" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + Culture="1036" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLinkerTool" + LinkIncremental="2" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="" + GenerateDebugInformation="true" + SubSystem="2" + TargetMachine="17" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + + + + + + ATLMinimizesCRunTimeLibraryUsage="false" + > + + + + + + SuppressStartupBanner="true" + /> + Name="VCManagedResourceCompilerTool" + /> + + + SubSystem="2" + /> + + + + + + + + + + + + + + + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="3" + TypeLibraryName=".\Release/Test.tlb" + /> - + Name="VCCLCompilerTool" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\Ivy;"..\..\..\pcre-6.4"" + PreprocessorDefinitions="USE_ETS" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="2" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + /> + Name="VCManagedResourceCompilerTool" + /> + Culture="1036" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLinkerTool" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="" + SubSystem="2" + TargetMachine="17" + /> + + + + + + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> + + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + RelativePath=".\ETSLayout.cpp" + > + RelativePath=".\HistoryEdit.cpp" + > + RelativePath="IvyProbe.cpp" + > + RelativePath="IvyProbeDlg.cpp" + > + RelativePath=".\StdAfx.cpp" + > + Name="Debug|Win32" + > + UsePrecompiledHeader="1" + /> + Name="Debug|x64" + > + UsePrecompiledHeader="1" + /> + + + + + + + RelativePath=".\TestParseCmdLine.cpp" + > + Filter="h;hpp;hxx;hm;inl" + > + RelativePath=".\ETSLayout.h" + > + RelativePath=".\HistoryEdit.h" + > + RelativePath="IvyProbe.h" + > + RelativePath="IvyProbeDlg.h" + > + RelativePath=".\Resource.h" + > + RelativePath=".\StdAfx.h" + > + RelativePath=".\TestParseCmdLine.h" + > + Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" + > + RelativePath="res\IvyProbe.ico" + > + RelativePath="res\IvyProbe.manifest" + > + + + + + + + + + + + + + RelativePath="IvyProbe.rc" + > + RelativePath="res\IvyProbe.rc2" + > + DeploymentContent="true" + > + + + + + + + + + + + + + RelativePath=".\ReadMe.txt" + > -- cgit v1.1 From eb995a25295f2b9c2ba74c6cadc9f049f6951fca Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:19 +0000 Subject: Utilisateur : Fcolin Date : 2/12/05 Heure : 10:00 Archivé dans $/Bus/IvyProbe Commentaire: (vss 11) --- IvyProbe/IvyProbe.vcproj | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.vcproj b/IvyProbe/IvyProbe.vcproj index 542fa9f..062ca7d 100644 --- a/IvyProbe/IvyProbe.vcproj +++ b/IvyProbe/IvyProbe.vcproj @@ -524,43 +524,6 @@ - - - - - - - - - - - - - - -- cgit v1.1 From 884803b2b27f112951e44079d965f81b7cf80316 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:20 +0000 Subject: Utilisateur : Fcolin Date : 9/08/06 Heure : 16:02 Archivé dans $/Bus/IvyProbe Commentaire: (vss 12) --- IvyProbe/IvyProbe.vcproj | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.vcproj b/IvyProbe/IvyProbe.vcproj index 062ca7d..cdf5dda 100644 --- a/IvyProbe/IvyProbe.vcproj +++ b/IvyProbe/IvyProbe.vcproj @@ -197,8 +197,8 @@ + -- cgit v1.1 From b37b4249097a0bdc44980010e1f93ba973ab6163 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:23 +0000 Subject: Utilisateur : Fcolin Date : 10/06/02 Heure : 13:14 Créé Commentaire: (vss 1) --- IvyProbe/IvyProbe.vcproj.vspscc | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 IvyProbe/IvyProbe.vcproj.vspscc (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.vcproj.vspscc b/IvyProbe/IvyProbe.vcproj.vspscc new file mode 100644 index 0000000..794f014 --- /dev/null +++ b/IvyProbe/IvyProbe.vcproj.vspscc @@ -0,0 +1,10 @@ +"" +{ +"FILE_VERSION" = "9237" +"ENLISTMENT_CHOICE" = "NEVER" +"PROJECT_FILE_RELATIVE_PATH" = "" +"NUMBER_OF_EXCLUDED_FILES" = "0" +"ORIGINAL_PROJECT_FILE_PATH" = "" +"NUMBER_OF_NESTED_PROJECTS" = "0" +"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROJECT" +} -- cgit v1.1 From da8a2ef0f8687b734e0fefe83cc62d5a223144ba Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:25 +0000 Subject: Utilisateur : Fcolin Date : 10/02/04 Heure : 17:21 Créé Commentaire: (vss 1) --- IvyProbe/IvyProbe.vssscc | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 IvyProbe/IvyProbe.vssscc (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbe.vssscc b/IvyProbe/IvyProbe.vssscc new file mode 100644 index 0000000..794f014 --- /dev/null +++ b/IvyProbe/IvyProbe.vssscc @@ -0,0 +1,10 @@ +"" +{ +"FILE_VERSION" = "9237" +"ENLISTMENT_CHOICE" = "NEVER" +"PROJECT_FILE_RELATIVE_PATH" = "" +"NUMBER_OF_EXCLUDED_FILES" = "0" +"ORIGINAL_PROJECT_FILE_PATH" = "" +"NUMBER_OF_NESTED_PROJECTS" = "0" +"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROJECT" +} -- cgit v1.1 From b123c857a242e591ec02fbf73cadb7bc2b5b2fdf Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:27 +0000 Subject: Utilisateur : Fcolin Date : 18/12/98 Heure : 18:48 Créé (vss 1) --- IvyProbe/IvyProbeDlg.cpp | 315 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 315 insertions(+) create mode 100644 IvyProbe/IvyProbeDlg.cpp (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp new file mode 100644 index 0000000..cea28e4 --- /dev/null +++ b/IvyProbe/IvyProbeDlg.cpp @@ -0,0 +1,315 @@ +// TestDlg.cpp : implementation file +// + +#include "stdafx.h" +#include "Test.h" +#include "TestDlg.h" + +#include "BusApplication.h" + +#ifdef _DEBUG +#define new DEBUG_NEW +#undef THIS_FILE +static char THIS_FILE[] = __FILE__; +#endif + + +///////////////////////////////////////////////////////////////////////////// +// CAboutDlg dialog used for App About + +class CAboutDlg : public CDialog +{ +public: + CAboutDlg(); + +// Dialog Data + //{{AFX_DATA(CAboutDlg) + enum { IDD = IDD_ABOUTBOX }; + //}}AFX_DATA + + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(CAboutDlg) + protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + //}}AFX_VIRTUAL + +// Implementation +protected: + //{{AFX_MSG(CAboutDlg) + //}}AFX_MSG + DECLARE_MESSAGE_MAP() +}; + +CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD) +{ + //{{AFX_DATA_INIT(CAboutDlg) + //}}AFX_DATA_INIT +} + +void CAboutDlg::DoDataExchange(CDataExchange* pDX) +{ + CDialog::DoDataExchange(pDX); + //{{AFX_DATA_MAP(CAboutDlg) + //}}AFX_DATA_MAP +} + +BEGIN_MESSAGE_MAP(CAboutDlg, CDialog) + //{{AFX_MSG_MAP(CAboutDlg) + // No message handlers + //}}AFX_MSG_MAP +END_MESSAGE_MAP() + +///////////////////////////////////////////////////////////////////////////// +// CTestDlg dialog + +CTestDlg::CTestDlg(CWnd* pParent /*=NULL*/) + : CDialog(CTestDlg::IDD, pParent) +{ + //{{AFX_DATA_INIT(CTestDlg) + m_busnumber = 0; + //}}AFX_DATA_INIT + // Note that LoadIcon does not require a subsequent DestroyIcon in Win32 + m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME); + + +} + +void CTestDlg::DoDataExchange(CDataExchange* pDX) +{ + CDialog::DoDataExchange(pDX); + //{{AFX_DATA_MAP(CTestDlg) + DDX_Control(pDX, IDC_TEXT, m_text); + DDX_Control(pDX, IDC_SLIDER7, m_slider7); + DDX_Control(pDX, IDC_SLIDER6, m_slider6); + DDX_Control(pDX, IDC_SLIDER5, m_slider5); + DDX_Control(pDX, IDC_SLIDER4, m_slider4); + DDX_Control(pDX, IDC_SLIDER3, m_slider3); + DDX_Control(pDX, IDC_SLIDER2, m_slider2); + DDX_Control(pDX, IDC_SLIDER1, m_slider1); + DDX_Control(pDX, IDC_SLIDER0, m_slider0); + DDX_Text(pDX, IDC_BUSNUMBER, m_busnumber); + DDV_MinMaxUInt(pDX, m_busnumber, 1024, 65535); + //}}AFX_DATA_MAP +} + +BEGIN_MESSAGE_MAP(CTestDlg, CDialog) + //{{AFX_MSG_MAP(CTestDlg) + ON_WM_SYSCOMMAND() + ON_WM_PAINT() + ON_WM_QUERYDRAGICON() + ON_BN_CLICKED(IDC_START, OnStart) + ON_WM_VSCROLL() + //}}AFX_MSG_MAP +END_MESSAGE_MAP() + +///////////////////////////////////////////////////////////////////////////// +// CTestDlg message handlers + +BOOL CTestDlg::OnInitDialog() +{ + CDialog::OnInitDialog(); + + // Add "About..." menu item to system menu. + + // IDM_ABOUTBOX must be in the system command range. + ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX); + ASSERT(IDM_ABOUTBOX < 0xF000); + + CMenu* pSysMenu = GetSystemMenu(FALSE); + if (pSysMenu != NULL) + { + CString strAboutMenu; + strAboutMenu.LoadString(IDS_ABOUTBOX); + if (!strAboutMenu.IsEmpty()) + { + pSysMenu->AppendMenu(MF_SEPARATOR); + pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu); + } + } + + // Set the icon for this dialog. The framework does this automatically + // when the application's main window is not a dialog + SetIcon(m_hIcon, TRUE); // Set big icon + SetIcon(m_hIcon, FALSE); // Set small icon + + // TODO: Add extra initialization here + m_busnumber = 2010; + UpdateData(FALSE); + + m_slider0.SetRange( 0, 127); + m_slider1.SetRange( 0, 127); + m_slider2.SetRange( 0, 127); + m_slider3.SetRange( 0, 127); + m_slider4.SetRange( 0, 127); + m_slider5.SetRange( 0, 127); + m_slider6.SetRange( 0, 127); + m_slider7.SetRange( 0, 127); + + m_slider0.SetWindowText( "MIDICS10:fader0 value=" ); + m_slider1.SetWindowText( "MIDICS10:fader1 value=" ); + m_slider2.SetWindowText( "MIDICS10:fader2 value=" ); + m_slider3.SetWindowText( "MIDICS10:fader3 value=" ); + m_slider4.SetWindowText( "MIDICS10:fader4 value=" ); + m_slider5.SetWindowText( "MIDICS10:fader5 value=" ); + m_slider6.SetWindowText( "MIDICS10:fader6 value=" ); + m_slider7.SetWindowText( "MIDICS10:fader7 value=" ); + + return TRUE; // return TRUE unless you set the focus to a control +} + +void CTestDlg::OnSysCommand(UINT nID, LPARAM lParam) +{ + if ((nID & 0xFFF0) == IDM_ABOUTBOX) + { + CAboutDlg dlgAbout; + dlgAbout.DoModal(); + } + else + { + CDialog::OnSysCommand(nID, lParam); + } +} + +// If you add a minimize button to your dialog, you will need the code below +// to draw the icon. For MFC applications using the document/view model, +// this is automatically done for you by the framework. + +void CTestDlg::OnPaint() +{ + if (IsIconic()) + { + CPaintDC dc(this); // device context for painting + + SendMessage(WM_ICONERASEBKGND, (WPARAM) dc.GetSafeHdc(), 0); + + // Center icon in client rectangle + int cxIcon = GetSystemMetrics(SM_CXICON); + int cyIcon = GetSystemMetrics(SM_CYICON); + CRect rect; + GetClientRect(&rect); + int x = (rect.Width() - cxIcon + 1) / 2; + int y = (rect.Height() - cyIcon + 1) / 2; + + // Draw the icon + dc.DrawIcon(x, y, m_hIcon); + } + else + { + CDialog::OnPaint(); + } +} + +// The system calls this to obtain the cursor to display while the user drags +// the minimized window. +HCURSOR CTestDlg::OnQueryDragIcon() +{ + return (HCURSOR) m_hIcon; +} + +void CTestDlg::OnStart() +{ + UpdateData(TRUE); + bus = new Bus( "TEST NT", m_busnumber,"TEST NT READY",new BusApplicationCallbackOf(this, ApplicationCallback)); + BusMessageCallbackOf *fader; + fader = new BusMessageCallbackOf(this, FaderCallback ); + + bus->BindMsg("^MIDICS10:fader([0-7]) value=([0-9]+)",fader); + bus->BindMsg("^MIDICS10:knob([0-5]) value=([0-9]+)",fader); + //bus->BindMsg("^S( A=([0-9]+))?( B=([0-9]+))?",cb); + bus->start(); +} + +void CTestDlg::BusCallback(BusApplication *app, int argc, const char **argv) +{ + int i; + CString text; + TRACE(" Called function args:"); + m_text.SetSel( -1, -1, TRUE ); + text.Format("Bus callback %d args\r\n",argc ); + m_text.ReplaceSel( text ); + for ( i = 0; i < argc; i++ ) + { + m_text.SetSel( -1, -1, TRUE ); + text.Format("Bus callback arg%d '%s'\r\n",i, argv[i] ); + m_text.ReplaceSel( text ); + TRACE(" '%s'",argv[i]); + } + TRACE("\n"); + +} + +void CTestDlg::OnOK() +{ + // TODO: Add extra validation here + delete bus; + CDialog::OnOK(); +} + +void CTestDlg::FaderCallback(BusApplication *app, int argc, const char **argv) +{ +int fader; +int value; +if ( argc != 2 ) + { + TRACE("bad Fader call back\n"); + return; + } + fader = atoi( argv[0] ); + value = atoi( argv[1] ); + switch ( fader ) { + case 0: + m_slider0.SetPos( value ); + break; + case 1: + m_slider1.SetPos( value ); + break; + case 2: + m_slider2.SetPos( value ); + break; + case 3: + m_slider3.SetPos( value ); + break; + case 4: + m_slider4.SetPos( value ); + break; + case 5: + m_slider5.SetPos( value ); + break; + case 6: + m_slider6.SetPos( value ); + break; + case 7: + m_slider7.SetPos( value ); + break; +} +UpdateData(FALSE); + +} + +void CTestDlg::DirectCallback(BusApplication *app, int id, const char *arg) +{ +TRACE("Direct Msg Receive %d, %s\n",id,arg ); +} + +void CTestDlg::ApplicationCallback(BusApplication *app, int event) +{ + CString text; + m_text.SetSel( -1, -1, TRUE ); + text.Format("Application: %s %s\r\n",(LPCSTR)(app->GetName()), event ? "bye" : "ready" ); + m_text.ReplaceSel( text ); +} + + +void CTestDlg::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) +{ + // TODO: Add your message handler code here and/or call default + CSliderCtrl *slider = (CSliderCtrl *)pScrollBar; + CString text; + CString value; + slider->GetWindowText( text ); + value.Format("%d",slider->GetPos()); + text += value; + TRACE("%s\n",(LPCSTR)text ); + bus->SendMsg( text ); + CDialog::OnVScroll(nSBCode, nPos, pScrollBar); +} -- cgit v1.1 From 61f0cf6e2dc786e051b5e5b0132dd45760ef8deb Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:28 +0000 Subject: Utilisateur : Fcolin Date : 22/12/98 Heure : 16:54 Archivé dans $/Bus/Test Commentaire: modif ligne message a emettre (vss 2) --- IvyProbe/IvyProbeDlg.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index cea28e4..be948ac 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -78,6 +78,7 @@ void CTestDlg::DoDataExchange(CDataExchange* pDX) { CDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CTestDlg) + DDX_Control(pDX, IDC_MSG, m_msgToSend); DDX_Control(pDX, IDC_TEXT, m_text); DDX_Control(pDX, IDC_SLIDER7, m_slider7); DDX_Control(pDX, IDC_SLIDER6, m_slider6); @@ -99,6 +100,7 @@ BEGIN_MESSAGE_MAP(CTestDlg, CDialog) ON_WM_QUERYDRAGICON() ON_BN_CLICKED(IDC_START, OnStart) ON_WM_VSCROLL() + ON_EN_VSCROLL(IDC_MSG, OnVscrollMsg) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -215,6 +217,8 @@ void CTestDlg::OnStart() bus->BindMsg("^MIDICS10:fader([0-7]) value=([0-9]+)",fader); bus->BindMsg("^MIDICS10:knob([0-5]) value=([0-9]+)",fader); + bus->BindMsg("(.*)",new BusMessageCallbackOf(this, BusCallback )); + //bus->BindMsg("^S( A=([0-9]+))?( B=([0-9]+))?",cb); bus->start(); } @@ -313,3 +317,20 @@ void CTestDlg::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) bus->SendMsg( text ); CDialog::OnVScroll(nSBCode, nPos, pScrollBar); } + +void CTestDlg::OnVscrollMsg() +{ + // TODO: Add your control notification handler code here + char buffer[200]; + int line = m_msgToSend.GetFirstVisibleLine( ) -1 ; + if ( line >= 0 ) + { + int len = m_msgToSend.GetLine( line , buffer, sizeof(buffer)-1); + if ( len ) + { + buffer[len] = '\0'; + TRACE("IDC MSG Scroll %d len= %d %s\n",line,len, buffer); + bus->SendMsg( buffer ); + } + } +} -- cgit v1.1 From 16d8c9bef9a0dd034435c4c463baf3d8bacc3339 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:30 +0000 Subject: Utilisateur : Fcolin Date : 12/03/99 Heure : 18:52 Archivé dans $/Bus/Test (vss 3) --- IvyProbe/IvyProbeDlg.cpp | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index be948ac..2112270 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -211,13 +211,11 @@ HCURSOR CTestDlg::OnQueryDragIcon() void CTestDlg::OnStart() { UpdateData(TRUE); - bus = new Bus( "TEST NT", m_busnumber,"TEST NT READY",new BusApplicationCallbackOf(this, ApplicationCallback)); - BusMessageCallbackOf *fader; - fader = new BusMessageCallbackOf(this, FaderCallback ); - - bus->BindMsg("^MIDICS10:fader([0-7]) value=([0-9]+)",fader); - bus->BindMsg("^MIDICS10:knob([0-5]) value=([0-9]+)",fader); - bus->BindMsg("(.*)",new BusMessageCallbackOf(this, BusCallback )); + bus = new Bus( "TEST NT", m_busnumber,"TEST NT READY",this); + + bus->BindMsg("^MIDICS10:fader([0-7]) value=([0-9]+)", BUS_CALLBACK_OF(CTestDlg, FaderCallback)); + bus->BindMsg("^MIDICS10:knob([0-5]) value=([0-9]+)", BUS_CALLBACK_OF(CTestDlg, FaderCallback)); + bus->BindMsg("(.*)", BUS_CALLBACK_OF(CTestDlg, BusCallback )); //bus->BindMsg("^S( A=([0-9]+))?( B=([0-9]+))?",cb); bus->start(); @@ -228,14 +226,14 @@ void CTestDlg::BusCallback(BusApplication *app, int argc, const char **argv) int i; CString text; TRACE(" Called function args:"); - m_text.SetSel( -1, -1, TRUE ); +// m_text.SetSel( -1, -1, FALSE ); text.Format("Bus callback %d args\r\n",argc ); - m_text.ReplaceSel( text ); +// m_text.ReplaceSel( text ); for ( i = 0; i < argc; i++ ) { - m_text.SetSel( -1, -1, TRUE ); +// m_text.SetSel( -1, -1, FALSE ); text.Format("Bus callback arg%d '%s'\r\n",i, argv[i] ); - m_text.ReplaceSel( text ); +// m_text.ReplaceSel( text ); TRACE(" '%s'",argv[i]); } TRACE("\n"); @@ -290,19 +288,25 @@ UpdateData(FALSE); } -void CTestDlg::DirectCallback(BusApplication *app, int id, const char *arg) +void CTestDlg::OnDirectMessage(BusApplication *app, int id, const char *arg) { TRACE("Direct Msg Receive %d, %s\n",id,arg ); } -void CTestDlg::ApplicationCallback(BusApplication *app, int event) +void CTestDlg::OnApplicationConnected(BusApplication *app) { CString text; - m_text.SetSel( -1, -1, TRUE ); - text.Format("Application: %s %s\r\n",(LPCSTR)(app->GetName()), event ? "bye" : "ready" ); + m_text.SetSel( -1, -1, FALSE ); + text.Format("Application: %s ready\r\n",(LPCSTR)(app->GetName()) ); + m_text.ReplaceSel( text ); +} +void CTestDlg::OnApplicationDisconnected(BusApplication *app) +{ + CString text; + m_text.SetSel( -1, -1, FALSE ); + text.Format("Application: %s bye\r\n",(LPCSTR)(app->GetName()) ); m_text.ReplaceSel( text ); } - void CTestDlg::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) { -- cgit v1.1 From 472fdb6d65fdea0c4cccbe6691162ecbcef1d240 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:32 +0000 Subject: Utilisateur : Fcolin Date : 16/03/99 Heure : 16:22 Archivé dans $/Bus/Test (vss 4) --- IvyProbe/IvyProbeDlg.cpp | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index 2112270..998c5dc 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -5,7 +5,7 @@ #include "Test.h" #include "TestDlg.h" -#include "BusApplication.h" +#include "IvyApplication.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -66,7 +66,7 @@ CTestDlg::CTestDlg(CWnd* pParent /*=NULL*/) : CDialog(CTestDlg::IDD, pParent) { //{{AFX_DATA_INIT(CTestDlg) - m_busnumber = 0; + m_busnumber = ""; //}}AFX_DATA_INIT // Note that LoadIcon does not require a subsequent DestroyIcon in Win32 m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME); @@ -89,7 +89,6 @@ void CTestDlg::DoDataExchange(CDataExchange* pDX) DDX_Control(pDX, IDC_SLIDER1, m_slider1); DDX_Control(pDX, IDC_SLIDER0, m_slider0); DDX_Text(pDX, IDC_BUSNUMBER, m_busnumber); - DDV_MinMaxUInt(pDX, m_busnumber, 1024, 65535); //}}AFX_DATA_MAP } @@ -135,7 +134,14 @@ BOOL CTestDlg::OnInitDialog() SetIcon(m_hIcon, FALSE); // Set small icon // TODO: Add extra initialization here - m_busnumber = 2010; + bus = new Ivy( "TEST NT","TEST NT READY",this); + + bus->BindMsg("^MIDICS10:fader([0-7]) value=([0-9]+)", BUS_CALLBACK_OF(CTestDlg, FaderCallback)); + bus->BindMsg("^MIDICS10:knob([0-5]) value=([0-9]+)", BUS_CALLBACK_OF(CTestDlg, FaderCallback)); + bus->BindMsg("(.*)", BUS_CALLBACK_OF(CTestDlg, IvyCallback )); + + //bus->BindMsg("^S( A=([0-9]+))?( B=([0-9]+))?",cb); + m_busnumber = bus->GetDomain( m_busnumber ); UpdateData(FALSE); m_slider0.SetRange( 0, 127); @@ -211,29 +217,25 @@ HCURSOR CTestDlg::OnQueryDragIcon() void CTestDlg::OnStart() { UpdateData(TRUE); - bus = new Bus( "TEST NT", m_busnumber,"TEST NT READY",this); - - bus->BindMsg("^MIDICS10:fader([0-7]) value=([0-9]+)", BUS_CALLBACK_OF(CTestDlg, FaderCallback)); - bus->BindMsg("^MIDICS10:knob([0-5]) value=([0-9]+)", BUS_CALLBACK_OF(CTestDlg, FaderCallback)); - bus->BindMsg("(.*)", BUS_CALLBACK_OF(CTestDlg, BusCallback )); - - //bus->BindMsg("^S( A=([0-9]+))?( B=([0-9]+))?",cb); - bus->start(); + bus->stop(); + m_busnumber = bus->GetDomain( m_busnumber ); + bus->start(m_busnumber); + UpdateData(FALSE); } -void CTestDlg::BusCallback(BusApplication *app, int argc, const char **argv) +void CTestDlg::IvyCallback(IvyApplication *app, int argc, const char **argv) { int i; CString text; TRACE(" Called function args:"); -// m_text.SetSel( -1, -1, FALSE ); - text.Format("Bus callback %d args\r\n",argc ); -// m_text.ReplaceSel( text ); + m_text.SetSel( -1, -1, FALSE ); + text.Format("Ivy callback %d args\r\n",argc ); + m_text.ReplaceSel( text ); for ( i = 0; i < argc; i++ ) { -// m_text.SetSel( -1, -1, FALSE ); - text.Format("Bus callback arg%d '%s'\r\n",i, argv[i] ); -// m_text.ReplaceSel( text ); + m_text.SetSel( -1, -1, FALSE ); + text.Format("Ivy callback arg%d '%s'\r\n",i, argv[i] ); + m_text.ReplaceSel( text ); TRACE(" '%s'",argv[i]); } TRACE("\n"); @@ -247,7 +249,7 @@ void CTestDlg::OnOK() CDialog::OnOK(); } -void CTestDlg::FaderCallback(BusApplication *app, int argc, const char **argv) +void CTestDlg::FaderCallback(IvyApplication *app, int argc, const char **argv) { int fader; int value; @@ -288,19 +290,19 @@ UpdateData(FALSE); } -void CTestDlg::OnDirectMessage(BusApplication *app, int id, const char *arg) +void CTestDlg::OnDirectMessage(IvyApplication *app, int id, const char *arg) { TRACE("Direct Msg Receive %d, %s\n",id,arg ); } -void CTestDlg::OnApplicationConnected(BusApplication *app) +void CTestDlg::OnApplicationConnected(IvyApplication *app) { CString text; m_text.SetSel( -1, -1, FALSE ); text.Format("Application: %s ready\r\n",(LPCSTR)(app->GetName()) ); m_text.ReplaceSel( text ); } -void CTestDlg::OnApplicationDisconnected(BusApplication *app) +void CTestDlg::OnApplicationDisconnected(IvyApplication *app) { CString text; m_text.SetSel( -1, -1, FALSE ); -- cgit v1.1 From 96b784c956f7f266987e03a573a58fdb8e4c3fb3 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:34 +0000 Subject: Utilisateur : Fcolin Date : 29/07/99 Heure : 16:46 Archivé dans $/Bus/Test (vss 5) --- IvyProbe/IvyProbeDlg.cpp | 71 ++++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 27 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index 998c5dc..c37ee48 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -71,7 +71,7 @@ CTestDlg::CTestDlg(CWnd* pParent /*=NULL*/) // Note that LoadIcon does not require a subsequent DestroyIcon in Win32 m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME); - + bus = NULL; } void CTestDlg::DoDataExchange(CDataExchange* pDX) @@ -100,6 +100,7 @@ BEGIN_MESSAGE_MAP(CTestDlg, CDialog) ON_BN_CLICKED(IDC_START, OnStart) ON_WM_VSCROLL() ON_EN_VSCROLL(IDC_MSG, OnVscrollMsg) + ON_WM_CLOSE() //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -134,16 +135,6 @@ BOOL CTestDlg::OnInitDialog() SetIcon(m_hIcon, FALSE); // Set small icon // TODO: Add extra initialization here - bus = new Ivy( "TEST NT","TEST NT READY",this); - - bus->BindMsg("^MIDICS10:fader([0-7]) value=([0-9]+)", BUS_CALLBACK_OF(CTestDlg, FaderCallback)); - bus->BindMsg("^MIDICS10:knob([0-5]) value=([0-9]+)", BUS_CALLBACK_OF(CTestDlg, FaderCallback)); - bus->BindMsg("(.*)", BUS_CALLBACK_OF(CTestDlg, IvyCallback )); - - //bus->BindMsg("^S( A=([0-9]+))?( B=([0-9]+))?",cb); - m_busnumber = bus->GetDomain( m_busnumber ); - UpdateData(FALSE); - m_slider0.SetRange( 0, 127); m_slider1.SetRange( 0, 127); m_slider2.SetRange( 0, 127); @@ -161,6 +152,18 @@ BOOL CTestDlg::OnInitDialog() m_slider5.SetWindowText( "MIDICS10:fader5 value=" ); m_slider6.SetWindowText( "MIDICS10:fader6 value=" ); m_slider7.SetWindowText( "MIDICS10:fader7 value=" ); + + bus = new Ivy( "TEST NT","TEST NT READY",this); + + bus->BindMsg("^MIDICS10:fader([0-7]) value=([0-9]+)", BUS_CALLBACK_OF(CTestDlg, FaderCallback)); + bus->BindMsg("^MIDICS10:knob([0-5]) value=([0-9]+)", BUS_CALLBACK_OF(CTestDlg, FaderCallback)); + bus->BindMsg("(.*)", BUS_CALLBACK_OF(CTestDlg, IvyCallback )); + + //bus->BindMsg("^S( A=([0-9]+))?( B=([0-9]+))?",cb); + m_busnumber = bus->GetDomain( m_busnumber ); + UpdateData(FALSE); + + return TRUE; // return TRUE unless you set the focus to a control } @@ -228,26 +231,18 @@ void CTestDlg::IvyCallback(IvyApplication *app, int argc, const char **argv) int i; CString text; TRACE(" Called function args:"); - m_text.SetSel( -1, -1, FALSE ); text.Format("Ivy callback %d args\r\n",argc ); - m_text.ReplaceSel( text ); + WriteMessage( text ); for ( i = 0; i < argc; i++ ) { - m_text.SetSel( -1, -1, FALSE ); text.Format("Ivy callback arg%d '%s'\r\n",i, argv[i] ); - m_text.ReplaceSel( text ); + WriteMessage( text ); TRACE(" '%s'",argv[i]); } TRACE("\n"); } -void CTestDlg::OnOK() -{ - // TODO: Add extra validation here - delete bus; - CDialog::OnOK(); -} void CTestDlg::FaderCallback(IvyApplication *app, int argc, const char **argv) { @@ -286,7 +281,7 @@ if ( argc != 2 ) m_slider7.SetPos( value ); break; } -UpdateData(FALSE); +//UpdateData(FALSE); } @@ -298,18 +293,20 @@ TRACE("Direct Msg Receive %d, %s\n",id,arg ); void CTestDlg::OnApplicationConnected(IvyApplication *app) { CString text; - m_text.SetSel( -1, -1, FALSE ); text.Format("Application: %s ready\r\n",(LPCSTR)(app->GetName()) ); - m_text.ReplaceSel( text ); + WriteMessage( text ); } void CTestDlg::OnApplicationDisconnected(IvyApplication *app) { CString text; - m_text.SetSel( -1, -1, FALSE ); text.Format("Application: %s bye\r\n",(LPCSTR)(app->GetName()) ); + WriteMessage( text ); +} +void CTestDlg::WriteMessage(const CString & text) +{ + m_text.SetSel( -1, -1, FALSE ); m_text.ReplaceSel( text ); } - void CTestDlg::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) { // TODO: Add your message handler code here and/or call default @@ -336,7 +333,27 @@ void CTestDlg::OnVscrollMsg() { buffer[len] = '\0'; TRACE("IDC MSG Scroll %d len= %d %s\n",line,len, buffer); - bus->SendMsg( buffer ); + int count = bus->SendMsg( buffer ); + CString mess; + mess.Format("Sending %d message %s\r\n",count,buffer); + WriteMessage( mess ); } } } + +void CTestDlg::OnClose() +{ + // TODO: Add your message handler code here and/or call default + TRACE ( "Quitting\n"); + if (bus) delete bus; + + CDialog::OnClose(); +} + +void CTestDlg::OnOK() +{ + // TODO: Add extra validation here + TRACE ( "Quitting\n"); + if (bus) delete bus; + CDialog::OnOK(); +} -- cgit v1.1 From bb80edd06eb39c91a574b65a4d15c2f483a9a918 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:36 +0000 Subject: Utilisateur : Fcolin Date : 6/01/00 Heure : 11:15 Archivé dans $/Bus/Test Commentaire: ajout bind to msg (vss 6) --- IvyProbe/IvyProbeDlg.cpp | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index c37ee48..9cd53c3 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -78,6 +78,7 @@ void CTestDlg::DoDataExchange(CDataExchange* pDX) { CDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CTestDlg) + DDX_Control(pDX, IDC_BIND, m_bind); DDX_Control(pDX, IDC_MSG, m_msgToSend); DDX_Control(pDX, IDC_TEXT, m_text); DDX_Control(pDX, IDC_SLIDER7, m_slider7); @@ -101,6 +102,7 @@ BEGIN_MESSAGE_MAP(CTestDlg, CDialog) ON_WM_VSCROLL() ON_EN_VSCROLL(IDC_MSG, OnVscrollMsg) ON_WM_CLOSE() + ON_EN_VSCROLL(IDC_BIND, OnVscrollBind) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -153,11 +155,11 @@ BOOL CTestDlg::OnInitDialog() m_slider6.SetWindowText( "MIDICS10:fader6 value=" ); m_slider7.SetWindowText( "MIDICS10:fader7 value=" ); - bus = new Ivy( "TEST NT","TEST NT READY",this); + bus = new Ivy( "TEST NT","TEST NT READY",this,FALSE); bus->BindMsg("^MIDICS10:fader([0-7]) value=([0-9]+)", BUS_CALLBACK_OF(CTestDlg, FaderCallback)); bus->BindMsg("^MIDICS10:knob([0-5]) value=([0-9]+)", BUS_CALLBACK_OF(CTestDlg, FaderCallback)); - bus->BindMsg("(.*)", BUS_CALLBACK_OF(CTestDlg, IvyCallback )); +// bus->BindMsg("(.*)", BUS_CALLBACK_OF(CTestDlg, IvyCallback )); //bus->BindMsg("^S( A=([0-9]+))?( B=([0-9]+))?",cb); m_busnumber = bus->GetDomain( m_busnumber ); @@ -357,3 +359,22 @@ void CTestDlg::OnOK() if (bus) delete bus; CDialog::OnOK(); } + +void CTestDlg::OnVscrollBind() +{ + char buffer[200]; + int line = m_bind.GetFirstVisibleLine( ) -1 ; + if ( line >= 0 ) + { + int len = m_bind.GetLine( line , buffer, sizeof(buffer)-1); + if ( len ) + { + buffer[len] = '\0'; + TRACE("IDC BIND Scroll %d len= %d %s\n",line,len, buffer); + int count = bus->BindMsg( buffer , BUS_CALLBACK_OF(CTestDlg, IvyCallback )); + CString mess; + mess.Format("Binding to '%s'\r\n",buffer); + WriteMessage( mess ); + } + } +} -- cgit v1.1 From 64762a94e5c9f1fd90a9ffd252908d27dc58da5a Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:38 +0000 Subject: Utilisateur : Fcolin Date : 14/03/00 Heure : 11:49 Archivé dans $/Bus/Test Commentaire: modif boite resize et combo box (vss 7) --- IvyProbe/IvyProbeDlg.cpp | 158 ++++++++++++++++++++--------------------------- 1 file changed, 68 insertions(+), 90 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index 9cd53c3..ff339c1 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -63,7 +63,7 @@ END_MESSAGE_MAP() // CTestDlg dialog CTestDlg::CTestDlg(CWnd* pParent /*=NULL*/) - : CDialog(CTestDlg::IDD, pParent) + : ETSLayoutDialog(CTestDlg::IDD, pParent) { //{{AFX_DATA_INIT(CTestDlg) m_busnumber = ""; @@ -76,10 +76,10 @@ CTestDlg::CTestDlg(CWnd* pParent /*=NULL*/) void CTestDlg::DoDataExchange(CDataExchange* pDX) { - CDialog::DoDataExchange(pDX); + ETSLayoutDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CTestDlg) - DDX_Control(pDX, IDC_BIND, m_bind); - DDX_Control(pDX, IDC_MSG, m_msgToSend); + DDX_Control(pDX, IDC_REGEXP, m_expr); + DDX_Control(pDX, IDC_MSG, m_msg); DDX_Control(pDX, IDC_TEXT, m_text); DDX_Control(pDX, IDC_SLIDER7, m_slider7); DDX_Control(pDX, IDC_SLIDER6, m_slider6); @@ -93,16 +93,14 @@ void CTestDlg::DoDataExchange(CDataExchange* pDX) //}}AFX_DATA_MAP } -BEGIN_MESSAGE_MAP(CTestDlg, CDialog) +BEGIN_MESSAGE_MAP(CTestDlg, ETSLayoutDialog) //{{AFX_MSG_MAP(CTestDlg) ON_WM_SYSCOMMAND() - ON_WM_PAINT() ON_WM_QUERYDRAGICON() ON_BN_CLICKED(IDC_START, OnStart) - ON_WM_VSCROLL() - ON_EN_VSCROLL(IDC_MSG, OnVscrollMsg) ON_WM_CLOSE() - ON_EN_VSCROLL(IDC_BIND, OnVscrollBind) + ON_BN_CLICKED(IDC_SEND, OnSend) + ON_BN_CLICKED(IDC_BIND, OnBind) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -111,7 +109,7 @@ END_MESSAGE_MAP() BOOL CTestDlg::OnInitDialog() { - CDialog::OnInitDialog(); + ETSLayoutDialog::OnInitDialog(); // Add "About..." menu item to system menu. @@ -136,6 +134,37 @@ BOOL CTestDlg::OnInitDialog() SetIcon(m_hIcon, TRUE); // Set big icon SetIcon(m_hIcon, FALSE); // Set small icon + // define the Layout + CreateRoot( VERTICAL ) + << ( pane( HORIZONTAL, ABSOLUTE_VERT ) + << item ( IDC_BUSNUMBER, GREEDY ) + << item ( IDC_START, NORESIZE ) + ) + << item ( IDC_TEXT, GREEDY ) + << ( pane( HORIZONTAL, ABSOLUTE_VERT ) + << item( paneNull, GREEDY ) + << item( IDC_SLIDER0, NORESIZE ) + << item( IDC_SLIDER1, NORESIZE ) + << item( IDC_SLIDER2, NORESIZE ) + << item( IDC_SLIDER3, NORESIZE ) + << item( IDC_SLIDER4, NORESIZE ) + << item( IDC_SLIDER5, NORESIZE ) + << item( IDC_SLIDER6, NORESIZE ) + << item( IDC_SLIDER7, NORESIZE ) + << item( paneNull, GREEDY ) + ) + << ( pane( HORIZONTAL, ABSOLUTE_VERT ) + << item( IDC_STATIC_MSG, NORESIZE ) + << item( IDC_MSG, GREEDY ) + << item( IDC_SEND, NORESIZE ) + ) + << ( pane( HORIZONTAL, ABSOLUTE_VERT ) + << item( IDC_STATIC_BIND, NORESIZE ) + << item( IDC_REGEXP, GREEDY ) + << item( IDC_BIND, NORESIZE ) + ); + UpdateLayout (); + // TODO: Add extra initialization here m_slider0.SetRange( 0, 127); m_slider1.SetRange( 0, 127); @@ -179,38 +208,11 @@ void CTestDlg::OnSysCommand(UINT nID, LPARAM lParam) } else { - CDialog::OnSysCommand(nID, lParam); + ETSLayoutDialog::OnSysCommand(nID, lParam); } } -// If you add a minimize button to your dialog, you will need the code below -// to draw the icon. For MFC applications using the document/view model, -// this is automatically done for you by the framework. - -void CTestDlg::OnPaint() -{ - if (IsIconic()) - { - CPaintDC dc(this); // device context for painting - - SendMessage(WM_ICONERASEBKGND, (WPARAM) dc.GetSafeHdc(), 0); - - // Center icon in client rectangle - int cxIcon = GetSystemMetrics(SM_CXICON); - int cyIcon = GetSystemMetrics(SM_CYICON); - CRect rect; - GetClientRect(&rect); - int x = (rect.Width() - cxIcon + 1) / 2; - int y = (rect.Height() - cyIcon + 1) / 2; - // Draw the icon - dc.DrawIcon(x, y, m_hIcon); - } - else - { - CDialog::OnPaint(); - } -} // The system calls this to obtain the cursor to display while the user drags // the minimized window. @@ -309,39 +311,7 @@ void CTestDlg::WriteMessage(const CString & text) m_text.SetSel( -1, -1, FALSE ); m_text.ReplaceSel( text ); } -void CTestDlg::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) -{ - // TODO: Add your message handler code here and/or call default - CSliderCtrl *slider = (CSliderCtrl *)pScrollBar; - CString text; - CString value; - slider->GetWindowText( text ); - value.Format("%d",slider->GetPos()); - text += value; - TRACE("%s\n",(LPCSTR)text ); - bus->SendMsg( text ); - CDialog::OnVScroll(nSBCode, nPos, pScrollBar); -} -void CTestDlg::OnVscrollMsg() -{ - // TODO: Add your control notification handler code here - char buffer[200]; - int line = m_msgToSend.GetFirstVisibleLine( ) -1 ; - if ( line >= 0 ) - { - int len = m_msgToSend.GetLine( line , buffer, sizeof(buffer)-1); - if ( len ) - { - buffer[len] = '\0'; - TRACE("IDC MSG Scroll %d len= %d %s\n",line,len, buffer); - int count = bus->SendMsg( buffer ); - CString mess; - mess.Format("Sending %d message %s\r\n",count,buffer); - WriteMessage( mess ); - } - } -} void CTestDlg::OnClose() { @@ -349,32 +319,40 @@ void CTestDlg::OnClose() TRACE ( "Quitting\n"); if (bus) delete bus; - CDialog::OnClose(); + ETSLayoutDialog::OnClose(); } -void CTestDlg::OnOK() + +void CTestDlg::OnSend() { - // TODO: Add extra validation here - TRACE ( "Quitting\n"); - if (bus) delete bus; - CDialog::OnOK(); + CString buffer; + m_msg.SetEditSel( 0, -1 ); + m_msg.GetWindowText( buffer ); + if ( buffer.IsEmpty() ) return; + int count = bus->SendMsg( buffer ); + if ( m_msg.FindStringExact(-1, buffer) == CB_ERR ) + { + m_msg.AddString( buffer ); + } + CString mess; + mess.Format("Sending %d message %s\r\n",count,buffer); + WriteMessage( mess ); + m_msg.Clear(); } -void CTestDlg::OnVscrollBind() +void CTestDlg::OnBind() { - char buffer[200]; - int line = m_bind.GetFirstVisibleLine( ) -1 ; - if ( line >= 0 ) - { - int len = m_bind.GetLine( line , buffer, sizeof(buffer)-1); - if ( len ) + CString buffer; + m_expr.SetEditSel( 0, -1 ); + m_expr.GetWindowText( buffer ); + if ( buffer.IsEmpty() ) return; + int count = bus->BindMsg( buffer , BUS_CALLBACK_OF(CTestDlg, IvyCallback )); + if ( m_expr.FindStringExact(-1, buffer) == CB_ERR ) { - buffer[len] = '\0'; - TRACE("IDC BIND Scroll %d len= %d %s\n",line,len, buffer); - int count = bus->BindMsg( buffer , BUS_CALLBACK_OF(CTestDlg, IvyCallback )); - CString mess; - mess.Format("Binding to '%s'\r\n",buffer); - WriteMessage( mess ); + m_expr.AddString( buffer ); } - } + CString mess; + mess.Format("Binding to %s\r\n",buffer); + WriteMessage( mess ); + m_expr.Clear(); } -- cgit v1.1 From 2a3f2940210bd608f129aec6fc1f40b1240db2ff Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:41 +0000 Subject: Utilisateur : Fcolin Date : 14/03/00 Heure : 14:49 Archivé dans $/Bus/Test Commentaire: modif Text Scroll (vss 8) --- IvyProbe/IvyProbeDlg.cpp | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index ff339c1..62fd7ac 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -80,7 +80,6 @@ void CTestDlg::DoDataExchange(CDataExchange* pDX) //{{AFX_DATA_MAP(CTestDlg) DDX_Control(pDX, IDC_REGEXP, m_expr); DDX_Control(pDX, IDC_MSG, m_msg); - DDX_Control(pDX, IDC_TEXT, m_text); DDX_Control(pDX, IDC_SLIDER7, m_slider7); DDX_Control(pDX, IDC_SLIDER6, m_slider6); DDX_Control(pDX, IDC_SLIDER5, m_slider5); @@ -165,7 +164,9 @@ BOOL CTestDlg::OnInitDialog() ); UpdateLayout (); - // TODO: Add extra initialization here + // extra initialization here + m_text.SubclassDlgItem (IDC_TEXT, this); + m_slider0.SetRange( 0, 127); m_slider1.SetRange( 0, 127); m_slider2.SetRange( 0, 127); @@ -235,12 +236,10 @@ void CTestDlg::IvyCallback(IvyApplication *app, int argc, const char **argv) int i; CString text; TRACE(" Called function args:"); - text.Format("Ivy callback %d args\r\n",argc ); - WriteMessage( text ); + WriteMessage( "Ivy callback %d args",argc ); for ( i = 0; i < argc; i++ ) { - text.Format("Ivy callback arg%d '%s'\r\n",i, argv[i] ); - WriteMessage( text ); + WriteMessage( " arg%d='%s'",i, argv[i] ); TRACE(" '%s'",argv[i]); } TRACE("\n"); @@ -296,20 +295,21 @@ TRACE("Direct Msg Receive %d, %s\n",id,arg ); void CTestDlg::OnApplicationConnected(IvyApplication *app) { - CString text; - text.Format("Application: %s ready\r\n",(LPCSTR)(app->GetName()) ); - WriteMessage( text ); + WriteMessage( "Application: %s ready",(LPCSTR)(app->GetName()) ); } void CTestDlg::OnApplicationDisconnected(IvyApplication *app) { - CString text; - text.Format("Application: %s bye\r\n",(LPCSTR)(app->GetName()) ); - WriteMessage( text ); + WriteMessage( "Application: %s bye",(LPCSTR)(app->GetName()) ); } -void CTestDlg::WriteMessage(const CString & text) +void CTestDlg::WriteMessage(LPCTSTR format, ...) { - m_text.SetSel( -1, -1, FALSE ); - m_text.ReplaceSel( text ); + CString str; + // format and write the data we were given + va_list args; + va_start(args, format); + str.FormatV(format, args); + + m_text.AppendString( str ); } @@ -334,9 +334,7 @@ void CTestDlg::OnSend() { m_msg.AddString( buffer ); } - CString mess; - mess.Format("Sending %d message %s\r\n",count,buffer); - WriteMessage( mess ); + WriteMessage( "Sending %d message %s",count,(LPCSTR)buffer ); m_msg.Clear(); } @@ -351,8 +349,6 @@ void CTestDlg::OnBind() { m_expr.AddString( buffer ); } - CString mess; - mess.Format("Binding to %s\r\n",buffer); - WriteMessage( mess ); + WriteMessage( "Binding to %s", (LPCSTR)buffer ); m_expr.Clear(); } -- cgit v1.1 From 19e9d97b62a0d300d18e1e006339073cd0c10803 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:42 +0000 Subject: Utilisateur : Fcolin Date : 2/02/01 Heure : 18:30 Archivé dans $/Bus/Test Commentaire: win CE compile not finished (vss 9) --- IvyProbe/IvyProbeDlg.cpp | 71 ++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 30 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index 62fd7ac..dc99158 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -4,6 +4,7 @@ #include "stdafx.h" #include "Test.h" #include "TestDlg.h" +#include "TestParseCmdLine.h" #include "IvyApplication.h" @@ -63,7 +64,7 @@ END_MESSAGE_MAP() // CTestDlg dialog CTestDlg::CTestDlg(CWnd* pParent /*=NULL*/) - : ETSLayoutDialog(CTestDlg::IDD, pParent) + : MyDialog(CTestDlg::IDD, pParent) { //{{AFX_DATA_INIT(CTestDlg) m_busnumber = ""; @@ -76,7 +77,7 @@ CTestDlg::CTestDlg(CWnd* pParent /*=NULL*/) void CTestDlg::DoDataExchange(CDataExchange* pDX) { - ETSLayoutDialog::DoDataExchange(pDX); + MyDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CTestDlg) DDX_Control(pDX, IDC_REGEXP, m_expr); DDX_Control(pDX, IDC_MSG, m_msg); @@ -92,7 +93,7 @@ void CTestDlg::DoDataExchange(CDataExchange* pDX) //}}AFX_DATA_MAP } -BEGIN_MESSAGE_MAP(CTestDlg, ETSLayoutDialog) +BEGIN_MESSAGE_MAP(CTestDlg, MyDialog) //{{AFX_MSG_MAP(CTestDlg) ON_WM_SYSCOMMAND() ON_WM_QUERYDRAGICON() @@ -108,7 +109,7 @@ END_MESSAGE_MAP() BOOL CTestDlg::OnInitDialog() { - ETSLayoutDialog::OnInitDialog(); + MyDialog::OnInitDialog(); // Add "About..." menu item to system menu. @@ -132,7 +133,8 @@ BOOL CTestDlg::OnInitDialog() // when the application's main window is not a dialog SetIcon(m_hIcon, TRUE); // Set big icon SetIcon(m_hIcon, FALSE); // Set small icon - + +#ifndef UNDER_CE // define the Layout CreateRoot( VERTICAL ) << ( pane( HORIZONTAL, ABSOLUTE_VERT ) @@ -163,7 +165,7 @@ BOOL CTestDlg::OnInitDialog() << item( IDC_BIND, NORESIZE ) ); UpdateLayout (); - +#endif // extra initialization here m_text.SubclassDlgItem (IDC_TEXT, this); @@ -176,15 +178,22 @@ BOOL CTestDlg::OnInitDialog() m_slider6.SetRange( 0, 127); m_slider7.SetRange( 0, 127); - m_slider0.SetWindowText( "MIDICS10:fader0 value=" ); - m_slider1.SetWindowText( "MIDICS10:fader1 value=" ); - m_slider2.SetWindowText( "MIDICS10:fader2 value=" ); - m_slider3.SetWindowText( "MIDICS10:fader3 value=" ); - m_slider4.SetWindowText( "MIDICS10:fader4 value=" ); - m_slider5.SetWindowText( "MIDICS10:fader5 value=" ); - m_slider6.SetWindowText( "MIDICS10:fader6 value=" ); - m_slider7.SetWindowText( "MIDICS10:fader7 value=" ); - + m_slider0.SetWindowText( TEXT("MIDICS10:fader0 value=") ); + m_slider1.SetWindowText( TEXT("MIDICS10:fader1 value=") ); + m_slider2.SetWindowText( TEXT("MIDICS10:fader2 value=") ); + m_slider3.SetWindowText( TEXT("MIDICS10:fader3 value=") ); + m_slider4.SetWindowText( TEXT("MIDICS10:fader4 value=") ); + m_slider5.SetWindowText( TEXT("MIDICS10:fader5 value=") ); + m_slider6.SetWindowText( TEXT("MIDICS10:fader6 value=") ); + m_slider7.SetWindowText( TEXT("MIDICS10:fader7 value=") ); + + // parse command Line Info + TestParseCmdLine cmd; + AfxGetApp()->ParseCommandLine( cmd ); + + // Set Argument from Command Line + m_busnumber = cmd.m_busNumber; + bus = new Ivy( "TEST NT","TEST NT READY",this,FALSE); bus->BindMsg("^MIDICS10:fader([0-7]) value=([0-9]+)", BUS_CALLBACK_OF(CTestDlg, FaderCallback)); @@ -195,7 +204,9 @@ BOOL CTestDlg::OnInitDialog() m_busnumber = bus->GetDomain( m_busnumber ); UpdateData(FALSE); - + // force bus start in case of start + if ( cmd.m_start ) + OnStart(); return TRUE; // return TRUE unless you set the focus to a control } @@ -209,7 +220,7 @@ void CTestDlg::OnSysCommand(UINT nID, LPARAM lParam) } else { - ETSLayoutDialog::OnSysCommand(nID, lParam); + MyDialog::OnSysCommand(nID, lParam); } } @@ -235,14 +246,14 @@ void CTestDlg::IvyCallback(IvyApplication *app, int argc, const char **argv) { int i; CString text; - TRACE(" Called function args:"); - WriteMessage( "Ivy callback %d args",argc ); + TRACE(TEXT(" Called function args:")); + WriteMessage( TEXT("Ivy callback %d args"),argc ); for ( i = 0; i < argc; i++ ) { - WriteMessage( " arg%d='%s'",i, argv[i] ); - TRACE(" '%s'",argv[i]); + WriteMessage( TEXT(" arg%d='%s'"),i, argv[i] ); + TRACE(TEXT(" '%s'"),argv[i]); } - TRACE("\n"); + TRACE(TEXT("\n")); } @@ -253,7 +264,7 @@ int fader; int value; if ( argc != 2 ) { - TRACE("bad Fader call back\n"); + TRACE(TEXT("bad Fader call back\n")); return; } fader = atoi( argv[0] ); @@ -290,16 +301,16 @@ if ( argc != 2 ) void CTestDlg::OnDirectMessage(IvyApplication *app, int id, const char *arg) { -TRACE("Direct Msg Receive %d, %s\n",id,arg ); +TRACE(TEXT("Direct Msg Receive %d, %s\n"),id,arg ); } void CTestDlg::OnApplicationConnected(IvyApplication *app) { - WriteMessage( "Application: %s ready",(LPCSTR)(app->GetName()) ); + WriteMessage( TEXT("Application: %s ready"),(LPCSTR)(app->GetName()) ); } void CTestDlg::OnApplicationDisconnected(IvyApplication *app) { - WriteMessage( "Application: %s bye",(LPCSTR)(app->GetName()) ); + WriteMessage( TEXT("Application: %s bye"),(LPCSTR)(app->GetName()) ); } void CTestDlg::WriteMessage(LPCTSTR format, ...) { @@ -316,10 +327,10 @@ void CTestDlg::WriteMessage(LPCTSTR format, ...) void CTestDlg::OnClose() { // TODO: Add your message handler code here and/or call default - TRACE ( "Quitting\n"); + TRACE ( TEXT("Quitting\n")); if (bus) delete bus; - ETSLayoutDialog::OnClose(); + MyDialog::OnClose(); } @@ -334,7 +345,7 @@ void CTestDlg::OnSend() { m_msg.AddString( buffer ); } - WriteMessage( "Sending %d message %s",count,(LPCSTR)buffer ); + WriteMessage( TEXT("Sending %d message %s"),count,(LPCSTR)buffer ); m_msg.Clear(); } @@ -349,6 +360,6 @@ void CTestDlg::OnBind() { m_expr.AddString( buffer ); } - WriteMessage( "Binding to %s", (LPCSTR)buffer ); + WriteMessage( TEXT("Binding to %s"), (LPCSTR)buffer ); m_expr.Clear(); } -- cgit v1.1 From 9d1aedd52ee1c7589d2b6509e059048ac4006c06 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:44 +0000 Subject: Utilisateur : Fcolin Date : 19/02/01 Heure : 10:39 Archivé dans $/Bus/Test (vss 10) --- IvyProbe/IvyProbeDlg.cpp | 115 +++++++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 60 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index dc99158..6982f2a 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -14,32 +14,26 @@ static char THIS_FILE[] = __FILE__; #endif +const char * CONVSTR( const CString& str ) +{ +#ifdef UNDER_CE + + static char buffer[4096]; + int len = str.GetLength(); + buffer[0] = '\0'; + if ( len ) + { + int err = WideCharToMultiByte( CP_ACP, WC_DEFAULTCHAR, str, len, buffer, 4096, "X", NULL ); + if ( err == 0 ) TRACE(TEXT("Error converting chars %d\n"),GetLastError()); + } + return buffer; +#else + return (LPCSTR) str; +#endif + +} -///////////////////////////////////////////////////////////////////////////// -// CAboutDlg dialog used for App About -class CAboutDlg : public CDialog -{ -public: - CAboutDlg(); - -// Dialog Data - //{{AFX_DATA(CAboutDlg) - enum { IDD = IDD_ABOUTBOX }; - //}}AFX_DATA - - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CAboutDlg) - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - -// Implementation -protected: - //{{AFX_MSG(CAboutDlg) - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD) { @@ -111,23 +105,23 @@ BOOL CTestDlg::OnInitDialog() { MyDialog::OnInitDialog(); - // Add "About..." menu item to system menu. - - // IDM_ABOUTBOX must be in the system command range. - ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX); - ASSERT(IDM_ABOUTBOX < 0xF000); - - CMenu* pSysMenu = GetSystemMenu(FALSE); - if (pSysMenu != NULL) - { - CString strAboutMenu; - strAboutMenu.LoadString(IDS_ABOUTBOX); - if (!strAboutMenu.IsEmpty()) - { - pSysMenu->AppendMenu(MF_SEPARATOR); - pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu); - } - } +// // Add "About..." menu item to system menu. +// +// // IDM_ABOUTBOX must be in the system command range. +// ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX); +// ASSERT(IDM_ABOUTBOX < 0xF000); +// +// CMenu* pSysMenu = GetSystemMenu(FALSE); +// if (pSysMenu != NULL) +// { +// CString strAboutMenu; +// strAboutMenu.LoadString(IDS_ABOUTBOX); +// if (!strAboutMenu.IsEmpty()) +// { +// pSysMenu->AppendMenu(MF_SEPARATOR); +// pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu); +// } +// } // Set the icon for this dialog. The framework does this automatically // when the application's main window is not a dialog @@ -201,7 +195,7 @@ BOOL CTestDlg::OnInitDialog() // bus->BindMsg("(.*)", BUS_CALLBACK_OF(CTestDlg, IvyCallback )); //bus->BindMsg("^S( A=([0-9]+))?( B=([0-9]+))?",cb); - m_busnumber = bus->GetDomain( m_busnumber ); + m_busnumber = bus->GetDomain( CONVSTR(m_busnumber) ); UpdateData(FALSE); // force bus start in case of start @@ -211,18 +205,19 @@ BOOL CTestDlg::OnInitDialog() return TRUE; // return TRUE unless you set the focus to a control } -void CTestDlg::OnSysCommand(UINT nID, LPARAM lParam) -{ - if ((nID & 0xFFF0) == IDM_ABOUTBOX) - { - CAboutDlg dlgAbout; - dlgAbout.DoModal(); - } - else - { - MyDialog::OnSysCommand(nID, lParam); - } -} + +//void CTestDlg::OnSysCommand(UINT nID, LPARAM lParam) +//{ +// if ((nID & 0xFFF0) == IDM_ABOUTBOX) +// { +// CAboutDlg dlgAbout; +// dlgAbout.DoModal(); +// } +// else +// { +// MyDialog::OnSysCommand(nID, lParam); +// } +//} @@ -237,8 +232,8 @@ void CTestDlg::OnStart() { UpdateData(TRUE); bus->stop(); - m_busnumber = bus->GetDomain( m_busnumber ); - bus->start(m_busnumber); + m_busnumber = bus->GetDomain( CONVSTR(m_busnumber) ); + bus->start(CONVSTR(m_busnumber)); UpdateData(FALSE); } @@ -340,12 +335,12 @@ void CTestDlg::OnSend() m_msg.SetEditSel( 0, -1 ); m_msg.GetWindowText( buffer ); if ( buffer.IsEmpty() ) return; - int count = bus->SendMsg( buffer ); + int count = bus->SendMsg( CONVSTR(buffer) ); if ( m_msg.FindStringExact(-1, buffer) == CB_ERR ) { m_msg.AddString( buffer ); } - WriteMessage( TEXT("Sending %d message %s"),count,(LPCSTR)buffer ); + WriteMessage( TEXT("Sending %d message %s"),count,CONVSTR(buffer) ); m_msg.Clear(); } @@ -355,11 +350,11 @@ void CTestDlg::OnBind() m_expr.SetEditSel( 0, -1 ); m_expr.GetWindowText( buffer ); if ( buffer.IsEmpty() ) return; - int count = bus->BindMsg( buffer , BUS_CALLBACK_OF(CTestDlg, IvyCallback )); + int count = bus->BindMsg( CONVSTR(buffer) , BUS_CALLBACK_OF(CTestDlg, IvyCallback )); if ( m_expr.FindStringExact(-1, buffer) == CB_ERR ) { m_expr.AddString( buffer ); } - WriteMessage( TEXT("Binding to %s"), (LPCSTR)buffer ); + WriteMessage( TEXT("Binding to %s"), CONVSTR(buffer) ); m_expr.Clear(); } -- cgit v1.1 From 214ff4d7a214e87c78ffdb2e66d430ad1ab4a99e Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:47 +0000 Subject: Utilisateur : Fcolin Date : 19/02/01 Heure : 17:00 Archivé dans $/Bus/Test (vss 11) --- IvyProbe/IvyProbeDlg.cpp | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index 6982f2a..4a891d9 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -20,11 +20,12 @@ const char * CONVSTR( const CString& str ) static char buffer[4096]; int len = str.GetLength(); - buffer[0] = '\0'; + buffer[len] = '\0'; if ( len ) { - int err = WideCharToMultiByte( CP_ACP, WC_DEFAULTCHAR, str, len, buffer, 4096, "X", NULL ); - if ( err == 0 ) TRACE(TEXT("Error converting chars %d\n"),GetLastError()); + int err = WideCharToMultiByte( CP_ACP, 0, str, len, buffer, 4096, NULL, NULL ); + if ( err == 0 ) + TRACE(TEXT("Error converting chars %d\n"),GetLastError()); } return buffer; #else @@ -242,10 +243,10 @@ void CTestDlg::IvyCallback(IvyApplication *app, int argc, const char **argv) int i; CString text; TRACE(TEXT(" Called function args:")); - WriteMessage( TEXT("Ivy callback %d args"),argc ); + WriteMessage( "Ivy callback %d args",argc ); for ( i = 0; i < argc; i++ ) { - WriteMessage( TEXT(" arg%d='%s'"),i, argv[i] ); + WriteMessage(" arg%d='%s'",i, argv[i] ); TRACE(TEXT(" '%s'"),argv[i]); } TRACE(TEXT("\n")); @@ -301,19 +302,19 @@ TRACE(TEXT("Direct Msg Receive %d, %s\n"),id,arg ); void CTestDlg::OnApplicationConnected(IvyApplication *app) { - WriteMessage( TEXT("Application: %s ready"),(LPCSTR)(app->GetName()) ); + WriteMessage( "Application: %s ready",(LPCSTR)(app->GetName()) ); } void CTestDlg::OnApplicationDisconnected(IvyApplication *app) { - WriteMessage( TEXT("Application: %s bye"),(LPCSTR)(app->GetName()) ); + WriteMessage( "Application: %s bye",(LPCSTR)(app->GetName()) ); } -void CTestDlg::WriteMessage(LPCTSTR format, ...) +void CTestDlg::WriteMessage(const char *format, ...) { - CString str; + char str[4096]; // format and write the data we were given va_list args; va_start(args, format); - str.FormatV(format, args); + vsprintf(str, format, args); m_text.AppendString( str ); } @@ -340,7 +341,7 @@ void CTestDlg::OnSend() { m_msg.AddString( buffer ); } - WriteMessage( TEXT("Sending %d message %s"),count,CONVSTR(buffer) ); + WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); m_msg.Clear(); } @@ -355,6 +356,6 @@ void CTestDlg::OnBind() { m_expr.AddString( buffer ); } - WriteMessage( TEXT("Binding to %s"), CONVSTR(buffer) ); + WriteMessage( "Binding to %s", CONVSTR(buffer) ); m_expr.Clear(); } -- cgit v1.1 From 45ff209d0041034924f45cd35cc39c5634a6573c Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:48 +0000 Subject: Utilisateur : Fcolin Date : 14/09/01 Heure : 15:21 Archivé dans $/Bus/Test (vss 12) --- IvyProbe/IvyProbeDlg.cpp | 140 ++++++++++++++++++++++------------------------- 1 file changed, 64 insertions(+), 76 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index 4a891d9..3ecc751 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -76,26 +76,25 @@ void CTestDlg::DoDataExchange(CDataExchange* pDX) //{{AFX_DATA_MAP(CTestDlg) DDX_Control(pDX, IDC_REGEXP, m_expr); DDX_Control(pDX, IDC_MSG, m_msg); - DDX_Control(pDX, IDC_SLIDER7, m_slider7); - DDX_Control(pDX, IDC_SLIDER6, m_slider6); - DDX_Control(pDX, IDC_SLIDER5, m_slider5); - DDX_Control(pDX, IDC_SLIDER4, m_slider4); - DDX_Control(pDX, IDC_SLIDER3, m_slider3); - DDX_Control(pDX, IDC_SLIDER2, m_slider2); - DDX_Control(pDX, IDC_SLIDER1, m_slider1); - DDX_Control(pDX, IDC_SLIDER0, m_slider0); DDX_Text(pDX, IDC_BUSNUMBER, m_busnumber); //}}AFX_DATA_MAP } BEGIN_MESSAGE_MAP(CTestDlg, MyDialog) //{{AFX_MSG_MAP(CTestDlg) - ON_WM_SYSCOMMAND() ON_WM_QUERYDRAGICON() ON_BN_CLICKED(IDC_START, OnStart) ON_WM_CLOSE() ON_BN_CLICKED(IDC_SEND, OnSend) ON_BN_CLICKED(IDC_BIND, OnBind) + ON_BN_CLICKED(IDC_CLOCK_FAST_BACKWARD, OnClockFastBackward) + ON_BN_CLICKED(IDC_CLOCK_BACKWARD, OnClockBackward) + ON_BN_CLICKED(IDC_CLOCK_PAUSE, OnClockPause) + ON_BN_CLICKED(IDC_CLOCK_START, OnClockStart) + ON_BN_CLICKED(IDC_CLOCK_FORWARD, OnClockForward) + ON_BN_CLICKED(IDC_CLOCK_FAST_FORWARD, OnClockFastForward) + ON_WM_SYSCOMMAND() + ON_BN_CLICKED(IDC_CLOCK_RATE, OnClockRate) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -139,14 +138,13 @@ BOOL CTestDlg::OnInitDialog() << item ( IDC_TEXT, GREEDY ) << ( pane( HORIZONTAL, ABSOLUTE_VERT ) << item( paneNull, GREEDY ) - << item( IDC_SLIDER0, NORESIZE ) - << item( IDC_SLIDER1, NORESIZE ) - << item( IDC_SLIDER2, NORESIZE ) - << item( IDC_SLIDER3, NORESIZE ) - << item( IDC_SLIDER4, NORESIZE ) - << item( IDC_SLIDER5, NORESIZE ) - << item( IDC_SLIDER6, NORESIZE ) - << item( IDC_SLIDER7, NORESIZE ) + << item( IDC_CLOCK_FAST_BACKWARD, NORESIZE ) + << item( IDC_CLOCK_BACKWARD, NORESIZE ) + << item( IDC_CLOCK_PAUSE, NORESIZE ) + << item( IDC_CLOCK_START, NORESIZE ) + << item( IDC_CLOCK_RATE, NORESIZE ) + << item( IDC_CLOCK_FORWARD, NORESIZE ) + << item( IDC_CLOCK_FAST_FORWARD, NORESIZE ) << item( paneNull, GREEDY ) ) << ( pane( HORIZONTAL, ABSOLUTE_VERT ) @@ -164,23 +162,6 @@ BOOL CTestDlg::OnInitDialog() // extra initialization here m_text.SubclassDlgItem (IDC_TEXT, this); - m_slider0.SetRange( 0, 127); - m_slider1.SetRange( 0, 127); - m_slider2.SetRange( 0, 127); - m_slider3.SetRange( 0, 127); - m_slider4.SetRange( 0, 127); - m_slider5.SetRange( 0, 127); - m_slider6.SetRange( 0, 127); - m_slider7.SetRange( 0, 127); - - m_slider0.SetWindowText( TEXT("MIDICS10:fader0 value=") ); - m_slider1.SetWindowText( TEXT("MIDICS10:fader1 value=") ); - m_slider2.SetWindowText( TEXT("MIDICS10:fader2 value=") ); - m_slider3.SetWindowText( TEXT("MIDICS10:fader3 value=") ); - m_slider4.SetWindowText( TEXT("MIDICS10:fader4 value=") ); - m_slider5.SetWindowText( TEXT("MIDICS10:fader5 value=") ); - m_slider6.SetWindowText( TEXT("MIDICS10:fader6 value=") ); - m_slider7.SetWindowText( TEXT("MIDICS10:fader7 value=") ); // parse command Line Info TestParseCmdLine cmd; @@ -191,8 +172,6 @@ BOOL CTestDlg::OnInitDialog() bus = new Ivy( "TEST NT","TEST NT READY",this,FALSE); - bus->BindMsg("^MIDICS10:fader([0-7]) value=([0-9]+)", BUS_CALLBACK_OF(CTestDlg, FaderCallback)); - bus->BindMsg("^MIDICS10:knob([0-5]) value=([0-9]+)", BUS_CALLBACK_OF(CTestDlg, FaderCallback)); // bus->BindMsg("(.*)", BUS_CALLBACK_OF(CTestDlg, IvyCallback )); //bus->BindMsg("^S( A=([0-9]+))?( B=([0-9]+))?",cb); @@ -254,46 +233,6 @@ void CTestDlg::IvyCallback(IvyApplication *app, int argc, const char **argv) } -void CTestDlg::FaderCallback(IvyApplication *app, int argc, const char **argv) -{ -int fader; -int value; -if ( argc != 2 ) - { - TRACE(TEXT("bad Fader call back\n")); - return; - } - fader = atoi( argv[0] ); - value = atoi( argv[1] ); - switch ( fader ) { - case 0: - m_slider0.SetPos( value ); - break; - case 1: - m_slider1.SetPos( value ); - break; - case 2: - m_slider2.SetPos( value ); - break; - case 3: - m_slider3.SetPos( value ); - break; - case 4: - m_slider4.SetPos( value ); - break; - case 5: - m_slider5.SetPos( value ); - break; - case 6: - m_slider6.SetPos( value ); - break; - case 7: - m_slider7.SetPos( value ); - break; -} -//UpdateData(FALSE); - -} void CTestDlg::OnDirectMessage(IvyApplication *app, int id, const char *arg) { @@ -359,3 +298,52 @@ void CTestDlg::OnBind() WriteMessage( "Binding to %s", CONVSTR(buffer) ); m_expr.Clear(); } + +void CTestDlg::OnClockFastBackward() +{ + CString buffer = "SetClock Rate=-9.0" ; + int count = bus->SendMsg( CONVSTR(buffer) ); + WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); +} + +void CTestDlg::OnClockBackward() +{ + CString buffer = "SetClock Rate=-1.0" ; + int count = bus->SendMsg( CONVSTR(buffer) ); + WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); +} + +void CTestDlg::OnClockPause() +{ + CString buffer = "ClockPause" ; + int count = bus->SendMsg( CONVSTR(buffer) ); + WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); +} + +void CTestDlg::OnClockStart() +{ + CString buffer = "ClockStart" ; + int count = bus->SendMsg( CONVSTR(buffer) ); + WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); +} + +void CTestDlg::OnClockForward() +{ + CString buffer = "SetClock Rate=9.0" ; + int count = bus->SendMsg( CONVSTR(buffer) ); + WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); +} + +void CTestDlg::OnClockFastForward() +{ + CString buffer = "SetClock Rate=100.0" ; + int count = bus->SendMsg( CONVSTR(buffer) ); + WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); +} + +void CTestDlg::OnClockRate() +{ + CString buffer = "SetClock Rate=1.0" ; + int count = bus->SendMsg( CONVSTR(buffer) ); + WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); +} -- cgit v1.1 From 0440889eb6038aaf47668f0f5ea2958c0868bdb7 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:51 +0000 Subject: Utilisateur : Fcolin Date : 27/03/02 Heure : 12:29 Archivé dans $/Bus/Test Commentaire: Add file load and save for message (vss 13) --- IvyProbe/IvyProbeDlg.cpp | 85 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 63 insertions(+), 22 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index 3ecc751..f504a1c 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -14,27 +14,6 @@ static char THIS_FILE[] = __FILE__; #endif -const char * CONVSTR( const CString& str ) -{ -#ifdef UNDER_CE - - static char buffer[4096]; - int len = str.GetLength(); - buffer[len] = '\0'; - if ( len ) - { - int err = WideCharToMultiByte( CP_ACP, 0, str, len, buffer, 4096, NULL, NULL ); - if ( err == 0 ) - TRACE(TEXT("Error converting chars %d\n"),GetLastError()); - } - return buffer; -#else - return (LPCSTR) str; -#endif - -} - - CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD) { @@ -93,11 +72,36 @@ BEGIN_MESSAGE_MAP(CTestDlg, MyDialog) ON_BN_CLICKED(IDC_CLOCK_START, OnClockStart) ON_BN_CLICKED(IDC_CLOCK_FORWARD, OnClockForward) ON_BN_CLICKED(IDC_CLOCK_FAST_FORWARD, OnClockFastForward) - ON_WM_SYSCOMMAND() ON_BN_CLICKED(IDC_CLOCK_RATE, OnClockRate) + ON_WM_SYSCOMMAND() + ON_COMMAND(FILE_LOAD, OnLoad) + ON_COMMAND(FILE_SAVE, OnSave) //}}AFX_MSG_MAP END_MESSAGE_MAP() + + +const char * CONVSTR( const CString& str ) +{ +#ifdef UNDER_CE + + static char buffer[4096]; + int len = str.GetLength(); + buffer[len] = '\0'; + if ( len ) + { + int err = WideCharToMultiByte( CP_ACP, 0, str, len, buffer, 4096, NULL, NULL ); + if ( err == 0 ) + TRACE(TEXT("Error converting chars %d\n"),GetLastError()); + } + return buffer; +#else + return (LPCSTR) str; +#endif + +} + + ///////////////////////////////////////////////////////////////////////////// // CTestDlg message handlers @@ -347,3 +351,40 @@ void CTestDlg::OnClockRate() int count = bus->SendMsg( CONVSTR(buffer) ); WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); } + +void CTestDlg::OnLoad() +{ + CString message; + + CFileDialog dialog( TRUE, "txt", NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, "Ivy Messages Files (*.txt)"); + if ( dialog.DoModal() == IDOK ) + { + CStdioFile file( dialog.GetPathName(), CFile::modeRead | CFile::typeText ); + m_msg.ResetContent(); + while ( file.ReadString(message) ) + { + m_msg.AddString( message ); + } + file.Close(); + } + +} + +void CTestDlg::OnSave() +{ + CString message; + + CFileDialog dialog( FALSE, "txt" , NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, "Ivy Messages Files (*.txt)"); + if ( dialog.DoModal() == IDOK ) + { + CStdioFile file( dialog.GetPathName(), CFile::modeCreate | CFile::modeWrite | CFile::typeText ); + for (int i=0;i < m_msg.GetCount();i++) + { + m_msg.GetLBText( i, message ); + file.WriteString(message + "\n"); + } + file.Close(); + + } + +} -- cgit v1.1 From 3ad3e0bad3ad035a281bb4fa1166084f0696a003 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:53 +0000 Subject: Utilisateur : Fcolin Date : 13/01/03 Heure : 15:28 Archivé dans $/Bus/IvyProbe Commentaire: (vss 14) --- IvyProbe/IvyProbeDlg.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index f504a1c..96bb3a2 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -132,7 +132,7 @@ BOOL CTestDlg::OnInitDialog() SetIcon(m_hIcon, TRUE); // Set big icon SetIcon(m_hIcon, FALSE); // Set small icon -#ifndef UNDER_CE +#ifdef USE_ETS // define the Layout CreateRoot( VERTICAL ) << ( pane( HORIZONTAL, ABSOLUTE_VERT ) @@ -174,7 +174,7 @@ BOOL CTestDlg::OnInitDialog() // Set Argument from Command Line m_busnumber = cmd.m_busNumber; - bus = new Ivy( "TEST NT","TEST NT READY",this,FALSE); + bus = new Ivy( "IvyProbe Windows","IvyProbe Windows Ready",this,FALSE); // bus->BindMsg("(.*)", BUS_CALLBACK_OF(CTestDlg, IvyCallback )); @@ -354,37 +354,41 @@ void CTestDlg::OnClockRate() void CTestDlg::OnLoad() { +#ifndef UNDER_CE + // TODO ReadString doesn't existe CString message; - CFileDialog dialog( TRUE, "txt", NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, "Ivy Messages Files (*.txt)"); + CFileDialog dialog( TRUE, TEXT("txt"), NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, TEXT("Ivy Messages Files (*.txt)")); if ( dialog.DoModal() == IDOK ) { CStdioFile file( dialog.GetPathName(), CFile::modeRead | CFile::typeText ); m_msg.ResetContent(); - while ( file.ReadString(message) ) + while ( file.ReadString( message )) { m_msg.AddString( message ); } file.Close(); } - +#endif } void CTestDlg::OnSave() { +#ifndef UNDER_CE + // TODO WriteString doesn't existe CString message; - CFileDialog dialog( FALSE, "txt" , NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, "Ivy Messages Files (*.txt)"); + CFileDialog dialog( FALSE, TEXT("txt") , NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, TEXT("Ivy Messages Files (*.txt)")); if ( dialog.DoModal() == IDOK ) { CStdioFile file( dialog.GetPathName(), CFile::modeCreate | CFile::modeWrite | CFile::typeText ); for (int i=0;i < m_msg.GetCount();i++) { m_msg.GetLBText( i, message ); - file.WriteString(message + "\n"); + file.WriteString(message + TEXT("\n")); } file.Close(); } - +#endif } -- cgit v1.1 From b95d0100933b20176881eedcf4f88e095801f35c Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:55 +0000 Subject: Utilisateur : Fcolin Date : 21/02/03 Heure : 16:31 Archivé dans $/Bus/IvyProbe Commentaire: (vss 15) --- IvyProbe/IvyProbeDlg.cpp | 54 ++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index 96bb3a2..0a6e7a4 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -2,8 +2,8 @@ // #include "stdafx.h" -#include "Test.h" -#include "TestDlg.h" +#include "IvyProbe.h" +#include "IvyProbeDlg.h" #include "TestParseCmdLine.h" #include "IvyApplication.h" @@ -37,8 +37,8 @@ END_MESSAGE_MAP() ///////////////////////////////////////////////////////////////////////////// // CTestDlg dialog -CTestDlg::CTestDlg(CWnd* pParent /*=NULL*/) - : MyDialog(CTestDlg::IDD, pParent) +CIvyProbeDlg::CIvyProbeDlg(CWnd* pParent /*=NULL*/) + : MyDialog(CIvyProbeDlg::IDD, pParent) { //{{AFX_DATA_INIT(CTestDlg) m_busnumber = ""; @@ -49,7 +49,7 @@ CTestDlg::CTestDlg(CWnd* pParent /*=NULL*/) bus = NULL; } -void CTestDlg::DoDataExchange(CDataExchange* pDX) +void CIvyProbeDlg::DoDataExchange(CDataExchange* pDX) { MyDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CTestDlg) @@ -59,7 +59,7 @@ void CTestDlg::DoDataExchange(CDataExchange* pDX) //}}AFX_DATA_MAP } -BEGIN_MESSAGE_MAP(CTestDlg, MyDialog) +BEGIN_MESSAGE_MAP(CIvyProbeDlg, MyDialog) //{{AFX_MSG_MAP(CTestDlg) ON_WM_QUERYDRAGICON() ON_BN_CLICKED(IDC_START, OnStart) @@ -105,7 +105,7 @@ const char * CONVSTR( const CString& str ) ///////////////////////////////////////////////////////////////////////////// // CTestDlg message handlers -BOOL CTestDlg::OnInitDialog() +BOOL CIvyProbeDlg::OnInitDialog() { MyDialog::OnInitDialog(); @@ -207,12 +207,12 @@ BOOL CTestDlg::OnInitDialog() // The system calls this to obtain the cursor to display while the user drags // the minimized window. -HCURSOR CTestDlg::OnQueryDragIcon() +HCURSOR CIvyProbeDlg::OnQueryDragIcon() { return (HCURSOR) m_hIcon; } -void CTestDlg::OnStart() +void CIvyProbeDlg::OnStart() { UpdateData(TRUE); bus->stop(); @@ -221,7 +221,7 @@ void CTestDlg::OnStart() UpdateData(FALSE); } -void CTestDlg::IvyCallback(IvyApplication *app, int argc, const char **argv) +void CIvyProbeDlg::IvyCallback(IvyApplication *app, int argc, const char **argv) { int i; CString text; @@ -238,20 +238,20 @@ void CTestDlg::IvyCallback(IvyApplication *app, int argc, const char **argv) -void CTestDlg::OnDirectMessage(IvyApplication *app, int id, const char *arg) +void CIvyProbeDlg::OnDirectMessage(IvyApplication *app, int id, const char *arg) { TRACE(TEXT("Direct Msg Receive %d, %s\n"),id,arg ); } -void CTestDlg::OnApplicationConnected(IvyApplication *app) +void CIvyProbeDlg::OnApplicationConnected(IvyApplication *app) { WriteMessage( "Application: %s ready",(LPCSTR)(app->GetName()) ); } -void CTestDlg::OnApplicationDisconnected(IvyApplication *app) +void CIvyProbeDlg::OnApplicationDisconnected(IvyApplication *app) { WriteMessage( "Application: %s bye",(LPCSTR)(app->GetName()) ); } -void CTestDlg::WriteMessage(const char *format, ...) +void CIvyProbeDlg::WriteMessage(const char *format, ...) { char str[4096]; // format and write the data we were given @@ -263,7 +263,7 @@ void CTestDlg::WriteMessage(const char *format, ...) } -void CTestDlg::OnClose() +void CIvyProbeDlg::OnClose() { // TODO: Add your message handler code here and/or call default TRACE ( TEXT("Quitting\n")); @@ -273,7 +273,7 @@ void CTestDlg::OnClose() } -void CTestDlg::OnSend() +void CIvyProbeDlg::OnSend() { CString buffer; m_msg.SetEditSel( 0, -1 ); @@ -288,13 +288,13 @@ void CTestDlg::OnSend() m_msg.Clear(); } -void CTestDlg::OnBind() +void CIvyProbeDlg::OnBind() { CString buffer; m_expr.SetEditSel( 0, -1 ); m_expr.GetWindowText( buffer ); if ( buffer.IsEmpty() ) return; - int count = bus->BindMsg( CONVSTR(buffer) , BUS_CALLBACK_OF(CTestDlg, IvyCallback )); + int count = bus->BindMsg( CONVSTR(buffer) , BUS_CALLBACK_OF(CIvyProbeDlg, IvyCallback )); if ( m_expr.FindStringExact(-1, buffer) == CB_ERR ) { m_expr.AddString( buffer ); @@ -303,56 +303,56 @@ void CTestDlg::OnBind() m_expr.Clear(); } -void CTestDlg::OnClockFastBackward() +void CIvyProbeDlg::OnClockFastBackward() { CString buffer = "SetClock Rate=-9.0" ; int count = bus->SendMsg( CONVSTR(buffer) ); WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); } -void CTestDlg::OnClockBackward() +void CIvyProbeDlg::OnClockBackward() { CString buffer = "SetClock Rate=-1.0" ; int count = bus->SendMsg( CONVSTR(buffer) ); WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); } -void CTestDlg::OnClockPause() +void CIvyProbeDlg::OnClockPause() { CString buffer = "ClockPause" ; int count = bus->SendMsg( CONVSTR(buffer) ); WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); } -void CTestDlg::OnClockStart() +void CIvyProbeDlg::OnClockStart() { CString buffer = "ClockStart" ; int count = bus->SendMsg( CONVSTR(buffer) ); WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); } -void CTestDlg::OnClockForward() +void CIvyProbeDlg::OnClockForward() { CString buffer = "SetClock Rate=9.0" ; int count = bus->SendMsg( CONVSTR(buffer) ); WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); } -void CTestDlg::OnClockFastForward() +void CIvyProbeDlg::OnClockFastForward() { CString buffer = "SetClock Rate=100.0" ; int count = bus->SendMsg( CONVSTR(buffer) ); WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); } -void CTestDlg::OnClockRate() +void CIvyProbeDlg::OnClockRate() { CString buffer = "SetClock Rate=1.0" ; int count = bus->SendMsg( CONVSTR(buffer) ); WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); } -void CTestDlg::OnLoad() +void CIvyProbeDlg::OnLoad() { #ifndef UNDER_CE // TODO ReadString doesn't existe @@ -372,7 +372,7 @@ void CTestDlg::OnLoad() #endif } -void CTestDlg::OnSave() +void CIvyProbeDlg::OnSave() { #ifndef UNDER_CE // TODO WriteString doesn't existe -- cgit v1.1 From e335964812eab775f8f634867481fa3e67bd1cca Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:56 +0000 Subject: Utilisateur : Fcolin Date : 26/02/03 Heure : 16:40 Archivé dans $/Bus/IvyProbe Commentaire: suppression bouton clock start (vss 16) --- IvyProbe/IvyProbeDlg.cpp | 62 ------------------------------------------------ 1 file changed, 62 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index 0a6e7a4..88cc8e2 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -66,13 +66,6 @@ BEGIN_MESSAGE_MAP(CIvyProbeDlg, MyDialog) ON_WM_CLOSE() ON_BN_CLICKED(IDC_SEND, OnSend) ON_BN_CLICKED(IDC_BIND, OnBind) - ON_BN_CLICKED(IDC_CLOCK_FAST_BACKWARD, OnClockFastBackward) - ON_BN_CLICKED(IDC_CLOCK_BACKWARD, OnClockBackward) - ON_BN_CLICKED(IDC_CLOCK_PAUSE, OnClockPause) - ON_BN_CLICKED(IDC_CLOCK_START, OnClockStart) - ON_BN_CLICKED(IDC_CLOCK_FORWARD, OnClockForward) - ON_BN_CLICKED(IDC_CLOCK_FAST_FORWARD, OnClockFastForward) - ON_BN_CLICKED(IDC_CLOCK_RATE, OnClockRate) ON_WM_SYSCOMMAND() ON_COMMAND(FILE_LOAD, OnLoad) ON_COMMAND(FILE_SAVE, OnSave) @@ -142,13 +135,6 @@ BOOL CIvyProbeDlg::OnInitDialog() << item ( IDC_TEXT, GREEDY ) << ( pane( HORIZONTAL, ABSOLUTE_VERT ) << item( paneNull, GREEDY ) - << item( IDC_CLOCK_FAST_BACKWARD, NORESIZE ) - << item( IDC_CLOCK_BACKWARD, NORESIZE ) - << item( IDC_CLOCK_PAUSE, NORESIZE ) - << item( IDC_CLOCK_START, NORESIZE ) - << item( IDC_CLOCK_RATE, NORESIZE ) - << item( IDC_CLOCK_FORWARD, NORESIZE ) - << item( IDC_CLOCK_FAST_FORWARD, NORESIZE ) << item( paneNull, GREEDY ) ) << ( pane( HORIZONTAL, ABSOLUTE_VERT ) @@ -303,54 +289,6 @@ void CIvyProbeDlg::OnBind() m_expr.Clear(); } -void CIvyProbeDlg::OnClockFastBackward() -{ - CString buffer = "SetClock Rate=-9.0" ; - int count = bus->SendMsg( CONVSTR(buffer) ); - WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); -} - -void CIvyProbeDlg::OnClockBackward() -{ - CString buffer = "SetClock Rate=-1.0" ; - int count = bus->SendMsg( CONVSTR(buffer) ); - WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); -} - -void CIvyProbeDlg::OnClockPause() -{ - CString buffer = "ClockPause" ; - int count = bus->SendMsg( CONVSTR(buffer) ); - WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); -} - -void CIvyProbeDlg::OnClockStart() -{ - CString buffer = "ClockStart" ; - int count = bus->SendMsg( CONVSTR(buffer) ); - WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); -} - -void CIvyProbeDlg::OnClockForward() -{ - CString buffer = "SetClock Rate=9.0" ; - int count = bus->SendMsg( CONVSTR(buffer) ); - WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); -} - -void CIvyProbeDlg::OnClockFastForward() -{ - CString buffer = "SetClock Rate=100.0" ; - int count = bus->SendMsg( CONVSTR(buffer) ); - WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); -} - -void CIvyProbeDlg::OnClockRate() -{ - CString buffer = "SetClock Rate=1.0" ; - int count = bus->SendMsg( CONVSTR(buffer) ); - WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); -} void CIvyProbeDlg::OnLoad() { -- cgit v1.1 From d9c1c56cccbe7ab0247a582272ac5f0b0c14f235 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:10:58 +0000 Subject: Utilisateur : Fcolin Date : 26/02/03 Heure : 16:49 Archivé dans $/Bus/IvyProbe Commentaire: (vss 17) --- IvyProbe/IvyProbeDlg.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index 88cc8e2..b782aa7 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -127,17 +127,13 @@ BOOL CIvyProbeDlg::OnInitDialog() #ifdef USE_ETS // define the Layout - CreateRoot( VERTICAL ) + CreateRoot( VERTICAL, nDefaultBorder, 5 ) << ( pane( HORIZONTAL, ABSOLUTE_VERT ) << item ( IDC_BUSNUMBER, GREEDY ) << item ( IDC_START, NORESIZE ) ) << item ( IDC_TEXT, GREEDY ) << ( pane( HORIZONTAL, ABSOLUTE_VERT ) - << item( paneNull, GREEDY ) - << item( paneNull, GREEDY ) - ) - << ( pane( HORIZONTAL, ABSOLUTE_VERT ) << item( IDC_STATIC_MSG, NORESIZE ) << item( IDC_MSG, GREEDY ) << item( IDC_SEND, NORESIZE ) -- cgit v1.1 From 98c6dc0bc00a97a159e664e77606fc3d52082bff Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:00 +0000 Subject: Utilisateur : Fcolin Date : 23/01/04 Heure : 16:30 Archivé dans $/Bus/IvyProbe Commentaire: (vss 18) --- IvyProbe/IvyProbeDlg.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index b782aa7..d64c616 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -248,8 +248,12 @@ void CIvyProbeDlg::WriteMessage(const char *format, ...) void CIvyProbeDlg::OnClose() { // TODO: Add your message handler code here and/or call default - TRACE ( TEXT("Quitting\n")); - if (bus) delete bus; + TRACE ( TEXT("IvyProbe Quitting\n")); + if (bus) + { + bus->stop(); + delete bus; + } MyDialog::OnClose(); } -- cgit v1.1 From ec4b01a7990a0de789a40b846c62a679092e7409 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:02 +0000 Subject: Utilisateur : Fcolin Date : 1/06/05 Heure : 16:45 Archivé dans $/Bus/IvyProbe Commentaire: (vss 19) --- IvyProbe/IvyProbeDlg.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index d64c616..b29fd72 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -239,7 +239,7 @@ void CIvyProbeDlg::WriteMessage(const char *format, ...) // format and write the data we were given va_list args; va_start(args, format); - vsprintf(str, format, args); + _vsnprintf(str, sizeof(str), format, args); m_text.AppendString( str ); } -- cgit v1.1 From 49e3b1e92ab32714523690991027b5bc0cbb18ef Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:04 +0000 Subject: Utilisateur : Fcolin Date : 18/11/05 Heure : 11:46 Archivé dans $/Bus/IvyProbe Commentaire: (vss 20) --- IvyProbe/IvyProbeDlg.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index b29fd72..997ae6f 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -239,7 +239,7 @@ void CIvyProbeDlg::WriteMessage(const char *format, ...) // format and write the data we were given va_list args; va_start(args, format); - _vsnprintf(str, sizeof(str), format, args); + _vsnprintf_s(str, sizeof(str), sizeof(str)-1, format, args); m_text.AppendString( str ); } -- cgit v1.1 From 8576e4d65fb5683bda81d2a4d40327e0f34f4804 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:06 +0000 Subject: Utilisateur : Fcolin Date : 6/06/06 Heure : 16:43 Archivé dans $/Bus/IvyProbe Commentaire: (vss 21) --- IvyProbe/IvyProbeDlg.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index 997ae6f..3d0e7b2 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -157,6 +157,7 @@ BOOL CIvyProbeDlg::OnInitDialog() m_busnumber = cmd.m_busNumber; bus = new Ivy( "IvyProbe Windows","IvyProbe Windows Ready",this,FALSE); + bus->SetBindCallback( this ); // bus->BindMsg("(.*)", BUS_CALLBACK_OF(CTestDlg, IvyCallback )); @@ -203,7 +204,7 @@ void CIvyProbeDlg::OnStart() UpdateData(FALSE); } -void CIvyProbeDlg::IvyCallback(IvyApplication *app, int argc, const char **argv) +void CIvyProbeDlg::OnMessage(IvyApplication *app, int argc, const char **argv) { int i; CString text; @@ -233,6 +234,20 @@ void CIvyProbeDlg::OnApplicationDisconnected(IvyApplication *app) { WriteMessage( "Application: %s bye",(LPCSTR)(app->GetName()) ); } + +void CIvyProbeDlg::OnAddBind (IvyApplication *app, int id, const char * regexp) +{ + WriteMessage( "Application: %s Add Binding %s",(LPCSTR)(app->GetName()), regexp ); +} +void CIvyProbeDlg::OnRemoveBind (IvyApplication *app, int id, const char * regexp) +{ + WriteMessage( "Application: %s Remove Binding %s",(LPCSTR)(app->GetName()), regexp ); +} +void CIvyProbeDlg::OnFilterBind (IvyApplication *app, int id, const char * regexp) +{ + WriteMessage( "Application: %s Filtered Binding %s",(LPCSTR)(app->GetName()), regexp ); +} + void CIvyProbeDlg::WriteMessage(const char *format, ...) { char str[4096]; @@ -280,7 +295,7 @@ void CIvyProbeDlg::OnBind() m_expr.SetEditSel( 0, -1 ); m_expr.GetWindowText( buffer ); if ( buffer.IsEmpty() ) return; - int count = bus->BindMsg( CONVSTR(buffer) , BUS_CALLBACK_OF(CIvyProbeDlg, IvyCallback )); + int count = bus->BindMsg( CONVSTR(buffer) , this ); if ( m_expr.FindStringExact(-1, buffer) == CB_ERR ) { m_expr.AddString( buffer ); -- cgit v1.1 From 6d324616b64ce89bd9666ef8a87d9517407d9418 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:08 +0000 Subject: Utilisateur : Fcolin Date : 9/08/06 Heure : 16:02 Archivé dans $/Bus/IvyProbe Commentaire: (vss 22) --- IvyProbe/IvyProbeDlg.cpp | 53 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 3 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.cpp b/IvyProbe/IvyProbeDlg.cpp index 3d0e7b2..ef7bff8 100644 --- a/IvyProbe/IvyProbeDlg.cpp +++ b/IvyProbe/IvyProbeDlg.cpp @@ -14,6 +14,8 @@ static char THIS_FILE[] = __FILE__; #endif +static char BASED_CODE szFilterMsg[] = "Ivy Messages Files (*.ivm)|*.ivm|Ivy Files (*.ivm;*.ivb;*.txt)|*.ivm;*.ivb;*.txt|All Files (*.*)|*.*||"; +static char BASED_CODE szFilterBind[] = "Ivy Bindings Files (*.ivb)|*.ivb|Ivy Files (*.ivm;*.ivb;*.txt)|*.ivm;*.ivb;*.txt|All Files (*.*)|*.*||"; CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD) { @@ -70,6 +72,8 @@ BEGIN_MESSAGE_MAP(CIvyProbeDlg, MyDialog) ON_COMMAND(FILE_LOAD, OnLoad) ON_COMMAND(FILE_SAVE, OnSave) //}}AFX_MSG_MAP + ON_COMMAND(ID_FILE_SAVEBINDINGS, &CIvyProbeDlg::OnFileSavebindings) + ON_COMMAND(ID_FILE_LOADBINDINGS, &CIvyProbeDlg::OnFileLoadbindings) END_MESSAGE_MAP() @@ -283,7 +287,8 @@ void CIvyProbeDlg::OnSend() int count = bus->SendMsg( CONVSTR(buffer) ); if ( m_msg.FindStringExact(-1, buffer) == CB_ERR ) { - m_msg.AddString( buffer ); + //m_msg.AddString( buffer ); + m_msg.InsertString( 0, buffer ); } WriteMessage( "Sending %d message %s",count,CONVSTR(buffer) ); m_msg.Clear(); @@ -311,7 +316,7 @@ void CIvyProbeDlg::OnLoad() // TODO ReadString doesn't existe CString message; - CFileDialog dialog( TRUE, TEXT("txt"), NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, TEXT("Ivy Messages Files (*.txt)")); + CFileDialog dialog( TRUE, TEXT("ivm"), NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, szFilterMsg); if ( dialog.DoModal() == IDOK ) { CStdioFile file( dialog.GetPathName(), CFile::modeRead | CFile::typeText ); @@ -331,7 +336,7 @@ void CIvyProbeDlg::OnSave() // TODO WriteString doesn't existe CString message; - CFileDialog dialog( FALSE, TEXT("txt") , NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, TEXT("Ivy Messages Files (*.txt)")); + CFileDialog dialog( FALSE, TEXT("ivm") , NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, szFilterMsg); if ( dialog.DoModal() == IDOK ) { CStdioFile file( dialog.GetPathName(), CFile::modeCreate | CFile::modeWrite | CFile::typeText ); @@ -345,3 +350,45 @@ void CIvyProbeDlg::OnSave() } #endif } + +void CIvyProbeDlg::OnFileLoadbindings() +{ +#ifndef UNDER_CE + // TODO ReadString doesn't existe + CString message; + + CFileDialog dialog( TRUE, TEXT("ivb"), NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, szFilterBind); + if ( dialog.DoModal() == IDOK ) + { + CStdioFile file( dialog.GetPathName(), CFile::modeRead | CFile::typeText ); + m_expr.ResetContent(); + while ( file.ReadString( message )) + { + m_expr.AddString( message ); + bus->BindMsg( CONVSTR(message) , this ); + } + file.Close(); + } +#endif +} + +void CIvyProbeDlg::OnFileSavebindings() +{ +#ifndef UNDER_CE + // TODO WriteString doesn't existe + CString message; + + CFileDialog dialog( FALSE, TEXT("ivb") , NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, szFilterBind); + if ( dialog.DoModal() == IDOK ) + { + CStdioFile file( dialog.GetPathName(), CFile::modeCreate | CFile::modeWrite | CFile::typeText ); + for (int i=0;i < m_expr.GetCount();i++) + { + m_expr.GetLBText( i, message ); + file.WriteString(message + TEXT("\n")); + } + file.Close(); + + } +#endif +} -- cgit v1.1 From c49ed23fb67decde21919759b35b02e974266d10 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:11 +0000 Subject: Utilisateur : Fcolin Date : 18/12/98 Heure : 18:48 Créé (vss 1) --- IvyProbe/IvyProbeDlg.h | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 IvyProbe/IvyProbeDlg.h (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.h b/IvyProbe/IvyProbeDlg.h new file mode 100644 index 0000000..1534e65 --- /dev/null +++ b/IvyProbe/IvyProbeDlg.h @@ -0,0 +1,69 @@ +// TestDlg.h : header file +// + +#if !defined(AFX_TESTDLG_H__F7F08FF0_E653_11D0_AE3E_080009F92591__INCLUDED_) +#define AFX_TESTDLG_H__F7F08FF0_E653_11D0_AE3E_080009F92591__INCLUDED_ + +#if _MSC_VER >= 1000 +#pragma once +#endif // _MSC_VER >= 1000 + +#include "Bus.h" + +///////////////////////////////////////////////////////////////////////////// +// CTestDlg dialog + +class CTestDlg : public CDialog +{ +// Construction +public: + + CTestDlg(CWnd* pParent = NULL); // standard constructor + +// Dialog Data + //{{AFX_DATA(CTestDlg) + enum { IDD = IDD_TEST_DIALOG }; + CEdit m_text; + CSliderCtrl m_slider7; + CSliderCtrl m_slider6; + CSliderCtrl m_slider5; + CSliderCtrl m_slider4; + CSliderCtrl m_slider3; + CSliderCtrl m_slider2; + CSliderCtrl m_slider1; + CSliderCtrl m_slider0; + UINT m_busnumber; + //}}AFX_DATA + + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(CTestDlg) + protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + //}}AFX_VIRTUAL + +// Implementation +protected: + void ApplicationCallback( BusApplication *app, int event ); + void DirectCallback( BusApplication *app, int id, const char *arg ); + void FaderCallback( BusApplication *app, int argc, const char **argv ); + void BusCallback( BusApplication *app, int argc, const char **argv ); + Bus *bus; HICON m_hIcon; + + // Generated message map functions + //{{AFX_MSG(CTestDlg) + virtual BOOL OnInitDialog(); + afx_msg void OnSysCommand(UINT nID, LPARAM lParam); + afx_msg void OnPaint(); + afx_msg HCURSOR OnQueryDragIcon(); + afx_msg void OnStart(); + virtual void OnOK(); + afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() + +}; + +//{{AFX_INSERT_LOCATION}} +// Microsoft Developer Studio will insert additional declarations immediately before the previous line. + +#endif // !defined(AFX_TESTDLG_H__F7F08FF0_E653_11D0_AE3E_080009F92591__INCLUDED_) -- cgit v1.1 From c5c7e1fda322c75ca990c409a1a6b5704dddfbc8 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:12 +0000 Subject: Utilisateur : Fcolin Date : 22/12/98 Heure : 16:54 Archivé dans $/Bus/Test Commentaire: modif ligne message a emettre (vss 2) --- IvyProbe/IvyProbeDlg.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.h b/IvyProbe/IvyProbeDlg.h index 1534e65..05675ad 100644 --- a/IvyProbe/IvyProbeDlg.h +++ b/IvyProbe/IvyProbeDlg.h @@ -23,6 +23,7 @@ public: // Dialog Data //{{AFX_DATA(CTestDlg) enum { IDD = IDD_TEST_DIALOG }; + CEdit m_msgToSend; CEdit m_text; CSliderCtrl m_slider7; CSliderCtrl m_slider6; @@ -58,6 +59,7 @@ protected: afx_msg void OnStart(); virtual void OnOK(); afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar); + afx_msg void OnVscrollMsg(); //}}AFX_MSG DECLARE_MESSAGE_MAP() -- cgit v1.1 From e0e5eee4825779a1ede9c15a85fde77491d698bd Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:14 +0000 Subject: Utilisateur : Fcolin Date : 12/03/99 Heure : 18:52 Archivé dans $/Bus/Test (vss 3) --- IvyProbe/IvyProbeDlg.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.h b/IvyProbe/IvyProbeDlg.h index 05675ad..1667588 100644 --- a/IvyProbe/IvyProbeDlg.h +++ b/IvyProbe/IvyProbeDlg.h @@ -13,7 +13,7 @@ ///////////////////////////////////////////////////////////////////////////// // CTestDlg dialog -class CTestDlg : public CDialog +class CTestDlg : public CDialog, public BusApplicationCallback { // Construction public: @@ -44,8 +44,9 @@ public: // Implementation protected: - void ApplicationCallback( BusApplication *app, int event ); - void DirectCallback( BusApplication *app, int id, const char *arg ); + void OnApplicationConnected( BusApplication *app ); + void OnApplicationDisconnected( BusApplication *app ); + void OnDirectMessage( BusApplication *app, int id, const char *arg ); void FaderCallback( BusApplication *app, int argc, const char **argv ); void BusCallback( BusApplication *app, int argc, const char **argv ); Bus *bus; HICON m_hIcon; -- cgit v1.1 From 291bcf2e81ebae13339d08964bd52f44706be0f8 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:16 +0000 Subject: Utilisateur : Fcolin Date : 16/03/99 Heure : 16:22 Archivé dans $/Bus/Test (vss 4) --- IvyProbe/IvyProbeDlg.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.h b/IvyProbe/IvyProbeDlg.h index 1667588..62e3c95 100644 --- a/IvyProbe/IvyProbeDlg.h +++ b/IvyProbe/IvyProbeDlg.h @@ -8,12 +8,12 @@ #pragma once #endif // _MSC_VER >= 1000 -#include "Bus.h" +#include "Ivy.h" ///////////////////////////////////////////////////////////////////////////// // CTestDlg dialog -class CTestDlg : public CDialog, public BusApplicationCallback +class CTestDlg : public CDialog, public IvyApplicationCallback { // Construction public: @@ -23,8 +23,8 @@ public: // Dialog Data //{{AFX_DATA(CTestDlg) enum { IDD = IDD_TEST_DIALOG }; - CEdit m_msgToSend; - CEdit m_text; + CEdit m_msgToSend; + CEdit m_text; CSliderCtrl m_slider7; CSliderCtrl m_slider6; CSliderCtrl m_slider5; @@ -33,7 +33,7 @@ public: CSliderCtrl m_slider2; CSliderCtrl m_slider1; CSliderCtrl m_slider0; - UINT m_busnumber; + CString m_busnumber; //}}AFX_DATA // ClassWizard generated virtual function overrides @@ -44,12 +44,12 @@ public: // Implementation protected: - void OnApplicationConnected( BusApplication *app ); - void OnApplicationDisconnected( BusApplication *app ); - void OnDirectMessage( BusApplication *app, int id, const char *arg ); - void FaderCallback( BusApplication *app, int argc, const char **argv ); - void BusCallback( BusApplication *app, int argc, const char **argv ); - Bus *bus; HICON m_hIcon; + void OnApplicationConnected( IvyApplication *app ); + void OnApplicationDisconnected( IvyApplication *app ); + void OnDirectMessage( IvyApplication *app, int id, const char *arg ); + void FaderCallback( IvyApplication *app, int argc, const char **argv ); + void IvyCallback( IvyApplication *app, int argc, const char **argv ); + Ivy *bus; HICON m_hIcon; // Generated message map functions //{{AFX_MSG(CTestDlg) -- cgit v1.1 From ec1119c0331d63dd8e8e218784e9fd6f7f929262 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:18 +0000 Subject: Utilisateur : Fcolin Date : 29/07/99 Heure : 16:46 Archivé dans $/Bus/Test (vss 5) --- IvyProbe/IvyProbeDlg.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.h b/IvyProbe/IvyProbeDlg.h index 62e3c95..d9706dd 100644 --- a/IvyProbe/IvyProbeDlg.h +++ b/IvyProbe/IvyProbeDlg.h @@ -44,6 +44,7 @@ public: // Implementation protected: + void WriteMessage(const CString & text); void OnApplicationConnected( IvyApplication *app ); void OnApplicationDisconnected( IvyApplication *app ); void OnDirectMessage( IvyApplication *app, int id, const char *arg ); @@ -58,9 +59,10 @@ protected: afx_msg void OnPaint(); afx_msg HCURSOR OnQueryDragIcon(); afx_msg void OnStart(); - virtual void OnOK(); afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar); afx_msg void OnVscrollMsg(); + afx_msg void OnClose(); + virtual void OnOK(); //}}AFX_MSG DECLARE_MESSAGE_MAP() -- cgit v1.1 From 294eaddf62e91fa43f412159fb06afa8de44ec69 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:20 +0000 Subject: Utilisateur : Fcolin Date : 6/01/00 Heure : 11:15 Archivé dans $/Bus/Test Commentaire: ajout bind to msg (vss 6) --- IvyProbe/IvyProbeDlg.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.h b/IvyProbe/IvyProbeDlg.h index d9706dd..ac32f11 100644 --- a/IvyProbe/IvyProbeDlg.h +++ b/IvyProbe/IvyProbeDlg.h @@ -23,6 +23,7 @@ public: // Dialog Data //{{AFX_DATA(CTestDlg) enum { IDD = IDD_TEST_DIALOG }; + CEdit m_bind; CEdit m_msgToSend; CEdit m_text; CSliderCtrl m_slider7; @@ -63,6 +64,7 @@ protected: afx_msg void OnVscrollMsg(); afx_msg void OnClose(); virtual void OnOK(); + afx_msg void OnVscrollBind(); //}}AFX_MSG DECLARE_MESSAGE_MAP() -- cgit v1.1 From 7cd160a4389e4abc0a26b5d880d260f4e3af5437 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:22 +0000 Subject: Utilisateur : Fcolin Date : 14/03/00 Heure : 11:49 Archivé dans $/Bus/Test Commentaire: modif boite resize et combo box (vss 7) --- IvyProbe/IvyProbeDlg.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.h b/IvyProbe/IvyProbeDlg.h index ac32f11..953d403 100644 --- a/IvyProbe/IvyProbeDlg.h +++ b/IvyProbe/IvyProbeDlg.h @@ -13,18 +13,19 @@ ///////////////////////////////////////////////////////////////////////////// // CTestDlg dialog -class CTestDlg : public CDialog, public IvyApplicationCallback +class CTestDlg : public ETSLayoutDialog, public IvyApplicationCallback { // Construction public: CTestDlg(CWnd* pParent = NULL); // standard constructor + DECLARE_LAYOUT(); // Dialog Data //{{AFX_DATA(CTestDlg) enum { IDD = IDD_TEST_DIALOG }; - CEdit m_bind; - CEdit m_msgToSend; + CComboBox m_expr; + CComboBox m_msg; CEdit m_text; CSliderCtrl m_slider7; CSliderCtrl m_slider6; @@ -57,14 +58,12 @@ protected: //{{AFX_MSG(CTestDlg) virtual BOOL OnInitDialog(); afx_msg void OnSysCommand(UINT nID, LPARAM lParam); - afx_msg void OnPaint(); afx_msg HCURSOR OnQueryDragIcon(); afx_msg void OnStart(); afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar); - afx_msg void OnVscrollMsg(); afx_msg void OnClose(); - virtual void OnOK(); - afx_msg void OnVscrollBind(); + afx_msg void OnSend(); + afx_msg void OnBind(); //}}AFX_MSG DECLARE_MESSAGE_MAP() -- cgit v1.1 From 28e0cb4fc10c7813d06a8d1c8154d64f250e9ce7 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:24 +0000 Subject: Utilisateur : Fcolin Date : 14/03/00 Heure : 14:49 Archivé dans $/Bus/Test Commentaire: modif Text Scroll (vss 8) --- IvyProbe/IvyProbeDlg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.h b/IvyProbe/IvyProbeDlg.h index 953d403..bd6c941 100644 --- a/IvyProbe/IvyProbeDlg.h +++ b/IvyProbe/IvyProbeDlg.h @@ -21,12 +21,12 @@ public: CTestDlg(CWnd* pParent = NULL); // standard constructor DECLARE_LAYOUT(); + CHistoryEdit m_text; // Dialog Data //{{AFX_DATA(CTestDlg) enum { IDD = IDD_TEST_DIALOG }; CComboBox m_expr; CComboBox m_msg; - CEdit m_text; CSliderCtrl m_slider7; CSliderCtrl m_slider6; CSliderCtrl m_slider5; @@ -46,7 +46,7 @@ public: // Implementation protected: - void WriteMessage(const CString & text); + void WriteMessage(LPCTSTR format, ...); void OnApplicationConnected( IvyApplication *app ); void OnApplicationDisconnected( IvyApplication *app ); void OnDirectMessage( IvyApplication *app, int id, const char *arg ); -- cgit v1.1 From 60d0d61b5ef2cd7ab13804a12617de856f23b7d3 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:26 +0000 Subject: Utilisateur : Fcolin Date : 2/02/01 Heure : 18:30 Archivé dans $/Bus/Test Commentaire: win CE compile not finished (vss 9) --- IvyProbe/IvyProbeDlg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.h b/IvyProbe/IvyProbeDlg.h index bd6c941..5ed0e5e 100644 --- a/IvyProbe/IvyProbeDlg.h +++ b/IvyProbe/IvyProbeDlg.h @@ -13,7 +13,7 @@ ///////////////////////////////////////////////////////////////////////////// // CTestDlg dialog -class CTestDlg : public ETSLayoutDialog, public IvyApplicationCallback +class CTestDlg : public MyDialog, public IvyApplicationCallback { // Construction public: -- cgit v1.1 From 8c356cbfd8b74015466126cacb1b4eb9c162d676 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:28 +0000 Subject: Utilisateur : Fcolin Date : 19/02/01 Heure : 10:39 Archivé dans $/Bus/Test (vss 10) --- IvyProbe/IvyProbeDlg.h | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.h b/IvyProbe/IvyProbeDlg.h index 5ed0e5e..61e3c12 100644 --- a/IvyProbe/IvyProbeDlg.h +++ b/IvyProbe/IvyProbeDlg.h @@ -9,6 +9,31 @@ #endif // _MSC_VER >= 1000 #include "Ivy.h" +///////////////////////////////////////////////////////////////////////////// +// CAboutDlg dialog used for App About + +class CAboutDlg : public CDialog +{ +public: + CAboutDlg(); + +// Dialog Data + //{{AFX_DATA(CAboutDlg) + enum { IDD = IDD_ABOUTBOX }; + //}}AFX_DATA + + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(CAboutDlg) + protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + //}}AFX_VIRTUAL + +// Implementation +protected: + //{{AFX_MSG(CAboutDlg) + //}}AFX_MSG + DECLARE_MESSAGE_MAP() +}; ///////////////////////////////////////////////////////////////////////////// // CTestDlg dialog @@ -57,7 +82,7 @@ protected: // Generated message map functions //{{AFX_MSG(CTestDlg) virtual BOOL OnInitDialog(); - afx_msg void OnSysCommand(UINT nID, LPARAM lParam); + //afx_msg void OnSysCommand(UINT nID, LPARAM lParam); afx_msg HCURSOR OnQueryDragIcon(); afx_msg void OnStart(); afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar); -- cgit v1.1 From c87f297c3840c032d3fc6a3ea9dfea48d9c88397 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:30 +0000 Subject: Utilisateur : Fcolin Date : 19/02/01 Heure : 17:00 Archivé dans $/Bus/Test (vss 11) --- IvyProbe/IvyProbeDlg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.h b/IvyProbe/IvyProbeDlg.h index 61e3c12..4d97c67 100644 --- a/IvyProbe/IvyProbeDlg.h +++ b/IvyProbe/IvyProbeDlg.h @@ -71,7 +71,7 @@ public: // Implementation protected: - void WriteMessage(LPCTSTR format, ...); + void WriteMessage(const char * format, ...); void OnApplicationConnected( IvyApplication *app ); void OnApplicationDisconnected( IvyApplication *app ); void OnDirectMessage( IvyApplication *app, int id, const char *arg ); -- cgit v1.1 From 0f81b4e3805796d2d71d318b60537b8847ac65d3 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:32 +0000 Subject: Utilisateur : Fcolin Date : 14/09/01 Heure : 15:21 Archivé dans $/Bus/Test (vss 12) --- IvyProbe/IvyProbeDlg.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.h b/IvyProbe/IvyProbeDlg.h index 4d97c67..fa90f09 100644 --- a/IvyProbe/IvyProbeDlg.h +++ b/IvyProbe/IvyProbeDlg.h @@ -82,13 +82,19 @@ protected: // Generated message map functions //{{AFX_MSG(CTestDlg) virtual BOOL OnInitDialog(); - //afx_msg void OnSysCommand(UINT nID, LPARAM lParam); afx_msg HCURSOR OnQueryDragIcon(); afx_msg void OnStart(); afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar); afx_msg void OnClose(); afx_msg void OnSend(); afx_msg void OnBind(); + afx_msg void OnClockFastBackward(); + afx_msg void OnClockBackward(); + afx_msg void OnClockPause(); + afx_msg void OnClockStart(); + afx_msg void OnClockForward(); + afx_msg void OnClockFastForward(); + afx_msg void OnClockRate(); //}}AFX_MSG DECLARE_MESSAGE_MAP() -- cgit v1.1 From 63ac5d3c955c4373fe87b0f8f44fbc344b0336c7 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:34 +0000 Subject: Utilisateur : Fcolin Date : 27/03/02 Heure : 12:29 Archivé dans $/Bus/Test Commentaire: Add file load and save for message (vss 13) --- IvyProbe/IvyProbeDlg.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.h b/IvyProbe/IvyProbeDlg.h index fa90f09..bf59474 100644 --- a/IvyProbe/IvyProbeDlg.h +++ b/IvyProbe/IvyProbeDlg.h @@ -77,7 +77,8 @@ protected: void OnDirectMessage( IvyApplication *app, int id, const char *arg ); void FaderCallback( IvyApplication *app, int argc, const char **argv ); void IvyCallback( IvyApplication *app, int argc, const char **argv ); - Ivy *bus; HICON m_hIcon; + Ivy *bus; + HICON m_hIcon; // Generated message map functions //{{AFX_MSG(CTestDlg) @@ -95,6 +96,8 @@ protected: afx_msg void OnClockForward(); afx_msg void OnClockFastForward(); afx_msg void OnClockRate(); + afx_msg void OnLoad(); + afx_msg void OnSave(); //}}AFX_MSG DECLARE_MESSAGE_MAP() -- cgit v1.1 From 01be0b37170026a6f07f25a4d734bf9f7a2984fd Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:37 +0000 Subject: Utilisateur : Fcolin Date : 13/01/03 Heure : 15:28 Archivé dans $/Bus/IvyProbe Commentaire: (vss 14) --- IvyProbe/IvyProbeDlg.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.h b/IvyProbe/IvyProbeDlg.h index bf59474..0823c38 100644 --- a/IvyProbe/IvyProbeDlg.h +++ b/IvyProbe/IvyProbeDlg.h @@ -9,6 +9,13 @@ #endif // _MSC_VER >= 1000 #include "Ivy.h" +#ifdef USE_ETS +#include "ETSLayout.h" +#define MyDialog ETSLayoutDialog +#else +#define MyDialog CDialog +#endif +#include "HistoryEdit.h" ///////////////////////////////////////////////////////////////////////////// // CAboutDlg dialog used for App About @@ -44,8 +51,9 @@ class CTestDlg : public MyDialog, public IvyApplicationCallback public: CTestDlg(CWnd* pParent = NULL); // standard constructor +#ifdef USE_ETS DECLARE_LAYOUT(); - +#endif CHistoryEdit m_text; // Dialog Data //{{AFX_DATA(CTestDlg) -- cgit v1.1 From 72af581ca773279af49c7715d6df6a3c53d9943b Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:38 +0000 Subject: Utilisateur : Fcolin Date : 21/02/03 Heure : 16:31 Archivé dans $/Bus/IvyProbe Commentaire: (vss 15) --- IvyProbe/IvyProbeDlg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.h b/IvyProbe/IvyProbeDlg.h index 0823c38..127a716 100644 --- a/IvyProbe/IvyProbeDlg.h +++ b/IvyProbe/IvyProbeDlg.h @@ -45,12 +45,12 @@ protected: ///////////////////////////////////////////////////////////////////////////// // CTestDlg dialog -class CTestDlg : public MyDialog, public IvyApplicationCallback +class CIvyProbeDlg : public MyDialog, public IvyApplicationCallback { // Construction public: - CTestDlg(CWnd* pParent = NULL); // standard constructor + CIvyProbeDlg(CWnd* pParent = NULL); // standard constructor #ifdef USE_ETS DECLARE_LAYOUT(); #endif -- cgit v1.1 From 8f2e27496eaa11cf658f8055615c175bd247252b Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:40 +0000 Subject: Utilisateur : Fcolin Date : 26/02/03 Heure : 16:40 Archivé dans $/Bus/IvyProbe Commentaire: suppression bouton clock start (vss 16) --- IvyProbe/IvyProbeDlg.h | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.h b/IvyProbe/IvyProbeDlg.h index 127a716..297c3af 100644 --- a/IvyProbe/IvyProbeDlg.h +++ b/IvyProbe/IvyProbeDlg.h @@ -60,14 +60,6 @@ public: enum { IDD = IDD_TEST_DIALOG }; CComboBox m_expr; CComboBox m_msg; - CSliderCtrl m_slider7; - CSliderCtrl m_slider6; - CSliderCtrl m_slider5; - CSliderCtrl m_slider4; - CSliderCtrl m_slider3; - CSliderCtrl m_slider2; - CSliderCtrl m_slider1; - CSliderCtrl m_slider0; CString m_busnumber; //}}AFX_DATA @@ -97,13 +89,6 @@ protected: afx_msg void OnClose(); afx_msg void OnSend(); afx_msg void OnBind(); - afx_msg void OnClockFastBackward(); - afx_msg void OnClockBackward(); - afx_msg void OnClockPause(); - afx_msg void OnClockStart(); - afx_msg void OnClockForward(); - afx_msg void OnClockFastForward(); - afx_msg void OnClockRate(); afx_msg void OnLoad(); afx_msg void OnSave(); //}}AFX_MSG -- cgit v1.1 From 378838d8274697057429fac2112b87e90452be09 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:42 +0000 Subject: Utilisateur : Fcolin Date : 6/06/06 Heure : 16:43 Archivé dans $/Bus/IvyProbe Commentaire: (vss 17) --- IvyProbe/IvyProbeDlg.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.h b/IvyProbe/IvyProbeDlg.h index 297c3af..135a567 100644 --- a/IvyProbe/IvyProbeDlg.h +++ b/IvyProbe/IvyProbeDlg.h @@ -45,7 +45,7 @@ protected: ///////////////////////////////////////////////////////////////////////////// // CTestDlg dialog -class CIvyProbeDlg : public MyDialog, public IvyApplicationCallback +class CIvyProbeDlg : public MyDialog, public IvyApplicationCallback, public IvyBindingCallback, public IvyMessageCallback { // Construction public: @@ -75,8 +75,12 @@ protected: void OnApplicationConnected( IvyApplication *app ); void OnApplicationDisconnected( IvyApplication *app ); void OnDirectMessage( IvyApplication *app, int id, const char *arg ); - void FaderCallback( IvyApplication *app, int argc, const char **argv ); - void IvyCallback( IvyApplication *app, int argc, const char **argv ); + void OnAddBind (IvyApplication *app, int id, const char * regexp); + void OnRemoveBind (IvyApplication *app, int id, const char * regexp); + void OnFilterBind (IvyApplication *app, int id, const char * regexp); + + void FaderCallback ( IvyApplication *app, int argc, const char **argv ); + void OnMessage ( IvyApplication *app, int argc, const char **argv ); Ivy *bus; HICON m_hIcon; -- cgit v1.1 From 7a185594f1a0242f00d63e15a11f6f71b0dc1f4b Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:44 +0000 Subject: Utilisateur : Fcolin Date : 9/08/06 Heure : 16:02 Archivé dans $/Bus/IvyProbe Commentaire: (vss 18) --- IvyProbe/IvyProbeDlg.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'IvyProbe') diff --git a/IvyProbe/IvyProbeDlg.h b/IvyProbe/IvyProbeDlg.h index 135a567..eee40ef 100644 --- a/IvyProbe/IvyProbeDlg.h +++ b/IvyProbe/IvyProbeDlg.h @@ -98,6 +98,10 @@ protected: //}}AFX_MSG DECLARE_MESSAGE_MAP() +public: + afx_msg void OnFileSavebindings(); +public: + afx_msg void OnFileLoadbindings(); }; //{{AFX_INSERT_LOCATION}} -- cgit v1.1 From e8c3cbbf03690b01892e1bab7b6a0680800987cf Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:47 +0000 Subject: Utilisateur : Fcolin Date : 10/06/02 Heure : 12:54 Créé Commentaire: (vss 1) --- IvyProbe/ReadMe.txt | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 IvyProbe/ReadMe.txt (limited to 'IvyProbe') diff --git a/IvyProbe/ReadMe.txt b/IvyProbe/ReadMe.txt new file mode 100644 index 0000000..333432d --- /dev/null +++ b/IvyProbe/ReadMe.txt @@ -0,0 +1,81 @@ +======================================================================== + MICROSOFT FOUNDATION CLASS LIBRARY : Test +======================================================================== + + +AppWizard has created this Test application for you. This application +not only demonstrates the basics of using the Microsoft Foundation classes +but is also a starting point for writing your application. + +This file contains a summary of what you will find in each of the files that +make up your Test application. + +Test.h + This is the main header file for the application. It includes other + project specific headers (including Resource.h) and declares the + CTestApp application class. + +Test.cpp + This is the main application source file that contains the application + class CTestApp. + +Test.rc + This is a listing of all of the Microsoft Windows resources that the + program uses. It includes the icons, bitmaps, and cursors that are stored + in the RES subdirectory. This file can be directly edited in Microsoft + Developer Studio. + +res\Test.ico + This is an icon file, which is used as the application's icon. This + icon is included by the main resource file Test.rc. + +res\Test.rc2 + This file contains resources that are not edited by Microsoft + Developer Studio. You should place all resources not + editable by the resource editor in this file. + +Test.clw + This file contains information used by ClassWizard to edit existing + classes or add new classes. ClassWizard also uses this file to store + information needed to create and edit message maps and dialog data + maps and to create prototype member functions. + + +///////////////////////////////////////////////////////////////////////////// + +AppWizard creates one dialog class: + +TestDlg.h, TestDlg.cpp - the dialog + These files contain your CTestDlg class. This class defines + the behavior of your application's main dialog. The dialog's + template is in Test.rc, which can be edited in Microsoft + Developer Studio. + + +///////////////////////////////////////////////////////////////////////////// +Other standard files: + +StdAfx.h, StdAfx.cpp + These files are used to build a precompiled header (PCH) file + named Test.pch and a precompiled types file named StdAfx.obj. + +Resource.h + This is the standard header file, which defines new resource IDs. + Microsoft Developer Studio reads and updates this file. + +///////////////////////////////////////////////////////////////////////////// +Other notes: + +AppWizard uses "TODO:" to indicate parts of the source code you +should add to or customize. + +If your application uses MFC in a shared DLL, and your application is +in a language other than the operating system's current language, you +will need to copy the corresponding localized resources MFC40XXX.DLL +from the Microsoft Visual C++ CD-ROM onto the system or system32 directory, +and rename it to be MFCLOC.DLL. ("XXX" stands for the language abbreviation. +For example, MFC40DEU.DLL contains resources translated to German.) If you +don't do this, some of the UI elements of your application will remain in the +language of the operating system. + +///////////////////////////////////////////////////////////////////////////// -- cgit v1.1 From e2612aa597b27394991fbe8b000e3c15d93d9917 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:49 +0000 Subject: Utilisateur : Fcolin Date : 18/12/98 Heure : 18:48 Créé (vss 1) --- IvyProbe/Resource.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 IvyProbe/Resource.h (limited to 'IvyProbe') diff --git a/IvyProbe/Resource.h b/IvyProbe/Resource.h new file mode 100644 index 0000000..e40669b --- /dev/null +++ b/IvyProbe/Resource.h @@ -0,0 +1,32 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Developer Studio generated include file. +// Used by Test.rc +// +#define IDM_ABOUTBOX 0x0010 +#define IDD_ABOUTBOX 100 +#define IDS_ABOUTBOX 101 +#define IDD_TEST_DIALOG 102 +#define CG_IDS_SOCKETS_INIT_FAILED 103 +#define IDR_MAINFRAME 128 +#define IDC_BUSNUMBER 1000 +#define IDC_START 1001 +#define IDC_SLIDER0 1002 +#define IDC_SLIDER1 1003 +#define IDC_SLIDER3 1004 +#define IDC_SLIDER4 1005 +#define IDC_SLIDER5 1006 +#define IDC_SLIDER6 1007 +#define IDC_SLIDER7 1008 +#define IDC_SLIDER2 1010 +#define IDC_TEXT 1011 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 129 +#define _APS_NEXT_COMMAND_VALUE 32771 +#define _APS_NEXT_CONTROL_VALUE 1012 +#define _APS_NEXT_SYMED_VALUE 104 +#endif +#endif -- cgit v1.1 From 8adf140e0f39bfa3984d24439f51714800d52be3 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:50 +0000 Subject: Utilisateur : Fcolin Date : 22/12/98 Heure : 16:54 Archivé dans $/Bus/Test Commentaire: modif ligne message a emettre (vss 2) --- IvyProbe/Resource.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/Resource.h b/IvyProbe/Resource.h index e40669b..6a80ecb 100644 --- a/IvyProbe/Resource.h +++ b/IvyProbe/Resource.h @@ -19,6 +19,7 @@ #define IDC_SLIDER7 1008 #define IDC_SLIDER2 1010 #define IDC_TEXT 1011 +#define IDC_MSG 1012 // Next default values for new objects // @@ -26,7 +27,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 129 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1012 +#define _APS_NEXT_CONTROL_VALUE 1013 #define _APS_NEXT_SYMED_VALUE 104 #endif #endif -- cgit v1.1 From 1273733a5b24b8fb48c9c2d5374e1569b1d6aa0a Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:53 +0000 Subject: Utilisateur : Fcolin Date : 6/01/00 Heure : 11:15 Archivé dans $/Bus/Test Commentaire: ajout bind to msg (vss 3) --- IvyProbe/Resource.h | 1 + 1 file changed, 1 insertion(+) (limited to 'IvyProbe') diff --git a/IvyProbe/Resource.h b/IvyProbe/Resource.h index 6a80ecb..f8d5965 100644 --- a/IvyProbe/Resource.h +++ b/IvyProbe/Resource.h @@ -20,6 +20,7 @@ #define IDC_SLIDER2 1010 #define IDC_TEXT 1011 #define IDC_MSG 1012 +#define IDC_BIND 1013 // Next default values for new objects // -- cgit v1.1 From 697b1b4e9dea2db64d8f07a1a59bb5cbf8149dd2 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:54 +0000 Subject: Utilisateur : Fcolin Date : 14/03/00 Heure : 11:49 Archivé dans $/Bus/Test Commentaire: modif boite resize et combo box (vss 4) --- IvyProbe/Resource.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/Resource.h b/IvyProbe/Resource.h index f8d5965..70fe2c7 100644 --- a/IvyProbe/Resource.h +++ b/IvyProbe/Resource.h @@ -19,8 +19,12 @@ #define IDC_SLIDER7 1008 #define IDC_SLIDER2 1010 #define IDC_TEXT 1011 -#define IDC_MSG 1012 -#define IDC_BIND 1013 +#define IDC_MSG 1015 +#define IDC_SEND 1016 +#define IDC_BIND 1017 +#define IDC_STATIC_MSG 1018 +#define IDC_STATIC_BIND 1019 +#define IDC_REGEXP 1021 // Next default values for new objects // @@ -28,7 +32,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 129 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1013 +#define _APS_NEXT_CONTROL_VALUE 1022 #define _APS_NEXT_SYMED_VALUE 104 #endif #endif -- cgit v1.1 From abc41ba285094480634a4d7e24dd773e82e3c721 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:56 +0000 Subject: Utilisateur : Fcolin Date : 14/03/00 Heure : 14:49 Archivé dans $/Bus/Test Commentaire: modif Text Scroll (vss 5) --- IvyProbe/Resource.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/Resource.h b/IvyProbe/Resource.h index 70fe2c7..97c8ba1 100644 --- a/IvyProbe/Resource.h +++ b/IvyProbe/Resource.h @@ -30,9 +30,9 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 129 +#define _APS_NEXT_RESOURCE_VALUE 132 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1022 +#define _APS_NEXT_CONTROL_VALUE 1024 #define _APS_NEXT_SYMED_VALUE 104 #endif #endif -- cgit v1.1 From f0033f355c6dda53a7ed6ea8709fcbc9b9b9c9f3 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:11:58 +0000 Subject: Utilisateur : Fcolin Date : 14/09/01 Heure : 15:21 Archivé dans $/Bus/Test (vss 6) --- IvyProbe/Resource.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/Resource.h b/IvyProbe/Resource.h index 97c8ba1..972709c 100644 --- a/IvyProbe/Resource.h +++ b/IvyProbe/Resource.h @@ -25,6 +25,13 @@ #define IDC_STATIC_MSG 1018 #define IDC_STATIC_BIND 1019 #define IDC_REGEXP 1021 +#define IDC_CLOCK_FAST_BACKWARD 1026 +#define IDC_CLOCK_BACKWARD 1027 +#define IDC_CLOCK_START 1028 +#define IDC_CLOCK_PAUSE 1029 +#define IDC_CLOCK_FORWARD 1030 +#define IDC_CLOCK_FAST_FORWARD 1031 +#define IDC_CLOCK_RATE 1032 // Next default values for new objects // @@ -32,7 +39,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 132 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1024 +#define _APS_NEXT_CONTROL_VALUE 1027 #define _APS_NEXT_SYMED_VALUE 104 #endif #endif -- cgit v1.1 From 236dd4d8a17f0e5a05246845a6eb5b1c80aacad1 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:01 +0000 Subject: Utilisateur : Fcolin Date : 27/03/02 Heure : 12:29 Archivé dans $/Bus/Test Commentaire: Add file load and save for message (vss 7) --- IvyProbe/Resource.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/Resource.h b/IvyProbe/Resource.h index 972709c..e7530a2 100644 --- a/IvyProbe/Resource.h +++ b/IvyProbe/Resource.h @@ -8,6 +8,7 @@ #define IDD_TEST_DIALOG 102 #define CG_IDS_SOCKETS_INIT_FAILED 103 #define IDR_MAINFRAME 128 +#define IDR_MENU1 132 #define IDC_BUSNUMBER 1000 #define IDC_START 1001 #define IDC_SLIDER0 1002 @@ -32,13 +33,15 @@ #define IDC_CLOCK_FORWARD 1030 #define IDC_CLOCK_FAST_FORWARD 1031 #define IDC_CLOCK_RATE 1032 +#define FILE_SAVE 32771 +#define FILE_LOAD 32772 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 132 -#define _APS_NEXT_COMMAND_VALUE 32771 +#define _APS_NEXT_RESOURCE_VALUE 133 +#define _APS_NEXT_COMMAND_VALUE 32773 #define _APS_NEXT_CONTROL_VALUE 1027 #define _APS_NEXT_SYMED_VALUE 104 #endif -- cgit v1.1 From 37b07f7de883c87bf1b687ac875e002408fc9b87 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:02 +0000 Subject: Utilisateur : Fcolin Date : 21/02/03 Heure : 16:13 Archivé dans $/Bus/IvyProbe Commentaire: (vss 8) --- IvyProbe/Resource.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/Resource.h b/IvyProbe/Resource.h index e7530a2..c4cd154 100644 --- a/IvyProbe/Resource.h +++ b/IvyProbe/Resource.h @@ -1,11 +1,12 @@ //{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. +// Microsoft Visual C++ generated include file. // Used by Test.rc // #define IDM_ABOUTBOX 0x0010 #define IDD_ABOUTBOX 100 #define IDS_ABOUTBOX 101 #define IDD_TEST_DIALOG 102 +#define IDD_IVYPROBE_DIALOG 102 #define CG_IDS_SOCKETS_INIT_FAILED 103 #define IDR_MAINFRAME 128 #define IDR_MENU1 132 -- cgit v1.1 From 7b6724fb751246ab5b240bc5a7e3e4d8b6d8bd93 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:04 +0000 Subject: Utilisateur : Fcolin Date : 21/02/03 Heure : 16:31 Archivé dans $/Bus/IvyProbe Commentaire: (vss 9) --- IvyProbe/Resource.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/Resource.h b/IvyProbe/Resource.h index c4cd154..809c90f 100644 --- a/IvyProbe/Resource.h +++ b/IvyProbe/Resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by Test.rc +// Used by IvyProbe.rc // #define IDM_ABOUTBOX 0x0010 #define IDD_ABOUTBOX 100 -- cgit v1.1 From 0546692aec1f7cf3b1d4153122025a050d443578 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:06 +0000 Subject: Utilisateur : Fcolin Date : 26/02/03 Heure : 16:40 Archivé dans $/Bus/IvyProbe Commentaire: suppression bouton clock start (vss 10) --- IvyProbe/Resource.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/Resource.h b/IvyProbe/Resource.h index 809c90f..3c75223 100644 --- a/IvyProbe/Resource.h +++ b/IvyProbe/Resource.h @@ -2,6 +2,7 @@ // Microsoft Visual C++ generated include file. // Used by IvyProbe.rc // +#define IDR_MANIFEST 1 #define IDM_ABOUTBOX 0x0010 #define IDD_ABOUTBOX 100 #define IDS_ABOUTBOX 101 @@ -41,7 +42,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 133 +#define _APS_NEXT_RESOURCE_VALUE 134 #define _APS_NEXT_COMMAND_VALUE 32773 #define _APS_NEXT_CONTROL_VALUE 1027 #define _APS_NEXT_SYMED_VALUE 104 -- cgit v1.1 From ce2737168ce16effbe3d2c18b56ced6ff7bccedc Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:08 +0000 Subject: Utilisateur : Fcolin Date : 9/08/06 Heure : 16:02 Archivé dans $/Bus/IvyProbe Commentaire: (vss 11) --- IvyProbe/Resource.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/Resource.h b/IvyProbe/Resource.h index 3c75223..afeece2 100644 --- a/IvyProbe/Resource.h +++ b/IvyProbe/Resource.h @@ -37,13 +37,15 @@ #define IDC_CLOCK_RATE 1032 #define FILE_SAVE 32771 #define FILE_LOAD 32772 +#define ID_FILE_SAVEBINDINGS 32773 +#define ID_FILE_LOADBINDINGS 32774 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 134 -#define _APS_NEXT_COMMAND_VALUE 32773 +#define _APS_NEXT_COMMAND_VALUE 32775 #define _APS_NEXT_CONTROL_VALUE 1027 #define _APS_NEXT_SYMED_VALUE 104 #endif -- cgit v1.1 From b50ba09468a05f69c81d4e818175ee5b0fa1d430 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:11 +0000 Subject: Utilisateur : Fcolin Date : 18/12/98 Heure : 18:48 Créé (vss 1) --- IvyProbe/StdAfx.cpp | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 IvyProbe/StdAfx.cpp (limited to 'IvyProbe') diff --git a/IvyProbe/StdAfx.cpp b/IvyProbe/StdAfx.cpp new file mode 100644 index 0000000..4b53d91 --- /dev/null +++ b/IvyProbe/StdAfx.cpp @@ -0,0 +1,6 @@ +// stdafx.cpp : source file that includes just the standard includes +// Test.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + -- cgit v1.1 From dd5237df04c19c5a507414b7e717081b09cf62c5 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:13 +0000 Subject: Utilisateur : Fcolin Date : 18/12/98 Heure : 18:48 Créé (vss 1) --- IvyProbe/StdAfx.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 IvyProbe/StdAfx.h (limited to 'IvyProbe') diff --git a/IvyProbe/StdAfx.h b/IvyProbe/StdAfx.h new file mode 100644 index 0000000..703bc37 --- /dev/null +++ b/IvyProbe/StdAfx.h @@ -0,0 +1,28 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#if !defined(AFX_STDAFX_H__F7F08FF2_E653_11D0_AE3E_080009F92591__INCLUDED_) +#define AFX_STDAFX_H__F7F08FF2_E653_11D0_AE3E_080009F92591__INCLUDED_ + +#if _MSC_VER >= 1000 +#pragma once +#endif // _MSC_VER >= 1000 + +#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers + +#include // MFC core and standard components +#include // MFC extensions +#include // MFC OLE automation classes +#ifndef _AFX_NO_AFXCMN_SUPPORT +#include // MFC support for Windows Common Controls +#endif // _AFX_NO_AFXCMN_SUPPORT +#include // MFC collections +#include +#include // MFC socket extensions + +//{{AFX_INSERT_LOCATION}} +// Microsoft Developer Studio will insert additional declarations immediately before the previous line. + +#endif // !defined(AFX_STDAFX_H__F7F08FF2_E653_11D0_AE3E_080009F92591__INCLUDED_) -- cgit v1.1 From 68af3ae83380a5161430e706863b579cc60e5e45 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:14 +0000 Subject: Utilisateur : Fcolin Date : 29/07/99 Heure : 16:46 Archivé dans $/Bus/Test (vss 2) --- IvyProbe/StdAfx.h | 1 + 1 file changed, 1 insertion(+) (limited to 'IvyProbe') diff --git a/IvyProbe/StdAfx.h b/IvyProbe/StdAfx.h index 703bc37..0d24d12 100644 --- a/IvyProbe/StdAfx.h +++ b/IvyProbe/StdAfx.h @@ -20,6 +20,7 @@ #endif // _AFX_NO_AFXCMN_SUPPORT #include // MFC collections #include +#include #include // MFC socket extensions //{{AFX_INSERT_LOCATION}} -- cgit v1.1 From 2cfe0a50bdc55ed20d35d6718d739891da74b464 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:16 +0000 Subject: Utilisateur : Fcolin Date : 14/03/00 Heure : 11:49 Archivé dans $/Bus/Test Commentaire: modif boite resize et combo box (vss 3) --- IvyProbe/StdAfx.h | 1 + 1 file changed, 1 insertion(+) (limited to 'IvyProbe') diff --git a/IvyProbe/StdAfx.h b/IvyProbe/StdAfx.h index 0d24d12..f44aeae 100644 --- a/IvyProbe/StdAfx.h +++ b/IvyProbe/StdAfx.h @@ -22,6 +22,7 @@ #include #include #include // MFC socket extensions +#include "ETSLayout.h" //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. -- cgit v1.1 From a810c638304f4f851e1d8faebf86467fc966b16f Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:18 +0000 Subject: Utilisateur : Fcolin Date : 14/03/00 Heure : 14:49 Archivé dans $/Bus/Test Commentaire: modif Text Scroll (vss 4) --- IvyProbe/StdAfx.h | 1 + 1 file changed, 1 insertion(+) (limited to 'IvyProbe') diff --git a/IvyProbe/StdAfx.h b/IvyProbe/StdAfx.h index f44aeae..799e157 100644 --- a/IvyProbe/StdAfx.h +++ b/IvyProbe/StdAfx.h @@ -23,6 +23,7 @@ #include #include // MFC socket extensions #include "ETSLayout.h" +#include "HistoryEdit.h" //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. -- cgit v1.1 From fac927b88bfd24832c3badede5e6c2d13a29970b Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:20 +0000 Subject: Utilisateur : Fcolin Date : 2/02/01 Heure : 18:30 Archivé dans $/Bus/Test Commentaire: win CE compile not finished (vss 5) --- IvyProbe/StdAfx.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'IvyProbe') diff --git a/IvyProbe/StdAfx.h b/IvyProbe/StdAfx.h index 799e157..35c8d10 100644 --- a/IvyProbe/StdAfx.h +++ b/IvyProbe/StdAfx.h @@ -20,9 +20,14 @@ #endif // _AFX_NO_AFXCMN_SUPPORT #include // MFC collections #include -#include +#include #include // MFC socket extensions +#ifndef UNDER_CE #include "ETSLayout.h" +#define MyDialog ETSLayoutDialog +#else +#define MyDialog CDialog +#endif #include "HistoryEdit.h" //{{AFX_INSERT_LOCATION}} -- cgit v1.1 From 5cff648700e909256cefd4e0e0e1fb6f2c588c96 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:22 +0000 Subject: Utilisateur : Fcolin Date : 13/01/03 Heure : 15:28 Archivé dans $/Bus/IvyProbe Commentaire: (vss 6) --- IvyProbe/StdAfx.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/StdAfx.h b/IvyProbe/StdAfx.h index 35c8d10..6f604f2 100644 --- a/IvyProbe/StdAfx.h +++ b/IvyProbe/StdAfx.h @@ -22,13 +22,7 @@ #include #include #include // MFC socket extensions -#ifndef UNDER_CE -#include "ETSLayout.h" -#define MyDialog ETSLayoutDialog -#else -#define MyDialog CDialog -#endif -#include "HistoryEdit.h" + //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. -- cgit v1.1 From 67833fd79a7908d81d92e95c5de19884d5f3ab8c Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:24 +0000 Subject: Utilisateur : Fcolin Date : 9/04/04 Heure : 16:31 Archivé dans $/Bus/IvyProbe Commentaire: (vss 7) --- IvyProbe/StdAfx.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/StdAfx.h b/IvyProbe/StdAfx.h index 6f604f2..bb04b8d 100644 --- a/IvyProbe/StdAfx.h +++ b/IvyProbe/StdAfx.h @@ -14,15 +14,23 @@ #include // MFC core and standard components #include // MFC extensions -#include // MFC OLE automation classes +#include +//#include // MFC OLE automation classes #ifndef _AFX_NO_AFXCMN_SUPPORT #include // MFC support for Windows Common Controls #endif // _AFX_NO_AFXCMN_SUPPORT #include // MFC collections #include -#include +//#include #include // MFC socket extensions - +#ifdef USE_ETS +#include "ETSLayout.h" +using namespace ETSLayout; +#define MyDialog ETSLayoutDialog +#else +#define MyDialog CDialog +#endif +#include "HistoryEdit.h" //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. -- cgit v1.1 From 501bc7c837b0d6d77d7e5d073020ac20fbd1c02a Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:27 +0000 Subject: Utilisateur : Fcolin Date : 31/01/01 Heure : 15:50 Créé (vss 1) --- IvyProbe/TestParseCmdLine.cpp | 75 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 IvyProbe/TestParseCmdLine.cpp (limited to 'IvyProbe') diff --git a/IvyProbe/TestParseCmdLine.cpp b/IvyProbe/TestParseCmdLine.cpp new file mode 100644 index 0000000..6b9201e --- /dev/null +++ b/IvyProbe/TestParseCmdLine.cpp @@ -0,0 +1,75 @@ +// FxParseCmdLine.cpp: implementation of the FxParseCmdLine class. +// +////////////////////////////////////////////////////////////////////// + +#include "stdafx.h" +#include "NewFxServer.h" +#include "FxParseCmdLine.h" + +#ifdef _DEBUG +#undef THIS_FILE +static char THIS_FILE[]=__FILE__; +#define new DEBUG_NEW +#endif + +////////////////////////////////////////////////////////////////////// +// Construction/Destruction +////////////////////////////////////////////////////////////////////// + +FxParseCmdLine::FxParseCmdLine() +{ + m_loop = FALSE; + m_start = FALSE; + m_busstart = FALSE; + m_speed = 10000; + m_exoFile = "D:\\users\\fcolin\\DATA\\SceTobago.toc"; + m_busNumber = ""; +} + +FxParseCmdLine::~FxParseCmdLine() +{ + +} + +void FxParseCmdLine::ParseParam(LPCTSTR lpszParam, BOOL bFlag, BOOL bLast) +{ + if (bFlag) + { + ParseParamFlag(lpszParam); + } + else + ParseParamNotFlag(lpszParam); + +} + +void FxParseCmdLine::ParseParamFlag(LPCTSTR pszParam) +{ + if (lstrcmpi(pszParam, "loop") == 0) + m_loop = TRUE; + else if (lstrcmpi(pszParam, "busstart") == 0) + m_busstart = TRUE; + else if (lstrcmpi(pszParam, "start") == 0) + m_start = TRUE; + else if (lstrcmpi(pszParam, "bus") == 0) + m_shellCommand = BusNumber; + else if (lstrcmpi(pszParam, "file") == 0) + m_shellCommand = ExoFile; + else if (lstrcmpi(pszParam, "speed") == 0) + m_shellCommand = Speed; +} + +void FxParseCmdLine::ParseParamNotFlag(LPCTSTR pszParam) +{ + switch ( m_shellCommand ) + { + case BusNumber: + m_busNumber = pszParam; + break; + case ExoFile: + m_exoFile = pszParam; + break; + case Speed: + m_speed = atoi(pszParam); + break; + } +} -- cgit v1.1 From 637e738039ec3f4a76d492516d767ef791e3758e Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:28 +0000 Subject: Utilisateur : Fcolin Date : 2/02/01 Heure : 18:30 Archivé dans $/Bus/Test Commentaire: win CE compile not finished (vss 2) --- IvyProbe/TestParseCmdLine.cpp | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/TestParseCmdLine.cpp b/IvyProbe/TestParseCmdLine.cpp index 6b9201e..62eff43 100644 --- a/IvyProbe/TestParseCmdLine.cpp +++ b/IvyProbe/TestParseCmdLine.cpp @@ -1,10 +1,10 @@ -// FxParseCmdLine.cpp: implementation of the FxParseCmdLine class. +// TestParseCmdLine.cpp: implementation of the TestParseCmdLine class. // ////////////////////////////////////////////////////////////////////// #include "stdafx.h" -#include "NewFxServer.h" -#include "FxParseCmdLine.h" + +#include "TestParseCmdLine.h" #ifdef _DEBUG #undef THIS_FILE @@ -16,22 +16,18 @@ static char THIS_FILE[]=__FILE__; // Construction/Destruction ////////////////////////////////////////////////////////////////////// -FxParseCmdLine::FxParseCmdLine() +TestParseCmdLine::TestParseCmdLine() { - m_loop = FALSE; m_start = FALSE; - m_busstart = FALSE; - m_speed = 10000; - m_exoFile = "D:\\users\\fcolin\\DATA\\SceTobago.toc"; m_busNumber = ""; } -FxParseCmdLine::~FxParseCmdLine() +TestParseCmdLine::~TestParseCmdLine() { } -void FxParseCmdLine::ParseParam(LPCTSTR lpszParam, BOOL bFlag, BOOL bLast) +void TestParseCmdLine::ParseParam(LPCTSTR lpszParam, BOOL bFlag, BOOL bLast) { if (bFlag) { @@ -42,34 +38,21 @@ void FxParseCmdLine::ParseParam(LPCTSTR lpszParam, BOOL bFlag, BOOL bLast) } -void FxParseCmdLine::ParseParamFlag(LPCTSTR pszParam) +void TestParseCmdLine::ParseParamFlag(LPCTSTR pszParam) { - if (lstrcmpi(pszParam, "loop") == 0) - m_loop = TRUE; - else if (lstrcmpi(pszParam, "busstart") == 0) - m_busstart = TRUE; - else if (lstrcmpi(pszParam, "start") == 0) + + if (lstrcmpi(pszParam, TEXT("start")) == 0) m_start = TRUE; - else if (lstrcmpi(pszParam, "bus") == 0) + else if (lstrcmpi(pszParam, TEXT("bus")) == 0) m_shellCommand = BusNumber; - else if (lstrcmpi(pszParam, "file") == 0) - m_shellCommand = ExoFile; - else if (lstrcmpi(pszParam, "speed") == 0) - m_shellCommand = Speed; } -void FxParseCmdLine::ParseParamNotFlag(LPCTSTR pszParam) +void TestParseCmdLine::ParseParamNotFlag(LPCTSTR pszParam) { switch ( m_shellCommand ) { case BusNumber: m_busNumber = pszParam; break; - case ExoFile: - m_exoFile = pszParam; - break; - case Speed: - m_speed = atoi(pszParam); - break; } } -- cgit v1.1 From a099aaf529db4a04fd82fa18ffd9b9ed82742238 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:31 +0000 Subject: Utilisateur : Fcolin Date : 31/01/01 Heure : 15:50 Créé (vss 1) --- IvyProbe/TestParseCmdLine.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 IvyProbe/TestParseCmdLine.h (limited to 'IvyProbe') diff --git a/IvyProbe/TestParseCmdLine.h b/IvyProbe/TestParseCmdLine.h new file mode 100644 index 0000000..9a6ae6d --- /dev/null +++ b/IvyProbe/TestParseCmdLine.h @@ -0,0 +1,37 @@ +// FxParseCmdLine.h: interface for the FxParseCmdLine class. +// +////////////////////////////////////////////////////////////////////// + +#if !defined(AFX_FXParseCMDLINE_H__20232B92_AB99_11D2_898F_00A0245B298A__INCLUDED_) +#define AFX_FXParseCMDLINE_H__20232B92_AB99_11D2_898F_00A0245B298A__INCLUDED_ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 + +class FxParseCmdLine : public CCommandLineInfo +{ +public: + BOOL m_busstart; + BOOL m_start; + BOOL m_loop; + UINT m_speed; + CString m_exoFile; + CString m_busNumber; + virtual void ParseParam( LPCTSTR lpszParam, BOOL bFlag, BOOL bLast ); + FxParseCmdLine(); + virtual ~FxParseCmdLine(); + enum { + Loop, + BusNumber, + Start, + ExoFile, + Speed + }m_shellCommand; + +protected: + void ParseParamNotFlag(LPCTSTR pszParam); + void ParseParamFlag(LPCTSTR pszParam); +}; + +#endif // !defined(AFX_FXParseCMDLINE_H__20232B92_AB99_11D2_898F_00A0245B298A__INCLUDED_) -- cgit v1.1 From 8f632d62fda3265a0e1e9483055d249ac0d2731b Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:32 +0000 Subject: Utilisateur : Fcolin Date : 2/02/01 Heure : 18:30 Archivé dans $/Bus/Test Commentaire: win CE compile not finished (vss 2) --- IvyProbe/TestParseCmdLine.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'IvyProbe') diff --git a/IvyProbe/TestParseCmdLine.h b/IvyProbe/TestParseCmdLine.h index 9a6ae6d..ef8d3ac 100644 --- a/IvyProbe/TestParseCmdLine.h +++ b/IvyProbe/TestParseCmdLine.h @@ -1,4 +1,4 @@ -// FxParseCmdLine.h: interface for the FxParseCmdLine class. +// TestParseCmdLine.h: interface for the TestParseCmdLine class. // ////////////////////////////////////////////////////////////////////// @@ -9,24 +9,18 @@ #pragma once #endif // _MSC_VER > 1000 -class FxParseCmdLine : public CCommandLineInfo +class TestParseCmdLine : public CCommandLineInfo { public: - BOOL m_busstart; + BOOL m_start; - BOOL m_loop; - UINT m_speed; - CString m_exoFile; CString m_busNumber; virtual void ParseParam( LPCTSTR lpszParam, BOOL bFlag, BOOL bLast ); - FxParseCmdLine(); - virtual ~FxParseCmdLine(); + TestParseCmdLine(); + virtual ~TestParseCmdLine(); enum { - Loop, BusNumber, Start, - ExoFile, - Speed }m_shellCommand; protected: -- cgit v1.1 From 1b0ddf4d0fee7138985299db77e6b8d594cee535 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:35 +0000 Subject: Utilisateur : Fcolin Date : 16/03/99 Heure : 15:52 Créé (vss 1) --- IvyProbe/res/IvyProbe.ico | Bin 0 -> 1078 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 IvyProbe/res/IvyProbe.ico (limited to 'IvyProbe') diff --git a/IvyProbe/res/IvyProbe.ico b/IvyProbe/res/IvyProbe.ico new file mode 100644 index 0000000..7eef0bc Binary files /dev/null and b/IvyProbe/res/IvyProbe.ico differ -- cgit v1.1 From 53eeaf8a273b2ae0e40f1dcdc4305d99290ea4b6 Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:37 +0000 Subject: Utilisateur : Fcolin Date : 26/02/03 Heure : 16:40 Créé Commentaire: suppression bouton clock start (vss 1) --- IvyProbe/res/IvyProbe.manifest | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 IvyProbe/res/IvyProbe.manifest (limited to 'IvyProbe') diff --git a/IvyProbe/res/IvyProbe.manifest b/IvyProbe/res/IvyProbe.manifest new file mode 100644 index 0000000..752fcd2 --- /dev/null +++ b/IvyProbe/res/IvyProbe.manifest @@ -0,0 +1,22 @@ + + + + + + -- cgit v1.1 From b53d73664d7fa1024f93806e9ac17456d81ce5ff Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 1 Feb 2007 13:12:39 +0000 Subject: Utilisateur : Fcolin Date : 16/03/99 Heure : 15:52 Créé (vss 1) --- IvyProbe/res/IvyProbe.rc2 | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 IvyProbe/res/IvyProbe.rc2 (limited to 'IvyProbe') diff --git a/IvyProbe/res/IvyProbe.rc2 b/IvyProbe/res/IvyProbe.rc2 new file mode 100644 index 0000000..7bbf8c2 --- /dev/null +++ b/IvyProbe/res/IvyProbe.rc2 @@ -0,0 +1,13 @@ +// +// TEST.RC2 - resources Microsoft Visual C++ does not edit directly +// + +#ifdef APSTUDIO_INVOKED + #error this file is not editable by Microsoft Visual C++ +#endif //APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// Add manually edited resources here... + +///////////////////////////////////////////////////////////////////////////// -- cgit v1.1