rhodes 3.3.5 → 3.4.2

data/platform/shared/db/DBRequestHelper.cpp

@@ -0,0 +1,114 @@
+//
+//  DBRequestHelper.cpp
+//  rhosynclib
+//
+//  Created by Alex Epifanoff on 19.06.12.
+//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
+//
+
+#include "DBRequestHelper.h"
+#include "common/AutoPointer.h"
+#include "common/RhodesApp.h"
+#include "common/RhoFilePath.h"
+
+namespace rho {
+namespace db {
+		
+
+	class BlobsRequest {
+	protected:
+		CDBAdapter& _db;
+		int _srcID;
+		Vector<String> _blobAttrs;
+		
+		virtual void requestBlobsForAttrib(const String& attr, Vector<String>& out ) = 0;
+		
+	public:
+		BlobsRequest(CDBAdapter& db, int srcID):_db(db),_srcID(srcID) {
+			_blobAttrs = db.getAttrMgr().getBlobAttrs(_srcID);
+		}
+		virtual ~BlobsRequest() {}
+		void getBlobs(Vector<String>& out) {
+			Vector<String> blobs;
+			for ( Vector<String>::const_iterator it = _blobAttrs.begin(); it != _blobAttrs.end(); ++it ) {
+				requestBlobsForAttrib(*it,out);
+			}
+		}
+	};
+	
+	class PropertyBagBlobsRequest : public BlobsRequest {
+	public:
+		PropertyBagBlobsRequest(CDBAdapter& db, int srcID) :
+		BlobsRequest(db, srcID) {}
+		
+		virtual void requestBlobsForAttrib(const String& attr, Vector<String>& out ) {
+			IDBResult res = _db.executeSQL( "SELECT value FROM object_values WHERE source_id=? AND attrib=?", _srcID, attr.c_str() );
+			for ( ;!res.isEnd();res.next()) {
+				out.push_back( /*common::CFilePath::join( RHODESAPP().getBlobsDirPath(), */res.getStringByIdx(0)/*)*/ );
+			}
+		}
+		
+	};
+	
+	class FixedSchemaBlobsRequest : public BlobsRequest {
+		const String _srcName;
+	public:
+		FixedSchemaBlobsRequest(CDBAdapter& db, int srcID, const String& srcName) :
+		BlobsRequest(db, srcID), _srcName(srcName) { }
+		
+		virtual void requestBlobsForAttrib(const String& attr, Vector<String>& out ) {
+			String sql = "SELECT " + attr + " FROM " + _srcName;
+			IDBResult res = _db.executeSQL(sql.c_str());
+			for ( ;!res.isEnd();res.next()) {
+				out.push_back( /*common::CFilePath::join( RHODESAPP().getBlobsDirPath(), */res.getStringByIdx(0)/*)*/ );
+			}
+		}
+		
+	};
+	
+	
+	Vector<String> CDBRequestHelper::requestBlobs( int srcID ) {
+		Vector<String> list;
+		
+		IDBResult res = _db.executeSQL("SELECT source_id, name, schema FROM sources WHERE source_id=?", srcID);
+		for ( ;!res.isEnd();res.next() ) {
+			int srcId = res.getIntByIdx(0);
+			String srcName = res.getStringByIdx(1);
+			boolean isSchemaSource = res.getStringByIdx(2).length() > 0;
+			
+			common::CAutoPtr<BlobsRequest> request;
+			if  (isSchemaSource) {
+				request = new FixedSchemaBlobsRequest(_db,srcId,srcName);
+			} else {
+				request = new PropertyBagBlobsRequest(_db,srcId);
+			}
+			
+			request->getBlobs(list);
+		}
+		
+		return list;
+	}
+	
+	Vector<String> CDBRequestHelper::requestBlobs(  ) {
+		Vector<String> list;
+		
+		IDBResult res = _db.executeSQL("SELECT source_id, name, schema FROM sources");
+		for ( ;!res.isEnd();res.next() ) {
+			int srcId = res.getIntByIdx(0);
+			String srcName = res.getStringByIdx(1);
+			boolean isSchemaSource = res.getStringByIdx(2).length() > 0;
+			
+			common::CAutoPtr<BlobsRequest> request;
+			if  (isSchemaSource) {
+				request = new FixedSchemaBlobsRequest(_db,srcId,srcName);
+			} else {
+				request = new PropertyBagBlobsRequest(_db,srcId);
+			}
+			
+			request->getBlobs(list);
+		}
+		
+		return list;
+	}
+}
+}

