rhodes 6.2.0 → 7.1.17

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

@@ -27,18 +27,24 @@
 #include "common/RhoPort.h"
 #include "ext/rho/rhoruby.h"
 #include "common/RhodesApp.h"
+#ifndef RHODES_VERSION_LIBRARY
 #include "MainWindowImpl.h"
+#endif
 
 extern "C" {
 
 void choose_picture(char* callback_url)
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->selectPicture(strdup(callback_url));
+#endif
 }
 
 void take_picture(char* callback_url, rho_param* options_hash)
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->takePicture(strdup(callback_url));
+#endif
 }
 
 VALUE get_camera_info(const char* camera_type)

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

@@ -25,7 +25,9 @@
 *------------------------------------------------------------------------*/
 
 #include "logging/RhoLog.h"
+#ifndef RHODES_VERSION_LIBRARY
 #include "MainWindowImpl.h"
+#endif
 #include "DateTimePickerImpl.h"
 
 static char ourTitle[1024];
@@ -43,7 +45,9 @@ void  choose_datetime_with_range(char* callback, char* title,
     else
         strcpy(ourTitle, "");
     CDateTimeMessage *msg = new CDateTimeMessage(callback, ourTitle, initial_time, format, data, min_time, max_time);
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->dateTimePicker(msg);
+#endif
 }
 
 

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

@@ -33,6 +33,7 @@
 #include "json/JSONIterator.h"
 #include "MainWindowImpl.h"
 //#undef null
+#ifndef RHODES_VERSION_LIBRARY
 #include <QString>
 #ifndef OS_SAILFISH
 #if QT_VERSION >= 0x050000
@@ -44,7 +45,9 @@
 #include <QHash>
 #include "../mainwindowinterface.h"
 
+
 IMPLEMENT_LOGCLASS(CMainWindow,"MainWindow");
+#endif
 
 using namespace rho;
 using namespace rho::common;
@@ -52,13 +55,19 @@ using namespace rho::json;
 
 extern "C" void rho_geoimpl_turngpsoff();
 
+#ifndef RHODES_VERSION_LIBRARY
 int CMainWindow::m_screenWidth;
 int CMainWindow::m_screenHeight;
 
 bool CMainWindow::mainWindowClosed = false;
+#endif
 
-CMainWindow::CMainWindow(): QObject(), m_started(true), qtMainWindow(NULL)
+CMainWindow::CMainWindow()
+#ifndef RHODES_VERSION_LIBRARY
+    : QObject(), m_started(true), qtMainWindow(NULL)
+#endif
 {
+#ifndef RHODES_VERSION_LIBRARY
     //int argc = 0;
     QCoreApplication::setOrganizationName("Rhomobile");
 #ifndef RHODES_EMULATOR
@@ -66,13 +75,16 @@ CMainWindow::CMainWindow(): QObject(), m_started(true), qtMainWindow(NULL)
 #else
     QCoreApplication::setApplicationName("RhoSimulator");
 #endif
+#endif //RHODES_VERSION_LIBRARY
     //qtApplication = (void*)new QApplication(argc, 0);
 }
 
 CMainWindow::~CMainWindow()
 {
+#ifndef RHODES_VERSION_LIBRARY
     if (qtMainWindow) delete (QtMainWindow*)qtMainWindow;
     //if (qtApplication) delete (QApplication*)qtApplication;
+#endif
 }
 
 CMainWindow* CMainWindow::getInstance(void)
@@ -83,8 +95,10 @@ CMainWindow* CMainWindow::getInstance(void)
 
 void CMainWindow::updateSizeProperties(int width, int height)
 {
+#ifndef RHODES_VERSION_LIBRARY
     m_screenWidth = width;
     m_screenHeight = height;
+#endif
 }
 
 void CMainWindow::logEvent(const ::std::string& message)
@@ -97,6 +111,7 @@ void CMainWindow::onWebViewUrlChanged(const ::std::string& url)
     RHODESAPP().keepLastVisitedUrl(url);
 }
 
+#ifndef RHODES_VERSION_LIBRARY
 bool CMainWindow::Initialize(const wchar_t* title)
 {
     bool ok = init(this, title);
@@ -105,9 +120,11 @@ bool CMainWindow::Initialize(const wchar_t* title)
 #endif
     return ok;
 }
