rhodes 3.3.2 → 3.3.3.beta.1

data/platform/wm/rhodes/Rhodes.cpp

@@ -90,6 +90,7 @@ struct CBarcodeInit
     CBarcodeInit()
     {
         m_bMC4900 = false;
+/*
         OSVERSIONINFO osv = {0};
 		osv.dwOSVersionInfoSize = sizeof(osv);
 		if (GetVersionEx(&osv))
@@ -98,7 +99,7 @@ struct CBarcodeInit
         RAWLOG_INFO1("CBarcodeInit : OS version :  %d", osv.dwMajorVersion);
 
         if ( m_bMC4900 )
-            rho_scanner_before_webkit();
+            rho_scanner_before_webkit();*/
     }
 
     static DWORD afterWebkit(LPVOID ){ rho_scanner_after_webkit(); return 0; }

data/platform/wm/rhodes/Rhodes.rc

@@ -124,12 +124,12 @@ BEGIN
     MENUITEM "Close",                       IDOK
 END
 
-
 IDR_SIGNATURE_MENU MENU 
 BEGIN
     MENUITEM "Clear",                       IDM_CLEAR
 END
 
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
@@ -198,7 +198,7 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,97,87,50,14
 END
 
-IDD_DATETIME_PICKER DIALOGEX 0, 0, 172, 186
+IDD_DATETIME_PICKER DIALOG  0, 0, 172, 186
 STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "DateTime Picker"
 FONT 8, "Microsoft Sans Serif"
@@ -207,16 +207,16 @@ BEGIN
     CONTROL         "",IDC_DATE_CTRL,"SysDateTimePick32",DTS_RIGHTALIGN | WS_TABSTOP,7,29,143,15
     LTEXT           "Time:",IDC_TIME_STATIC,7,44,25,10
     LTEXT           "Date:",IDC_DATE_STATIC,7,21,27,8
-    LTEXT           "DateTime Picker",ID_DATETIME_CAPTION,9,6,141,8
+    LTEXT           "DateTime Picker",ID_DATETIME_CAPTION,9,6,107,8
 END
 
-IDD_TIME_PICKER DIALOGEX 0, 0, 172, 186
+IDD_TIME_PICKER DIALOG  0, 0, 172, 186
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "",IDC_TIME_CTRL,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_TABSTOP | 0x8,7,29,143,15
     LTEXT           "Time:",IDC_TIME_STATIC,7,21,27,8
-    LTEXT           "Time Picker",ID_TIME_CAPTION,9,6,142,8
+    LTEXT           "Time Picker",ID_TIME_CAPTION,9,6,110,8
 END
 
 IDD_BLUETOOTH_DISCOVER DIALOG  0, 0, 172, 186
@@ -251,11 +251,12 @@ BEGIN
 END
 
 IDD_TAKE_SIGNATURE DIALOG  0, 0, 135, 105
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_SYSMENU// | WS_CAPTION
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 BEGIN
 END
 
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO

data/platform/wm/rhodes/rho/rubyext/RhoSignature.cpp

@@ -20,6 +20,7 @@ extern BOOL rho_wmimpl_saveSignature(void *inkImpl, LPCTSTR szFilePathName);
 
 extern "C" HWND getMainWnd();
 extern "C" HWND getWebViewWnd(int index);
