compilator 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23428a336f2cfc5e51baebbb09949dd2baa5c800
-  data.tar.gz: 5cfa57f67a36f6761dccf31b7a5e1c1b20e3be0e
+  metadata.gz: 9e18435dc97a5925f10d3514d70fb2fb55d9d3ca
+  data.tar.gz: 14a8d1ffa1d0ff3c3b4ca2a6e37418a22be2fc58
 SHA512:
-  metadata.gz: 0fe1eaa7b760be6f13bc36f670eabae8bac2d0c270237d25e9431a446ce46ced8b136c6c54d5b577df2a894dec7d2e87dfc0add2f2de226a7f6f67414695e8be
-  data.tar.gz: 36961c24a2e20d5dfb0ce6ab02947120747eef6c3a078b038fb70ad10c3d103c5fa5dc63ae11ad87e722e62c2020e6527a64bacdd4e509d3efbdf1e9ee266072
+  metadata.gz: 1d9f218bdd690d0a063d93ea5f08e660c6191ffc3a8d9016fac4b9a5529afa28dd342d74a4ad0c24b7b44460fe8ee056a9f956df5e73cfa746f632e58f062572
+  data.tar.gz: c802bbc8f61c9ab889b409dbd1c9924de6ebfbb4c8c45e47698e355f6e6809e2e89b26bc476618205102c7bad9e78b926b31e1c96fa5961d4e64004a7f5a84ac

data/lib/compilator/version.rb

@@ -1,3 +1,3 @@
 module Compilator
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/compilator.rb

@@ -1,7 +1,8 @@
 require_relative 'compilator/version'
 
 require 'druzy/mvc'
-require 'gtk3'
+require 'tk'
+require 'tkextlib/tile'
 
 module Compilator
   
@@ -75,144 +76,167 @@ module Compilator
   
     def initialize(controller)
       super(controller)
+      #Tk::Tile::Style.theme_use "classic"
       
-      @window = Gtk::Window.new
-      @window.title = 'COMPILATOR'
-      @window.signal_connect('key_press_event') do |widget, event|
-        val = Gdk::Keyval.name(Gdk::Keyval.to_lower(event.keyval))
+      @root = TkRoot.new
+      @root.title = 'Compilator'
+      @root.bind('Key') do |event|
+        val = event.valid_fields['keysym'].downcase
         
-        if controller.model.score.has_key?(val)
+        if val == 'return'
           Thread.new do
-            controller.notify_action(self,:key_pressed, :key => val)
+            @controller.notify_action(self, :key_enter_pressed, :value => @entry_variable.value)
           end
-          
-        elsif event.keyval == Gdk::Keyval::KEY_Return
+        elsif @controller.model.score.has_key?(val)
           Thread.new do
-            controller.notify_action(self, :key_enter_pressed, :value => @entry.text)
-          end
-        end
-      end
-      @window.signal_connect('delete-event') do 
-        Thread.new do
-          controller.notify_action(self,:close_window)
+            @controller.notify_action(self,:key_pressed, :key => val)
+          end  
         end
+        
       end
       
-      @entry = Gtk::Entry.new
-      @entry.editable = false
-      @entry.xalign = 1
+      @window = Tk::Tile::Frame.new(@root)
+      
+      @entry_variable = TkVariable.new
+      @entry = Tk::Tile::Entry.new(@window)
+      @entry.justify = 'right'
+      @entry.validate = 'key'
+      @entry.textvariable = @entry_variable 
+      @entry.validatecommand do |valid|
+        if valid.action == 1
+         false
+       else
+         true
+       end          
+      end
       
-      @button_r = Gtk::Button.new
-      @button_r.add(Gtk::Label.new.set_markup('<span size="xx-large" foreground="red">R</span>'))
-      @button_r.signal_connect("clicked") do
+      @button_r = Tk::Tile::Button.new(@window)
+      @button_r['text'] = 'R'
+      Tk::Tile::Style.configure('Red.TButton', {"foreground" => 'red'  })
+      @button_r['style'] = 'Red.TButton'
+      @button_r.bind('ButtonPress') do
         Thread.new do
