qtbindings 4.8.3.0 → 4.8.5.0

data/lib/qt4.rb

@@ -0,0 +1,101 @@
+windows = false
+platform = RUBY_PLATFORM.split("-")[1]
+windows = true if platform =~ /mswin32/ or platform =~ /mingw32/
+
+module Qt
+  PLUGIN_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'plugins'))
+end
+if RUBY_VERSION.split('.')[0].to_i == 1
+  if windows
+    ENV['PATH'] = File.join(File.dirname(__FILE__), '../bin') + ';' + File.join(File.dirname(__FILE__), '../lib/1.9') + ';' + File.join(File.dirname(__FILE__), '../bin/plugins') + ';' + File.join(File.dirname(__FILE__), '../bin/1.9') + ';' + ENV['PATH']
+  end
+  $: << File.join(File.dirname(__FILE__), '../lib/1.9')
+  require '1.9/qtruby4'
+else
+  if windows
+    ENV['PATH'] = File.join(File.dirname(__FILE__), '../bin') + ';' + File.join(File.dirname(__FILE__), '../lib/2.0') + ';' + File.join(File.dirname(__FILE__), '../bin/plugins') + ';' + File.join(File.dirname(__FILE__), '../bin/2.0') + ';' + ENV['PATH']
+  end
+  $: << File.join(File.dirname(__FILE__), '../lib/2.0')
+  require '2.0/qtruby4'
+end
+
+module Qt
+  class RubyThreadFix < Qt::Object
+    slots 'ruby_thread_timeout()'
+    slots 'callback_timeout()'
+    slots 'callback_timeout2()'
+    @@queue  = Queue.new
+
+    def initialize
+      super()
+      # Enable threading
+      @ruby_thread_sleep_period = 0.01
+      @ruby_thread_timer = Qt::Timer.new(self)
+      connect(@ruby_thread_timer, SIGNAL('timeout()'), SLOT('ruby_thread_timeout()'))
+      @ruby_thread_timer.start(0)
+      @callback_timer = Qt::Timer.new(self)
+      connect(@callback_timer, SIGNAL('timeout()'), SLOT('callback_timeout()'))
+      @callback_timer.start(1)
+      @callback_timer2 = Qt::Timer.new(self)
+      connect(@callback_timer2, SIGNAL('timeout()'), SLOT('callback_timeout2()'))
+      @running = true
+    end
+
+    def ruby_thread_timeout
+      sleep(@ruby_thread_sleep_period)
+    end
+
+    def callback_timeout
+      if !@@queue.empty?
+        # Start a backup timer in case this one goes modal.
+        @callback_timer2.start(100)
+        @@queue.pop.call until @@queue.empty?
+        # Cancel the backup timer
+        @callback_timer2.stop if @callback_timer2
+      end
+    end
+
+    def callback_timeout2
+      @callback_timer2.interval = 10
+      @@queue.pop.call until @@queue.empty?
+    end
+
+    def self.queue
+      @@queue
+    end
+
+    def stop
+      if @running
+        @running = false
+        @ruby_thread_timer.stop
+        @callback_timer.stop
+        @callback_timer2.stop
+        @ruby_thread_timer.dispose
+        @callback_timer.dispose
+        @callback_timer2.dispose
+        @ruby_thread_timer = nil
+        @callback_timer = nil
+        @callback_timer2 = nil
+      end
+    end
+  end
+
+  def self.execute_in_main_thread (blocking = false, sleep_period = 0.001, delay_execution = false)
+    if Thread.current != Thread.main
+      complete = false
+      RubyThreadFix.queue << lambda {|| yield; complete = true}
+      if blocking
+        until complete
+          sleep(sleep_period)
+        end
+      end
+    else
+      if delay_execution
+        RubyThreadFix.queue << lambda {|| yield; complete = true}
+      else
+        yield
+      end
+    end
+  end
+
+end # module Qt

data/lib/qtbindings_version.rb

@@ -1,2 +1,2 @@
-QTBINDINGS_VERSION = '4.8.3.0'
-QTBINDINGS_RELEASE_DATE = '2012-10-01 21:56:20 -0600'
+QTBINDINGS_VERSION = '4.8.5.0'
+QTBINDINGS_RELEASE_DATE = '2013-12-03 16:46:31 -0700'