+extern "C" void rho_webview_navigate(const char* url, int index);
 
 namespace rho 
 {
@@ -34,6 +35,14 @@ CRhoSignature::~CRhoSignature(void)
 {
 }
 
+static bool namecmp(const wchar_t* tc1, LPCTSTR tc2)
+{
+	if (!tc1 || !tc2)
+		return false;
+
+	return !_wcsicmp( (LPCTSTR)tc1, tc2);
+}
+
 /*static*/ void CRhoSignature::takeSignature(CParams* params)
 {
     CModalParams& oSigParams = *((CModalParams*)params);
@@ -160,62 +169,31 @@ void CRhoSignatureWindow::addNewPoint(int x, int y, bool bNewLine)
 
 void CRhoSignatureWindow::sendVectors()
 {
-	if ( !m_bDoVectors )
+	if ( !getParams().m_bSendVectors )
         return;
-#if 0
-	TCHAR		szTarget[MAXURL + 1];
-	LPTSTR		pIndex;
-	int			iTotalLen,iStrLen,iErr = 1;
-	CSignature	*pObj = (CSignature *)lParam;
-	P_COORDXY	pPoint = pObj->m_pCurrentVector;
-		
-	while(pPoint)	// we need at least 2 points for a line
-	{
-		wcscpy(szTarget,L"new Array(");
-		iTotalLen = 10;
-		pIndex = szTarget + 10;
-		//set our pointer past 'new Array('  
-		while(pPoint && iTotalLen < ((MAXLEN_VECTORARR / 2) - 13))
-		{
-			if(pPoint->bNewLine){
-				wcscpy(pIndex,L"0xFFFF,0xFFFF,");
-				iTotalLen	+= 14;
-				pIndex		+= 14;
 
-			}
-			
-			iStrLen		= wsprintf(pIndex,L"0x%X,0x%X,",pPoint->XPos,pPoint->YPos);
-			iTotalLen	+= iStrLen;
-			pIndex		+= iStrLen;
-			
-			pPoint = pPoint->pPoint;
-			
-		}
-		
-		
-		if(pPoint){				// if we haven't finished outputting this batch of points
-			--pIndex;			//get rid of the last seperator
-			*pIndex = L')';		//add the bracket
-			pIndex++;			
-			*pIndex = NULL;		//finally NULL terminate
-			
-		}
-		else{					
-			*pIndex = NULL;		//we have reached the end of a batch send
-			wcscat(szTarget,L"0xFFFF,0xFFFF)");//add the last point indicator
-		}
-		
-		//navigate
-		if(pObj && pObj->m_hParent && *pObj->m_tcVectorNavigateURI != NULL)
-		{
-            //RHO
-            //TODO: SendPBNavigate
-			//pObj->m_pModule->SendPBNavigate(tcVectorEventNames, pObj->m_iInstanceID, pObj->m_tcVectorNavigateURI, szTarget, NULL); 
-            //RHO
-			iErr = 0;
-		}
-	}
-#endif
+    if ( getParams().m_strSendVectorJS.length() == 0 )
+        return;
+
+    String	strTarget = m_vecPoints.size() > 1 ? "new Array(" : "" ;
+    char szPtBuf[100];
+    for( int i = 0; i < (int)m_vecPoints.size()-1; i++ )
+    {
+        if ( m_vecPoints[i+1].m_bNewLine )
+            strTarget += "0xFFFF,0xFFFF,";
+
+        sprintf( szPtBuf, "0x%X,0x%X,", m_vecPoints[i].m_xPos, m_vecPoints[i].m_yPos );
+
+        strTarget += szPtBuf;
+    }
+
+    strTarget += "0xFFFF,0xFFFF)";
+
+    //TODO: send vector
+    //m_strSendVectorJS + "(" + strTarget + ")"
+    //BUT : "VectorEvent:url('Javascript:onVectors(%s);')"
+    //rho_webview_navigate( );
+
 }
 
 LRESULT CRhoSignatureWindow::OnLButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
@@ -238,7 +216,7 @@ LRESULT CRhoSignatureWindow::OnLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam
     ReleaseCapture();
     m_bCapture = false;
     m_ptLast = CPoint(-1, -1);
-    //sendVectors();
+    sendVectors();
 
     return TRUE;
 }
@@ -600,144 +578,313 @@ static void readIntFromParam(rho_param* params, const char* szName, long& res)
         convertFromStringA( p->v.string, res );
 }
 
