rhodes 3.3.2 → 3.3.3.beta.1

data/platform/shared/common/RhodesApp.cpp

@@ -348,6 +348,7 @@ void CRhodesApp::run()
 
     LOG(INFO) + "RhodesApp thread shutdown";
 
+    getExtManager().close();
     rubyext::CGeoLocation::Destroy();
     sync::CSyncThread::Destroy();
 
@@ -855,7 +856,7 @@ int CRhodesApp::determineFreeListeningPort()
         serv_addr.sin_len = sizeof(serv_addr);
 #endif
         serv_addr.sin_family = AF_INET;
-        serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+        serv_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
         serv_addr.sin_port = htons((short)listenPort);
         
         LOG(INFO) + "Trying to bind of " + listenPort + " port...";
@@ -869,7 +870,7 @@ int CRhodesApp::determineFreeListeningPort()
                 serv_addr.sin_len = sizeof(serv_addr);
 #endif
                 serv_addr.sin_family = AF_INET;
-                serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+                serv_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
                 serv_addr.sin_port = htons(0);
 
                 LOG(INFO) + "Trying to bind on dynamic port...";

data/platform/shared/common/RhodesApp.h

@@ -37,6 +37,7 @@
 #include "net/HttpServer.h"
 #include "SplashScreen.h"
 #include "AppMenu.h"
+#include "ExtManager.h"
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "RhodesApp"
@@ -60,6 +61,7 @@ private:
     CSplashScreen m_oSplashScreen;
     CAppMenu m_oAppMenu;
     CRhoTimer m_oTimer;
+    CExtManager m_oExtManager;
 
     String m_strLoadingPagePath, m_strLoadingPngPath;
     String m_strStartUrl, m_strOptionsUrl, m_strRhobundleReloadUrl;//, m_strFirstStartUrl;
@@ -136,6 +138,7 @@ public:
     CAppMenu& getAppMenu (void) { return m_oAppMenu; }
     CSplashScreen& getSplashScreen(){return m_oSplashScreen;}
     CRhoTimer&     getTimer(){ return m_oTimer; }
+    CExtManager&   getExtManager(){ return m_oExtManager; }
 
     boolean sendLog(const String& strCallbackUrl);
 

data/platform/shared/common/map/GeocodingMapEngine.cpp

@@ -388,4 +388,27 @@ void rho_geoimpl_do_geocoding(rho_param* p, const char* callback, int callback_t
     }
 }
 
-
+void rho_geocoding_parse_json_responce(const char* data, char* adress_buf, int max_adress_length, double* latitude, double* longitude, int* is_adress_ok, int* is_coords_ok) {
+    
+    rho::String adress;
+    bool coord_ok = false;
+    bool adress_ok = false;
+    bool is_result = rho::common::map::parse_json(data, latitude, longitude, &adress, &coord_ok, &adress_ok);
+    
+    *is_adress_ok = 0;
+    *is_coords_ok = 0;
+    
+    if (is_result) {
+        if (adress_ok) {
+            if (adress.length() > (max_adress_length-1)) {
+                adress = adress.substr(0, max_adress_length-1); 
+            }
+            strcpy(adress_buf, adress.c_str());
+            *is_adress_ok = 1;
+        }
+        if (coord_ok) {
+            *is_coords_ok = 1;
+        }
+    }
+    
+}

data/platform/shared/common/map/GeocodingMapEngine.h

@@ -101,6 +101,9 @@ extern "C" {
     
     
 void rho_geoimpl_do_geocoding(rho_param* p, const char* callback, int callback_tag);    
+    
+    void rho_geocoding_parse_json_responce(const char* data, char* adress_buf, int max_adress_length, double* latitude, double* longitude, int* is_adress_ok, int* is_coords_ok);    
+    
 #ifdef __cplusplus
 }
 #endif

data/platform/shared/logging/RhoLogConf.cpp

