qtbindings 4.8.6.3-x64-mingw32 → 4.8.6.4-x64-mingw32

data/examples/tutorial/t8/t8.rb

@@ -1,43 +1,43 @@
-#!/usr/bin/env ruby
-$VERBOSE = true; $:.unshift File.dirname($0)
-
-require 'Qt'
-require './lcdrange.rb'
-require './cannon.rb'
-
-class MyWidget < Qt::Widget
-    def initialize(parent = nil)
-        super
-        quit = Qt::PushButton.new('Quit')
-        quit.setFont(Qt::Font.new('Times', 18, Qt::Font::Bold))
-    
-        connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()'))
-    
-        angle = LCDRange.new( self )
-        angle.range = 5..70
-
-        cannonField = CannonField.new( self )
-
-        connect( angle, SIGNAL('valueChanged(int)'),
-                cannonField, SLOT('setAngle(int)') )
-        connect( cannonField, SIGNAL('angleChanged(int)'),
-                angle, SLOT('setValue(int)') )
-
-        gridLayout = Qt::GridLayout.new
-        gridLayout.addWidget( quit, 0, 0 )
-        gridLayout.addWidget( angle, 1, 0 )
-        gridLayout.addWidget( cannonField, 1, 1, 2, 1 )
-        gridLayout.setColumnStretch( 1, 10 )
-        setLayout( gridLayout )
-
-        angle.setValue( 60 )
-        angle.setFocus()
-    end
-end    
-
-a = Qt::Application.new(ARGV)
-
-w = MyWidget.new
-w.setGeometry( 100, 100, 500, 355 )
-w.show
-a.exec
+#!/usr/bin/env ruby
+$VERBOSE = true; $:.unshift File.dirname($0)
+
+require 'Qt'
+require_relative 'lcdrange.rb'
+require_relative 'cannon.rb'
+
+class MyWidget < Qt::Widget
+  def initialize(parent = nil)
+    super
+    quit = Qt::PushButton.new('Quit')
+    quit.setFont(Qt::Font.new('Times', 18, Qt::Font::Bold))
+
+    connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()'))
+
+    angle = LCDRange.new(self)
+    angle.range = 5..70
+
+    cannonField = CannonField.new(self)
+
+    connect(angle, SIGNAL('valueChanged(int)'),
+            cannonField, SLOT('setAngle(int)'))
+    connect(cannonField, SIGNAL('angleChanged(int)'),
+            angle, SLOT('setValue(int)'))
+
+    gridLayout = Qt::GridLayout.new
+    gridLayout.addWidget(quit, 0, 0)
+    gridLayout.addWidget(angle, 1, 0)
+    gridLayout.addWidget(cannonField, 1, 1, 2, 1)
+    gridLayout.setColumnStretch(1, 10)
+    setLayout(gridLayout)
+
+    angle.setValue(60)
+    angle.setFocus()
+  end
+end
+
+a = Qt::Application.new(ARGV)
+
+w = MyWidget.new
+w.setGeometry(100, 100, 500, 355)
+w.show
+a.exec

data/examples/tutorial/t9/cannon.rb