-CRect CRhoSignature::CParams::getWndRect()
+static int getColorFromString(const char* szColor)
 {
-    CRect rcDefault, rcWnd(-1,-1,-1,-1);
-    if (m_params)
-    {
-        readIntFromParam(m_params, "left", rcWnd.left);
-        readIntFromParam(m_params, "top", rcWnd.top);
-        readIntFromParam(m_params, "width", rcWnd.right);
-        rcWnd.right += rcWnd.left > 0 ? rcWnd.left : 0;
-        readIntFromParam(m_params, "height", rcWnd.bottom);
-        rcWnd.bottom += rcWnd.top > 0 ? rcWnd.top : 0;
-    }
+    if ( !szColor || !*szColor )
+        return RGB(0, 0, 0);
 
-    if ( m_eType == esModal )
-    {
-        ::GetWindowRect(getMainWnd(), rcDefault);
-    }else
-    {
-        rcDefault = CRect(30, 100, 30 + 200, 100 + 150);
-    }
+	int c = atoi(szColor);
 
-    if (rcWnd.left == -1)
-        rcWnd.left = rcDefault.left;
-    if (rcWnd.top == -1)
-        rcWnd.top = rcDefault.top;
-    if (rcWnd.right == -1)
-        rcWnd.right = rcDefault.right;
-    if (rcWnd.bottom == -1)
-        rcWnd.bottom = rcDefault.bottom;
+	int cR = (c & 0xFF0000) >> 16;
+	int cG = (c & 0xFF00) >> 8;
+	int cB = (c & 0xFF);
 
-    return rcWnd;
+    return RGB(cR, cG, cB);
 }
 
-const String& CRhoSignature::CParams::getFilePath()
+static BYTE CharHexToByte(TCHAR chHex)
 {
-    if ( m_strFilePath.length() > 0 )
-        return m_strFilePath;
-
-    if (m_params)
-    {
-        rho_param* pFP = rho_param_hash_get(m_params, "filePath");
-        if ( pFP )
-            m_strFilePath = pFP->v.string;
-    }
+	TCHAR ch =  chHex;
+	ch = towupper(chHex);
+	TCHAR conv[] = {L"0123456789ABCDEF"};
+	int byIndex;
+	for(byIndex = 0;ch != conv[byIndex];byIndex++);
+	return byIndex;
+	
+}
 
-    if ( m_strFilePath.length() > 0 )
-        return m_strFilePath;
+static COLORREF getColorFromMetaString(LPCTSTR lpSzColor)
+{
+	TCHAR	pStr[7];
+	int		iVal;
+	BYTE byCol[3];
+		
+	if(wcslen(lpSzColor)!= 7)
+		return FALSE;
 
-    m_strFilePath = RHODESAPPBASE().getBlobsDirPath() + "/Image_" + CLocalTime().toString(true,true) + "." + getFileFormat();
+	for(int loop = 0;loop < 3;loop++)
+	{
+		_tcscpy(pStr,lpSzColor +(loop * 2)+ 1);
+		pStr[2] = '\0';
+		
+		iVal = CharHexToByte(*pStr);
+		byCol[loop] = (iVal * 16) + CharHexToByte(*(pStr+1));
 
-    return m_strFilePath;
+	}
+	COLORREF nCrColor = 0;	//set the COLORREF to 0
+	nCrColor = (byCol[0] << 16)|(byCol[1] << 8)|(byCol[2]);
+	
+	return nCrColor;
 }
 
