rhodes 5.5.15 → 5.5.17

data/platform/shared/common/RhodesApp.h

@@ -147,6 +147,8 @@ private:
     boolean m_bExit, m_bRestartServer;
 
     String m_strListeningPorts;
+    String m_strNodeJSListeningPorts;
+    int m_nNodeJSListeningPorts;
 
     common::CAutoPtr<net::CHttpServer> m_httpServer;
     CSplashScreen m_oSplashScreen;
@@ -270,6 +272,7 @@ public:
 
     void notifyLocalServerStarted();
     const char* getFreeListeningPort();
+    const char* getNodeJSListeningPort();
     int determineFreeListeningPort();
 	
     void setNetworkStatusNotify(const apiGenerator::CMethodResult& oResult, int poll_interval);
@@ -284,6 +287,7 @@ public:
     bool isLocalServerRunning() { return ( (m_httpServer) && (m_httpServer->started()) ); }
   
     unsigned int getLocalServerPort() { return (m_httpServer!=0)?(m_httpServer->getPort()):0; }
+    unsigned int getNodeJSServerPort() { return m_nNodeJSListeningPorts; }
 #ifdef OS_MACOSX
     String directHttpRequest( const String& method, const String& uri, const String& query, const rho::net::HttpHeaderList& headers, const String& body ) {  return m_httpServer->directRequest(method, uri, query, headers, body ); }
 #endif
@@ -359,6 +363,8 @@ void rho_http_free(void* data);
 
 int rho_http_started();
 int rho_http_get_port();
+int rho_nodejs_get_port();
+    
 
 #ifdef OS_MACOSX
 const char* rho_http_direct_request( const char* method, const char* uri, const char* query, const void* headers, const char* body, int bodylen, int* responseLength );
@@ -414,6 +420,7 @@ void rho_platform_restart_application();
 void rho_sys_set_network_status_notify(const char* url, int poll_interval);
 void rho_sys_clear_network_status_notify();
 int rho_rhodesapp_is_application_active();
+int rho_rhodesapp_is_nodejs_app();
     
 #ifdef __cplusplus
 };

data/platform/shared/common/RhodesAppBase.cpp

@@ -76,6 +76,10 @@ CRhodesAppBase::CRhodesAppBase(const String& strRootPath, const String& strUserP
     m_bJSApplication   = false;
 #endif
 
+    const char* nodejs_app = get_app_build_config_item("nodejs_application");
+    
+    m_bNodeJSApplication = nodejs_app && (strcmp(nodejs_app,"true") == 0);
+    
     initAppUrls();
 }
 	
@@ -351,7 +355,7 @@ int rho_sys_unzip_file(const char* szZipPath, const char* psw, const char* outpu
   case RHO_ZIP_FORMAT_ZIP:  return rho_internal_unzip_zip(szZipPath, psw); break;
   case RHO_ZIP_FORMAT_GZIP: return rho_internal_unzip_gzip(szZipPath, outputFilename); break;
   }
-  
+
   return -1;
 }
 

data/platform/shared/common/RhodesAppBase.h

@@ -33,6 +33,8 @@
 #include "common/IRhoClassFactory.h"
 #include "push/RhoPushManager.h"
 #include "api_generator/MethodResult.h"
+#include "common/app_build_capabilities.h"
+#include "common/app_build_configs.h"
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "RhodesApp"
@@ -62,6 +64,7 @@ protected:
     String m_strPushCallback, m_strPushCallbackParams;
     PushManager m_appPushMgr;
     bool m_bJSApplication;
+    bool m_bNodeJSApplication;
 
     CRhodesAppBase(const String& strRootPath, const String& strUserPath, const String& strRuntimePath);
 public:
@@ -92,7 +95,11 @@ public:
 	
     void setJSApplication(bool bJSApp){ m_bJSApplication = bJSApp; }
     bool isJSApplication()const{ return m_bJSApplication; }
-	// Deprecated
+
+    void setNodeJSApplication(bool bJSApp){ m_bNodeJSApplication = bJSApp; }
+    bool isNodeJSApplication()const{ return m_bNodeJSApplication; }
+
+    // Deprecated
     boolean callPushCallback(const String& strData) const;
 
 protected:

data/platform/shared/common/ThreadQueue.h