@@ -1,45 +1,44 @@
-require 'Qt'
-
-class CannonField < Qt::Widget
-    signals 'angleChanged(int)'
-    slots 'setAngle(int)'
-    
-    def initialize(parent = nil)
-        super
-        @currentAngle = 45
-        setPalette( Qt::Palette.new( Qt::Color.new( 250, 250, 200) ) )
-	setAutoFillBackground(true)
-    end
-
-    def setAngle( degrees )
-        if degrees < 5
-            degrees = 5
-        elsif degrees > 70
-            degrees = 70
-        end
-        if @currentAngle == degrees
-            return
-        end
-        @currentAngle = degrees
-        repaint()
-        emit angleChanged( @currentAngle )
-    end
-
-    def paintEvent( event )
-        painter = Qt::Painter.new( self )
-
-        painter.setPen( Qt::NoPen )
-        painter.setBrush( Qt::Brush.new(Qt::blue) )
-
-        painter.translate( 0, rect().bottom() )
-        painter.drawPie( Qt::Rect.new(-35, -35, 70, 70), 0, 90*16 )
-        painter.rotate( - @currentAngle )
-        painter.drawRect( Qt::Rect.new(33, -4, 15, 8) )
-        painter.end()
-    end
-
-
-    def sizePolicy()
-        return Qt::SizePolicy.new( Qt::SizePolicy::Expanding, Qt::SizePolicy::Expanding )
-    end
-end
+require 'Qt'
+
+class CannonField < Qt::Widget
+  signals 'angleChanged(int)'
+  slots 'setAngle(int)'
+
+  def initialize(parent = nil)
+    super
+    @currentAngle = 45
+    setPalette(Qt::Palette.new(Qt::Color.new(250, 250, 200)))
+    setAutoFillBackground(true)
+  end
+
+  def setAngle(degrees)
+    if degrees < 5
+      degrees = 5
+    elsif degrees > 70
+      degrees = 70
+    end
+    if @currentAngle == degrees
+      return
+    end
+    @currentAngle = degrees
+    repaint()
+    emit angleChanged(@currentAngle)
+  end
+
+  def paintEvent(event)
+    painter = Qt::Painter.new(self)
+
+    painter.setPen(Qt::NoPen)
+    painter.setBrush(Qt::Brush.new(Qt::blue))
+
+    painter.translate(0, rect().bottom())
+    painter.drawPie(Qt::Rect.new(-35, -35, 70, 70), 0, 90 * 16)
+    painter.rotate(- @currentAngle)
+    painter.drawRect(Qt::Rect.new(33, -4, 15, 8))
+    painter.end()
+  end
+
+  def sizePolicy()
+    return Qt::SizePolicy.new(Qt::SizePolicy::Expanding, Qt::SizePolicy::Expanding)
+  end
+end

data/examples/tutorial/t9/lcdrange.rb

@@ -1,46 +1,46 @@
-require 'Qt'
-
-class LCDRange < Qt::Widget
-    signals 'valueChanged(int)'
-    slots 'setValue(int)', 'setRange(int, int)'
-
-    def initialize(parent = nil)
-        super
-        lcd = Qt::LCDNumber.new(2)
-        @slider = Qt::Slider.new(Qt::Horizontal)
-        @slider.range = 0..99
-        @slider.setValue(0)
-        connect(@slider, SIGNAL('valueChanged(int)'), lcd, SLOT('display(int)'))
-        connect(@slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)'))
-
-        layout = Qt::VBoxLayout.new
-        layout.addWidget(lcd)
-        layout.addWidget(@slider)
-        setLayout(layout)
-
-        setFocusProxy(@slider)
-    end
-
-    def value()
-        @slider.value()
-    end
-
-    def setValue( value )
-        @slider.setValue( value )
-    end
-    
-    def range=( r )
-        setRange(r.begin, r.end)
-    end
-
-    def setRange( minVal, maxVal )
-        if minVal < 0 || maxVal > 99 || minVal > maxVal
-              printf( "LCDRange::setRange(%d,%d)\n" +
-                       "\tRange must be 0..99\n" +
-                       "\tand minVal must not be greater than maxVal",
-                       minVal, maxVal )
-            return
-        end
-        @slider.setRange( minVal, maxVal )
-    end
-end
+require 'Qt'
+
+class LCDRange < Qt::Widget
+  signals 'valueChanged(int)'
+  slots 'setValue(int)', 'setRange(int, int)'
+
+  def initialize(parent = nil)
+    super
+    lcd = Qt::LCDNumber.new(2)
+    @slider = Qt::Slider.new(Qt::Horizontal)
+    @slider.range = 0..99
+    @slider.setValue(0)
+    connect(@slider, SIGNAL('valueChanged(int)'), lcd, SLOT('display(int)'))
+    connect(@slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)'))
+
+    layout = Qt::VBoxLayout.new
+    layout.addWidget(lcd)
+    layout.addWidget(@slider)
+    setLayout(layout)
+
+    setFocusProxy(@slider)
+  end
+
+  def value()
+    @slider.value()
+  end
+
+  def setValue(value)
+    @slider.setValue(value)
+  end
+
+  def range=(r)
+    setRange(r.begin, r.end)
+  end
+
+  def setRange(minVal, maxVal)
+    if minVal < 0 || maxVal > 99 || minVal > maxVal
+      printf("LCDRange::setRange(%d,%d)\n" +
+                 "\tRange must be 0..99\n" +
+                 "\tand minVal must not be greater than maxVal",
+                 minVal, maxVal)
+      return
+    end
+    @slider.setRange(minVal, maxVal)
+  end
+end