-const String& CRhoSignature::CParams::getFileFormat()
+void CRhoSignature::CParams::readParams(rho_param* params)
 {
-    if ( m_strFileFormat.length() > 0 )
-        return m_strFileFormat;
+    m_nLeft = m_nTop = m_nWidth = m_nHeight = -1;
+    if ( params )
+    {
+        readIntFromParam(params, "left", m_nLeft);
+        readIntFromParam(params, "top", m_nTop);
+        readIntFromParam(params, "width", m_nWidth);
+        readIntFromParam(params, "height", m_nHeight);
+    }
+
+    if (params)
+    {
+        rho_param* pFP = rho_param_hash_get(params, "filePath");
+        if ( pFP )
+           m_strFilePath = pFP->v.string;
+    }
+
+    if ( m_strFilePath.length() == 0 )
+        m_strFilePath = RHODESAPPBASE().getBlobsDirPath() + "/Image_" + CLocalTime().toString(true,true) + "." + getFileFormat();
 
-    if (m_params)
+    if (params)
     {
-        rho_param* pFF = rho_param_hash_get(m_params, "imageFormat");
+        rho_param* pFF = rho_param_hash_get(params, "imageFormat");
         if ( pFF )
             m_strFileFormat = pFF->v.string;
     }
 
-    if ( m_strFileFormat.length() > 0 )
-        return m_strFileFormat;
+    if ( m_strFileFormat.length() == 0 )
+        m_strFileFormat = "bmp";
 
-    m_strFileFormat = "bmp";
 
-    return m_strFileFormat;
-}
+    m_nPenColor = RGB(0,0,0);
 
-static int getColorFromString(const char* szColor)
-{
-    if ( !szColor || !*szColor )
-        return RGB(0, 0, 0);
+    if (params)
+    {
+        rho_param* p = rho_param_hash_get(params, "penColor");
+        if ( p )
+            m_nPenColor = getColorFromString(p->v.string);
+    }
 
-	int c = atoi(szColor);
+    m_nBgColor = RGB(255,255,255);
 
-	int cR = (c & 0xFF0000) >> 16;
-	int cG = (c & 0xFF00) >> 8;
-	int cB = (c & 0xFF);
+    if (params)
+    {
+        rho_param* p = rho_param_hash_get(params, "bgColor");
+        if ( p )
+            m_nBgColor = getColorFromString(p->v.string);
+    }
 
-    return RGB(cR, cG, cB);
-}
+    m_nPenWidth = 1;
 
-int CRhoSignature::CParams::getPenColor()
-{
-    COLORREF color = RGB(0,0,0);
+    if (params)
+        readIntFromParam(params, "penWidth", m_nPenWidth);
+
+    m_nBorder = 0;
 
-    if (m_params)
+    if (params)
     {
-        rho_param* p = rho_param_hash_get(m_params, "penColor");
-        if ( p )
-            color = getColorFromString(p->v.string);
+        rho_param* p = rho_param_hash_get(params, "border");
+        if ( p && (strcasecmp(p->v.string, "true") == 0 || strcasecmp(p->v.string, "1") == 0 ) )
+            m_nBorder = 1;
     }
 
-    return color;
+    m_bSendVectors = false;
+
 }
 
-int CRhoSignature::CParams::getBgColor()
+CRect CRhoSignature::CParams::getWndRect()
 {
-    COLORREF color = RGB(255,255,255);
+    CRect rcDefault, rcWnd(-1,-1,-1,-1);
+    
+    rcWnd.left = m_nLeft;
+    rcWnd.top = m_nTop;
+    rcWnd.right = m_nWidth;
+    rcWnd.right += rcWnd.left > 0 ? rcWnd.left : 0;
+    rcWnd.bottom = m_nHeight;
+    rcWnd.bottom += rcWnd.top > 0 ? rcWnd.top : 0;
 
-    if (m_params)
+    if ( m_eType == esModal )
     {
-        rho_param* p = rho_param_hash_get(m_params, "bgColor");
-        if ( p )
-            color = getColorFromString(p->v.string);
+        ::GetWindowRect(getMainWnd(), rcDefault);
+    }else
+    {
+        rcDefault = CRect(30, 100, 30 + 200, 100 + 150);
     }
 
-    return color;
+    if (rcWnd.left == -1)
+        rcWnd.left = rcDefault.left;
+    if (rcWnd.top == -1)
+        rcWnd.top = rcDefault.top;
+    if (rcWnd.right == -1)
+        rcWnd.right = rcDefault.right;
+    if (rcWnd.bottom == -1)
+        rcWnd.bottom = rcDefault.bottom;
+
+    return rcWnd;
 }
 
