rhodes 5.5.0.3 → 5.5.0.7

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

@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QWEBVIEWSELECTIONSUPPRESSOR_H
+#define QWEBVIEWSELECTIONSUPPRESSOR_H
+
+#include <QtWebKitWidgets/qwebview.h>
+#include <QtGui/qevent.h>
+#include <QDebug>
+
+class QWebViewSelectionSuppressor : public QObject
+{
+    Q_OBJECT
+public:
+    QWebViewSelectionSuppressor(QWebView *v)
+        : QObject(v), view(v), enabled(false), mousePressed(false)
+    {
+        Q_ASSERT(view);
+        enable();
+    }
+
+    ~QWebViewSelectionSuppressor() {}
+
+    inline void enable()
+    {
+        if (enabled)
+            return;
+        view->installEventFilter(this);
+        enabled = true;
+    }
+ 
+    inline void disable()
+    {
+        if (!enabled)
+            return;
+        view->removeEventFilter(this);
+        enabled = false;
+    }
+
+    inline bool isEnabled() const
+    {
+        return enabled;
+    }
+
+protected:
+    inline bool eventFilter(QObject *, QEvent *e);
+
+private:
+    QWebView *view;
+    bool enabled;
+    bool mousePressed;
+};
+
+bool QWebViewSelectionSuppressor::eventFilter(QObject *, QEvent *e)
+{
+    switch (e->type()) {
+    case QEvent::MouseButtonPress:
+        if (static_cast<QMouseEvent *>(e)->button() == Qt::LeftButton)
+            mousePressed = true;
+        break;
+    case QEvent::MouseButtonRelease:
+        if (static_cast<QMouseEvent *>(e)->button() == Qt::LeftButton)
+            mousePressed = false;
+        break;
+    case QEvent::MouseMove:
+        if (mousePressed)
+            return true;
+        break;
+    default:
+        break;
+    }
+    return false;
+}
+
+#endif

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

