ig3tool 0.5.3 → 0.6.0

data/bin/ig3tool

@@ -29,22 +29,23 @@ module Ig3tool
 		port = ENV['IG3TOOL_PORT'] || 2007
     $client = Ig3tool::Client.new(host, port)
     Gtk::init
+		$toolwindow = nil
   
 		begin
 		if $client.validate
-			ToolWindow.new(@klasses)
+			$toolwindow = ToolWindow.new(@klasses)
 		else
 			LoginWindow.new($client) do
-				ToolWindow.new(@klasses)
+				$toolwindow = ToolWindow.new(@klasses)
 			end
 		end
 		rescue Exception => e
 			LoginWindow.new($client) do
-				ToolWindow.new(@klasses)
+				$toolwindow = ToolWindow.new(@klasses)
 			end
 		end
     begin
-      Gtk::main
+				Gtk::main
     rescue Interrupt
       # Ctrl-C
     rescue Exception => e
@@ -93,4 +94,3 @@ require "ui/loginwindow.rb"
 
 # Start de grafische interface
 Ig3tool::start()
-

data/lib/glade/vendingmachine.glade

@@ -55,7 +55,6 @@
                   <widget class="GtkLabel" id="label19">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Blikjes&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                   </widget>
                   <packing>
@@ -70,8 +69,6 @@
                     <child>
                       <widget class="GtkTable" id="blikjes_table">
                         <property name="visible">True</property>
-                        <property name="n_rows">1</property>
-                        <property name="n_columns">1</property>
                         <property name="column_spacing">12</property>
                         <property name="row_spacing">6</property>
                         <child>
@@ -95,7 +92,6 @@
                   <widget class="GtkLabel" id="label20">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Flesjes&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                   </widget>
                   <packing>
@@ -110,8 +106,6 @@
                     <child>
                       <widget class="GtkTable" id="flesjes_table">
                         <property name="visible">True</property>
-                        <property name="n_rows">1</property>
-                        <property name="n_columns">1</property>
                         <property name="column_spacing">12</property>
                         <property name="row_spacing">6</property>
                         <child>

data/lib/ui/automaatwindow.rb

@@ -4,24 +4,22 @@ module Ig3tool
 		MENU_PATH = ["Automaat"]
 		ICON = "cola_xsmall.png"
 
-		BLIKJES = [
+		LEFTCOL = [
 			[ "Coca Cola",            "5449000000996" ],
 			[ "Coca Cola Light",      "5449000050205" ],
+			[ "Coca Cola Zero",       "5449000131805" ],
+			[ "Coca Light Lemon",     "5449000089229" ],
 			[ "Fanta Orange",         "5449000011527" ],
 			[ "Fanta Lemon",          "5449000006004" ],
+		]
+
+		RIGHTCOL = [
 			[ "Minute Maid",          "90494024"      ],
 			[ "Minute Maid Tropical", "5449000100573" ],
+			[ "Minute Maid Appelsap", "90494031"      ],
 			[ "Nestea",               "5449000027382" ],
-			[ "Coca Light Lemon",     "5449000089229" ],
-		]
-
-		FLESJES = [
-			[ "Coca Cola",            "54491472" ],
-			[ "Coca Cola Light",      "54492387" ],
-			[ "Fanta Orange",         "40822938" ],
-			[ "Fanta Lemon",          "54492493" ],
-			[ "Aquarius Orange",      "54490802" ],
-			[ "Water",                "5449000111678" ],
+			[ "Aquarius Orange",      "5449000033819" ],
+			[ "Nalu",                 "5449000067456" ],
 		]
 
 		def initialize
@@ -31,8 +29,8 @@ module Ig3tool
 
 			@entries = [ ]
 
-			[[BLIKJES,  @glade.get_widget("blikjes_table")],
-				[FLESJES, @glade.get_widget("flesjes_table")]].
+			[[LEFTCOL,  @glade.get_widget("blikjes_table")],
+				[RIGHTCOL, @glade.get_widget("flesjes_table")]].
 				each do |list, table|
 				table.resize(list.length, 2)
 				list.each_with_index do |(name, barcode), i|

data/lib/ui/gladehelper.rb

@@ -35,22 +35,51 @@ module Ig3tool
       end
       @sounds["cash"] = "cash2.wav"
       @sounds["tetten"] = "shaglic1.wav"
+			@sounds["yeahbaby"] = "yeahbaby.wav"
+			@sounds["ltunes"] = "ltunes.wav"
+			@sounds["tahdah"] = "tahdah.wav"
+			@sounds["wall-e"] = "walle01.wav"
+			@sounds["buttscratcher"] = "buttscratcher.wav"
+			@sounds["tea"] = "wohlen_sie.wav"
+			@sounds["burp"] = "burp.wav"
+			@sounds["cow"] = "cow.wav"
+			@sounds["jaaa"] = "jaaaaaa.wav"
+			@sounds["kaching"] = "kaching.wav"
+			@sounds["pika"] = "pikachu1.wav"
+			@sounds["scribble"] = "scribble.wav"
+			@sounds["sheep"] = "sheep.wav"
+			@sounds["fart"] = "fart.wav"
+			@sounds["ohyeah"] = "ohyeah.wav"
+			@sounds["canttouch"] = "cant_touch_this.wav"
+			@sounds["hammertime"] = "stop_hammertime.wav"
+			@sounds["gone1"] = "gonept1.mp3"
+			@sounds["gone2"] = "gonept2.mp3"
     end
 
     def play(key)
-      filename = @sounds[key]
-      unless filename.nil?
-        filename = File.join(GLADE_DIR, "sound", filename)
-        Thread.new do
-          begin
-                 `aplay #{filename}`
-          rescue Exception => e
-            warn "sound error: #{e.message}"
-          end
-        end
-      end
+			Thread.new do
+				filename = @sounds[key]
+				unless filename.nil?
+					filename = File.join(GLADE_DIR, "sound", filename)
+					begin
+						`aplay #{filename}`
+					rescue Exception => e
+						warn "sound error: #{e.message}"
+					end
+				end
+			end
     end
 
+		def speak(str)
+			Thread.new do
+				begin
+					`echo \"#{str}\" | festival --tts`
+				rescue
+						warn "speech error: #{e.message}"
+				end
+			end
+		end
+
 		def present
 			@window.present
 		end

data/lib/ui/printingwindow.rb

@@ -110,6 +110,26 @@ module Ig3tool
 			@ext_list.enable_search = true
 
 			make_debugger_combo(@ext_debugger)
+			
+			begin
+        GLib::Timeout.add_seconds(30) {
+          begin
+            _update_log
+            _update_biglog
+          rescue Exception => e
+          end
+          true
+        }
+      rescue
+        GLib::Timeout.add(30*1000) {
+          begin
+            _update_log
+            _update_biglog
+          rescue Exception => e
+          end
+          true
+        }
+      end
 
 			refresh(nil)
       @statussearch.active = 0
@@ -669,35 +689,64 @@ module Ig3tool
 		end
 
 
-		def _update_log
-			Thread.new do
+    def _update_log
+			_update_log_bypassed
+			@filteredlog.scroll_to_point(0,0)
+			begin
+			  GLib::Timeout.add_seconds(1) {
+				  @filteredlog.scroll_to_point(0,0)
+				  false
+			  }
+		  rescue
+		    GLib::Timeout.add(1*1000) {
+				  @filteredlog.scroll_to_point(0,0)
+				  false
+			  }
+	    end
+		end
+
+		def _update_log_bypassed
 				begin
 					loglines = $client.print_logs(200, @last_log_id)
 					loglines.reverse.each do |ll|
 						@filteredlog_store.prepend[0] = ll
 					end
-					@last_log_id = loglines.first.real_id
+					@last_log_id = loglines.first["id"]
 				rescue Exception => e
 					warn "error updating log: " + e.message
 				end
-			end
 		end
-
+		
 		def _update_biglog
+			_update_biglog_bypassed
+			@log.scroll_to_point(0,0)
+      begin
+        GLib::Timeout.add_seconds(1) {
+          @log.scroll_to_point(0,0)
+          false
+        }
+      rescue
+        GLib::Timeout.add(1*1000) {
+          @log.scroll_to_point(0,0)
+          false
+        }
+      end
+		end
+
+		def _update_biglog_bypassed
 			if !@updating_biglog # sommige kindjes vinden het leuk om op refresh te klikken
 				@updating_biglog = true
-				Thread.new do 
 					begin
 						loglines = $client.print_logs(200, @last_big_log_id)
 						loglines.reverse.each do |ll|
 							@log_store.prepend[0] = ll
 						end
-						@last_big_log_id = loglines.first.real_id
+						@last_big_log_id = loglines.first["id"]
 						@updating_biglog = false
 					rescue Exception => e
 						warn "error updating biglog: " + e.message
+						@updating_biglog = false
 					end
-				end
 			end
 		end
 

data/lib/ui/saleswindow.rb

@@ -32,6 +32,10 @@ module Ig3tool
       toggle_saldo_label(false)
 		end
 
+		def focus_smartzap
+			_get_widget("smartzap").grab_focus
+		end
+
     def set_saldo(username)
       begin
       i = $client.interne(username)
@@ -92,7 +96,19 @@ module Ig3tool
 				# is het een debugger?
 			when /^[a-z-]/i
 
-        play("tetten") if value == "tetten"
+				Thread.new do
+					case value
+					when "tetten": play("tetten")
+					when "rdewaele": play("yeahbaby")
+					when "resteven": play("tea")
+					when "rroels": play("sheep")
+					when "hdebondt": play("pika")
+					#when "kpinte": speak("hello kevin")
+					when "bcorne": play("gonept2")
+					when "jeuk": play("buttscratcher")
+					#when "dharnie": say("hey, sweetheart")
+					end
+				end
 
 				wanted = {"username", value, "status", "debugger"}
 				pers = $client.person_lookup(wanted)
@@ -141,6 +157,7 @@ module Ig3tool
 			# is het een product?
 			begin
 				prod = $client.product_lookup(value)
+				# speak(prod.name) # SPEAK OR DIE!
 				qty  = _get_widget("count").text.to_i
 				_add_product(prod, qty)
 				return
@@ -267,7 +284,14 @@ module Ig3tool
 			begin
 				$client.scribble! params
 				clear_clicked
-				play("scribble")
+				case params["debugger"]
+				when "resteven": play("jaaa")
+				when "rroels": play("ohyeah")
+				when "bcorne": play("gonept2")
+				when "kpinte": play("burp")
+				when "rdewaele": play("fart")
+				else play("scribble")
+				end
 			rescue Exception => e
 				puts "Error: #{$!}"
 			end

data/lib/ui/toolwindow.rb

@@ -1,10 +1,40 @@
 module Ig3tool
 
-	require 'pathname'
+	begin
+		require 'pathname'
+		require 'inline'
+		class XScreenSaver
+			class << self
+				inline do |builder|
+					builder.add_link_flags '-lXss'
+					builder.include '<X11/extensions/scrnsaver.h>'
+					builder.c %{
+					double idle_time() {
+						static Display *display;
+						XScreenSaverInfo *info = XScreenSaverAllocInfo();
+						if (!display)  display = XOpenDisplay(0);
+							if (!display)  return -1;
+								XScreenSaverQueryInfo(display, DefaultRootWindow(display), info);
+								return info->idle / 1000;
+					}
+				}
+				end
+			end
+		end
+	rescue Exception => e
+		class XScreenSaver
+			def self.timeout
+				0
+			end
+		end
+		puts "XTimeout extension not enabled: #{e.message}"
+	end
 
 	# Hoofdmenu (altijd on top)
 	# Zorgt voor dynamische uitbreidingsmogelijkheden van de ig3tool
 
+	SALES_WINDOW_TIMEOUT = 60 # 1 Minuut
+
 	class ToolWindow
 
 		@@windows = {}
@@ -45,6 +75,21 @@ module Ig3tool
 				Gtk::main_quit
 			end
 
+			GLib::Timeout.add_seconds(30) {
+				begin
+					if XScreenSaver.idle_time >= SALES_WINDOW_TIMEOUT
+						klass = SalesWindow
+						@@windows[klass] ||= klass.new
+						@@windows[klass].show
+						@@windows[klass].present
+						@@windows[klass].focus_smartzap
+					end
+				rescue Exception => e
+					puts "No XTimeout"
+				end
+				true
+			}
+
 			bigbox.show_all
 			size = window.size_request
 			size[0] += 24

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ig3tool
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors: 
-- Kevin Pinte
+- Kevin Pinte, Dries Harnie, Lode Hoste, Reinout Stevens
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-02-21 00:00:00 +01:00
+date: 2009-10-05 00:00:00 +02:00
 default_executable: ig3tool
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,98 +31,110 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/ui
-- lib/lib
 - lib/glade
+- lib/lib
+- lib/ui
 - bin/ig3tool
-- lib/ui/loginwindow.rb
-- lib/ui/toolwindow.rb
-- lib/ui/saleswindow.rb
-- lib/ui/printingwindow.rb
-- lib/ui/automaatwindow.rb
-- lib/ui/peoplewindow.rb
-- lib/ui/protjes.rb
-- lib/ui/messagebox.rb
-- lib/ui/gladehelper.rb
-- lib/ui/bibliotheekwindow.rb
-- lib/ui/interne.rb
-- lib/lib/errors.rb
-- lib/lib/util.rb
-- lib/glade/stock_bookmark_klein.png
-- lib/glade/protjes.glade
-- lib/glade/printing.glade
-- lib/glade/penningtool.glade
-- lib/glade/bibliotheek.glade
-- lib/glade/products.glade
-- lib/glade/vendingmachine.glade
-- lib/glade/stock_print.png
-- lib/glade/members.svg
-- lib/glade/printerlog_klein.png
-- lib/glade/bib.glade
+- lib/glade/piggy_small.png
+- lib/glade/stock_bookmark_xklein.png
+- lib/glade/members.glade
+- lib/glade/memberinfo_xklein.png
+- lib/glade/printer.png
 - lib/glade/memberinfo.svg
-- lib/glade/cola_small.png
+- lib/glade/doos_xsmall.png
+- lib/glade/cola_light_small.png
+- lib/glade/bib.glade
 - lib/glade/members_xklein.png
+- lib/glade/cola_light_xsmall.png
+- lib/glade/memberinfo_klein.png
+- lib/glade/money_small.png
+- lib/glade/stock_book_klein.png
+- lib/glade/printerlog_xklein.png
+- lib/glade/newinterne.glade
+- lib/glade/protjes.glade
+- lib/glade/vendingmachine.glade
+- lib/glade/stock_book_xklein.png
+- lib/glade/interne.glade
+- lib/glade/sound
+- lib/glade/sound/buttscratcher.wav
+- lib/glade/sound/scribble.wav
+- lib/glade/sound/cant_touch_this.wav
+- lib/glade/sound/shaglic1.wav
+- lib/glade/sound/fart.wav
+- lib/glade/sound/tahdah.wav
+- lib/glade/sound/ohyeah.wav
+- lib/glade/sound/wohlen_sie.wav
+- lib/glade/sound/stop_hammertime.wav
+- lib/glade/sound/kaching.wav
+- lib/glade/sound/cash2.wav
+- lib/glade/sound/ltunes.wav
+- lib/glade/sound/pikachu1.wav
+- lib/glade/sound/burp.wav
+- lib/glade/sound/jaaaaaa.wav
+- lib/glade/sound/yeahbaby.wav
+- lib/glade/sound/walle01.wav
+- lib/glade/sound/cow.wav
+- lib/glade/sound/sheep.wav
+- lib/glade/cola_xsmall.png
 - lib/glade/printer_klein.png
-- lib/glade/printer.png
-- lib/glade/loginwindow.glade
-- lib/glade/printen.glade
+- lib/glade/printer_xklein.png
 - lib/glade/icons
-- lib/glade/icons/stock_bookmark_klein.png
-- lib/glade/icons/emblem-penning.xpm
-- lib/glade/icons/stock_print.png
-- lib/glade/icons/emblem-money.png
+- lib/glade/icons/piggy_small.png
+- lib/glade/icons/stock_bookmark_xklein.png
+- lib/glade/icons/emblem-people.png
+- lib/glade/icons/stock_bookmark.svg
+- lib/glade/icons/doos_xsmall.png
 - lib/glade/icons/no.xpm
-- lib/glade/icons/cola_small.png
+- lib/glade/icons/cola_light_small.png
 - lib/glade/icons/members_xklein.png
-- lib/glade/icons/cola.png
+- lib/glade/icons/cola_light_xsmall.png
+- lib/glade/icons/stock_book_klein.png
+- lib/glade/icons/emblem-package.png
 - lib/glade/icons/stock_book_xklein.png
-- lib/glade/icons/stock_bookmark.svg
 - lib/glade/icons/cola_xsmall.png
-- lib/glade/icons/piggy_small.png
-- lib/glade/icons/doos_xsmall.png
-- lib/glade/icons/cola_light_xsmall.png
 - lib/glade/icons/stock_book.svg
+- lib/glade/icons/members_klein.png
+- lib/glade/icons/stock_bookmark_klein.png
+- lib/glade/icons/emblem-penning.xpm
 - lib/glade/icons/gdict.png
-- lib/glade/icons/emblem-package.png
-- lib/glade/icons/stock_book_klein.png
-- lib/glade/icons/emblem-people.png
-- lib/glade/icons/stock_bookmark_xklein.png
+- lib/glade/icons/stock_print.png
 - lib/glade/icons/doos_small.png
-- lib/glade/icons/emblem-sales.png
-- lib/glade/icons/members_klein.png
+- lib/glade/icons/emblem-money.png
+- lib/glade/icons/cola_small.png
 - lib/glade/icons/piggy_xsmall.png
-- lib/glade/icons/cola_light_small.png
-- lib/glade/interne.glade
-- lib/glade/money_xsmall.png
-- lib/glade/members.glade
-- lib/glade/printerlog_xklein.png
-- lib/glade/sound
-- lib/glade/sound/burp.wav
-- lib/glade/sound/kaching.wav
-- lib/glade/sound/cash2.wav
-- lib/glade/sound/scribble.wav
-- lib/glade/sound/cow.wav
-- lib/glade/sound/shaglic1.wav
-- lib/glade/sound/yeahbaby.wav
-- lib/glade/stock_book_xklein.png
-- lib/glade/cola_xsmall.png
-- lib/glade/piggy_small.png
-- lib/glade/money_small.png
-- lib/glade/newinterne.glade
-- lib/glade/doos_xsmall.png
-- lib/glade/sales.glade
-- lib/glade/cola_light_xsmall.png
+- lib/glade/icons/cola.png
+- lib/glade/icons/emblem-sales.png
+- lib/glade/penningtool.glade
+- lib/glade/printerlog_klein.png
 - lib/glade/stock_book.svg
-- lib/glade/memberinfo_xklein.png
-- lib/glade/people.glade
-- lib/glade/stock_book_klein.png
-- lib/glade/stock_bookmark_xklein.png
-- lib/glade/memberinfo_klein.png
-- lib/glade/doos_small.png
+- lib/glade/loginwindow.glade
+- lib/glade/sales.glade
 - lib/glade/members_klein.png
+- lib/glade/stock_bookmark_klein.png
+- lib/glade/members.svg
+- lib/glade/products.glade
+- lib/glade/stock_print.png
+- lib/glade/doos_small.png
+- lib/glade/bibliotheek.glade
+- lib/glade/cola_small.png
+- lib/glade/printing.glade
 - lib/glade/piggy_xsmall.png
-- lib/glade/cola_light_small.png
-- lib/glade/printer_xklein.png
+- lib/glade/printen.glade
+- lib/glade/money_xsmall.png
+- lib/glade/people.glade
+- lib/lib/util.rb
+- lib/lib/errors.rb
+- lib/ui/saleswindow.rb
+- lib/ui/loginwindow.rb
+- lib/ui/messagebox.rb
+- lib/ui/bibliotheekwindow.rb
+- lib/ui/toolwindow.rb
+- lib/ui/protjes.rb
+- lib/ui/printingwindow.rb
+- lib/ui/interne.rb
+- lib/ui/peoplewindow.rb
+- lib/ui/gladehelper.rb
+- lib/ui/automaatwindow.rb
 has_rdoc: false
 homepage: http://infogroep.be
 post_install_message: 
@@ -147,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ig3tool
-rubygems_version: 1.3.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: gtk ig3tool client