-int CRhoSignature::CParams::getPenWidth()
+
+//IRhoExtension
+void CRhoSignature::onSetProperty(const wchar_t* pName, const wchar_t* pValue, const CRhoExtData& oExtData)
 {
-    long nw = 1;
+    LOG(INFO) + "onSetProperty";
 
-    if (m_params)
-        readIntFromParam(m_params, "penWidth", nw);
+    if (!m_pSigWindow)
+        m_pSigWindow = new CRhoSignatureWindow(new CRhoSignature::CNonModalParams(false, 0));
 
-    return (int)nw;
-}
+    CParams& oParams = m_pSigWindow->getParams();
 
-boolean CRhoSignature::CParams::hasBorder()
-{
-    long nw = 0;
+    if( namecmp(pName, L"Visibility") )
+	{
+		if( namecmp(pValue, L"Visible") ) 
+		{
+            m_pSigWindow->Create(getWebViewWnd(0));
+            m_pSigWindow->ShowWindow(SW_SHOW);
+		}
+		else if( namecmp(pValue, L"Hidden")) 
+		{
+			hideSignature();
+		}
+	}
+	else if (namecmp(pName, L"Enabled"))
+	{
+		//  In order to maintain compatibility with PB2.x we also need to 
+		//  condider enabled / disabled as well as visibility.
+		m_pSigWindow->Create(getWebViewWnd(0));
+        m_pSigWindow->ShowWindow(SW_SHOW);
+	}
+	else if (namecmp(pName, L"Disabled"))
+	{
+		hideSignature();
+	}else if( namecmp(pName, L"Border") )
+	{
+		if( namecmp(pValue, L"Visible"))
+            oParams.m_nBorder = 1;
+		else if( namecmp(pValue, L"Hidden"))
+            oParams.m_nBorder = 0;
+	}
+	else if( namecmp(pName, L"Clear") ) 
+	{
+		m_pSigWindow->clearImage();
+	}
+	else if( namecmp(pName, L"Width")) 
+	{
+        convertFromStringW( (LPCTSTR)pValue, oParams.m_nWidth );
+	}
+	else if( namecmp(pName, L"Height")) 
+	{
+		convertFromStringW( (LPCTSTR)pValue, oParams.m_nHeight );
+	}
+	else if( namecmp(pName, L"Left")) 
+	{
+		convertFromStringW( (LPCTSTR)pValue, oParams.m_nLeft );
+	}
+	else if( namecmp(pName, L"Top")) 
+	{
+		convertFromStringW( (LPCTSTR)pValue, oParams.m_nTop );
+	}
+	else if( namecmp(pName, L"Penwidth")) 
+	{
+		convertFromStringW( (LPCTSTR)pValue, oParams.m_nPenWidth );
+	}
+	else if( namecmp(pName, L"Pencolor")) 
+	{
+        oParams.m_nPenColor = getColorFromMetaString( (LPCTSTR)pValue );
+	}
+	else if( namecmp( pName, L"BGColor")) 
+	{
+		oParams.m_nBgColor = getColorFromMetaString( (LPCTSTR)pValue );
+	}
+	/*else if(cmp(pbMetaStructure->lpParameter, L"Destination")) 
+	{
+		m_bDestinationSet = true;
+		if (pbMetaStructure->lpValue)
+			return SetIMOProperty(m_FileTransferIMO,L"Destination",pbMetaStructure->lpValue); 
+	}*/
+	else if( namecmp( pName, L"Name")) 
+	{
+        oParams.m_strFilePath = pValue ? convertToStringA((LPCTSTR)pValue) : "Signature";
+        oParams.m_strFilePath += ".bmp";
+	}
+	/*else if(cmp(pbMetaStructure->lpParameter, L"Username"))
+	{
+		if (pbMetaStructure->lpValue)
+			return SetIMOProperty(m_FileTransferIMO,L"UserName",pbMetaStructure->lpValue);
+	}
+	else if(cmp(pbMetaStructure->lpParameter, L"Password"))
+	{
+		if (pbMetaStructure->lpValue)
+			return SetIMOProperty(m_FileTransferIMO,L"Password",pbMetaStructure->lpValue);
+	}
+	else if(cmp(pbMetaStructure->lpParameter, L"Protocol"))
+	{
+		if (pbMetaStructure->lpValue)
+			return SetIMOProperty(m_FileTransferIMO,L"Protocol",pbMetaStructure->lpValue);
+	}
+	else if(cmp(pbMetaStructure->lpParameter, L"SignatureSaveEvent")) 
+	{
+		//set the nav string for the filetransfer module
+		if (pbMetaStructure->lpValue)
+			return SetIMOProperty(m_FileTransferIMO,L"TransferEvent",pbMetaStructure->lpValue);
+	}*/
+	else if( namecmp(pName, L"VectorEvent"))
+	{
+		//  Set the signature capture module to vector mode
+		if (pValue)
+		{
+            oParams.m_strSendVectorJS = convertToStringA((LPCTSTR)pValue);
+            oParams.m_bSendVectors = true;
+		}
+	}/*
+	else if( namecmp(pName, L"capture")) 
+	{
+		//  Capture will save the signature as a bitmap and transfer this 
+		//  to a remote destination if a destination parameter has been set.
+		//  Create a Bitmap based on the Captured Signature
+		if(pSig->CreateDIBitmap() == FALSE)
+		{
+			return FALSE;
+		}
 
-    if (m_params)
-    {
-        rho_param* p = rho_param_hash_get(m_params, "border");
-        if ( p && (strcasecmp(p->v.string, "true") == 0 || strcasecmp(p->v.string, "1") == 0 ) )
-            nw = 1;
-    }
+		//  Call FileTransfer Plug-in to transfer the captured bitmap to the 
+		//  specified destination.
+		if(m_FileTransferIMO && m_bDestinationSet)
+		{
+			TCHAR tcFormattedSource[MAXURL];
+			wsprintf(tcFormattedSource, L"file://\\%s", pSig->m_lpSzFilename);
+			if(SetIMOProperty(m_FileTransferIMO,L"Source", tcFormattedSource))
+			{
+				if(SetIMOProperty(m_FileTransferIMO,L"Overwrite",L"true"))
+				{
+					if (SetIMOProperty(m_FileTransferIMO, L"SetFileDestination", L"FALSE"))
+					{
+						return CallIMOMethod(m_FileTransferIMO,L"Transfer");
+					}
+				}
+			}
+		}
+		//  The transfer to FileTransfer has failed
+		return FALSE;
+	}*/
+	else
+	{
+		//  Unrecognized tag
+		//Log(PB_LOG_WARNING, L"Unrecognised Meta Tag Provided to Signature Capture Module", _T(__FUNCTION__), __LINE__);
+		
+	}
 
-    return nw != 0;
+    //TODO: process meta tags: save props to rho_param
+    // if action is coming like show/hide call correspondign methods
+}
+
+void CRhoSignature::onBeforeNavigate(const CRhoExtData& oExtData)
+{
+    hideSignature();
 }
+//IRhoExtension
 
 }
 
@@ -767,4 +914,13 @@ void rho_signature_clear()
     rho_callInUIThread(CRhoSignature::clearSignature, 0);
 }
 
+void Init_SignatureCapture(void);
+void init_rhoext_Signature()
+{
+    Init_SignatureCapture();
+
+    RHODESAPP().getExtManager().registerExtension( "signaturecapture", new CRhoSignature() );
+}
+
+
 }