Menu
▾
▴
can-svn
|
From: <ak...@us...> - 2008-02-03 17:31:47
|
Revision: 807
http://can.svn.sourceforge.net/can/?rev=807&view=rev
Author: akhe
Date: 2008-02-03 09:29:50 -0800 (Sun, 03 Feb 2008)
Log Message:
-----------
Fixed bug that set hard coded bit in header CANAL id even when it should not be set.
Modified Paths:
--------------
trunk/src/vscp/common/devicethread.cpp
trunk/src/vscp/common/vscp.h
trunk/src/vscp/common/vscphelper.cpp
trunk/src/vscp/vscpworks/vscpworks.dsp
Modified: trunk/src/vscp/common/devicethread.cpp
===================================================================
--- trunk/src/vscp/common/devicethread.cpp 2008-02-03 16:38:59 UTC (rev 806)
+++ trunk/src/vscp/common/devicethread.cpp 2008-02-03 17:29:50 UTC (rev 807)
@@ -639,7 +639,7 @@
m_pMainThreadObj->m_pDeviceItem->m_pClientItem->m_mutexClientInputQueue.Unlock();
canalMsg canalMsg;
- convertEventToCanal ( &canalMsg, pqueueEvent );
+ convertEventToCanal( &canalMsg, pqueueEvent );
if ( CANAL_ERROR_SUCCESS ==
m_pMainThreadObj->m_pDeviceItem->m_proc_CanalBlockingSend ( m_pMainThreadObj->m_pDeviceItem->m_openHandle, &canalMsg, 300 ) ) {
// Remove the node
Modified: trunk/src/vscp/common/vscp.h
===================================================================
--- trunk/src/vscp/common/vscp.h 2008-02-03 16:38:59 UTC (rev 806)
+++ trunk/src/vscp/common/vscp.h 2008-02-03 17:29:50 UTC (rev 807)
@@ -158,7 +158,7 @@
#define VSCO_HEADER_PRIORITY_MASK 0xE0
-#define VSCP_HEADER_HARD_CODED 0x10 // If set node nickname is hardcoded
+#define VSCP_HEADER_HARD_CODED 0x10 // If set if node nickname is hardcoded
#define VSCP_HEADER_NO_CRC 0x08 // Don't calculate CRC
#define VSCP_HEADER_CAN_MSG 0x04 // This is a CAN message
#define VSCP_HEADER_CAN_EXTENDED 0x02 // This is an extended id CAN message
Modified: trunk/src/vscp/common/vscphelper.cpp
===================================================================
--- trunk/src/vscp/common/vscphelper.cpp 2008-02-03 16:38:59 UTC (rev 806)
+++ trunk/src/vscp/common/vscphelper.cpp 2008-02-03 17:29:50 UTC (rev 807)
@@ -119,7 +119,7 @@
uint8_t getVSCPheadFromCANid( const uint32_t id )
{
- return ( uint8_t ) ( 0xf0 & ( id >> 21 ) );
+ return ( uint8_t ) ( 0xf0 & ( id >> 21 ) ); // Shift 26-5 1110 0000
};
///////////////////////////////////////////////////////////////////////////////
@@ -158,7 +158,7 @@
//unsigned long t1 = (unsigned long)priority << 20;
//unsigned long t2 = (unsigned long)pvscpMsg->vscp_class << 16;
//unsigned long t3 = (unsigned long)pvscpMsg->vscp_type << 8;
- return ( ( ( unsigned long ) priority << 21 ) |
+ return ( ( ( unsigned long ) priority << 26 ) |
( ( unsigned long ) vscp_class << 16 ) |
( ( unsigned long ) vscp_type << 8 ) |
0 );
@@ -170,7 +170,7 @@
uint32_t getCANidFromVSCPevent( const vscpEvent *pEvent )
{
- return ( ( ( unsigned long ) getVscpPriority( pEvent ) << 21 ) |
+ return ( ( ( unsigned long ) getVscpPriority( pEvent ) << 26 ) |
( ( unsigned long ) pEvent->vscp_class << 16 ) |
( ( unsigned long ) pEvent->vscp_type << 8 ) |
0 );
@@ -673,19 +673,19 @@
pcanalMsg->sizeData = 8;
}
- unsigned char priority = ( pvscpEvent->head & VSCP_MASK_PRIORITY );
+ unsigned char priority = ( ( pvscpEvent->head & VSCP_MASK_PRIORITY ) >> 5);
//unsigned long t1 = (unsigned long)priority << 20;
//unsigned long t2 = (unsigned long)pvscpMsg->vscp_class << 16;
//unsigned long t3 = (unsigned long)pvscpMsg->vscp_type << 8;
- pcanalMsg->id = ( ( unsigned long ) priority << 21 ) |
+ pcanalMsg->id = ( ( unsigned long ) priority << 26 ) |
( ( unsigned long ) vscp_class << 16 ) |
( ( unsigned long ) pvscpEvent->vscp_type << 8 ) |
nodeid; // Normally we are the host of hosts
// but for class=512 events nodeid
// is present in GUID LSB
- if ( pvscpEvent->head | VSCP_HEADER_HARD_CODED ) {
+ if ( pvscpEvent->head & VSCP_HEADER_HARD_CODED ) {
pcanalMsg->id |= VSCP_CAN_ID_HARD_CODED;
}
Modified: trunk/src/vscp/vscpworks/vscpworks.dsp
===================================================================
--- trunk/src/vscp/vscpworks/vscpworks.dsp 2008-02-03 16:38:59 UTC (rev 806)
+++ trunk/src/vscp/vscpworks/vscpworks.dsp 2008-02-03 17:29:50 UTC (rev 807)
@@ -31,7 +31,7 @@
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "vscpworks - Win32 Debug"
+!IF "$(CFG)" == "vscpworks - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -43,20 +43,20 @@
# PROP Output_Dir "VCProjectDebug"
# PROP Intermediate_Dir "VCProjectDebug"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W4 /GR /Zi /Od /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswud" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "__WXDEBUG__" /D "_DEBUG" /D "_UNICODE" /Fd"VCProjectDebug\vscpworks.pdb" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W4 /GR /Zi /Od /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswud" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "__WXDEBUG__" /D "_DEBUG" /D "_UNICODE" /Fd"VCProjectDebug\vscpworks.pdb" /FD /EHsc /c
-# ADD BASE MTL /nologo /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "__WXDEBUG__" /D "_DEBUG" /D "_UNICODE" /mktyplib203 /win32
-# ADD MTL /nologo /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "__WXDEBUG__" /D "_DEBUG" /D "_UNICODE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /i "D:\wxWidgets-2.8.7/include" /i "D:\wxWidgets-2.8.7/contrib/include" /i "D:\wxWidgets-2.8.7/lib/vc_lib/mswud" /i "C:\Program Files\Microsoft Visual Studio\vc98\include" /d "NOPCH" /d "WIN32" /d "__WXMSW__" /d "_WINDOWS" /d "__WXDEBUG__" /d "_DEBUG" /d "_UNICODE"
-# ADD RSC /l 0x405 /i "D:\wxWidgets-2.8.7/include" /i "D:\wxWidgets-2.8.7/contrib/include" /i "D:\wxWidgets-2.8.7/lib/vc_lib/mswud" /i "C:\Program Files\Microsoft Visual Studio\vc98\include" /d "NOPCH" /d "WIN32" /d "__WXMSW__" /d "_WINDOWS" /d "__WXDEBUG__" /d "_DEBUG" /d "_UNICODE"
+# ADD BASE CPP /nologo /FD /Fd"VCProjectDebug\vscpworks.pdb" /MDd /Od /GR /EHsc /W4 /Zi /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /D_UNICODE /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswud" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /c
+# ADD CPP /nologo /FD /Fd"VCProjectDebug\vscpworks.pdb" /MDd /Od /GR /EHsc /W4 /Zi /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /D_UNICODE /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswud" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /c
+# ADD BASE MTL /nologo /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /D_UNICODE /mktyplib203 /win32
+# ADD MTL /nologo /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /D_UNICODE /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /D_UNICODE /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswud" /I "C:\Program Files\Microsoft Visual Studio\vc98\include"
+# ADD RSC /l 0x405 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /D_UNICODE /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswud" /I "C:\Program Files\Microsoft Visual Studio\vc98\include"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 wxmsw28ud_richtext.lib wxmsw28ud_aui.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxmsw28ud_adv.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib"
-# ADD LINK32 wxmsw28ud_richtext.lib wxmsw28ud_aui.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxmsw28ud_adv.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib"
+# ADD BASE LINK32 wxmsw28ud_richtext.lib wxmsw28ud_aui.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxmsw28ud_adv.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib" /nologo /SUBSYSTEM:WINDOWS /machine:i386 /DEBUG /out:"VCProjectDebug\vscpworks.exe"
+# ADD LINK32 wxmsw28ud_richtext.lib wxmsw28ud_aui.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxmsw28ud_adv.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib" /nologo /SUBSYSTEM:WINDOWS /machine:i386 /DEBUG /out:"VCProjectDebug\vscpworks.exe"
-!ELSEIF "$(CFG)" == "vscpworks - Win32 Release"
+!ELSEIF "$(CFG)" == "vscpworks - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -68,20 +68,20 @@
# PROP Output_Dir "VCProjectRelease"
# PROP Intermediate_Dir "VCProjectRelease"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W4 /GR /O2 /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/msw" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /Fd"VCProjectRelease\vscpworks.pdb" /FD /EHsc /c
-# ADD CPP /nologo /MD /W4 /GR /O2 /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/msw" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /Fd"VCProjectRelease\vscpworks.pdb" /FD /EHsc /c
-# ADD BASE MTL /nologo /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /i "D:\wxWidgets-2.8.7/include" /i "D:\wxWidgets-2.8.7/contrib/include" /i "D:\wxWidgets-2.8.7/lib/vc_lib/msw" /i "C:\Program Files\Microsoft Visual Studio\vc98\include" /d "NOPCH" /d "WIN32" /d "__WXMSW__" /d "_WINDOWS"
-# ADD RSC /l 0x405 /i "D:\wxWidgets-2.8.7/include" /i "D:\wxWidgets-2.8.7/contrib/include" /i "D:\wxWidgets-2.8.7/lib/vc_lib/msw" /i "C:\Program Files\Microsoft Visual Studio\vc98\include" /d "NOPCH" /d "WIN32" /d "__WXMSW__" /d "_WINDOWS"
+# ADD BASE CPP /nologo /FD /Fd"VCProjectRelease\vscpworks.pdb" /MD /O2 /GR /EHsc /W4 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/msw" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /c
+# ADD CPP /nologo /FD /Fd"VCProjectRelease\vscpworks.pdb" /MD /O2 /GR /EHsc /W4 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/msw" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /c
+# ADD BASE MTL /nologo /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /mktyplib203 /win32
+# ADD MTL /nologo /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/msw" /I "C:\Program Files\Microsoft Visual Studio\vc98\include"
+# ADD RSC /l 0x405 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/msw" /I "C:\Program Files\Microsoft Visual Studio\vc98\include"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 wxmsw28_richtext.lib wxmsw28_aui.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxmsw28_adv.lib wxmsw28_html.lib wxmsw28_xrc.lib wxbase28_net.lib wxbase28_xml.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /subsystem:windows /machine:I386 /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib"
-# ADD LINK32 wxmsw28_richtext.lib wxmsw28_aui.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxmsw28_adv.lib wxmsw28_html.lib wxmsw28_xrc.lib wxbase28_net.lib wxbase28_xml.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /subsystem:windows /machine:I386 /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib"
+# ADD BASE LINK32 wxmsw28_richtext.lib wxmsw28_aui.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxmsw28_adv.lib wxmsw28_html.lib wxmsw28_xrc.lib wxbase28_net.lib wxbase28_xml.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib" /nologo /SUBSYSTEM:WINDOWS /machine:i386 /out:"VCProjectRelease\vscpworks.exe"
+# ADD LINK32 wxmsw28_richtext.lib wxmsw28_aui.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxmsw28_adv.lib wxmsw28_html.lib wxmsw28_xrc.lib wxbase28_net.lib wxbase28_xml.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib" /nologo /SUBSYSTEM:WINDOWS /machine:i386 /out:"VCProjectRelease\vscpworks.exe"
-!ELSEIF "$(CFG)" == "vscpworks - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "vscpworks - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -93,20 +93,20 @@
# PROP Output_Dir "VCProjectUnicodeRelease"
# PROP Intermediate_Dir "VCProjectUnicodeRelease"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W4 /GR /O2 /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswu" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "_UNICODE" /Fd"VCProjectUnicodeRelease\vscpworks.pdb" /FD /EHsc /c
-# ADD CPP /nologo /MD /W4 /GR /O2 /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswu" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "_UNICODE" /Fd"VCProjectUnicodeRelease\vscpworks.pdb" /FD /EHsc /c
-# ADD BASE MTL /nologo /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "_UNICODE" /mktyplib203 /win32
-# ADD MTL /nologo /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "_UNICODE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /i "D:\wxWidgets-2.8.7/include" /i "D:\wxWidgets-2.8.7/contrib/include" /i "D:\wxWidgets-2.8.7/lib/vc_lib/mswu" /i "C:\Program Files\Microsoft Visual Studio\vc98\include" /d "NOPCH" /d "WIN32" /d "__WXMSW__" /d "_WINDOWS" /d "_UNICODE"
-# ADD RSC /l 0x405 /i "D:\wxWidgets-2.8.7/include" /i "D:\wxWidgets-2.8.7/contrib/include" /i "D:\wxWidgets-2.8.7/lib/vc_lib/mswu" /i "C:\Program Files\Microsoft Visual Studio\vc98\include" /d "NOPCH" /d "WIN32" /d "__WXMSW__" /d "_WINDOWS" /d "_UNICODE"
+# ADD BASE CPP /nologo /FD /Fd"VCProjectUnicodeRelease\vscpworks.pdb" /MD /O2 /GR /EHsc /W4 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D_UNICODE /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswu" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /c
+# ADD CPP /nologo /FD /Fd"VCProjectUnicodeRelease\vscpworks.pdb" /MD /O2 /GR /EHsc /W4 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D_UNICODE /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswu" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /c
+# ADD BASE MTL /nologo /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D_UNICODE /mktyplib203 /win32
+# ADD MTL /nologo /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D_UNICODE /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D_UNICODE /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswu" /I "C:\Program Files\Microsoft Visual Studio\vc98\include"
+# ADD RSC /l 0x405 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D_UNICODE /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswu" /I "C:\Program Files\Microsoft Visual Studio\vc98\include"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 wxmsw28u_richtext.lib wxmsw28u_aui.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxmsw28u_adv.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxbase28u_net.lib wxbase28u_xml.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /subsystem:windows /machine:I386 /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib"
-# ADD LINK32 wxmsw28u_richtext.lib wxmsw28u_aui.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxmsw28u_adv.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxbase28u_net.lib wxbase28u_xml.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /subsystem:windows /machine:I386 /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib"
+# ADD BASE LINK32 wxmsw28u_richtext.lib wxmsw28u_aui.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxmsw28u_adv.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxbase28u_net.lib wxbase28u_xml.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib" /nologo /SUBSYSTEM:WINDOWS /machine:i386 /out:"VCProjectUnicodeRelease\vscpworks.exe"
+# ADD LINK32 wxmsw28u_richtext.lib wxmsw28u_aui.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxmsw28u_adv.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxbase28u_net.lib wxbase28u_xml.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib" /nologo /SUBSYSTEM:WINDOWS /machine:i386 /out:"VCProjectUnicodeRelease\vscpworks.exe"
-!ELSEIF "$(CFG)" == "vscpworks - Win32 unicode Debug"
+!ELSEIF "$(CFG)" == "vscpworks - Win32 unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -118,20 +118,20 @@
# PROP Output_Dir "VCProjectunicodeDebug"
# PROP Intermediate_Dir "VCProjectunicodeDebug"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W4 /GR /Zi /Od /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswd" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "__WXDEBUG__" /D "_DEBUG" /Fd"VCProjectunicodeDebug\vscpworks.pdb" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W4 /GR /Zi /Od /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswd" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "__WXDEBUG__" /D "_DEBUG" /FR /Fd"VCProjectunicodeDebug\vscpworks.pdb" /FD /EHsc /c
-# ADD BASE MTL /nologo /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "__WXDEBUG__" /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "__WXDEBUG__" /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /i "D:\wxWidgets-2.8.7/include" /i "D:\wxWidgets-2.8.7/contrib/include" /i "D:\wxWidgets-2.8.7/lib/vc_lib/mswd" /i "C:\Program Files\Microsoft Visual Studio\vc98\include" /d "NOPCH" /d "WIN32" /d "__WXMSW__" /d "_WINDOWS" /d "__WXDEBUG__" /d "_DEBUG"
-# ADD RSC /l 0x405 /i "D:\wxWidgets-2.8.7/include" /i "D:\wxWidgets-2.8.7/contrib/include" /i "D:\wxWidgets-2.8.7/lib/vc_lib/mswd" /i "C:\Program Files\Microsoft Visual Studio\vc98\include" /d "NOPCH" /d "WIN32" /d "__WXMSW__" /d "_WINDOWS" /d "__WXDEBUG__" /d "_DEBUG"
+# ADD BASE CPP /nologo /FD /Fd"VCProjectunicodeDebug\vscpworks.pdb" /MDd /Od /GR /EHsc /W4 /Zi /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswd" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /c
+# ADD CPP /nologo /FD /Fd"VCProjectunicodeDebug\vscpworks.pdb" /MDd /Od /GR /EHsc /W4 /Zi /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswd" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /c
+# ADD BASE MTL /nologo /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /mktyplib203 /win32
+# ADD MTL /nologo /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswd" /I "C:\Program Files\Microsoft Visual Studio\vc98\include"
+# ADD RSC /l 0x405 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswd" /I "C:\Program Files\Microsoft Visual Studio\vc98\include"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 wxmsw28d_richtext.lib wxmsw28d_aui.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxmsw28d_adv.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxbase28d_net.lib wxbase28d_xml.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib"
-# ADD LINK32 wxmsw28d_richtext.lib wxmsw28d_aui.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxmsw28d_adv.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxbase28d_net.lib wxbase28d_xml.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib"
+# ADD BASE LINK32 wxmsw28d_richtext.lib wxmsw28d_aui.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxmsw28d_adv.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxbase28d_net.lib wxbase28d_xml.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib" /nologo /SUBSYSTEM:WINDOWS /machine:i386 /DEBUG /out:"VCProjectunicodeDebug\vscpworks.exe"
+# ADD LINK32 wxmsw28d_richtext.lib wxmsw28d_aui.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxmsw28d_adv.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxbase28d_net.lib wxbase28d_xml.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib" /nologo /SUBSYSTEM:WINDOWS /machine:i386 /DEBUG /out:"VCProjectunicodeDebug\vscpworks.exe"
-!ENDIF
+!ENDIF
# Begin Target
@@ -144,43 +144,47 @@
# PROP Default_Filter ""
# Begin Source File
-SOURCE="..\common\canalsuperwrapper.cpp"
+SOURCE="dlgvscpmsg.cpp"
# End Source File
# Begin Source File
-SOURCE="..\..\common\crc.c"
+SOURCE="dlgselectdaemoninterface.cpp"
# End Source File
# Begin Source File
-SOURCE="dlgconfiguration.cpp"
+SOURCE="frmmain.cpp"
# End Source File
# Begin Source File
-SOURCE="dlgnewvscpsession.cpp"
+SOURCE="vscpworks.cpp"
# End Source File
# Begin Source File
-SOURCE="dlgselectdaemoninterface.cpp"
+SOURCE="frmvscpsession.cpp"
# End Source File
# Begin Source File
-SOURCE="dlgvscpfilter.cpp"
+SOURCE="dlgnewvscpsession.cpp"
# End Source File
# Begin Source File
+SOURCE="dlgconfiguration.cpp"
+# End Source File
+# Begin Source File
+
SOURCE="dlgvscpinterfacesettings.cpp"
# End Source File
# Begin Source File
-SOURCE="dlgvscpmsg.cpp"
+SOURCE="dlgvscpfilter.cpp"
# End Source File
# Begin Source File
-SOURCE="dlgvscptrmit.cpp"
+SOURCE="vscpbootloader.cpp"
# End Source File
# Begin Source File
-SOURCE="..\common\dllwrapper.cpp"
+SOURCE="dlgvscptrmit.cpp"
# End Source File
# Begin Source File
@@ -188,47 +192,47 @@
# End Source File
# Begin Source File
-SOURCE="frmmain.cpp"
+SOURCE="readregiister.cpp"
# End Source File
# Begin Source File
-SOURCE="frmvscpsession.cpp"
+SOURCE="writeregister.cpp"
# End Source File
# Begin Source File
-SOURCE="gridtable.cpp"
+SOURCE="readmsfurl.cpp"
# End Source File
# Begin Source File
-SOURCE="..\common\guid.cpp"
+SOURCE="readmdffile.cpp"
# End Source File
# Begin Source File
-SOURCE="..\common\mdf.cpp"
+SOURCE="readguid.cpp"
# End Source File
# Begin Source File
-SOURCE="readguid.cpp"
+SOURCE="..\common\canalsuperwrapper.cpp"
# End Source File
# Begin Source File
-SOURCE="readmdffile.cpp"
+SOURCE="..\..\common\crc.c"
# End Source File
# Begin Source File
-SOURCE="readmsfurl.cpp"
+SOURCE="..\common\dllwrapper.cpp"
# End Source File
# Begin Source File
-SOURCE="readregiister.cpp"
+SOURCE="..\common\guid.cpp"
# End Source File
# Begin Source File
-SOURCE="threadvscpwork.cpp"
+SOURCE="..\common\mdf.cpp"
# End Source File
# Begin Source File
-SOURCE="vscpbootloader.cpp"
+SOURCE="threadvscpwork.cpp"
# End Source File
# Begin Source File
@@ -244,43 +248,40 @@
# End Source File
# Begin Source File
-SOURCE="vscpworks.cpp"
+SOURCE="gridtable.cpp"
# End Source File
# Begin Source File
SOURCE="vscpworks.rc"
# End Source File
-# Begin Source File
-SOURCE="writeregister.cpp"
-# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter ""
# Begin Source File
-SOURCE="..\common\canal.h"
+SOURCE="dlgvscpmsg.h"
# End Source File
# Begin Source File
-SOURCE="..\common\canaldlldef.h"
+SOURCE="dlgselectdaemoninterface.h"
# End Source File
# Begin Source File
-SOURCE="..\common\canalsuperwrapper.h"
+SOURCE="frmmain.h"
# End Source File
# Begin Source File
-SOURCE="..\..\common\crc.h"
+SOURCE="vscpworks.h"
# End Source File
# Begin Source File
-SOURCE="..\common\devicelist.h"
+SOURCE="frmvscpsession.h"
# End Source File
# Begin Source File
-SOURCE="..\common\devitem.h"
+SOURCE="dlgnewvscpsession.h"
# End Source File
# Begin Source File
@@ -288,90 +289,94 @@
# End Source File
# Begin Source File
-SOURCE="dlgnewvscpsession.h"
+SOURCE="dlgvscpinterfacesettings.h"
# End Source File
# Begin Source File
-SOURCE="dlgselectdaemoninterface.h"
+SOURCE="dlgvscpfilter.h"
# End Source File
# Begin Source File
-SOURCE="dlgvscpfilter.h"
+SOURCE="vscpbootloader.h"
# End Source File
# Begin Source File
-SOURCE="dlgvscpinterfacesettings.h"
+SOURCE="dlgvscptrmit.h"
# End Source File
# Begin Source File
-SOURCE="dlgvscpmsg.h"
+SOURCE="frmdeviceconfig.h"
# End Source File
# Begin Source File
-SOURCE="dlgvscptrmit.h"
+SOURCE="readregiister.h"
# End Source File
# Begin Source File
-SOURCE="..\common\dllwrapper.h"
+SOURCE="writeregister.h"
# End Source File
# Begin Source File
-SOURCE="frmdeviceconfig.h"
+SOURCE="readmsfurl.h"
# End Source File
# Begin Source File
-SOURCE="frmmain.h"
+SOURCE="readmdffile.h...
[truncated message content] |
|
From: <ak...@us...> - 2008-02-28 14:18:37
|
Revision: 863
http://can.svn.sourceforge.net/can/?rev=863&view=rev
Author: akhe
Date: 2008-02-28 06:18:33 -0800 (Thu, 28 Feb 2008)
Log Message:
-----------
Property Changed:
----------------
trunk/src/vscp/install_win32/
trunk/src/vscp/samples/
Property changes on: trunk/src/vscp/install_win32
___________________________________________________________________
Name: svn:ignore
- setup4vscp.exe
+ setup4vscp.exe
files
*.exe
Property changes on: trunk/src/vscp/samples
___________________________________________________________________
Name: svn:ignore
+ delivery
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ak...@us...> - 2008-04-20 20:45:58
|
Revision: 887
http://can.svn.sourceforge.net/can/?rev=887&view=rev
Author: akhe
Date: 2008-04-20 13:45:55 -0700 (Sun, 20 Apr 2008)
Log Message:
-----------
Added MDF Editor dialog
Modified Paths:
--------------
trunk/src/vscp/common/mdf.cpp
trunk/src/vscp/common/mdf.h
trunk/src/vscp/vscpworks/frmmain.cpp
trunk/src/vscp/vscpworks/frmmain.h
trunk/src/vscp/vscpworks/frmmain_symbols.h
trunk/src/vscp/vscpworks/readmsfurl.cpp
trunk/src/vscp/vscpworks/readmsfurl.h
trunk/src/vscp/vscpworks/readmsfurl_symbols.h
trunk/src/vscp/vscpworks/vscpworks.dsp
trunk/src/vscp/vscpworks/vscpworks.pjd
Added Paths:
-----------
trunk/src/vscp/vscpworks/mdfeditor.cpp
trunk/src/vscp/vscpworks/mdfeditor.h
trunk/src/vscp/vscpworks/mdfeditor_symbols.h
Modified: trunk/src/vscp/common/mdf.cpp
===================================================================
--- trunk/src/vscp/common/mdf.cpp 2008-04-18 08:08:45 UTC (rev 886)
+++ trunk/src/vscp/common/mdf.cpp 2008-04-20 20:45:55 UTC (rev 887)
@@ -342,7 +342,7 @@
// parseMDF
//
-bool CMDF::parseMDF( wxString& path )
+bool CMDF::parseMDF( wxString& path, wxString& lang )
{
bool rv = true;
wxXmlDocument doc;
@@ -611,6 +611,16 @@
pAbstraction->m_strDescription = child4->GetNodeContent();
}
}
+ else if ( child4->GetName() == wxT("help") ) {
+ wxString str;
+ str = child4->GetPropVal ( wxT ( "lang" ), _("en") );
+ if ( str == m_strLocale ) {
+ pAbstraction->m_strHelp = child4->GetNodeContent();
+ }
+ else if ( ( _("en") == str ) ) {
+ pAbstraction->m_strHelp = child4->GetNodeContent();
+ }
+ }
else if ( child4->GetName() == wxT("access") ) {
pAbstraction->m_nAccess = MDF_ACCESS_READ;
wxString strAccessRights = child4->GetNodeContent();
@@ -661,6 +671,16 @@
pValueItem->m_strDescription = child6->GetNodeContent();
}
}
+ else if ( child6->GetName() == wxT("help") ) {
+ wxString str;
+ str = child6->GetPropVal ( wxT ( "lang" ), _("en") );
+ if ( str == m_strLocale ) {
+ pValueItem->m_strHelp = child6->GetNodeContent();
+ }
+ else if ( ( _("en") == str ) ) {
+ pValueItem->m_strHelp = child6->GetNodeContent();
+ }
+ }
child6 = child6->GetNext();
@@ -723,6 +743,16 @@
pRegister->m_strDescription = child4->GetNodeContent();
}
}
+ else if ( child4->GetName() == wxT("help") ) {
+ wxString str;
+ str = child4->GetPropVal ( wxT ( "lang" ), _("en") );
+ if ( str == m_strLocale ) {
+ pRegister->m_strHelp = child4->GetNodeContent();
+ }
+ else if ( ( _("en") == str ) ) {
+ pRegister->m_strHelp = child4->GetNodeContent();
+ }
+ }
else if ( child4->GetName() == wxT("bitfield") ) {
wxXmlNode *child5 = child4->GetChildren();
@@ -761,6 +791,16 @@
pBit->m_strDescription = child6->GetNodeContent();
}
}
+ else if ( child6->GetName() == wxT("help") ) {
+ wxString str;
+ str = child6->GetPropVal ( wxT ( "lang" ), _("en") );
+ if ( str == m_strLocale ) {
+ pBit->m_strHelp = child6->GetNodeContent();
+ }
+ else if ( ( _("en") == str ) ) {
+ pBit->m_strHelp = child6->GetNodeContent();
+ }
+ }
else if ( child6->GetName() == wxT("access") ) {
pBit->m_nAccess = MDF_ACCESS_READ;
@@ -824,6 +864,16 @@
pValueItem->m_strDescription = child6->GetNodeContent();
}
}
+ else if ( child6->GetName() == wxT("help") ) {
+ wxString str;
+ str = child6->GetPropVal ( wxT ( "lang" ), _("en") );
+ if ( str == m_strLocale ) {
+ pValueItem->m_strHelp = child6->GetNodeContent();
+ }
+ else if ( ( _("en") == str ) ) {
+ pValueItem->m_strHelp = child6->GetNodeContent();
+ }
+ }
child6 = child6->GetNext();
@@ -896,6 +946,16 @@
pAction->m_strDescription = child4->GetNodeContent();
}
}
+ else if ( child4->GetName() == wxT("help") ) {
+ wxString str;
+ str = child4->GetPropVal ( wxT ( "lang" ), _("en") );
+ if ( str == m_strLocale ) {
+ pAction->m_strHelp = child4->GetNodeContent();
+ }
+ else if ( ( _("en") == str ) ) {
+ pAction->m_strHelp = child4->GetNodeContent();
+ }
+ }
}
}
@@ -942,6 +1002,16 @@
pEvent->m_strDescription = child4->GetNodeContent();
}
}
+ else if ( child4->GetName() == wxT("help") ) {
+ wxString str;
+ str = child4->GetPropVal ( wxT ( "lang" ), _("en") );
+ if ( str == m_strLocale ) {
+ pEvent->m_strHelp = child4->GetNodeContent();
+ }
+ else if ( ( _("en") == str ) ) {
+ pEvent->m_strHelp = child4->GetNodeContent();
+ }
+ }
else if ( child4->GetName() == wxT("data") ) {
CMDF_EventData *pEventData = new CMDF_EventData;
@@ -950,7 +1020,7 @@
pEventData->m_nOffset = child4->GetPropVal ( wxT ( "offset" ), 0 );
- wxXmlNode *child5 = child5->GetChildren();
+ wxXmlNode *child5 = child4->GetChildren();
while (child5) {
if ( child4->GetName() == wxT("name") ) {
@@ -973,9 +1043,19 @@
pEventData->m_strDescription = child5->GetNodeContent();
}
}
+ else if ( child4->GetName() == wxT("help") ) {
+ wxString str;
+ str = child5->GetPropVal ( wxT ( "lang" ), _("en") );
+ if ( str == m_strLocale ) {
+ pEventData->m_strHelp = child5->GetNodeContent();
+ }
+ else if ( ( _("en") == str ) ) {
+ pEventData->m_strHelp = child5->GetNodeContent();
+ }
+ }
else if ( child5->GetName() == wxT("valuelist") ) {
- wxXmlNode *child6 = child6->GetChildren();
+ wxXmlNode *child6 = child5->GetChildren();
while (child6) {
if ( child6->GetName() == wxT("item") ) {
@@ -1009,6 +1089,16 @@
pValueItem->m_strDescription = child7->GetNodeContent();
}
}
+ else if ( child7->GetName() == wxT("help") ) {
+ wxString str;
+ str = child7->GetPropVal ( wxT ( "lang" ), _("en") );
+ if ( str == m_strLocale ) {
+ pValueItem->m_strHelp = child7->GetNodeContent();
+ }
+ else if ( ( _("en") == str ) ) {
+ pValueItem->m_strHelp = child7->GetNodeContent();
+ }
+ }
child7 = child7->GetNext();
@@ -1059,6 +1149,16 @@
pBit->m_strDescription = child7->GetNodeContent();
}
}
+ else if ( child7->GetName() == wxT("help") ) {
+ wxString str;
+ str = child7->GetPropVal ( wxT ( "lang" ), _("en") );
+ if ( str == m_strLocale ) {
+ pBit->m_strHelp = child7->GetNodeContent();
+ }
+ else if ( ( _("en") == str ) ) {
+ pBit->m_strHelp = child7->GetNodeContent();
+ }
+ }
else if ( child7->GetName() == wxT("access") ) {
pBit->m_nAccess = MDF_ACCESS_READ;
@@ -1147,6 +1247,16 @@
pBit->m_strDescription = child5->GetNodeContent();
}
}
+ else if ( child5->GetName() == wxT("help") ) {
+ wxString str;
+ str = child5->GetPropVal ( wxT ( "lang" ), _("en") );
+ if ( str == m_strLocale ) {
+ pBit->m_strHelp = child5->GetNodeContent();
+ }
+ else if ( ( _("en") == str ) ) {
+ pBit->m_strHelp = child5->GetNodeContent();
+ }
+ }
else if ( child5->GetName() == wxT("access") ) {
pBit->m_nAccess = MDF_ACCESS_READ;
Modified: trunk/src/vscp/common/mdf.h
===================================================================
--- trunk/src/vscp/common/mdf.h 2008-04-18 08:08:45 UTC (rev 886)
+++ trunk/src/vscp/common/mdf.h 2008-04-20 20:45:55 UTC (rev 887)
@@ -83,7 +83,8 @@
wxString m_strName;
wxString m_strDescription;
- wxString m_strValue; // The abstraction tells the type
+ wxString m_strHelp; // Item help text or url
+ wxString m_strValue; // The abstraction tells the type
};
@@ -104,6 +105,7 @@
wxString m_strName;
wxString m_strDescription;
+ wxString m_strHelp; // Item help text or url
wxString m_strID; // Abstract variable id (unique
// inside of MDF
@@ -150,6 +152,7 @@
wxString m_strName;
wxString m_strDescription;
+ wxString m_strHelp; // Item help text or url
uint8_t m_nPos; // position in bit field 0-7 (from the left)
uint8_t m_nWidth; // 1 for one bit 2-8 for bit-field
@@ -180,7 +183,8 @@
wxString m_strName;
wxString m_strDescription;
-
+ wxString m_strHelp; // Item help text or url
+
uint16_t m_nPage;
uint16_t m_nOffset;
uint16_t m_nWidth; // Defaults to 1
@@ -216,6 +220,7 @@
wxString m_strName;
wxString m_strDescription;
+ wxString m_strHelp; // Item help text or url
uint16_t m_nOffset;
uint8_t m_width;
@@ -244,6 +249,7 @@
wxString m_strName;
wxString m_strDescription;
+ wxString m_strHelp; // Item help text or url
uint16_t m_nCode;
@@ -295,6 +301,7 @@
wxString m_strName;
wxString m_strDescription;
+ wxString m_strHelp; // Item help text or url
uint16_t m_nOffset;
@@ -322,6 +329,7 @@
wxString m_strName;
wxString m_strDescription;
+ wxString m_strHelp; // Item help text or url
uint16_t m_nClass;
uint16_t m_nType;
@@ -355,6 +363,7 @@
wxString m_strItem;
wxString m_strDescription;
+ wxString m_strHelp; // Item help text or url
};
WX_DECLARE_LIST( CMDF_Item, MDF_ITEM_LIST );
@@ -467,7 +476,7 @@
@param path Path to downloaded MDF
@return true if the parsing went well.
*/
- bool parseMDF( wxString& path );
+ bool parseMDF( wxString& path, wxString& lang );
wxString m_strLocale; // ISO code for requested language
Modified: trunk/src/vscp/vscpworks/frmmain.cpp
===================================================================
--- trunk/src/vscp/vscpworks/frmmain.cpp 2008-04-18 08:08:45 UTC (rev 886)
+++ trunk/src/vscp/vscpworks/frmmain.cpp 2008-04-20 20:45:55 UTC (rev 887)
@@ -69,6 +69,7 @@
#include "frmvscpsession.h"
#include "frmdeviceconfig.h"
#include "dlgconfiguration.h"
+#include "mdfeditor.h"
extern appConfiguration g_Config;
@@ -171,6 +172,8 @@
EVT_MENU( ID_MENUITEM_CONFIGURATION, frmMain::OnMenuitemConfigurationClick )
+ EVT_MENU( ID_MENUITEM_MDF_EDITOR, frmMain::OnMenuitemMdfEditorClick )
+
EVT_MENU( ID_MENUITEM33, frmMain::OnMenuitemHelpClick )
EVT_MENU( ID_MENUITEM34, frmMain::OnMenuitemFaqClick )
@@ -181,7 +184,7 @@
EVT_MENU( ID_MENUITEM_CREDITS, frmMain::OnMenuitemCrediitsClick )
- EVT_MENU( ID_MENUITEM38, frmMain::OnMenuitemVSCPSiteClick )
+ EVT_MENU( ID_MENUITEM_VSCP_SITE, frmMain::OnMenuitemVSCPSiteClick )
EVT_MENU( ID_MENUITEM39, frmMain::OnMenuitem39Click )
@@ -270,35 +273,37 @@
menuBar->Append(itemMenu3, _("File"));
wxMenu* itemMenu11 = new wxMenu;
itemMenu11->Append(ID_MENUITEM_CONFIGURATION, _("Configuration..."), _T(""), wxITEM_NORMAL);
+ itemMenu11->AppendSeparator();
+ itemMenu11->Append(ID_MENUITEM_MDF_EDITOR, _("MDF Editor"), _T(""), wxITEM_NORMAL);
menuBar->Append(itemMenu11, _("Tools"));
- wxMenu* itemMenu13 = new wxMenu;
- itemMenu13->Append(ID_MENUITEM33, _("VSCP-Works Help"), _T(""), wxITEM_RADIO);
- itemMenu13->Append(ID_MENUITEM34, _("Frequently Asked Questions"), _T(""), wxITEM_NORMAL);
- itemMenu13->Append(ID_MENUITEM35, _("Keyboard shortcuts"), _T(""), wxITEM_NORMAL);
- itemMenu13->AppendSeparator();
- itemMenu13->Append(ID_MENUITEM_THANKS, _("Thanks..."), _T(""), wxITEM_NORMAL);
- itemMenu13->Append(ID_MENUITEM_CREDITS, _("Credits..."), _T(""), wxITEM_NORMAL);
- itemMenu13->AppendSeparator();
- itemMenu13->Append(ID_MENUITEM38, _("Go to VSCP site"), _T(""), wxITEM_NORMAL);
- itemMenu13->AppendSeparator();
- itemMenu13->Append(ID_MENUITEM39, _("About"), _T(""), wxITEM_NORMAL);
- menuBar->Append(itemMenu13, _("Help"));
+ wxMenu* itemMenu15 = new wxMenu;
+ itemMenu15->Append(ID_MENUITEM33, _("VSCP-Works Help"), _T(""), wxITEM_RADIO);
+ itemMenu15->Append(ID_MENUITEM34, _("Frequently Asked Questions"), _T(""), wxITEM_NORMAL);
+ itemMenu15->Append(ID_MENUITEM35, _("Keyboard shortcuts"), _T(""), wxITEM_NORMAL);
+ itemMenu15->AppendSeparator();
+ itemMenu15->Append(ID_MENUITEM_THANKS, _("Thanks..."), _T(""), wxITEM_NORMAL);
+ itemMenu15->Append(ID_MENUITEM_CREDITS, _("Credits..."), _T(""), wxITEM_NORMAL);
+ itemMenu15->AppendSeparator();
+ itemMenu15->Append(ID_MENUITEM_VSCP_SITE, _("Go to VSCP site"), _T(""), wxITEM_NORMAL);
+ itemMenu15->AppendSeparator();
+ itemMenu15->Append(ID_MENUITEM39, _("About"), _T(""), wxITEM_NORMAL);
+ menuBar->Append(itemMenu15, _("Help"));
itemFrame1->SetMenuBar(menuBar);
- wxStatusBar* itemStatusBar24 = new wxStatusBar;
- itemStatusBar24->Create( itemFrame1, ID_STATUSBAR, wxST_SIZEGRIP|wxNO_BORDER );
- itemStatusBar24->SetFieldsCount(2);
- itemFrame1->SetStatusBar(itemStatusBar24);
+ wxStatusBar* itemStatusBar26 = new wxStatusBar;
+ itemStatusBar26->Create( itemFrame1, ID_STATUSBAR, wxST_SIZEGRIP|wxNO_BORDER );
+ itemStatusBar26->SetFieldsCount(2);
+ itemFrame1->SetStatusBar(itemStatusBar26);
- wxToolBar* itemToolBar25 = CreateToolBar( wxTB_FLAT|wxTB_HORIZONTAL|wxTB_NODIVIDER, ID_TOOLBAR );
- wxBitmap itemtool26Bitmap(itemFrame1->GetBitmapResource(wxT("open.xpm")));
- wxBitmap itemtool26BitmapDisabled;
- itemToolBar25->AddTool(ID_TOOL, _T(""), itemtool26Bitmap, itemtool26BitmapDisabled, wxITEM_NORMAL, _T(""), wxEmptyString);
- itemToolBar25->Realize();
- itemFrame1->SetToolBar(itemToolBar25);
+ wxToolBar* itemToolBar27 = CreateToolBar( wxTB_FLAT|wxTB_HORIZONTAL|wxTB_NODIVIDER, ID_TOOLBAR );
+ wxBitmap itemtool28Bitmap(itemFrame1->GetBitmapResource(wxT("open.xpm")));
+ wxBitmap itemtool28BitmapDisabled;
+ itemToolBar27->AddTool(ID_TOOL, _T(""), itemtool28Bitmap, itemtool28BitmapDisabled, wxITEM_NORMAL, _T(""), wxEmptyString);
+ itemToolBar27->Realize();
+ itemFrame1->SetToolBar(itemToolBar27);
- wxBoxSizer* itemBoxSizer27 = new wxBoxSizer(wxVERTICAL);
- itemFrame1->SetSizer(itemBoxSizer27);
+ wxBoxSizer* itemBoxSizer29 = new wxBoxSizer(wxVERTICAL);
+ itemFrame1->SetSizer(itemBoxSizer29);
////@end frmMain content construction
@@ -682,3 +687,19 @@
////@end wxEVT_COMMAND_MENU_SELECTED event handler for ID_MENUITEM8 in frmMain.
}
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// wxEVT_COMMAND_MENU_SELECTED event handler for ID_MENUITEM_MDF_EDITOR
+//
+
+void frmMain::OnMenuitemMdfEditorClick( wxCommandEvent& event )
+{
+ MDFEditor dlg( this );
+
+ if ( wxID_OK == dlg.ShowModal() ) {
+ //dlg.getDialogData();
+ }
+ event.Skip();
+
+}
+
Modified: trunk/src/vscp/vscpworks/frmmain.h
===================================================================
--- trunk/src/vscp/vscpworks/frmmain.h 2008-04-18 08:08:45 UTC (rev 886)
+++ trunk/src/vscp/vscpworks/frmmain.h 2008-04-20 20:45:55 UTC (rev 887)
@@ -136,6 +136,9 @@
/// wxEVT_COMMAND_MENU_SELECTED event handler for ID_MENUITEM_CONFIGURATION
void OnMenuitemConfigurationClick( wxCommandEvent& event );
+ /// wxEVT_COMMAND_MENU_SELECTED event handler for ID_MENUITEM_MDF_EDITOR
+ void OnMenuitemMdfEditorClick( wxCommandEvent& event );
+
/// wxEVT_COMMAND_MENU_SELECTED event handler for ID_MENUITEM33
void OnMenuitemHelpClick( wxCommandEvent& event );
@@ -151,7 +154,7 @@
/// wxEVT_COMMAND_MENU_SELECTED event handler for ID_MENUITEM_CREDITS
void OnMenuitemCrediitsClick( wxCommandEvent& event );
- /// wxEVT_COMMAND_MENU_SELECTED event handler for ID_MENUITEM38
+ /// wxEVT_COMMAND_MENU_SELECTED event handler for ID_MENUITEM_VSCP_SITE
void OnMenuitemVSCPSiteClick( wxCommandEvent& event );
/// wxEVT_COMMAND_MENU_SELECTED event handler for ID_MENUITEM39
@@ -181,12 +184,13 @@
ID_MENUITEM_SCAN = 12001,
ID_MENU_VSCPWORKS_EXIT = 12005,
ID_MENUITEM_CONFIGURATION = 12011,
+ ID_MENUITEM_MDF_EDITOR = 12006,
ID_MENUITEM33 = 12018,
ID_MENUITEM34 = 12019,
ID_MENUITEM35 = 12020,
ID_MENUITEM_THANKS = 12021,
ID_MENUITEM_CREDITS = 12022,
- ID_MENUITEM38 = 12023,
+ ID_MENUITEM_VSCP_SITE = 12023,
ID_MENUITEM39 = 12024,
ID_STATUSBAR = 12025,
ID_TOOLBAR = 12026,
Modified: trunk/src/vscp/vscpworks/frmmain_symbols.h
===================================================================
--- trunk/src/vscp/vscpworks/frmmain_symbols.h 2008-04-18 08:08:45 UTC (rev 886)
+++ trunk/src/vscp/vscpworks/frmmain_symbols.h 2008-04-20 20:45:55 UTC (rev 887)
@@ -3,7 +3,7 @@
// Purpose: Symbols file
// Author: Ake Hedman
// Modified by:
-// Created: Tue 08 Jan 2008 17:16:46 CET
+// Created: Sun 20 Apr 2008 22:35:23 CEST
// RCS-ID:
// Copyright: (C) 2007 Ake Hedman, D Of Scandinavia, <ak...@do...>
// Licence:
@@ -47,13 +47,14 @@
#define ID_FRMMAIN_SYMBOL_4 _("Exit")
#define ID_FRMMAIN_SYMBOL_5 _("File")
#define ID_FRMMAIN_SYMBOL_6 _("Configuration...")
-#define ID_FRMMAIN_SYMBOL_7 _("Tools")
-#define ID_FRMMAIN_SYMBOL_8 _("VSCP-Works Help")
-#define ID_FRMMAIN_SYMBOL_9 _("Frequently Asked Questions")
-#define ID_FRMMAIN_SYMBOL_10 _("Keyboard shortcuts")
-#define ID_FRMMAIN_SYMBOL_11 _("Thanks...")
-#define ID_FRMMAIN_SYMBOL_12 _("Credits...")
-#define ID_FRMMAIN_SYMBOL_13 _("Go to VSCP site")
-#define ID_FRMMAIN_SYMBOL_14 _("About")
-#define ID_FRMMAIN_SYMBOL_15 _("Help")
-#define ID_FRMMAIN_SYMBOL_16 _("VSCP-Works")
+#define ID_FRMMAIN_SYMBOL_7 _("MDF Editor")
+#define ID_FRMMAIN_SYMBOL_8 _("Tools")
+#define ID_FRMMAIN_SYMBOL_9 _("VSCP-Works Help")
+#define ID_FRMMAIN_SYMBOL_10 _("Frequently Asked Questions")
+#define ID_FRMMAIN_SYMBOL_11 _("Keyboard shortcuts")
+#define ID_FRMMAIN_SYMBOL_12 _("Thanks...")
+#define ID_FRMMAIN_SYMBOL_13 _("Credits...")
+#define ID_FRMMAIN_SYMBOL_14 _("Go to VSCP site")
+#define ID_FRMMAIN_SYMBOL_15 _("About")
+#define ID_FRMMAIN_SYMBOL_16 _("Help")
+#define ID_FRMMAIN_SYMBOL_17 _("VSCP-Works")
Added: trunk/src/vscp/vscpworks/mdfeditor.cpp
===================================================================
--- trunk/src/vscp/vscpworks/mdfeditor.cpp (rev 0)
+++ trunk/src/vscp/vscpworks/mdfeditor.cpp 2008-04-20 20:45:55 UTC (rev 887)
@@ -0,0 +1,414 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: mdfeditor.cpp
+// Purpose:
+// Author: Ake Hedman
+// Modified by:
+// Created: Sun 20 Apr 2008 22:00:39 CEST
+// RCS-ID:
+// Copyright: (C) 2007 Ake Hedman, D Of Scandinavia, <ak...@do...>
+// Licence:
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version
+// 2 of the License, or (at your option) any later version.
+//
+// This file is part of the VSCP (http://can.sourceforge.net)
+//
+// Copyright (C) 2000-2007 Ake Hedman, D Of Scandinavia, <ak...@do...>
+//
+// This file is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this file see the file COPYING. If not, write to
+// the Free Software Foundation, 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for VSCP & Friends may be arranged by contacting
+// D of Scandinavia at in...@do..., http://www.dofscandinavia.com
+/////////////////////////////////////////////////////////////////////////////
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma implementation "mdfeditor.h"
+#endif
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/wx.h"
+#endif
+
+////@begin includes
+#include "wx/bookctrl.h"
+////@end includes
+
+#include "mdfeditor.h"
+
+////@begin XPM images
+////@end XPM images
+
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// MDFEditor type definition
+//
+
+IMPLEMENT_DYNAMIC_CLASS( MDFEditor, wxDialog )
+
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// MDFEditor event table definition
+//
+
+BEGIN_EVENT_TABLE( MDFEditor, wxDialog )
+
+////@begin MDFEditor event table entries
+////@end MDFEditor event table entries
+
+END_EVENT_TABLE()
+
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// MDFEditor constructors
+//
+
+MDFEditor::MDFEditor()
+{
+ Init();
+}
+
+MDFEditor::MDFEditor( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
+{
+ Init();
+ Create(parent, id, caption, pos, size, style);
+}
+
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// MDFEditor creator
+//
+
+bool MDFEditor::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
+{
+////@begin MDFEditor creation
+ SetExtraStyle(wxWS_EX_VALIDATE_RECURSIVELY|wxWS_EX_BLOCK_EVENTS);
+ wxPropertySheetDialog::Create( parent, id, caption, pos, size, style );
+
+ SetSheetStyle(wxPROPSHEET_DEFAULT);
+ CreateButtons(wxOK|wxCANCEL|wxHELP);
+ CreateControls();
+ LayoutDialog();
+ Centre();
+////@end MDFEditor creation
+ return true;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// MDFEditor destructor
+//
+
+MDFEditor::~MDFEditor()
+{
+////@begin MDFEditor destruction
+////@end MDFEditor destruction
+}
+
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Member initialisation
+//
+
+void MDFEditor::Init()
+{
+////@begin MDFEditor member initialisation
+////@end MDFEditor member initialisation
+}
+
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Control creation for MDFEditor
+//
+
+void MDFEditor::CreateControls()
+{
+////@begin MDFEditor content construction
+ MDFEditor* itemPropertySheetDialog1 = this;
+
+ wxPanel* itemPanel2 = new wxPanel;
+ itemPanel2->Create( GetBookCtrl(), ID_PANEL_MDF_GENERAL, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
+ wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL);
+ itemPanel2->SetSizer(itemBoxSizer3);
+
+ wxGrid* itemGrid4 = new wxGrid( itemPanel2, ID_GRID1, wxDefaultPosition, wxSize(600, 150), wxSUNKEN_BORDER|wxHSCROLL|wxVSCROLL );
+ itemGrid4->SetDefaultColSize(50);
+ itemGrid4->SetDefaultRowSize(25);
+ itemGrid4->SetColLabelSize(25);
+ itemGrid4->SetRowLabelSize(50);
+ itemGrid4->CreateGrid(5, 5, wxGrid::wxGridSelectCells);
+ itemBoxSizer3->Add(itemGrid4, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+
+ wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL);
+ itemBoxSizer3->Add(itemBoxSizer5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+ wxBitmapButton* itemBitmapButton6 = new wxBitmapButton;
+ itemBitmapButton6->Create( itemPanel2, ID_BITMAPBUTTON1, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+ itemBoxSizer5->Add(itemBitmapButton6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+ wxBitmapButton* itemBitmapButton7 = new wxBitmapButton;
+ itemBitmapButton7->Create( itemPanel2, ID_BITMAPBUTTON, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+ itemBoxSizer5->Add(itemBitmapButton7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+ wxBitmapButton* itemBitmapButton8 = new wxBitmapButton;
+ itemBitmapButton8->Create( itemPanel2, ID_BITMAPBUTTON2, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+ itemBoxSizer5->Add(itemBitmapButton8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+ wxBitmapButton* itemBitmapButton9 = new wxBitmapButton;
+ itemBitmapButton9->Create( itemPanel2, ID_BITMAPBUTTON3, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+ itemBoxSizer5->Add(itemBitmapButton9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+ GetBookCtrl()->AddPage(itemPanel2, _("General"));
+
+ wxPanel* itemPanel10 = new wxPanel;
+ itemPanel10->Create( GetBookCtrl(), ID_PANEL_MDF_ABSTRACTIONS, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
+ wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL);
+ itemPanel10->SetSizer(itemBoxSizer11);
+
+ wxTreeCtrl* itemTreeCtrl12 = new wxTreeCtrl;
+ itemTreeCtrl12->Create( itemPanel10, ID_GRID6, wxDefaultPosition, wxSize(600, 150), wxTR_SINGLE|wxSUNKEN_BORDER );
+ itemBoxSizer11->Add(itemTreeCtrl12, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+
+ wxBoxSizer* itemBoxSizer13 = new wxBoxSizer(wxHORIZONTAL);
+ itemBoxSizer11->Add(itemBoxSizer13, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+ wxBitmapButton* itemBitmapButton14 = new wxBitmapButton;
+ itemBitmapButton14->Create( itemPanel10, ID_BITMAPBUTTON24, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+ itemBoxSizer13->Add(itemBitmapButton14, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+ wxBitmapButton* itemBitmapButton15 = new wxBitmapButton;
+ itemBitmapButton15->Create( itemPanel10, ID_BITMAPBUTTON25, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+ itemBoxSizer13->Add(itemBitmapButton15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+ wxBitmapButton* itemBitmapButton16 = new wxBitmapButton;
+ itemBitmapButton16->Create( itemPanel10, ID_BITMAPBUTTON26, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+ itemBoxSizer13->Add(itemBitmapButton16, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+ wxBitmapButton* itemBitmapButton17 = new wxBitmapButton;
+ itemBitmapButton17->Create( itemPanel10, ID_BITMAPBUTTON27, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+ itemBoxSizer13->Add(itemBitmapButton17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+ GetBookCtrl()->AddPage(itemPanel10, _("Abstractions"));
+
+ wxPanel* itemPanel18 = new wxPanel;
+ itemPanel18->Create( GetBookCtrl(), ID_PANEL_MDF_REGISTERS, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
+ wxBoxSizer* itemBoxSizer19 = new wxBoxSizer(wxVERTICAL);
+ itemPanel18->SetSizer(itemBoxSizer19);
+
+ wxTreeCtrl* itemTreeCtrl20 = new wxTreeCtrl;
+ itemTreeCtrl20->Create( itemPanel18, ID_TREECTRL, wxDefaultPosition, wxSize(600, 150), wxTR_SINGLE|wxSUNKEN_BORDER );
+ itemBoxSizer19->Add(itemTreeCtrl20, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+
+ wxBoxSizer* itemBoxSizer21 = new wxBoxSizer(wxHORIZONTAL);
+ itemBoxSizer19->Add(itemBoxSizer21, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+ wxBitmapButton* itemBitmapButton22 = new wxBitmapButton;
+ itemBitmapButton22->Create( itemPanel18, ID_BITMAPBUTTON20, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+ itemBoxSizer21->Add(itemBitmapButton22, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+ wxBitmapButton* itemBitmapButton23 = new wxBitmapButton;
+ itemBitmapButton23->Create( itemPanel18, ID_BITMAPBUTTON21, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+ itemBoxSizer21->Add(itemBitmapButton23, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+ wxBitmapButton* itemBitmapButton24 = new wxBitmapButton;
+ itemBitmapButton24->Create( itemPanel18, ID_BITMAPBUTTON22, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+ itemBoxSizer21->Add(itemBitmapButton24, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+ wxBitmapButton* itemBitmapButton25 = new wxBitmapButton;
+ itemBitmapButton25->Create( itemPanel18, ID_BITMAPBUTTON23, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+ itemBoxSizer21->Add(itemBitmapButton25, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+ GetBookCtrl()->AddPage(itemPanel18, _("Registers"));
+
+ wxPanel* itemPanel26 = new wxPanel;
+ itemPanel26->Create( GetBookCtrl(), ID_PANEL_MDF_DM, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
+ wxBoxSizer* itemBoxSizer27 = new wxBoxSizer...
[truncated message content] |
|
From: <ak...@us...> - 2008-04-20 20:51:46
|
Revision: 888
http://can.svn.sourceforge.net/can/?rev=888&view=rev
Author: akhe
Date: 2008-04-20 13:51:25 -0700 (Sun, 20 Apr 2008)
Log Message:
-----------
Added some missing files,
Added Paths:
-----------
trunk/src/vscp/drivers/rs485/README
trunk/src/vscp/samples/vscpbutton/configuration.cpp
trunk/src/vscp/samples/vscpbutton/configuration.h
trunk/src/vscp/samples/vscpbutton/configuration_symbols.h
trunk/src/vscp/samples/vscpbutton/vscpbutton.cpp
trunk/src/vscp/samples/vscpbutton/vscpbutton.h
trunk/src/vscp/samples/vscpbutton/vscpbutton_symbols.h
Added: trunk/src/vscp/drivers/rs485/README
===================================================================
--- trunk/src/vscp/drivers/rs485/README (rev 0)
+++ trunk/src/vscp/drivers/rs485/README 2008-04-20 20:51:25 UTC (rev 888)
@@ -0,0 +1 @@
+Prototype for a RS-485 driver.
Added: trunk/src/vscp/samples/vscpbutton/configuration.cpp
===================================================================
--- trunk/src/vscp/samples/vscpbutton/configuration.cpp (rev 0)
+++ trunk/src/vscp/samples/vscpbutton/configuration.cpp 2008-04-20 20:51:25 UTC (rev 888)
@@ -0,0 +1,431 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: configuration.cpp
+// Purpose:
+// Author: Ake Hedman
+// Modified by:
+// Created: Sat 15 Dec 2007 16:52:56 CET
+// RCS-ID:
+// Copyright: Copyright (C) 2007 D of Scandinavia
+// Licence:
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/wx.h"
+#endif
+
+////@begin includes
+#include "wx/bookctrl.h"
+////@end includes
+
+#include "configuration.h"
+
+////@begin XPM images
+////@end XPM images
+
+
+/*!
+ * Configuration type definition
+ */
+
+IMPLEMENT_DYNAMIC_CLASS( Configuration, wxPropertySheetDialog )
+
+
+/*!
+ * Configuration event table definition
+ */
+
+BEGIN_EVENT_TABLE( Configuration, wxPropertySheetDialog )
+
+////@begin Configuration event table entries
+////@end Configuration event table entries
+
+END_EVENT_TABLE()
+
+
+/*!
+ * Configuration constructors
+ */
+
+Configuration::Configuration()
+{
+ Init();
+}
+
+Configuration::Configuration( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
+{
+ Init();
+ Create(parent, id, caption, pos, size, style);
+}
+
+
+/*!
+ * Configuration creator
+ */
+
+bool Configuration::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
+{
+////@begin Configuration creation
+ SetExtraStyle(wxWS_EX_VALIDATE_RECURSIVELY|wxWS_EX_BLOCK_EVENTS);
+ wxPropertySheetDialog::Create( parent, id, caption, pos, size, style );
+
+ SetSheetStyle(wxPROPSHEET_DEFAULT);
+ CreateButtons(wxOK|wxCANCEL|wxHELP);
+ CreateControls();
+ LayoutDialog();
+ Centre();
+////@end Configuration creation
+ return true;
+}
+
+
+/*!
+ * Configuration destructor
+ */
+
+Configuration::~Configuration()
+{
+////@begin Configuration destruction
+////@end Configuration destruction
+}
+
+
+/*!
+ * Member initialisation
+ */
+
+void Configuration::Init()
+{
+////@begin Configuration member initialisation
+ m_RemoteServerDescription = NULL;
+ m_RemoteServerURL = NULL;
+ m_RemoteServerPort = NULL;
+ m_RemoteServerUsername = NULL;
+ m_RemoteServerPassword = NULL;
+ m_strVscpClass = NULL;
+ m_strVscpType = NULL;
+ m_wxChoicePriority = NULL;
+ m_strGUID15 = NULL;
+ m_wxStrGUID14 = NULL;
+ m_wxStrGUID13 = NULL;
+ m_wxStrGUID12 = NULL;
+ m_wxStrGUID11 = NULL;
+ m_wxStrGUID10 = NULL;
+ m_wxStrGUID9 = NULL;
+ m_wxStrGUID8 = NULL;
+ m_wxStrGUID7 = NULL;
+ m_wxStrGUID6 = NULL;
+ m_wxStrGUID5 = NULL;
+ m_wxStrGUID4 = NULL;
+ m_wxStrGUID3 = NULL;
+ m_wxStrGUID2 = NULL;
+ m_wxStrGUID1 = NULL;
+ m_wxStrGUID0 = NULL;
+ m_strVscpData = NULL;
+ m_strNote = NULL;
+////@end Configuration member initialisation
+}
+
+
+/*!
+ * Control creation for Configuration
+ */
+
+void Configuration::CreateControls()
+{
+////@begin Configuration content construction
+ Configuration* itemPropertySheetDialog1 = this;
+
+ wxPanel* itemPanel2 = new wxPanel;
+ itemPanel2->Create( GetBookCtrl(), ID_PANEL_HOST_SETTINGS, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
+ wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL);
+ itemPanel2->SetSizer(itemBoxSizer3);
+
+ wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxVERTICAL);
+ itemBoxSizer3->Add(itemBoxSizer4, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+
+ wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL);
+ itemBoxSizer3->Add(itemBoxSizer5, 0, wxALIGN_RIGHT|wxALL, 1);
+ wxStaticText* itemStaticText6 = new wxStaticText;
+ itemStaticText6->Create( itemPanel2, wxID_STATIC, _("Description:"), wxDefaultPosition, wxDefaultSize, 0 );
+ itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ m_RemoteServerDescription = new wxTextCtrl;
+ m_RemoteServerDescription->Create( itemPanel2, ID_TEXTCTRL18, _T(""), wxDefaultPosition, wxSize(400, -1), 0 );
+ itemBoxSizer5->Add(m_RemoteServerDescription, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxHORIZONTAL);
+ itemBoxSizer3->Add(itemBoxSizer8, 0, wxALIGN_RIGHT|wxALL, 1);
+ wxStaticText* itemStaticText9 = new wxStaticText;
+ itemStaticText9->Create( itemPanel2, wxID_STATIC, _("Server URL:"), wxDefaultPosition, wxDefaultSize, 0 );
+ itemBoxSizer8->Add(itemStaticText9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ m_RemoteServerURL = new wxTextCtrl;
+ m_RemoteServerURL->Create( itemPanel2, ID_TEXTCTRL19, _("localhost"), wxDefaultPosition, wxSize(400, -1), 0 );
+ itemBoxSizer8->Add(m_RemoteServerURL, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxHORIZONTAL);
+ itemBoxSizer3->Add(itemBoxSizer11, 0, wxALIGN_RIGHT|wxALL, 1);
+ wxStaticText* itemStaticText12 = new wxStaticText;
+ itemStaticText12->Create( itemPanel2, wxID_STATIC, _("Server port:"), wxDefaultPosition, wxDefaultSize, 0 );
+ itemBoxSizer11->Add(itemStaticText12, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ m_RemoteServerPort = new wxTextCtrl;
+ m_RemoteServerPort->Create( itemPanel2, ID_TEXTCTRL20, _("9598"), wxDefaultPosition, wxSize(50, -1), 0 );
+ itemBoxSizer11->Add(m_RemoteServerPort, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ itemBoxSizer11->Add(348, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ wxBoxSizer* itemBoxSizer15 = new wxBoxSizer(wxHORIZONTAL);
+ itemBoxSizer3->Add(itemBoxSizer15, 0, wxALIGN_RIGHT|wxALL, 1);
+ wxStaticText* itemStaticText16 = new wxStaticText;
+ itemStaticText16->Create( itemPanel2, wxID_STATIC, _("Username:"), wxDefaultPosition, wxDefaultSize, 0 );
+ itemBoxSizer15->Add(itemStaticText16, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ m_RemoteServerUsername = new wxTextCtrl;
+ m_RemoteServerUsername->Create( itemPanel2, ID_TEXTCTRL21, _T(""), wxDefaultPosition, wxSize(200, -1), 0 );
+ itemBoxSizer15->Add(m_RemoteServerUsername, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ itemBoxSizer15->Add(200, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ wxBoxSizer* itemBoxSizer19 = new wxBoxSizer(wxHORIZONTAL);
+ itemBoxSizer3->Add(itemBoxSizer19, 0, wxALIGN_RIGHT|wxALL, 1);
+ wxStaticText* itemStaticText20 = new wxStaticText;
+ itemStaticText20->Create( itemPanel2, wxID_STATIC, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 );
+ itemBoxSizer19->Add(itemStaticText20, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ m_RemoteServerPassword = new wxTextCtrl;
+ m_RemoteServerPassword->Create( itemPanel2, ID_TEXTCTRL22, _T(""), wxDefaultPosition, wxSize(200, -1), wxTE_PASSWORD );
+ itemBoxSizer19->Add(m_RemoteServerPassword, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ itemBoxSizer19->Add(200, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ wxBoxSizer* itemBoxSizer23 = new wxBoxSizer(wxHORIZONTAL);
+ itemBoxSizer3->Add(itemBoxSizer23, 0, wxALIGN_RIGHT|wxALL, 5);
+
+ wxBoxSizer* itemBoxSizer24 = new wxBoxSizer(wxHORIZONTAL);
+ itemBoxSizer3->Add(itemBoxSizer24, 0, wxALIGN_RIGHT|wxALL, 5);
+ wxButton* itemButton25 = new wxButton;
+ itemButton25->Create( itemPanel2, ID_BUTTON, _("Test connection"), wxDefaultPosition, wxDefaultSize, 0 );
+ itemBoxSizer24->Add(itemButton25, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ itemBoxSizer24->Add(285, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ GetBookCtrl()->AddPage(itemPanel2, _("Host"));
+
+ wxPanel* itemPanel27 = new wxPanel;
+ itemPanel27->Create( GetBookCtrl(), ID_PANEL_EVENT_SETTINGS, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
+ wxBoxSizer* itemBoxSizer28 = new wxBoxSizer(wxHORIZONTAL);
+ itemPanel27->SetSizer(itemBoxSizer28);
+
+ wxBoxSizer* itemBoxSizer29 = new wxBoxSizer(wxVERTICAL);
+ itemBoxSizer28->Add(itemBoxSizer29, 0, wxALIGN_TOP|wxALL, 5);
+ itemBoxSizer29->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+
+ wxBoxSizer* itemBoxSizer31 = new wxBoxSizer(wxHORIZONTAL);
+ itemBoxSizer28->Add(itemBoxSizer31, 0, wxALIGN_TOP|wxALL, 5);
+ wxFlexGridSizer* itemFlexGridSizer32 = new wxFlexGridSizer(2, 2, 0, 0);
+ itemBoxSizer31->Add(itemFlexGridSizer32, 1, wxALIGN_TOP|wxALL, 1);
+ wxStaticText* itemStaticText33 = new wxStaticText;
+ itemStaticText33->Create( itemPanel27, wxID_STATIC, _("Class :"), wxDefaultPosition, wxDefaultSize, 0 );
+ itemStaticText33->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, false, wxT("Tahoma")));
+ itemFlexGridSizer32->Add(itemStaticText33, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 1);
+
+ wxArrayString m_strVscpClassStrings;
+ m_strVscpClass = new wxComboBox;
+ m_strVscpClass->Create( itemPanel27, ID_COMBOBOX, _T(""), wxDefaultPosition, wxSize(200, -1), m_strVscpClassStrings, wxCB_DROPDOWN );
+ itemFlexGridSizer32->Add(m_strVscpClass, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ wxStaticText* itemStaticText35 = new wxStaticText;
+ itemStaticText35->Create( itemPanel27, wxID_STATIC, _("Type :"), wxDefaultPosition, wxDefaultSize, 0 );
+ itemStaticText35->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, false, wxT("Tahoma")));
+ itemFlexGridSizer32->Add(itemStaticText35, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 1);
+
+ wxArrayString m_strVscpTypeStrings;
+ m_strVscpType = new wxComboBox;
+ m_strVscpType->Create( itemPanel27, ID_COMBOBOX1, _T(""), wxDefaultPosition, wxSize(200, -1), m_strVscpTypeStrings, wxCB_DROPDOWN );
+ itemFlexGridSizer32->Add(m_strVscpType, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ wxStaticText* itemStaticText37 = new wxStaticText;
+ itemStaticText37->Create( itemPanel27, wxID_STATIC, _("Priority :"), wxDefaultPosition, wxDefaultSize, 0 );
+ itemStaticText37->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, false, wxT("Tahoma")));
+ itemFlexGridSizer32->Add(itemStaticText37, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 1);
+
+ wxArrayString m_wxChoicePriorityStrings;
+ m_wxChoicePriorityStrings.Add(_("0 - Highest"));
+ m_wxChoicePriorityStrings.Add(_("1 - Even higher"));
+ m_wxChoicePriorityStrings.Add(_("2 - Higher"));
+ m_wxChoicePriorityStrings.Add(_("3 - Normal high"));
+ m_wxChoicePriorityStrings.Add(_("4 - Normal low"));
+ m_wxChoicePriorityStrings.Add(_("5 - Lower"));
+ m_wxChoicePriorityStrings.Add(_("6 - Even lower"));
+ m_wxChoicePriorityStrings.Add(_("7 - Lowest"));
+ m_wxChoicePriority = new wxChoice;
+ m_wxChoicePriority->Create( itemPanel27, ID_CHOICE, wxDefaultPosition, wxSize(120, -1), m_wxChoicePriorityStrings, 0 );
+ m_wxChoicePriority->SetStringSelection(_("0"));
+ itemFlexGridSizer32->Add(m_wxChoicePriority, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ itemFlexGridSizer32->Add(5, 5, 0, wxALIGN_LEFT|wxALIGN_TOP|wxRIGHT|wxTOP|wxBOTTOM, 2);
+
+ itemFlexGridSizer32->Add(5, 5, 0, wxALIGN_LEFT|wxALIGN_TOP|wxRIGHT|wxTOP|wxBOTTOM, 2);
+
+ itemFlexGridSizer32->Add(5, 5, 0, wxALIGN_LEFT|wxALIGN_TOP|wxRIGHT|wxTOP|wxBOTTOM, 2);
+
+ wxStaticText* itemStaticText42 = new wxStaticText;
+ itemStaticText42->Create( itemPanel27, wxID_STATIC, _("GUID"), wxDefaultPosition, wxDefaultSize, 0 );
+ itemStaticText42->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, false, wxT("Tahoma")));
+ itemFlexGridSizer32->Add(itemStaticText42, 1, wxALIGN_LEFT|wxALIGN_TOP|wxALL|wxADJUST_MINSIZE, 0);
+
+ wxStaticText* itemStaticText43 = new wxStaticText;
+ itemStaticText43->Create( itemPanel27, wxID_STATIC, _("15 - 8 :"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
+ itemStaticText43->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, false, wxT("Tahoma")));
+ itemFlexGridSizer32->Add(itemStaticText43, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 1);
+
+ wxBoxSizer* itemBoxSizer44 = new wxBoxSizer(wxHORIZONTAL);
+ itemFlexGridSizer32->Add(itemBoxSizer44, 1, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 1);
+ m_strGUID15 = new wxTextCtrl;
+ m_strGUID15->Create( itemPanel27, ID_TEXTCTRL, _("0"), wxDefaultPosition, wxSize(40, -1), wxTE_RIGHT );
+ itemBoxSizer44->Add(m_strGUID15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ m_wxStrGUID14 = new wxTextCtrl;
+ m_wxStrGUID14->Create( itemPanel27, ID_TEXTCTRL1, _("0"), wxDefaultPosition, wxSize(40, -1), wxTE_RIGHT );
+ itemBoxSizer44->Add(m_wxStrGUID14, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ m_wxStrGUID13 = new wxTextCtrl;
+ m_wxStrGUID13->Create( itemPanel27, ID_TEXTCTRL2, _("0"), wxDefaultPosition, wxSize(40, -1), wxTE_RIGHT );
+ itemBoxSizer44->Add(m_wxStrGUID13, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ m_wxStrGUID12 = new wxTextCtrl;
+ m_wxStrGUID12->Create( itemPanel27, ID_TEXTCTRL3, _("0"), wxDefaultPosition, wxSize(40, -1), wxTE_RIGHT );
+ itemBoxSizer44->Add(m_wxStrGUID12, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ m_wxStrGUID11 = new wxTextCtrl;
+ m_wxStrGUID11->Create( itemPanel27, ID_TEXTCTRL4, _("0"), wxDefaultPosition, wxSize(40, -1), wxTE_RIGHT );
+ itemBoxSizer44->Add(m_wxStrGUID11, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ m_wxStrGUID10 = new wxTextCtrl;
+ m_wxStrGUID10->Create( itemPanel27, ID_TEXTCTRL5, _("0"), wxDefaultPosition, wxSize(40, -1), wxTE_RIGHT );
+ itemBoxSizer44->Add(m_wxStrGUID10, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ m_wxStrGUID9 = new wxTextCtrl;
+ m_wxStrGUID9->Create( itemPanel27, ID_TEXTCTRL6, _("0"), wxDefaultPosition, wxSize(40, -1), wxTE_RIGHT );
+ itemBoxSizer44->Add(m_wxStrGUID9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ m_wxStrGUID8 = new wxTextCtrl;
+ m_wxStrGUID8->Create( itemPanel27, ID_TEXTCTRL7, _("0"), wxDefaultPosition, wxSize(40, -1), wxTE_RIGHT );
+ itemBoxSizer44->Add(m_wxStrGUID8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ wxStaticText* itemStaticText53 = new wxStaticText;
+ itemStaticText53->Create( itemPanel27, wxID_STATIC, _("7 - 0 :"), wxDefaultPosition, wxDefaultSize, 0 );
+ itemStaticText53->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, false, wxT("Tahoma")));
+ itemFlexGridSizer32->Add(itemStaticText53, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 1);
+
+ wxBoxSizer* itemBoxSizer54 = new wxBoxSizer(wxHORIZONTAL);
+ itemFlexGridSizer32->Add(itemBoxSizer54, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 1);
+ m_wxStrGUID7 = new wxTextCtrl;
+ m_wxStrGUID7->Create( itemPanel27, ID_TEXTCTRL8, _("0"), wxDefaultPosition, wxSize(40, -1), wxTE_RIGHT );
+ itemBoxSizer54->Add(m_wxStrGUID7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ m_wxStrGUID6 = new wxTextCtrl;
+ m_wxStrGUID6->Create( itemPanel27, ID_TEXTCTRL9, _("0"), wxDefaultPosition, wxSize(40, -1), wxTE_RIGHT );
+ itemBoxSizer54->Add(m_wxStrGUID6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ m_wxStrGUID5 = new wxTextCtrl;
+ m_wxStrGUID5->Create( itemPanel27, ID_TEXTCTRL10, _("0"), wxDefaultPosition, wxSize(40, -1), wxTE_RIGHT );
+ itemBoxSizer54->Add(m_wxStrGUID5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ m_wxStrGUID4 = new wxTextCtrl;
+ m_wxStrGUID4->Create( itemPanel27, ID_TEXTCTRL11, _("0"), wxDefaultPosition, wxSize(40, -1), wxTE_RIGHT );
+ itemBoxSizer54->Add(m_wxStrGUID4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ m_wxStrGUID3 = new wxTextCtrl;
+ m_wxStrGUID3->Create( itemPanel27, ID_TEXTCTRL12, _("0"), wxDefaultPosition, wxSize(40, -1), wxTE_RIGHT );
+ itemBoxSizer54->Add(m_wxStrGUID3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ m_wxStrGUID2 = new wxTextCtrl;
+ m_wxStrGUID2->Create( itemPanel27, ID_TEXTCTRL13, _("0"), wxDefaultPosition, wxSize(40, -1), wxTE_RIGHT );
+ itemBoxSizer54->Add(m_wxStrGUID2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ m_wxStrGUID1 = new wxTextCtrl;
+ m_wxStrGUID1->Create( itemPanel27, ID_TEXTCTRL14, _("0"), wxDefaultPosition, wxSize(40, -1), wxTE_RIGHT );
+ itemBoxSizer54->Add(m_wxStrGUID1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ m_wxStrGUID0 = new wxTextCtrl;
+ m_wxStrGUID0->Create( itemPanel27, ID_TEXTCTRL15, _("0"), wxDefaultPosition, wxSize(40, -1), wxTE_RIGHT );
+ itemBoxSizer54->Add(m_wxStrGUID0, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
+ wxStaticText* itemStaticText63 = new wxStaticText;
+ itemStaticText63->Create( itemPanel27, wxID_STATIC, _("Data :"), wxDefaultPosition, wxDefaultSize, 0 );
+ itemStaticText63->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, false, wxT("Tahoma")));
+ itemFlexGridSizer32->Add(itemStaticText63, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 1);
+
+ m_strVscpData = new wxTextCtrl;
+ m_strVscpData->Create( itemPanel27, ID_TEXTCTRL16, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
+ if (Configuration::ShowToolTips())
+ m_strVscpData->SetToolTip(_("You enter data for the event as a comma separated list. You can arrange the data on lines. Hexadecimal values should be preceded with '0x'."));
+ itemFlexGridSizer32->Add(m_strVscpData, 2, wxGROW|wxALIGN_TOP|wxALL, 1);
+
+ itemFlexGridSizer32->Add(5, 5, 0, wxALIGN_LEFT|wxALIGN_TOP|wxRIGHT|wxTOP|wxBOTTOM, 2);
+
+ itemFlexGridSizer32->Add(5, 5, 0, wxALIGN_LEFT|wxALIGN_TOP|wxRIGHT|wxTOP|wxBOTTOM, 2);
+
+ wxStaticText* itemStaticText67 = new wxStaticText;
+ itemStaticText67->Create( itemPanel27, wxID_STATIC, _("Note :"), wxDefaultPosition, wxDefaultSize, 0 );
+ itemStaticText67->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, false, wxT("Tahoma")));
+ itemFlexGridSizer32->Add(itemStaticText67, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 1);
+
+ m_strNote = new wxTextCtrl;
+ m_strNote->Create( itemPanel27, ID_TEXTCTRL17, _T(""), wxDefaultPosition, wxSize(-1, 50), 0 );
+ itemFlexGridSizer32->Add(m_strNote, 2, wxGROW|wxALIGN_TOP|wxALL, 1);
+
+ wxBoxSizer* itemBoxSizer69 = new wxBoxSizer(wxHORIZONTAL);
+ itemBoxSizer28->Add(itemBoxSizer69, 0, wxALIGN_BOTTOM|wxALL, 1);
+ wxBoxSizer* itemBoxSizer70 = new wxBoxSizer(wxVERTICAL);
+ itemBoxSizer69->Add(itemBoxSizer70, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+ GetBookCtrl()->AddPage(itemPanel27, _("Event"));
+
+////@end Configuration content construction
+}
+
+
+/*!
+ * Should we show tooltips?
+ */
+
+bool Configuration::ShowToolTips()
+{
+ return true;
+}
+
+/*!
+ * Get bitmap resources
+ */
+
+wxBitmap Configuration::GetBitmapResource( const wxString& name )
+{
+ // Bitmap retrieval
+////@begin Configuration bitmap retrieval
+ wxUnusedVar(name);
+ return wxNullBitmap;
+////@end Configuration bitmap retrieval
+}
+
+/*!
+ * Get icon resources
+ */
+
+wxIcon Configuration::GetIconResource( const wxString& name )
+{
+ // Icon retrieval
+////@begin Configuration icon retrieval
+ wxUnusedVar(name);
+ return wxNullIcon;
+////@end Configuration icon retrieval
+}
Added: trunk/src/vscp/samples/vscpbutton/configuration.h
===================================================================
--- trunk/src/vscp/samples/vscpbutton/configuration.h (rev 0)
+++ trunk/src/vscp/samples/vscpbutton/configuration.h 2008-04-20 20:51:25 UTC (rev 888)
@@ -0,0 +1,148 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: configuration.h
+// Purpose:
+// Author: Ake Hedman
+// Modified by:
+// Created: Sat 15 Dec 2007 16:52:56 CET
+// RCS-ID:
+// Copyright: Copyright (C) 2007 D of Scandinavia
+// Licence:
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _CONFIGURATION_H_
+#define _CONFIGURATION_H_
+
+
+/*!
+ * Includes
+ */
+
+////@begin includes
+#include "configuration_symbols.h"
+#include "wx/propdlg.h"
+////@end includes
+
+/*!
+ * Forward declarations
+ */
+
+////@begin forward declarations
+////@end forward declarations
+
+/*!
+ * Control identifiers
+ */
+
+////@begin control identifiers
+#define ID_CONFIGURATION 10002
+#define ID_PANEL_HOST_SETTINGS 10003
+#define ID_TEXTCTRL18 10018
+#define ID_TEXTCTRL19 10019
+#define ID_TEXTCTRL20 10020
+#define ID_TEXTCTRL21 10024
+#define ID_TEXTCTRL22 10025
+#define ID_BUTTON 10026
+#define ID_PANEL_EVENT_SETTINGS 10001
+#define ID_COMBOBOX 10000
+#define ID_COMBOBOX1 10004
+#define ID_CHOICE 10005
+#define ID_TEXTCTRL 10006
+#define ID_TEXTCTRL1 10007
+#define ID_TEXTCTRL2 10008
+#define ID_TEXTCTRL3 10009
+#define ID_TEXTCTRL4 10010
+#define ID_TEXTCTRL5 10011
+#define ID_TEXTCTRL6 10012
+#define ID_TEXTCTRL7 10013
+#define ID_TEXTCTRL8 10014
+#define ID_TEXTCTRL9 10015
+#define ID_TEXTCTRL10 10016
+#define ID_TEXTCTRL11 10017
+#define ID_TEXTCTRL12 10021
+#define ID_TEXTCTRL13 10022
+#define ID_TEXTCTRL14 10023
+#define ID_TEXTCTRL15 10032
+#define ID_TEXTCTRL16 10035
+#define ID_TEXTCTRL17 10036
+#define SYMBOL_CONFIGURATION_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
+#define SYMBOL_CONFIGURATION_TITLE _("Configuration")
+#define SYMBOL_CONFIGURATION_IDNAME ID_CONFIGURATION
+#define SYMBOL_CONFIGURATION_SIZE wxSize(400, 300)
+#define SYMBOL_CONFIGURATION_POSITION wxDefaultPosition
+////@end control identifiers
+
+
+/*!
+ * Configuration class declaration
+ */
+
+class Configuration: public wxPropertySheetDialog
+{
+ DECLARE_DYNAMIC_CLASS( Configuration )
+ DECLARE_EVENT_TABLE()
+
+public:
+ /// Constructors
+ Configuration();
+ Configuration( wxWindow* parent, wxWindowID id = SYMBOL_CONFIGURATION_IDNAME, const wxString& caption = SYMBOL_CONFIGURATION_TITLE, const wxPoint& pos = SYMBOL_CONFIGURATION_POSITION, const wxSize& size = SYMBOL_CONFIGURATION_SIZE, long style = SYMBOL_CONFIGURATION_STYLE );
+
+ /// Creation
+ bool Create( wxWindow* parent, wxWindowID id = SYMBOL_CONFIGURATION_IDNAME, const wxString& caption = SYMBOL_CONFIGURATION_TITLE, const wxPoint& pos = SYMBOL_CONFIGURATION_POSITION, const wxSize& size = SYMBOL_CONFIGURATION_SIZE, long style = SYMBOL_CONFIGURATION_STYLE );
+
+ /// Destructor
+ ~Configuration();
+
+ /// Initialises member variables
+ void Init();
+
+ /// Creates the controls and sizers
+ void CreateControls();
+
+////@begin Configuration event handler declarations
+
+////@end Configuration event handler declarations
+
+////@begin Configuration member function declarations
+
+ /// Retrieves bitmap resources
+ wxBitmap GetBitmapResource( const wxString& name );
+
+ /// Retrieves icon resources
+ wxIcon GetIconResource( const wxString& name );
+////@end Configuration member function declarations
+
+ /// Should we show tooltips?
+ static bool ShowToolTips();
+
+////@begin Configuration member variables
+ wxTextCtrl* m_RemoteServerDescription;
+ wxTextCtrl* m_RemoteServerURL;
+ wxTextCtrl* m_RemoteServerPort;
+ wxTextCtrl* m_RemoteServerUsername;
+ wxTextCtrl* m_RemoteServerPassword;
+ wxComboBox* m_strVscpClass;
+ wxComboBox* m_strVscpType;
+ wxChoice* m_wxChoicePriority;
+ wxTextCtrl* m_strGUID15;
+ wxTextCtrl* m_wxStrGUID14;
+ wxTextCtrl* m_wxStrGUID13;
+ wxTextCtrl* m_wxStrGUID12;
+ wxTextCtrl* m_wxStrGUID11;
+ wxTextCtrl* m_wxStrGUID10;
+ wxTextCtrl* m_wxStrGUID9;
+ wxTextCtrl* m_wxStrGUID8;
+ wxTextCtrl* m_wxStrGUID7;
+ wxTextCtrl* m_wxStrGUID6;
+ wxTextCtrl* m_wxStrGUID5;
+ wxTextCtrl* m_wxStrGUID4;
+ wxTextCtrl* m_wxStrGUID3;
+ wxTextCtrl* m_wxStrGUID2;
+ wxTextCtrl* m_wxStrGUID1;
+ wxTextCtrl* m_wxStrGUID0;
+ wxTextCtrl* m_strVscpData;
+ wxTextCtrl* m_strNote;
+////@end Configuration member variables
+};
+
+#endif
+ // _CONFIGURATION_H_
Added: trunk/src/vscp/samples/vscpbutton/configuration_symbols.h
===================================================================
--- trunk/src/vscp/samples/vscpbutton/configuration_symbols.h (rev 0)
+++ trunk/src/vscp/samples/vscpbutton/configuration_symbols.h 2008-04-20 20:51:25 UTC (rev 888)
@@ -0,0 +1,40 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: configuration_symbols.h
+// Purpose: Symbols file
+// Author: Ake Hedman
+// Modified by:
+// Created: Sat 15 Dec 2007 17:02:50 CET
+// RCS-ID:
+// Copyright: Copyright (C) 2007 D of Scandinavia
+// Licence:
+/////////////////////////////////////////////////////////////////////////////
+
+#define ID_CONFIGURATION_SYMBOL_0 _("Description:")
+#define ID_CONFIGURATION_SYMBOL_1 _("Server URL:")
+#define ID_CONFIGURATION_SYMBOL_2 _("localhost")
+#define ID_CONFIGURATION_SYMBOL_3 _("Server port:")
+#define ID_CONFIGURATION_SYMBOL_4 _("9598")
+#define ID_CONFIGURATION_SYMBOL_5 _("Username:")
+#define ID_CONFIGURATION_SYMBOL_6 _("Password:")
+#define ID_CONFIGURATION_SYMBOL_7 _("Test connection")
+#define ID_CONFIGURATION_SYMBOL_8 _("Host")
+#define ID_CONFIGURATION_SYMBOL_9 _("Class :")
+#define ID_CONFIGURATION_SYMBOL_10 _("Type :")
+#define ID_CONFIGURATION_SYMBOL_11 _("Priority :")
+#define ID_CONFIGURATION_SYMBOL_12 _("0 - Highest")
+#define ID_CONFIGURATION_SYMBOL_13 _("1 - Even higher")
+#define ID_CONFIGURATION_SYMBOL_14 _("2 - Higher")
+#define ID_CONFIGURATION_SYMBOL_15 _("3 - Normal high")
+#define ID_CONFIGURATION_SYMBOL_16 _("4 - Normal low")
+#define ID_CONFIGURATION_SYMBOL_17 _("5 - Lower")
+#define ID_CONFIGURATION_SYMBOL_18 _("6 - Even lower")
+#define ID_CONFIGURATION_SYMBOL_19 _("7 - Lowest")
+#define ID_CONFIGURATION_SYMBOL_20 _("0")
+#define ID_CONFIGURATION_SYMBOL_21 _("GUID")
+#define ID_CONFIGURATION_SYMBOL_22 _("15 - 8 :")
+#define ID_CONFIGURATION_SYMBOL_23 _("7 - 0 :")
+#define ID_CONFIGURATION_SYMBOL_24 _("Data :")
+#define ID_CONFIGURATION_SYMBOL_25 _("You enter data for the event as a comma separated list. You can arrange the data on lines. Hexadecimal values should be preceded with '0x'.")
+#define ID_CONFIGURATION_SYMBOL_26 _("Note :")
+#define ID_CONFIGURATION_SYMBOL_27 _("Event")
+#define ID_CONFIGURATION_SYMBOL_28 _("Configuration")
Added: trunk/src/vscp/samples/vscpbutton/vscpbutton.cpp
===================================================================
--- trunk/src/vscp/samples/vscpbutton/vscpbutton.cpp (rev 0)
+++ trunk/src/vscp/samples/vscpbutton/vscpbutton.cpp 2008-04-20 20:51:25 UTC (rev 888)
@@ -0,0 +1,171 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: vscpbutton.cpp
+// Purpose:
+// Author: Ake Hedman
+// Modified by:
+// Created: Sat 15 Dec 2007 16:00:05 CET
+// RCS-ID:
+// Copyright: Copyright (C) 2007 D of Scandinavia
+// Licence:
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/wx.h"
+#endif
+
+////@begin includes
+////@end includes
+
+#include "vscpbutton.h"
+
+////@begin XPM images
+////@end XPM images
+
+
+/*!
+ * VSCPButton type definition
+ */
+
+IMPLEMENT_DYNAMIC_CLASS( VSCPButton, wxDialog )
+
+
+/*!
+ * VSCPButton event table definition
+ */
+
+BEGIN_EVENT_TABLE( VSCPButton, wxDialog )
+
+////@begin VSCPButton event table entries
+////@end VSCPButton event table entries
+
+END_EVENT_TABLE()
+
+
+/*!
+ * VSCPButton constructors
+ */
+
+VSCPButton::VSCPButton()
+{
+ Init();
+}
+
+VSCPButton::VSCPButton( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
+{
+ Init();
+ Create(parent, id, caption, pos, size, style);
+}
+
+
+/*!
+ * VSCPButton creator
+ */
+
+bool VSCPButton::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
+{
+////@begin VSCPButton creation
+ SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
+ wxDialog::Create( parent, id, caption, pos, size, style );
+
+ CreateControls();
+ if (GetSizer())
+ {
+ GetSizer()->SetSizeHints(this);
+ }
+ Centre();
+////@end VSCPButton creation
+ return true;
+}
+
+
+/*!
+ * VSCPButton destructor
+ */
+
+VSCPButton::~VSCPButton()
+{
+////@begin VSCPButton destruction
+////@end VSCPButton destruction
+}
+
+
+/*!
+ * Member initialisation
+ */
+
+void VSCPButton::Init()
+{
+////@begin VSCPButton member initialisation
+////@end VSCPButton member initialisation
+}
+
+
+/*!
+ * Control creation for VSCPButton
+ */
+
+void VSCPButton::CreateControls()
+{
+////@begin VSCPButton content construction
+ VSCPButton* itemDialog1 = this;
+
+ wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
+ itemDialog1->SetSizer(itemBoxSizer2);
+
+ wxToolBar* itemToolBar3 = new wxToolBar;
+ itemToolBar3->Create( itemDialog1, ID_TOOLBAR, wxDefaultPosition, wxDefaultSize, wxTB_FLAT|wxTB_HORIZONTAL );
+ wxBitmap itemtool4Bitmap(wxNullBitmap);
+ wxBitmap itemtool4BitmapDisabled;
+ itemToolBar3->AddTool(ID_TOOL, _T(""), itemtool4Bitmap, itemtool4BitmapDisabled, wxITEM_NORMAL, _T(""), wxEmptyString);
+ itemToolBar3->Realize();
+ itemBoxSi...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X