watobo 0.9.21 → 0.9.23

data/lib/watobo/gui/utils/load_icons.rb

@@ -1,44 +1,35 @@
-#.
-# load_icons.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
-    
-    def self.load_gui_icon(name)
-      return nil if @icon_path.nil?
-      icon = load_icon(File.join(@icon_path, name)) 
-    end
-    
-    def self.load_icon(filename)
-      begin
-        icon = nil
-        return icon if @application.nil?
-        #filename = 
-        File.open(filename, "rb") do |f| 
-          if filename.strip =~ /\.ico$/ then
-            icon = FXICOIcon.new(@application, f.read)
-            #icon = FXICOIcon.new(getApp(), f.read)
-          elsif filename.strip =~ /\.png$/ then
-            icon = FXPNGIcon.new(@application, f.read)
-          elsif filename.strip =~ /\.gif$/ then
-            icon = FXGIFIcon.new(@application, f.read)
-          end
-          icon.create
-        end
-        
-        icon
-      rescue => bang
-        puts "Couldn't load icon: #{filename}"
-        puts bang
-      end
-      
-    end
-  end
+module Watobo#:nodoc: all
+  module Gui
+    
+    def self.load_gui_icon(name)
+      return nil if @icon_path.nil?
+      icon = load_icon(File.join(@icon_path, name)) 
+    end
+    
+    def self.load_icon(filename)
+      begin
+        icon = nil
+        return icon if @application.nil?
+        #filename = 
+        File.open(filename, "rb") do |f| 
+          if filename.strip =~ /\.ico$/ then
+            icon = FXICOIcon.new(@application, f.read)
+            #icon = FXICOIcon.new(getApp(), f.read)
+          elsif filename.strip =~ /\.png$/ then
+            icon = FXPNGIcon.new(@application, f.read)
+          elsif filename.strip =~ /\.gif$/ then
+            icon = FXGIFIcon.new(@application, f.read)
+          end
+          icon.create
+        end
+        
+        icon
+      rescue => bang
+        puts "Couldn't load icon: #{filename}"
+        puts bang
+      end
+      
+    end
+  end
 end

data/lib/watobo/gui/utils/load_plugins.rb

