rhodes 1.5.5 → 2.0.0.beta1

data/platform/wm/rhodes/MainWindow.h

@@ -7,24 +7,31 @@
 #include <exdisp.h>
 #endif
 #include "resource.h"
-#include "GetURLDialog.h"
 #include "logging/RhoLog.h"
 #include "common/RhoConf.h"
+#include "common/RhodesApp.h"
+
 #if defined(OS_WINDOWS)
 #include "menubar.h"
 #endif
 #include "LogView.h"
 
+#define ID_CUSTOM_MENU_ITEM_FIRST (WM_APP+3)
+#define ID_CUSTOM_MENU_ITEM_LAST  (ID_CUSTOM_MENU_ITEM_FIRST + (APP_MENU_ITEMS_MAX) - 1)
+
 static const UINT ID_BROWSER = 1;
 
 static UINT WM_TAKEPICTURE             = ::RegisterWindowMessage(L"RHODES_WM_TAKEPICTURE");
 static UINT WM_SELECTPICTURE           = ::RegisterWindowMessage(L"RHODES_WM_SELECTPICTURE");
 static UINT WM_CONNECTIONSNETWORKCOUNT = ::RegisterWindowMessage(L"RHODES_WM_CONNECTIONSNETWORKCOUNT");
 static UINT WM_ALERT_SHOWPOPUP         = ::RegisterWindowMessage(L"RHODES_WM_ALERT_SHOWPOPUP");
+static UINT WM_DATETIME_PICKER         = ::RegisterWindowMessage(L"RHODES_WM_DATETIME_PICKER");
+
 
 class CMainWindow :
 #if defined(_WIN32_WCE)
-    public CWindowImpl<CMainWindow, CWindow, CWinTraits<WS_CLIPCHILDREN | WS_CLIPSIBLINGS> >,
+	public CFrameWindowImpl<CMainWindow>, 
+	public CFullScreenFrame<CMainWindow>,
 #else
     public CWindowImpl<CMainWindow, CWindow, CWinTraits<WS_BORDER | WS_SYSMENU | WS_MINIMIZEBOX | WS_CLIPCHILDREN | WS_CLIPSIBLINGS> >,
 #endif
@@ -65,21 +72,14 @@ public:
         MESSAGE_HANDLER(WM_ACTIVATE, OnActivate)
         MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChange)
         MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
-		MESSAGE_HANDLER(WM_PAINT, OnPaint);
+		MESSAGE_HANDLER(WM_PAINT, OnPaint)
         COMMAND_ID_HANDLER(IDM_EXIT, OnExitCommand)
+        COMMAND_ID_HANDLER(IDM_NAVIGATE_BACK, OnNavigateBackCommand)
         COMMAND_ID_HANDLER(IDM_SK1_EXIT, OnBackCommand)
-        COMMAND_ID_HANDLER(IDM_BACK, OnBackCommand)
-        COMMAND_ID_HANDLER(IDM_FORWARD, OnForwardCommand)
-        COMMAND_ID_HANDLER(IDM_HOME, OnHomeCommand)
-        COMMAND_ID_HANDLER(IDM_OPENURL, OnOpenURLCommand)
-        COMMAND_ID_HANDLER(IDM_REFRESH, OnRefreshCommand)
 		COMMAND_ID_HANDLER(IDM_NAVIGATE, OnNavigateCommand)
-        COMMAND_ID_HANDLER(IDM_STOP, OnStopCommand)
-        COMMAND_ID_HANDLER(IDM_SYNC, OnSyncCommand)
-        COMMAND_ID_HANDLER(IDM_OPTIONS, OnOptionsCommand)
         COMMAND_ID_HANDLER(IDM_LOG,OnLogCommand)
-		COMMAND_ID_HANDLER(IDM_RELOADRHOBUNDLE, OnReloadRhobundleCommand)
-//		COMMAND_ID_HANDLER(IDM_START_PAGE, OnLoadStartPageCommand)
+		COMMAND_ID_HANDLER(ID_FULLSCREEN, OnFullscreenCommand)
+		COMMAND_RANGE_HANDLER(ID_CUSTOM_MENU_ITEM_FIRST, ID_CUSTOM_MENU_ITEM_LAST, OnCustomMenuItemCommand)
 #if defined(OS_WINDOWS)
 		COMMAND_ID_HANDLER(IDM_POPUP_MENU, OnPopupMenuCommand)
 		MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnPosChanged)
@@ -88,31 +88,26 @@ public:
 		MESSAGE_HANDLER(WM_SELECTPICTURE, OnSelectPicture)
 		MESSAGE_HANDLER(WM_CONNECTIONSNETWORKCOUNT, OnConnectionsNetworkCount)
         MESSAGE_HANDLER(WM_ALERT_SHOWPOPUP, OnAlertShowPopup);
