rwdtinker 1.80 → 1.81

data/code/01rwdcore/02helptexthashbegin.rb

@@ -2,3 +2,13 @@
 
  Helptext = Hash.new { |hh, kk| hh[kk] = "ERROR: Identificador de mensaje desconocido: #{kk.inspect}."; hh[kk] }
     helpmessage = {
+    :general_help          => "You can work with Applets:  go to 'Selection tab', <br>
+                                  On that back screen you will find:<br>
+                                  List Applets:  you can see and delete installed applets<br>
+                                  List Zips: you can see lists of applets that you can install<br>
+                                  Edit Configuration: You can view the rwdtinker configuration and change it<br>
+                                  Diagnostic Tab: You can view the environments variables that rwdtinker is running with<br>
+      "
+
+    }
+    helpmessage.each { |kk, vv| Helptext[kk] = vv }

data/code/01rwdcore/03helptexthash.rb

@@ -1,23 +1,21 @@
- # Help files for RwdTinker core
+ # this code loads the help text
 
-   
-      :general_help          => "You can work with Applets:  go to 'Selection tab', <br>
-                                  On that back screen you will find:<br>
-                                  List Applets:  you can see and delete installed applets<br>
-                                  List Zips: you can see lists of applets that you can install<br>
-                                  Edit Configuration: You can view the rwdtinker configuration and change it<br>
-                                  Diagnostic Tab: You can view the environments variables that rwdtinker is running with<br>
-      ",
-      :network_help  => "Using over a Network: To serve the application over your local LAN,change the last line in the<br>
-init.rb file to something like:\n<br>
-RwdTinker.file(RWDFile).serve(8080, '-r' ? '.rwduids' : nil)\n<br>
-Then you should be able to login at: http://yourhostname:8080",
+                  
+               tmphelpfilename = "Tinkerhelptexthash.txt" 
+               tmphelpdir = "rwd_files"
+	      
+        begin # exception trapped block
+       
+       
+	      fileName = File.join(tmphelpdir ,tmphelpfilename )
+        
+        
+	      fd = File.open(fileName,"r")
+	      tmphelptext =        fd.read
+             fd.close
+	     eval  tmphelptext
+        rescue SystemCallError, StandardError
+	    $rwdtinkerlog.error  "Tinkerbell help file load: system call error: "
+        end # exception rescue
 
-          
-  :documents_rwdtinker => "<b>Documents:
-  <p>
   
-  when you click on a document name, the document should pop up in a <br>
-  browser window, or in another browser tab.</b>
-  "
-      

data/code/01rwdcore/runopentinkerdocument.rb

@@ -1,7 +1,7 @@
 # open document for rwdtinker application
 def runopentinkerdocument
 
-tinkerdocumenturl = "http://localhost:7705/" + @a_tinkerdocumentinput
+tinkerdocumenturl = "http://localhost:#{$port}/" + @a_tinkerdocumentinput
     Thread.new( tinkerdocumenturl){ |t|  `#{Browser_Exe} #{tinkerdocumenturl}`  }
  end
    

data/configuration/rwdtinker.dist

@@ -1,4 +1,4 @@
-##VERSION: (1.80)
+##VERSION: (1.81)
 ConfigurationDir = "configuration" # for use in program - init.rb has this value without using this constant
 CodeName = "rwdtinker"
 CodeNameFile = CodeName + ".rb"
@@ -10,6 +10,5 @@ LangDir = "lang"
     $prevouswindow ="main" 
    $rwdcontrolports =["13713","13714","13715","13716"]   # remote control code not actived 2007
  $port = 7705
-Browser_Exe = 'mozilla '
-RwdTinkerVersion = "1.80"
+RwdTinkerVersion = "1.81"
 

data/configuration/tinkerwin2variables.dist

@@ -1,4 +1,4 @@
-##VERSION: (1.80)
+##VERSION: (1.81)
 TinkerWin2ConfigurationFileName = "tinkerwin2variables.cnf" # this file name - do not change
 ##NAME: ($zipslocation):(1.78)
 $zipslocation = "zips" # location of applets to add