data/examples/tutorial/t9/t9.rb

@@ -1,43 +1,43 @@
-#!/usr/bin/env ruby
-$VERBOSE = true; $:.unshift File.dirname($0)
-
-require 'Qt'
-require './lcdrange.rb'
-require './cannon.rb'
-
-class MyWidget < Qt::Widget
-    def initialize(parent = nil)
-        super
-        quit = Qt::PushButton.new('Quit')
-        quit.font = Qt::Font.new('Times', 18, Qt::Font::Bold)
-    
-        connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()'))
-    
-        angle = LCDRange.new( self )
-        angle.range = 5..70
-
-        cannonField = CannonField.new( self )
-
-        connect( angle, SIGNAL('valueChanged(int)'),
-                cannonField, SLOT('setAngle(int)') )
-        connect( cannonField, SIGNAL('angleChanged(int)'),
-                angle, SLOT('setValue(int)') )
-        gridLayout = Qt::GridLayout.new
-
-        gridLayout.addWidget( quit, 0, 0 )
-        gridLayout.addWidget( angle, 1, 0 )
-        gridLayout.addWidget( cannonField, 1, 1, 2, 1 )
-        gridLayout.setColumnStretch( 1, 10 )
-        setLayout( gridLayout )
-
-        angle.setValue( 60 )
-        angle.setFocus()
-    end
-end    
-
-a = Qt::Application.new(ARGV)
-
-w = MyWidget.new
-w.setGeometry( 100, 100, 500, 355 )
-w.show
-a.exec
+#!/usr/bin/env ruby
+$VERBOSE = true; $:.unshift File.dirname($0)
+
+require 'Qt'
+require_relative 'lcdrange.rb'
+require_relative 'cannon.rb'
+
+class MyWidget < Qt::Widget
+  def initialize(parent = nil)
+    super
+    quit = Qt::PushButton.new('Quit')
+    quit.font = Qt::Font.new('Times', 18, Qt::Font::Bold)
+
+    connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()'))
+
+    angle = LCDRange.new(self)
+    angle.range = 5..70
+
+    cannonField = CannonField.new(self)
+
+    connect(angle, SIGNAL('valueChanged(int)'),
+            cannonField, SLOT('setAngle(int)'))
+    connect(cannonField, SIGNAL('angleChanged(int)'),
+            angle, SLOT('setValue(int)'))
+    gridLayout = Qt::GridLayout.new
+
+    gridLayout.addWidget(quit, 0, 0)
+    gridLayout.addWidget(angle, 1, 0)
+    gridLayout.addWidget(cannonField, 1, 1, 2, 1)
+    gridLayout.setColumnStretch(1, 10)
+    setLayout(gridLayout)
+
+    angle.setValue(60)
+    angle.setFocus()
+  end
+end
+
+a = Qt::Application.new(ARGV)
+
+w = MyWidget.new
+w.setGeometry(100, 100, 500, 355)
+w.show
+a.exec

