watobo 0.9.21 → 0.9.23

data/lib/watobo/gui/about_watobo.rb

@@ -1,12 +1,3 @@
-#.
-# about_watobo.rb
-#.
-# 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
   

data/lib/watobo/gui/browser_preview.rb

@@ -1,12 +1,3 @@
-#.
-# browser_preview.rb
-#.
-# 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/certificate_dialog.rb

@@ -1,12 +1,3 @@
-#.
-# certificate_dialog.rb
-#.
-# 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/chat_diff.rb

@@ -1,12 +1,3 @@
-#.
-# chat_diff.rb
-#.
-# 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/chatviewer_frame.rb

@@ -1,14 +1,5 @@
-#.
-# chatviewer_frame.rb
-#.
-# 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 Watobo #:nodoc: all
   module Gui
 
     SEL_TYPE_GREP = 0
@@ -16,6 +7,7 @@ module Watobo#:nodoc: all
     class TextViewer < FXVerticalFrame
 
       attr_accessor :max_len
+
       def style=(new_style)
         @simple_text_view.style = new_style
       end
@@ -25,24 +17,24 @@ module Watobo#:nodoc: all
       end
 
       def setText(text, prefs={})
-        
+
         normalized_text = text
         if text.is_a? String
-           normalized_text = text.gsub(/[^[:print:]]/,".")
+          normalized_text = text.gsub(/[^[:print:]]/, ".")
         elsif text.respond_to? :has_body?
           if text.content_type =~ /(xml)/
             doc = Nokogiri::XML(text.body, &:noblanks)
-            fbody = doc.to_xhtml( indent:3, indent_text:" ")
-            normalized_text = text.headers.map{|h| h.strip }.join("\n")
+            fbody = doc.to_xhtml(indent: 3, indent_text: " ")
+            normalized_text = text.headers.map { |h| h.strip }.join("\n")
             normalized_text << "\n\n"
             unless fbody.to_s.empty?
-            normalized_text << fbody.to_s
+              normalized_text << fbody.to_s
             else
               normalized_text = text
             end
           end
         end
-        
+
         @text = normalized_text
         #@text = text
         @simple_text_view.max_len = @max_len
@@ -78,7 +70,7 @@ module Watobo#:nodoc: all
         @text_dt = FXDataTarget.new('')
         @filter_dt = FXDataTarget.new('')
 
-        text_view_header = FXHorizontalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_SIDE_BOTTOM|LAYOUT_FIX_HEIGHT,:height => 24, :padding => 0)
+        text_view_header = FXHorizontalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_SIDE_BOTTOM|LAYOUT_FIX_HEIGHT, :height => 24, :padding => 0)
 
         #@auto_apply_cbtn.connect(SEL_COMMAND, method(:onInterceptChanged))
 
@@ -94,7 +86,7 @@ module Watobo#:nodoc: all
         #  :opts => FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y)
 
         @filter_text = FXComboBox.new(text_view_header, 20, @filter_dt, 0, FRAME_SUNKEN|FRAME_THICK|LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
-        @filter_text.connect(SEL_COMMAND){
+        @filter_text.connect(SEL_COMMAND) {
           applyFilter()
           addFilterHistory()
         }
@@ -104,27 +96,27 @@ module Watobo#:nodoc: all
         }
 
         menu = FXMenuPane.new(self)
-        FXMenuCommand.new(menu, "&Highlight").connect(SEL_COMMAND){
+        FXMenuCommand.new(menu, "&Highlight").connect(SEL_COMMAND) {
           @filter_mode = SEL_TYPE_HIGHLIGHT
           applyFilter()
           @mode_btn.text = "Highlight"
-        }#, method(:switchMethod))
-        FXMenuCommand.new(menu, "&Grep").connect(SEL_COMMAND){
+        } #, method(:switchMethod))
+        FXMenuCommand.new(menu, "&Grep").connect(SEL_COMMAND) {
           @filter_mode = SEL_TYPE_GREP
           applyFilter()
           @mode_btn.text = "Grep"
-        }#, method(:switchMethod))
+        } #, method(:switchMethod))
 
         @auto_apply_cbtn = FXCheckButton.new(text_view_header, "auto-apply", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP|LAYOUT_RIGHT|LAYOUT_FILL_Y)
         @mode_btn = FXMenuButton.new(text_view_header, "Highlight", nil, menu,
-        :opts=> MENUBUTTON_DOWN|FRAME_RAISED|FRAME_THICK|ICON_AFTER_TEXT|LAYOUT_RIGHT|LAYOUT_FILL_Y)
+                                     :opts => MENUBUTTON_DOWN|FRAME_RAISED|FRAME_THICK|ICON_AFTER_TEXT|LAYOUT_RIGHT|LAYOUT_FILL_Y)
 
         reset_button = FXButton.new(text_view_header, "&Reset", nil, nil, 0, FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_Y)
