rwdhypernote 0.11 → 0.12

data/configuration/language.dist

@@ -1,7 +1,8 @@
-##VERSION:1.62
+##VERSION:1.69
 #language selection file
 ##NAME:$lang:0
 #$lang = "jp"
 $lang= "en"
 #$lang= "nl"
 #$lang= "es"
+#$lang= "fr"

data/configuration/rwdapplicationidentity.dist

@@ -1,3 +1,3 @@
-##VERSION:1.66
-$rwdapplicationidentity = "Rwdhypernote application"
+##VERSION:1.69
+$rwdapplicationidentity = "rwdtinker main application"
 

data/configuration/rwdtinker.dist

@@ -1,4 +1,4 @@
-##VERSION:1.66
+##VERSION:1.74
 ConfigurationDir = "configuration" # for use in program - init.rb has this value without using this constant
 CodeName = "rwdtinker"
 CodeNameFile = CodeName + ".rb"
@@ -9,11 +9,10 @@ LangDir = "lang"
   $help_topic = "general_help"
    $helptopicsarray = [ "general_help","network_help"]
   $prevouswindow ="main" 
-   $rwdcontrolports =["13713","13714","13715","13716","13717","13718"]
+   $rwdcontrolports =["13713","13714","13715","13716","13717","13718"]   # remote control code not actived 2007
  $port = 7705
 $rwdjumplink = ["helpscreen","tinkerbackwindow","returntomain","opendocuments","editconfiguration"]
 Browser_Exe = 'mozilla '
-$tinkerdocumentsarray +=["COPYING","HowTo_Tinker.txt","rwdapplications.html","RubyWebDialogs.html"]
-RwdTinkerVersion = "1.66"
-	
-   
+$tinkerdocumentsarray +=["HowTo_Tinker.txt","rwdapplications.html","RubyWebDialogs.html"]
+RwdTinkerVersion = "1.74"
+

data/configuration/{rwdhypernote.dist → rwdwhypernote-0.12.dist}

@@ -1,4 +1,4 @@
-##VERSION:0.11
+##VERSION:0.12
 ##NAME:$rwdhypernote_directory:0
 $rwdhypernote_directory = "Notes"
 ##NAME:$notesarray:0
@@ -13,5 +13,8 @@ $rwdhypernote_updatedirectory = "updates"
 $testharnessarray += ["rwdhypernote_all_tests"]
 $tinkerhelpaboutarray += ["RwdHypernote"] 
 $tinkerdocumentsarray += ["HowTo_HyperNote.txt"]
-RwdHyperNoteVersion = "0.11"
+JumpLink.update(:RwdHypernoteTXT=>"runrwdhypernotetxtwindow", :RwdHypernote=>"runrwdhypernotemain")
+$rwdjumplink +=["RwdHypernote","RwdHypernoteTXT"]
+##NAME:RwdHyperNoteVersion:0
+RwdHyperNoteVersion = "0.12"
 

data/configuration/tinkerwin2variables.dist

@@ -1,4 +1,4 @@
-##VERSION:1.66
+##VERSION:1.69
 TinkerWin2ConfigurationFileName = "tinkerwin2variables.cnf" # this file name - do not change
 ##NAME:$zipslocation:0
 $zipslocation = "zips" # location of applets to add
@@ -7,11 +7,11 @@ $zipslocation = "zips" # location of applets to add
  $xpcommand = " "  # Linux machines
 # $xpcommand =  "cmd /C "  # XP machines with cmd shell
 ##NAME:$gemdirectory_withgemfiles:0
- $gemdirectory_withgemfiles = "/usr/lib/ruby/gems/1.8/gems"
+ $gemdirectory_withgemfiles = "/var/lib/gems/1.8/gems"
 # $gemdirectory_withgemfiles = "c:\\ruby\\lib\\ruby\\gems\\1.8\\gems"  # XP machine
 ##NAME:$geminstalled_directory:0
 # $geminstalled_directory = "/ruby/lib/ruby/gems/1.8/gems" # XP machine
