watobo 0.9.19 → 0.9.20

data/lib/watobo/gui/password_policy_dialog.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # password_policy_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/plugin_board.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # plugin_board.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/preferences_dialog.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # preferences_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/progress_window.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # progress_window.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/project_wizzard.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # project_wizzard.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/proxy_dialog.rb

@@ -1,25 +1,13 @@
-# .
+#.
 # proxy_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
-# .
-# @private 
+#.
+# 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
     class AddProxyDialog < FXDialogBox
@@ -30,8 +18,9 @@ module Watobo#:nodoc: all
         s = {
           :name =>  @proxy_name_dt.value,
           :port => @proxy_port_dt.value,
-          :host => @proxy_dt.value
-
+          :host => @proxy_dt.value,
+          :target_pattern => @pattern_dt.value,
+          :enabled => true
         }
 
         c = {
@@ -53,8 +42,8 @@ module Watobo#:nodoc: all
       end
 
       def savePasswords?()
-       return false
-       # @save_pws_cbt.checked?
+        return false
+      # @save_pws_cbt.checked?
       end
 
       def onAccept(sender, sel, event)
@@ -93,8 +82,8 @@ module Watobo#:nodoc: all
         return 0
         end
 
-      #  @password_policy[:save_passwords] = @save_pws_cbt.checked?
-      #  puts @password_policy.to_yaml
+        #  @password_policy[:save_passwords] = @save_pws_cbt.checked?
+        #  puts @password_policy.to_yaml
         getApp().stopModal(self, 1)
         self.hide()
         return 1
@@ -110,6 +99,7 @@ module Watobo#:nodoc: all
         @proxy_name_dt = FXDataTarget.new('')
         @proxy_port_dt = FXDataTarget.new('')
         @proxy_dt = FXDataTarget.new('')
+        @pattern_dt = FXDataTarget.new('')
         @username_dt = FXDataTarget.new('')
         @password_dt = FXDataTarget.new('')
         @password_rt_dt = FXDataTarget.new('')
@@ -119,9 +109,11 @@ module Watobo#:nodoc: all
 
         unless proxy.nil?
           begin
+            puts proxy.to_yaml
             @proxy_name_dt.value = proxy[:name]
             @proxy_port_dt.value = proxy[:port]
             @proxy_dt.value = proxy[:host]
+            @pattern_dt.value = proxy[:target_pattern]
 
             @username_dt.value = proxy[:username] if proxy.has_key? :username
             @password_dt.value = proxy[:password] if proxy.has_key? :password
@@ -135,8 +127,8 @@ module Watobo#:nodoc: all
 
         end
 
-       # @password_policy = Hash.new
-       # @password_policy.update password_policy
+        # @password_policy = Hash.new
+        # @password_policy.update password_policy
         main = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
 
         matrix = FXMatrix.new(main, 2, :opts => MATRIX_BY_COLUMNS|LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_GROOVE)
@@ -161,6 +153,14 @@ module Watobo#:nodoc: all
         :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT)
 
         port.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+        