@@ -55,7 +55,7 @@ public:
         virtual void execute(){}
     };
 
-private:
+protected:
 
 	int           m_nPollInterval;
    	common::CMutex m_mxStackCommands;

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

@@ -37,6 +37,8 @@
 #include "common/RhoFile.h"
 #include "net/INetRequest.h"
 
+#include <algorithm>
+
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "BaseMapEngine"

data/platform/shared/net/HttpServer.cpp

@@ -554,7 +554,6 @@ bool CHttpServer::run()
         tv.tv_sec = nTimeout/1000;
         tv.tv_usec = (nTimeout - tv.tv_sec*1000)*1000;
         
-        
         int ret = select(m_listener+1, &readfds, NULL, NULL, (tv.tv_sec == 0 && tv.tv_usec == 0 ? 0 : &tv) );
         
         //int errsv = errno;

data/platform/shared/qt/RhoSimulator.pro

@@ -1,5 +1,16 @@
+    greaterThan(QT_VERSION, 5.6.0): {
+        CONFIG += c++14
+        DEFINES += CPP_ELEVEN
+        DEFINES += RHODES_VERSION_2
+    }
+
+    lessThan(QT_VERSION, 5.6.0): {
+        DEFINES += RHODES_VERSION_1
+    }
+
 TEMPLATE = subdirs
 SUBDIRS = rubylib rholib sqlite3 syncengine
+
 unix:!macx {
  # SUBDIRS += curl
 }

data/platform/shared/qt/RhoSimulator_dev.pro

@@ -1,3 +1,12 @@
+    greaterThan(QT_VERSION, 5.6.0): {
+        CONFIG += c++14
+        DEFINES += CPP_ELEVEN
+        DEFINES += RHODES_VERSION_2
+    }
+
+    lessThan(QT_VERSION, 5.6.0): {
+        DEFINES += RHODES_VERSION_1
+    }
 TEMPLATE = subdirs
 SUBDIRS = rubylib rholib sqlite3 syncengine \
 ../../../lib/commonAPI/coreapi/ext/platform/qt/coreapi.pro \
@@ -10,8 +19,9 @@ SUBDIRS = rubylib rholib sqlite3 syncengine \
 #../../../lib/extensions/fcntl/ext/fcntl.pro \
 #../../../lib/extensions/openssl/ext/openssl.pro \
 #../../../lib/extensions/serialport/ext/serialport.pro \