data/platform/shared/db/DBRequestHelper.h

@@ -0,0 +1,27 @@
+//
+//  DBRequestHelper.h
+//  rhosynclib
+//
+//  Created by Alex Epifanoff on 19.06.12.
+//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
+//
+
+#include "DBAdapter.h"
+
+namespace rho {
+namespace db {
+	
+	class CDBRequestHelper {
+	protected:
+		CDBAdapter& _db;
+		
+	public:
+		CDBRequestHelper(CDBAdapter& db): _db(db) {}
+		
+		Vector<String> requestBlobs( int srcID );
+		Vector<String> requestBlobs(  );
+	};
+
+	
+}
+}

data/platform/shared/logging/RhoLogConf.h

@@ -202,6 +202,8 @@ void rho_logconf_saveSettings();
 void rho_logconf_freeString(char* str);
 
 int rho_conf_send_log(const char* callback_url);
+int rho_conf_send_log_in_same_thread();
+
 void rho_conf_clean_log();
     
 void rho_log_resetup_http_url(const char* http_log_url);    

data/platform/shared/net/AsyncHttp.cpp

@@ -277,7 +277,7 @@ void CAsyncHttp::CHttpCommand::callNotify(NetResponse& resp, int nError )
             m_strResBody += "&" + strHeaders;
 
         m_strResBody += "&" + RHODESAPP().addCallbackObject(
-            new CAsyncHttpResponse(resp, m_mapHeaders.get("content-type")), "body");
+            new CAsyncHttpResponse(resp, m_mapHeaders.get("content-type"), m_mapHeaders.get("content-encoding")), "body");
     }
 
     if ( m_strCallbackParams.length() > 0 )
@@ -286,6 +286,7 @@ void CAsyncHttp::CHttpCommand::callNotify(NetResponse& resp, int nError )
     if ( m_strCallback.length() > 0 )
     {
         String strFullUrl = m_NetRequest.resolveUrl(m_strCallback);
+        LOG(TRACE) + "Callback:" + m_strCallback + "Result body: " + m_strResBody;
         getNet().pushData( strFullUrl, m_strResBody, null );
     }
 }
@@ -297,7 +298,7 @@ unsigned long CAsyncHttp::CAsyncHttpResponse::getObjectValue()
 {
     if (m_NetResponse.isSuccess())
     {
-        if ( m_strContentType.find("application/json") != String::npos )
+        if ( m_strContentType.find("application/json") != String::npos/* && m_strContentEncoding.find("gzip") == String::npos*/ )
         {
             char* szError = 0;
             unsigned long valBody = rjson_tokener_parse(m_NetResponse.getCharData(), &szError);
@@ -310,7 +311,7 @@ unsigned long CAsyncHttp::CAsyncHttpResponse::getObjectValue()
         }
     }
 
-    return rho_ruby_create_string(m_NetResponse.getCharData());
+    return rho_ruby_create_string_withlen2(m_NetResponse.getCharData(), m_NetResponse.getDataSize() );
 }
 
 } // namespace net

data/platform/shared/net/AsyncHttp.h