@@ -1,121 +1,118 @@
-#.
-# load_plugins.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
-    @plugin_list = []
-    def self.add_plugin(p)
-      @plugin_list << p
-    end
-
-    def self.plugins
-      @plugin_list
-    end
-
-    def self.clear_plugins
-      @plugin_list = []
-    end
-
-    module Utils
-      def self.load_plugins(project=nil)
-        raise ArgumentError, "Need a project" unless project
-        # this is the old plugin style
-        Dir["#{Watobo.plugin_path}/*"].each do |sub|
-          if File.ftype(sub) == "directory"
-            pgf = File.join(sub, "gui.rb")
-            if File.exist? pgf
-              puts "Loading Plugin GUI #{pgf} ..."
-
-              group = File.basename(sub)
-              plugin = File.basename(pgf).sub(/\.rb/,'')
-              # load "#{@settings[:module_path]}/#{modules}/#{check}"
-              group_class = group.slice(0..0).upcase + group.slice(1..-1).downcase
-              #
-              plugin_class = plugin.slice(0..0).upcase + plugin.slice(1..-1).downcase
-              class_name = "Watobo::Plugin::#{group_class}::#{plugin_class}"
-              puts
-              puts ">> ClassName: #{class_name}"
-              puts
-              load pgf
-              class_constant = Watobo.class_eval(class_name)
-
-              Watobo::Gui.add_plugin class_constant.new(Watobo::Gui.application, project)
-            else
-
-              Dir["#{sub}/#{File.basename(sub)}.rb"].each do |plugin_file|
-                begin
-                  puts "* processing plugin file #{plugin_file}" if $DEBUG
-                  load plugin_file
-                  group = File.basename(sub)
-                  plugin = File.basename(plugin_file).sub(/\.rb/,'')
-                  # load "#{@settings[:module_path]}/#{modules}/#{check}"
-                  group_class = group.slice(0..0).upcase + group.slice(1..-1).downcase
-                  #
-                  plugin_class = plugin.slice(0..0).upcase + plugin.slice(1..-1).downcase
-                  class_constant = Watobo.class_eval("Watobo::Plugin::#{group_class}::#{plugin_class}")
-
-                  Watobo::Gui.add_plugin class_constant.new(Watobo::Gui.application, project)
-                rescue => bang
-                  puts bang if $DEBUG
-                  puts bang.backtrace if $DEBUG
-                #   notify(:logger, LOG_INFO, "problems loading plugin: #{plugin_file}")
-                end
-              end
-
-              # this the way loading new plugins
-
-              Dir["#{sub}/gui/#{File.basename(sub)}.rb"].each do |plugin_file|
-                begin
-                  puts "* processing plugin file #{plugin_file}" if $DEBUG
-                  load plugin_file
-                  group = File.basename(sub)
-                  plugin = File.basename(plugin_file).sub(/\.rb/,'')
-                  # load "#{@settings[:module_path]}/#{modules}/#{check}"
-                  group_class = group.slice(0..0).upcase + group.slice(1..-1).downcase
-                  #
-                  plugin_class = plugin.slice(0..0).upcase + plugin.slice(1..-1).downcase
-                  class_name = "Watobo::Plugin::#{group_class}::Gui::Main"
-                  #puts class_name
-                  class_constant = Watobo.class_eval(class_name)
-
-                  Watobo::Gui.add_plugin class_constant.new(Watobo::Gui.application, project)
-                  
-                rescue => bang
-                  puts bang
-                  puts bang.backtrace if $DEBUG
-                #   notify(:logger, LOG_INFO, "problems loading plugin: #{plugin_file}")
-                end
-              end
-              #
-
-              Watobo::Plugin.constants.each do |pc|
-                puts ">> PLUGIN >> #{pc.to_s}"
-                
-                pclass = Watobo::Plugin.class_eval(pc.to_s)
-                
-                if pclass.respond_to? :create_gui
-                  puts "ADD NEW PLUGIN #{pc.upcase}"
-                  # TODO: In later versions - if all plugins are switched to the new style - this will not be necessary here
-                  gui = pclass.create_gui()
-                  # puts gui.class
-                  Watobo::Gui.add_plugin pclass
-
-                # exit
-                end
-              end
-            end
-          end
-        end
-
-      end
-    #-------------
-    end
-  end
+module Watobo#:nodoc: all
+  module Gui
+    @plugin_list = []
+    def self.add_plugin(p)
+      @plugin_list << p
+    end
+
+    def self.plugins
+      @plugin_list
+    end
+
+    def self.clear_plugins
+      @plugin_list = []
+    end
+
+    module Utils
+      def self.load_plugins(project=nil)
+        raise ArgumentError, "Need a project" unless project
+        # this is the old plugin style
+        Dir["#{Watobo.plugin_path}/*"].each do |sub|
+          if File.ftype(sub) == "directory"
+            pgf = File.join(sub, "gui.rb")
+            if File.exist? pgf
+              puts "Loading Plugin GUI #{pgf} ..."
+
+              group = File.basename(sub)
+              plugin = File.basename(pgf).sub(/\.rb/,'')
+              # load "#{@settings[:module_path]}/#{modules}/#{check}"
+              group_class = group.slice(0..0).upcase + group.slice(1..-1).downcase
+              #
+              plugin_class = plugin.slice(0..0).upcase + plugin.slice(1..-1).downcase
+              class_name = "Watobo::Plugin::#{group_class}::#{plugin_class}"
+              puts
+              puts ">> ClassName: #{class_name}"
+              puts
+              load pgf
+              class_constant = Watobo.class_eval(class_name)
+
+
+                Watobo::Gui.add_plugin class_constant.new(Watobo::Gui.application, project)
+
+            else
+
+              Dir["#{sub}/#{File.basename(sub)}.rb"].each do |plugin_file|
+                begin
+                  puts "* processing plugin file #{plugin_file}" if $DEBUG
+                  load plugin_file
+                  group = File.basename(sub)
+                  plugin = File.basename(plugin_file).sub(/\.rb/,'')
+                  # load "#{@settings[:module_path]}/#{modules}/#{check}"
+                  group_class = group.slice(0..0).upcase + group.slice(1..-1).downcase
+                  #
+                  plugin_class = plugin.slice(0..0).upcase + plugin.slice(1..-1).downcase
+                  class_constant = Watobo.class_eval("Watobo::Plugin::#{group_class}::#{plugin_class}")
+
+                     Watobo::Gui.add_plugin class_constant.new(Watobo::Gui.application, project)
+
+                rescue => bang
+                  puts bang if $DEBUG
+                  puts bang.backtrace if $DEBUG
+                #   notify(:logger, LOG_INFO, "problems loading plugin: #{plugin_file}")
+                end
+              end
+
+              # this the way loading new plugins
+
+              Dir["#{sub}/gui/#{File.basename(sub)}.rb"].each do |plugin_file|
+                begin
+                  puts "* processing plugin file #{plugin_file}" if $DEBUG
+                  load plugin_file
+                  group = File.basename(sub)
+                  plugin = File.basename(plugin_file).sub(/\.rb/,'')
+                  # load "#{@settings[:module_path]}/#{modules}/#{check}"
+                  group_class = group.slice(0..0).upcase + group.slice(1..-1).downcase
+                  #
+                  plugin_class = plugin.slice(0..0).upcase + plugin.slice(1..-1).downcase
+                  class_name = "Watobo::Plugin::#{group_class}::Gui::Main"
+                  #puts class_name
+                  class_constant = Watobo.class_eval(class_name)
+
+
+                    Watobo::Gui.add_plugin class_constant.new(Watobo::Gui.application, project)
+
+                rescue => bang
+                  puts bang
+                  puts bang.backtrace if $DEBUG
+                #   notify(:logger, LOG_INFO, "problems loading plugin: #{plugin_file}")
+                end
+              end
+              #
+
+              Watobo::Plugin.constants.each do |pc|
+                puts ">> PLUGIN >> #{pc.to_s}"
+
+                pclass = Watobo::Plugin.class_eval(pc.to_s)
+
+                if pclass.respond_to? :create_gui
+                  puts "ADD NEW PLUGIN #{pc.upcase}"
+                  # TODO: In later versions - if all plugins are switched to the new style - this will not be necessary here
+
+                    gui = pclass.create_gui()
+                    # puts gui.class
+                    Watobo::Gui.add_plugin pclass
+
+
+                # exit
+                end
+              end
+            end
+          end
+        end
+
+      end
+    #-------------
+    end
+  end
 end

data/lib/watobo/gui/utils/master_password.rb

@@ -1,79 +1,70 @@
-#.
-# master_password.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
-    module MasterPW
-      @master_password = ''
-      @save_without_master = false
-      @save_passwords = false
-      # set the master password
-      def self.set=(pw)
-        @master_password = ''
-        return false unless pw.is_a? String
-        @master_password = pw
-        true
-      end
-
-      def self.set?
-        return false unless @master_password.is_a? String
-        @master_password.empty?
-      end
-
-      def self.disable
-        @save_without_master = false
-        @master_password = ''
-      end
-
-      def self.enable
-        @save_without_master = true
-      end
-
-      def self.save_passwords?
-        @save_passwords
-      end
-
-      def self.save_passwords=(state)
-        @save_passwords = state
-      end
-
-      def self.save_without_master=(state)
-        @save_without_master = state
-      end
-
-      def self.save_without_master?
-        @save_without_master
-      end
-
-      # retrieve the master password
-      def self.get
-        @master_password
-      end
-
-      # check if master password is set
-      def self.enabled?
-        return @master_password.empty?
-      end
-
-      def self.settings
-        s = { :save_passwords => @save_passwords, :save_without_master => @save_without_master }
-      end
-
-      def self.settings=(s)
-        return false unless s.is_a? Hash
-        @save_passwords = s[:save_passwords] if s.has_key? :save_passwords
-        @save_without_master = s[:save_without_master] if s.has_key? :save_without_master
-        true
-      end
-
-    end
-
-  end
+module Watobo#:nodoc: all
+  module Gui
+    module MasterPW
+      @master_password = ''
+      @save_without_master = false
+      @save_passwords = false
+      # set the master password
+      def self.set=(pw)
+        @master_password = ''
+        return false unless pw.is_a? String
+        @master_password = pw
+        true
+      end
+
+      def self.set?
+        return false unless @master_password.is_a? String
+        @master_password.empty?
+      end
+
+      def self.disable
+        @save_without_master = false
+        @master_password = ''
+      end
+
+      def self.enable
+        @save_without_master = true
+      end
+
+      def self.save_passwords?
+        @save_passwords
+      end
+
+      def self.save_passwords=(state)
+        @save_passwords = state
+      end
+
+      def self.save_without_master=(state)
+        @save_without_master = state
+      end
+
+      def self.save_without_master?
+        @save_without_master
+      end
+
+      # retrieve the master password
+      def self.get
+        @master_password
+      end
+
+      # check if master password is set
+      def self.enabled?
+        return @master_password.empty?
+      end
+
+      def self.settings
+        s = { :save_passwords => @save_passwords, :save_without_master => @save_without_master }
+      end
+
+      def self.settings=(s)
+        return false unless s.is_a? Hash
+        @save_passwords = s[:save_passwords] if s.has_key? :save_passwords
+        @save_without_master = s[:save_without_master] if s.has_key? :save_without_master
+        true
+      end
+
+    end
+
+  end
 end