rhodes 1.5.5 → 2.0.0.beta1

data/platform/wm/rhodes/Alert.cpp

@@ -70,3 +70,7 @@ extern "C" void alert_play_file(char* file_name, ...) {
     CAlert::playFile(file_name);
 #endif
 }
+
+extern "C" void alert_hide_popup()
+{
+}

data/platform/wm/rhodes/DateTimePicker.cpp

@@ -0,0 +1,183 @@
+#include "stdafx.h"
+#include "logging/RhoLog.h"
+
+#include "MainWindow.h"
+#include "Utils.h"
+#include "DateTimePicker.h"
+
+#define DLG_ITEM_SET_FONT_BOLD(ITEM_ID)							\
+{																\
+	HFONT hFont = GetDlgItem((ITEM_ID)).GetFont();				\
+	LOGFONT fontAttributes = { 0 };								\
+    ::GetObject(hFont, sizeof(fontAttributes), &fontAttributes);\
+    fontAttributes.lfWeight = FW_BOLD;							\
+	hFont = CreateFontIndirect(&fontAttributes);				\
+	GetDlgItem((ITEM_ID)).SetFont(hFont);						\
+}
+
+
+/*
+ * TODO: title and initial time, flexible behavour 
+ */
+
+extern "C" HWND getMainWnd();
+
+CDateTimePickerDialog::CDateTimePickerDialog (const CDateTimeMessage *msg)
+{
+	m_returnTime  = 0;
+	m_format       = msg->m_format;
+	m_title        = msg->m_title;
+	m_initialTime  = msg->m_initialTime;
+}
+
+CDateTimePickerDialog::~CDateTimePickerDialog ()
+{
+}
+
+LRESULT CDateTimePickerDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
+{
+#if defined(_WIN32_WCE)
+	//USES_CONVERSION;
+	SetWindowText(_T("Date"));
+
+    SHINITDLGINFO shidi = { SHIDIM_FLAGS, m_hWnd, SHIDIF_SIZEDLGFULLSCREEN };
+    RHO_ASSERT(SHInitDialog(&shidi));
+
+
+    SHMENUBARINFO mbi = { sizeof(mbi), 0 };
+    mbi.hwndParent = m_hWnd;
+    mbi.nToolBarId = IDR_GETURL_MENUBAR;
+    mbi.hInstRes = _AtlBaseModule.GetResourceInstance();
+    RHO_ASSERT(SHCreateMenuBar(&mbi));
+
+	DLG_ITEM_SET_FONT_BOLD (IDC_DATE_STATIC);
+	DLG_ITEM_SET_FONT_BOLD (IDC_TIME_STATIC);
+
+	if (m_format == CDateTimeMessage::FORMAT_DATE) {
+		GetDlgItem(IDC_TIME_CTRL).ShowWindow(SW_HIDE);
+		GetDlgItem(IDC_TIME_STATIC).ShowWindow(SW_HIDE);
+	}
+	
+	GotoDlgCtrl(GetDlgItem(IDC_DATE_CTRL));
+#endif
+
+    return FALSE;
+}
+
+LRESULT CDateTimePickerDialog::OnOK(WORD /*wNotifyCode*/, WORD wID, HWND hwnd, BOOL& /*bHandled*/)
+{
+	SYSTEMTIME sysTime;
+
+	if (m_format == CDateTimeMessage::FORMAT_TIME)
+	{
+		DateTime_GetSystemtime (GetDlgItem(IDC_TIME_CTRL), &sysTime);
+	} 
+	else if (m_format == CDateTimeMessage::FORMAT_DATE)
+	{
+		DateTime_GetSystemtime (GetDlgItem(IDC_DATE_CTRL), &sysTime);
+	} 
+	else if (m_format == CDateTimeMessage::FORMAT_DATE_TIME)
+	{
+		SYSTEMTIME time, date;
+
+		DateTime_GetSystemtime (GetDlgItem(IDC_TIME_CTRL), &time);
+		DateTime_GetSystemtime (GetDlgItem(IDC_DATE_CTRL), &date);
+
+		sysTime.wYear		= date.wYear; 
+		sysTime.wMonth		= date.wMonth; 
+		sysTime.wDayOfWeek	= date.wDayOfWeek; 
+		sysTime.wDay		= date.wDay; 
+		sysTime.wHour		= time.wHour; 
+		sysTime.wMinute		= time.wMinute;
+		sysTime.wSecond		= time.wSecond; 
+	} 
+	else
+	{
+		LOG(ERROR) + "invalid format";
+		m_returnTime = 0;
+	}
+
+	m_returnTime = SystemTimeToUnixTime (&sysTime);
+
+    EndDialog(wID);
+    return 0;
+}
+
+time_t CDateTimePickerDialog::GetTime()
+{
+	return m_returnTime;
+}
+
+LRESULT CDateTimePickerDialog::OnCancel(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
+{
+    EndDialog(wID);
+    return 0;
+}
+
+
+CTimePickerDialog::CTimePickerDialog (const CDateTimeMessage *msg)
+{
+	m_returnTime  = 0;
+	m_format       = msg->m_format;
+	m_title        = msg->m_title;
+	m_initialTime  = msg->m_initialTime;
+}
+
+CTimePickerDialog::~CTimePickerDialog ()
+{
+}
+
+LRESULT CTimePickerDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
+{
+#if defined(_WIN32_WCE)
+	//USES_CONVERSION;
+	SetWindowText(_T("Date"));
+
+    SHINITDLGINFO shidi = { SHIDIM_FLAGS, m_hWnd, SHIDIF_SIZEDLGFULLSCREEN };
+    RHO_ASSERT(SHInitDialog(&shidi));
+
+
+    SHMENUBARINFO mbi = { sizeof(mbi), 0 };
+    mbi.hwndParent = m_hWnd;
+    mbi.nToolBarId = IDR_GETURL_MENUBAR;
+    mbi.hInstRes = _AtlBaseModule.GetResourceInstance();
+    RHO_ASSERT(SHCreateMenuBar(&mbi));
+
+	DLG_ITEM_SET_FONT_BOLD (IDC_TIME_STATIC);
+
+	GotoDlgCtrl(GetDlgItem(IDC_TIME_CTRL));
+#endif
+
+    return FALSE;
+}
+
+LRESULT CTimePickerDialog::OnOK(WORD /*wNotifyCode*/, WORD wID, HWND hwnd, BOOL& /*bHandled*/)
+{
+	SYSTEMTIME sysTime;
+	DateTime_GetSystemtime (GetDlgItem(IDC_TIME_CTRL), &sysTime);
+	m_returnTime = SystemTimeToUnixTime (&sysTime);
+
+    EndDialog(wID);
+    return 0;
+}
+
+time_t CTimePickerDialog::GetTime()
+{
+	return m_returnTime;
+}
+
+LRESULT CTimePickerDialog::OnCancel(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
+{
+    EndDialog(wID);
+    return 0;
+}
+
+void  choose_datetime(char* callback, char* title, 
+					  long initial_time, int format, char* data)
+{
+	LOG(INFO) + __FUNCTION__ + "callback = " + callback + " title = " + title;
+
+	HWND main_wnd = getMainWnd();
+	::PostMessage(main_wnd, WM_DATETIME_PICKER, 0, 
+					(LPARAM)new CDateTimeMessage(callback, title, initial_time, format, data));
+}

data/platform/wm/rhodes/DateTimePicker.h

@@ -0,0 +1,100 @@
+#ifndef __DATETIMEPICKER_H__
+#define __DATETIMEPICKER_H__
+
+#include "resource.h"
+
+//TODO: delegates
+class CDateTimeMessage 
+{
+public:
+	static enum 
+	{
+		FORMAT_DATE_TIME,
+		FORMAT_DATE,
+		FORMAT_TIME
+	};
+
+	CDateTimeMessage (const char* callback, const char* title, long initial_time, int format, const char* data)
+	{
+		m_callback    = strdup (callback);
+		m_title       = strdup (title);
+		m_initialTime = initial_time;
+		m_format      = format;
+		m_data        = strdup (data);
+	}
+
+	~CDateTimeMessage ()
+	{
+		free (m_callback);
+		free (m_title);
+		free (m_data);
+	}
+
+	char *m_callback;
+	char *m_title;
+	char *m_data;
+	long  m_initialTime;
+	int   m_format;
+};
+
+class CDateTimePickerDialog : public CDialogImpl<CDateTimePickerDialog>
+{
+public:
+	CDateTimePickerDialog  (const CDateTimeMessage *msg);
+	~CDateTimePickerDialog ();
+
+	time_t GetTime();
+
+	enum { IDD = IDD_DATETIME_PICKER };
+	
+	BEGIN_MSG_MAP(CDateTimePickerDialog)
+		MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
+		COMMAND_ID_HANDLER(IDOK, OnOK)
+		COMMAND_ID_HANDLER(IDCANCEL, OnCancel)
+	END_MSG_MAP()
+
+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*/);
+
+private:
+	int         m_format;
+	time_t      m_returnTime;
+	time_t		m_initialTime;
+	const char *m_title;
+};
+
+class CTimePickerDialog : public CDialogImpl<CTimePickerDialog>
+{
+public:
+	CTimePickerDialog  (const CDateTimeMessage *msg);
+	~CTimePickerDialog ();
+
+	time_t GetTime();
+
+	enum { IDD = IDD_TIME_PICKER };
+	
+	BEGIN_MSG_MAP(CTimePickerDialog)
+		MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
+		COMMAND_ID_HANDLER(IDOK, OnOK)
+		COMMAND_ID_HANDLER(IDCANCEL, OnCancel)
+	END_MSG_MAP()
+
+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*/);
+
+private:
+	int         m_format;
+	time_t      m_returnTime;
+	time_t		m_initialTime;
+	const char *m_title;
+};
+
+
+extern "C" void  choose_datetime(char* callback, char* title, 
+								 long initial_time, int format, char* data);
+
+#endif //__DATETIMEPICKER_H__

