compilator 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14278249ee5b9a507d40073db9b7a92b392b38fd
-  data.tar.gz: 676b006a453d8cb101da7ab58c596823cc28b321
+  metadata.gz: c1eee5eae5f10d32df205126d3370343e7b6bb45
+  data.tar.gz: 6b1e6e076a90fcab32ba1b6c43fa69014a4f944f
 SHA512:
-  metadata.gz: fa1cb7b4ab01c0bac652df2e059e108d65cdfcb692b205177c3145064876b1ddb3b071ec9f15a90d56dc5045ccb0ef87255bfee5b538df574ba77cd3094426ec
-  data.tar.gz: 578770a4cd912fabed36009c70d38d878767801dce89841c4cdef7dc744727a240061996eba4a51d3a7dd108c9fcdada125ee41f9fb524525db9e9e3ff5e1f69
+  metadata.gz: 876863003618cc44fbb63f3e0e6a9523ce43cb53f954547a07aea0a04158bb1d344f508287ab49d97fbc63b586202f9ddbb29ab62293641f7440cc6a606b8c64
+  data.tar.gz: 32a8a8b8acc46acc0d50371e9b85b90144c16bb0dbc16305141ac150f378dbf1cfd1a95bb321155666646f74bc7d082b81875db4dfca5408f0cda22befa5c253

data/lib/compilator.rb

@@ -19,28 +19,44 @@ module Compilator
     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)
+      if kwargs[:location] == @model.calculatrice
+        
+        if action == :key_pressed || action == :button_pressed
+          @model.last_key_pressed = kwargs[:key]
         
-      elsif action == :key_delete_pressed
-        @model.delete = true
-              
-      elsif action == :button_equal_pressed
-        numerateur = 0
-        kwargs[:value].each_char do |c|
-          numerateur = numerateur+model.score[c]
+        elsif action == :key_enter_pressed
+          notify_action(view,:button_equal_pressed,kwargs)
+          
+        elsif action == :key_delete_pressed
+          @model.delete = true
+                
+        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
         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 kwargs[:location] == @model.total
+        if action == :button_calcul_pressed
+          num = kwargs['a'].to_i+kwargs['c'].to_i+kwargs['e'].to_i+kwargs['g'].to_i+kwargs['i'].to_i
+          denom = kwargs['b'].to_i+kwargs['d'].to_i+kwargs['f'].to_i+kwargs['h'].to_i+kwargs['j'].to_i
+          @model.result_total = num.to_s+"/"+denom.to_s
+          @model.result_arrondi = (num*20.to_f/denom).round(2).to_s+'/20'
         
-      elsif action == :close_window 
+        elsif action == :key_enter_pressed
+          notify_action(view,:button_calcul_pressed,kwargs)
+        
+        elsif action == :button_raz_pressed
+          @model.raz_total = true
+        end          
+      end  
+      if action == :close_window 
         view.close
       end 
     end
@@ -48,7 +64,7 @@ module Compilator
   
   class CompilatorModel < Druzy::MVC::Model
     
-    attr_accessor :score, :last_key_pressed, :result, :delete
+    attr_accessor :score, :last_key_pressed, :result, :delete, :calculatrice, :total
     
     
     def initialize
@@ -58,6 +74,9 @@ module Compilator
       @result = nil
       @raz = false
       @delete = false
+      @result_total = nil
+      @result_arrondi = nil
+      @raz_total
     end
     
     def last_key_pressed=(last_key_pressed)
@@ -79,6 +98,21 @@ module Compilator
       old, @delete = @delete, delete
       fire_property_change(Druzy::MVC::PropertyChangeEvent.new(self,'delete',old,@delete))
     end