+		MESSAGE_HANDLER(WM_DATETIME_PICKER, OnDateTimePicker);
     END_MSG_MAP()
-
+	
 private:
     // WM_xxx handlers
     LRESULT OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
-    LRESULT OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
     LRESULT OnActivate(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/);
     LRESULT OnSettingChange(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/);
     LRESULT OnDestroy(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled);
 	LRESULT OnPaint(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
+	LRESULT OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 
     // WM_COMMAND handlers
     LRESULT OnExitCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnBackCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
-    LRESULT OnForwardCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
-    LRESULT OnHomeCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
-    LRESULT OnOpenURLCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
-    LRESULT OnRefreshCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+    LRESULT OnNavigateBackCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnNavigateCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
-    LRESULT OnStopCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
-    LRESULT OnSyncCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
-	LRESULT OnOptionsCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 	LRESULT OnLogCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
-	LRESULT OnReloadRhobundleCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
-//	LRESULT OnLoadStartPageCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+	LRESULT OnFullscreenCommand (WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+	LRESULT OnCustomMenuItemCommand (WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 
 #if defined(OS_WINDOWS)
 	LRESULT OnPopupMenuCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
@@ -122,8 +117,8 @@ private:
 	LRESULT OnTakePicture(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
 	LRESULT OnSelectPicture(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
 	LRESULT OnConnectionsNetworkCount(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
-
     LRESULT OnAlertShowPopup (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
+	LRESULT OnDateTimePicker (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
 	
 public:
     BEGIN_SINK_MAP(CMainWindow)
@@ -146,10 +141,13 @@ private:
     void __stdcall OnCommandStateChange(long lCommand, BOOL bEnable);
 
     // utility functions
-    BOOL SetEnabledState(UINT uMenuItemID, BOOL bEnable);
+    BOOL SetMenuItemEnabled      (UINT uMenuItemID, BOOL bEnable);
+	BOOL SetToolbarButtonEnabled (UINT uTbbID, BOOL bEnable);
+	
 	void ShowLoadingPage(LPDISPATCH pDisp, VARIANT* URL);
 
     static rho::StringW getRhodesAppName();
+	void createCustomMenu(void);
 
 private:
     // Represents the PIEWebBrowser control contained in the main application.
@@ -176,23 +174,18 @@ private:
 #endif
 
 	bool m_bLoading;
-	bool m_bRhobundleReloadEnabled;
-	//char* m_current_url;
-    //char* m_szStartPage;
-
-	void SetRhobundleReloadMenu();
 
 #if !defined(_WIN32_WCE)
 private:
 	static int m_screenWidth;
 	static int m_screenHeight;
-
+	
 public:
 	static int getScreenWidth() {return m_screenWidth;}
 	static int getScreenHeight() {return m_screenHeight;}
 #endif
+private:
+	int m_pageCounter;
 
-//private:
-//	void SendCameraCallbackRequest(HRESULT status, LPTSTR image_name, char* callback_url);
+    rho::Vector<rho::common::CAppMenuItem> m_arAppMenuItems;
 };
-

data/platform/wm/rhodes/Rhodes.cpp

@@ -6,6 +6,12 @@
 #include "common/StringConverter.h"
 #include "common/rhoparams.h"
 #include "rho/rubyext/GeoLocationImpl.h"
+#include "ruby/ext/rho/rhoruby.h"
+
+using namespace rho;
+using namespace rho::common;
+using namespace std;
+using namespace stdext;
 
 #ifndef RUBY_RUBY_H
 typedef unsigned long VALUE;
@@ -110,6 +116,7 @@ public :
 		LOG(INFO) + "Rhodes started";
 
         ::SetThreadPriority(GetCurrentThread(),10);
+
         // Create the main application window
         m_appWindow.Create(NULL, CWindow::rcDefault, TEXT("Rhodes"), WS_VISIBLE);
         if (NULL == m_appWindow.m_hWnd)
@@ -139,30 +146,12 @@ public :
 			NULL, 
 			&g_hNotify);
 #else
-//        rho_clientregister_create("win32_client");
+		rho_clientregister_create("win32_client");
 #endif
-        return S_OK;
-    }
 
-	void DoViewRefresh() {
-		::PostMessage(m_appWindow.m_hWnd,WM_COMMAND,IDM_REFRESH,0);
-	}
-    
-	void DoViewNavigate(char* url) 
-    {
-        rho::String strUrl = RHODESAPP().canonicalizeRhoUrl(url);
-        ::PostMessage( m_appWindow.m_hWnd, WM_COMMAND, IDM_NAVIGATE, (LPARAM)wce_mbtowc(strUrl.c_str()) );
-    }
-
-    void DoShowLog()
-    {
-        ::PostMessage(m_appWindow.m_hWnd,WM_COMMAND,IDM_LOG,0);
+        return S_OK;
     }
 
-	//char* GetCurrentLocation() {
-	//	return m_appWindow.GetCurrentLocation();
-	//}
-
 	HWND GetManWindow() {
 		return m_appWindow.m_hWnd;
 	}
@@ -228,6 +217,13 @@ bool g_restartOnExit = false;
 extern "C" int WINAPI _tWinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/,
                                 LPTSTR /*lpCmdLine*/, int nShowCmd)
 {
+	INITCOMMONCONTROLSEX ctrl;
+	
+	//Required to use datetime picker controls.
+	ctrl.dwSize = sizeof(ctrl);
+	ctrl.dwICC = ICC_DATE_CLASSES;
+	InitCommonControlsEx(&ctrl);
+
 	return _AtlModule.WinMain(nShowCmd);
 }
 
@@ -242,55 +238,16 @@ extern "C" const char* rho_native_rhopath()
 
 extern "C" void rho_conf_show_log()
 {
-    _AtlModule.DoShowLog();
+    ::PostMessage(getMainWnd(),WM_COMMAND,IDM_LOG,0);
 }
 
 //Hook for ruby call to refresh web view
 
-extern "C" void webview_refresh(int index) {
-	_AtlModule.DoViewRefresh();
-}
-
-//Sync hook to refresh the web view
-extern "C" void perform_webview_refresh() {
-	webview_refresh(0);
-}
-
-extern "C" void webview_navigate(char* url, int index) {
-	_AtlModule.DoViewNavigate(url);
-}
-
-extern "C" char* webview_execute_js(char* js, int index) {
-//TODO: webview_execute_js
-    return "";
-}
-
-extern "C" void webview_set_menu_items(VALUE valMenu) 
-{
-    RHODESAPP().setViewMenu(valMenu);
-}
-
-extern "C" int webview_active_tab() {
-	return 0;
-}
-
-//extern "C" char* get_current_location() {
-//	return _AtlModule.GetCurrentLocation();
-//}
-
-extern "C" char* webview_current_location(int index) {
-    return const_cast<char*>(RHODESAPP().getCurrentUrl(index).c_str());
-}
-
 extern "C" void rho_net_impl_network_indicator(int active)
 {
     //TODO: rho_net_impl_network_indicator
 }
 
-extern "C" void choose_datetime(char* callback, char* title, long initial_time, int format, char* data) {
-	//TODO: Implement me!
-}
-
 extern "C" void create_nativebar(int bar_type, rho_param *p) {
 	//TODO: Implement me!
 }
@@ -327,6 +284,9 @@ extern "C" void Init_fcntl(void)
 {
 }
 
+extern "C" void Init_NavBar(void)
+{
+}
 /*BOOL EnumRhodesWindowsProc(HWND hwnd,LPARAM lParam)
 {
 	char buf[255] = {0};

data/platform/wm/rhodes/Rhodes.rc

@@ -74,15 +74,16 @@ IDR_MAIN_MENU MENU
 BEGIN
     POPUP ""
     BEGIN
-        MENUITEM "Forward",                     IDM_FORWARD
-        MENUITEM "Home",                        IDM_HOME
-        MENUITEM "Open URL...",                 IDM_OPENURL
+        //MENUITEM "Forward",                     IDM_FORWARD
+        //MENUITEM "Home",                        IDM_HOME
+        //MENUITEM "Open URL...",                 IDM_OPENURL
         MENUITEM "Refresh",                     IDM_REFRESH
-        MENUITEM "Stop",                        IDM_STOP
-        MENUITEM "Sync",                        IDM_SYNC
+        //MENUITEM "Stop",                        IDM_STOP
+        //MENUITEM "Sync",                        IDM_SYNC
         MENUITEM "Options",                     IDM_OPTIONS
         MENUITEM "Log...",                      IDM_LOG
-        MENUITEM "Reload RhoBundle",            IDM_RELOADRHOBUNDLE
+        //MENUITEM "Reload RhoBundle",            IDM_RELOADRHOBUNDLE
+        MENUITEM "Fullscreen",                  ID_FULLSCREEN
         MENUITEM "Exit",                        IDM_EXIT
     END
 END
@@ -150,7 +151,7 @@ CAPTION "Log"
 MENU IDR_LOGVIEW_MENU
 FONT 10, "Courier"
 BEGIN
-    CONTROL         "",IDC_LOGEDIT,"RichEdit20A",ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | ES_NOHIDESEL,3,4,137,110
+    CONTROL         "",IDC_LOGEDIT,"RichEdit20W",ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | ES_READONLY | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,3,4,137,110
 END
 
 IDD_LOGVIEW_WIDE DIALOG  0, 0, 210, 129
@@ -188,6 +189,24 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,97,87,50,14
 END
 
+IDD_DATETIME_PICKER DIALOG  0, 0, 172, 186
+STYLE DS_SETFONT | WS_POPUP | WS_SYSMENU
+FONT 8, "Microsoft Sans Serif"
+BEGIN
+    CONTROL         "",IDC_TIME_CTRL,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_TABSTOP | 0x8,7,36,143,15
+    CONTROL         "",IDC_DATE_CTRL,"SysDateTimePick32",DTS_RIGHTALIGN | WS_TABSTOP,7,11,143,15
+    LTEXT           "Time:",IDC_TIME_STATIC,7,26,25,10
+    LTEXT           "Date:",IDC_DATE_STATIC,7,3,27,8
+END
+
+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,11,143,15
+    LTEXT           "Time:",IDC_TIME_STATIC,7,3,27,8
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -233,6 +252,21 @@ BEGIN
     BEGIN
         BOTTOMMARGIN, 94
     END
+
+    IDD_DATETIME_PICKER, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 164
+        TOPMARGIN, 3
+        BOTTOMMARGIN, 179
+    END
+
+    IDD_TIME_PICKER, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 162
+        TOPMARGIN, 1
+    END
 END
 #endif    // APSTUDIO_INVOKED
 

data/platform/wm/rhodes/Utils.cpp

@@ -0,0 +1,65 @@
+#include "stdafx.h"
+
+void UnixTimeToFileTime (const time_t unixTime, LPFILETIME pFileTime)
+{
+	LONGLONG ll = 0;
+	ll = Int32x32To64 (unixTime, 10000000) + 116444736000000000;
+	pFileTime->dwLowDateTime  = (DWORD )(ll);
+	pFileTime->dwHighDateTime = (DWORD )(ll >> 32);
+} 
+
+
+time_t SystemTimeToUnixTime (const LPSYSTEMTIME sysTime)
+{
+	if (NULL == sysTime)
+		return -1;
+	
+	BOOL isValid = FALSE;
+
+	if ((sysTime->wYear >= 1900) && 
+		((sysTime->wMonth >= 1)  && (sysTime->wMonth <= 12))  && 
+		((sysTime->wDay >= 1)    && (sysTime->wDay <= 31))    &&
+		((sysTime->wHour >= 0)   && (sysTime->wHour <= 23))   && 
+		((sysTime->wMinute >= 0) && (sysTime->wMinute <= 59)) &&
+		((sysTime->wSecond >= 0) && (sysTime->wSecond <= 59))
+		)
+	{
+		isValid = TRUE;
+	} 
+	
+	if (isValid == FALSE)
+		return -1 ;
+	
+	struct tm atm;
+	atm.tm_sec = sysTime->wSecond;
+	atm.tm_min = sysTime->wMinute;
+	atm.tm_hour = sysTime->wHour;
+	atm.tm_mday = sysTime->wDay;
+	atm.tm_mon = sysTime->wMonth - 1;
+	atm.tm_year = sysTime->wYear - 1900;
+	atm.tm_isdst = -1; 
+	
+	time_t retVal = -1 ;
+	retVal = ::mktime (&atm);
+
+	return retVal;
+}
+
+
+BOOL UnixTimeToSystemTime (const time_t unixTime, LPSYSTEMTIME pSysTime)
+{
+	ZeroMemory (pSysTime, sizeof(SYSTEMTIME)); 
+	
+	FILETIME fileTime = {0};
+	UnixTimeToFileTime (unixTime, &fileTime);
+
+	BOOL retVal  = FALSE; 
+	
+	FILETIME localFileTime = {0};
+	retVal = FileTimeToLocalFileTime (&fileTime, &localFileTime); 
+
+	if (retVal)
+		retVal = FileTimeToSystemTime (&localFileTime, pSysTime);
+
+	return retVal;
+} 

data/platform/wm/rhodes/Utils.h

@@ -0,0 +1,9 @@
+#ifndef __UTILS_H__
+#define __UTILS_H__
+
+void   UnixTimeToFileTime (const time_t unixTime, LPFILETIME pFileTime);
+
+time_t SystemTimeToUnixTime (const LPSYSTEMTIME sysTime);
+BOOL   UnixTimeToSystemTime (const time_t unixTime, LPSYSTEMTIME pSysTime);
+
+#endif

data/platform/wm/rhodes/camera/Camera.cpp

@@ -130,8 +130,8 @@ bool copy_file(LPTSTR from, LPTSTR to) {
 	RHO_ASSERT(to);
 
 	SHFILEOPSTRUCT SHFileOp;
-	CString source(from);
-	CString destination(to);
+	ATL::CString source(from);
+	ATL::CString destination(to);
 
 	// add required string terminators
 	source+=_T("\0\0");