@@ -78,7 +78,8 @@ void LogSettings::closeRemoteLog()
 
 void LogSettings::initRemoteLog()
 {
-#if defined( OS_PLATFORM_MOTCE ) && !defined (APP_BUILD_CAPABILITY_BARCODE)
+
+#if defined( OS_PLATFORM_MOTCE )// && !defined (APP_BUILD_CAPABILITY_BARCODE)
     //TODO: remote log prevent loading app - stuck on loading.png when no barcode. very strange!
     OSVERSIONINFO osv = {0};
 	osv.dwOSVersionInfoSize = sizeof(osv);

data/platform/shared/net/HttpServer.cpp

@@ -381,7 +381,7 @@ bool CHttpServer::init()
     memset(&sa, 0, sizeof(sa));
     sa.sin_family = AF_INET;
     sa.sin_port = htons((uint16_t)m_port);
-    sa.sin_addr.s_addr = INADDR_ANY;
+    sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
     if (bind(m_listener, (const sockaddr *)&sa, sizeof(sa)) == SOCKET_ERROR) {
         RAWLOG_ERROR2("Can not bind to port %d: %d", m_port, RHO_NET_ERROR_CODE);
         close_listener();

data/platform/shared/ruby/ext/rho/rhoruby.c

@@ -70,6 +70,7 @@ extern void Init_NavBar(void);
 extern void Init_RhoEvent(void);
 extern void Init_Calendar(void);
 extern void Init_Extensions(void);
+extern void init_rhoext_Signature();
 
 //RhoSupport extension
 extern void Init_RhoSupport(void);
@@ -220,7 +221,12 @@ void RhoRubyStart()
     Init_WebView();
     Init_RhoConf();
     Init_Alert();
+#if defined(WINDOWS_PLATFORM)
+    init_rhoext_Signature();
+#else
     Init_SignatureCapture();
+#endif
+    
     Init_RhoBluetooth();	
 	Init_RhodesNativeViewManager();	
     Init_Camera();

data/platform/wm/RhoLib/RhoLib.vcproj

@@ -2319,6 +2319,14 @@
 				RelativePath="..\..\shared\common\BundleManager.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\shared\common\ExtManager.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\shared\common\ExtManager.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\shared\common\InputStream.h"
 				>

data/platform/wm/rhodes/DateTimePicker.cpp

@@ -51,7 +51,7 @@ extern "C" int rho_sys_get_screen_width();
 
 extern "C" HWND getMainWnd();
 
-CDateTimePickerDialog::CDateTimePickerDialog (const CDateTimeMessage *msg)
+CDateTimePickerDialog::CDateTimePickerDialog (const CDateTimeMessage *msg) : m_hWndCommandBar(0)
 {
 	m_returnTime  = 0;
 	m_format       = msg->m_format;
@@ -65,6 +65,16 @@ CDateTimePickerDialog::~CDateTimePickerDialog ()
 {
 }
 
+LRESULT CDateTimePickerDialog::OnDestroyDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled)
+{
+    if ( m_hWndCommandBar )
+        ::DestroyWindow(m_hWndCommandBar);
+
+    m_hWndCommandBar = 0;
+
+	return FALSE;
+}
+
 LRESULT CDateTimePickerDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
 {
 	if ((m_title != NULL) && (strlen(m_title) > 0)) {
@@ -112,10 +122,15 @@ LRESULT CDateTimePickerDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LP
 
 	GotoDlgCtrl(GetDlgItem(IDC_DATE_CTRL));
 
-#else 
+#elif defined( OS_PLATFORM_MOTCE )
+
+	//CreateButtons();
+	//GotoDlgCtrl(m_btnOk);
+	SetWindowLong(GWL_STYLE,(long)WS_BORDER);
+	m_hWndCommandBar = CommandBar_Create(_AtlBaseModule.GetResourceInstance(), m_hWnd, 1);
+    CommandBar_AddAdornments(m_hWndCommandBar, CMDBAR_OK, 0 );
 
-	CreateButtons();
-	GotoDlgCtrl(m_btnOk);
+    CommandBar_Show(m_hWndCommandBar, TRUE);
 
 #endif
 
@@ -183,7 +198,7 @@ LRESULT CDateTimePickerDialog::OnCancel(WORD /*wNotifyCode*/, WORD wID, HWND /*h
 }
 
 
-CTimePickerDialog::CTimePickerDialog (const CDateTimeMessage *msg)
+CTimePickerDialog::CTimePickerDialog (const CDateTimeMessage *msg) : m_hWndCommandBar(0)
 {
 	m_returnTime  = 0;
 	m_format       = msg->m_format;
@@ -195,6 +210,16 @@ CTimePickerDialog::~CTimePickerDialog ()
 {
 }
 
+LRESULT CTimePickerDialog::OnDestroyDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled)
+{
+    if ( m_hWndCommandBar )
+        ::DestroyWindow(m_hWndCommandBar);
+
+    m_hWndCommandBar = 0;
+
+	return FALSE;
+}
+
 LRESULT CTimePickerDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
 {
 	if ((m_title != NULL) && (strlen(m_title) > 0)) {
@@ -226,10 +251,15 @@ LRESULT CTimePickerDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM
 		DateTime_SetSystemtime( GetDlgItem(IDC_TIME_CTRL), GDT_VALID, &start_time);
 	}
 
-#else
+#elif defined( OS_PLATFORM_MOTCE )
+
+	//CreateButtons();
+	//GotoDlgCtrl(m_btnOk);
+	SetWindowLong(GWL_STYLE,(long)WS_BORDER);
+	m_hWndCommandBar = CommandBar_Create(_AtlBaseModule.GetResourceInstance(), m_hWnd, 1);
+    CommandBar_AddAdornments(m_hWndCommandBar, CMDBAR_OK, 0 );
 
-	CreateButtons();
-	GotoDlgCtrl(m_btnOk);
+    CommandBar_Show(m_hWndCommandBar, TRUE);
 
 #endif
 

data/platform/wm/rhodes/DateTimePicker.h

@@ -97,6 +97,7 @@ public:
 	LRESULT OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 	LRESULT OnOK(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 	LRESULT OnCancel(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+	LRESULT OnDestroyDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 private:
 	int         m_format;
 	time_t      m_returnTime;
@@ -104,6 +105,7 @@ private:
 	const char *m_title;
 	time_t      m_min_time;
 	time_t      m_max_time;
+	HWND m_hWndCommandBar;
 };
 
 
@@ -132,12 +134,14 @@ private:
 	LRESULT OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 	LRESULT OnOK(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 	LRESULT OnCancel(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+	LRESULT OnDestroyDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 
 private:
 	int         m_format;
 	time_t      m_returnTime;
 	time_t		m_initialTime;
 	const char *m_title;
+	HWND m_hWndCommandBar;
 };
 
 

data/platform/wm/rhodes/LogOptionsDlg.cpp

@@ -29,6 +29,16 @@
 
 #include "logging/RhoLog.h"
 
+LRESULT CLogOptionsDlg::OnDestroyDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled)
+{
+    if ( m_hWndCommandBar )
+        ::DestroyWindow(m_hWndCommandBar);
+
+    m_hWndCommandBar = 0;
+
+	return FALSE;
+}
+
 LRESULT CLogOptionsDlg::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
 #if defined( OS_WINCE ) && !defined (OS_PLATFORM_MOTCE)
@@ -44,6 +54,12 @@ LRESULT CLogOptionsDlg::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BO
     mbi.hInstRes = _AtlBaseModule.GetResourceInstance();
     mbi.dwFlags    = SHCMBF_HMENU;
     SHCreateMenuBar(&mbi);
+#else
+	SetWindowLong(GWL_STYLE,(long)WS_BORDER);
+
+	m_hWndCommandBar = CommandBar_Create(_AtlBaseModule.GetResourceInstance(), m_hWnd, 1);
+	CommandBar_AddAdornments(m_hWndCommandBar, CMDBAR_OK, 0 );
+    CommandBar_Show(m_hWndCommandBar, TRUE);
 #endif //OS_WINCE
 
     SendDlgItemMessage(IDC_CBXLEVELS,CB_ADDSTRING,0,  (LPARAM)_T("Trace"));

data/platform/wm/rhodes/LogOptionsDlg.h

@@ -33,7 +33,7 @@ class CLogOptionsDlg :
 	public CDialogImpl<CLogOptionsDlg>
 {
 public:
-    CLogOptionsDlg(){}
+	CLogOptionsDlg() : m_hWndCommandBar(0) {}
 	~CLogOptionsDlg(){}
 
 #if defined(OS_WINDOWS)
@@ -49,12 +49,13 @@ BEGIN_MSG_MAP(CLogOptionsDlg)
 END_MSG_MAP()
 
 	LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
-
+	LRESULT OnDestroyDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled);
 	LRESULT OnOK(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
 	LRESULT OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
 
 private:
     void saveOptions();
+	HWND m_hWndCommandBar;
 };
 
 

data/platform/wm/rhodes/LogView.cpp

@@ -39,6 +39,16 @@
 rho::common::CMutex CLogView::m_ViewFlushLock;
 #endif
 
+LRESULT CLogView::OnDestroyDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled)
+{
+    if ( m_hWndCommandBar )
+        ::DestroyWindow(m_hWndCommandBar);
+
+    m_hWndCommandBar = 0;
+
+	return FALSE;
+}
+
 LRESULT CLogView::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
 #if defined( OS_WINCE )
@@ -58,6 +68,16 @@ LRESULT CLogView::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bH
     SHCreateMenuBar(&mbi);
 
 //    SendDlgItemMessage(IDC_LOGEDIT,WM_SETFONT, (WPARAM)GetStockObject(SYSTEM_FONT),0);
+#else
+	SetWindowLong(GWL_STYLE,(long)WS_BORDER);
+	ShowWindow(SW_MAXIMIZE);
+
+	m_hWndCommandBar = CommandBar_Create(_AtlBaseModule.GetResourceInstance(), m_hWnd, 1);
+	CommandBar_AddAdornments(m_hWndCommandBar, 0, 0 );
+	HMENU menu = LoadMenu(0, MAKEINTRESOURCE(IDR_LOGMENUBAR));
+	CommandBar_InsertMenubarEx(m_hWndCommandBar, 0, (LPTSTR)menu, 0);
+	CommandBar_DrawMenuBar(m_hWndCommandBar, 0);
+    CommandBar_Show(m_hWndCommandBar, TRUE);
 #endif
 
     loadLogText();
@@ -156,7 +176,7 @@ LRESULT CLogView::OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL&
 	}
     ::MoveWindow( GetDlgItem(IDC_LOGEDIT), 0,0, LOWORD(lParam), HIWORD(lParam), TRUE );
 #else
-    ::MoveWindow( GetDlgItem(IDC_LOGEDIT), 0,0, LOWORD(lParam), HIWORD(lParam), TRUE );
+    ::MoveWindow( GetDlgItem(IDC_LOGEDIT), 0,CommandBar_Height( m_hWndCommandBar ), LOWORD(lParam), HIWORD(lParam), TRUE );
 #endif
     return 0;
 }

data/platform/wm/rhodes/LogView.h

@@ -89,11 +89,12 @@ class CLogView :
 #endif
 {
     HBRUSH m_hBrush;
+	HWND m_hWndCommandBar;
 
     void loadLogText();
 public:
     CLogView() : 
-	  m_hBrush ( NULL )
+	  m_hBrush ( NULL ), m_hWndCommandBar(0)
 #if defined(OS_WINDOWS)
 	, m_pFindDialog(NULL), m_findText(L""), m_findParams(FR_DOWN)
 #endif
@@ -155,6 +156,7 @@ END_MSG_MAP()
 //  LRESULT NotifyHandler(int idCtrl, LPNMHDR pnmh, BOOL& bHandled);
 
 	LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+	LRESULT OnDestroyDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 
 	LRESULT OnBack(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
 	LRESULT OnOptions(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);

data/platform/wm/rhodes/MainWindow.cpp

@@ -47,7 +47,6 @@
 #include "ext/rho/rhoruby.h"
 #include "rubyext/WebView.h"
 #include "camera/Camera.h"
-#include "rubyext/RhoSignature.h"
 #include "sync/SyncThread.h"
 #include "common/RhoFilePath.h"
 #include "common/RhoFile.h"
@@ -927,7 +926,7 @@ bool Rhodes_WM_ProcessBeforeNavigate(LPCTSTR url)
 {
     LOG(TRACE) + "OnBeforeNavigate2: " + url;
 
-    rho::CRhoSignature::hideSignature();
+    RHODESAPP().getExtManager().onBeforeNavigate();
 
     const wchar_t *to_remove;
     if ( (to_remove = wcsstr(url, L"rho_open_target=_blank")) != 0)

data/platform/wm/rhodes/MapView/MapViewManager.cpp

@@ -78,7 +78,7 @@ class DrawingDeviceMapViewImpl : public WmDrawingDeviceImpl {
 static DrawingDeviceMapViewImpl ourDrawingDevice;
 
 
-CRhoMapViewDlg::CRhoMapViewDlg () : m_hBrush(0), m_hMemBitmap(0)
+CRhoMapViewDlg::CRhoMapViewDlg () : m_hBrush(0), m_hMemBitmap(0), m_hWndCommandBar(0)
 {
 }
 
@@ -86,6 +86,16 @@ CRhoMapViewDlg::~CRhoMapViewDlg ()
 {
 }
 
+LRESULT CRhoMapViewDlg::OnDestroyDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled)
+{
+    if ( m_hWndCommandBar )
+        ::DestroyWindow(m_hWndCommandBar);
+
+    m_hWndCommandBar = 0;
+
+	return FALSE;
+}
+
 LRESULT CRhoMapViewDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
 {
 	SetWindowText(_T("MapView"));
@@ -103,7 +113,11 @@ LRESULT CRhoMapViewDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*
 	mbi.hInstRes = _AtlBaseModule.GetResourceInstance();
 	
 	SHCreateMenuBar(&mbi);
-#endif
+#else
+	m_hWndCommandBar = CommandBar_Create(_AtlBaseModule.GetResourceInstance(), m_hWnd, 1);
+	CommandBar_AddAdornments(m_hWndCommandBar, 0, 0 );
+    CommandBar_Show(m_hWndCommandBar, TRUE);
+#endif //OS_WINCE
 
 	//::SetWindowLong(GetDlgItem(IDC_SLIDER_ZOOM).m_hWnd, 
 	//	GWL_EXSTYLE,

data/platform/wm/rhodes/MapView/MapViewManager.h

@@ -132,6 +132,7 @@ class CRhoMapViewDlg : public //CDialog
 {
     HBRUSH m_hBrush;
     HBITMAP m_hMemBitmap;
+	HWND m_hWndCommandBar;
 public:
 	CRhoMapViewDlg  ();
 	~CRhoMapViewDlg ();
@@ -155,6 +156,7 @@ public:
 
 public:
 	LRESULT OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
+	LRESULT OnDestroyDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled);
 	LRESULT OnDraw(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 	LRESULT OnSliderScroll(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 	LRESULT OnDestroy(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);