- $geminstalled_directory = "/usr/lib/ruby/gems/1.8/gems" # Debian Linux
+ $geminstalled_directory = "/var/lib/gems/1.8/gems" # Debian Linux
 
 RwdTinkerWin2Version = "0.8"
 

data/ev/net.rb

@@ -784,8 +784,8 @@ class HTTPServer
               end
 
               if (not remote) or (remote and (auth.nil? or auth.empty? or authenticate(auth, realm, req, resp)))
-                $stderr.puts "#{count2} #{Time.new.strftime("%Y-%m-%d %H:%M:%S")} #{ip} #{req.user} #{req.request.to_s.strip}"
-
+            #    $stderr.puts "#{count2} #{Time.new.strftime("%Y-%m-%d %H:%M:%S")} #{ip} #{req.user} #{req.request.to_s.strip}"
+             1 == 1
                 begin
                   yield(req, resp)
                 rescue Exception => e

data/ev/rwd.rb

@@ -635,7 +635,7 @@ class RWDWindow
 
   def initialize(rwd, window=nil)
     rwd	= rwd.join("\n")	if rwd.kind_of?(Array)
-
+  
     if @@windows[rwd].nil?
       @@windows[rwd]		= {}
       @@helpwindows[rwd]	= {}
@@ -666,6 +666,8 @@ class RWDWindow
 
     vars	= vars.deep_dup
 
+begin # error wrap
+
     vars.each do |key, value|
       if not key.empty?
         if value.respond_to? "to_s"
@@ -721,6 +723,12 @@ class RWDWindow
 
     html
   end
+  
+  rescue 
+  if $DEBUG
+  $stderr.puts  "error in RWDWindow - render method"
+  end
+  end
 end
 
 class RWDMessage < RWDWindow
@@ -763,8 +771,10 @@ class RWDDone < RWDWindow
 end
 
 class RWDialog
+	
   def initialize(xml)
-    @rwd_xml			= xml
+    @rwd_xml			=  $rwd_gui_tinker
+    # change from default ev - was xml
     @rwd_exitbrowser		= false
     @rwd_history		= []
     @rwd_ignore_vars		= []
@@ -818,6 +828,7 @@ class RWDialog
     help		= false
     back		= false
     tab			= ""
+    @rwd_progress_thread = nil
     @rwd_msgtype	= nil	if @rwd_progress_thread.nil?
     @rwd_download	= nil
     @rwd_download_file	= nil
@@ -833,7 +844,7 @@ class RWDialog
 		# Copy the vars from the window to vars. vars wil later on be copied to instance variables.
 
     post.sort.each do |key, value|
-      puts "Post: #{key} -> #{value.from_html.inspect}"	if $rwd_debug
+      puts  "Post: #{key} -> #{value.from_html.inspect}"	if $rwd_debug
 
       vars[key]	= value.from_html
     end
@@ -910,7 +921,7 @@ class RWDialog
 
       if (not back) or @rwd_call_after_back.include?(@rwd_action)
         unless @rwd_action =~ /^rwd_/
-          puts "Method: #{@rwd_action}(#{@rwd_args.join(", ")})"	if $rwd_debug
+          puts  "Method: #{@rwd_action}(#{@rwd_args.join(", ")})"	if $rwd_debug
           if methods.include?(@rwd_action)
             method(@rwd_action).call(*@rwd_args)
           else
@@ -948,7 +959,7 @@ class RWDialog
 		# just ignore.
 
     vars.sort.each do |key, value|
-      puts "Pre: #{key} -> #{value.inspect}"	if $rwd_debug
+      puts  "Pre: #{key} -> #{value.inspect}"	if $rwd_debug
     end
 
 
@@ -971,11 +982,20 @@ class RWDialog
             res << RWDError.new(@rwd_msg).render(pda)	if @rwd_msgtype == "error"
             res << @rwd_msg				if @rwd_msgtype == "text"
           else
-            puts "Window: #{@rwd_window}"		if $rwd_debug
-            puts "Tab: #{@rwd_tab}"		if $rwd_debug
-
-            res << RWDWindow.new(@rwd_xml, @rwd_window).render(pda, @rwd_refresh_action, vars, @rwd_switches, help, @rwd_tab)
-          end
+           puts   "Window: #{@rwd_window}"		if $rwd_debug
+            puts  "Tab: #{@rwd_tab}"		if $rwd_debug
+
+begin # error block
+      if @rwd_window.empty? 
+	      @rwd_window = "main"
+	      end
+            res << RWDWindow.new($rwd_gui_tinker, @rwd_window).render(pda, @rwd_refresh_action, vars, @rwd_switches, help, @rwd_tab)
+rescue
+ if $DEBUG
+ $stderr.puts  "error in render"
+ end
+ end
+end
         end
       end
     end

data/extras/zip/zip.rb

@@ -1047,8 +1047,9 @@ module Zip
 
     def write_file(entry, destPath, continueOnExistsProc = proc { false })
       if File.exists?(destPath) && ! yield(entry, destPath)
-	raise ZipDestinationFileExistsError,
-	  "Destination '#{destPath}' already exists"
+
+#	raise ZipDestinationFileExistsError,
+	$stderr.puts  "Destination '#{destPath}' already exists"
       end
       File.open(destPath, "wb") { 
 	  |os|

data/gui/00coreguibegin/applicationguitop.rwd

@@ -1,4 +1,4 @@
 $rwdguivar=
 "<application>
-  <window name=\"main\" title=\"RwdHyperNote - RubyWebDialogs\">
+  <window name=\"main\" title=\"RwdHyperNote - RwdTinker\">
 <tabs>"

data/gui/frontwindow0/viewlogo/cc0openphoto.rwd

@@ -0,0 +1,22 @@
+$rwdguivar=  
+	
+"	
+	<tab name=\"viewtinkerlogo\" caption=\"Tinker\">
+
+    <table>
+      <row> <p align=\"right\">#{Message[:tinker_logo]}</row>
+
+    </table>
+    <image src=\"tinker.png\"> </image>
+    <table>
+      <row> <p></row>
+
+    </table>
+      <horizontal>
+      
+      <button caption=#{Message[:help]} action=\"runhelpwindow\"/>
+      
+      
+     </horizontal>
+
+	</tab>"

data/gui/frontwindowselectionbegin/selectiontabbegin/00selectiontabbegin.rwd

@@ -1,6 +1,6 @@
 $rwdguivar=
 "	
-      <tab name=\"selectiontab\" caption=\"Menu Panel\">
+      <tab name=\"selectiontab\" caption=#{Message[:menu_panel]}>
 
       <table>
       <row> <p align=\"right\">Open a new location </row>

data/gui/frontwindowselections/superant.com.rwdtinkerwin2selectiontab/jumplinkcommands.rwd

@@ -1,7 +1,7 @@
 $rwdguivar=
 "
 <horizontal>
-<button caption=\"Show Jump Links\" action=\"showjumplinkoptions\"/>
+<button caption=#{Message[:showjump_links]} action=\"showjumplinkoptions\"/>
 
 </horizontal>
  <table>
@@ -10,6 +10,6 @@ $rwdguivar=
    </table>
 
       <horizontal>
-      <button caption=\"Jump to Application Location\" action=\"runjumplinkcommand\"/>
+      <button caption=#{Message[:jumptoapplication_location]} action=\"runjumplinkcommand\"/>
     </horizontal>
 "

data/gui/frontwindowtdocuments/superant.com.documents/tinkerdocuments.rwd

@@ -1,7 +1,7 @@
 $rwdguivar=
 "
 <horizontal>
-<button caption=\"Show Documents List\" action=\"setuptinkerdocuments\"/>
+<button caption=#{Message[:showdocument_list]} action=\"setuptinkerdocuments\"/>
 
 </horizontal>
  <table>
@@ -9,6 +9,6 @@ $rwdguivar=
 
    </table>
 <horizontal>
-      <button caption=\"Open Document\" action=\"runopentinkerdocument\"/>
+      <button caption=#{Message[:open_document]} action=\"runopentinkerdocument\"/>
   </horizontal>
 "

data/gui/helpaboutbegin/superant.com.helpaboutbegin/zzdocumentend.rwd

@@ -1,7 +1,7 @@
 $rwdguivar=
 "     
 <horizontal>       
-      <button caption=\"Help\" action=\"runhelpwindow\"/>
+      <button caption=#{Message[:help]} action=\"runhelpwindow\"/>
       
     </horizontal>
 	</tab>"

data/gui/helpaboutbegin/superant.com.helpaboutbegin/zzzzhelpscreenstart.rwd

@@ -1,3 +1,3 @@
 $rwdguivar=
 "
-<helpwindow name=\"main\" title=\"Help About\">"
+<helpwindow name=\"main\" title=#{Message[:help_about]}>"

data/gui/helpaboutinstalled/superant.com.tinkerhelpabout/helpabouttab.rwd

@@ -1,7 +1,7 @@
 $rwdguivar=
 "
 <horizontal>
-<button caption=\"Show Help About Links\" action=\"setuphelpaboutoptions\"/>
+<button caption=#{Message[:showhelpabout_links]} action=\"setuphelpaboutoptions\"/>
 
 </horizontal>
  <table>
@@ -10,6 +10,6 @@ $rwdguivar=
    </table>
 
       <horizontal>
-      <button caption=\"Open Selected Help About\" action=\"runrwdtinkerversion\"/>
+      <button caption=#{Message[:openselectedhelp_about]} action=\"runrwdtinkerversion\"/>
     </horizontal>
 "

data/gui/helpaboutzend/superant.com.helpaboutend/zhelpscreenstart2.rwd

@@ -1,3 +1,3 @@
 $rwdguivar=
 "
-<helpwindow name=\"tinkerbackwindow\" title=\"Help About\">"
+<helpwindow name=\"tinkerbackwindow\" title=#{Message[:help_about]}>"

data/gui/helpaboutzend/superant.com.helpaboutend/zzzzhelpabout2.rwd

@@ -1,7 +1,7 @@
 $rwdguivar=
 "
 <horizontal>
-<button caption=\"Show Help About Links\" action=\"setuphelpaboutoptions\"/>
+<button caption=#{Message[:showhelpabout_links]} action=\"setuphelpaboutoptions\"/>
 
 </horizontal>
  <table>
@@ -10,6 +10,6 @@ $rwdguivar=
    </table>
 
       <horizontal>
-      <button caption=\"Open Selected Help About\" action=\"runrwdtinkerversion\"/>
+      <button caption=#{Message[:openselectedhelp_about]} action=\"runrwdtinkerversion\"/>
     </horizontal>
 "

data/gui/tinkerbackwindows/superant.com.hypernote/10appletbegin.rwd

@@ -0,0 +1,4 @@
+$rwdguivar=
+"<application>
+  <window name=\"rwdhypernotewindow\" title=\"RwdHypernote RwdTinker\">
+<tabs>"

data/gui/tinkerbackwindows/superant.com.hypernote/81jumplinkcommands.rwd

@@ -0,0 +1,17 @@
+$rwdguivar=
+"
+<tab name=selectiontab caption=#{Message[:selection_tab]}>
+<horizontal>
+<button caption=#{Message[:showjump_links]} action=\"showjumplinkoptions\"/>
+
+</horizontal>
+ <table>
+      <select name=\"a_jumplinkinput\">  %%jumplinkoptions%% </select>
+
+   </table>
+
+      <horizontal>
+      <button caption=#{Message[:jumptoapplication_location]} action=\"runjumplinkcommand\"/>
+    </horizontal>
+    </tab>
+"

data/gui/tinkerbackwindows/superant.com.hypernote/9end.rwd

@@ -0,0 +1,6 @@
+$rwdguivar=
+"
+</tabs>
+</window>"
+
+

data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/1appname.rwd

@@ -1,5 +1,5 @@
 $rwdguivar=
 "
-<window name = \"tinkerbackwindow\" title=\"Tinker Back Window\">
+<window name = \"tinkerbackwindow\" title=#{Message[:tinkerback_window]}>
 
 <tabs>"

data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/40rwdlistzips.rwd

@@ -1,9 +1,9 @@
 $rwdguivar=
 "
-	<tab name=\"rwdzipslister\" caption=\"List Zips\">
+	<tab name=\"rwdzipslister\" caption=#{Message[:list_zips]}>
 
     <table>
-      <row> <p align=\"right\">File Name:</p>  <text size=70 name=\"a_installapplet\"/> </row>
+      <row> <p align=\"right\">#{Message[:file_name]}</p>  <text size=70 name=\"a_installapplet\"/> </row>
 
     </table>
      
@@ -11,26 +11,25 @@ $rwdguivar=
       <horizontal>
 
 
-<button caption=\"install (rwdtinker) applet\" action=\"installgemapplet\"/>
-      <button caption=\"Help\" action=\"runhelpwindowtinkerwin2\"/>
-      
-    </horizontal>
+<button caption=#{Message[:install_applet]} action=\"installgemapplet\"/>
+      <button caption=#{Message[:help]} action=\"runhelpwindowtinkerwin2\"/>
+          </horizontal>
     <p>%installapplettext%</p>
 
  <horizontal>
       
-       <button caption=\"view (rwdtinker) applet contents\" action=\"viewgemappletcontents\"/>
+       <button caption=#{Message[:viewapplet_contents]} action=\"viewgemappletcontents\"/>
     </horizontal>
     <p>%appletcontentstext%</p>
     <table>
-      <row> <p align=\"right\">Click below to view the list of zip files </row>
+      <row> <p align=\"right\">#{Message[:clickbelowtoviewlistof_zip]} </row>
       
     </table>
 
     <horizontal>
-       <button caption=\"List (zip directory) applets available for installing\" action=\"listzipfilestoinstall\"/>
+       <button caption=#{Message[:listappletsavailablefor_installation]} action=\"listzipfilestoinstall\"/>
       
-     <button caption=\"List applets (in the GEM Directory) available for installing\" action=\"listgemzips\"/>
+     <button caption=#{Message[:listappletsinthegem_directory]} action=\"listgemzips\"/>
       
     </horizontal>
 

data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/45installremotezip.rwd

@@ -3,12 +3,12 @@ $rwdguivar=
 	<tab name=\"superantcomremotezipsinstall\" caption=\"Install Remote Applets\">
 
     <table>
-      <row> <p align=\"right\">File Name:</p>  <text size=70 name=\"superantcominstallremoteappletinput\"/> </row>
+      <row> <p align=\"right\">#{Message[:file_name]}</p>  <text size=70 name=\"superantcominstallremoteappletinput\"/> </row>
 
     </table>
       <horizontal>
       <button caption=\"install remote Gem applet package\" action=\"superantcominstallremotegemapplet\"/>
-      <button caption=\"Help\" action=\"runhelpwindowtinkerwin2\"/>
+      <button caption=#{Message[:help]} action=\"runhelpwindowtinkerwin2\"/>
       
     </horizontal>
     <p>%superantcominstallremotegemappletresult%</p>
@@ -17,7 +17,7 @@ $rwdguivar=
 
 
 
-       <button caption=\"view already installed GEM applets\" action=\"superantcomshowgemfiledirs\"/>
+       <button caption=#{Message[:viewalreadyinstalled_applications]} action=\"superantcomshowgemfiledirs\"/>
     </horizontal>
     <p>%%superantcomshowgemappletdirsresult%%</p>
 
@@ -26,13 +26,13 @@ $rwdguivar=
 
 
     <table>
-      <row> <p align=\"right\">Click below to view the list of zip files </row>
+      <row> <p align=\"right\">#{Message[:clickbelowtoviewlistof_zip]} </row>
       
     </table>
 
     <horizontal>
        
-     <button caption=\"List applets in the Remote GEM Repository available for downloading\" action=\"superantcomremotegemlist\"/>
+     <button caption=#{Message[:listappletsinthegem_directory]} action=\"superantcomremotegemlist\"/>
       
     </horizontal>
  <p>%superantcomremotegemappletsfullresult%</p>

data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/50rwdlistapplets.rwd

@@ -1,38 +1,38 @@
 $rwdguivar=
 "
-	<tab name=\"filelister\" caption=\"List Applets\">
+	<tab name=\"filelister\" caption=#{Message[:list_applets]}>
 
 
     <table>
-      <row> <p align=\"right\">File Name:</p>  <text name=\"a_installlist\"/> </row>
+      <row> <p align=\"right\">#{Message[:file_name]}</p>  <text name=\"a_installlist\"/> </row>
 
     </table>
 
       <horizontal>
-       <button caption=\"View Install Text\" action=\"openappletname\"/>
-        <button caption=\"Help\" action=\"runhelpwindowtinkerwin2\"/>
+       <button caption=#{Message[:viewinstalled_text]} action=\"openappletname\"/>
+        <button caption=#{Message[:help]} action=\"runhelpwindowtinkerwin2\"/>
     </horizontal>
           <p>%displaytext%</p>
 
     <table>
-      <row> <p align=\"right\">File Name:</p>  <text name=\"a_removeapplet\"/> </row>
+      <row> <p align=\"right\">#{Message[:file_name]}</p>  <text name=\"a_removeapplet\"/> </row>
 
     </table>
 
     <p>%removeapplettext%</p>
       <horizontal>
-       <button caption=\"remove applet\" action=\"removeapplet\"/>
-      <button caption=\"Cancel\" action=\"main\"/>
+       <button caption=#{Message[:remove_applet]} action=\"removeapplet\"/>
+      <button caption=#{Message[:cancel]} action=\"main\"/>
       
     </horizontal>
     <table>
       <row> <p> </row>
-      <row> <p align=\"right\">View the list of installation files </row>
+      <row> <p align=\"right\">#{Message[:viewlistinstall_files]} </row>
       
     </table>
     <horizontal>
       
-      <button caption=\"List Files\" action=\"listinstalledfiles\"/>
+      <button caption=#{Message[:list_files]} action=\"listinstalledfiles\"/>
       
     </horizontal>
 

data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/60editconfiguration.rwd

@@ -7,9 +7,9 @@ $rwdguivar=
  <row> <p> </row>
  <horizontal>
       <button caption=\"Load Record\" action=\"loadconfigurationrecord\"/>
-      <button caption=\"Save Changes\" action=\"saveconfigurationrecord\"/>
+      <button caption=#{Message[:save_changes]} action=\"saveconfigurationrecord\"/>
       <button caption=\"Reload Variables\" action=\"loadconfigurationvariables\"/>
-       <button caption=\"Help\" action=\"runhelpwindowtinkerwin2\"/>
+       <button caption=#{Message[:help]} action=\"runhelpwindowtinkerwin2\"/>
       
 
 

data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/70rwddiagnostics.rwd

@@ -2,7 +2,7 @@ $rwdguivar=
 "
 	<tab name=\"diagnostictab\" caption=\"Diagnostic Tab\">
       <horizontal>
-       <button caption=\"View Platform Information\" action=\"runviewplatform\"/>
+       <button caption=#{Message[:viewplatform_information]} action=\"runviewplatform\"/>
     
       
     </horizontal>

data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/81jumplinkcommands.rwd

@@ -1,8 +1,8 @@
 $rwdguivar=
 "
-<tab name=selectiontab caption=\"Selection Tab\">
+<tab name=selectiontab caption=#{Message[:selection_tab]}>
 <horizontal>
-<button caption=\"Show Jump Links\" action=\"showjumplinkoptions\"/>
+<button caption=#{Message[:showjump_links]} action=\"showjumplinkoptions\"/>
 
 </horizontal>
  <table>
@@ -11,7 +11,7 @@ $rwdguivar=
    </table>
 
       <horizontal>
-      <button caption=\"Jump to Application Location\" action=\"runjumplinkcommand\"/>
+      <button caption=#{Message[:jumptoapplication_location]} action=\"runjumplinkcommand\"/>
     </horizontal>
     </tab>
 "