data/platform/wm/rhodes/MainWindow.cpp

@@ -14,24 +14,20 @@
 #endif
 #include "resource.h"
 #include "MainWindow.h"
-#include "common/RhodesApp.h"
 #include "common/StringConverter.h"
 #include "AppManager.h"
 #include "ext/rho/rhoruby.h"
+#include "rubyext/WebView.h"
 #if defined(_WIN32_WCE)
 #include "camera/Camera.h"
 #endif
 #include "rho/net/NetRequest.h"
 #include "sync/SyncThread.h"
+#include "common/RhoFilePath.h"
 
-IMPLEMENT_LOGCLASS(CMainWindow,"MainWindow");
-//char* canonicalizeURL(const char* path);
-//const char* strip_local_domain(const char* url);
-
-//extern "C" wchar_t* wce_mbtowc(const char* a);
-//extern "C" char* wce_wctomb(const wchar_t* w);
+#include <hash_map>
 
-//extern "C" void pause_sync( int nPause );
+IMPLEMENT_LOGCLASS(CMainWindow,"MainWindow");
 
 #if defined(_WIN32_WCE)
 #include <regext.h>
@@ -41,10 +37,13 @@ extern HREGNOTIFY g_hNotify;
 
 #endif
 
+#include "DateTimePicker.h"
+
 extern "C" void rho_sysimpl_sethas_network(int nValue);
 
 using namespace rho::common;
 using namespace rho;