+    
+    def result_total=(result_total)
+      old, @result_total = @result_total, result_total
+      fire_property_change(Druzy::MVC::PropertyChangeEvent.new(self,'result_total',old,@result_total))
+    end
+    
+    def result_arrondi=(result_arrondi)
+      old, @result_arrondi = @result_arrondi, result_arrondi
+      fire_property_change(Druzy::MVC::PropertyChangeEvent.new(self,'result_arrondi',old,@result_arrondi))
+    end
+    
+    def raz_total=(raz_total)
+      old, @raz_total = @raz_total, raz_total
+      fire_property_change(Druzy::MVC::PropertyChangeEvent.new(self,'raz_total',old,@raz_total))
+    end
   end
   
   class CompilatorView < Druzy::MVC::View
@@ -92,33 +126,38 @@ module Compilator
         val = event.valid_fields['keysym'].downcase
         if val == 'return'
           Thread.new do
-            @controller.notify_action(self, :key_enter_pressed, :value => @entry_variable.value)
+            @controller.notify_action(self, :key_enter_pressed, {:value => @entry_variable.value, :location => @notebook.selected}.merge(Hash[('a'..'j').collect{|el| [el,instance_variable_get("@entry_variable_"+el)]}]))
           end
           
         elsif val == 'escape'
           Thread.new do
-            @controller.notify_action(self, :button_raz_pressed)
+            @controller.notify_action(self, :button_raz_pressed, :location => @notebook.selected)
           end
           
         elsif val == 'delete'
           Thread.new do
-            @controller.notify_action(self, :key_delete_pressed)
+            @controller.notify_action(self, :key_delete_pressed, :location => @notebook.selected)
           end
           
         elsif @controller.model.score.has_key?(val)
           Thread.new do
-            @controller.notify_action(self,:key_pressed, :key => val)
+            @controller.notify_action(self,:key_pressed, :key => val, :location => @notebook.selected)
           end  
         end
         
       end
+
+      @notebook = Tk::Tile::Notebook.new(@root) do
+        place('x' => 0, 'y' => 0)
+      end      
       
-      @window = Tk::Tile::Frame.new(@root)
+      @window_calc = Tk::Tile::Frame.new(@notebook)
+      @controller.model.calculatrice = @window_calc
       
       @font_button = TkFont.new("size" => 24)
       
       @entry_variable = TkVariable.new
-      @entry = Tk::Tile::Entry.new(@window)
+      @entry = Tk::Tile::Entry.new(@window_calc)
       @entry.justify = 'right'
       @entry.validate = 'key'
       @entry.textvariable = @entry_variable
@@ -126,74 +165,39 @@ module Compilator
         false        
       end
       
-      @button_r = Tk::Tile::Button.new(@window)
-      @button_r['text'] = 'R'
-      Tk::Tile::Style.configure('Red.TButton', {"foreground" => 'red', 'font' => @font_button})
-      @button_r['style'] = 'Red.TButton'
-      @button_r['width'] = 1
-      @button_r.bind('ButtonPress') do
-        Thread.new do
-          @controller.notify_action(self,:button_pressed, :key => 'r')
+      @controller.model.score.keys.each do |key|
+        var_name = "@button_"+key
+        instance_variable_set(var_name.to_sym,Tk::Tile::Button.new(@window_calc))
+        button = instance_variable_get(var_name.to_sym)
+        button['text'] = key.upcase
+        button['width'] = 1
+        button.bind('ButtonPress') do
+          Thread.new do
+            @controller.notify_action(self,:button_pressed, :key => key, :location => @notebook.selected)
+          end
         end
       end
             
-      @button_o = Tk::Tile::Button.new(@window)
-      @button_o['text'] = 'O'
+      Tk::Tile::Style.configure('Red.TButton', {"foreground" => 'red', 'font' => @font_button})
+      @button_r['style'] = 'Red.TButton'
+            
       Tk::Tile::Style.configure('Orange.TButton', {"foreground" => 'orange', 'font' => @font_button})
       @button_o['style'] = 'Orange.TButton'
-      @button_o['width'] = 1
-      @button_o.bind('ButtonPress') do
-        Thread.new do
-          @controller.notify_action(self,:button_pressed, :key => 'o')
-        end
-      end
       