-../../../lib/extensions/zlib/ext/zlib.pro\
-../../../lib/commonAPI/mediacapture/ext/platform/qt/MediaCapture.pro
+../../../lib/extensions/zlib/ext/zlib.pro \
+../../../lib/commonAPI/mediacapture/ext/platform/qt/MediaCapture.pro #\
+#../../../lib/commonAPI/barcode/ext/platform/qt/Barcode.pro
 
 unix:!macx {
  # SUBDIRS += curl

data/platform/shared/qt/curl/curl.pro

@@ -1,5 +1,13 @@
 QT -= core
+    greaterThan(QT_VERSION, 5.6.0): {
+        CONFIG += c++14
+        DEFINES += CPP_ELEVEN
+        DEFINES += RHODES_VERSION_2
+    }
 
+    lessThan(QT_VERSION, 5.6.0): {
+        DEFINES += RHODES_VERSION_1
+    }
 TARGET = curl
 TEMPLATE = lib
 
@@ -53,6 +61,8 @@ DEFINES += RHODES_QT_PLATFORM _XOPEN_SOURCE _DARWIN_C_SOURCE
 win32 {
   QMAKE_CFLAGS_WARN_ON += /wd4101 /wd4005
   QMAKE_CFLAGS_RELEASE += /O2
+  QMAKE_CXXFLAGS_RELEASE += -MP9
+  QMAKE_CXXFLAGS_DEBUG += -MP9
 }
 
 HEADERS += ../../curl/lib/arpa_telnet.h\

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

@@ -0,0 +1,29 @@
+#ifndef GUITHREADFUNCHELPER_H
+#define GUITHREADFUNCHELPER_H
+
+#include <QObject>
+#include <QCameraInfo>
+#include <QDebug>
+#include <QMetaObject>
+
+class GuiThreadFuncHelper : public QObject
+{
+    Q_OBJECT
+
+    explicit GuiThreadFuncHelper(QObject *parent = 0):QObject(parent){}
+public:
+    static GuiThreadFuncHelper * getInstance(QObject *parent = 0){
+        static GuiThreadFuncHelper instance(parent);
+        return &instance;
+    }
+
+signals:
+
+public slots:
+    void availableCameras(QObject * getter){
+        QMetaObject::invokeMethod(getter, "availableCameras", Qt::QueuedConnection,
+        Q_ARG(QList<QCameraInfo>, QCameraInfo::availableCameras()));
+    }
+};
+
+#endif // GUITHREADFUNCHELPER_H

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

@@ -4,6 +4,8 @@
 #include <QObject>
 #include <QThread>
 #include <QDebug>
+#include <QMainWindow>
+#include <QApplication>
 
 class IExecutable : public QObject
 {
@@ -16,6 +18,13 @@ public:
         connect(this, SIGNAL(run()), this, SLOT(execute()), Qt::QueuedConnection);
         qDebug() << "Creating Executable in thred ID 0x" + QString::number((quint32)QThread::currentThreadId(), 16);
     }
+    static QMainWindow * getMainWindow(){
+        foreach (QWidget * widget, qApp->topLevelWidgets()) {
+            if (widget->inherits("QMainWindow")) return qobject_cast<QMainWindow *>(widget);
+        }
+        return nullptr;
+    }
+
     virtual ~IExecutable(){}
 
 signals:

data/platform/shared/qt/rhodes/impl/MainWindowImpl.cpp

@@ -41,7 +41,7 @@
 #include <QtGui/QAction>
 #endif
 #include <QHash>
-#include "../QtMainWindow.h"
+#include "../mainwindowinterface.h"
 
 IMPLEMENT_LOGCLASS(CMainWindow,"MainWindow");
 
@@ -56,32 +56,27 @@ int CMainWindow::m_screenHeight;
 
 bool CMainWindow::mainWindowClosed = false;
 
-CMainWindow::CMainWindow():
-    QObject(),
-    m_started(true),
-    qtMainWindow(NULL)
+CMainWindow::CMainWindow(): QObject(), m_started(true), qtMainWindow(NULL)
 {
-    int argc = 0;
+    //int argc = 0;
     QCoreApplication::setOrganizationName("Rhomobile");
 #ifndef RHODES_EMULATOR
     QCoreApplication::setApplicationName(RHODESAPP().getAppName().c_str());
 #else
     QCoreApplication::setApplicationName("RhoSimulator");
 #endif
-    qtApplication = (void*)new QApplication(argc, 0);
+    //qtApplication = (void*)new QApplication(argc, 0);
 }
 
 CMainWindow::~CMainWindow()
 {
     if (qtMainWindow) delete (QtMainWindow*)qtMainWindow;
-    if (qtApplication) delete (QApplication*)qtApplication;
+    //if (qtApplication) delete (QApplication*)qtApplication;
 }
 
 CMainWindow* CMainWindow::getInstance(void)
 {
-    static CMainWindow* instance = 0;
-    if (instance==0)
-        instance = new CMainWindow();
+    static CMainWindow* instance = new CMainWindow();
     return instance;
 }
 
@@ -117,18 +112,12 @@ void CMainWindow::createCustomMenu(void)
          RHODESAPP().getCurrentUrl().compare(strIndexPage) == 0 )
         m_arAppMenuItems.addElement(CAppMenuItem("Reload RhoBundle","reload_rhobundle"));
 #endif //ENABLE_DYNAMIC_RHOBUNDLE
-
     //update UI with custom menu items
     menuClear();
-    for ( unsigned int i = 0; i < m_arAppMenuItems.size(); i++)
-    {
+    for ( unsigned int i = 0; i < m_arAppMenuItems.size(); i++)  {
         CAppMenuItem& oItem = m_arAppMenuItems.elementAt(i);
-        if (oItem.m_eType == CAppMenuItem::emtSeparator) 
-            menuAddSeparator();
-        else
-        {
-            menuAddAction((oItem.m_strLink == "close" ? "Exit" : oItem.m_strLabel.c_str()), i, oItem.m_isEnable);
-        }
+        if (oItem.m_eType == CAppMenuItem::emtSeparator) { menuAddSeparator();}
+        else {menuAddAction((oItem.m_strLink == "close" ? "Exit" : oItem.m_strLabel.c_str()), i, oItem.m_isEnable);}
     }
 }
 