+using namespace stdext;
 
 #if !defined(_WIN32_WCE)
 int CMainWindow::m_screenWidth;
@@ -54,13 +53,11 @@ int CMainWindow::m_screenHeight;
 CMainWindow::CMainWindow()
 {
 	m_bLoading = true;
-	m_bRhobundleReloadEnabled = true;
 #if defined(_WIN32_WCE)
     memset(&m_sai, 0, sizeof(m_sai));
     m_sai.cbSize = sizeof(m_sai);
 #endif
-//	m_current_url = NULL;
-//    m_szStartPage = NULL;
+	m_pageCounter = 0;
 }
 
 CMainWindow::~CMainWindow()
@@ -171,7 +168,8 @@ LRESULT CMainWindow::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*
     mbi.nToolBarId = IDR_MAIN_MENUBAR; // ID of toolbar resource
     mbi.hInstRes   = _AtlBaseModule.GetResourceInstance();
     CBR(SHCreateMenuBar(&mbi));
-    m_menuBar = mbi.hwndMB; // save menu bar HWND
+	m_hWndCECommandBar = mbi.hwndMB;
+	m_menuBar = m_hWndCECommandBar;
 
 	// Compute RECT for initial size and position.
     // The following code should compute RECT appropriately
@@ -194,6 +192,8 @@ LRESULT CMainWindow::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*
     {
         rcMainWindow.bottom = si.rcVisibleDesktop.bottom;
     }
+	
+	SetToolbarButtonEnabled(IDM_SK1_EXIT, FALSE);
 #endif
 
 #if !defined(_WIN32_WCE)
@@ -203,7 +203,13 @@ LRESULT CMainWindow::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*
 
     MoveWindow(&rcMainWindow);
 
-    RHO_ASSERT(SUCCEEDED(hr));
+#if defined(_WIN32_WCE)
+	//Set fullscreen after window resizing
+	if ( RHOCONF().getBool("full_screen"))
+   	    SetFullScreen(true);
+#endif
+
+	RHO_ASSERT(SUCCEEDED(hr));
 Error:
 
     return SUCCEEDED(hr) ? 0 : -1;