@@ -45,12 +45,13 @@ class CAsyncHttp : public common::CThreadQueue
     class CAsyncHttpResponse : public rho::ICallbackObject
     {
         NetResponse m_NetResponse;
-        String m_strContentType;
+        String m_strContentType, m_strContentEncoding;
     public:
-        CAsyncHttpResponse(NetResponse& resp, const String& strContentType)
+        CAsyncHttpResponse(NetResponse& resp, const String& strContentType, const String& strContentEncoding)
         {
             m_NetResponse = resp;
             m_strContentType = strContentType;
+            m_strContentEncoding = strContentEncoding;
         }
         ~CAsyncHttpResponse();
 

data/platform/shared/net/CURLNetRequest.cpp

@@ -133,6 +133,7 @@ INetResponse *CURLNetRequest::makeResponse(Vector<char> const &body, int nErrorC
 
 INetResponse *CURLNetRequest::makeResponse(char const *body, size_t bodysize, int nErrorCode)
 {
+    RAWTRACE1("CURLNetRequest::makeResponse - nErrorCode: %d", nErrorCode);
     if (!body) {
         body = "";
         bodysize = 0;
@@ -234,7 +235,7 @@ INetResponse* CURLNetRequest::doPull(const char* method, const String& strUrl,
     Hashtable<String,String> h;
     if (pHeaders)
         h = *pHeaders;
-    
+
     for (int nAttempts = 0; nAttempts < 10; ++nAttempts) {
         Vector<char> respChunk;
         
@@ -247,7 +248,10 @@ INetResponse* CURLNetRequest::doPull(const char* method, const String& strUrl,
         curl_easy_setopt(curl, CURLOPT_WRITEDATA, &respChunk);
         curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &curlBodyBinaryCallback);
         if (nStartFrom > 0)
+		{
+			RAWLOG_INFO1("CURLNetRequest::doPull - resuming from %d",nStartFrom);
             curl_easy_setopt(curl, CURLOPT_RESUME_FROM, nStartFrom);
+		}
 
         CURLcode err = doCURLPerform(strUrl);
         curl_slist_free_all(hdrs);
@@ -255,6 +259,8 @@ INetResponse* CURLNetRequest::doPull(const char* method, const String& strUrl,
         long statusCode = 0;
         if (curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &statusCode) != 0)
             statusCode = 500;
+        
+        RAWTRACE2("CURLNetRequest::doPull - Status code: %d, response size: %d", (int)statusCode, respChunk.size() );
 		
 		if (statusCode == 416 )
 		{
@@ -266,7 +272,7 @@ INetResponse* CURLNetRequest::doPull(const char* method, const String& strUrl,
                 std::copy(respChunk.begin(), respChunk.end(), std::back_inserter(respBody));
             // Clear counter of attempts because 206 response does not considered to be failed attempt
             nAttempts = 0;
-        }
+		}
         else {
             if (oFile) {
                 oFile->movePosToStart();
@@ -277,8 +283,14 @@ INetResponse* CURLNetRequest::doPull(const char* method, const String& strUrl,
         }
         
         if (err == CURLE_OPERATION_TIMEDOUT && respChunk.size() > 0) {
-            RAWTRACE("Connection was closed by timeout, but we have part of data received; try to restore connection");
-            nStartFrom = oFile ? oFile->size() : respBody.size();
+            RAWLOG_INFO("Connection was closed by timeout, but we have part of data received; try to restore connection");
+            nRespCode = -1;
+			if ( oFile != 0 ) {
+				oFile->flush();
+				nStartFrom = oFile->size();
+			} else {
+				nStartFrom = respBody.size();
+			}
             continue;
         }
         
@@ -424,6 +436,7 @@ int CURLNetRequest::getResponseCode(CURLcode err, char const *body, size_t bodys
         RAWTRACE("END RESPONSE-----");
     }
 
+    RAWTRACE1("CURLNetRequest::getResponseCode - Status code: %d", (int)statusCode);
     return (int)statusCode;
 }
 
@@ -726,7 +739,7 @@ CURLcode CURLNetRequest::CURLHolder::perform()
         if (result == CURLE_OK && noactivity >= timeout)
             result = CURLE_OPERATION_TIMEDOUT;
         if (result == CURLE_OK || result == CURLE_PARTIAL_FILE) {
-            RAWTRACE("Operation completed successfully");
+            RAWTRACE2("Operation completed successfully with result %d: %s", (int)result, curl_easy_strerror(result));
         }
         else {
             RAWLOG_ERROR2("Operation finished with error %d: %s", (int)result, curl_easy_strerror(result));

data/platform/shared/net/HttpServer.cpp

@@ -1030,8 +1030,11 @@ bool CHttpServer::send_file(String const &path, HeaderList const &hdrs)
     
     // Detect mime type
     headers.push_back(Header("Content-Type", get_mime_type(path)));
-    //headers.push_back(Header("Expires", "Thu, 15 Apr 2020 20:00:00 GMT") );
-    //headers.push_back(Header("Cache-Control", "max-age=2592000") );
+    if ( String_startsWith(path, "/public") )
+    {
+        headers.push_back(Header("Expires", "Thu, 15 Apr 2020 20:00:00 GMT") );
+        headers.push_back(Header("Cache-Control", "max-age=2592000") );
+    }
 
     // Content length
     char* buf = new char[FILE_BUF_SIZE];
@@ -1049,16 +1052,19 @@ bool CHttpServer::send_file(String const &path, HeaderList const &hdrs)
             range_begin = range_end - 1;
         content_size = range_end - range_begin + 1;
         
-        snprintf(buf, FILE_BUF_SIZE, "bytes %lu-%lu/%lu", (unsigned long)range_begin,
-                 (unsigned long)range_end, (unsigned long)file_size);
-        headers.push_back(Header("Content-Range", buf));
-        
         if (fseek(fp, range_begin, SEEK_SET) == -1) {
             RAWLOG_ERROR1("Can not seek to specified range start: %lu", (unsigned long)range_begin);
+			snprintf(buf, FILE_BUF_SIZE, "bytes */%lu", (unsigned long)file_size);
+			headers.push_back(Header("Content-Range", buf));
+			send_response(create_response("416 Request Range Not Satisfiable",headers));
             fclose(fp);
             delete buf;
             return false;
         }
+		
+		snprintf(buf, FILE_BUF_SIZE, "bytes %lu-%lu/%lu", (unsigned long)range_begin,
+                 (unsigned long)range_end, (unsigned long)file_size);
+        headers.push_back(Header("Content-Range", buf));
         
         start_line = "206 Partial Content";
     }
@@ -1087,14 +1093,12 @@ bool CHttpServer::send_file(String const &path, HeaderList const &hdrs)
         if (need_to_read > FILE_BUF_SIZE)
             need_to_read = FILE_BUF_SIZE;
         size_t n = fread(buf, 1, need_to_read, fp);//fread(buf, 1, need_to_read, fp);
-        if (n < 0) {
-            RAWLOG_ERROR2("Can not read part of file (at position %lu): %s", (unsigned long)start, strerror(errno));
-            fclose(fp);
-            delete buf;
-            return false;
-        }
-        if (n == 0) {
-            RAWLOG_ERROR1("End of file reached, but we expect data (%lu bytes)", (unsigned long)need_to_read);
+        if (n < need_to_read) {
+			if (ferror(fp) ) {
+				RAWLOG_ERROR2("Can not read part of file (at position %lu): %s", (unsigned long)start, strerror(errno));
+			} else if ( feof(fp) ) {
+				RAWLOG_ERROR1("End of file reached, but we expect data (%lu bytes)", (unsigned long)need_to_read);
+			}
             fclose(fp);
             delete buf;
             return false;

data/platform/shared/qt/rhodes/MainWindowCallback.h

@@ -39,7 +39,6 @@ class IMainWindowCallback
 public:
     virtual void updateSizeProperties(int width, int height) = 0;
     virtual void onActivate(int active) = 0;
-    virtual void logEvent(const ::std::string& message) = 0;
     virtual void createCustomMenu(void) = 0;
     virtual void onCustomMenuItemCommand(int nItemPos) = 0;
     virtual void onWindowClose(void) = 0;

data/platform/shared/qt/rhodes/QtMainWindow.cpp

@@ -41,13 +41,17 @@
 #include <QtNetwork/QNetworkCookie>
 #include <QFileDialog>
 #include <QDesktopServices>
+#include <QDesktopWidget>
 #include "ext/rho/rhoruby.h"
 #include "common/RhoStd.h"
 #include "common/RhodesApp.h"
+#include "common/RhoConf.h"
 #include "rubyext/WebView.h"
 #include "rubyext/NativeToolbarExt.h"
 #undef null
 #include "DateTimeDialog.h"
+#include "statistic/RhoProfiler.h"
+#include <QStylePainter>
 
 #if defined(OS_MACOSX) || defined(OS_LINUX)
 #define stricmp strcasecmp
@@ -59,22 +63,24 @@
 #include "qwebviewkineticscroller.h"
 #endif
 
-IMPLEMENT_LOGCLASS(QtMainWindow,"MainWindow");
+IMPLEMENT_LOGCLASS(QtMainWindow,"QtMainWindow");
 
 extern "C" {
     extern VALUE rb_thread_main(void);
     extern VALUE rb_thread_wakeup(VALUE thread);
 }
+using namespace rho::common;
 
 QtMainWindow::QtMainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::QtMainWindow),
     webInspectorWindow(new QtWebInspector()),
-    cb(NULL),
+    mainWindowCallback(NULL),
     cur_tbrp(0),
     m_alertDialog(0),
     m_LogicalDpiX(0),
-    m_LogicalDpiY(0)
+    m_LogicalDpiY(0),
+	firstShow(true), m_bFirstLoad(true)
     //TODO: m_SyncStatusDlg
 {
 #ifdef OS_WINDOWS_DESKTOP
@@ -84,18 +90,20 @@ QtMainWindow::QtMainWindow(QWidget *parent) :
 
     ui->setupUi(this);
 
-    QWebSettings* qs = QWebSettings::globalSettings(); //this->ui->webView->settings();
+#ifdef OS_WINDOWS_DESKTOP
+	ui->menuSimulate->clear();
+	ui->menuSimulate->setTitle("Navigate");
+	ui->menuSimulate->insertAction(0, ui->actionBack);
+#endif
+
+    QWebSettings* qs = QWebSettings::globalSettings();
     qs->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
-    qs->setAttribute(QWebSettings::LocalStorageEnabled, true);
-    qs->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true);
-    qs->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, true);
     qs->setOfflineStorageDefaultQuota(1024*1024*1024);
 
     rho::String rs_dir = RHODESAPP().getRhoRootPath()+RHO_EMULATOR_DIR;
-    qs->setOfflineWebApplicationCachePath(rs_dir.c_str());
-    qs->setLocalStoragePath(rs_dir.c_str());
-    qs->setOfflineStoragePath(rs_dir.c_str());
+    qs->enablePersistentStorage(rs_dir.c_str());
 
+	this->ui->webView->setContextMenuPolicy(Qt::NoContextMenu);
     this->ui->webView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
     this->ui->webView->page()->mainFrame()->securityOrigin().setDatabaseQuota(1024*1024*1024);
     this->main_webView = this->ui->webView;
@@ -106,8 +114,17 @@ QtMainWindow::QtMainWindow(QWidget *parent) :
     this->ui->toolBar->hide();
     this->ui->toolBarRight->hide();
 
+    this->main_webView->hide();
+    //this->ui->centralWidget->hide();
+
+    //this->ui->centralWidget->setStyleSheet("background-color: yellow");
+    //this->ui->centralWidget->setStyleSheet("QWidget {background-image: url(test.jpg)}" );
+
+
+#if defined(RHODES_EMULATOR)
     // connecting WebInspector
     main_webInspector->setPage(ui->webView->page());
+#endif
 
 #ifdef OS_SYMBIAN
     QWebViewKineticScroller *newScroller = new QWebViewKineticScroller();
@@ -115,7 +132,9 @@ QtMainWindow::QtMainWindow(QWidget *parent) :
     QWebViewSelectionSuppressor* suppressor = new QWebViewSelectionSuppressor(this->ui->webView);
 #endif
 
+#if defined(RHODES_EMULATOR)
     webInspectorWindow->show();
+#endif
 }
 
 QtMainWindow::~QtMainWindow()
@@ -127,25 +146,60 @@ QtMainWindow::~QtMainWindow()
     delete ui;
 }
 
+void QtMainWindow::paintEvent(QPaintEvent *p2)
+{
+    if ( m_bFirstLoad )
+    {
+        QPainter paint(this);
+
+        QImage image;
+        image.load(RHODESAPP().getLoadingPngPath().c_str());
+        QSize imSize = image.size();
+
+        QRect rcClient = this->rect();
+        rcClient.setBottom( rcClient.bottom() - this->ui->toolBar->rect().height() ) ;
+        RHODESAPP().getSplashScreen().start();
+/*
+        CSplashScreen& splash = RHODESAPP().getSplashScreen();
+
+        int nLeft = rcClient.left(), nTop = rcClient.top(), nWidth = imSize.width(), nHeight = imSize.height(), Width = rcClient.right() - rcClient.left(), Height = rcClient.bottom() - rcClient.top();
+        if (splash.isFlag(CSplashScreen::HCENTER) )
+		    nLeft = (Width-nWidth)/2;
+	    if (splash.isFlag(CSplashScreen::VCENTER) )
+		    nTop = (Height-nHeight)/2;
+	    if (splash.isFlag(CSplashScreen::VZOOM) )
+		    nHeight = Height;
+	    if (splash.isFlag(CSplashScreen::HZOOM) )
+		    nWidth = Width;
+
+        QRect rc( nLeft, nTop, nWidth, nHeight );*/
+
+        paint.drawImage( rcClient, image );
+    }
+
+    QMainWindow::paintEvent(p2);
+
+}
+
 void QtMainWindow::setCallback(IMainWindowCallback* callback)
 {
-    cb = callback;
+    mainWindowCallback = callback;
 }
 
 void QtMainWindow::hideEvent(QHideEvent *)
 {
-    if (cb) cb->onActivate(0);
+    if (mainWindowCallback) mainWindowCallback->onActivate(0);
 }
 
 void QtMainWindow::showEvent(QShowEvent *)
 {
-    if (cb) cb->onActivate(1);
+    if (mainWindowCallback) mainWindowCallback->onActivate(1);
 }
 
 void QtMainWindow::closeEvent(QCloseEvent *ce)
 {
     rb_thread_wakeup(rb_thread_main());
-    if (cb) cb->onWindowClose();
+    if (mainWindowCallback) mainWindowCallback->onWindowClose();
     tabbarRemoveAllTabs(false);
     webInspectorWindow->close();
     QMainWindow::closeEvent(ce);
@@ -155,8 +209,17 @@ void QtMainWindow::resizeEvent(QResizeEvent *event)
 {
     m_LogicalDpiX = this->logicalDpiY();
     m_LogicalDpiY = this->logicalDpiY();
-    if (cb)
-        cb->updateSizeProperties(event->size().width(), event->size().height());
+    if (mainWindowCallback)
+        mainWindowCallback->updateSizeProperties(event->size().width(), event->size().height());
+}
+
+void QtMainWindow::adjustWebInspector()
+{
+	int screen_width = QApplication::desktop()->screenGeometry().width();
+	int wi_x = this->x() + this->width() + 16;
+	if ((wi_x + webInspectorWindow->width() + 16) > screen_width)
+		wi_x = screen_width - webInspectorWindow->width() - 16;
+	webInspectorWindow->move(wi_x, webInspectorWindow->y());
 }
 
 bool QtMainWindow::isStarted(void)
@@ -173,6 +236,25 @@ void QtMainWindow::on_actionBack_triggered()
         ui->webView->back();
 }
 
+void QtMainWindow::on_actionRotateRight_triggered()
+{
+	this->resize(this->height(), this->width());
+	this->adjustWebInspector();
+	RHODESAPP().callScreenRotationCallback(this->width(), this->height(), 90);
+}
+
+void QtMainWindow::on_actionRotateLeft_triggered()
+{
+	this->resize(this->height(), this->width());
+	this->adjustWebInspector();
+	RHODESAPP().callScreenRotationCallback(this->width(), this->height(), -90);
+}
+
+void QtMainWindow::on_actionRotate180_triggered()
+{
+	RHODESAPP().callScreenRotationCallback(this->width(), this->height(), 180);
+}
+
 bool QtMainWindow::internalUrlProcessing(const QUrl& url)
 {
     int ipos;
@@ -200,7 +282,7 @@ void QtMainWindow::on_webView_linkClicked(const QUrl& url)
 {
     QString sUrl = url.toString();
     if (sUrl.contains("rho_open_target=_blank")) {
-        if (cb) cb->logEvent("WebView: open external browser");
+        LOG(INFO) + "WebView: open external browser";
         ExternalWebView* externalWebView = new ExternalWebView();
         externalWebView->navigate(QUrl(sUrl.remove("rho_open_target=_blank")));
         externalWebView->show();
@@ -210,8 +292,8 @@ void QtMainWindow::on_webView_linkClicked(const QUrl& url)
             sUrl.remove(QRegExp("#+$"));
             if (sUrl.compare(ui->webView->url().toString())!=0) {
 #ifdef OS_MACOSX
-                if (cb && !sUrl.startsWith("javascript:", Qt::CaseInsensitive))
-                    cb->onWebViewUrlChanged(sUrl.toStdString());
+                if (mainWindowCallback && !sUrl.startsWith("javascript:", Qt::CaseInsensitive))
+                    mainWindowCallback->onWebViewUrlChanged(sUrl.toStdString());
 #endif
                 ui->webView->load(QUrl(sUrl));
             }
@@ -221,35 +303,71 @@ void QtMainWindow::on_webView_linkClicked(const QUrl& url)
 
 void QtMainWindow::on_webView_loadStarted()
 {
-    if (cb) cb->logEvent("WebView: loading...");
+	if (firstShow && RHOCONF().getBool("full_screen")) {
+		firstShow = false;
+		fullscreenCommand(1);
+	}
+    LOG(INFO) + "WebView: loading...";
+    PROF_START("BROWSER_PAGE");
 }
 
 void QtMainWindow::on_webView_loadFinished(bool ok)
 {
-    if (cb) {
-        cb->logEvent((ok?"WebView: loaded ":"WebView: failed "));
+    if (ok)
+        LOG(INFO) + "Page load complete.";
+    else
+        LOG(ERROR) + "Page load failed.";
+
+    PROF_STOP("BROWSER_PAGE");
+
 #ifdef OS_MACOSX
-        if (ok) cb->onWebViewUrlChanged(ui->webView->url().toString().toStdString());
+    if (mainWindowCallback && ok) mainWindowCallback->onWebViewUrlChanged(ui->webView->url().toString().toStdString());
 #endif
+
+    if ( m_bFirstLoad )
+    {
+        if ( ui->webView->url().toString() != "about:blank" )
+        {
+            long lMS = RHODESAPP().getSplashScreen().howLongWaitMs();
+            if ( lMS > 0 )
+                m_SplashTimer.start(lMS, this);
+            else
+            {
+                m_bFirstLoad = false;
+                main_webView->show();
+            }
+        }
     }
+
+}
+
+void QtMainWindow::timerEvent(QTimerEvent *event)
+{
+    if (event->timerId() == m_SplashTimer.timerId()) 
+    {
+        m_bFirstLoad = false;
+        main_webView->show();
+     } else {
+         QWidget::timerEvent(event);
+     }
 }
 
 void QtMainWindow::on_webView_urlChanged(QUrl url)
 {
-    if (cb) {
+    if (mainWindowCallback) {
 #ifdef OS_MACOSX
         ::std::string sUrl = url.toString().toStdString();
-        cb->logEvent("WebView: URL changed to " + sUrl);
-        cb->onWebViewUrlChanged(sUrl);
+        LOG(INFO) + "WebView: URL changed to " + sUrl;
+        mainWindowCallback->onWebViewUrlChanged(sUrl);
 #else
-        cb->logEvent("WebView: URL changed");
+        LOG(INFO) + "WebView: URL changed";
 #endif
     }
 }
 
 void QtMainWindow::on_menuMain_aboutToShow()
 {
-    if (cb) cb->createCustomMenu();
+    if (mainWindowCallback) mainWindowCallback->createCustomMenu();
 }
 
 void QtMainWindow::navigate(QString url, int index)
@@ -258,11 +376,11 @@ void QtMainWindow::navigate(QString url, int index)
     if (wv) {
         if (url.startsWith("javascript:", Qt::CaseInsensitive)) {
             url.remove(0,11);
-            wv->stop();
+            //wv->stop();
             wv->page()->mainFrame()->evaluateJavaScript(url);
         } else if (!internalUrlProcessing(url)) {
 #ifdef OS_MACOSX
-            if (cb) cb->onWebViewUrlChanged(url.toStdString());
+            if (mainWindowCallback) mainWindowCallback->onWebViewUrlChanged(url.toStdString());
 #endif
             wv->load(QUrl(url));
         }
@@ -286,7 +404,7 @@ void QtMainWindow::Refresh(int index)
     QWebView* wv = (index < tabViews.size()) && (index >= 0) ? tabViews[index] : ui->webView;
     if (wv) {
 #ifdef OS_MACOSX
-        if (cb) cb->onWebViewUrlChanged(wv->url().toString().toStdString());
+        if (mainWindowCallback) mainWindowCallback->onWebViewUrlChanged(wv->url().toString().toStdString());
 #endif
         wv->reload();
     }
@@ -595,15 +713,21 @@ void QtMainWindow::menuActionEvent(bool checked)
 {
     QObject* sender = QObject::sender();
     QAction* action;
-    if (sender && (action = dynamic_cast<QAction*>(sender)) && cb)
-        cb->onCustomMenuItemCommand(action->data().toInt());
+    if (sender && (action = dynamic_cast<QAction*>(sender)) && mainWindowCallback)
+        mainWindowCallback->onCustomMenuItemCommand(action->data().toInt());
 }
 
 void QtMainWindow::on_actionAbout_triggered()
 {
-    #ifndef RHO_SYMBIAN
+#ifndef RHO_SYMBIAN
+#ifdef RHODES_EMULATOR
     QMessageBox::about(this, RHOSIMULATOR_NAME, RHOSIMULATOR_NAME " v" RHOSIMULATOR_VERSION);
-    #endif
+#else
+    QMessageBox::about(this, APPLICATION_NAME, APPLICATION_NAME " v" APPLICATION_VERSION);
+
+#endif
+
+#endif
 }
 
 // slots:
@@ -824,7 +948,8 @@ void QtMainWindow::takeSignature(void*) //TODO: Signature::Params*
 
 void QtMainWindow::fullscreenCommand(int enable)
 {
-    //TODO: fullscreenCommand
+    if ((enable && !isMaximized()) || (!enable && isMaximized()))
+        setWindowState(windowState() ^ Qt::WindowMaximized);
     LOG(INFO) + (enable ? "Switched to Fullscreen mode" : "Switched to Normal mode" );
 }
 
@@ -842,3 +967,22 @@ void QtMainWindow::bringToFront()
     this->raise();
     this->activateWindow();
 }
+
+// Window frame
+void QtMainWindow::setFrame(int x, int y, int width, int height)
+{
+    this->move(x, y);
+    this->resize(width, height);
+    this->adjustWebInspector();
+}
+
+void QtMainWindow::setPosition(int x, int y)
+{
+    this->move(x, y);
+}
+
+void QtMainWindow::setSize(int width, int height)
+{
+    this->resize(width, height);
+    this->adjustWebInspector();
+}