+        
+        FXLabel.new(matrix, "Pattern:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
+        pattern = FXTextField.new(matrix, 25,
+        :target => @pattern_dt, :selector => FXDataTarget::ID_VALUE,
+        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT)
+
+        pattern.handle(self, FXSEL(SEL_UPDATE, 0), nil)
 
         FXLabel.new(matrix, "Auth-Type:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
         @auth_types_cb = FXComboBox.new(matrix, 5, nil, 0,
@@ -219,11 +219,11 @@ module Watobo#:nodoc: all
         :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT)
         domain.handle(self, FXSEL(SEL_UPDATE, 0), nil)
 
-      #  frame = FXVerticalFrame.new(main, :opts => LAYOUT_FILL_X)
-      #  @save_pws_cbt = FXCheckButton.new(frame, "save passwords")
-      #  @save_pws_cbt.checkState = false
-      #  @save_pws_cbt.checkState = true if password_policy[:save_passwords] == true
-      #  note_label = FXLabel.new(frame, "This setting affects all passwords!!!")
+        #  frame = FXVerticalFrame.new(main, :opts => LAYOUT_FILL_X)
+        #  @save_pws_cbt = FXCheckButton.new(frame, "save passwords")
+        #  @save_pws_cbt.checkState = false
+        #  @save_pws_cbt.checkState = true if password_policy[:save_passwords] == true
+        #  note_label = FXLabel.new(frame, "This setting affects all passwords!!!")
 
         buttons = FXHorizontalFrame.new(main, :opts => LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|PACK_UNIFORM_WIDTH,
         :padLeft => 40, :padRight => 40, :padTop => 20, :padBottom => 20)
@@ -265,35 +265,30 @@ module Watobo#:nodoc: all
     end
 
     class ProxyDialog < FXDialogBox
-     #TODO: Implement Connection Check!!
+      #TODO: Implement Connection Check!!
 
       attr_accessor :proxy
 
       include Responder
       def switchEnableProxy()
-        if not @proxyEnableCheckButton.checked? then
-          @proxyTable.hide()
-          @newProxyButton.disable
-          @delProxyButton.disable
-          @editProxyButton.disable
-          @acceptBtn.enable
-          @proxy = nil
-        @proxyTable.killSelection()
-        else
-          @proxyTable.show()
-          @newProxyButton.enable
-          selectProxy(@proxy)
-          @acceptBtn.disable
-          refreshProxyList()
-        end
-        @proxySelectionFrame.enabled = @proxyEnableCheckButton.checked?
-        @proxy_prelabel.enabled = @proxyEnableCheckButton.checked?
-        @proxy_label.enabled = @proxyEnableCheckButton.checked?
+        @proxyTable.show()
+        @newProxyButton.enable
+        selectProxy(@proxy)
+        @acceptBtn.disable
+        refreshProxyList()
+        
+        @proxySelectionFrame.enable
+        #@proxy_prelabel.enable
+        #@proxy_label.enable
       end
 
       def refreshProxyList
         @proxyTable.clearItems(false)
-        @proxyTable.setTableSize(0, 2)
+        @proxyTable.setTableSize(0, 4)
+        @proxyTable.setColumnText(0, "Name" )
+        @proxyTable.setColumnText(1, "Proxy" )
+        @proxyTable.setColumnText(2, "Pattern" )
+        @proxyTable.setColumnText(3, "Enabled" )
         return if @proxy_list.nil?
         @proxy_list.each_key do |proxy|
           puts "* addProxyItem #{proxy}"
@@ -302,7 +297,7 @@ module Watobo#:nodoc: all
       end
 
       def getProxyPrefs()
-        @proxy_list[:default_proxy] = @proxy.nil? ? '' : @proxy[:name]
+       # @proxy_list[:default_proxy] = @proxy.nil? ? '' : @proxy[:name]
         @proxy_list
       end
 
@@ -315,7 +310,7 @@ module Watobo#:nodoc: all
           # puts proxy.to_yaml
           @proxy_list[proxy[:name]] = proxy
         end
-      #  @password_policy[:save_passwords] = @save_passwords
+        #  @password_policy[:save_passwords] = @save_passwords
         getApp().stopModal(self, 1)
         self.hide()
         return 1
@@ -342,7 +337,7 @@ module Watobo#:nodoc: all
           @proxy_list[@proxy[:name]] = @proxy
 
           addProxyItem( @proxy )
-          
+
           lastRowIndex = @proxyTable.numRows
           last = -1
           lastRowIndex.times do |i|
@@ -355,7 +350,7 @@ module Watobo#:nodoc: all
 
           @proxyTable.selectRow(last)
           @proxyTable.makePositionVisible(last,0)
-          @proxy_label.text = @proxy[:name]
+         # @proxy_label.text = @proxy[:name]
         end
       end
 
@@ -372,7 +367,7 @@ module Watobo#:nodoc: all
           @proxyTable.killSelection(true)
           @delProxyButton.disable
           @acceptBtn.disable
-          @proxy_label.text = ''
+         # @proxy_label.text = ''
         end
       end
 
@@ -392,7 +387,7 @@ module Watobo#:nodoc: all
         if row >= 0 then
           @proxyTable.selectRow(row)
           @proxy = @proxyTable.getItemData(row,0)
-          @proxy_label.text = @proxy[:name]
+          #@proxy_label.text = @proxy[:name]
         @delProxyButton.enable
         @editProxyButton.enable
         @acceptBtn.enable
@@ -405,7 +400,7 @@ module Watobo#:nodoc: all
         @editProxyButton.disable
         @delProxyButton.disable
         @proxyTable.killSelection(true)
-        @proxy_label.text = "- none -"
+       # @proxy_label.text = "- none -"
         @proxy = nil
         return false if proxy.nil?
         return false unless proxy[:name]
@@ -414,12 +409,12 @@ module Watobo#:nodoc: all
         @proxyTable.each do |items|
           if items[0].to_s == proxy_name
             puts "* match #{proxy_name}"
-          @proxyTable.selectRow(i)
-          @proxyTable.setCurrentItem(i,0)
-          @proxyTable.makePositionVisible(i,0)
-          @proxy = @proxyTable.getItemData(i,0)
+            @proxyTable.selectRow(i)
+            @proxyTable.setCurrentItem(i,0)
+            @proxyTable.makePositionVisible(i,0)
+            @proxy = @proxyTable.getItemData(i,0)
           #  puts @proxy
-          @proxy_label.text = proxy_name
+          #@proxy_label.text = proxy_name
           @delProxyButton.enable
           end
           i += 1
@@ -431,7 +426,7 @@ module Watobo#:nodoc: all
       end
 
       def addProxyItem(proxy)
-       # puts proxy.to_yaml
+        # puts proxy.to_yaml
         lastRowIndex = @proxyTable.numRows
         siteIndex = -1
         lastRowIndex.times do |i|
@@ -449,23 +444,32 @@ module Watobo#:nodoc: all
         @proxyTable.setItemText(lastRowIndex, 1, proxy[:host] + ":" + proxy[:port])
         @proxyTable.setItemData(lastRowIndex, 0, proxy)
         @proxyTable.getItem(lastRowIndex,1).justify = FXTableItem::LEFT
+
+        @proxyTable.setItemText(lastRowIndex, 2, proxy[:target_pattern])
+        #@proxyTable.setItemData(lastRowIndex, 0, proxy)
+        @proxyTable.getItem(lastRowIndex,2).justify = FXTableItem::LEFT
+
+        enabled = proxy[:enabled] ? "True" : "False"
+        @proxyTable.setItemText(lastRowIndex, 3, enabled)
+        #@proxyTable.setItemData(lastRowIndex, 0, proxy)
+        @proxyTable.getItem(lastRowIndex,3).justify = FXTableItem::LEFT
       end
 
       def initialize(owner)
-        super(owner, "Use Proxy", :opts => DECOR_ALL, :width => 250, :height => 400)
+        super(owner, "Use Proxy", :opts => DECOR_ALL, :width => 450, :height => 400)
         @new_proxy = FXDataTarget.new('')
         @save_passwords = false
-        
+
         @proxy_settings = Hash.new
         @proxy_settings.update(Watobo::Conf::ForwardingProxy.to_h)
 
-      #  @password_policy = password_policy
+        #  @password_policy = password_policy
 
         @proxy = nil
         pname = @proxy_settings[:default_proxy]
         @proxy_settings ||= {}
         if @proxy_settings.has_key? pname
-        @proxy = @proxy_settings[pname]
+          @proxy = @proxy_settings[pname]
         end
 
         @proxy_list = {}
@@ -475,17 +479,18 @@ module Watobo#:nodoc: all
         FXMAPFUNC(SEL_COMMAND, ID_ACCEPT, :onAccept)
         FXMAPFUNC(SEL_COMMAND, ID_CANCEL, :onCancel)
 
-        current_proxy_frame = FXHorizontalFrame.new(self,FRAME_NONE|LAYOUT_FILL_X|FRAME_GROOVE)
-        FXLabel.new(current_proxy_frame, "Current Proxy:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
-        @cp_label = FXLabel.new(current_proxy_frame, "- none -", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
+       # current_proxy_frame = FXHorizontalFrame.new(self,FRAME_NONE|LAYOUT_FILL_X|FRAME_GROOVE)
+       # FXLabel.new(current_proxy_frame, "Current Proxy:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
+       # @cp_label = FXLabel.new(current_proxy_frame, "- none -", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
 
         main_frame = FXVerticalFrame.new(self, :opts => FRAME_GROOVE|LAYOUT_FILL_X|LAYOUT_FILL_Y)
         enable_proxy_frame = FXHorizontalFrame.new(main_frame,FRAME_NONE|LAYOUT_FILL_X|LAYOUT_FILL_Y)
-        @proxyEnableCheckButton = FXCheckButton.new(enable_proxy_frame, "enable forwarding proxy", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_LEFT)
+       # @proxyEnableCheckButton = FXCheckButton.new(enable_proxy_frame, "enable forwarding proxy", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_LEFT)
+        FXLabel.new(enable_proxy_frame, "Right click row for enabling/disabling proxy.")
 
-        @proxyEnableCheckButton.connect(SEL_COMMAND) do |sender, sel, item|
-          switchEnableProxy()
-        end
+       # @proxyEnableCheckButton.connect(SEL_COMMAND) do |sender, sel, item|
+       #   switchEnableProxy()
+       # end
 
         @proxySelectionFrame = FXGroupBox.new(main_frame, "Select Forwarding Proxy", LAYOUT_SIDE_TOP|FRAME_GROOVE|LAYOUT_FILL_X|LAYOUT_FILL_Y, 0, 0, 0, 0)
 
@@ -494,11 +499,38 @@ module Watobo#:nodoc: all
         @proxyTable = FXTable.new(proxySubSelection,
         :opts => TABLE_COL_SIZABLE|TABLE_ROW_SIZABLE|LAYOUT_FILL_X|LAYOUT_FILL_Y|TABLE_READONLY,
         :padding => 2)
-        @proxyTable.setTableSize(0, 2)
+        @proxyTable.setTableSize(0, 4)
 
         @proxyTable.connect(SEL_COMMAND, method(:onProxySelect))
         @proxyTable.connect(SEL_SELECTED, method(:onProxySelect))
 
+        @proxyTable.connect(SEL_RIGHTBUTTONRELEASE) do |sender, sel, event|
+          unless event.moved?
+            #   row = sender.getCurrentRow
+            ypos = event.click_y
+            row = @proxyTable.rowAtY(ypos)
+            #  puts "right click on row #{row} of #{@chatTable.numRows}"
+            if row >= 0 and row < @proxyTable.numRows then
+              proxy = @proxyTable.getItemData(row,0)
+
+              @proxyTable.selectRow(row, false)
+              FXMenuPane.new(self) do |menu_pane|
+                target = FXMenuCheck.new(menu_pane, "Enabled" )
+                target.check = proxy.has_key?(:enabled) ? proxy[:enabled] : false
+                target.connect(SEL_COMMAND) {
+                  proxy[:enabled] = target.checked?()
+                  refreshProxyList
+                }
+
+                menu_pane.create
+                menu_pane.popup(nil, event.root_x, event.root_y)
+                app.runModalWhileShown(menu_pane)
+              end
+
+            end
+          end
+        end
+
         @proxyTable.rowHeaderWidth = 0
         @proxyTable.rowHeaderMode = LAYOUT_FIX_WIDTH
 
@@ -518,9 +550,9 @@ module Watobo#:nodoc: all
         @delProxyButton.connect(SEL_COMMAND, method(:delProxy))
         @delProxyButton.disable
 
-        selection_frame = FXHorizontalFrame.new(main_frame,FRAME_NONE|LAYOUT_FILL_X)
-        @proxy_prelabel = FXLabel.new(selection_frame, "Selected Proxy:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
-        @proxy_label = FXLabel.new(selection_frame, "- none -", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
+       # selection_frame = FXHorizontalFrame.new(main_frame,FRAME_NONE|LAYOUT_FILL_X)
+       # @proxy_prelabel = FXLabel.new(selection_frame, "Selected Proxy:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
+       # @proxy_label = FXLabel.new(selection_frame, "- none -", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
 
         buttons = FXHorizontalFrame.new(main_frame, :opts => LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|PACK_UNIFORM_WIDTH,
         :padLeft => 40, :padRight => 40, :padTop => 20, :padBottom => 20)
@@ -528,13 +560,13 @@ module Watobo#:nodoc: all
         # Accept
         @acceptBtn = FXButton.new(buttons, "&Accept", nil, self, ID_ACCEPT,
         FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)
-        @acceptBtn.disable
+        @acceptBtn.enable
         # Cancel
         FXButton.new(buttons, "&Cancel", nil, self, ID_CANCEL,
         FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)
 
-        @proxyEnableCheckButton.setCheck(false, false)
-        @proxyEnableCheckButton.setCheck(true, false) unless @proxy.nil?
+        #@proxyEnableCheckButton.setCheck(false, false)
+        #@proxyEnableCheckButton.setCheck(true, false) unless @proxy.nil?
         refreshProxyList()
         switchEnableProxy()