@@ -295,7 +301,6 @@ LRESULT CMainWindow::OnPaint(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/
 LRESULT CMainWindow::OnActivate(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/)
 {
     int fActive = LOWORD(wParam);
-
 #if defined(_WIN32_WCE)
     // Notify shell of our WM_ACTIVATE message
     SHHandleWMActivate(m_hWnd, wParam, lParam, &m_sai, 0);
@@ -320,8 +325,17 @@ LRESULT CMainWindow::OnActivate(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOO
 LRESULT CMainWindow::OnSettingChange(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/)
 {
 #if defined(_WIN32_WCE)
-    // Notify shell of our WM_SETTINGCHANGE message
-    SHHandleWMSettingChange(m_hWnd, wParam, lParam, &m_sai);
+	
+	//handle sreen rotation
+	int width  = GetSystemMetrics(SM_CXSCREEN);	
+	int height = GetSystemMetrics(SM_CYSCREEN);
+	
+	if (wParam == SETTINGCHANGE_RESET) {
+		rho_rhodesapp_callScreenRotationCallback(width, height, 90);
+	}
+	
+	// Notify shell of our WM_SETTINGCHANGE message
+	SHHandleWMSettingChange(m_hWnd, wParam, lParam, &m_sai);
 #endif
     return 0;
 }
@@ -343,89 +357,15 @@ LRESULT CMainWindow::OnExitCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hW
     return 0;
 }
 
-LRESULT CMainWindow::OnBackCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
-{
-//    if ( m_szStartPage && m_current_url && _stricmp(m_current_url,m_szStartPage) != 0 )
-    rho::String strAppUrl = RHODESAPP().getAppBackUrl();
-
-    if ( strAppUrl.length() > 0 )
-    	m_spIWebBrowser2->Navigate( const_cast<wchar_t*>(convertToStringW(strAppUrl).c_str()), NULL, NULL, NULL, NULL);
-    else if ( _stricmp(RHODESAPP().getCurrentUrl().c_str(),RHODESAPP().getStartUrl().c_str()) != 0 )
-        m_spIWebBrowser2->GoBack();
-
-    return 0;
-}
-
-LRESULT CMainWindow::OnForwardCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
+LRESULT CMainWindow::OnNavigateBackCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
 {
-    m_spIWebBrowser2->GoForward();
+    m_spIWebBrowser2->GoBack();
     return 0;
 }
 
-void CMainWindow::SetRhobundleReloadMenu() {
-	if ( m_bRhobundleReloadEnabled )
-	{
-		m_bRhobundleReloadEnabled = false;
-
-		#if defined(ENABLE_DYNAMIC_RHOBUNDLE) && defined(_WIN32_WCE)
-		if ( !CHttpServer::Instance()->GetRhobundleReloadUrl() ) //disable RhoBundle reload url
-		{
-			HMENU hMenu = (HMENU)m_menuBar.SendMessage(SHCMBM_GETSUBMENU, 0, IDM_SK2_MENU);
-			RemoveMenu(hMenu, IDM_RELOADRHOBUNDLE, MF_BYCOMMAND);
-		}
-		#elif defined(_WIN32_WCE)			
-			HMENU hMenu = (HMENU)m_menuBar.SendMessage(SHCMBM_GETSUBMENU, 0, IDM_SK2_MENU);
-			RemoveMenu(hMenu, IDM_RELOADRHOBUNDLE, MF_BYCOMMAND);
-		#endif
-	}
-}
-
-LRESULT CMainWindow::OnHomeCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
-{
-    //TODO: show menu on navigate to start page
-	SetRhobundleReloadMenu();
-	m_spIWebBrowser2->Navigate( 
-        const_cast<wchar_t*>(convertToStringW(RHODESAPP().getStartUrl()).c_str()), NULL, NULL, NULL, NULL);
-	return 0;
-}
-#if 0
-LRESULT CMainWindow::OnLoadStartPageCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
-{
-	SetRhobundleReloadMenu();
-	
-	LPTSTR startPage = NULL;
-    LPTSTR lastPageW = NULL;
-
-	if ( RHOCONF().getBool("KeepTrackOfLastVisitedPage") ) 
-    {
-	    rho::String lastPage = RHOCONF().getString("LastVisitedPage");
-	    if (lastPage.length() > 0) {
-		    char* _page = canonicalizeURL(lastPage.c_str());
-		    startPage = lastPageW = wce_mbtowc(_page);
-		    free(_page);
-        }
-    }
-
-	if ( !startPage )
-		startPage = CHttpServer::Instance()->GetStartPage();
-
-	m_spIWebBrowser2->Navigate(startPage, NULL, NULL, NULL, NULL);
-	if (lastPageW) {
-		free(lastPageW);
-	}
-	
-	return 0;
-}
-#endif //0
-
-LRESULT CMainWindow::OnOpenURLCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
+LRESULT CMainWindow::OnBackCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
 {
-    CGetURLDialog getURLDialog;
-    int nRetCode = getURLDialog.DoModal(m_hWnd); // display the 'Get URL' dialog box
-    if (IDOK == nRetCode)
-    {
-        m_spIWebBrowser2->Navigate(getURLDialog.GetURL(), NULL, NULL, NULL, NULL);
-    }
+    RHODESAPP().navigateBack();
     return 0;
 }
 
@@ -445,81 +385,34 @@ LRESULT CMainWindow::OnLogCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWn
     return 0;
 }
 
-LRESULT CMainWindow::OnRefreshCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
+LRESULT CMainWindow::OnFullscreenCommand (WORD /*wNotifyCode*/, WORD /*wID*/, HWND hwnd, BOOL& /*bHandled*/)
 {
-//    m_spIWebBrowser2->Refresh();
-
-//	LPTSTR wcurl = wce_mbtowc(GetCurrentLocation());
-
-    rho::StringW strCurrentUrlW;
-    rho::common::convertToStringW(RHODESAPP().getCurrentUrl().c_str(), strCurrentUrlW);
-    Navigate2(const_cast<wchar_t*>(strCurrentUrlW.c_str()));
-
-//	free(wcurl);
-    return 0;
-}
+#if defined (_WIN32_WCE) 
+	SetFullScreen(!m_bFullScreen);
+#endif
+	return 0;
+};
 
 LRESULT CMainWindow::OnNavigateCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND hWndCtl, BOOL& /*bHandled*/)
 {
 	LPTSTR wcurl = (LPTSTR)hWndCtl;
-	if (wcurl) {
+	if (wcurl) 
+    {
 		Navigate2(wcurl);
 		free(wcurl);
 	}
     return 0;
 }
 
-LRESULT CMainWindow::OnStopCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
-{
-    m_spIWebBrowser2->Stop();
-    return 0;
-}
-
-
-LRESULT CMainWindow::OnSyncCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
+#if defined(OS_WINDOWS)
+LRESULT CMainWindow::OnPopupMenuCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) 
 {
-	rho_sync_doSyncAllSources(TRUE);
-    return 0;
-}
-
-LRESULT CMainWindow::OnOptionsCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
-	m_spIWebBrowser2->Navigate(const_cast<wchar_t*>(convertToStringW(RHODESAPP().getOptionsUrl()).c_str()), NULL, NULL, NULL, NULL);
+	createCustomMenu();
 	return 0;
 }
 
