qtbindings 4.8.6.3-x86-mingw32 → 4.8.6.4-x86-mingw32

data/examples/tutorial/t12/lcdrange.rb

@@ -1,59 +1,58 @@
-require 'Qt'
-require 'pp'
-
-class LCDRange < Qt::Widget
-    signals 'valueChanged(int)'
-    slots 'setValue(int)', 'setRange(int, int)', 'setText(const char *)'
-
-    def initialize(s, parent = nil)
-        super(parent)
-        init()
-        setText(s)
-    end
-    
-    def init()
-        lcd = Qt::LCDNumber.new(2)
-        @slider = Qt::Slider.new(Qt::Horizontal)
-        @slider.range = 0..99
-        @slider.setValue(0)
-        @label = Qt::Label.new( ' ' )
-        @label.setAlignment( Qt::AlignHCenter.to_i | Qt::AlignTop.to_i )
-
-        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
-      		qWarning( "LCDRange::setRange(#{minVal},#{maxVal})\n" +
-               		"\tRange must be 0..99\n" +
-               		"\tand minVal must not be greater than maxVal" )
-			return
-		end
-        @slider.range = minVal..maxVal
-    end
-    
-    def setText( s )
-        @label.setText( s )
-    end
-
-end
+require 'Qt'
+require 'pp'
+
+class LCDRange < Qt::Widget
+  signals 'valueChanged(int)'
+  slots 'setValue(int)', 'setRange(int, int)', 'setText(const char *)'
+
+  def initialize(s, parent = nil)
+    super(parent)
+    init()
+    setText(s)
+  end
+
+  def init()
+    lcd = Qt::LCDNumber.new(2)
+    @slider = Qt::Slider.new(Qt::Horizontal)
+    @slider.range = 0..99
+    @slider.setValue(0)
+    @label = Qt::Label.new(' ')
+    @label.setAlignment(Qt::AlignHCenter.to_i | Qt::AlignTop.to_i)
+
+    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
+      qWarning("LCDRange::setRange(#{minVal},#{maxVal})\n" +
+               "\tRange must be 0..99\n" +
+               "\tand minVal must not be greater than maxVal")
+      return
+    end
+    @slider.range = minVal..maxVal
+  end
+
+  def setText(s)
+    @label.setText(s)
+  end
+end

data/examples/tutorial/t12/t12.rb

@@ -1,66 +1,65 @@
-#!/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( 'ANGLE' )
-        angle.range = 5..70
-        
-        force  = LCDRange.new( 'FORCE' )
-        force.range = 10..50
-        
-        cannonField = CannonField.new( self )
-
-        connect( angle, SIGNAL('valueChanged(int)'),
-                cannonField, SLOT('setAngle(int)') )
-        connect( cannonField, SIGNAL('angleChanged(int)'),
-                angle, SLOT('setValue(int)') )
-
-        connect( force, SIGNAL('valueChanged(int)'),
-                cannonField, SLOT('setForce(int)') )
-        connect( cannonField, SIGNAL('forceChanged(int)'),
-                force, SLOT('setValue(int)') )
-        
-        shoot = Qt::PushButton.new( '&Shoot' )
-        shoot.setFont( Qt::Font.new( 'Times', 18, Qt::Font::Bold ) )
-
-        connect( shoot, SIGNAL('clicked()'), cannonField, SLOT('shoot()') )
-            
-        topLayout = Qt::HBoxLayout.new
-        topLayout.addWidget(shoot)
-        topLayout.addStretch(1)
-
-        leftLayout = Qt::VBoxLayout.new()
-        leftLayout.addWidget( angle )
-        leftLayout.addWidget( force )
-
-        gridLayout = Qt::GridLayout.new
-        gridLayout.addWidget( quit, 0, 0 )
-        gridLayout.addLayout(topLayout, 0, 1)
-        gridLayout.addLayout(leftLayout, 1, 0)
-        gridLayout.addWidget( cannonField, 1, 1, 2, 1 )
-        gridLayout.setColumnStretch( 1, 10 )
-		setLayout(gridLayout)
-    
-        angle.setValue( 60 )
-        force.setValue( 25 )
-        angle.setFocus()
-    end
-end    
-
-app = Qt::Application.new(ARGV)
-widget = MyWidget.new
-widget.setGeometry( 100, 100, 500, 355 )
-widget.show
-app.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('ANGLE')
+    angle.range = 5..70
+
+    force = LCDRange.new('FORCE')
+    force.range = 10..50
+
+    cannonField = CannonField.new(self)
+
+    connect(angle, SIGNAL('valueChanged(int)'),
+            cannonField, SLOT('setAngle(int)'))
+    connect(cannonField, SIGNAL('angleChanged(int)'),
+            angle, SLOT('setValue(int)'))
+
+    connect(force, SIGNAL('valueChanged(int)'),
+            cannonField, SLOT('setForce(int)'))
+    connect(cannonField, SIGNAL('forceChanged(int)'),
+            force, SLOT('setValue(int)'))
+
+    shoot = Qt::PushButton.new('&Shoot')
+    shoot.setFont(Qt::Font.new('Times', 18, Qt::Font::Bold))
+
+    connect(shoot, SIGNAL('clicked()'), cannonField, SLOT('shoot()'))
+
+    topLayout = Qt::HBoxLayout.new
+    topLayout.addWidget(shoot)
+    topLayout.addStretch(1)
+
+    leftLayout = Qt::VBoxLayout.new()
+    leftLayout.addWidget(angle)
+    leftLayout.addWidget(force)
+
+    gridLayout = Qt::GridLayout.new
+    gridLayout.addWidget(quit, 0, 0)
+    gridLayout.addLayout(topLayout, 0, 1)
+    gridLayout.addLayout(leftLayout, 1, 0)
+    gridLayout.addWidget(cannonField, 1, 1, 2, 1)
+    gridLayout.setColumnStretch(1, 10)
+    setLayout(gridLayout)
+
+    angle.setValue(60)
+    force.setValue(25)
+    angle.setFocus()
+  end
+end
+
+app = Qt::Application.new(ARGV)
+widget = MyWidget.new
+widget.setGeometry(100, 100, 500, 355)
+widget.show
+app.exec

data/examples/tutorial/t13/cannon.rb

@@ -1,208 +1,206 @@
-require 'Qt'
-include Math
-
-class CannonField < Qt::Widget
-    
-    signals 'hit()', 'missed()', 'angleChanged(int)', 'forceChanged(int)', 
-            'canShoot(bool)'
-    
-    slots   'setAngle(int)', 'setForce(int)', 'shoot()', 'moveShot()', 
-            'newTarget()', 'setGameOver()', 'restartGame()'
-    
-    
-    def initialize(parent = nil)
-        super
-        @currentAngle = 45
-        @currentForce = 0
-        @timerCount = 0;
-        @autoShootTimer = Qt::Timer.new( self )
-        connect( @autoShootTimer, SIGNAL('timeout()'),
-                 self, SLOT('moveShot()') );
-        @shootAngle = 0
-        @shootForce = 0
-        @target = Qt::Point.new(0, 0)
-        @gameEnded = false
-        setPalette( Qt::Palette.new( Qt::Color.new( 250, 250, 200) ) )
-        setAutoFillBackground(true)
-        newTarget()
-        @barrelRect = Qt::Rect.new(33, -4, 15, 8)
-    end
-
-    def angle() 
-        return @currentAngle 
-    end
-
-    def force() 
-        return @currentForce 
-    end
-
-    def gameOver() 
-        return @gameEnded 
-    end
-
-    def setAngle( degrees )
-        if degrees < 5
-            degrees = 5
-        elsif degrees > 70
-            degrees = 70
-        end
-        if @currentAngle == degrees
-            return
-        end
-        @currentAngle = degrees
-        update( cannonRect() )
-        emit angleChanged( @currentAngle )
-    end
-    
-    def setForce( newton )
-        if newton < 0
-            newton = 0
-        end
-        if @currentForce == newton
-            return
-        end
-        @currentForce = newton
-        emit forceChanged( @currentForce )
-    end
-    
-    def shoot()
-        if isShooting()
-            return
-        end
-        @timerCount = 0
-        @shootAngle = @currentAngle
-        @shootForce = @currentForce
-        @autoShootTimer.start( 50 )
-		emit canShoot( false )
-    end
-
-    @@first_time = true
-    
-    def newTarget()
-        if @@first_time
-            @@first_time = false
-            midnight = Qt::Time.new( 0, 0, 0 )
-            srand( midnight.secsTo(Qt::Time.currentTime()) )
-        end
-        @target = Qt::Point.new( 200 + rand(190), 10  + rand(255) )
-        update()
-    end
-    
-    def setGameOver()
-        if @gameEnded
-            return
-        end
-        if isShooting()
-            @autoShootTimer.stop()
-        end
-        @gameEnded = true
-        update()
-    end
-
-    def restartGame()
-        if isShooting()
-            @autoShootTimer.stop()
-        end
-        @gameEnded = false
-        update()
-        emit canShoot( true )
-    end
-    
-    def moveShot()
-        r = Qt::Region.new( shotRect() )
-        @timerCount += 1
-
-        shotR = shotRect()
-
-        if shotR.intersects( targetRect() ) 
-            @autoShootTimer.stop()
-            emit hit()
-            emit canShoot(true)
-        elsif shotR.x() > width() || shotR.y() > height()
-            @autoShootTimer.stop()
-            emit missed()
-            emit canShoot(true)
-        else
-            r = r.unite( Qt::Region.new( shotR ) )
-        end
-        
-        update( r )
-    end
-
-    def paintEvent( e )
-        painter = Qt::Painter.new( self )
-
-        if @gameEnded
-            painter.setPen( Qt::black )
-            painter.setFont( Qt::Font.new( "Courier", 48, Qt::Font::Bold ) )
-            painter.drawText( rect(), Qt::AlignCenter, "Game Over" )
-        end
-        paintCannon(painter)
-        if isShooting()
-            paintShot( painter )
-        end        
-        if !@gameEnded
-            paintTarget( painter )
-        end
-        painter.end()
-    end
-
-    def paintShot( painter )
-        painter.setPen( Qt::NoPen )
-        painter.setBrush( Qt::Brush.new(Qt::black) )
-        painter.drawRect( shotRect() )
-    end
-
-    def paintTarget( painter )
-        painter.setBrush( Qt::Brush.new(Qt::red) )
-        painter.setPen( Qt::Pen.new(Qt::Color.new(Qt::black)) )
-        painter.drawRect( targetRect() )
-    end
-    
-    def paintCannon(painter)                
-        painter.setPen(Qt::NoPen)
-        painter.setBrush(Qt::Brush.new(Qt::blue))
-
-        painter.save()
-        painter.translate(0, height())
-        painter.drawPie( Qt::Rect.new(-35, -35, 70, 70), 0, 90*16 )
-        painter.rotate( - @currentAngle )
-        painter.drawRect( @barrelRect )
-        painter.restore()
-    end
-
-    def cannonRect()
-        r = Qt::Rect.new( 0, 0, 50, 50)
-        r.moveBottomLeft( rect().bottomLeft() )
-        return r
-    end
-    
-    def shotRect()
-        gravity = 4.0
-
-        time      = @timerCount / 4.0
-        velocity  = @shootForce
-        radians   = @shootAngle*3.14159265/180.0
-
-        velx      = velocity*cos( radians )
-        vely      = velocity*sin( radians )
-        x0        = ( @barrelRect.right()  + 5.0 )*cos(radians)
-        y0        = ( @barrelRect.right()  + 5.0 )*sin(radians)
-        x         = x0 + velx*time
-        y         = y0 + vely*time - 0.5*gravity*time*time
-
-        r = Qt::Rect.new( 0, 0, 6, 6 );
-        r.moveCenter( Qt::Point.new( x.round, height() - 1 - y.round ) )
-        return r
-    end
-
-    def targetRect()
-        r = Qt::Rect.new( 0, 0, 20, 10 )
-        r.moveCenter( Qt::Point.new(@target.x(), height() - 1 - @target.y()) )
-        return r
-    end
-    
-    def isShooting()
-        return @autoShootTimer.isActive()
-    end
-end
+require 'Qt'
+include Math
+
+class CannonField < Qt::Widget
+  signals 'hit()', 'missed()', 'angleChanged(int)', 'forceChanged(int)',
+          'canShoot(bool)'
+
+  slots   'setAngle(int)', 'setForce(int)', 'shoot()', 'moveShot()',
+          'newTarget()', 'setGameOver()', 'restartGame()'
+
+  def initialize(parent = nil)
+    super
+    @currentAngle = 45
+    @currentForce = 0
+    @timerCount = 0;
+    @autoShootTimer = Qt::Timer.new(self)
+    connect(@autoShootTimer, SIGNAL('timeout()'),
+             self, SLOT('moveShot()'));
+    @shootAngle = 0
+    @shootForce = 0
+    @target = Qt::Point.new(0, 0)
+    @gameEnded = false
+    setPalette(Qt::Palette.new(Qt::Color.new(250, 250, 200)))
+    setAutoFillBackground(true)
+    newTarget()
+    @barrelRect = Qt::Rect.new(33, -4, 15, 8)
+  end
+
+  def angle()
+    return @currentAngle
+  end
+
+  def force()
+    return @currentForce
+  end
+
+  def gameOver()
+    return @gameEnded
+  end
+
+  def setAngle(degrees)
+    if degrees < 5
+      degrees = 5
+    elsif degrees > 70
+      degrees = 70
+    end
+    if @currentAngle == degrees
+      return
+    end
+    @currentAngle = degrees
+    update(cannonRect())
+    emit angleChanged(@currentAngle)
+  end
+
+  def setForce(newton)
+    if newton < 0
+      newton = 0
+    end
+    if @currentForce == newton
+      return
+    end
+    @currentForce = newton
+    emit forceChanged(@currentForce)
+  end
+
+  def shoot()
+    if isShooting()
+      return
+    end
+    @timerCount = 0
+    @shootAngle = @currentAngle
+    @shootForce = @currentForce
+    @autoShootTimer.start(50)
+    emit canShoot(false)
+  end
+
+  @@first_time = true
+
+  def newTarget()
+    if @@first_time
+      @@first_time = false
+      midnight = Qt::Time.new(0, 0, 0)
+      srand(midnight.secsTo(Qt::Time.currentTime()))
+    end
+    @target = Qt::Point.new(200 + rand(190), 10 + rand(255))
+    update()
+  end
+
+  def setGameOver()
+    if @gameEnded
+      return
+    end
+    if isShooting()
+      @autoShootTimer.stop()
+    end
+    @gameEnded = true
+    update()
+  end
+
+  def restartGame()
+    if isShooting()
+      @autoShootTimer.stop()
+    end
+    @gameEnded = false
+    update()
+    emit canShoot(true)
+  end
+
+  def moveShot()
+    r = Qt::Region.new(shotRect())
+    @timerCount += 1
+
+    shotR = shotRect()
+
+    if shotR.intersects(targetRect())
+      @autoShootTimer.stop()
+      emit hit()
+      emit canShoot(true)
+    elsif shotR.x() > width() || shotR.y() > height()
+      @autoShootTimer.stop()
+      emit missed()
+      emit canShoot(true)
+    else
+      r = r.unite(Qt::Region.new(shotR))
+    end
+
+    update(r)
+  end
+
+  def paintEvent(e)
+    painter = Qt::Painter.new(self)
+
+    if @gameEnded
+      painter.setPen(Qt::black)
+      painter.setFont(Qt::Font.new("Courier", 48, Qt::Font::Bold))
+      painter.drawText(rect(), Qt::AlignCenter, "Game Over")
+    end
+    paintCannon(painter)
+    if isShooting()
+      paintShot(painter)
+    end
+    if !@gameEnded
+      paintTarget(painter)
+    end
+    painter.end()
+  end
+
+  def paintShot(painter)
+    painter.setPen(Qt::NoPen)
+    painter.setBrush(Qt::Brush.new(Qt::black))
+    painter.drawRect(shotRect())
+  end
+
+  def paintTarget(painter)
+    painter.setBrush(Qt::Brush.new(Qt::red))
+    painter.setPen(Qt::Pen.new(Qt::Color.new(Qt::black)))
+    painter.drawRect(targetRect())
+  end
+
+  def paintCannon(painter)
+    painter.setPen(Qt::NoPen)
+    painter.setBrush(Qt::Brush.new(Qt::blue))
+
+    painter.save()
+    painter.translate(0, height())
+    painter.drawPie(Qt::Rect.new(-35, -35, 70, 70), 0, 90 * 16)
+    painter.rotate(- @currentAngle)
+    painter.drawRect(@barrelRect)
+    painter.restore()
+  end
+
+  def cannonRect()
+    r = Qt::Rect.new(0, 0, 50, 50)
+    r.moveBottomLeft(rect().bottomLeft())
+    return r
+  end
+
+  def shotRect()
+    gravity = 4.0
+
+    time      = @timerCount / 4.0
+    velocity  = @shootForce
+    radians   = @shootAngle * 3.14159265 / 180.0
+
+    velx      = velocity * cos(radians)
+    vely      = velocity * sin(radians)
+    x0        = (@barrelRect.right()  + 5.0) * cos(radians)
+    y0        = (@barrelRect.right()  + 5.0) * sin(radians)
+    x         = x0 + velx * time
+    y         = y0 + vely * time - 0.5 * gravity * time * time
+
+    r = Qt::Rect.new(0, 0, 6, 6);
+    r.moveCenter(Qt::Point.new(x.round, height() - 1 - y.round))
+    return r
+  end
+
+  def targetRect()
+    r = Qt::Rect.new(0, 0, 20, 10)
+    r.moveCenter(Qt::Point.new(@target.x(), height() - 1 - @target.y()))
+    return r
+  end
+
+  def isShooting()
+    return @autoShootTimer.isActive()
+  end
+end