@@ -117,6 +117,18 @@ win32 {
 HEADERS += ExternalWebView.h\
 MainWindowCallback.h\
 QtMainWindow.h\
+qwebviewkineticscroller.h\
+qkineticscroller.h\
+qkineticscroller_p.h\
+qwebviewselectionsuppressor.h\
+qtscroller.h\
+qtscroller_p.h\
+qtscrollerproperties.h\
+qtscrollerproperties_p.h\
+qtflickgesture_p.h\
+qtscrollerfilter_p.h\
+qtscrollevent.h\
+qtscrollevent_p.h\
 QtNativeTabBar.h\
 QtWebInspector.h\
 QtWebPage.h\
@@ -140,6 +152,13 @@ QtMainWindow.cpp\
 QtNativeTabBar.cpp\
 QtWebInspector.cpp\
 QtWebPage.cpp\
+qkineticscroller.cpp\
+qwebviewkineticscroller.cpp\
+qtflickgesture.cpp\
+qtscroller.cpp\
+qtscrollerproperties.cpp\
+qtscrollerfilter.cpp\
+qtscrollevent.cpp\
 impl/AlertImpl.cpp\
 impl/BluetoothImpl.cpp\
 impl/CalendarImpl.cpp\

data/res/generators/rhogen.rb

@@ -60,14 +60,14 @@ module Rhogen
     alias_method :module_name, :class_name
   end
 
-  class AppGenerator < BaseGenerator
+  class RubyAppGenerator < BaseGenerator
 
     def self.source_root
       File.join(File.dirname(__FILE__), 'templates', 'application')
     end
 
     desc <<-DESC
-      Generates a new rhodes application.
+      Generates a new ruby-based rhodes application.
 
       Options:
         --rhoconnect - include rhoconnect-client in application
@@ -286,13 +286,205 @@ module Rhogen
     end
   end
 
-  class ModelGenerator < BaseGenerator
+  class JavascriptAppGenerator < BaseGenerator
+
+    def self.source_root
+      File.join(File.dirname(__FILE__), 'templates', 'application')
+    end
+
+    desc <<-DESC
+      Generates a new javascript-based rhodes application.
+
+      Options:
+        --rhoconnect - include rhoconnect-client in application
+
+      Required:
+        name        - application name
+
+      Optional:
+        syncserver  - url to the rhosync application (i.e. "http://localhost:9292")
+        zip_url     - optional url to zipfile download of bundle (this can be your RhoHub Bundle URL)
+    DESC
+
+    #option :testing_framework, :desc => 'Specify which testing framework to use (spec, test_unit)'
+
+    option :rhoconnect, :desc => '', :as => :boolean, :default => false
+
+    first_argument :name, :required => true, :desc => 'application name'
+    second_argument :syncserver, :required => false, :desc => 'url to the source adapter (i.e. "" or "http://rhosync.rhohub.com/apps/myapp/sources/")'
+    third_argument :zip_url, :required => false, :desc => 'optional url to zipfile download of bundle'
+
+    invoke :appResources
+
+    template :config do |template|
+      zip_url ||= ''
+      syncserver ||= ''
+      template.source = 'javascript_rhoconfig.txt'
+      template.destination = "#{name}/rhoconfig.txt"
+    end
+
+    template :buildyml do |template|
+      @sdk_path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+      @sdk_path.gsub!('\\', '/')
+      @app_name = name
+      @app_name_cleared = name.downcase.split(/[^a-zA-Z0-9\.\-]/).map { |w| w.downcase }.join("")
+      puuid = UUID.new
+      generated_uuid = puuid.generate
+      @productid = generated_uuid
+      @uid = '0x'+(0xE0000000 + rand(0xFFFFFFF)).to_s(16)
+      @rhoconnectclient_ext = '"rhoconnect-client"' if rhoconnect
+      template.source = 'javascript_build.yml'
+      template.destination = "#{name}/build.yml"
+    end
+
+    template :gitignore do |template|
+      template.source = 'gitignore'
+      template.destination = "#{name}/.gitignore"
+    end
+
+    template :rubyversion do |template|
+      template.source = 'ruby-version'
+      template.destination = "#{name}/.ruby-version"
+    end
+
+    template :gemfile do |template|
+      template.source = 'Gemfile'
+      template.destination = "#{name}/Gemfile"
+    end
+
+    template :application do |template|
+      template.source = 'app/javascript_index.html'
+      template.destination = "#{name}/app/index.html"
+    end
+
+    file :applicationScript do |file|
+      file.source = 'app/javascript_index.js'
+      file.destination = "#{name}/app/index.js"
+    end
+
+    template :options do |template|
+      template.source = 'app/Settings/javascript_index.html'
+      template.destination = "#{name}/app/Settings/index.html"
+    end
+
+    template :login do |template|
+      template.source = 'app/Settings/javascript_login.html'
+      template.destination = "#{name}/app/Settings/login.html"
+    end
+
+    template :loading do |template|
+      template.source = 'app/loading.html'
+      template.destination = "#{name}/app/loading.html"
+    end
+
+    file :loadingpng do |file|
+      file.source = 'app/loading.png'
+      file.destination = "#{name}/app/loading.png"
+    end
+
+    file :loadingpng5 do |file|
+      file.source = 'app/loading-568h@2x.png'
+      file.destination = "#{name}/app/loading-568h@2x.png"
+    end
+
+    file :loadingpng51 do |file|
+      file.source = 'app/loading-667h@2x.png'
+      file.destination = "#{name}/app/loading-667h@2x.png"
+    end
+
+    file :loadingpng52 do |file|
+      file.source = 'app/loading-736h@3x.png'
+      file.destination = "#{name}/app/loading-736h@3x.png"
+    end
+
+    file :loadingpngl do |file|
+      file.source = 'app/loading-Landscape.png'
+      file.destination = "#{name}/app/loading-Landscape.png"
+    end
+
+    file :loadingpngll do |file|
+      file.source = 'app/loading-LandscapeLeft.png'
+      file.destination = "#{name}/app/loading-LandscapeLeft.png"
+    end
+
+    file :loadingpnglr do |file|
+      file.source = 'app/loading-LandscapeRight.png'
+      file.destination = "#{name}/app/loading-LandscapeRight.png"
+    end
+
+    file :loadingpngp do |file|
+      file.source = 'app/loading-Portrait.png'
+      file.destination = "#{name}/app/loading-Portrait.png"
+    end
+
+    file :loadingpngpud do |file|
+      file.source = 'app/loading-PortraitUpsideDown.png'
+      file.destination = "#{name}/app/loading-PortraitUpsideDown.png"
+    end
+
+    file :loadingpngl2 do |file|
+      file.source = 'app/loading-Landscape@2x.png'
+      file.destination = "#{name}/app/loading-Landscape@2x.png"
+    end
+
+    file :loadingpngll2 do |file|
+      file.source = 'app/loading-LandscapeLeft@2x.png'
+      file.destination = "#{name}/app/loading-LandscapeLeft@2x.png"
+    end
+
+    file :loadingpnglr2 do |file|
+      file.source = 'app/loading-LandscapeRight@2x.png'
+      file.destination = "#{name}/app/loading-LandscapeRight@2x.png"
+    end
+
+    file :loadingpngp2 do |file|
+      file.source = 'app/loading-Portrait@2x.png'
+      file.destination = "#{name}/app/loading-Portrait@2x.png"
+    end
+
+    file :loadingpngpud2 do |file|
+      file.source = 'app/loading-PortraitUpsideDown@2x.png'
+      file.destination = "#{name}/app/loading-PortraitUpsideDown@2x.png"
+    end
+
+    file :loadingpngx do |file|
+      file.source = 'app/loading@2x.png'
+      file.destination = "#{name}/app/loading@2x.png"
+    end
+
+    directory :icon do |directory|
+      directory.source = 'icon'
+      directory.destination = "#{name}/icon"
+    end
+
+    directory :production do |directory|
+      directory.source = 'production'
+      directory.destination = "#{name}/production"
+    end
+
+    file :androidmanifesterb do |file|
+      file.source = 'AndroidManifest.erb'
+      file.destination = "#{name}/AndroidManifest.erb"
+    end
+
+    directory :public do |directory|
+      directory.source = 'public'
+      directory.destination = "#{name}/public/"
+    end
+
+    template :rakefile do |template|
+      template.source = 'Rakefile'
+      template.destination = "#{name}/Rakefile"
+    end
+  end
+
+  class RubyModelGenerator < BaseGenerator
     def self.source_root
       File.join(File.dirname(__FILE__), 'templates', 'model')
     end
 
     desc <<-DESC
-      Generates a new model for a rhodes application.
+      Generates a new ruby model for a ruby-based rhodes application.
 
       Required:
         name        - model name
@@ -368,6 +560,113 @@ module Rhogen
     end
   end
 
+  class JavascriptModelGenerator < BaseGenerator
+    def self.source_root
+      File.join(File.dirname(__FILE__), 'templates', 'model')
+    end
+
+    desc <<-DESC
+      Generates a new javascript model for a javascript-based rhodes application.
+
+      Required:
+        name        - model name
+        attributes  - list of one or more string attributes (i.e. name,industry,progress), NO spaces between attributes
+
+      Optional:
+        priority    - sync priority (i.e. 100)
+        type        - DEPRECATED: type of model (i.e. "ask" for an ask model). This will be removed in 1.5, instead use
+                      search method.
+    DESC
+
+    #option :testing_framework, :desc => 'Specify which testing framework to use (spec, test_unit)'
+
+    first_argument :name, :required => true, :desc => 'model name'
+    second_argument :attributes, :as => :array, :required => true, :desc => "list of one or more string attributes (i.e. name,industry,progress), NO spaces between attributes"
+    third_argument :priority, :required => false, :desc => "optional sync priority (i.e. 100)"
+    fourth_argument :type, :required => false, :desc => "optional type (i.e. \"ask\" for an ask model)"
+
+    template :javascript_index do |template|
+      template.source = "javascript_index.html"
+      template.destination = "app/#{name.modulize}/index.html"
+    end
+
+    template :javascript_index_script do |template|
+      template.source = "javascript_index.js"
+      template.destination = "app/#{name.modulize}/index.js"
+    end
+
+    template :javascript_model_script do |template|
+      template.source = "javascript_model.js"
+      template.destination = "app/#{name.modulize}/model.js"
+    end
+
+    template :javascript_new do |template|
+      template.source = "javascript_new.html"
+      template.destination = "app/#{name.modulize}/new.html"
+    end
+
+    template :javascript_show do |template|
+      template.source = "javascript_show.html"
+      template.destination = "app/#{name.modulize}/show.html"
+    end
+
+    template :javascript_edit do |template|
+      template.source = "javascript_edit.html"
+      template.destination = "app/#{name.modulize}/edit.html"
+    end
+
+
+    # template :index do |template|
+    #   template.source = 'index.erb'
+    #   template.destination = "app/#{name.modulize}/index.erb"
+    # end
+    #
+    # template :edit do |template|
+    #   template.source = 'edit.erb'
+    #   template.destination = "app/#{name.modulize}/edit.erb"
+    # end
+    #
+    # template :new do |template|
+    #   template.source = 'new.erb'
+    #   template.destination = "app/#{name.modulize}/new.erb"
+    # end
+    #
+    # template :new do |template|
+    #   template.source = 'show.erb'
+    #   template.destination = "app/#{name.modulize}/show.erb"
+    # end
+    #
+    # template :controller do |template|
+    #   underscore_name = name.modulize.split(/(?=[A-Z])/).map { |w| w.downcase }.join('_')
+    #   template.source = 'controller.rb'
+    #   template.destination = "app/#{name.modulize}/#{underscore_name}_controller.rb"
+    # end
+    #
+    # template :model do |template|
+    #   underscore_name = name.modulize.split(/(?=[A-Z])/).map { |w| w.downcase }.join('_')
+    #   template.source = 'model.rb'
+    #   template.destination = "app/#{name.modulize}/#{underscore_name}.rb"
+    # end
+    #
+    # template :spec do |template|
+    #   underscore_name = name.modulize.split(/(?=[A-Z])/).map { |w| w.downcase }.join('_')
+    #   template.source = 'spec.rb'
+    #   template.destination = "app/test/#{underscore_name}_spec.rb"
+    # end
+
+    def attributes?
+      self.attributes && !self.attributes.empty?
+    end
+
+    def syncserver_exists?
+      found = true
+      File.open('rhoconfig.txt').each do |line|
+        found = false if line.match("syncserver\ =\ ''") or line.match("syncserver\ =\ \"\"") or line.match("syncserver\ =\ nil")
+      end
+      found
+    end
+  end
+
   class SpecGenerator < BaseGenerator
 
     def self.source_root
@@ -412,9 +711,6 @@ module Rhogen
 
   end
 
-
-
-
   class IphoneProjectGenerator < BaseGenerator
 
     @@noapp = false
@@ -681,12 +977,6 @@ module Rhogen
 
   end
 
-
-
-
-
-
-
   class ExtensionGenerator < BaseGenerator
 
     @@noapp = false
@@ -1348,8 +1638,10 @@ module Rhogen
   end
 
 
-  add :app, AppGenerator
-  add :model, ModelGenerator
+  add :app, RubyAppGenerator
+  add :jsapp, JavascriptAppGenerator
+  add :model, RubyModelGenerator
+  add :jsmodel, JavascriptModelGenerator
   add :spec, SpecGenerator
   add :extension, ExtensionGenerator
   add :api, ApiGenerator