-LRESULT CMainWindow::OnReloadRhobundleCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
+LRESULT CMainWindow::OnPosChanged(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& bHandled) 
 {
-#ifdef ENABLE_DYNAMIC_RHOBUNDLE
-	if ( RHODESAPP().getRhobundleReloadUrl().length()>0 ) {
-		CAppManager::ReloadRhoBundle(m_hWnd,RHODESAPP().getRhobundleReloadUrl().c_str(), NULL);
-	} else {
-		MessageBox(_T("Path to the bundle is not defined."),_T("Information"), MB_OK | MB_ICONINFORMATION );
-	}
-#endif
-	return 0;
-}
-
-#if defined(OS_WINDOWS)
-LRESULT CMainWindow::OnPopupMenuCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
-	CMenu menu;
-	CMenu sub;
-	RECT  rect;
-
-	m_browser.GetWindowRect(&rect);
-
-	VERIFY(menu.LoadMenu(IDR_MAIN_MENU));
-	sub.Attach(menu.GetSubMenu(0));
-    sub.TrackPopupMenu(
-            TPM_RIGHTALIGN | TPM_BOTTOMALIGN | TPM_LEFTBUTTON | TPM_VERNEGANIMATION, 
-			rect.right-1, 
-			rect.bottom-1,
-			m_hWnd);
-	sub.Detach();
-
-	return 0;
-}
-
-LRESULT CMainWindow::OnPosChanged(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& bHandled) {
 	LPWINDOWPOS lp = (LPWINDOWPOS)lParam;
 	setIniInt(_T("main_view_left"),lp->x);
 	setIniInt(_T("main_view_top"),lp->y);
@@ -527,37 +420,9 @@ LRESULT CMainWindow::OnPosChanged(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lPara
 	return 0;
 }
 #endif
-/*
-void CMainWindow::SendCameraCallbackRequest(HRESULT status, LPTSTR image_name, char* callback_url) {
-
-    rho::String callback = RHODESAPP().canonicalizeRhoUrl(callback_url);
-
-	char* imageuri = NULL, *message;
-	if (status==S_OK) {
-		imageuri = wce_wctomb(image_name);
-		int len = 256+strlen(imageuri);
-		message = (char*) malloc(len);
-		sprintf(message,"status=ok&image_uri=%s",imageuri);
-	} else {
-		char* status_message = (status==S_FALSE?"User canceled operation":"Error");
-		int len = 256+strlen(status_message);
-		message = (char*) malloc(len);
-		sprintf(message,"status=%s&message=%s",
-			(status==S_FALSE?"cancel":"error"),status_message);
-	}
-
-//	char* headers = "Content-Type: application/x-www-form-urlencoded\r\n";
-	//char* res = m_callbackRequest.doRequest(L"POST",callback,headers,strlen(headers),message,strlen(message));
-	//if ( res ) free(res);
-    rho::net::CNetRequest oNetReq;
-    oNetReq.pushData( callback, message, null );
-
-	free(message);
-	if (imageuri) 
-        free(imageuri);
-}*/
 
-LRESULT CMainWindow::OnTakePicture(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/) {
+LRESULT CMainWindow::OnTakePicture(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/) 
+{
 #if defined (_WIN32_WCE)
 	Camera camera;
 	TCHAR image_uri[MAX_PATH];
@@ -571,7 +436,8 @@ LRESULT CMainWindow::OnTakePicture(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lPar
 	return 0;
 }
 
-LRESULT CMainWindow::OnConnectionsNetworkCount(UINT /*uMsg*/, WPARAM wParam, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
+LRESULT CMainWindow::OnConnectionsNetworkCount(UINT /*uMsg*/, WPARAM wParam, LPARAM /*lParam*/, BOOL& /*bHandled*/) 
+{
 #if defined (_WIN32_WCE)
 
 	rho_sysimpl_sethas_network( (int)wParam );
@@ -588,6 +454,7 @@ LRESULT CMainWindow::OnSelectPicture(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lP
 	Camera camera;
 	status = camera.selectPicture(this->m_hWnd,image_uri);
 #else
+    //TODO: show browse file dialog
     wsprintf( image_uri, L"%s", L"dashboard.PNG");
 #endif
 
@@ -621,6 +488,30 @@ LRESULT CMainWindow::OnAlertShowPopup (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM
     return 0;
 }
 
+LRESULT CMainWindow::OnDateTimePicker (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/)
+{
+	CDateTimeMessage *msg = (CDateTimeMessage *)lParam;
+	int retCode	= -1;
+	time_t ret_time = 0;
+
+	if (msg->m_format == CDateTimeMessage::FORMAT_TIME) {
+		CTimePickerDialog timeDialog(msg);
+		retCode = timeDialog.DoModal(m_hWnd);
+		ret_time = timeDialog.GetTime();
+	} else {
+		CDateTimePickerDialog dateTimeDialog(msg);
+		retCode = dateTimeDialog.DoModal(m_hWnd);
+		ret_time = dateTimeDialog.GetTime();
+	}
+
+	rho_rhodesapp_callDateTimeCallback( msg->m_callback, 
+										retCode == IDOK ? (long )ret_time : 0,
+										msg->m_data,
+										retCode == IDOK ? 0 : 1);
+	delete msg;
+
+	return 0;
+}
 
 // **************************************************************************
 //
@@ -643,8 +534,8 @@ void __stdcall CMainWindow::OnBeforeNavigate2(IDispatch* pDisp, VARIANT * pvtURL
         SetWindowText(convertToStringW(strTitle).c_str());
     else
         SetWindowText(TEXT("Untitled"));
-
-    RHO_ASSERT(SetEnabledState(IDM_STOP, TRUE));
+	
+    //RHO_ASSERT(SetMenuItemEnabled(IDM_STOP, TRUE));
 }
 
 void __stdcall CMainWindow::OnBrowserTitleChange(BSTR bstrTitleText)
@@ -736,9 +627,9 @@ void CMainWindow::ShowLoadingPage(LPDISPATCH pDisp, VARIANT* URL)
 
 void __stdcall CMainWindow::OnDocumentComplete(IDispatch* pDisp, VARIANT * pvtURL)
 {
+	LOG(INFO) + "Show loading page";
     USES_CONVERSION;
 	
-	//BOOL store_current_url = !m_bLoading;
 	LPCTSTR url = OLE2CT(V_BSTR(pvtURL));
 	if (m_bLoading && wcscmp(url,_T("about:blank"))==0) {
 		LOG(TRACE) + "Show loading page";
@@ -748,35 +639,32 @@ void __stdcall CMainWindow::OnDocumentComplete(IDispatch* pDisp, VARIANT * pvtUR
 		m_bLoading = false; //show loading page only once
     }else
     {
-//        if ( m_current_url && strcmp(m_current_url,"about:blank") ==0 )
-//            m_szStartPage = wce_wctomb(url);
     }
     m_bLoading = false;
 
-	/*if (m_current_url) {
-		free(m_current_url);
-	}
-
-	m_current_url = wce_wctomb(url);*/
-	
-	//if( store_current_url ) 
-    //    RHODESAPP().keepLastVisitedUrlW(url);
-
     LOG(TRACE) + "OnDocumentComplete: " + url;
 
-    RHO_ASSERT(SetEnabledState(IDM_STOP, FALSE));
+#if defined (_WIN32_WCE)
+	createCustomMenu();
+	
+	m_pageCounter++;
+	if (m_pageCounter > 2) //"loading" page + first page
+		SetToolbarButtonEnabled(IDM_SK1_EXIT, TRUE);
+#endif	
+    //RHO_ASSERT(SetMenuItemEnabled(IDM_STOP, FALSE));
 }
 
 void __stdcall CMainWindow::OnCommandStateChange(long lCommand, BOOL bEnable)
 {
     /*if (CSC_NAVIGATEBACK == lCommand)
     {
-        RHO_ASSERT(SetEnabledState(IDM_BACK, bEnable));
+        RHO_ASSERT(SetMenuItemEnabled(IDM_BACK, bEnable));
     }
-    else */if (CSC_NAVIGATEFORWARD == lCommand)
+    else */
+    /*if (CSC_NAVIGATEFORWARD == lCommand)
     {
-        RHO_ASSERT(SetEnabledState(IDM_FORWARD, bEnable));
-    }
+        RHO_ASSERT(SetMenuItemEnabled(IDM_FORWARD, bEnable));
+    }*/
 }
 
 // **************************************************************************
@@ -784,15 +672,25 @@ void __stdcall CMainWindow::OnCommandStateChange(long lCommand, BOOL bEnable)
 // utility function
 //
 // **************************************************************************
-BOOL CMainWindow::SetEnabledState(UINT uMenuItemID, BOOL bEnable)
+BOOL CMainWindow::SetMenuItemEnabled(UINT uMenuItemID, BOOL bEnable)
 {
+	return TRUE;
+}
+
+BOOL CMainWindow::SetToolbarButtonEnabled(UINT uTbbID, BOOL bEnable)
+{
+
 #if defined(_WIN32_WCE)
-    HMENU hMenu = (HMENU)m_menuBar.SendMessage(SHCMBM_GETSUBMENU, 0, IDM_SK2_MENU);
-    BOOL bRetVal = EnableMenuItem(hMenu, uMenuItemID, bEnable ? MF_ENABLED : MF_GRAYED);
-    return (bRetVal != 0xFFFFFFFF);
+	TBBUTTONINFO tbbi;
+    tbbi.cbSize = sizeof(tbbi);
+    tbbi.dwMask = TBIF_STATE;
+    tbbi.fsState = bEnable ? TBSTATE_ENABLED : TBSTATE_INDETERMINATE;
+    ::SendMessage (m_menuBar, TB_SETBUTTONINFO, uTbbID, (LPARAM)&tbbi);
+	return TRUE;
 #else
 	return TRUE;
 #endif
+
 }
 
 // **************************************************************************
@@ -805,13 +703,30 @@ BOOL CMainWindow::SetEnabledState(UINT uMenuItemID, BOOL bEnable)
 // **************************************************************************
 BOOL CMainWindow::TranslateAccelerator(MSG* pMsg)
 {
+#ifdef OS_WINCE
+	if (pMsg->message == WM_CONTEXTMENU){
+		/*
+		CMenuHandle menu;
+		menu.LoadMenu(IDR_MAIN_MENU);
+		menu = menu.GetSubMenu(0);
+		return menu.TrackPopupMenu( TPM_CENTERALIGN | TPM_VERTICAL, LOWORD(pMsg->lParam), HIWORD(pMsg->lParam), m_hWnd);
+		*/
+		
+		return TRUE;
+	}
+
+	if (m_bFullScreen && pMsg->message == WM_KEYUP && 
+		(pMsg->wParam == VK_F1 ||  pMsg->wParam == VK_F2))
+	        SetFullScreen(false);
+#endif
+
     // Accelerators are only keyboard or mouse messages
     UINT uMsg = pMsg->message;
     if (!(WM_KEYFIRST   <= uMsg && uMsg <= WM_KEYLAST) &&
         !(WM_MOUSEFIRST <= uMsg && uMsg <= WM_MOUSELAST))
     {
 
-#ifdef OS_WINCE
+#ifdef OS_WINCE			
         if ( uMsg == WM_HOTKEY )
         {
             int idHotKey = (int) pMsg->wParam; 
@@ -820,7 +735,8 @@ BOOL CMainWindow::TranslateAccelerator(MSG* pMsg)
 
             if ( uVirtKey == VK_ESCAPE ){
                 if ( fuModifiers&MOD_KEYUP )
-                    PostMessageW(WM_COMMAND,MAKEWPARAM(IDM_BACK,1),NULL);
+                    RHODESAPP().navigateBack();
+                    //PostMessageW(WM_COMMAND,MAKEWPARAM(IDM_BACK,1),NULL);
 
                 return TRUE;
             }
@@ -856,3 +772,100 @@ BOOL CMainWindow::TranslateAccelerator(MSG* pMsg)
     // ::TranslateAccelerator() function here, instead of simply returning FALSE.
     return FALSE;
 }
+
+#if defined (OS_WINDOWS)
+void CMainWindow::createCustomMenu()
+{
+	CMenu menu;
+	CMenu sub;
+	CMenu popup;
+	
+	VERIFY(menu.CreateMenu());
+	VERIFY(popup.CreatePopupMenu());
+	menu.AppendMenu(MF_POPUP, (UINT) popup.m_hMenu, _T(""));
+
+	RHODESAPP().getAppMenu().copyMenuItems(m_arAppMenuItems);
+
+#ifdef ENABLE_DYNAMIC_RHOBUNDLE
+    String strIndexPage = CFilePath::join(RHODESAPP().getStartUrl(),"index_erb.iseq");
+    if ( RHODESAPP().getCurrentUrl().compare(RHODESAPP().getStartUrl()) == 0 ||
+         RHODESAPP().getCurrentUrl().compare(strIndexPage) == 0 )
+        m_arAppMenuItems.addElement(CAppMenuItem("Reload RhoBundle","reload_rhobundle"));
+#endif //ENABLE_DYNAMIC_RHOBUNDLE
+
+	//update UI with custom menu items
+	USES_CONVERSION; 
+    for ( int i = m_arAppMenuItems.size() - 1; i >= 0; i--)
+    {
+        CAppMenuItem& oItem = m_arAppMenuItems.elementAt(i);
+        if (oItem.m_eType == CAppMenuItem::emtSeparator) 
+			popup.InsertMenu(0, MF_BYPOSITION | MF_SEPARATOR, (UINT_PTR)0, (LPCTSTR)0);
+		else 
+			popup.InsertMenu(0, MF_BYPOSITION, ID_CUSTOM_MENU_ITEM_FIRST + i, 
+                oItem.m_eType == CAppMenuItem::emtClose ? _T("Exit") : A2T(oItem.m_strLabel.c_str()) );
+    }
+
+	RECT  rect; 
+	m_browser.GetWindowRect(&rect);
+	sub.Attach(menu.GetSubMenu(0));
+	sub.TrackPopupMenu( TPM_RIGHTALIGN | TPM_BOTTOMALIGN | TPM_LEFTBUTTON | TPM_VERNEGANIMATION, 
+						rect.right-1, 
+						rect.bottom-1,
+						m_hWnd);
+	sub.Detach();
+}
+
+#endif//OS_WINDOWS
+
+#if defined (OS_WINCE)
+
+void CMainWindow::createCustomMenu()
+{
+	HMENU hMenu = (HMENU)m_menuBar.SendMessage(SHCMBM_GETSUBMENU, 0, IDM_SK2_MENU);
+	
+	//except exit item
+	int num = GetMenuItemCount (hMenu);
+	for (int i = 0; i < (num - 1); i++)	
+		DeleteMenu(hMenu, 0, MF_BYPOSITION);
+
+	RHODESAPP().getAppMenu().copyMenuItems(m_arAppMenuItems);
+ 	
+	//update UI with cusom menu items
+	USES_CONVERSION;
+    for ( int i = m_arAppMenuItems.size() - 1; i >= 0; i--)
+    {
+        CAppMenuItem& oItem = m_arAppMenuItems.elementAt(i);
+		if (oItem.m_eType == CAppMenuItem::emtSeparator) 
+			InsertMenu(hMenu, 0, MF_BYPOSITION | MF_SEPARATOR, 0, 0);
+		else if (oItem.m_eType != CAppMenuItem::emtExit && oItem.m_eType != CAppMenuItem::emtClose)
+    		InsertMenu(hMenu, 0, MF_BYPOSITION, ID_CUSTOM_MENU_ITEM_FIRST + i, A2T(oItem.m_strLabel.c_str()));
+	}
+}
+#endif //OS_WINCE
+
+LRESULT CMainWindow::OnCustomMenuItemCommand (WORD /*wNotifyCode*/, WORD  wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
+{	
+    int nItemPos = wID-ID_CUSTOM_MENU_ITEM_FIRST;
+    if ( nItemPos < 0 || nItemPos >= (int)m_arAppMenuItems.size() )
+        return 0;
+
+	CAppMenuItem& oMenuItem = m_arAppMenuItems.elementAt(nItemPos);
+    if ( oMenuItem.m_eType == CAppMenuItem::emtUrl )
+    {
+        if ( oMenuItem.m_strLink == "reload_rhobundle" )
+        {
+        #ifdef ENABLE_DYNAMIC_RHOBUNDLE
+	        if ( RHODESAPP().getRhobundleReloadUrl().length()>0 ) {
+		        CAppManager::ReloadRhoBundle(m_hWnd,RHODESAPP().getRhobundleReloadUrl().c_str(), NULL);
+	        } else {
+		        MessageBox(_T("Path to the bundle is not defined."),_T("Information"), MB_OK | MB_ICONINFORMATION );
+	        }
+        #endif
+            return 0;
+        }
+    }
+
+    oMenuItem.processCommand();
+
+    return 0;
+}