-          controller.notify_action(self,:button_pressed, :key => 'r')
+          @controller.notify_action(self,:button_pressed, :key => 'r')
         end
       end
-
-      @button_o = Gtk::Button.new
-      @button_o.add(Gtk::Label.new.set_markup('<span size="xx-large" foreground="orange">O</span>'))
-      @button_o.signal_connect("clicked") do
+            
+      @button_o = Tk::Tile::Button.new(@window)
+      @button_o['text'] = 'O'
+      Tk::Tile::Style.configure('Orange.TButton', {"foreground" => 'orange'  })
+      @button_o['style'] = 'Orange.TButton'
+      @button_o.bind('ButtonPress') do
         Thread.new do
-          controller.notify_action(self,:button_pressed, :key => 'o')
+          @controller.notify_action(self,:button_pressed, :key => 'o')
         end
       end
-
-      @button_j = Gtk::Button.new
-      @button_j.add(Gtk::Label.new.set_markup('<span size="xx-large" foreground="yellow">J</span>'))
-      @button_j.signal_connect("clicked") do
+      
+      @button_j = Tk::Tile::Button.new(@window)
+      @button_j['text'] = 'J'
+      Tk::Tile::Style.configure('Yellow.TButton', {"foreground" => 'yellow'  })
+      @button_j['style'] = 'Yellow.TButton'
+      @button_j.bind('ButtonPress') do
         Thread.new do
-          controller.notify_action(self,:button_pressed, :key => 'j')
+          @controller.notify_action(self,:button_pressed, :key => 'j')
         end
       end
-
-      @button_c = Gtk::Button.new
-      @button_c.add(Gtk::Label.new.set_markup('<span size="xx-large" foreground="lime">C</span>'))
-      @button_c.signal_connect("clicked") do
+      
+      @button_c = Tk::Tile::Button.new(@window)
+      @button_c['text'] = 'C'
+      Tk::Tile::Style.configure('Lime.TButton', {"foreground" => 'lime'  })
+      @button_c['style'] = 'Lime.TButton'
+      @button_c.bind('ButtonPress') do
         Thread.new do
-          controller.notify_action(self,:button_pressed, :key => 'c')
+          @controller.notify_action(self,:button_pressed, :key => 'c')
         end
       end
-
-      @button_v = Gtk::Button.new
-      @button_v.add(Gtk::Label.new.set_markup('<span size="xx-large" foreground="green">V</span>'))
-      @button_v.signal_connect("clicked") do
+      
+      @button_v = Tk::Tile::Button.new(@window)
+      @button_v['text'] = 'V'
+      Tk::Tile::Style.configure('Green.TButton', {"foreground" => 'green'  })
+      @button_v['style'] = 'Green.TButton'
+      @button_v.bind('ButtonPress') do
         Thread.new do
-          controller.notify_action(self,:button_pressed, :key => 'v')
+          @controller.notify_action(self,:button_pressed, :key => 'v')
         end
       end
-
-      @button_e = Gtk::Button.new
-      @button_e.add(Gtk::Label.new.set_markup('<span underline="single" size="xx-large" foreground="green">E</span>'))
-      @button_e.signal_connect("clicked") do
+      
+      @button_e = Tk::Tile::Button.new(@window)
+      @button_e['text'] = 'E'
+      @button_e['underline'] = 0
+      Tk::Tile::Style.configure('Underline.TButton', {"foreground" => 'green'})
+      @button_e['style'] = 'Underline.TButton'
+      @button_e.bind('ButtonPress') do
         Thread.new do
-          controller.notify_action(self,:button_pressed, :key => 'e')
+          @controller.notify_action(self,:button_pressed, :key => 'e')
         end
       end
-
-      @button_equal = Gtk::Button.new(:label => '=')
-      @button_equal.signal_connect("clicked") do
+      
+      @button_raz = Tk::Tile::Button.new(@window)
+      @button_raz['text'] = 'RàZ'
+      @button_raz.bind('ButtonPress') do
         Thread.new do
-          controller.notify_action(self,:button_equal_pressed, :value => @entry.text)
+          @controller.notify_action(self,:button_raz_pressed)
         end
       end
       