@@ -14,5 +14,14 @@ $zipslocation = "zips" # location of applets to add
 # $geminstalled_directory = "/ruby/lib/ruby/gems/1.8/gems" # XP machine
  $geminstalled_directory = "/var/lib/gems/1.8/gems" # Debian Linux
 
-RwdTinkerWin2Version = "1.80"
+$rwdapplicationidentity = "rwdtinker main application"
 
+RwdTinkerWin2Version = "1.81"
+Browser_Exe = 'mozilla '
+#language selection file
+##NAME: ($lang):(1.78)
+#$lang = "jp"
+$lang= "en"
+#$lang= "nl"
+#$lang= "es"
+#$lang= "fr"

data/init.rb

@@ -255,24 +255,24 @@ Rconftool::install(configdist,confignew)     #integrates new file with old
 		  $port = port
 		  # Rescue the "Address in use" error
 	  rescue Errno::EADDRINUSE
-		  puts "RWD Startup: Port #{port} on host #{host} is already in use."
+		  $rwdtinkerlog.warn "RWD Startup: Port #{port} on host #{host} is already in use."
 		  port=port +1
-		  puts "trying port: #{port}"
+		  $rwdtinkerlog.warn "trying port: #{port}"
 		  # Rescue the "Address not available' error
 	  rescue Errno::EADDRNOTAVAIL
-		  puts "RWD Startup: Address #{host} is not available to bind."
+		  $rwdtinkerlog.warn "RWD Startup: Address #{host} is not available to bind."
 		  port =port + 1
-		  puts "trying port: #{port}"
+		  $rwdtinkerlog.warn "trying port: #{port}"
 		  # Rescue "permission denied errors
 	  rescue Errno::EACCES
-		  puts "RWD Startup: Access denied when binding interface addresses. ?"
+		  $rwdtinkerlog.warn "RWD Startup: Access denied when binding interface addresses. ?"
 		  port =port + 1
-		  puts "trying port: #{port}"
+		  $rwdtinkerlog.warn "trying port: #{port}"
 		  # Rescue all other errors
 	  rescue
-		  puts "RWD Startup: An error occured."
+		  $rwdtinkerlog.warn "RWD Startup: An error occured."
 		  port =port + 1
-		  puts "trying port: #{port}"
+		  $rwdtinkerlog.warn "trying port: #{port}"
 		  # Rescue all other errors
 	  end
 

data/rwd_files/HowTo_Tinker.txt

@@ -226,6 +226,11 @@ http://www.erikveen.dds.nl/rubywebdialogs/index.html
 Thanks, Steven Gibson
 
 == Changelog
+version 1.81
+  condensed config files from 4 -> 2
+  fixed document launch bug 
+  add $KCODE = 'u'
+  
 version 1.80
  changed pda handling in rwd.rb
  added logging

data/rwd_files/Tinkerhelptexthash.txt

@@ -0,0 +1,81 @@
+ # Help files for RwdTinker core
+   
+  
+ Helptext.update(  :network_help  => "Using over a Network: To serve the application over your local LAN,change the last line in the<br>
+init.rb file to something like:\n<br>
+RwdTinker.file(RWDFile).serve(8080, '-r' ? '.rwduids' : nil)\n<br>
+Then you should be able to login at: http://yourhostname:8080")
+
+   
+ Helptext.update(   :documents_rwdtinker => "<b>Documents:
+  <p>
+  
+  when you click on a document name, the document should pop up in a <br>
+  browser window, or in another browser tab.</b>
+  ")
+      
+ Helptext.update( :tinkerwin2_help => "    You can view the list of applets you can install
+      by clicking on the list files button
+<br><br>
+           You can download an applet created by someone else
+           <br><br>
+      put the file in the zips directory
+      <br>
+      rwdtinker applets packaged as RubyGems can be used if you have RubyGems installed.
+      You can download rwdtinker gems at the 'Install Remote Applets' tab
+      to install applets you need the ruby zlib library installed
+      ")
+      
+       Helptext.update( 
+     :applet_viewing   =>  "You can get a list of all installed applets by clicking the 'listfiles button'<br>
+         To see the text of a install file<br>
+       Type in the name of the file you want.<br>
+      <p>
+       type it without the inf ending
+       rwdapplet-0.1<br>
+       <p>
+       Then click the 'View Installed File' button
+       <p>
+       If it finds the file it will open it. It displays the text the search box.
+<p>
+      You can uninstall applets on this screen")
+      
+     Helptext.update(   
+  :applet_installation  => " You can download an applet created by someone else<br>
+      put the file in the zips directory<br>
+      
+      click on the 'list zips' tab<br>
+      click on 'list applets available for installing<br>
+      <br>
+      chose the applet you want<br>
+      click on 'install applet'<br>
+      If all goes well the applet should be installed.<br>
+      You will need to restart rwdtinker to see the new screens<br>
+       to install applets you need the ruby zlib library installed")
+       
+ Helptext.update( 
+     :applet_tinkerbackeditconfiguration  => " You can edit the configuration
+  <p>
+  Remember to reload the configuration variables if you want your
+  changes used.")
+  
+   Helptext.update( 
+  :remotegemapplet_install  => " To download and install use the 'Install Remote Applets'
+  <br>
+  First click on 'List applets in the Remote GEM Repository available for downloading'<br>
+  then go to the very bottom to click on the applet you want<br>
+  then on the top click 'install remote Gem applet package'
+  <br>
+  This installs the package in the Gem system<br>
+  You still need to install it into rwdtinker - do that in the 'List Zips' tab<br>
+  <br>
+  For this feature to work, you need<br>
+  RubyGems installed<br>
+   Variables set correctly in the tinerwin2.cnf file<br>
+      $xpcommand,  $gemdirectory_withgemfiles and  $geminstalled_directory<br>
+    the defaults as shipped will normally be for a Debian Linux system  <br>
+   On Debian Linux, you would usually need to be running rwdtinker as root in order to install RubyGems
+   <br><br>
+   You can view the list of rwdtinker applets you have installed already by clicking 'view already installed GEM applets'
+ "
+)

data/tests/makedist.rb

@@ -15,7 +15,7 @@ require 'fileutils'
 
 DistroName = "rwdtinker"
 
-DistroVersion="1.80"
+DistroVersion="1.81"
 
 DistroTitle="#{DistroName}.dist"
 load "configuration/#{DistroTitle}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rwdtinker
 version: !ruby/object:Gem::Version 
-  version: "1.80"
+  version: "1.81"
 platform: ruby
 authors: 
 - Steven Gibson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-04 00:00:00 -07:00
+date: 2008-10-07 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -65,7 +65,6 @@ files:
 - code/superant.com.rwdtinkerbackwindow/removeappletvariables.rb
 - code/superant.com.rwdtinkerbackwindow/removeapplet.rb
 - code/superant.com.rwdtinkerbackwindow/viewgemappletcontents.rb
-- code/superant.com.rwdtinkerbackwindow/helptexthashtinkerwin2.rb
 - code/superant.com.rwdtinkerbackwindow/remotegemlist.rb
 - code/superant.com.rwdtinkerbackwindow/installgemapplet.rb
 - code/superant.com.rwdtinkerbackwindow/runremoteinstall.rb
@@ -73,7 +72,6 @@ files:
 - code/01rwdcore/setuptinkerdocuments.rb
 - code/01rwdcore/openhelpwindow.rb
 - code/01rwdcore/setuphelpaboutoptions.rb
-- code/01rwdcore/04helptextend.rb
 - code/01rwdcore/01rwdcore.rb
 - code/01rwdcore/rwdwindowreturn.rb
 - code/01rwdcore/uploadreturns.rb
@@ -92,8 +90,6 @@ files:
 - code/dd0viewphoto/dd0viewphoto.rb
 - configuration/rwdtinker.dist
 - configuration/tinkerwin2variables.dist
-- configuration/language.dist
-- configuration/rwdapplicationidentity.dist
 - lang/en/rwdcore/languagefile.rb
 - lang/es/rwdcore/languagefile-es.rb
 - lang/fr/rwdcore/languagefile.rb
@@ -138,6 +134,7 @@ files:
 - rwd_files/rdoc-style.css
 - rwd_files/Readme.txt
 - rwd_files/rwdapplications.html
+- rwd_files/Tinkerhelptexthash.txt
 - rwd_files/HowTo_TinkerWin2.txt
 - rwd_files/RubyWebDialogs.html
 - rwd_files/HowTo_Tinker.txt

data/code/01rwdcore/04helptextend.rb

@@ -1,6 +0,0 @@
-
-    }
-    helpmessage.each { |kk, vv| Helptext[kk] = vv }
-  
-
-

data/code/superant.com.rwdtinkerbackwindow/helptexthashtinkerwin2.rb

@@ -1,61 +0,0 @@
-# help text files used by context sensitive help  
-
- Helptext.update( :tinkerwin2_help => "    You can view the list of applets you can install
-      by clicking on the list files button
-
-           You can download an applet created by someone else
-           
-      put the file in the zips directory
-      
-      rwdtinker applets packaged as RubyGems can be used if you have RubyGems installed.
-      You can download rwdtinker gems at the 'Install Remote Applets' tab
-      to install applets you need the ruby zlib library installed
-      ",
-     :applet_viewing   =>  "You can get a list of all installed applets by clicking the 'listfiles button'
-         To see the text of a install file
-       Type in the name of the file you want.
-      
-       type it without the inf ending
-       rwdapplet-0.1
-       
-       Then click the 'View Installed File' button
-       
-       If it finds the file it will open it. It displays the text the search box.
-
-      You can uninstall applets on this screen",
-      
-  :applet_installation  => " You can download an applet created by someone else\n
-      put the file in the zips directory\n
-      
-      click on the 'list zips' tab\n
-      click on 'list applets available for installing'\n
-      
-      chose the applet you want\n
-      click on 'install applet'\n
-      If all goes well the applet should be installed.\n
-      You will need to restart rwdtinker to see the new screens
-       to install applets you need the ruby zlib library installed",
-
-     :applet_tinkerbackeditconfiguration  => " You can edit the configuration
-  
-  Remember to reload the configuration variables if you want your
-  changes used.",
-  :remotegemapplet_install  => " To download and install use the 'Install Remote Applets'
-  
-  First click on 'List applets in the Remote GEM Repository available for downloading'
-  then go to the very bottom to click on the applet you want
-  then on the top click 'install remote Gem applet package'
-  
-  This installs the package in the Gem system
-  You still need to install it into rwdtinker - do that in the 'List Zips' tab
-  
-  For this feature to work, you need
-  RubyGems installed
-   Variables set correctly in the tinerwin2.cnf file
-      $xpcommand,  $gemdirectory_withgemfiles and  $geminstalled_directory
-    the defaults as shipped will normally be for a Debian Linux system  
-   On Debian Linux, you would usually need to be running rwdtinker as root in order to install RubyGems
-   
-   You can view the list of rwdtinker applets you have installed already by clicking 'view already installed GEM applets'
- "
-)

data/configuration/language.dist

@@ -1,8 +0,0 @@
-##VERSION: (1.80)
-#language selection file
-##NAME: ($lang):(1.78)
-#$lang = "jp"
-$lang= "en"
-#$lang= "nl"
-#$lang= "es"
-#$lang= "fr"

data/configuration/rwdapplicationidentity.dist

@@ -1,3 +0,0 @@
-##VERSION: (1.80)
-$rwdapplicationidentity = "rwdtinker main application"
-