rhodes 6.2.0 → 7.1.17

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

@@ -27,7 +27,9 @@
 #include "common/RhoPort.h"
 #include "ext/rho/rhoruby.h"
 #include "common/RhodesApp.h"
+#ifndef RHODES_VERSION_LIBRARY
 #include "MainWindowImpl.h"
+#endif
 
 extern "C" {
 

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

@@ -29,7 +29,10 @@
 #include "rubyext/WebView.h"
 #include "common/RhodesApp.h"
 #include "common/StringConverter.h"
+
+#ifndef RHODES_VERSION_LIBRARY
 #include "MainWindowImpl.h"
+#endif
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "WebView"
@@ -49,11 +52,14 @@ extern "C" {
 
 void rho_webview_refresh(int index) 
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->refreshCommand(index);
+#endif
 }
 
 void rho_webview_navigate(const char* url, int index) 
 {
+#ifndef RHODES_VERSION_LIBRARY
     if ( !url )
     {
         RAWLOG_ERROR("WebView.navigate failed: url is nil");
@@ -66,28 +72,37 @@ void rho_webview_navigate(const char* url, int index)
     nd->index = index;
     nd->url = dup_wcs(convertToStringW(strUrl).c_str());
     CMainWindow::getInstance()->navigateCommand(nd);
+#endif
 }
 
 void rho_webview_navigate_back()
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->webviewNavigateBackCommand(-1);
+#endif
 }
 
 void rho_webview_navigate_back_with_tab(int index)
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->webviewNavigateBackCommand(index);
+#endif
 }
 
 void rho_webview_navigate_forward()
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->navigateForwardCommand();
+#endif
 }
 
 const char* rho_webview_execute_js(const char* js, int index) 
 {
+#ifndef RHODES_VERSION_LIBRARY
     String strJS = "javascript:";
     strJS += js;
     rho_webview_navigate(strJS.c_str(), index);
+#endif
     return "";
 }
 
@@ -105,22 +120,34 @@ const char* rho_webview_current_location(int index)
 
 int rho_webview_active_tab() 
 {
+ #ifndef RHODES_VERSION_LIBRARY
     return CMainWindow::getInstance()->tabbarGetCurrent();
+#else
+    return -1;
+#endif
 }
 
 void rho_webview_full_screen_mode(int enable)
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->fullscreenCommand(enable);
+#endif
 }
 
 int rho_webview_get_full_screen()
 {
+#ifndef RHODES_VERSION_LIBRARY
     return CMainWindow::getInstance()->getFullScreen() ? 1 : 0;
+#else
+    return -1;
+#endif
 }
 
 void rho_webview_set_cookie(const char *url, const char *cookie)
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->setCookie(url, cookie);
+#endif
 }
 
 void rho_webview_save(const char* format, const char* path, int tab_index)

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

@@ -1,5 +1,6 @@
 #include "notificationsound.h"
 
+#ifndef RHODES_VERSION_LIBRARY
 #include <QAudioOutput>
 #include <QPointer>
 #include <QBuffer>
@@ -7,9 +8,11 @@
 #include <QSound>
 #include <QEventLoop>
 #include <QTimer>
+#endif
 
 void NotificationSound::playSound()
 {
+#ifndef RHODES_VERSION_LIBRARY
     //QSound::play(":/sound/notification_sound.wav");
     //return;
     qreal frequency = ((sFrequency <= 0)?2000:sFrequency);
@@ -43,24 +46,33 @@ void NotificationSound::playSound()
     QEventLoop loop;
     QTimer::singleShot(mseconds*2, &loop, SLOT(quit()));
     loop.exec();
+#endif
 }
 
 void NotificationSound::beep()
 {
+#ifndef RHODES_VERSION_LIBRARY
     rho::Hashtable<rho::String, rho::String> propertyMap;
     beep(propertyMap);
+#endif
 }
 