-      @button_raz = Gtk::Button.new(:label => "RàZ")
-      @button_raz.signal_connect("clicked") do
+      @button_equal = Tk::Tile::Button.new(@window)
+      @button_equal['text'] = '='
+      @button_equal.bind('ButtonPress') do
         Thread.new do
-          controller.notify_action(self,:button_raz_pressed)
+          @controller.notify_action(self,:button_equal_pressed, :value => @entry_variable.value)
         end
       end
       
-      @label_result = Gtk::Label.new("0")
-      @label_result.xalign = 1
+      @label_result = Tk::Tile::Label.new(@window)
+      @label_result.justify('right')
       
-      #container
-      @onglet = Gtk::Notebook.new
-       
-      @main_vbox = Gtk::Box.new(:vertical, 0)
+      #ajout
+      TkGrid.columnconfigure( @root, 0, :weight => 1 )
+      TkGrid.rowconfigure( @root, 0, :weight => 1 )
       
-      @grid_button = Gtk::Grid.new
-      @grid_button.set_property("row_homogeneous",true)
-      @grid_button.set_property("column-homogeneous", true)
+      TkGrid.columnconfigure( @window, 0, :weight => 1)
+      TkGrid.columnconfigure( @window, 1, :weight => 1 )
+      TkGrid.columnconfigure( @window, 2, :weight => 1 )
+      TkGrid.rowconfigure( @window, 0, :weight => 0)
+      TkGrid.rowconfigure( @window, 1, :weight => 1)
+      TkGrid.rowconfigure( @window, 2, :weight => 1)
+      TkGrid.rowconfigure( @window, 3, :weight => 1)
+      TkGrid.rowconfigure( @window, 4, :weight => 0)
+      
+      @window.grid(:column => 0, :row => 0, :sticky => 'nsew')
+      
+      @entry.grid(:column => 0, :row => 0, :columnspan => 3, :sticky => 'new')
+      
+
+      @button_r.grid(:column => 0, :row => 1, :sticky => 'nsew')
+      @button_o.grid(:column => 1, :row => 1, :sticky => 'nsew')
+      @button_j.grid(:column => 2, :row => 1, :sticky => 'ewns')
+      @button_c.grid(:column => 0, :row => 2, :sticky => 'ewns')
+      @button_v.grid(:column => 1, :row => 2, :sticky => 'ewns')
+      @button_e.grid(:column => 2, :row => 2, :sticky => 'ewns')
+      @button_raz.grid(:column => 0, :row => 3, :sticky => 'ewns')
+      @button_equal.grid(:column => 1, :row => 3, :columnspan => 2, :sticky => 'ewns')
+      
+      @label_result.grid(:column => 0, :row => 4, :columnspan => 3, :sticky => 'ew')
       
-      #ajout
-      @onglet.append_page(@main_vbox, Gtk::Label.new("Calculatrice"))
-      
-      @window.add(@onglet)
-      
-      @main_vbox.pack_start(@entry, :expand => false)
-      @main_vbox.pack_start(@grid_button,:expand => true, :fill => true, :padding => 10)
-      @main_vbox.pack_start(@label_result, :expand => false, :padding => 10)
-      
-      @grid_button.attach(@button_r,0,0,1,1,)
-      @grid_button.attach(@button_o,1,0,1,1)
-      @grid_button.attach(@button_j,2,0,1,1)
-      @grid_button.attach(@button_c,0,1,1,1)
-      @grid_button.attach(@button_v,1,1,1,1)
-      @grid_button.attach(@button_e,2,1,1,1)
-      @grid_button.attach(@button_raz,0,2,1,1)
-      @grid_button.attach(@button_equal,1,2,2,1)
     end
     
     def display
-      @window.show_all
     end
     
     def close
-      @window.destroy
-      Gtk.main_quit
     end
   
     def property_change(event)
       if event.property_name == "last_key_pressed"
-        @entry.text = @entry.text+event.new_value
+        @entry_variable.set_value(@entry_variable.value+event.new_value)
         
       elsif event.property_name == 'result'
+        
         @label_result.text = event.new_value.to_s 
         
       elsif event.property_name == 'raz'
-        @entry.text = ''
+        @entry_variable.set_value('')
       end
     end
   
