lib/ppcurses/menu/RadioMenu.rb in ppcurses-0.0.8 vs lib/ppcurses/menu/RadioMenu.rb in ppcurses-0.0.9

@@ -1,102 +1,99 @@
-# Curses reference:
-# http://www.ruby-doc.org/stdlib-1.9.3/libdoc/curses/rdoc/Curses.html
 
-require "curses"
-require './ppcurses/BaseMenu.rb'
-include Curses
+require 'ppcurses/menu/BaseMenu.rb'
 
-class RadioMenu  < BaseMenu
+module PPCurses
+  class RadioMenu  < BaseMenu
 
-  def initialize( menuItems, actionItems )
-    @items = Array.new
+    def initialize( menuItems, actionItems )
+      @items = Array.new
 
-    @menuLength = 0
+      @menuLength = 0
 
-     menuItems.each do |item|
-       @items.push item
-        @menuLength += item.length + 5
-     end
+       menuItems.each do |item|
+         @items.push item
+          @menuLength += item.length + 5
+       end
 
-    @selection = 0
+      @selection = 0
 
-    unless actionItems.nil? 
-      @actions = Array.new
-      actionItems.each do |item|
-        @actions.push item      
-      end
-    end 
-   
-    winWidth = @menuLength + 4
+      unless actionItems.nil? 
+        @actions = Array.new
+        actionItems.each do |item|
+          @actions.push item      
+        end
+      end 
+     
+      winWidth = @menuLength + 4
 
-    @win = Window.new(3, winWidth ,0, (cols - winWidth) / 2)
+      @win = Window.new(3, winWidth ,0, (cols - winWidth) / 2)
 
-    @win.timeout=-1
-    # Enables reading arrow keys in getch 
-    @win.keypad(true)
-  end
-
-  def show()
-    @win.box("|", "-")
-    y = 1
-    x = 2
-
-    @win.setpos(y, x)
-
-    for i in [e-mail]
-      @win.addstr( @items[i] )
-      if @selection == i then @win.addstr(" [*] ") else @win.addstr(" [ ] " ) end
+      @win.timeout=-1
+      # Enables reading arrow keys in getch 
+      @win.keypad(true)
     end
 
-   @win.refresh
+    def show()
+      @win.box("|", "-")
+      y = 1
+      x = 2
 
-  end
+      @win.setpos(y, x)
 
+      for i in [e-mail]
+        @win.addstr( @items[i] )
+        if @selection == i then @win.addstr(" [*] ") else @win.addstr(" [ ] " ) end
+      end
 
-  def getMenuSelection()
+     @win.refresh
 
-    while(1)
-      c = @win.getch
+    end
 
-      processed = self.handleMenuSelection(c)
 
-      if c == 27 then # ESCAPE
-        @win.clear
-        @win.refresh
-        break
-      end
+    def getMenuSelection()
 
-    end 
+      while(1)
+        c = @win.getch
 
-  end
+        processed = self.handleMenuSelection(c)
 
+        if c == 27 then # ESCAPE
+          @win.clear
+          @win.refresh
+          break
+        end
 
-  def handleMenuSelection(c)
-    n_choices = @items.length
+      end 
 
-    if c == KEY_RIGHT then
-      if @selection < n_choices - 1 then @selection += 1 else @selection = 0 end
-      self.show()
     end
 
-    if c == KEY_LEFT then
-      if @selection > 0 then @selection -= 1 else @selection = n_choices-1 end
-      self.show()
-    end
 
-    if c == 10 then # ENTER
-      unless @actions.nil?
-        @actions[@selection].execute()
+    def handleMenuSelection(c)
+      n_choices = @items.length
+
+      if c == KEY_RIGHT then
+        if @selection < n_choices - 1 then @selection += 1 else @selection = 0 end
         self.show()
       end
+
+      if c == KEY_LEFT then
+        if @selection > 0 then @selection -= 1 else @selection = n_choices-1 end
+        self.show()
+      end
+
+      if c == 10 then # ENTER
+        unless @actions.nil?
+          @actions[@selection].execute()
+          self.show()
+        end
+      end
     end
-  end
- 
+   
 
 
-  def close()
-    @win.close()
+    def close()
+      @win.close()
+    end
+
   end
 
 end
-
-