+#endif
 
 void CMainWindow::createCustomMenu(void)
 {
+#ifndef RHODES_VERSION_LIBRARY
     RHODESAPP().getAppMenu().copyMenuItems(m_arAppMenuItems);
 #ifdef ENABLE_DYNAMIC_RHOBUNDLE
     String strIndexPage = CFilePath::join(RHODESAPP().getStartUrl(),"index"RHO_ERB_EXT);
@@ -128,10 +145,12 @@ void CMainWindow::createCustomMenu(void)
 #endif
         }
     }
+#endif//RHODES_VERSION_LIBRARY
 }
 
 void CMainWindow::onCustomMenuItemCommand(int nItemPos)
 {    
+#ifndef RHODES_VERSION_LIBRARY
     if ( nItemPos < 0 || nItemPos >= (int)m_arAppMenuItems.size() )
         return;
 
@@ -149,8 +168,17 @@ void CMainWindow::onCustomMenuItemCommand(int nItemPos)
     }
 
     oMenuItem.processCommand();
+#endif
+}
+
+void CMainWindow::onWindowClose(void)
+{
+#ifndef RHODES_VERSION_LIBRARY
+    mainWindowClosed = true;
+#endif
 }
 
+#ifndef RHODES_VERSION_LIBRARY
 void CMainWindow::minimizeWindow(void)
 {
 #ifndef OS_SAILFISH //TODO: FIX
@@ -180,11 +208,6 @@ void CMainWindow::DestroyUi(void)
     rho_rhodesapp_callUiDestroyedCallback();
 }
 
-void CMainWindow::onWindowClose(void)
-{
-    mainWindowClosed = true;
-}
-
 
 // **************************************************************************
 //
@@ -666,7 +689,7 @@ void CMainWindow::menuAddAction(const char* label, int item, bool enabled)
 {
     ((QtMainWindow*)qtMainWindow)->menuAddAction(QString(label), item, enabled);
 }
-
+#endif
 // Handlers
 void CMainWindow::onActivate(int active)
 {
@@ -675,6 +698,7 @@ void CMainWindow::onActivate(int active)
         rho_geoimpl_turngpsoff();
 }
 
+#ifndef RHODES_VERSION_LIBRARY
 // Commands
 void CMainWindow::exitCommand()
 {
@@ -825,10 +849,15 @@ void CMainWindow::createCustomMenuSlot(void)
 {
     createCustomMenu();
 }
+#endif
 
 extern "C" void rho_os_impl_performOnUiThread(rho::common::IRhoRunnable* pTask)
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->executeRunnable(pTask);
+#else
+    pTask->runObject();
+#endif
 }
 
 #if defined(RHODES_QT_PLATFORM) && defined(OS_MACOSX)

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

@@ -39,17 +39,26 @@
 #include "AlertImpl.h"
 #include "DateTimePickerImpl.h"
 #undef null
+
+#ifndef RHODES_VERSION_LIBRARY
 #include <QObject>
+#endif
 
 #ifdef OS_MACOSX
 #define stricmp strcasecmp
 #define strnicmp strncasecmp
 #endif
 
-class CMainWindow : public QObject, IMainWindowCallback
+class CMainWindow : public
+#ifndef RHODES_VERSION_LIBRARY
+        QObject,
+#endif
+        IMainWindowCallback
 {
+#ifndef RHODES_VERSION_LIBRARY
     Q_OBJECT
     DEFINE_LOGCLASS
+#endif
 private:
     explicit CMainWindow();
 public:
@@ -64,6 +73,7 @@ public:
     virtual void onWindowClose(void);
     virtual void onWebViewUrlChanged(const ::std::string& url);
     // public methods:
+#ifndef RHODES_VERSION_LIBRARY
     bool Initialize(const wchar_t* title);
     void DestroyUi(void);
     // for 'main_window_closed' System property
@@ -190,4 +200,5 @@ private slots:
     void createCustomMenuSlot(void);
     void unsetProxy();
     void setProxy(const char* host, const char* port, const char* login, const char* password);
+#endif
 };

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

@@ -27,11 +27,12 @@
 #include "common/rhoparams.h"
 #include "common/RhoFilePath.h"
 #include "rubyext/WebView.h"
-#include "MainWindowImpl.h"
 #include "rubyext/NativeToolbarExt.h"
 #include "rubyext/WebView.h"
 #include "NativeTabbarImpl.h"
 #undef null
+#ifndef RHODES_VERSION_LIBRARY
+#include "MainWindowImpl.h"
 #include <QString>
 #ifndef OS_SAILFISH
 #include <QApplication>
@@ -40,8 +41,10 @@
 #else
 #include <QtGui/QAction>
 #endif
-
 #endif
+#else
+#include "api_generator/MethodResult.h"
+#endif //RHODES_VERSION_LIBRARY
 //IMPLEMENT_LOGCLASS(CNativeTabbar,"NativeTabbar");
 
 using namespace rho;
@@ -52,30 +55,46 @@ using namespace rho::common;
 
 bool rho_osximpl_tabbar_isStarted()
 {
+#ifndef RHODES_VERSION_LIBRARY
     return CMainWindow::getInstance()->isStarted();
+#else
+    return false;
+#endif
 }
 
 void rho_osximpl_tabbar_create( const rho::Vector<rho::String>& tabbarElements,  const rho::Hashtable<rho::String, rho::String>& tabBarProperties, rho::apiGenerator::CMethodResult& oResult)
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->createTabbarEx(tabbarElements, tabBarProperties, oResult);
+#endif
 }
 
 void rho_osximpl_tabbar_remove()
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->removeTabbar();
+#endif
 }
 
 int rho_osximpl_tabbar_currentTabIndex()
 {
+#ifndef RHODES_VERSION_LIBRARY
     return CMainWindow::getInstance()->tabbarGetCurrent();
+#else
+    return -1;
+#endif
 }
 
 void rho_osximpl_tabbar_switchTab(int tabIndex)
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->tabbarSwitch(tabIndex);
+#endif
 }
 
 void rho_osximpl_tabbar_setTabBadge(int tabIndex,  const rho::String& badge)
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->tabbarBadge(tabIndex, badge.c_str());
+#endif
 }

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

@@ -30,6 +30,7 @@
 #include "logging/RhoLog.h"
 #include "common/IRhoThreadImpl.h"
 #include "ruby/ext/rho/rhoruby.h"
+#include "api_generator/MethodResult.h"
 
 /*class CNativeTabbar
 {

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

@@ -36,6 +36,7 @@
 #include "NativeToolbarImpl.h"
 #include "rubyext/NativeToolbarExt.h"
 #undef null
+#ifndef RHODES_VERSION_LIBRARY
 #include <QString>
 #ifndef OS_SAILFISH
 #if QT_VERSION >= 0x050000
@@ -44,6 +45,7 @@
 #include <QtGui/QAction>
 #endif
 #endif
+#endif //RHODES_VERSION_LIBRARY
 
 //IMPLEMENT_LOGCLASS(CNativeToolbar,"NativeToolbar");
 
@@ -55,15 +57,23 @@ using namespace rho::common;
 
 bool rho_osximpl_toolbar_isStarted()
 {
+#ifndef RHODES_VERSION_LIBRARY
     return CMainWindow::getInstance()->isStarted();
+#else
+    return false;
+#endif
 }
 
 void rho_osximpl_toolbar_create( const rho::Vector<rho::String>& toolbarElements,  const rho::Hashtable<rho::String, rho::String>& toolBarProperties)
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->createToolbarEx(toolbarElements, toolBarProperties);
+#endif
 }
 
 void rho_osximpl_toolbar_remove()
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->removeToolbar();
+#endif
 }

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

@@ -30,6 +30,8 @@
 #include "common/RhoFilePath.h"
 #include "logging/RhoLog.h"
 #undef null
+
+#ifndef RHODES_VERSION_LIBRARY
 #include <qglobal.h>
 
 #include <QLocale>
@@ -51,8 +53,12 @@
 #include <QtWebKit/qwebkitversion.h>
 #endif
 #endif
+#endif
 #include "../RhoSimulator.h"
 
+#ifdef RHODES_VERSION_LIBRARY
+#include "common/RhodesApp.h"
+#endif
 using namespace rho;
 using namespace rho::common;
 
@@ -62,7 +68,7 @@ extern "C" {
 
 const char* rho_sys_qt_getWebviewFramework()
 {
-#ifndef OS_SAILFISH
+#if !defined(OS_SAILFISH) && !defined(RHODES_VERSION_LIBRARY)
     if (qt_webview_framework[0] == '\0') {
 
         #if defined(RHODES_VERSION_1)
@@ -94,27 +100,47 @@ static int has_camera()
 
 static double get_screen_ppi_x()
 {
+#ifndef RHODES_VERSION_LIBRARY
     return CMainWindow::getInstance()->getLogicalDpiX();
+#else
+    return 0.0;
+#endif
 }
 
 static double get_screen_ppi_y()
 {
+#ifndef RHODES_VERSION_LIBRARY
     return CMainWindow::getInstance()->getLogicalDpiY();
+#else
+    return 0.0;
+#endif
 }
 
 VALUE rho_sys_get_locale()
 {
+#ifndef RHODES_VERSION_LIBRARY
     return rho_ruby_create_string(QLocale::system().name().left(2).toStdString().c_str());
+#else
+    return rho_ruby_get_NIL();
+#endif
 }
 
 int rho_sys_get_screen_width()
 {
+#ifndef RHODES_VERSION_LIBRARY
     return CMainWindow::getScreenWidth();
+#else
+    return -1;
+#endif
 }
 
 int rho_sys_get_screen_height()
 {
+#ifndef RHODES_VERSION_LIBRARY
     return CMainWindow::getScreenHeight();
+#else
+    return -1;
+#endif
 }
 
 int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
@@ -124,10 +150,12 @@ int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
         return 1;
     }
 
+#ifndef RHODES_VERSION_LIBRARY
     if (strcasecmp("main_window_closed",szPropName) == 0) {
         *resValue = rho_ruby_create_boolean(CMainWindow::mainWindowClosed);
         return 1;
     }
+#endif
 
     if (strcasecmp("has_camera",szPropName) == 0) {
         *resValue = rho_ruby_create_boolean(has_camera());
@@ -154,10 +182,12 @@ int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
         return 1;
     }
 
+#ifndef RHODES_VERSION_LIBRARY
     if (strcasecmp("country",szPropName) == 0) {
         *resValue = rho_ruby_create_string(QLocale::system().name().right(2).toStdString().c_str());
         return 1;
     }
+#endif
 
     if (strcasecmp("device_name",szPropName) == 0) {
         *resValue = rho_ruby_create_string("Qt");
@@ -220,14 +250,20 @@ VALUE rho_sys_has_network()
 
 void rho_sys_app_exit()
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->exitCommand();
+#else
+    exit(0);
+#endif
 }
 
 void rho_sys_open_url(const char* url)
 {
+#ifndef RHODES_VERSION_LIBRARY
     QString sUrl = QString::fromUtf8(url);
     if (sUrl.startsWith("/")) sUrl.prepend("file://");
     QDesktopServices::openUrl(QUrl(sUrl));
+#endif
 }
 
 void rho_sys_run_app(const char *appname, VALUE params)
@@ -238,14 +274,20 @@ void rho_sys_run_app(const char *appname, VALUE params)
 
 void rho_sys_bring_to_front()
 {
+#ifndef RHODES_VERSION_LIBRARY
     // TODO: rho_sys_bring_to_front
     return CMainWindow::getInstance()->bringToFront();
+#endif
 }
 
 void rho_sys_report_app_started()
 {
     // TODO: rho_sys_report_app_started
-    RAWLOGC_INFO("SystemImpl", "rho_sys_report_app_started() has no implementation " RHO_PLATFORM_NAME_AT ".");
+    //RAWLOGC_INFO("SystemImpl", "rho_sys_report_app_started() has no implementation " RHO_PLATFORM_NAME_AT ".");
+#if defined(WINDOWS_PLATFORM)
+    RHODESAPP().notifyAppStared();
+#endif
+
 }
 
 int rho_sys_is_app_installed(const char *appname)
@@ -283,7 +325,7 @@ void rho_sys_set_application_icon_badge(int badge_number)
 
 void rho_sys_impl_exit_with_errormessage(const char* szTitle, const char* szMsg)
 {
-#ifndef OS_SAILFISH
+#if !defined(OS_SAILFISH) && !defined (RHODES_VERSION_LIBRARY)
     QMessageBox::critical(0, QString(szTitle), QString(szMsg));
 #endif
 }
@@ -306,27 +348,37 @@ int SymbolLicence_check(const char* company, const char* licence)
 
 void rho_sys_set_window_frame(int x0, int y0, int width, int height)
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->setFrame(x0, y0, width, height);
+#endif
 }
 
 void rho_sys_set_window_position(int x0, int y0)
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->setPosition(x0, y0);
+#endif
 }
 
 void rho_sys_set_window_size(int width, int height)
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->setSize(width, height);
+#endif
 }
 
 void rho_sys_lock_window_size(int locked)
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->lockSize(locked);
+#endif
 }
 
 void rho_symimpl_createMenu()
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->createCustomMenuCommand();
+#endif
 }
 
 } //extern "C"