-NotificationSound::NotificationSound(int frequency, int duration, int volume) : IExecutable(getMainWindow())
+NotificationSound::NotificationSound(int frequency, int duration, int volume)
+#ifndef RHODES_VERSION_LIBRARY
+    : IExecutable(getMainWindow())
+#endif
 {
+#ifndef RHODES_VERSION_LIBRARY
     sFrequency = frequency;
     sDuration = duration;
     sVolume = volume;
+#endif
 }
 
 
 void NotificationSound::beep(const rho::Hashtable<rho::String, rho::String> &propertyMap)
 {
+#ifndef RHODES_VERSION_LIBRARY
     int mseconds = 1000;
     if (propertyMap.containsKey("duration")){
         QString propDur(propertyMap.get("duration").c_str());
@@ -84,9 +96,11 @@ void NotificationSound::beep(const rho::Hashtable<rho::String, rho::String> &pro
 
     NotificationSound * sound = new NotificationSound(frequency,mseconds,volume);
     sound->run();
-
+#endif
 }
 
 extern "C" void notification_beep(const rho::Hashtable<rho::String, rho::String>& propertyMap){
+#ifndef RHODES_VERSION_LIBRARY
     NotificationSound::beep(propertyMap);
+#endif
 }

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

@@ -1,11 +1,19 @@
 #ifndef NOTIFICATIONSOUND_H
 #define NOTIFICATIONSOUND_H
 #include "../../platform/shared/common/RhoStd.h"
+
+#ifndef RHODES_VERSION_LIBRARY
 #include "../iexecutable.h"
+#endif
 
-class NotificationSound : public IExecutable
+class NotificationSound
+#ifndef RHODES_VERSION_LIBRARY
+        : public IExecutable
+#endif
 {
+#ifndef RHODES_VERSION_LIBRARY
     Q_OBJECT
+#endif
 private:
     int sFrequency = 0;
     int sDuration = 0;
@@ -15,11 +23,13 @@ public:
     void playSound();
     static void beep();
     static void beep(const rho::Hashtable<rho::String, rho::String>& propertyMap);
+#ifndef RHODES_VERSION_LIBRARY
 public slots:
     virtual void execute(){
         playSound();
         deleteLater();
     }
+#endif
 };
 
 #endif // NOTIFICATIONSOUND_H

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

@@ -74,14 +74,10 @@ QMenuBar* QtMainWindow::createMenu() {
 
     QMenuBar * menuBar = new QMenuBar(this);
 
-
     QMenu *mMain = new QMenu("Main", this);
-    //mMain->addAction("Exit", this, SLOT(on_actionExit_triggered()));
     mMain->addAction("Exlt", this, SLOT(on_actionExit_triggered()));
     menuBar->addMenu(mMain);
-    //if (menuMain == NULL) {
-        menuMain = mMain;
-    //}
+    menuMain = mMain;
 
     #ifndef OS_WINDOWS_DESKTOP
     QMenu * menuSimulate = new QMenu("Simulate", this);
@@ -98,7 +94,6 @@ QMenuBar* QtMainWindow::createMenu() {
     menuBar->addMenu(menuSimulate);
     #endif
 
-
     QMenu * menuHelp = new QMenu("Help", this);
     //menuHelp->addAction("About", this, SLOT(on_actionAbout_triggered()));
     menuHelp->addAction("Info", this, SLOT(on_actionAbout_triggered()));
@@ -114,9 +109,11 @@ QtMainWindow::QtMainWindow(QWidget *parent) : QMainWindow(parent), mainWindowCal
 {
     lastInstance = this;
     menuMain = NULL;
-    createMenu();
+    if (RHOCONF().getBool("start_maximized")){
+        setWindowState(windowState() | Qt::WindowMaximized);
+    }
 
-currentThreadId = QThread::currentThreadId();//this->thread()->currentThreadId();
+    currentThreadId = QThread::currentThreadId();
 
 #if !defined(RHODES_EMULATOR)
     QPixmap icon(QCoreApplication::applicationDirPath().append(QDir::separator()).append("icon.png"));
@@ -171,17 +168,16 @@ currentThreadId = QThread::currentThreadId();//this->thread()->currentThreadId()
     QObject::connect(webView, SIGNAL(urlChanged(QUrl)), this, SLOT(on_webView_urlChanged(QUrl)));
     verticalLayout->addWidget(webView);
 
-
-
     connect(this, SIGNAL(navigate(QString,int)), this,
             SLOT(slotNavigate(QString,int)), Qt::QueuedConnection);
 
     toolBar = new QToolBar(this);
-    //toolBar->setFixedSize(160,12);
+    toolBar->setMovable(false);
     this->addToolBar(Qt::BottomToolBarArea, toolBar);
 
     toolBarRight = new QToolBar(this);
-    //toolBarRight->setFixedSize(160,12);
+    toolBarRight->setMovable(false);
+    toolBarRight->setLayoutDirection(Qt::RightToLeft);
     this->addToolBar(Qt::BottomToolBarArea, toolBarRight);
 
     if (RHOCONF().isExist("http_proxy_host"))
@@ -243,6 +239,9 @@ currentThreadId = QThread::currentThreadId();//this->thread()->currentThreadId()
     }
 
     setMenuBar(createMenu());
+    if (RHOCONF().getInt("w32_hide_menu_bar")){
+        this->menuBar()->hide();
+    }
 }
 
 QtMainWindow::~QtMainWindow()
@@ -436,10 +435,15 @@ void QtMainWindow::on_webView_linkClicked(const QUrl& url)
 
 void QtMainWindow::on_webView_loadStarted()
 {
-	if (firstShow && RHOCONF().getBool("full_screen")) {
-		firstShow = false;
-		fullscreenCommand(1);
-	}
+    if (firstShow){
+        firstShow = false;
+
+        if (RHOCONF().getBool("full_screen") && !RHOCONF().getBool("start_maximized")){
+            fullscreenCommand(1);
+        }
+    }
+
+
     LOG(INFO) + "WebView: loading...";
     PROF_START("BROWSER_PAGE");
 }
@@ -1191,6 +1195,11 @@ void QtMainWindow::fullscreenCommand(int enable)
 #if defined(OS_WINDOWS_DESKTOP) && !defined(RHODES_EMULATOR)
     if ((enable && !isFullScreen()) || (!enable && isFullScreen())) {
         this->menuBar()->setVisible(RHOCONF().getBool("w32_fullscreen_menu") || (!enable));
+
+#ifdef OS_WINDOWS_DESKTOP
+        QWindowsWindowFunctions::setHasBorderInFullScreen( windowHandle(), true );
+#endif
+
         setWindowModality(enable ? Qt::ApplicationModal : Qt::NonModal);
         setWindowState(windowState() ^ Qt::WindowFullScreen);
     }

data/platform/shared/qt/rhodes/newVersion/QtMainWindow.h

@@ -60,6 +60,9 @@
 #include <QWebEngineUrlRequestInfo>
 #include "QtNativeTabBar.h"
 #include "DateTimeDialog.h"
+#ifdef OS_WINDOWS_DESKTOP
+    #include <QtPlatformHeaders\QWindowsWindowFunctions>
+#endif
 
 class QtMainWindow : public QMainWindow
 {

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

@@ -1,4 +1,11 @@
 #include "WebUrlRequestInterceptor.h"
+#include "common/RhoDefs.h"
+
+#if defined(OS_WINDOWS_DESKTOP)
+#include "impl/SecurityTokenGeneratorImpl.h"
+#include "common/IRhoClassFactory.h"
+#include "common/RhoConf.h"
+#endif
 
 #include <QDebug>
 WebUrlRequestInterceptor::WebUrlRequestInterceptor(QObject *p):QWebEngineUrlRequestInterceptor(p)
@@ -6,6 +13,16 @@ WebUrlRequestInterceptor::WebUrlRequestInterceptor(QObject *p):QWebEngineUrlRequ
 
 }
 void WebUrlRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo &info) {
+
+#if defined(OS_WINDOWS_DESKTOP)
+    const rho::common::ISecurityTokenGenerator* generator = rho_conf_getInt("disable_external_access") ? 
+        rho_get_RhoClassFactory()->createSecurityTokenGenerator() : nullptr;
+    if(generator)
+    {
+        info.setHttpHeader("RHO-SECURE-TOKEN", QByteArray::fromStdString(generator->getSecurityToken()));
+    }
+#endif
+
     QString rsrct = "";
     switch(info.resourceType()){
     case 0:rsrct="ResourceTypeMainFrame = 0, // top level page"; break;

data/platform/shared/qt/rhodes/rhodes.pro

@@ -1,3 +1,4 @@
+!contains(DEFINES, RHODES_VERSION_LIBRARY)  {
 QT += core gui network
 message(Qt version: $$[QT_VERSION])
 isEqual(QT_MAJOR_VERSION, 5):{
@@ -35,8 +36,7 @@ isEqual(QT_MAJOR_VERSION, 5):{
         INCLUDEPATH += newVersion
     }
 }
-
-#DEFINES += RHODES_EMULATOR
+}
 
 !contains(DEFINES, OS_SAILFISH)  {
     TARGET = RhoSimulator
@@ -47,6 +47,14 @@ contains(DEFINES, OS_SAILFISH)  {
     TEMPLATE = app
 }
 
+contains(DEFINES, RHODES_VERSION_LIBRARY)  {
+    CONFIG += c++14
+    CONFIG -= qt
+    TEMPLATE = lib
+    TARGET = rhodeslib
+    #CONFIG += debug
+}
+
 CONFIG += warn_on
 
 INCLUDEPATH += ../..\
@@ -112,20 +120,24 @@ win32 {
   Debug {
     DEFINES += _DEBUG DEBUG
     LIBS += comsuppwd.lib
+
+    contains(DEFINES, RHODES_VERSION_LIBRARY)  {
+       TARGET = rhodeslibd
+    }
   }
   Release {
     DEFINES += _NDEBUG NDEBUG QT_NO_DEBUG
     LIBS += comsuppw.lib
   }
   LIBS += ../../../win32/bin/rubylib/rubylib.lib\
-../../../win32/bin/rholib/rholib.lib\
-../../../win32/bin/sqlite3/sqlite3.lib\
-../../../win32/bin/syncengine/syncengine.lib\
-oldnames.lib wininet.lib Iphlpapi.lib Dbghelp.lib ws2_32.lib Crypt32.lib gdiplus.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
+         ../../../win32/bin/rholib/rholib.lib\
+         ../../../win32/bin/sqlite3/sqlite3.lib\
+         ../../../win32/bin/syncengine/syncengine.lib\
+         oldnames.lib wininet.lib Iphlpapi.lib Dbghelp.lib ws2_32.lib Crypt32.lib gdiplus.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
   PRE_TARGETDEPS += ../../../win32/bin/rubylib/rubylib.lib\
-../../../win32/bin/rholib/rholib.lib\
-../../../win32/bin/sqlite3/sqlite3.lib\
-../../../win32/bin/syncengine/syncengine.lib
+                    ../../../win32/bin/rholib/rholib.lib\
+                    ../../../win32/bin/sqlite3/sqlite3.lib\
+                    ../../../win32/bin/syncengine/syncengine.lib
   exists("../../../win32/bin/extensions/extensions.pri") {
     include("../../../win32/bin/extensions/extensions.pri")
   }
@@ -165,7 +177,8 @@ contains(DEFINES, OS_SAILFISH) {
   DEFINES += QT_LARGEFILE_SUPPORT QT_CORE_LIB QT_GUI_LIB QT_NETWORK_LIB QT_WEBKIT_LIB OS_LINUX
 }
 
-DEFINES += RHODES_QT_PLATFORM
+  DEFINES += RHODES_QT_PLATFORM
+
 
 !isEmpty(RHOSIMULATOR_BUILD) {
   DEFINES += RHODES_EMULATOR
@@ -188,6 +201,7 @@ win32 {
     QMAKE_CFLAGS_DEBUG += /Zi /MDd
 }
 
+!contains(DEFINES, RHODES_VERSION_LIBRARY)  {
 HEADERS += impl/RhoClassFactoryImpl.h\
 impl/MainWindowImpl.h\
 impl/NativeToolbarImpl.h\
@@ -201,7 +215,8 @@ MainWindowCallback.h\
 QtCustomStyle.h\
 mainwindowinterface.h \
 guithreadfunchelper.h \
-impl/notificationsound.h
+impl/notificationsound.h\
+impl/SecurityTokenGeneratorImpl.h
 
 SOURCES += impl/AlertImpl.cpp\
 impl/BluetoothImpl.cpp\
@@ -223,10 +238,12 @@ impl/QtSystemImpl.cpp\
 impl/WebViewImpl.cpp\
 impl/MainWindowImpl.cpp\
 impl/NativeTabbarImpl.cpp\
+impl/SecurityTokenGeneratorImpl.cpp\
 ../../../../lib/commonAPI/coreapi/ext/platform/qt/src/CWebViewImpl.cpp \
-    impl/notificationsound.cpp \
-    ../../../../lib/commonAPI/coreapi/ext/shared/SystemImplBase.cpp
+impl/notificationsound.cpp \
+../../../../lib/commonAPI/coreapi/ext/shared/SystemImplBase.cpp
 #TODO: make this like normal developer do
+}
 
 contains(DEFINES, OS_SAILFISH)  {
 SOURCES += \
@@ -311,10 +328,47 @@ newVersion/ExternalWebView.cpp\
 newVersion/DateTimeDialog.cpp\
 newVersion/main.cpp\
 newVersion/WebUrlRequestInterceptor.cpp
+}
 
+contains(DEFINES, RHODES_VERSION_LIBRARY) {
+HEADERS +=  impl/MainWindowImpl.h\
+            impl/NativeToolbarImpl.h\
+            impl/NativeTabbarImpl.h\
+            ../../rubyext/NativeToolbarExt.h\
+            impl/DateTimePickerImpl.h\
+            impl/AlertImpl.h \
+            MainWindowCallback.h\
+            impl/RhoClassFactoryImpl.h
+
+SOURCES +=\
+           impl/RhoThreadImpl.cpp\
+           impl/GeoLocationImpl.cpp\
+           impl/PhonebookImpl.cpp\
+           impl/BluetoothImpl.cpp\
+           impl/CameraImpl.cpp\
+           impl/RhoNativeViewManagerImpl.cpp\
+           impl/DateTimePickerImpl.cpp\
+           impl/RingtoneManagerImpl.cpp\
+           impl/RhodesImpl.cpp\
+           impl/MapViewImpl.cpp\
+           impl/WebViewImpl.cpp\
+           impl/CalendarImpl.cpp\
+           impl/QtSystemImpl.cpp\
+           impl/SignatureImpl.cpp\
+           impl/AlertImpl.cpp\
+           impl/MainWindowImpl.cpp\
+           impl/NativeTabbarImpl.cpp\
+           impl/RhoClassFactoryImpl.cpp\
+           ../../../../lib/commonAPI/coreapi/ext/platform/qt/src/CWebViewImpl.cpp \
+           ../../../../lib/commonAPI/coreapi/ext/shared/SystemImplBase.cpp\
+           impl/NativeToolbarImpl.cpp\
+           impl/notificationsound.cpp\
+           rhorubyVersion/rhodeslib.cpp
 }
-RESOURCES += resources/common.qrc
 
+!contains(DEFINES, RHODES_VERSION_LIBRARY) {
+RESOURCES += resources/common.qrc
+}
 
 contains(DEFINES, OS_SAILFISH)  {
 unix:!macx: