watobo 0.9.19 → 0.9.20

data/lib/watobo/gui/interceptor_settings_dialog.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # interceptor_settings_dialog.rb
-# 
-# Copyright 2013 by siberas, http://www.siberas.de
-# 
-# This file is part of WATOBO (Web Application Tool Box)
-#        http://watobo.sourceforge.com
-# 
-# WATOBO is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation version 2 of the License.
-# 
-# WATOBO is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with WATOBO; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# .
+#.
+# Copyright 2014 by siberas, http://www.siberas.de
+# This file is part of WATOBO (Web Application Tool Box) http://watobo.sourceforge.com
+# WATOBO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.
+# WATOBO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License along with WATOBO; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 # @private 
 module Watobo#:nodoc: all
   module Gui

data/lib/watobo/gui/list_box.rb

@@ -1,124 +1,112 @@
-# .
+#.
 # list_box.rb
-# 
-# Copyright 2013 by siberas, http://www.siberas.de
-# 
-# This file is part of WATOBO (Web Application Tool Box)
-#        http://watobo.sourceforge.com
-# 
-# WATOBO is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation version 2 of the License.
-# 
-# WATOBO is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with WATOBO; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# .
-# @private 
-module Watobo#:nodoc: all
-  module Gui
-    class ListBox < FXGroupBox
-      def to_a
-        a=[]
-        @list.each do |i|
-          a << i.to_s
-        end
-        a
-      end
-      
-      def set(list)
-        @list.clearItems
-        list.each do |le|
-          addPattern(le)
-        end
-      end
-
-      def append(list)
-        if list.is_a? Array
-          list.each do |e|
-            addPattern(e) if e.is_a? String
-          end
-        elsif list.is_a? String
-          addPattern(list)
-        else
-          raise ArgumentError, "Need String or Array"
-        end
-      end
-
-      def removePattern(pattern)
-        index = @list.currentItem
-        if  index >= 0
-        @list.removeItem(index)
-        end
-      end
-
-      def addPattern(pattern)
-        if pattern != "" then
-          pattern_ok, *error = Watobo::Utils.checkRegex(pattern)
-          if pattern_ok == true
-            item = @list.appendItem("#{pattern}")
-          @list.setItemData(item, pattern)
-          @list.sortItems()
-
-          else
-            FXMessageBox.information(self, MBOX_OK, "Wrong Path Format", "Path must be a Regex!!!\nError: #{error.join('\n')}")
-          end
-        end
-      end
-
-      def initialize(owner, title="", info_text="", opts= LAYOUT_SIDE_RIGHT|FRAME_GROOVE|LAYOUT_FILL_X)
-        gbframe = super(owner, title, opts , 0, 0, 0, 0)
-        frame = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X, :padding => 0)
+#.
+# Copyright 2014 by siberas, http://www.siberas.de
+# This file is part of WATOBO (Web Application Tool Box) http://watobo.sourceforge.com
+# WATOBO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.
+# WATOBO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License along with WATOBO; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-        unless info_text.empty?
-          fxtext = FXText.new(frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP)
-        fxtext.backColor = fxtext.parent.backColor
-        fxtext.disable
-        text = "#{info_text}"
-        fxtext.setText(text)
-        end
-
-        input_frame = FXHorizontalFrame.new(frame, :opts => LAYOUT_FILL_X)
-        #@text = FXTextField.new(input_frame, 20, :target => @expath_dt, :selector => FXDataTarget::ID_VALUE, :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_LEFT|LAYOUT_FILL_X)
-        @text = FXTextField.new(input_frame, 20, nil, 0, :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_LEFT|LAYOUT_FILL_X)
-        @rem_btn = FXButton.new(input_frame, "Remove" , :opts => BUTTON_NORMAL|BUTTON_DEFAULT|LAYOUT_RIGHT)
-        @add_btn = FXButton.new(input_frame, "Add" , :opts => BUTTON_NORMAL|BUTTON_DEFAULT|LAYOUT_RIGHT)
-
-        list_frame = FXVerticalFrame.new(frame, :opts => LAYOUT_FILL_X|FRAME_SUNKEN, :padding => 0)
-        @list = FXList.new(list_frame, :opts => LIST_EXTENDEDSELECT|LAYOUT_FILL_X|LAYOUT_FILL_Y)
-        @list.numVisible = 5
-
-        @list.connect(SEL_COMMAND){ |sender, sel, item|
-          @text.text = sender.getItemText(item)
-          @text.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-        }
-
-        @rem_btn.connect(SEL_COMMAND){ |sender, sel, item|
-          removePattern(@text.text) if @text.text != ''
-          @text.text = ''
-          @text.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-        }
-        
-        @text.connect(SEL_COMMAND){
-          @add_btn.setFocus()
-         # @add_btn.setDefault()
-          
-        }
-        
-        @add_btn.connect(SEL_COMMAND){ |sender, sel, item|
-
-          addPattern(@text.text) if @text.text != ''
-          @text.text = ''
-          @text.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-          @text.setFocus()
-          #@text.setDefault()
-        }
-      end
-    end
-  end
+# @private 
+module Watobo#:nodoc: all
+  module Gui
+    class ListBox < FXGroupBox
+      def to_a
+        a=[]
+        @list.each do |i|
+          a << i.to_s
+        end
+        a
+      end
+      
+      def set(list)
+        @list.clearItems
+        list.each do |le|
+          addPattern(le)
+        end
+      end
+
+      def append(list)
+        if list.is_a? Array
+          list.each do |e|
+            addPattern(e) if e.is_a? String
+          end
+        elsif list.is_a? String
+          addPattern(list)
+        else
+          raise ArgumentError, "Need String or Array"
+        end
+      end
+
+      def removePattern(pattern)
+        index = @list.currentItem
+        if  index >= 0
+        @list.removeItem(index)
+        end
+      end
+
+      def addPattern(pattern)
+        if pattern != "" then
+          pattern_ok, *error = Watobo::Utils.checkRegex(pattern)
+          if pattern_ok == true
+            item = @list.appendItem("#{pattern}")
+          @list.setItemData(item, pattern)
+          @list.sortItems()
+
+          else
+            FXMessageBox.information(self, MBOX_OK, "Wrong Path Format", "Path must be a Regex!!!\nError: #{error.join('\n')}")
+          end
+        end
+      end
+
+      def initialize(owner, title="", info_text="", opts= LAYOUT_SIDE_RIGHT|FRAME_GROOVE|LAYOUT_FILL_X)
+        gbframe = super(owner, title, opts , 0, 0, 0, 0)
+        frame = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X, :padding => 0)
+
+        unless info_text.empty?
+          fxtext = FXText.new(frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP)
+        fxtext.backColor = fxtext.parent.backColor
+        fxtext.disable
+        text = "#{info_text}"
+        fxtext.setText(text)
+        end
+
+        input_frame = FXHorizontalFrame.new(frame, :opts => LAYOUT_FILL_X)
+        #@text = FXTextField.new(input_frame, 20, :target => @expath_dt, :selector => FXDataTarget::ID_VALUE, :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_LEFT|LAYOUT_FILL_X)
+        @text = FXTextField.new(input_frame, 20, nil, 0, :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_LEFT|LAYOUT_FILL_X)
+        @rem_btn = FXButton.new(input_frame, "Remove" , :opts => BUTTON_NORMAL|BUTTON_DEFAULT|LAYOUT_RIGHT)
+        @add_btn = FXButton.new(input_frame, "Add" , :opts => BUTTON_NORMAL|BUTTON_DEFAULT|LAYOUT_RIGHT)
+
+        list_frame = FXVerticalFrame.new(frame, :opts => LAYOUT_FILL_X|FRAME_SUNKEN, :padding => 0)
+        @list = FXList.new(list_frame, :opts => LIST_EXTENDEDSELECT|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+        @list.numVisible = 5
+
+        @list.connect(SEL_COMMAND){ |sender, sel, item|
+          @text.text = sender.getItemText(item)
+          @text.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+        }
+
+        @rem_btn.connect(SEL_COMMAND){ |sender, sel, item|
+          removePattern(@text.text) if @text.text != ''
+          @text.text = ''
+          @text.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+        }
+        
+        @text.connect(SEL_COMMAND){
+          @add_btn.setFocus()
+         # @add_btn.setDefault()
+          
+        }
+        
+        @add_btn.connect(SEL_COMMAND){ |sender, sel, item|
+
+          addPattern(@text.text) if @text.text != ''
+          @text.text = ''
+          @text.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+          @text.setFocus()
+          #@text.setDefault()
+        }
+      end
+    end
+  end
 end

data/lib/watobo/gui/log_file_viewer.rb

@@ -1,55 +1,43 @@
-# .
+#.
 # log_file_viewer.rb
-# 
-# Copyright 2013 by siberas, http://www.siberas.de
-# 
-# This file is part of WATOBO (Web Application Tool Box)
-#        http://watobo.sourceforge.com
-# 
-# WATOBO is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation version 2 of the License.
-# 
-# WATOBO is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with WATOBO; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# .
-# @private 
-module Watobo#:nodoc: all
-  module Gui
-    class LogFileViewer < FXVerticalFrame
-
-      include Watobo::Constants
-      def show_logs
-        begin
-           @textbox.setText(Watobo.logs)
-        rescue => bang
-          puts "! Could not show logs"
-          puts bang
-          puts bang.backtrace if $DEBUG
-        end
-      end
-
-   
-      def initialize(parent, mode = nil, opts)
-        opts[:padding]=0
-        
-        super(parent, opts)
+#.
+# Copyright 2014 by siberas, http://www.siberas.de
+# This file is part of WATOBO (Web Application Tool Box) http://watobo.sourceforge.com
+# WATOBO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.
+# WATOBO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License along with WATOBO; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-        update_btn = FXButton.new(self, "Update",:opts => FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_LEFT).connect(SEL_COMMAND){ show_logs }
-        frame = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN)
-        @textbox = FXText.new(frame,  nil, 0, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_AUTOSCROLL|TEXT_READONLY)
-        @textbox.editable = false
-      show_logs  
-   
-      end
-      
-          end
-
-  end
+# @private 
+module Watobo#:nodoc: all
+  module Gui
+    class LogFileViewer < FXVerticalFrame
+
+      include Watobo::Constants
+      def show_logs
+        begin
+           @textbox.setText(Watobo.logs)
+        rescue => bang
+          puts "! Could not show logs"
+          puts bang
+          puts bang.backtrace if $DEBUG
+        end
+      end
+
+   
+      def initialize(parent, mode = nil, opts)
+        opts[:padding]=0
+        
+        super(parent, opts)
+
+        update_btn = FXButton.new(self, "Update",:opts => FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_LEFT).connect(SEL_COMMAND){ show_logs }
+        frame = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN)
+        @textbox = FXText.new(frame,  nil, 0, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_AUTOSCROLL|TEXT_READONLY)
+        @textbox.editable = false
+      show_logs  
+   
+      end
+      
+          end
+
+  end
 end

data/lib/watobo/gui/log_viewer.rb

@@ -1,102 +1,90 @@
-# .
+#.
 # log_viewer.rb
-# 
-# Copyright 2013 by siberas, http://www.siberas.de
-# 
-# This file is part of WATOBO (Web Application Tool Box)
-#        http://watobo.sourceforge.com
-# 
-# WATOBO is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation version 2 of the License.
-# 
-# WATOBO is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with WATOBO; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# .
-# @private 
-module Watobo#:nodoc: all
-  module Gui
-    class LogViewer < FXVerticalFrame
-
-      include Watobo::Constants
-      def purge_logs
-        begin
-          @log_text_lock.synchronize do
-            @textbox.setText('')
-          # @textbox.makePositionVisible 0
-          end
-        rescue => bang
-          puts "! Could not purge logs"
-          puts bang
-          puts bang.backtrace if $DEBUG
-        end
-      end
-
-      # LOG_INFO
-      def log(log_level, msg )
-
-        t = Time.now
-        now = t.strftime("%m/%d/%Y @ %H:%M:%S")
-
-        begin
-          log_text = case log_level
-          when LOG_INFO
-            "#{now}: #{msg}\n"
-          else
-          ""
-          end
-          @log_queue << log_text
-        rescue => bang
-          puts bang
-          puts bang.backtrace if $DEBUG
-        end
-      end
-
-      def initialize(parent, mode = nil, opts)
-        opts[:padding]=0
-        
-        @mode = mode.nil? ? :inster : mode
-
-        super(parent, opts)
+#.
+# Copyright 2014 by siberas, http://www.siberas.de
+# This file is part of WATOBO (Web Application Tool Box) http://watobo.sourceforge.com
+# WATOBO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.
+# WATOBO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License along with WATOBO; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-        @log_queue = Queue.new
-
-        @log_text_lock = Mutex.new
-
-        @textbox = FXText.new(self,  nil, 0, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
-        @textbox.editable = false
-        start_update_timer
-      end
-
-      private
-
-      def start_update_timer
-        @timer = FXApp.instance.addTimeout( 150, :repeat => true) {
-          #print @log_queue.length
-          if @log_queue.length > 0
-            msg = @log_queue.deq
-            if @mode == :insert
-              @log_text_lock.synchronize do
-                 @textbox.insertText(0,msg)
-               end
-            else
-              @log_text_lock.synchronize do
-                 @textbox.appendText(msg)
-               end
-            end
-             @textbox.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-          end
-          }
-
-      end
-     
-    end
-
-  end
+# @private 
+module Watobo#:nodoc: all
+  module Gui
+    class LogViewer < FXVerticalFrame
+
+      include Watobo::Constants
+      def purge_logs
+        begin
+          @log_text_lock.synchronize do
+            @textbox.setText('')
+          # @textbox.makePositionVisible 0
+          end
+        rescue => bang
+          puts "! Could not purge logs"
+          puts bang
+          puts bang.backtrace if $DEBUG
+        end
+      end
+
+      # LOG_INFO
+      def log(log_level, msg )
+
+        t = Time.now
+        now = t.strftime("%m/%d/%Y @ %H:%M:%S")
+
+        begin
+          log_text = case log_level
+          when LOG_INFO
+            "#{now}: #{msg}\n"
+          else
+          ""
+          end
+          @log_queue << log_text
+        rescue => bang
+          puts bang
+          puts bang.backtrace if $DEBUG
+        end
+      end
+
+      def initialize(parent, mode = nil, opts)
+        opts[:padding]=0
+        
+        @mode = mode.nil? ? :inster : mode
+
+        super(parent, opts)
+
+        @log_queue = Queue.new
+
+        @log_text_lock = Mutex.new
+
+        @textbox = FXText.new(self,  nil, 0, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
+        @textbox.editable = false
+        start_update_timer
+      end
+
+      private
+
+      def start_update_timer
+        @timer = FXApp.instance.addTimeout( 150, :repeat => true) {
+          #print @log_queue.length
+          if @log_queue.length > 0
+            msg = @log_queue.deq
+            if @mode == :insert
+              @log_text_lock.synchronize do
+                 @textbox.insertText(0,msg)
+               end
+            else
+              @log_text_lock.synchronize do
+                 @textbox.appendText(msg)
+               end
+            end
+             @textbox.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+          end
+          }
+
+      end
+     
+    end
+
+  end
 end