data/qtbindings.gemspec

@@ -1,7 +1,7 @@
 require './lib/qtbindings_version'
 
 spec = Gem::Specification.new do |s|
-  s.authors = ['Richard Dale', 'Arno Rehn', 'Ryan Melton']
+  s.authors = ['Ryan Melton', 'Jason Thomas', 'Richard Dale', 'Arno Rehn']
   s.email = 'kde-bindings@kde.org'
   s.rubyforge_project = 'qtbindings'
   s.summary = "Qt bindings for ruby"

data/qtbindingsnative.gemspec

@@ -1,7 +1,7 @@
 require './lib/qtbindings_version'
 
 spec = Gem::Specification.new do |s|
-  s.authors = ['Richard Dale', 'Arno Rehn', 'Ryan Melton']
+  s.authors = ['Ryan Melton', 'Jason Thomas', 'Richard Dale', 'Arno Rehn']
   s.email = 'kde-bindings@kde.org'
   s.rubyforge_project = 'qtbindings'
   s.platform = Gem::Platform::CURRENT

data/{README.txt → readme.txt}

@@ -1,119 +1,127 @@
-qtbindings
-----------
-This project provides bindings that allow the QT Gui toolkit to be used from the
-Ruby Programming language. Overall it is a repackaging of a subset of the KDE 
-bindings ruby and smoke systems into a format that lends itself well to 
-packaging into a Ruby gem.
-
-Goals
------
-1. To make it easy to install a Qt binding for Ruby on all platforms using 
-   RubyGems
-2. To maintain an up-to-date binary gem for Windows that is bundled with 
-   the latest version of Qt from http://qt.nokia.com
-3. To reduce the scope and maintenance of the bindings to only bind to the 
-   libraries provided by the Qt SDK.
-4. To increase compatibility with non-linux platforms
-
-Tested Environments
---------------------
-Mac OSX 10.6.8 (Snow Leopard)
-XCode 3.2.6
-Brew - QT 4.8.2
-Cmake 2.8.6
-
-Windows XP SP3
-QT Libraries 4.8.3
-Mingw 4.4
-Cmake 2.6.4
-Ruby 1.8.7p370 and 1.9.3p0 installed from rubyinstaller.org
-
-Note: Ruby 1.9.3 patch levels 125 and 194 on Windows have a bug in the I/O
-system which prevent the usage of the pos method. That is why I'm using 1.9.3p0.
-  See http://bugs.ruby-lang.org/issues/6179 and http://bugs.ruby-lang.org/issues/6401 
-
-Ubuntu Linux 11.10
-QT SDK 4.8.1
-Cmake 2.8.5
-
-Compiling
----------
-Compiling qtbindings requires the following prerequisites:
-1. cmake 2.8.x installed and in your path
-2. QT 4.8.x installed and in your path
-3. Ruby installed and in your path
-4. gcc 4.x
-
-Additionally: all of the operating system prequisites for compiling, 
-window system development, opengl, etc must be installed.
-
-Rakefile
---------
-Perform the following steps to build the gem on Unix or Mac:
-1. rake VERSION=4.8.x.y gem
-     Where the x is the subversion of QT and y is the patch level of qtbindings
-
-Perform the following steps to build the gem on Windows:
-1. Ensure you are running Ruby 1.8.7
-     ruby -v #=> ruby 1.8.7
-2. rake distclean
-3. rake build
-4. Switch to Ruby 1.9.3
-     ruby -v #=> ruby 1.9.3
-5. rake build
-6. rake VERSION=4.8.x.y gemnative
-     Where the x is the subversion of QT and y is the patch level of qtbindings
-
-Note: The gem is built twice to create the FAT binary which will work 
-on both Ruby 1.8 and 1.9. The Windows utility called pik is useful for
-switching between Ruby versions.
-
-After building the gem, verify the examples work by running:
-1. rake examples
-
-Operating Systems Notes:
-
-Debian Linux
-------------
-1. The following should get you the packages you need:
-sudo aptitude install build-essential bison openssl libreadline5 
-  libreadline-dev curl git-core zlib1g zlib1g-dev libssl-dev vim 
-  libsqlite3-0 libsqlite3-dev sqlite3 libreadline5-dev libreadline6-dev 
-  libxml2-dev git-core subversion autoconf xorg-dev libgl1-mesa-dev 
-  libglu1-mesa-dev
-
-Mac OSX Snow Leopard
------------------------
-1. XCode
-2. Brew (http://mxcl.github.com/homebrew/)
-   Install qt with 'brew install qt'
-
-Windows - Note: Only necessary for debugging (binary gem available)
---------
-1. mingw from the Qt SDK in your path: ie C:\Qt\2010.04\mingw\bin
-
-Install
-------
-On linux/MacOSX you must make sure you have all the necessary prerequisites 
-installed or the compile will fail. 
-
-gem install qtbindings
-
-This should always work flawlessly on Windows because everything is nicely 
-packaged into a binary gem. However, the gem is very large ~90MB, so please
-be patient while gem downloads the file. 
-
-To get help:
-Sign up to the kdebindings mailing list at:
-https://mail.kde.org/mailman/listinfo/kde-bindings
-You can also file tickets here at github for issues specific to the 
-qtbindings gem.
-
-License:
-This library is released under the LGPL Version 2.1.
-See COPYING.LIB.txt
-
-Disclaimer:
-Almost all of this code was written by the great guys who work on the KDE 
-bindings project, particurly Arno Rehn and Richard Dale. I hope to increase 
-the adoption and use of the code that they have written. 
+qtbindings
+----------
+This project provides bindings that allow the QT Gui toolkit to be used from the
+Ruby Programming language. Overall it is a repackaging of a subset of the KDE
+bindings ruby and smoke systems into a format that lends itself well to
+packaging into a Ruby gem.
+
+Goals
+-----
+1. To make it easy to install a Qt binding for Ruby on all platforms using
+   RubyGems
+2. To maintain an up-to-date binary gem for Windows that is bundled with
+   the latest version of Qt from http://qt.nokia.com
+3. To reduce the scope and maintenance of the bindings to only bind to the
+   libraries provided by the Qt SDK.
+4. To increase compatibility with non-linux platforms
+
+Note: This gem only supports Ruby 1.9.3 and Ruby 2.0.0 starting at qtbindings version 4.8.5.0.
+For Ruby 1.8.x you can try installing version 4.8.3.0, however upgrading Ruby is
+highly recommended.
+
+Usage Notes
+------------
+Ruby threading is now fully supported out of the box.   All GUI access however must be done
+inside the main thread.  To support updating the GUI using other threads, use the following function
+provided in Qt4.rb:
+
+Qt.execute_in_main_thread(true) do
+  # GUI code here
+end
+
+Tested Environments
+--------------------
+Mac OSX 10.6.8 (Snow Leopard)
+XCode 3.2.6 (gcc 4.2.1)
+Brew - QT 4.8.5
+Cmake 2.8.11.2
+Ruby 1.9.3p448
+
+Windows XP SP3
+QT SDK 4.8.5
+Cmake 2.8.8
+Ruby 1.9.3p448 and Ruby 2.0.0p353 installed from rubyinstaller.org
+
+Ubuntu Linux 11.10
+QT SDK 4.8.1
+Cmake 2.8.5
+
+Compiling
+---------
+Compiling qtbindings requires the following prerequisites:
+1. cmake 2.8.x installed and in your path
+2. QT 4.8.x installed and in your path
+3. Ruby installed and in your path
+4. gcc 4.x
+
+Additionally: all of the operating system prequisites for compiling,
+window system development, opengl, etc must be installed.
+
+Rakefile
+--------
+Perform the following steps to build the gem on Unix or Mac:
+1. rake VERSION=4.8.x.y gem
+     Where the x is the subversion of QT and y is the patch level of qtbindings
+
+Perform the following steps to build the gem on Windows:
+1. Ensure you are running Ruby 1.9.3
+     ruby -v #=> ruby 1.9.3
+2. rake distclean
+3. rake build
+4. Switch to Ruby 2.0.0
+     ruby -v #=> ruby 2.0.0
+5. rake build
+6. rake VERSION=4.8.x.y gemnative
+     Where the x is the subversion of QT and y is the patch level of qtbindings
+
+Note: The gem is built twice to create the FAT binary which will work
+on both Ruby 1.9 and 2.0. The Windows utility called pik is useful for
+switching between Ruby versions.
+
+After building the gem, verify the examples work by running:
+1. rake examples
+
+Operating Systems Notes:
+
+Debian Linux
+------------
+1. The following should get you the packages you need:
+sudo aptitude install build-essential bison openssl libreadline5
+  libreadline-dev curl git-core zlib1g zlib1g-dev libssl-dev vim
+  libsqlite3-0 libsqlite3-dev sqlite3 libreadline5-dev libreadline6-dev
+  libxml2-dev git-core subversion autoconf xorg-dev libgl1-mesa-dev
+  libglu1-mesa-dev
+
+Mac OSX Snow Leopard
+-----------------------
+1. XCode
+2. Brew (http://mxcl.github.com/homebrew/)
+   Install qt with 'brew install qt'
+
+Windows - Note: Only necessary for debugging (binary gem available)
+--------
+1. mingw 4.4 in your path (from here or elsewhere: http://nosymbolfound.blogspot.com/2012/12/since-until-now-qt-under-windows-is.html#!/2012/12/since-until-now-qt-under-windows-is.html)
+
+Install
+------
+On linux/MacOSX you must make sure you have all the necessary prerequisites
+installed or the compile will fail.
+
+gem install qtbindings
+
+This should always work flawlessly on Windows because everything is nicely
+packaged into a binary gem. However, the gem is very large ~90MB, so please
+be patient while gem downloads the file.
+
+To get help:
+You can file tickets here at github for issues specific to the
+qtbindings gem.
+
+License:
+This library is released under the LGPL Version 2.1.
+See COPYING.LIB.txt
+
+Disclaimer:
+Almost all of this code was written by the guys who worked on the KDE
+bindings project, particurly Arno Rehn and Richard Dale. I hope to increase
+the adoption and use of the code that they have written.

data/{TODO.txt → todo.txt}

@@ -1,3 +1,2 @@
 1. Get all of the examples to run on every platform
 2. Remove all compiler warnings
-3. Test against Qt 4.7

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: qtbindings
 version: !ruby/object:Gem::Version
-  version: 4.8.3.0
-  prerelease: 
+  version: 4.8.5.0
 platform: ruby
 authors:
+- Ryan Melton
+- Jason Thomas
 - Richard Dale
 - Arno Rehn
-- Ryan Melton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies: []
 description: qtbindings provides ruby bindings to QT4.x. It is derived from the kdebindings
   project.
@@ -28,7 +28,7 @@ extra_rdoc_files: []
 files:
 - lib/Qt/qtruby4.rb
 - lib/Qt.rb
-- lib/Qt4.rb
+- lib/qt4.rb
 - lib/qtbindings_version.rb
 - lib/qtscript/qtscript.rb
 - lib/qttest/qttest.rb
@@ -621,7 +621,7 @@ files:
 - ext/ruby/qtruby/src/marshall_primitives.h
 - ext/ruby/qtruby/src/marshall_types.cpp
 - ext/ruby/qtruby/src/marshall_types.h
-- ext/ruby/qtruby/src/Qt.cpp
+- ext/ruby/qtruby/src/qt.cpp
 - ext/ruby/qtruby/src/qtruby.cpp
 - ext/ruby/qtruby/src/qtruby.h
 - ext/ruby/qtruby/src/smokeruby.h
@@ -785,13 +785,13 @@ files:
 - ext/smoke/smokebase/CMakeLists.txt
 - ext/smoke/smokebase/smokebase.cpp
 - ext/smoke/solid_smoke.h
-- CHANGELOG.txt
+- changelog.txt
 - CMakeLists.txt
 - COPYING.LIB.txt
 - COPYING.txt
-- KNOWN_ISSUES.txt
-- README.txt
-- TODO.txt
+- known_issues.txt
+- readme.txt
+- todo.txt
 - extconf.rb
 - qtbindings.gemspec
 - qtbindingsnative.gemspec
@@ -799,18 +799,17 @@ files:
 homepage: http://github.com/ryanmelt/qtbindings
 licenses:
 - LGPLv2.1
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
@@ -818,8 +817,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: qtbindings
-rubygems_version: 1.8.10
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Qt bindings for ruby
 test_files: []