rhodes 5.5.2 → 5.5.15

data/lib/commonAPI/coreapi/public/api/rhoapi.js

@@ -497,7 +497,7 @@ var Rho = Rho || (function ($) {
     };
 
     (function propertySupportCheck() {
-        propsSupport.ffHackKeywords = (function supported_firefoxHack_keywords() {
+/*        propsSupport.ffHackKeywords = (function supported_firefoxHack_keywords() {
             var testObj = {};
             var okGet = false;
             var okSet = false;
@@ -514,7 +514,7 @@ var Rho = Rho || (function ($) {
                 testObj.propSet = testObj.propGet;
             } catch (ex) {};
             return okGet && okSet;
-        })();
+        })();*/
 
         propsSupport.ffHackMethod = (function supported_firefoxHack_method() {
             var testObj = {};
@@ -1047,7 +1047,8 @@ var Rho = Rho || (function ($) {
     });
 
     addBridge(rhoPlatform.id.WM, function() {
-        var bridge = new WebkitBridge();
+        var bridgeClass = typeof(WebkitBridge) !== "undefined" ? WebkitBridge : IEBridge;
+        var bridge = new bridgeClass();
         return {
             apiCall: function (cmdText, async, resultHandler) {
                 var apiResult = bridge.framework(cmdText);
@@ -1056,6 +1057,7 @@ var Rho = Rho || (function ($) {
         }
     });
 
+
     addBridge(rhoPlatform.id.RHOSIMULATOR, function() {
         return {
             apiCall: function (cmdText, async, resultHandler) {
@@ -1096,6 +1098,7 @@ var Rho = Rho || (function ($) {
         [/iPhone|iPod|iPad/                , bridges[rhoPlatform.id.IPHONE]      ],
         [/Windows\s+Phone/                 , bridges[rhoPlatform.id.WP8]         ],
         [/Windows\s+(?:Mobile|CE)|WM [0-9]/, bridges[rhoPlatform.id.WM]          ],
+        [/MSIE/                            , bridges[rhoPlatform.id.WM]          ],
         [/Windows/                         , bridges[rhoPlatform.id.WIN32]       ]
     ];
 

data/lib/commonAPI/mediacapture/ext.yml

@@ -19,11 +19,10 @@ wp8:
 project_paths:
   wp8: ext/platform/wp8/Mediacapture.vcxproj
   wm: ext/platform/wm/Mediacapture.vcproj
-  win32: ext/platform/wm/Mediacapture.vcproj
   
 xml_api_paths: ext/camera.xml, ext/videocapture.xml
 
-platforms: ["wm", "iphone", "android", "wp8"]
+platforms: ["wm", "iphone", "android", "wp8", "win32"]
 
 wm:
   files:

data/lib/commonAPI/mediacapture/ext/build.bat

@@ -13,6 +13,14 @@ rake --trace
 
 )
 
+if "%RHO_PLATFORM%" == "win32" (
+
+call "%RHO_VSCMNTOOLS%..\..\VC\vcvarsall.bat" x86
+cd platform\qt
+rake --trace
+
+)
+
 if "%RHO_PLATFORM%" == "bb" (
 
 cd platform\bb

data/lib/commonAPI/mediacapture/ext/platform/qt/MediaCapture.pro

@@ -0,0 +1,82 @@
+QT += multimedia gui widgets multimediawidgets webkitwidgets core network webkit
+
+TARGET = Mediacapture
+TEMPLATE = lib
+CONFIG += staticlib warn_on
+
+isEmpty(RHODES_ROOT) {
+   RHODES_ROOT = ../../../../../..
+}
+
+INCLUDEPATH += \
+$$RHODES_ROOT/lib/commonAPI/coreapi/ext/shared\
+$$RHODES_ROOT/platform/shared/common\
+$$RHODES_ROOT/platform/shared/rubyext\
+$$RHODES_ROOT/platform/shared/ruby/include\
+$$RHODES_ROOT/platform/shared\
+../../shared\
+
+macx {
+  DESTDIR = $$RHODES_ROOT/platform/osx/bin/extensions
+  OBJECTS_DIR = $$RHODES_ROOT/platform/osx/bin/extensions/mediacapture
+  INCLUDEPATH += $$RHODES_ROOT/platform/shared/ruby/iphone
+}
+win32 {
+  DESTDIR = $$RHODES_ROOT/platform/win32/bin/extensions
+  OBJECTS_DIR = $$RHODES_ROOT/platform/win32/bin/extensions/mediacapture 
+  DEFINES += WIN32 _WINDOWS _LIB _UNICODE UNICODE
+  debug {
+    DEFINES += _DEBUG DEBUG
+  }
+  release {
+    DEFINES += _NDEBUG NDEBUG
+  }
+  INCLUDEPATH += $$RHODES_ROOT/platform/shared/ruby/win32
+  RCC_DIR = $$RHODES_ROOT/lib/commonAPI/mediacapture/ext/platform/qt/resources
+}
+
+DEFINES += RHODES_QT_PLATFORM _XOPEN_SOURCE _DARWIN_C_SOURCE
+
+!isEmpty(RHOSIMULATOR_BUILD) {
+  DEFINES += RHODES_EMULATOR
+}
+
+!win32 {
+  QMAKE_CFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
+}
+win32 {
+  QMAKE_CFLAGS_WARN_ON += /wd4996 /wd4100 /wd4005
+  QMAKE_CXXFLAGS_WARN_ON += /wd4996 /wd4100 /wd4005
+  QMAKE_CFLAGS_RELEASE += /O2
+  QMAKE_CXXFLAGS_RELEASE += /O2
+
+  QMAKE_CXXFLAGS_RELEASE += -MP9
+  QMAKE_CXXFLAGS_DEBUG += -MP9
+}
+
+
+
+HEADERS += \
+..\..\shared\generated\cpp\ICamera.h\
+..\..\shared\generated\cpp\CameraBase.h \
+    src/CCameraData.h \
+    src/ImageFileNameGetter.h \
+    src/ImageFilenameGetterResult.h \
+    src/CameraDialogController.h \
+    src/CameraDialogView.h \
+    src/CameraDialogBuilder.h
+
+SOURCES += \
+..\..\shared\MediacaptureInit.cpp\
+..\..\shared\generated\cpp\Camera_js_wrap.cpp\
+..\..\shared\generated\cpp\Camera_ruby_wrap.cpp\
+..\..\shared\generated\cpp\CameraBase.cpp\
+..\..\shared\generated\Camera_api_init.cpp\
+..\..\shared\generated\Camera_js_api.cpp\
+..\..\shared\generated\Camera_ruby_api.c\
+src\Camera_impl.cpp \
+    src/CCameraData.cpp \
+    src/CameraDialogView.cpp
+
+RESOURCES += $$RHODES_ROOT/lib/commonAPI/mediacapture/ext/platform/qt/resources/mediacapture.qrc

data/lib/commonAPI/mediacapture/ext/platform/qt/Rakefile

@@ -0,0 +1,35 @@
+def build_extension(name)
+  require File.join($rootdir, 'lib/build/jake.rb')
+  args = ['-o', 'Makefile', '-r', '-spec', $qmake_spec, "#{name}.pro", 'CONFIG-=debug', 'CONFIG+=release', 'CONFIG+=no_fixpath', "RHODES_ROOT='#{$rootdir}'", $qmakevars]
+  puts Jake.run($qmake,args)
+  fail "[qmake #{name}.pro]" unless $? == 0
+  #puts Jake.run($make, ['clean'])
+  fail "[make clean]" unless $? == 0
+  puts Jake.run($make, ['all'])
+  fail "[make all]" unless $? == 0
+end
+
+namespace "build" do
+  task :config do
+    $platform = ENV['RHO_PLATFORM']
+    raise "RHO_PLATFORM is not set" if $platform.nil?
+    $rootdir = ENV['RHO_ROOT']
+    raise "RHO_ROOT is not set" if $rootdir.nil?
+    $qmake = ENV['RHO_QMAKE']
+    raise "RHO_QMAKE is not set" if $qmake.nil?
+    $qmake_spec = ENV['RHO_QMAKE_SPEC']
+    raise "RHO_QMAKE_SPEC is not set" if $qmake_spec.nil?
+    $qmakevars = ENV['RHO_QMAKE_VARS']
+    if $platform == 'win32'
+      $make = 'nmake'
+    else
+      $make = 'make'
+    end
+  end
+
+  task :all => :config do
+    build_extension('Mediacapture')
+  end
+end
+
+task :default => "build:all"

data/lib/commonAPI/mediacapture/ext/platform/qt/resources/mediacapture.qrc

@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="mcimages">
+        <file>diaClosed.png</file>
+		<file>diaOpened.png</file>
+		<file>photoSave.png</file>
+    </qresource>
+</RCC>

data/lib/commonAPI/mediacapture/ext/platform/qt/src/CCameraData.cpp

@@ -0,0 +1,83 @@
+#include "CCameraData.h"
+
+QHash<QString, CCameraData *> CCameraData::camerasKeeper;
+
+QMutex *CCameraData::getMutex()
+{
+    static QMutex mutex;
+    return & mutex;
+}
+CCameraData::CCameraData():CameraDialogController(0)
+{
+    cameraType.clear();
+    cameraID.clear();
+}
+
+const QString CCameraData::getCameraType() const
+{
+    return cameraType;
+}
+
+const QString CCameraData::getCameraID() const
+{
+    return cameraID;
+}
+
+const QList<QString> CCameraData::getKeys()
+{
+    return camerasKeeper.keys();
+}
+
+
+const CCameraData *CCameraData::addNewCamera(QCameraInfo &info){
+    CCameraData * data = new CCameraData(info);
+    camerasKeeper.insert(data->getCameraID(), data);
+    return data;
+}
+
+
+void CCameraData::cleanAll(){
+QMutexLocker locker(getMutex());
+    foreach (CCameraData * cameraData, camerasKeeper) {
+        cameraData->deleteLater();
+        camerasKeeper.clear();
+    }
+}
+
+const bool CCameraData::isEmpty()
+{
+    return camerasKeeper.isEmpty();
+}
+
+CCameraData *CCameraData::getCameraData(QString &ID)
+{
+    QMutexLocker locker(getMutex());
+    if(camerasKeeper.contains(ID)){return camerasKeeper.value(ID);
+    }else{return nullptr;}
+}
+
+
+CCameraData::CCameraData(QCameraInfo &info):CameraDialogController(0){
+    this->info = info;
+    cameraID = QString::number(camerasKeeper.size() + 1);
+    if (info.position() == QCamera::BackFace){cameraType = "back";}
+    else{cameraType = "front";}
+}
+
+
+void CCameraData::showView(rho::apiGenerator::CMethodResult &oResult)
+{
+    if (dialogExists()) return;
+    CameraDialogBuilder * builder = new CameraDialogBuilder(this, info, oResult, getQMainWindow());
+    emit builder->run();
+}
+
+QtMainWindow *CCameraData::getQMainWindow()
+{
+    return ((QtMainWindow *) CMainWindow::getInstance()->getQtMainWindow());
+}
+
+void CCameraData::choosePicture(rho::apiGenerator::CMethodResult& oResult) {
+    ImageFileNameGetter * getter = new ImageFileNameGetter(QThread::currentThread(),oResult,getQMainWindow());
+    getter->run();
+}

data/lib/commonAPI/mediacapture/ext/platform/qt/src/CCameraData.h

@@ -0,0 +1,54 @@
+#ifndef CCAMERADATA_H
+#define CCAMERADATA_H
+#include <QObject>
+#include <QCameraInfo>
+#include <QCamera>
+#include <QMultimedia>
+#include <QMediaRecorder>
+#include <QCameraImageCapture>
+#include <QEventLoopLocker>
+#include <QThread>
+#include <QMutex>
+#include <QMutexLocker>
+#include "../../platform/shared/qt/rhodes/QtMainWindow.h"
+#include "../../platform/shared/qt/rhodes/impl/MainWindowImpl.h"
+#include "../../platform/shared/qt/rhodes/iexecutable.h"
+#include "ImageFileNameGetter.h"
+#include "CameraDialogController.h"
+#include "CameraDialogBuilder.h"
+
+class CCameraData : public CameraDialogController{
+    Q_OBJECT
+private:
+    QString cameraType;
+    QString cameraID;
+    QCameraInfo info;
+
+    CCameraData();
+    CCameraData(QCameraInfo &info);
+
+    static QHash<QString, CCameraData *> camerasKeeper;
+
+public:
+    ~CCameraData() {cleanAll();}
+    static const CCameraData *addNewCamera(QCameraInfo &info);
+    static void cleanAll();
+    static const QList<QString> getKeys();
+    static const bool isEmpty();
+    static CCameraData *getCameraData(QString &ID);
+
+    const QString getCameraType() const;
+    const QString getCameraID() const;
+
+    void takeAPicture(rho::apiGenerator::CMethodResult &oResult);
+    static QMutex * getMutex();
+
+    void showView(rho::apiGenerator::CMethodResult &oResult);
+    static QtMainWindow *getQMainWindow();
+    static void choosePicture(rho::apiGenerator::CMethodResult &oResult);
+public slots:
+
+
+};
+
+#endif // CCAMERADATA_H

data/lib/commonAPI/mediacapture/ext/platform/qt/src/CameraDialogBuilder.h

@@ -0,0 +1,36 @@
+#ifndef CAMERADIALOGBUILDER_H
+#define CAMERADIALOGBUILDER_H
+
+#include "../../platform/shared/qt/rhodes/iexecutable.h"
+#include "CameraDialogView.h"
+#include "CameraDialogController.h"
+
+class CameraDialogBuilder : public IExecutable
+{
+    Q_OBJECT
+private:
+    CameraDialogController * controller;
+    QCameraInfo info;
+    QWidget * parentWidget;
+    rho::apiGenerator::CMethodResult oResult;
+public:
+    explicit CameraDialogBuilder(CameraDialogController * controller, QCameraInfo &info,
+                                 rho::apiGenerator::CMethodResult &oResult, QWidget *parent) : IExecutable(parent){
+        this->controller = controller;
+        this->info = info;
+        this->oResult = oResult;
+        parentWidget = parent;
+    }
+
+public slots:
+    void execute(){
+        CameraDialogView * dialog = new CameraDialogView(info, oResult, controller, parentWidget);
+        connect(parentWidget, SIGNAL(destroyed(QObject*)), dialog, SLOT(reject()));
+        connect(parentWidget, SIGNAL(destroyed(QObject*)), dialog, SLOT(deleteLater()));
+        dialog->show();
+        controller->setDialogExists();
+        deleteLater();
+    }
+};
+
+#endif // CAMERADIALOGBUILDER_H

data/lib/commonAPI/mediacapture/ext/platform/qt/src/CameraDialogController.h

@@ -0,0 +1,31 @@
+#ifndef CAMERADIALOGCONTROLLER_H
+#define CAMERADIALOGCONTROLLER_H
+
+#include <QObject>
+#include <QDebug>
+#include <QMutex>
+#include <QMutexLocker>
+
+class CameraDialogController : public QObject
+{
+    Q_OBJECT
+protected:
+    volatile bool exists;
+    QMutex mutex;
+
+public:
+    explicit CameraDialogController(QObject *parent):QObject(parent){
+        exists = false;
+    }
+    virtual ~CameraDialogController(){
+
+    }
+
+    volatile bool dialogExists(){return exists;}
+public slots:
+    void setDialogExists(){exists = true;}
+    void setDialogRejected(){exists = false;}
+
+};
+
+#endif // CAMERADIALOGCONTROLLER_H

data/lib/commonAPI/mediacapture/ext/platform/qt/src/CameraDialogView.h

@@ -0,0 +1,73 @@
+#ifndef CAMERADIALOGVIEW_H
+#define CAMERADIALOGVIEW_H
+
+#include <QDialog>
+#include <QCamera>
+#include <QVBoxLayout>
+#include <QDebug>
+#include <QVideoWidget>
+#include <QEventLoop>
+#include <QThread>
+#include <QDebug>
+#include <QFileInfo>
+#include <QCameraFocus>
+#include <QCameraExposure>
+#include <QImageEncoderSettings>
+#include <QDir>
+#include <QCameraImageCapture>
+#include <QCameraInfo>
+#include <QPushButton>
+#include <QImage>
+#include <QPixmap>
+#include <QLabel>
+#include <QHBoxLayout>
+#include <QTime>
+#include <QDate>
+#include <QTimer>
+#include <QIcon>
+#include "../../../../../platform/shared/api_generator/MethodResult.h"
+#include "../../../../../platform/shared/common/RhoStd.h"
+#include "../../platform/shared/qt/rhodes/QtMainWindow.h"
+#include "../../platform/shared/qt/rhodes/impl/MainWindowImpl.h"
+#include "../../platform/shared/qt/rhodes/iexecutable.h"
+#include "CameraDialogController.h"
+#include <QtPlugin>
+#include <QPluginLoader>
+#include <QJsonObject>
+
+
+class CameraDialogView : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit CameraDialogView(QCameraInfo & info, rho::apiGenerator::CMethodResult &oResult,
+                              CameraDialogController * controller, QWidget *parent);
+    ~CameraDialogView();
+
+    static void getImageData(rho::Hashtable<rho::String, rho::String> & mapRes, const QString &fileNameToOpen);
+    static QDir getImageDir();
+private:
+    QVideoWidget * videoWidget;
+    rho::apiGenerator::CMethodResult oResult;
+    QCameraImageCapture * imageCapture;
+    QCamera * camera;
+    CameraDialogController * controller;
+    QLabel * laPreview;
+    QImage currentImage;
+    bool imageIsSaved;
+    QTimer timerToRestoreCaptureButtonImage;
+    QIcon imageCaptureClose;
+    QIcon imageCaptureOpened;
+    QIcon imageSave;
+    QPushButton * buttonCapture;
+public slots:
+    void imageSaved(int id, const QString &fileName);
+    void error();
+    void capture();
+    void imageCaptured(int id, const QImage &preview);
+    void saveCurrentImage();
+    void restoreCaptureButtonImage();
+
+};
+
+#endif // CAMERADIALOGVIEW_H