@@ -220,11 +244,6 @@ module Compilator
   
 end
 
-Gtk.init
-Thread.new do
-  Gtk.main
-end
-
 Compilator::Compilator.new.display_views
 
-Thread.list.each {|t| t.join if t!=Thread.main}
+Tk.mainloop

data/lib/compilator.rb.old

@@ -0,0 +1,230 @@
+require_relative 'compilator/version'
+
+require 'druzy/mvc'
+require 'gtk3'
+
+module Compilator
+  
+  class Compilator < Druzy::MVC::Controller
+    
+    def initialize(model = nil)
+      if model == nil
+        initialize(CompilatorModel.new)  
+      else
+        super(model)
+        add_view(CompilatorView.new(self))
+      end
+      
+    end
+    
+    def notify_action(view,action,kwargs={})
+      
+      if action == :key_pressed || action == :button_pressed
+        model.last_key_pressed = kwargs[:key]
+      
+      elsif action == :key_enter_pressed
+        notify_action(view,:button_equal_pressed,kwargs)
+              
+      elsif action == :button_equal_pressed
+        numerateur = 0
+        kwargs[:value].each_char do |c|
+          numerateur = numerateur+model.score[c]
+        end
+        denominateur = kwargs[:value].size*5
+        model.result = numerateur.to_s+"/"+denominateur.to_s+" => "+(numerateur*20.to_f/denominateur).round(2).to_s+"/20"
+        
+      elsif action == :button_raz_pressed
+        model.raz = true
+        
+      elsif action == :close_window 
+        view.close
+      end 
+    end
+  end
+  
+  class CompilatorModel < Druzy::MVC::Model
+    
+    attr_accessor :score, :last_key_pressed, :result
+    
+    
+    def initialize
+      super()
+      @score = {'r' => 0, 'o' => 1, 'j' => 2, 'c' => 3, 'v' => 4, 'e' => 5}
+      @last_key_pressed = nil
+      @result = nil
+      @raz = false
+    end
+    
+    def last_key_pressed=(last_key_pressed)
+      old, @last_key_pressed = @last_key_pressed, last_key_pressed
+      fire_property_change(Druzy::MVC::PropertyChangeEvent.new(self,"last_key_pressed",old,@last_key_pressed))
+    end
+    
+    def result=(result)
+      old, @result = @result, result
+      fire_property_change(Druzy::MVC::PropertyChangeEvent.new(self,"result",old,@result))
+    end
+    
+    def raz=(raz)
+      old, @raz = @raz, raz
+      fire_property_change(Druzy::MVC::PropertyChangeEvent.new(self,"raz",old,@raz))
+    end
+  end
+  
+  class CompilatorView < Druzy::MVC::View
+  
+    def initialize(controller)
+      super(controller)
+      
+      @window = Gtk::Window.new
+      @window.title = 'COMPILATOR'
+      @window.signal_connect('key_press_event') do |widget, event|
+        val = Gdk::Keyval.name(Gdk::Keyval.to_lower(event.keyval))
+        
+        if controller.model.score.has_key?(val)
+          Thread.new do
+            controller.notify_action(self,:key_pressed, :key => val)
+          end
+          
+        elsif event.keyval == Gdk::Keyval::KEY_Return
+          Thread.new do
+            controller.notify_action(self, :key_enter_pressed, :value => @entry.text)
+          end
+        end
+      end
+      @window.signal_connect('delete-event') do 
+        Thread.new do
+          controller.notify_action(self,:close_window)
+        end
+      end
+      
+      @entry = Gtk::Entry.new
+      @entry.editable = false
+      @entry.xalign = 1
+      
+      @button_r = Gtk::Button.new
+      @button_r.add(Gtk::Label.new.set_markup('<span size="xx-large" foreground="red">R</span>'))
+      @button_r.signal_connect("clicked") do
+        Thread.new do
+          controller.notify_action(self,:button_pressed, :key => 'r')
+        end
+      end
+
+      @button_o = Gtk::Button.new
+      @button_o.add(Gtk::Label.new.set_markup('<span size="xx-large" foreground="orange">O</span>'))
+      @button_o.signal_connect("clicked") do
+        Thread.new do
+          controller.notify_action(self,:button_pressed, :key => 'o')
+        end
+      end
+
+      @button_j = Gtk::Button.new
+      @button_j.add(Gtk::Label.new.set_markup('<span size="xx-large" foreground="yellow">J</span>'))
+      @button_j.signal_connect("clicked") do
+        Thread.new do
+          controller.notify_action(self,:button_pressed, :key => 'j')
+        end
+      end
+
+      @button_c = Gtk::Button.new
+      @button_c.add(Gtk::Label.new.set_markup('<span size="xx-large" foreground="lime">C</span>'))
+      @button_c.signal_connect("clicked") do
+        Thread.new do
+          controller.notify_action(self,:button_pressed, :key => 'c')
+        end
+      end
+
+      @button_v = Gtk::Button.new
+      @button_v.add(Gtk::Label.new.set_markup('<span size="xx-large" foreground="green">V</span>'))
+      @button_v.signal_connect("clicked") do
+        Thread.new do
+          controller.notify_action(self,:button_pressed, :key => 'v')
+        end
+      end
+
+      @button_e = Gtk::Button.new
+      @button_e.add(Gtk::Label.new.set_markup('<span underline="single" size="xx-large" foreground="green">E</span>'))
+      @button_e.signal_connect("clicked") do
+        Thread.new do
+          controller.notify_action(self,:button_pressed, :key => 'e')
+        end
+      end
+
+      @button_equal = Gtk::Button.new(:label => '=')
+      @button_equal.signal_connect("clicked") do
+        Thread.new do
+          controller.notify_action(self,:button_equal_pressed, :value => @entry.text)
+        end
+      end
+      
+      @button_raz = Gtk::Button.new(:label => "RàZ")
+      @button_raz.signal_connect("clicked") do
+        Thread.new do
+          controller.notify_action(self,:button_raz_pressed)
+        end
+      end
+      
+      @label_result = Gtk::Label.new("0")
+      @label_result.xalign = 1
+      
+      #container
+      @onglet = Gtk::Notebook.new
+       
+      @main_vbox = Gtk::Box.new(:vertical, 0)
+      
+      @grid_button = Gtk::Grid.new
+      @grid_button.set_property("row_homogeneous",true)
+      @grid_button.set_property("column-homogeneous", true)
+      
+      #ajout
+      @onglet.append_page(@main_vbox, Gtk::Label.new("Calculatrice"))
+      
+      @window.add(@onglet)
+      
+      @main_vbox.pack_start(@entry, :expand => false)
+      @main_vbox.pack_start(@grid_button,:expand => true, :fill => true, :padding => 10)
+      @main_vbox.pack_start(@label_result, :expand => false, :padding => 10)
+      
+      @grid_button.attach(@button_r,0,0,1,1,)
+      @grid_button.attach(@button_o,1,0,1,1)
+      @grid_button.attach(@button_j,2,0,1,1)
+      @grid_button.attach(@button_c,0,1,1,1)
+      @grid_button.attach(@button_v,1,1,1,1)
+      @grid_button.attach(@button_e,2,1,1,1)
+      @grid_button.attach(@button_raz,0,2,1,1)
+      @grid_button.attach(@button_equal,1,2,2,1)
+    end
+    
+    def display
+      @window.show_all
+    end
+    
+    def close
+      @window.destroy
+      Gtk.main_quit
+    end
+  
+    def property_change(event)
+      if event.property_name == "last_key_pressed"
+        @entry.text = @entry.text+event.new_value
+        
+      elsif event.property_name == 'result'
+        @label_result.text = event.new_value.to_s 
+        
+      elsif event.property_name == 'raz'
+        @entry.text = ''
+      end
+    end
+  
+  end
+  
+end
+
+Gtk.init
+Thread.new do
+  Gtk.main
+end
+
+Compilator::Compilator.new.display_views
+
+Thread.list.each {|t| t.join if t!=Thread.main}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compilator
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jonathan Le Greneur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-04 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: druzy-mvc
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: gtk3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -74,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/compilator.rb
+- lib/compilator.rb.old
 - lib/compilator/version.rb
 homepage: https://github.com/druzy/compilator
 licenses: