rhodes 2.4.1 → 3.0.0.beta.1

data/platform/wm/rhodes/emulator/NativeToolbarQt.cpp

@@ -0,0 +1,57 @@
+#include "stdafx.h"
+
+#include "NativeToolbarQt.h"
+#include "common/rhoparams.h"
+#include "MainWindowProxy.h"
+#include "MainWindow.h"
+#include "common/RhoFilePath.h"
+#include "rubyext/WebView.h"
+#undef null
+#include <QString>
+#include <QApplication>
+#include <QtGui/QAction>
+
+extern CMainWindow& getAppWindow();
+IMPLEMENT_LOGCLASS(CNativeToolbar,"NativeToolbar");
+
+using namespace rho;
+using namespace rho::common;
+
+CNativeToolbar::CNativeToolbar(void)
+{
+}
+
+CNativeToolbar::~CNativeToolbar(void)
+{
+}
+
+void CNativeToolbar::OnFinalMessage(HWND /*hWnd*/)
+{
+    getAppWindow().getProxy().removeAllButtons();
+}
+
+/*static*/ CNativeToolbar& CNativeToolbar::getInstance()
+{
+    return getAppWindow().getToolbar();
+}
+
+void CNativeToolbar::createToolbar(rho_param *p)
+{
+    getAppWindow().getProxy().createToolbar(p);
+}
+
+
+void CNativeToolbar::removeToolbar()
+{
+    getAppWindow().getProxy().removeToolbar();
+}
+
+int CNativeToolbar::getHeight()
+{
+    return getAppWindow().getProxy().getHeight();
+}
+
+bool CNativeToolbar::isStarted()
+{
+    return getAppWindow().getProxy().isStarted();
+}

data/platform/wm/rhodes/emulator/NativeToolbarQt.h

@@ -0,0 +1,52 @@
+#pragma once
+
+#include "common/IRhoThreadImpl.h"
+#include "ruby/ext/rho/rhoruby.h"
+
+#include <atlbase.h>
+#include <atlapp.h>
+#include <atlctrls.h>
+#include <atldlgs.h>
+#include <atlmisc.h>
+
+class CNativeToolbar
+{
+    DEFINE_LOGCLASS;
+
+public:
+    static const int  MIN_TOOLBAR_HEIGHT = 60;
+
+public:
+    class CCreateTask: public rho::common::IRhoRunnable
+    {
+        rho_param *m_param;
+    public:
+        CCreateTask(rho_param *p) : m_param(rho_param_dup(p)){ }
+        ~CCreateTask(){ rho_param_free(m_param); }
+        virtual void runObject(){
+            CNativeToolbar::getInstance().createToolbar(m_param);
+        }
+    };
+    class CRemoveTask: public rho::common::IRhoRunnable
+    {
+    public:
+        virtual void runObject(){
+            CNativeToolbar::getInstance().removeToolbar(); 
+        }
+    };
+
+public:
+    CNativeToolbar(void);
+    ~CNativeToolbar(void);
+
+    static CNativeToolbar& getInstance();
+
+    virtual void OnFinalMessage(HWND /*hWnd*/);
+
+    int getHeight();
+    bool isStarted();
+
+private:
+    void createToolbar(rho_param *param);
+    void removeToolbar();
+};

data/platform/wm/rhodes/emulator/QtMainWindow.cpp

@@ -0,0 +1,219 @@
+#pragma warning(disable:4996)
+#include "QtMainWindow.h"
+#include "ui_QtMainWindow.h"
+#include "ExternalWebView.h"
+#include <QResizeEvent>
+#include "common/RhoStd.h"
+#include "common/RhodesApp.h"
+#include "rubyext/WebView.h"
+#undef null
+
+QtMainWindow::QtMainWindow(QWidget *parent) :
+    QMainWindow(parent),
+    ui(new Ui::QtMainWindow),
+    wi(new QWebInspector()),
+    cb(NULL)
+{
+    ui->setupUi(this);
+    this->ui->webView->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
+    this->ui->webView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
+    this->move(0,0);
+    this->ui->toolBar->hide();
+    this->ui->toolBarRight->hide();
+
+    // connecting WebInspector
+    wi->setWindowTitle("Web Inspector");
+    wi->setPage(ui->webView->page());
+    wi->move(416, this->geometry().y());
+    wi->resize(850, 600);
+    wi->show();
+}
+
+QtMainWindow::~QtMainWindow()
+{
+    delete wi;
+    delete ui;
+}
+
+void QtMainWindow::setCallback(IMainWindowCallback* callback)
+{
+    cb = callback;
+}
+
+void QtMainWindow::hideEvent(QHideEvent *)
+{
+    if (cb) cb->onActivate(0);
+}
+
+void QtMainWindow::showEvent(QShowEvent *)
+{
+    if (cb) cb->onActivate(1);
+}
+
+void QtMainWindow::closeEvent(QCloseEvent *ce)
+{
+    wi->close();
+    QMainWindow::closeEvent(ce);
+}
+
+void QtMainWindow::resizeEvent(QResizeEvent *event)
+{
+    if (cb)
+        cb->updateSizeProperties(event->size().width(), event->size().height()); // ui->webView
+}
+
+void QtMainWindow::on_actionBack_triggered()
+{
+    ui->webView->back();
+}
+
+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");
+        ExternalWebView* externalWebView = new ExternalWebView();
+        externalWebView->navigate(QUrl(sUrl.remove("rho_open_target=_blank")));
+        externalWebView->show();
+        externalWebView->activateWindow();
+    } else
+        ui->webView->setUrl(url);
+}
+
+void QtMainWindow::on_webView_loadStarted()
+{
+    if (cb) cb->logEvent("WebView: loading...");
+}
+
+void QtMainWindow::on_webView_loadFinished(bool ok)
+{
+    if (cb) cb->logEvent((ok?"WebView: loaded ":"WebView: failed ")); // +ui->webView->url().toString()
+}
+
+void QtMainWindow::on_webView_urlChanged(QUrl url)
+{
+    if (cb) cb->logEvent("WebView: URL changed"); // url.toString()
+}
+
+void QtMainWindow::on_menuMain_aboutToShow()
+{
+    if (cb) cb->createCustomMenu();
+}
+
+void QtMainWindow::navigate(QUrl url)
+{
+    ui->webView->setUrl(url);
+}
+
+void QtMainWindow::GoBack(void)
+{
+    ui->webView->back();
+}
+
+void QtMainWindow::GoForward(void)
+{
+    ui->webView->forward();
+}
+
+void QtMainWindow::Refresh(void)
+{
+    ui->webView->reload();
+}
+
+void QtMainWindow::toolbarRemoveAllButtons()
+{
+    ui->toolBar->clear();
+    ui->toolBarRight->clear();
+}
+
+void QtMainWindow::toolbarShow()
+{
+    ui->toolBar->show();
+    ui->toolBarRight->show();
+}
+
+void QtMainWindow::toolbarHide()
+{
+    ui->toolBar->hide();
+    ui->toolBarRight->hide();
+}
+
+int QtMainWindow::toolbarGetHeight()
+{
+    return ui->toolBar->height();
+}
+
+void QtMainWindow::toolbarAddAction(const QString & text)
+{
+    ui->toolBar->addAction(text);
+}
+
+void QtMainWindow::on_toolbarAction_triggered(bool checked)
+{
+    QObject* sender = QObject::sender();
+    QAction* action;
+    if (sender && (action = dynamic_cast<QAction*>(sender))) {
+		rho::String* strAction = new rho::String(action->data().toString().toStdString());
+        if ( strcasecmp(strAction->c_str(), "forward") == 0 )
+            rho_webview_navigate_forward();
+        else
+            RHODESAPP().loadUrl(*strAction);
+    }
+}
+
+void QtMainWindow::toolbarAddAction(const QIcon & icon, const QString & text, const char* action, bool rightAlign)
+{
+    QAction* qAction = new QAction(icon, text, ui->toolBar);
+    qAction->setData(QVariant(action));
+    QObject::connect(qAction, SIGNAL(triggered(bool)), this, SLOT(on_toolbarAction_triggered(bool)) );
+    if (rightAlign)
+        ui->toolBarRight->insertAction( (ui->toolBarRight->actions().size() > 0 ? ui->toolBarRight->actions().last() : 0), qAction);
+    else
+        ui->toolBar->addAction(qAction);
+}
+
+void QtMainWindow::toolbarAddSeparator()
+{
+    ui->toolBar->addSeparator();
+}
+
+void QtMainWindow::setToolbarStyle(bool border, QString background)
+{
+	QString style = "";
+	if (!border) style += "border:0px";
+	if (background.length()>0) {
+        if (style.length()>0) style += ";";
+        style += "background:"+background;
+    }
+	if (style.length()>0) {
+		style = "QToolBar{"+style+"}";
+	    ui->toolBar->setStyleSheet(style);
+        ui->toolBarRight->setStyleSheet(style);
+	}
+}
+
+void QtMainWindow::menuAddAction(const QString & text, int item)
+{
+    QAction* qAction = new QAction(text, ui->toolBar);
+    qAction->setData(QVariant(item));
+    QObject::connect(qAction, SIGNAL(triggered(bool)), this, SLOT(on_menuAction_triggered(bool)) );
+    ui->menuMain->addAction(qAction);
+}
+
+void QtMainWindow::menuClear(void)
+{
+    ui->menuMain->clear();
+}
+
+void QtMainWindow::menuAddSeparator()
+{
+    ui->menuMain->addSeparator();
+}
+
+void QtMainWindow::on_menuAction_triggered(bool checked)
+{
+    QObject* sender = QObject::sender();
+    QAction* action;
+    if (sender && (action = dynamic_cast<QAction*>(sender)) && cb)
+        cb->onCustomMenuItemCommand(action->data().toInt());
+}

data/platform/wm/rhodes/emulator/QtMainWindow.h

@@ -0,0 +1,62 @@
+#ifndef QTMAINWINDOW_H
+#define QTMAINWINDOW_H
+
+#include <QMainWindow>
+#include <QUrl>
+#include <QWebInspector>
+#include <QAction>
+#include "MainWindowCallback.h"
+#include "common/IRhoThreadImpl.h"
+
+namespace Ui {
+    class QtMainWindow;
+}
+
+class QtMainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    explicit QtMainWindow(QWidget *parent = 0);
+    ~QtMainWindow();
+    virtual void hideEvent(QHideEvent *);
+    virtual void showEvent(QShowEvent *);
+    virtual void closeEvent(QCloseEvent *);
+    void setCallback(IMainWindowCallback* callback);
+    // webview
+    void navigate(QUrl url);
+    void GoBack(void);
+    void GoForward(void);
+    void Refresh(void);
+    // toolbar
+    void toolbarRemoveAllButtons(void);
+    void toolbarShow(void);
+    void toolbarHide(void);
+    int toolbarGetHeight(void);
+    void toolbarAddAction(const QString & text);
+    void toolbarAddAction(const QIcon & icon, const QString & text, const char* action, bool rightAlign = false);
+    void toolbarAddSeparator(void);
+	void setToolbarStyle(bool border, QString background);
+    // menu
+    void menuClear(void);
+    void menuAddAction(const QString & text, int item);
+    void menuAddSeparator(void);
+private:
+    Ui::QtMainWindow *ui;
+    QWebInspector *wi;
+    IMainWindowCallback* cb;
+
+private slots:
+    void on_webView_urlChanged(QUrl );
+    void on_webView_loadFinished(bool);
+    void on_webView_loadStarted();
+    void on_webView_linkClicked(const QUrl&);
+    void on_actionBack_triggered();
+    void on_toolbarAction_triggered(bool);
+    void on_menuAction_triggered(bool);
+    void on_menuMain_aboutToShow();
+protected:
+    void resizeEvent(QResizeEvent *);
+};
+
+#endif // QTMAINWINDOW_H

data/platform/wm/rhodes/emulator/QtMainWindow.ui

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>QtMainWindow</class>
+ <widget class="QMainWindow" name="QtMainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </property>
+  <property name="locale">
+   <locale language="English" country="UnitedStates"/>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <property name="spacing">
+     <number>0</number>
+    </property>
+    <property name="margin">
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="QWebView" name="webView">
+      <property name="url">
+       <url>
+        <string>about:blank</string>
+       </url>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>400</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuMain">
+    <property name="title">
+     <string>Main</string>
+    </property>
+   </widget>
+   <widget class="QMenu" name="menuNavigate">
+    <property name="title">
+     <string>Navigate</string>
+    </property>
+    <addaction name="actionBack"/>
+   </widget>
+   <addaction name="menuMain"/>
+   <addaction name="menuNavigate"/>
+  </widget>
+  <widget class="QToolBar" name="toolBar">
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <property name="locale">
+    <locale language="English" country="UnitedStates"/>
+   </property>
+   <property name="movable">
+    <bool>false</bool>
+   </property>
+   <property name="allowedAreas">
+    <set>Qt::BottomToolBarArea</set>
+   </property>
+   <property name="floatable">
+    <bool>false</bool>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>BottomToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
+  <widget class="QToolBar" name="toolBarRight">
+   <property name="windowTitle">
+    <string>toolBarRight</string>
+   </property>
+   <property name="layoutDirection">
+    <enum>Qt::RightToLeft</enum>
+   </property>
+   <property name="movable">
+    <bool>false</bool>
+   </property>
+   <property name="allowedAreas">
+    <set>Qt::BottomToolBarArea</set>
+   </property>
+   <property name="floatable">
+    <bool>false</bool>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>BottomToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
+  <action name="actionBack">
+   <property name="text">
+    <string>Back</string>
+   </property>
+  </action>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QWebView</class>
+   <extends>QWidget</extends>
+   <header>QtWebKit/QWebView</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>