@@ -269,7 +258,7 @@ bool CMainWindow::init(IMainWindowCallback* callback, const wchar_t* title)
 
 void CMainWindow::messageLoop(void)
 {
-    ((QApplication*)qtApplication)->exec();
+    //((QApplication*)qtApplication)->exec();
 }
 
 bool CMainWindow::getFullScreen()

data/platform/shared/qt/rhodes/impl/MainWindowImpl.h

@@ -105,7 +105,7 @@ public:
 private:
     bool m_started;
     void* qtMainWindow;
-    void* qtApplication;
+    //void* qtApplication;
 
 private:
     static int m_screenWidth;

data/platform/shared/qt/rhodes/impl/QtSystemImpl.cpp

@@ -31,16 +31,23 @@
 #include "logging/RhoLog.h"
 #undef null
 #include <qglobal.h>
-#include <QWebPage>
+
 #include <QLocale>
 #include <QDesktopServices>
 #include <QMessageBox>
 #include "MainWindowImpl.h"
+#include <QUrl>
+#ifdef RHODES_VERSION_2
+#include <QtWebEngineVersion>
+#endif
+#ifdef RHODES_VERSION_1
+#include <QWebPage>
 #if QT_VERSION >= 0x050000
 #include <QtWebKit/qtwebkitversion.h>
 #else
 #include <QtWebKit/qwebkitversion.h>
 #endif
+#endif
 #include "../RhoSimulator.h"
 
 using namespace rho;