-      @button_j = Tk::Tile::Button.new(@window)
-      @button_j['text'] = 'J'
-      @button_j['width'] = 1
       Tk::Tile::Style.configure('Yellow.TButton', {"foreground" => 'yellow', 'font' => @font_button})
       @button_j['style'] = 'Yellow.TButton'
-      @button_j.bind('ButtonPress') do
-        Thread.new do
-          @controller.notify_action(self,:button_pressed, :key => 'j')
-        end
-      end
       
-      @button_c = Tk::Tile::Button.new(@window)
-      @button_c['text'] = 'C'
-      @button_c['width'] = 1
       Tk::Tile::Style.configure('Lime.TButton', {"foreground" => 'lime green', 'font' => @font_button})
       @button_c['style'] = 'Lime.TButton'
-      @button_c.bind('ButtonPress') do
-        Thread.new do
-          @controller.notify_action(self,:button_pressed, :key => 'c')
-        end
-      end
       
-      @button_v = Tk::Tile::Button.new(@window)
-      @button_v['text'] = 'V'
-      @button_v['width'] = 1
       Tk::Tile::Style.configure('Green.TButton', {"foreground" => 'green', 'font' => @font_button})
       @button_v['style'] = 'Green.TButton'
-      @button_v.bind('ButtonPress') do
-        Thread.new do
-          @controller.notify_action(self,:button_pressed, :key => 'v')
-        end
-      end
       
-      @button_e = Tk::Tile::Button.new(@window)
-      @button_e['text'] = 'E'
       @button_e['underline'] = 0
-      @button_e['width'] = 1
       Tk::Tile::Style.configure('Underline.TButton', {"foreground" => 'green', 'font' => @font_button})
       @button_e['style'] = 'Underline.TButton'
-      @button_e.bind('ButtonPress') do
-        Thread.new do
-          @controller.notify_action(self,:button_pressed, :key => 'e')
-        end
-      end
       
-      @button_raz = Tk::Tile::Button.new(@window)
+      @button_raz = Tk::Tile::Button.new(@window_calc)
       @button_raz['text'] = 'RàZ'
       @button_raz['width'] = 1
       Tk::Tile::Style.configure('Medium.TButton', {'font' => TkFont.new('size' => 12)})
@@ -204,7 +208,7 @@ module Compilator
         end
       end
       
-      @button_equal = Tk::Tile::Button.new(@window)
+      @button_equal = Tk::Tile::Button.new(@window_calc)
       @button_equal['text'] = '='
       Tk::Tile::Style.configure('Big.TButton', {'font' => TkFont.new('size' => 24)})
       @button_equal['style'] = 'Big.TButton'
@@ -215,29 +219,125 @@ module Compilator
         end
       end
       
-      @label_result = Tk::Tile::Label.new(@window)
+      @label_result = Tk::Tile::Label.new(@window_calc)
       @label_result.justify = 'right'
-      Tk::Tile::Style.configure('Big.TLabel',{'font' => TkFont.new('size' => 12)})
+      Tk::Tile::Style.configure('Big.TLabel',{'font' => TkFont.new('size' => 14)})
       @label_result['style'] = 'Big.TLabel'
+
+      #onglet total
+      
+      @window_total = Tk::Tile::Frame.new(@notebook)
+      @controller.model.total = @window_total
+     
+      @paned_fraction = Tk::Tile::Paned.new(@window_total)
+     
+      {'co' => ['a','b'], 'ce' => ['c','d'], 'ee' => ['e','f'], 'eoc' => ['g','h'], 'eoi'=> ['i','j']}.each do |key,value|
+        label_name = "@label_frame_"+key
+        instance_variable_set(label_name.to_sym,Tk::Tile::Labelframe.new(@paned_fraction))
+        label_frame = instance_variable_get(label_name.to_sym)
+        label_frame['text'] = key.upcase
+        
+        value.each do |val|
+          entry_name = "@entry_"+val
+          entry_variable_name = "@entry_variable_"+val
+          instance_variable_set(entry_name.to_sym,Tk::Tile::Entry.new(label_frame))
+          instance_variable_set(entry_variable_name.to_sym,TkVariable.new)
+          entry = instance_variable_get(entry_name.to_sym)
+          entry_variable = instance_variable_get(entry_variable_name.to_sym)
+          
+          entry.width = 3
+          entry.textvariable = entry_variable
+          entry.validate = 'key'
+          entry.validatecommand do |valid|
+            if (0..9).map{|el| el.to_s}.include?(valid.string)
+              true
+            else
+              false
+            end
+          end   
+        end        
+        
+      end
+      
+      @paned_result = Tk::Tile::Paned.new(@window_total)
+      
+      @label_frame_brut = Tk::Tile::Labelframe.new(@paned_result)
+      @label_frame_brut['text'] = 'Résultat brut'
       
+      @label_result_brut = Tk::Tile::Label.new(@label_frame_brut)
+      @label_result_brut['text'] = '0'
+      @label_result_brut.justify = 'right'
+      
+      @label_frame_arrondi = Tk::Tile::Labelframe.new(@paned_result)
+      @label_frame_arrondi['text'] = "Résultat arrondi au centième"
+      
+      @label_result_arrondi = Tk::Tile::Label.new(@label_frame_arrondi)
+      @label_result_arrondi['text'] = '0'
+      @label_result_arrondi.justify = 'right'
+            
+      @paned_button = Tk::Tile::Paned.new(@window_total)
       
+      for n in (0..9)
+        var_name = "@button_"+n.to_s
+        instance_variable_set(var_name.to_sym,Tk::Tile::Button.new(@paned_button))
+        button = instance_variable_get(var_name.to_sym)
+        button['text'] = n.to_s
+        button['style'] = 'Big.TButton'
+        button['width'] = 1
+      end
+      
+      @button_raz_total = Tk::Tile::Button.new(@paned_button)
+      @button_raz_total['text'] = 'RàZ'
+      @button_raz_total.bind('ButtonPress') do
+        puts "rrrr"
+        Thread.new do
+          @controller.notify_action(self,:button_raz_pressed, :location => @notebook.selected)
+        end
+      end
+      
+      @button_del = Tk::Tile::Button.new(@paned_button)
+      @button_del['text'] = 'Del/Suppr'
+      
+      @button_calcul = Tk::Tile::Button.new(@paned_button)
+      @button_calcul['text'] = 'Calculer'
+      @button_calcul.bind('ButtonPress') do
+        Thread.new do
+          @controller.notify_action(self,:button_calcul_pressed, {:location => @notebook.selected}.merge(Hash[('a'..'j').collect{|el| [el,instance_variable_get("@entry_variable_"+el)]}]))
+        end
+      end
       #ajout
+     
       TkGrid.columnconfigure( @root, 0, :weight => 1 )
       TkGrid.rowconfigure( @root, 0, :weight => 1 )
       
-      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)
+      TkGrid.columnconfigure( @window_calc, 0, :weight => 1)
+      TkGrid.columnconfigure( @window_calc, 1, :weight => 1 )
+      TkGrid.columnconfigure( @window_calc, 2, :weight => 1 )
+      TkGrid.rowconfigure( @window_calc, 0, :weight => 0)
+      TkGrid.rowconfigure( @window_calc, 1, :weight => 1)
+      TkGrid.rowconfigure( @window_calc, 2, :weight => 1)
+      TkGrid.rowconfigure( @window_calc, 3, :weight => 1)
+      TkGrid.rowconfigure( @window_calc, 4, :weight => 0)
       
-      @window.grid(:column => 0, :row => 0, :sticky => 'nsew')
+      TkGrid.columnconfigure(@window_total,0, :weight => 1)
+      TkGrid.rowconfigure(@window_total, 0, :weight => 0)
+      TkGrid.rowconfigure(@window_total, 1, :weight => 0)
+      TkGrid.rowconfigure(@window_total, 2, :weight => 1)
       