data/lib/Qt4.rb

@@ -1,111 +1,119 @@
-windows = false
-platform = RUBY_PLATFORM.split("-")[1]
-windows = true if platform =~ /mswin32/ or platform =~ /mingw32/
-
-begin
-  require 'thread'
-  require 'qtbindings-qt'
-rescue LoadError
-  # Oh well - Hopefully not using the Windows binary gem
-end
-
-ruby_version = RUBY_VERSION.split('.')[0..1].join('.')
-if windows
-  ENV['PATH'] = File.join(File.dirname(__FILE__), '../bin') + ';' + File.join(File.dirname(__FILE__), "../lib/#{ruby_version}") + ';' + File.join(File.dirname(__FILE__), "../bin/#{ruby_version}") + ';' + ENV['PATH']
-end
-$: << File.join(File.dirname(__FILE__), "../lib/#{ruby_version}")
-require "#{ruby_version}/qtruby4"
-
-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
-
-  # Code which accesses the GUI must be executed in the main QT GUI thread.
-  # This method allows code in another thread to execute safely in the main GUI
-  # thread. By default it will block the main GUI thread until the code in the
-  # block completes althought this can be changed by passing false for the
-  # first parameter.
-  #
-  # @param blocking [Boolean] Whether to block the main thread until the code
-  #   in the block finishing executing. If false the main thread will be
-  #   allowed to continue and the block code will execute in parallel.
-  # @param sleep_period [Float] The amount of time to sleep between checking
-  #   whether the code in the block has finished executing
-  # @param delay_execution [Boolean] Only used if called from the main GUI
-  #   thread. Allows the block to be executed in parallel with the main thread.
-  def self.execute_in_main_thread (blocking = true, 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
+windows = false
+platform = RUBY_PLATFORM.split("-")[1]
+windows = true if platform =~ /mswin32/ or platform =~ /mingw32/
+
+begin
+  require 'thread'
+  require 'qtbindings-qt'
+rescue LoadError
+  # Oh well - Hopefully not using the Windows binary gem
+end
+
+ruby_version = RUBY_VERSION.split('.')[0..1].join('.')
+if windows
+  ENV['PATH'] = File.join(File.dirname(__FILE__), '../bin') + ';' + File.join(File.dirname(__FILE__), "../lib/#{ruby_version}") + ';' + File.join(File.dirname(__FILE__), "../bin/#{ruby_version}") + ';' + ENV['PATH']
+  begin
+    require 'ruby_installer'
+    RubyInstaller::Runtime.add_dll_directory(File.join(File.dirname(__FILE__), '../bin'))
+    RubyInstaller::Runtime.add_dll_directory(File.join(File.dirname(__FILE__), "../lib/#{ruby_version}"))
+    RubyInstaller::Runtime.add_dll_directory(File.join(File.dirname(__FILE__), "../bin/#{ruby_version}"))
+  rescue
+    # Oh well - Hopefully not Ruby 2.4+ on windows
+  end
+end
+$: << File.join(File.dirname(__FILE__), "../lib/#{ruby_version}")
+require "#{ruby_version}/qtruby4"
+
+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
+
+  # Code which accesses the GUI must be executed in the main QT GUI thread.
+  # This method allows code in another thread to execute safely in the main GUI
+  # thread. By default it will block the main GUI thread until the code in the
+  # block completes althought this can be changed by passing false for the
+  # first parameter.
+  #
+  # @param blocking [Boolean] Whether to block the main thread until the code
+  #   in the block finishing executing. If false the main thread will be
+  #   allowed to continue and the block code will execute in parallel.
+  # @param sleep_period [Float] The amount of time to sleep between checking
+  #   whether the code in the block has finished executing
+  # @param delay_execution [Boolean] Only used if called from the main GUI
+  #   thread. Allows the block to be executed in parallel with the main thread.
+  def self.execute_in_main_thread (blocking = true, 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