@@ -53,7 +60,14 @@ extern "C" {
 const char* rho_sys_qt_getWebviewFramework()
 {
     if (qt_webview_framework[0] == '\0') {
+
+        #ifdef RHODES_VERSION_1
         const QByteArray ver = QString("WEBKIT/").append(qWebKitVersion()).toLatin1();
+        #endif
+
+        #ifdef RHODES_VERSION_2
+        const QByteArray ver = QString("WEBENGINE/").append(QTWEBENGINE_VERSION_STR).toLatin1();
+        #endif
         if (ver.length() < 32) {
             strncpy(qt_webview_framework, ver.constData(), ver.length());
             qt_webview_framework[ver.length()] = '\0';

data/platform/shared/qt/rhodes/impl/RhoThreadImpl.cpp

@@ -182,7 +182,7 @@ int CRhoThreadImpl::wait(unsigned int nTimeoutMs)
 	}
 	else
 	{
-	LOG(TRACE) + "RHOQT wait-m_waitThread does not existdo not call stopWait";
+        LOG(TRACE) + "RHOQT wait-m_waitThread does not existdo not call stopWait";
 	}
 
 	LOG(TRACE) + "RHOQT wait-before m_waitThread->start";
@@ -194,15 +194,15 @@ int CRhoThreadImpl::wait(unsigned int nTimeoutMs)
 	
 	if(isVeyBigTimeoutvalue)
 	{
-	LOG(INFO) + "RHOQT wait-before wait for a long time nTimeoutMs:-  "+nTimeoutMs;
-	result = m_waitThread->wait(1000UL*nTimeoutMs) ? 0 : 1;
-	LOG(INFO) + "RHOQT wait-after wait for a long time Result:-  "+result;
+        LOG(INFO) + "RHOQT wait-before wait for a long time nTimeoutMs:-  "+nTimeoutMs;
+        result = m_waitThread->wait(1000UL*nTimeoutMs) ? 0 : 1;
+        LOG(INFO) + "RHOQT wait-after wait for a long time Result:-  "+result;
 	}
 	else
 	{
-	LOG(INFO) + "RHOQT wait-before wait for a short time nTimeoutMs:-  "+nTimeoutMs;
-	result = m_waitThread->wait(1UL*nTimeoutMs) ? 0 : 1;
-	LOG(INFO) + "RHOQT wait-after wait for a short time Result:-  "+result;
+        LOG(INFO) + "RHOQT wait-before wait for a short time nTimeoutMs:-  "+nTimeoutMs;
+        result = m_waitThread->wait(1UL*nTimeoutMs) ? 0 : 1;
+        LOG(INFO) + "RHOQT wait-after wait for a short time Result:-  "+result;
 	}
 
 

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

@@ -0,0 +1,12 @@
+#ifndef MAINWINDOWINTERFACE_H
+#define MAINWINDOWINTERFACE_H
+
+#endif // MAINWINDOWINTERFACE_H
+
+#ifdef RHODES_VERSION_1
+#include "oldVersion/QtMainWindow.h"
+#endif
+
+#ifdef RHODES_VERSION_2
+#include "newVersion/QtMainWindow.h"
+#endif

data/platform/shared/qt/rhodes/newVersion/DateTimeDialog.cpp

@@ -0,0 +1,96 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+#include "DateTimeDialog.h"
+#include <QDateTimeEdit>
+
+DateTimeDialog::DateTimeDialog(CDateTimeMessage* msg, QWidget *parent) : QDialog(parent){
+
+    if (msg->m_title && (strlen(msg->m_title) > 0))
+        this->setWindowTitle(QString(msg->m_title));
+
+    QDateTimeEdit* m_dte;
+    switch (m_type = msg->m_format) {
+    case CDateTimeMessage::FORMAT_DATE:
+        m_dte = new QDateEdit(this);
+        if (msg->m_min_time)
+            m_dte->setMinimumDate(QDateTime::fromTime_t(msg->m_min_time).date());
+        if (msg->m_max_time)
+            m_dte->setMaximumDate(QDateTime::fromTime_t(msg->m_max_time).date());
+        if (msg->m_initialTime)
+            m_dte->setDate(QDateTime::fromTime_t(msg->m_initialTime).date());
+        m_dte->setCalendarPopup(true);
+        //m_dte->setDisplayFormat(QLocale::system().dateFormat(QLocale::ShortFormat));
+        break;
+    case CDateTimeMessage::FORMAT_TIME:
+        m_dte = new QTimeEdit(this);
+        if (msg->m_min_time)
+            m_dte->setMinimumTime(QDateTime::fromTime_t(msg->m_min_time).time());
+        if (msg->m_max_time)
+            m_dte->setMaximumTime(QDateTime::fromTime_t(msg->m_max_time).time());
+        if (msg->m_initialTime)
+            m_dte->setTime(QDateTime::fromTime_t(msg->m_initialTime).time());
+        //m_dte->setDisplayFormat(QLocale::system().timeFormat(QLocale::ShortFormat));
+        break;
+    default: //case CDateTimeMessage::FORMAT_DATE_TIME:
+        m_dte = new QDateTimeEdit(this);
+        if (msg->m_min_time)
+            m_dte->setMinimumDateTime(QDateTime::fromTime_t(msg->m_min_time));
+        if (msg->m_max_time)
+            m_dte->setMaximumDateTime(QDateTime::fromTime_t(msg->m_max_time));
+        if (msg->m_initialTime)
+            m_dte->setDateTime(QDateTime::fromTime_t(msg->m_initialTime));
+        m_dte->setCalendarPopup(true);
+        //m_dte->setDisplayFormat(QLocale::system().dateTimeFormat(QLocale::ShortFormat));
+    }
+    //m_dte->move(20, 20);
+    QVBoxLayout * vblay = new QVBoxLayout(this);
+    vblay->addWidget(m_dte);
+    QDialogButtonBox * buttonBox = new QDialogButtonBox(this);
+    connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
+    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Preferred);
+
+    mv_dte = m_dte;
+}
+
+DateTimeDialog::~DateTimeDialog()
+{
+    delete (QDateTimeEdit*)mv_dte;
+}
+
+time_t DateTimeDialog::getUnixTime(void)
+{
+    QDateTimeEdit* m_dte = (QDateTimeEdit*)mv_dte;
+    switch (m_type) {
+    case CDateTimeMessage::FORMAT_DATE:
+        return QDateTime(m_dte->date()).toTime_t();
+    case CDateTimeMessage::FORMAT_TIME:
+        return QDateTime(QDateTime::fromTime_t(0).date(),m_dte->time()).toTime_t();
+    default: //case CDateTimeMessage::FORMAT_DATE_TIME:
+        return m_dte->dateTime().toTime_t();
+    }
+}