-      @entry.grid(:column => 0, :row => 0, :columnspan => 3, :sticky => 'new')
+      TkGrid.columnconfigure(@paned_fraction, 0, :weight =>1)
+      TkGrid.columnconfigure(@paned_fraction, 1, :weight =>1)
+      TkGrid.columnconfigure(@paned_fraction, 2, :weight =>1)
+      TkGrid.columnconfigure(@paned_fraction, 3, :weight =>1)
+      TkGrid.columnconfigure(@paned_fraction, 4, :weight =>1)
+      
+      TkGrid.columnconfigure(@paned_result, 0, :weight =>1)
+      TkGrid.columnconfigure(@paned_result, 1, :weight =>1)
+      
+      @notebook.add(@window_calc, :text => 'Calculatrice')
+      @notebook.add(@window_total, :text => 'Total')
+      @notebook.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')
@@ -248,8 +348,49 @@ module Compilator
       @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 => 'ews')
       
+      @paned_fraction.grid(:column => 0, :row => 0, :sticky => 'ew')
+      
+      @label_frame_co.grid(:column => 0, :row => 0)
+      @entry_a.grid(:column => 0, :row => 0)
+      @entry_b.grid(:column => 0, :row => 1)
+      
+      @label_frame_ce.grid(:column => 1, :row => 0)
+      @entry_c.grid(:column => 0, :row => 0)
+      @entry_d.grid(:column => 0, :row => 1)
+      
+      @label_frame_ee.grid(:column => 2, :row => 0)
+      @entry_e.grid(:column => 0, :row => 0)
+      @entry_f.grid(:column => 0, :row => 1)
+      
+      @label_frame_eoc.grid(:column => 3, :row => 0)
+      @entry_g.grid(:column => 0, :row => 0)
+      @entry_h.grid(:column => 0, :row => 1)
+      
+      @label_frame_eoi.grid(:column => 4, :row => 0)
+      @entry_i.grid(:column => 0, :row => 0)
+      @entry_j.grid(:column => 0, :row => 1)      
+      
+      @paned_result.grid(:column => 0, :row => 1, :sticky => 'ew')
+      @label_frame_brut.grid(:column => 0, :row => 0, :sticky => 'ew')
+      @label_result_brut.grid(:column => 0, :row => 0, :sticky => 'ew')
+      
+      @label_frame_arrondi.grid(:column => 1, :row => 0, :sticky => 'ew')
+      @label_result_arrondi.grid(:column => 0, :row => 0, :sticky => 'ew')
+      
+      @paned_button.grid(:column => 0, :row => 2)
+      @button_raz_total.grid(:column => 0, :row => 0)
+      @button_del.grid(:column => 0, :row => 1)
+      @button_calcul.grid(:column => 0, :row => 2, :columnspan => 6, :sticky => 'ew' )
+      for n in (0..4) do
+        button1 = instance_variable_get("@button_"+n.to_s)
+        button2 = instance_variable_get("@button_"+(n+5).to_s)
+        button1.grid(:column => n+1, :row => 0)
+        button2.grid(:column => n+1, :row => 1)
+      end
+      
     end
     
     def display
@@ -278,6 +419,25 @@ module Compilator
         Thread.new do
           @entry_variable.set_value(@entry_variable.value[0..-2])
         end
+        
+      elsif event.property_name == 'result_total'
+        Thread.new do
+          @label_result_brut.text = event.new_value.to_s
+        end
+        
+      elsif event.property_name == 'result_arrondi'
+        Thread.new do
+          @label_result_arrondi.text = event.new_value.to_s
+        end
+        
+      elsif event.property_name == 'raz_total'
+        puts "coucou"
+        Thread.new do
+          ('a'..'j').each do |el|
+            
+            instance_variable_get("@entry_variable_"+el).set_value('')
+          end
+        end
       end
     end
   

data/lib/compilator/version.rb

@@ -1,3 +1,3 @@
 module Compilator
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compilator
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Jonathan Le Greneur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: druzy-mvc
@@ -60,7 +60,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/compilator.rb
-- lib/compilator.rb.old
 - lib/compilator/version.rb
 homepage: https://github.com/druzy/compilator
 licenses:

data/lib/compilator.rb.old

@@ -1,230 +0,0 @@
-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}