-        reset_button.connect(SEL_COMMAND){ resetFilter() }
+        reset_button.connect(SEL_COMMAND) { resetFilter() }
 
         text_box_frame = FXVerticalFrame.new(self, LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK, :padding => 0)
 
-        @simple_text_view = SimpleTextView.new(text_box_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y,:padding => 0)
+        @simple_text_view = SimpleTextView.new(text_box_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
         @simple_text_view.style = 1
         @simple_text_view.editable = false
         @simple_text_view.textStyle -= TEXT_WORDWRAP
@@ -144,10 +136,10 @@ module Watobo#:nodoc: all
         @match_pos_label.textColor = 'grey'
         return true if pattern == ''
         case @filter_mode
-        when SEL_TYPE_GREP
-          grepPattern(pattern)
-        when SEL_TYPE_HIGHLIGHT
-          highlightPattern(pattern)
+          when SEL_TYPE_GREP
+            grepPattern(pattern)
+          when SEL_TYPE_HIGHLIGHT
+            highlightPattern(pattern)
         end
       end
 
@@ -197,7 +189,6 @@ module Watobo#:nodoc: all
         @simple_text_view.makeMatchVisible(0)
 
         @match_pos_label.text = "1/#{@simple_text_view.numMatches()}" if @simple_text_view.numMatches() > 0
-
       end
 
       def grepPattern(pattern)
@@ -223,12 +214,12 @@ module Watobo#:nodoc: all
         @ctrl_pressed = false
 
         widget.connect(SEL_KEYPRESS) { |sender, sel, event|
-        # puts event.code
+          # puts event.code
           @ctrl_pressed = true if event.code == KEY_Control_L or event.code == KEY_Control_R
           #  @shift_pressed = true if @ctrl_pressed and ( event.code == KEY_Shift_L or event.code == KEY_Shift_R )
           if event.code == KEY_Return
             highlight(@filter_text.text)
-          true # special handling of KEY_Return, because we don't want a linebreak in textbox.
+            true # special handling of KEY_Return, because we don't want a linebreak in textbox.
           end
 
           if event.code == KEY_F1
@@ -237,12 +228,12 @@ module Watobo#:nodoc: all
               FXMenuPane.new(self) do |menu_pane|
                 FXMenuCaption.new(menu_pane, "Hotkeys:")
                 FXMenuSeparator.new(menu_pane)
-                [ "<ctrl-r> - Reset Filter",
-                  "<ctrl-g> - Grep",
-                  "<ctrl-h> - Highlight",
-                  "<ctrl-n> - Goto Next",
-                  "<ctrl-shift-n> - Goto Prev",
-                  "<ctrl-w> - Switch Wordwrap"
+                ["<ctrl-r> - Reset Filter",
+                 "<ctrl-g> - Grep",
+                 "<ctrl-h> - Highlight",
+                 "<ctrl-n> - Goto Next",
+                 "<ctrl-shift-n> - Goto Prev",
+                 "<ctrl-w> - Switch Wordwrap"
                 ].each do |hk|
                   FXMenuCaption.new(menu_pane, hk).backColor = 'yellow'
                 end
@@ -257,26 +248,26 @@ module Watobo#:nodoc: all
 
           if @ctrl_pressed
             case event.code
-            when KEY_n
-              gotoNextMatch()
-              addFilterHistory()
-            when KEY_N
-              gotoPrevMatch()
-              addFilterHistory()
-            when KEY_w
-              @simple_text_view.textbox.textStyle ^= TEXT_WORDWRAP
-            when KEY_h
-              @mode_btn.text = "Highlight"
-              @filter_mode = SEL_TYPE_HIGHLIGHT
-              addFilterHistory()
-              applyFilter()
-            when KEY_g
-              @mode_btn.text = "Grep"
-              @filter_mode = SEL_TYPE_GREP
-              addFilterHistory()
-              applyFilter()
-            when KEY_r
-              resetFilter()
+              when KEY_n
+                gotoNextMatch()
+                addFilterHistory()
+              when KEY_N
+                gotoPrevMatch()
+                addFilterHistory()
+              when KEY_w
+                @simple_text_view.textbox.textStyle ^= TEXT_WORDWRAP
+              when KEY_h
+                @mode_btn.text = "Highlight"
+                @filter_mode = SEL_TYPE_HIGHLIGHT
+                addFilterHistory()
+                applyFilter()
+              when KEY_g
+                @mode_btn.text = "Grep"
+                @filter_mode = SEL_TYPE_GREP
+                addFilterHistory()
+                applyFilter()
+              when KEY_r
+                resetFilter()
 
             end
           end
@@ -294,6 +285,7 @@ module Watobo#:nodoc: all
     class RequestViewer < FXVerticalFrame
 
       attr_accessor :max_len
+
       def setText(text)
         @text = text
         @textviewer.max_len = @max_len
@@ -336,7 +328,7 @@ module Watobo#:nodoc: all
         }
         textviewer_tab = FXTabItem.new(@tabBook, "Text", nil)
         tab_frame = FXVerticalFrame.new(@tabBook, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED)
-        @textviewer = TextViewer.new(tab_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y,:padding => 0)
+        @textviewer = TextViewer.new(tab_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
         @textviewer.style = 1
         @textviewer.editable = false
 
@@ -346,10 +338,15 @@ module Watobo#:nodoc: all
         tab_frame = FXVerticalFrame.new(@tabBook, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED)
         @hexViewer = HexViewer.new(tab_frame)
         @viewers.push @hexViewer
-        
+
         FXTabItem.new(@tabBook, "Table", nil)
         tab_frame = FXVerticalFrame.new(@tabBook, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED)
         @viewers << Watobo::Gui::TableEditorFrame.new(tab_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK, :padding => 0)
+
+        FXTabItem.new(@tabBook, "JSON", nil)
+       # tab_frame = FXVerticalFrame.new(@tabBook, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED)
+       # @viewers << Watobo::Gui::TableEditorFrame.new(tab_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK, :padding => 0)
+        @viewers << JsonViewer.new(@tabBook, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED)
       end
 
     end
@@ -359,15 +356,16 @@ module Watobo#:nodoc: all
       include Watobo::Gui::Utils
 
       attr_accessor :max_len, :auto_filter
+
       def setText(text, prefs={})
-        
+
         @text = text
         @textviewer.max_len = @max_len
         index = @tabBook.current
 
         @viewers[index].setText(text)
-     #  @viewers.map{|v| v.setText(text)}
-      # @textviewer.applyFilter if cp[:filter] == true
+        #  @viewers.map{|v| v.setText(text)}
+        # @textviewer.applyFilter if cp[:filter] == true
 
       end
 
@@ -412,8 +410,8 @@ module Watobo#:nodoc: all
 
         textviewer_tab = FXTabItem.new(@tabBook, "Text", nil)
         tab_frame = FXVerticalFrame.new(@tabBook, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED)
-        @textviewer = TextViewer.new( tab_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
-       # @textviewer = TextView2.new( tab_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
+        @textviewer = TextViewer.new(tab_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
+        # @textviewer = TextView2.new( tab_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
 
         @textviewer.style = 2
         @textviewer.editable = false
@@ -424,7 +422,7 @@ module Watobo#:nodoc: all
 
         taglessviewer_tab = FXTabItem.new(@tabBook, "Tagless", nil)
         tab_frame = FXVerticalFrame.new(@tabBook, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED)
-        tagless_frame = FXVerticalFrame.new(tab_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK, :padding=>0)
+        tagless_frame = FXVerticalFrame.new(tab_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK, :padding => 0)
         #text_view_header = FXHorizontalFrame.new(tagless_frame, :opts => LAYOUT_FILL_X|LAYOUT_SIDE_BOTTOM)
         @taglessviewer = TaglessViewer.new(tagless_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
         @viewers << @taglessviewer
@@ -433,17 +431,20 @@ module Watobo#:nodoc: all
         tab_frame = FXVerticalFrame.new(@tabBook, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED)
         @hexViewer = HexViewer.new(tab_frame)
         @viewers << @hexViewer
-        
-        FXTabItem.new(@tabBook, "HTML", nil)       
+
+        FXTabItem.new(@tabBook, "HTML", nil)
         @html_viewer = HTMLViewerFrame.new(@tabBook, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED)
         @viewers << @html_viewer
-        
-        FXTabItem.new(@tabBook, "Custom", nil)       
+
+        FXTabItem.new(@tabBook, "Custom", nil)
         @viewers << CustomViewer.new(@tabBook, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED)
-        
+
+        FXTabItem.new(@tabBook, "JSON", nil)
+        @viewers << JsonViewer.new(@tabBook, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED)
+
       end
 
     end
-  ###################### end of namespace ############################
+    ###################### end of namespace ############################
   end
 end

data/lib/watobo/gui/checkboxtree.rb

@@ -1,12 +1,3 @@
-#.
-# checkboxtree.rb
-#.
-# 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
-
 if $0 == __FILE__
   inc_path = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
   $: << inc_path

data/lib/watobo/gui/checks_policy_frame.rb

@@ -1,12 +1,3 @@
-#.
-# checks_policy_frame.rb
-#.
-# 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/client_cert_dialog.rb

@@ -1,14 +1,5 @@
-#.
-# client_cert_dialog.rb
-#.
-# 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 Watobo #:nodoc: all
   module Gui
     class ClientCertDialog < FXDialogBox
       class PEMFrame < FXVerticalFrame
@@ -24,6 +15,12 @@ module Watobo#:nodoc: all
               client_cert[:ssl_client_key] = OpenSSL::PKey::RSA.new(File.read(@client_key_dt.value), @password_dt.value)
             end
 
+            client_cert[:password] = @password_dt.value
+
+            client_cert[:certificate_file] = @client_cert_dt.value
+            client_cert[:key_file] = @client_key_dt.value
+            client_cert[:type] = :pem
+
             return client_cert
           rescue => bang
             puts bang
@@ -34,30 +31,45 @@ module Watobo#:nodoc: all
 
         def settings
           s = {
-            :certificate_file => @client_cert_dt.value,
-            :password => @password_dt.value,
-            :key_file => @client_key_dt.value
+              :certificate_file => @client_cert_dt.value,
+              :password => @password_dt.value,
+              :key_file => @client_key_dt.value
           }
         end
 
+        def update_fields(c)
+          unless c.nil?
+            @client_cert_dt.value = c[:certificate_file]
+            @cert_path = File.dirname(c[:certificate_file]) + '/'
+            @client_key_dt.value = c[:key_file]
+            @password_dt.value = c[:password].nil? ? '' : c[:password]
+            @retype_dt.value = c[:password].nil? ? '' : c[:password]
+            @client_cert_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+            @client_key_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+            @password_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+            @retype_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+          end
+        end
+
+
         def settings_valid?
           unless @password_dt.value.empty?
             puts "* password is set"
             if @password_dt.value != @retype_dt.value
               FXMessageBox.information(self, MBOX_OK, "Passwords", "Passwords don't match!")
-            return false
+              return false
             end
-          password = @password_dt.value
+            password = @password_dt.value
           end
 
           unless File.exist?(@client_cert_dt.value)
             FXMessageBox.information(self, MBOX_OK, "File not found", "#{@client_cert_dt.value} does not exist!")
-          return false
+            return false
           end
 
           unless File.exist?(@client_key_dt.value)
             FXMessageBox.information(self, MBOX_OK, "File not found", "#{@client_key_dt.value} does not exist!")
-          return false
+            return false
 
           end
           # last but not least check if private key can be accessed
@@ -65,7 +77,7 @@ module Watobo#:nodoc: all
             key = OpenSSL::PKey::RSA.new(File.open(@client_key_dt.value), password)
           rescue => bang
             FXMessageBox.information(self, MBOX_OK, "Wrong Password", "Could not open private key file. Wrong password?")
-          return false
+            return false
           end
           true
         end
@@ -80,44 +92,44 @@ module Watobo#:nodoc: all
           matrix = FXMatrix.new(self, 3, :opts => MATRIX_BY_COLUMNS|LAYOUT_FILL_X|LAYOUT_FILL_Y)
 
           FXLabel.new(matrix, "Certificate File:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
-          @client_cert_txt = FXTextField.new(matrix,  25,
-        :target => @client_cert_dt, :selector => FXDataTarget::ID_VALUE,
-        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT)
+          @client_cert_txt = FXTextField.new(matrix, 25,
+                                             :target => @client_cert_dt, :selector => FXDataTarget::ID_VALUE,
+                                             :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT)
 
-          FXButton.new(matrix, "Select").connect(SEL_COMMAND){ select_cert_file }
+          FXButton.new(matrix, "Select").connect(SEL_COMMAND) { select_cert_file }
 
           FXLabel.new(matrix, "Key File:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
           @client_key_txt = FXTextField.new(matrix, 25,
-        :target => @client_key_dt, :selector => FXDataTarget::ID_VALUE,
-        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT)
-          FXButton.new(matrix, "Select").connect(SEL_COMMAND){ select_key_file }
+                                            :target => @client_key_dt, :selector => FXDataTarget::ID_VALUE,
+                                            :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT)
+          FXButton.new(matrix, "Select").connect(SEL_COMMAND) { select_key_file }
 
           #  matrix = FXMatrix.new(main_frame, 2, :opts => MATRIX_BY_COLUMNS|LAYOUT_FILL_X|LAYOUT_FILL_Y)
           FXLabel.new(matrix, "Password:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
           @password_txt = FXTextField.new(matrix, 25,
-        :target => @password_dt, :selector => FXDataTarget::ID_VALUE,
-        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT|TEXTFIELD_PASSWD)
+                                          :target => @password_dt, :selector => FXDataTarget::ID_VALUE,
+                                          :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT|TEXTFIELD_PASSWD)
 
-          FXButton.new(matrix, "", :opts=>FRAME_NONE).disable
+          FXButton.new(matrix, "", :opts => FRAME_NONE).disable
 
           FXLabel.new(matrix, "Retype:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
           @retype_txt = FXTextField.new(matrix, 25,
-        :target => @retype_dt, :selector => FXDataTarget::ID_VALUE,
-        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT|TEXTFIELD_PASSWD)
+                                        :target => @retype_dt, :selector => FXDataTarget::ID_VALUE,
+                                        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT|TEXTFIELD_PASSWD)
 
-          FXButton.new(matrix, "", :opts=>FRAME_NONE).disable
+          FXButton.new(matrix, "", :opts => FRAME_NONE).disable
 
         end
 
         private
 
         def select_cert_file()
-          cert_filename = FXFileDialog.getOpenFilename(self, "Select Certificate File", @cert_path, "*.pem\n*")
+          cert_filename = FXFileDialog.getOpenFilename(self, "Select Certificate File", @cert_path, "*.pem,*.cer\n*")
           if cert_filename != "" then
             if File.exists?(cert_filename) then
               @client_cert_dt.value = cert_filename
               @client_cert_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-              @cert_path = File.dirname(cert_filename)
+              @cert_path = File.dirname(cert_filename) + '/'
             end
           end
         end
@@ -129,7 +141,7 @@ module Watobo#:nodoc: all
             if File.exists?(key_filename) then
               @client_key_dt.value = key_filename
               @client_key_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-              @cert_path = File.dirname(key_filename)
+              @cert_path = File.dirname(key_filename) + '/'
             end
           end
         end
@@ -142,17 +154,18 @@ module Watobo#:nodoc: all
           password = @password_dt.value
 
           begin
-puts "* open certfile: #{@client_cert_dt.value}"
             if File.exist?(@client_cert_dt.value)
               p12_data = nil
-              File.open(@client_cert_dt.value, "rb"){|fh|
+              File.open(@client_cert_dt.value, "rb") { |fh|
                 p12_data = fh.read
               }
-              p12 = OpenSSL::PKCS12.new( p12_data, password)
-              puts p12.certificate
+              p12 = OpenSSL::PKCS12.new(p12_data, password)
               client_cert[:ssl_client_cert] = p12.certificate
               client_cert[:ssl_client_key] = p12.key
-              client_cert[:extra_chain_certs] =  p12.ca_certs
+              client_cert[:extra_chain_certs] = p12.ca_certs
+              client_cert[:certificate_file] = @client_cert_dt.value
+              client_cert[:password] = password
+              client_cert[:type] = :pkcs12
 
             end
 
@@ -164,19 +177,31 @@ puts "* open certfile: #{@client_cert_dt.value}"
           return nil
         end
 
+        def update_fields(c)
+          unless c.nil?
+            @client_cert_dt.value = c[:certificate_file]
+            @cert_path = File.dirname(c[:certificate_file]) + '/'
+            @password_dt.value = c[:password].nil? ? '' : c[:password]
+            @retype_dt.value = c[:password].nil? ? '' : c[:password]
+            @client_cert_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+            @password_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+            @retype_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+          end
+        end
+
         def settings_valid?
           unless @password_dt.value.empty?
             puts "* password is set"
             if @password_dt.value != @retype_dt.value
               FXMessageBox.information(self, MBOX_OK, "Passwords", "Passwords don't match!")
-            return false
+              return false
             end
-          password = @password_dt.value
+            password = @password_dt.value
           end
 
           unless File.exist?(@client_cert_dt.value)
             FXMessageBox.information(self, MBOX_OK, "File not found", "#{@client_cert_dt.value} does not exist!")
-          return false
+            return false
           end
 
           true
@@ -184,8 +209,8 @@ puts "* open certfile: #{@client_cert_dt.value}"
 
         def settings
           s = {
-            :certificate_file => @client_cert_dt.value,
-            :password => @password_dt.value
+              :certificate_file => @client_cert_dt.value,
+              :password => @password_dt.value
           }
         end
 
@@ -199,25 +224,25 @@ puts "* open certfile: #{@client_cert_dt.value}"
           matrix = FXMatrix.new(self, 3, :opts => MATRIX_BY_COLUMNS|LAYOUT_FILL_X|LAYOUT_FILL_Y)
 
           FXLabel.new(matrix, "PKCS12 File:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
-          @client_cert_txt = FXTextField.new(matrix,  25,
-        :target => @client_cert_dt, :selector => FXDataTarget::ID_VALUE,
-        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT)
+          @client_cert_txt = FXTextField.new(matrix, 25,
+                                             :target => @client_cert_dt, :selector => FXDataTarget::ID_VALUE,
+                                             :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT)
 
-          FXButton.new(matrix, "Select").connect(SEL_COMMAND){ select_cert_file }
+          FXButton.new(matrix, "Select").connect(SEL_COMMAND) { select_cert_file }
 
           FXLabel.new(matrix, "Password:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
           @password_txt = FXTextField.new(matrix, 25,
-        :target => @password_dt, :selector => FXDataTarget::ID_VALUE,
-        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT|TEXTFIELD_PASSWD)
+                                          :target => @password_dt, :selector => FXDataTarget::ID_VALUE,
+                                          :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT|TEXTFIELD_PASSWD)
 
-          FXButton.new(matrix, "", :opts=>FRAME_NONE).disable
+          FXButton.new(matrix, "", :opts => FRAME_NONE).disable
 
           FXLabel.new(matrix, "Retype:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
           @retype_txt = FXTextField.new(matrix, 25,
-        :target => @retype_dt, :selector => FXDataTarget::ID_VALUE,
-        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT|TEXTFIELD_PASSWD)
+                                        :target => @retype_dt, :selector => FXDataTarget::ID_VALUE,
+                                        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT|TEXTFIELD_PASSWD)
 
-          FXButton.new(matrix, "", :opts=>FRAME_NONE).disable
+          FXButton.new(matrix, "", :opts => FRAME_NONE).disable
 
         end
 
@@ -246,7 +271,7 @@ puts "* open certfile: #{@client_cert_dt.value}"
 
       def savePasswords?()
         return false
-      #@save_pws_cbt.checked?
+        #@save_pws_cbt.checked?
       end
 
       include Responder
@@ -257,15 +282,12 @@ puts "* open certfile: #{@client_cert_dt.value}"
         FXMAPFUNC(SEL_COMMAND, ID_ACCEPT, :onAccept)
 
         @password_policy = {
-          :save_passwords => false
+            :save_passwords => false
         }
 
         @cert_path = nil
         @client_certificates = {}
 
-        current_certs = Watobo.project.getClientCertificates
-        @client_certificates = current_certs unless current_certs.nil?
-
         @password_policy.update prefs[:password_policy] if prefs.has_key? :password_policy
 
         @site_dt = FXDataTarget.new('')
@@ -279,8 +301,8 @@ puts "* open certfile: #{@client_cert_dt.value}"
 
         @scope_only_cb.connect(SEL_COMMAND) { updateSitesCombo() }
 
-        @sites_combo = FXComboBox.new(frame, 5,  @site_dt, FXDataTarget::ID_VALUE,
-        COMBOBOX_STATIC|FRAME_SUNKEN|FRAME_THICK|LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
+        @sites_combo = FXComboBox.new(frame, 5, @site_dt, FXDataTarget::ID_VALUE,
+                                      COMBOBOX_STATIC|FRAME_SUNKEN|FRAME_THICK|LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
 
         @sites_combo.numVisible = @sites_combo.numItems >= 20 ? 20 : @sites_combo.numItems
         @sites_combo.numColumns = 25
@@ -302,14 +324,14 @@ puts "* open certfile: #{@client_cert_dt.value}"
         @cert_settings << PKCS12Frame.new(@tabBook)
 
         buttons = FXHorizontalFrame.new(main_frame, :opts => LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|PACK_UNIFORM_WIDTH,
-        :padLeft => 40, :padRight => 40, :padTop => 20, :padBottom => 20)
+                                        :padLeft => 40, :padRight => 40, :padTop => 20, :padBottom => 20)
 
         accept = FXButton.new(buttons, "&Accept", nil, self, ID_ACCEPT,
-        FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)
+                              FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)
         accept.enable
         # Cancel
         FXButton.new(buttons, "&Cancel", nil, self, ID_CANCEL,
-        FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)
+                     FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)
       end
 
       private
@@ -318,8 +340,8 @@ puts "* open certfile: #{@client_cert_dt.value}"
         @sites_combo.clearItems
         @sites_combo.appendItem(NO_SELECTION, nil)
         @site_dt.value = NO_SELECTION
-        Watobo::Chats.sites(:in_scope => @scope_only_cb.checked? ){ |site|
-        #puts "Site: #{site}"
+        Watobo::Chats.sites(:in_scope => @scope_only_cb.checked?) { |site|
+          #puts "Site: #{site}"
           @sites_combo.appendItem(site, site)
         }
         @sites_combo.numVisible = @sites_combo.numItems >= 20 ? 20 : @sites_combo.numItems
@@ -339,40 +361,27 @@ puts "* open certfile: #{@client_cert_dt.value}"
         end
       end
 
-      def updateFields()
-        # @sites_combo.handle(self, FXSEL(SEL_UPDATE, 1), nil)
-        @client_cert_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-        @client_key_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-      end
-
       def update_fields(sender, sel, item)
         @site_dt.value = item
-        if @client_certificates.has_key? item
-          #puts "* certs found"
-          #c = @client_certificates[item]
-         # @client_cert_dt.value = c[:certificate_file]
-         # @client_key_dt.value = c[:key_file]
-         # @password_dt.value = c[:password]
-         # @retype_dt.value = c[:password]
-         # @client_cert_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-         # @client_key_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-         # @password_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-         # @retype_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-        end
+        c = Watobo::ClientCertStore.get(item)
+        return false if c.nil?
+        i = c[:type] == :pem ? 0 : 1
+        @tabBook.current = i
+        @cert_settings[i].update_fields c
+
       end
 
       def onAccept(sender, sel, event)
-
         password = nil
         if @site_dt.value.empty? or @site_dt.value == NO_SELECTION
           FXMessageBox.information(self, MBOX_OK, "No Site Selected", "You must select a site from the drop down list.")
-        return 0
+          return 0
         end
 
         index = @tabBook.current
         unless @cert_settings[index].settings_valid?
           puts "Wrong settings"
-        return 0
+          return 0
         end
 
         Watobo::ClientCertStore.set(@site_dt.value, @cert_settings[index].cert)