rwdhypernote 0.13 → 0.15

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

@@ -28,10 +28,7 @@ def initiateapplet(nametextlocal)
 	
 	debuginitiate = 0
 	
-	if $DEBUG
- $stderr.puts "starting config load with: #{nametextlocal}"
-        end
-
+	$rwdtinkerlog.info  "initiateapplet: starting config load with: #{nametextlocal}"
 
   Dir.chdir($progdir )    #changes the current working directory
 	  
@@ -45,98 +42,105 @@ begin
 	 
        eval configfileload  #load  config file
        
-     setuphelpaboutoptions # update the help about list
-       setuptinkerdocuments # update the document pull down list
-       runhelpwindow   # update the help menu
-        showjumplinkoptions # update the application link menu
-	runrwdtinkerbackwindow # back to applet window
-	
 	 rescue
-   
-           if $DEBUG
-              $stderr.puts  "error in initiateapplets - config load"
-          end
+	 
+   $rwdtinkerlog.error  "initiateapplet: error in initiateapplets - config load"
+        
         debuginitiate += 1
-  end
-  tempguistorage = $rwd_gui_tinker # if gui load fails restore old
-  begin # error trap
+end
+$tempdoc = " "
   
-	# build the actual GUI from the gui parts
+  Dir.chdir($progdir) # change back to top program directory
+
+  # build the English Language hash file from the parts
+  require 'lib/rwdtinker/rwdlangdir'
+  
+  tempdoc  = RwdtinkerTools.findlanguagefiles(LangDir,"en")
+
+  #writes the contents of doc into the  languagehashvariable 
+  
+  languagehashvariable  =  tempdoc  
+
+  # END of en Lang building
   $tempdoc = " "
-  #get a list of the files and subdirectories on the starting directory only
-  a = Array.new(Dir[GuiDir].entries.sort)
-  #loop through the list, ignore the files and add all new directories found
-  a.each do |x|
-	  #if a directory...
-	  if(test(?d,x))
-		  #use this new dir find to add to the original list of directories
-		  @@root = x + "/**"
-		  #adds the new ones to the array
-		  b = Dir[@@root].entries.sort
-		  b.each do |x|
-			  if(test(?d,x))
-				  a.push(x)  #appends to the end of the array...
-			  end
-		  end
-	  end
-  end
-  a.each do |x|
-	  #if it is a file...
-	  if(!test(?d,x)) 
-		  a.delete(x)
-
-	  else #it is a directory...
-		  loadguifile(x + "/**")
-		  
-		  
-	  end
-  end
+  Dir.chdir($progdir) # change back to top program directory
+
+  # build the local Language hash file from the parts
+  tempdoc  = RwdtinkerTools.findlanguagefiles(LangDir,$lang)
+
+   #writes the contents of doc into the variable
+
+ languagehashvariable =  languagehashvariable + tempdoc 
 
-$rwd_gui_tinker = $tempdoc
+  Dir.chdir($progdir) # change back to top program directory
+
+   temp = eval(   languagehashvariable )
 
   
+  tempguistorage = $rwd_gui_tinker # if gui load fails restore old
+  begin # error trap
+  
+	# build the actual GUI from the gui parts
+  tempdoc = " "
+  
+   require 'lib/rwdtinker/rwdguidir'
+   
+  tempdoc = RwdtinkerTools.findguifiles(GuiDir)
+  
+ $rwd_gui_tinker = tempdoc
+  
  rescue
     $rwd_gui_tinker = tempguistorage # restore old gui
-           if $DEBUG
-              $stderr.puts  "error in initiateapplets - gui building"
-          end
+    
+    $rwdtinkerlog.error  "error in initiateapplets - gui building"
 
         debuginitiate += 1
 end
 
 begin # error trap
-# now load in the code files
+            # now load in the code files
 
-$tempdoc  = ""
-tempcodeinstallline  = ""
+            $tempdoc  = ""
+              tempcodeinstallline  = ""
 
-         @fileName = "installed/" + nametextlocal + ".inf"
+            @fileName = "installed/" + nametextlocal + ".inf"
+	    
+	$rwdtinkerlog.debug "initateapplets: loading file: #{@fileName}"
 	
-  tmpfilearray = File.readlines(@fileName)
+            tmpfilearray = File.readlines(@fileName)
   
-  tmpfilearray.each do |line|
+            tmpfilearray.each do |line|
 	  
-       tempcodeinstallline = line.chomp
-       if tempcodeinstallline.include?('code/')
-	     findfiles(tempcodeinstallline  + "/**")
-            tempcoderesult = eval( $tempdoc ) # read the program code and evaluate
-       end
-end 
-  
-# resultend =  tempcodeinstallline .index("\n",resultstart)
- tempresult  = @fileName
- 
-return " applet loading successful " + tempresult 
+                        tempcodeinstallline = line.chomp
+                        if tempcodeinstallline.include?('code/')
+	                           findfiles(tempcodeinstallline  + "/**")
+                                    tempcoderesult = eval( $tempdoc ) # read the program code and evaluate
+                        end
+             end 
+
 
  rescue
-    if $DEBUG
-              $stderr.puts  "error in initiateapplets - code building"
-          end
+ 
+ $rwdtinkerlog.error "error in initiateapplets - code building"
+   
         debuginitiate += 1
     
 
   end
   
+          setuphelpaboutoptions # update the help about list
+           setuptinkerdocuments # update the document pull down list
+          runhelpwindow   # update the help menu
+          showjumplinkoptions # update the application link menu
+	  runrwdtinkerbackwindow # back to applet window
+
+         # resultend =  tempcodeinstallline .index("\n",resultstart)
+         tempresult  = @fileName
+ 
+         return " applet loading successful " + tempresult 
+
+
+  
        if  debuginitiate > 0
          return " initiateapplet .."
        else
@@ -145,95 +149,22 @@ return " applet loading successful " + tempresult
 
 end
 
-=begin
-
-
-  Dir.chdir($progdir) # change back to top program directory
-
-  # build the English Language hash file from the parts
-  languagehashvariable = 'Message = Hash.new { |hh, kk| hh[kk] = "ERROR: Message not found: #{kk.inspect}."; hh[kk] }
-  langmessage = {' + "\n"
-  startlangdir = File.join(LangDir,"en")
-  #get a list of the files and subdirectories on the starting directory only
-  alanghash = Array.new(Dir[startlangdir].entries.sort)
-  #loop through the list, ignore the files and add all new directories found
-  alanghash.each do |x|
-	  #if a directory...
-	  if(test(?d,x))
-		  # add to the original list of directories
-		  @@tmproot = x + "/**"
-		  #adds the new ones to the array
-		  blanghash = Dir[@@tmproot].entries.sort
-		  blanghash.each do |x|
-			  if(test(?d,x))
-				  alanghash.push(x)  #appends to the end of the array...
-			  end
-		  end
-	  end
-  end
-  alanghash.each do |x|
-	  #if it is a file...
-	  if(!test(?d,x))
-		  alanghash.delete(x)
-	  else              #it is a directory...
-		  findfiles(x + "/**")
-	  end
-  end
-
-
-  #writes the contents of doc into the  languagehashvariable 
-  languagehashvariable  =  languagehashvariable + $tempdoc + "}  ; langmessage.each { |kk, vv| Message[kk] = vv }"
-
-  # END of en Lang building
-  $tempdoc = " "
-  Dir.chdir($progdir) # change back to top program directory
-
-  # build the local Language hash file from the parts
-  startlangdir = File.join(LangDir,$lang)
-  #get a list of the files and subdirectories on the starting directory only
-  alanghash = Array.new(Dir[startlangdir].entries.sort)
-  #loop through the list, ignore the files and add all new directories found
-  alanghash.each do |x|
-	  #if a directory...
-	  if(test(?d,x))
-		  # add to the original list of directories
-		  @@tmproot = x + "/**"
-		  #adds the new ones to the array
-		  blanghash = Dir[@@tmproot].entries.sort
-		  blanghash.each do |x|
-			  if(test(?d,x))
-				  alanghash.push(x)  #appends to the end of the array...
-			  end
-		  end
-	  end
-  end
-  alanghash.each do |x|
-	  #if it is a file...
-	  if(!test(?d,x))
-		  alanghash.delete(x)
-	  else              #it is a directory...
-		  findfiles(x + "/**")
-	  end
-  end
-
-
-  #writes the contents of doc into the variable
-  languagehashvariable =  languagehashvariable  + " ; Message.update(" + $tempdoc + ' :rwdtinker => "Rwdtinker" ) '
-
-
-  $tempdoc = " "
-
-  Dir.chdir($progdir) # change back to top program directory
-
-  temp = eval(   languagehashvariable )
-
-  $tempdoc = " "
-
- 
-
-	
 
+def findfiles(d)
+	a = Array.new(Dir[d].entries.sort)
+	#loop through and get the files names
+	a.each do |x|
+		#adjust the filters to the files you want to see...
+		if(!test(?d,x))
+			# only rwd files
+			if x =~ /rb|rwd|txt/
+				fileA=File.open("#{x}","r")        #opens the file thats in fileName as read only
+				$tempdoc+=fileA.read    #reads the file into the doc string
+				fileA.close    
+			end
+		end
+	end
+end
 
-=end
 
   

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

@@ -1,7 +1,7 @@
 # install rwdtinker applet from a long directory location 
 def installgemapplet
 	require 'fileutils'
-	require 'extras/zip/zip'
+	require 'lib/zip/zip'
 	nametext = "%s" % [@a_installapplet]
 
 	begin # exception trapped block
@@ -13,16 +13,18 @@ def installgemapplet
 			zf.extract(entry.to_s, entry.to_s)
 		}
 		
-		rescue
+	rescue
 		
-	if $DEBUG
-	$stderr.puts "unzip error - applet may not be installed correctly"
-       end
-        @installapplettext = " .. "
+		         $rwdtinkerlog.error "installgemapplet: unzip error - applet may not be installed correctly"
 	
-	end # exception rescue
+                           @installapplettext = " .. "
 	
-		@nametextbase = File.basename(nametext)
+        end # exception rescue
+
+                @rwd_ignore_vars << @nametextbase << @returninitiateresults << @installapplettext	
+		tmpnametext = File.basename(nametext)
+		tmpnametext.chop!; tmpnametext.chop!; tmpnametext.chop!; tmpnametext.chop!
+		@nametextbase = tmpnametext.chop!
 		@returninitateresults = initiateapplet(@nametextbase)
 		@installapplettext = Message[:applet_installed] + " " +   @returninitateresults 
 

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

@@ -5,8 +5,14 @@ def fillziptoinstallname(inffile)
 	
 end
 
-def  listzipfilestoinstall
-	startlangdir = File.join($progdir, $zipslocation )
+def  listzipfilestoinstall
+	
+	if  $zipslocation.slice(0,1) == "/" ||   $zipslocation.include?(":")
+	    startlangdir = $zipslocation 
+         else	
+	    startlangdir = File.join($progdir, $zipslocation )
+	end
+	
 	#get a list of the files and subdirectories on the starting directory only
 	
 

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

@@ -24,14 +24,14 @@
 def removeappletvariables(tempremovename)
 	
  	 begin # exception trapped block
-	 if $DEBUG
-	$stderr.puts "in removeappletvariables"
-	end
+	
+        $rwdtinkerlog.info "in removeappletvariables"
+
 	 # removefileinf = File.open(tempremove){|f| f.read}
 	 
-        temp = tempremovename.gsub("-","_")
-        removemethod =  temp.gsub(".","_")
-       
+        
+        removemethod =  tempremovename
+        
           
         send "#{removemethod}"
 	

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

@@ -1,7 +1,7 @@
 #view contents of a tinker applet
 def viewappletcontents
 	require 'fileutils'
-	require 'extras/zip/zip'
+	require 'lib/zip/zip'
 	nametext = "%s" % [@a_installapplet]
 
 	begin # exception trapped block

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

@@ -1,7 +1,7 @@
 #view gem info
 def viewgemappletcontents
 	require 'fileutils'
-	require 'extras/zip/zip'
+	require 'lib/zip/zip'
 	nametext = "%s" % [@a_installapplet]
 
 	begin # exception trapped block

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

@@ -0,0 +1,13 @@
+def rwdtinkerrunviewlog
+	   require 'lib/rwdtinker/rwdtinkertools'
+	   
+           if @a_rwdtinkerlognumber == nil
+		        @a_rwdtinkerlognumber = 11
+	                 @returnlogdisplay = RwdtinkerTools.tail("rwd_files/log/rwdtinker.log",@a_rwdtinkerlognumber.to_i)
+			 
+	   else
+		         @returnlogdisplay = RwdtinkerTools.tail("rwd_files/log/rwdtinker.log",@a_rwdtinkerlognumber.to_i)
+
+           end
+end
+

data/configuration/rwdtinker.dist

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

data/configuration/{rwdwhypernote-0.13.dist → rwdwhypernote.dist}

@@ -1,10 +1,10 @@
-##VERSION:0.13
-##NAME:$rwdhypernote_directory:0
-$rwdhypernote_directory = "Notes"
-##NAME:$notesarray:0
-$notesarray = ["Notes/changes.txt"]
-##NAME:$noteslinksarray:0
-$noteslinksarray = ["Notes/changes.lnk"]
+##VERSION: (0.15)
+##NAME: ($rwdhypernote_directory):(0.15)
+$rwdhypernote_directory = "rwd_files/Notes"
+##NAME: ($notesarray):(0.15)
+$notesarray = ["rwd_files/Notes/changes.txt"]
+##NAME: ($noteslinksarray):(0.15)
+$noteslinksarray = ["rwd_files/Notes/changes.lnk"]
 $rwdhypernote_ftpsite = "ftp.mysite.com"
 $rwdhypernote_ftplogin = "mylogin"
 $rwdhypernote_ftppassword = "mypassword"
@@ -15,6 +15,6 @@ $tinkerhelpaboutarray += ["RwdHypernote"]
 $tinkerdocumentsarray += ["HowTo_HyperNote.txt"]
 JumpLink.update(:RwdHypernoteTXT=>"runrwdhypernotetxtwindow", :RwdHypernote=>"runrwdhypernotemain")
 $rwdjumplink +=["RwdHypernote","RwdHypernoteTXT"]
-##NAME:RwdHyperNoteVersion:0
-RwdHyperNoteVersion = "0.13"
+##NAME: (RwdHyperNoteVersion):(0.15)
+RwdHyperNoteVersion = "0.15"
 

data/configuration/tinkerwin2variables.dist

@@ -1,17 +1,23 @@
-##VERSION:1.69
+##VERSION: (1.82)
 TinkerWin2ConfigurationFileName = "tinkerwin2variables.cnf" # this file name - do not change
-##NAME:$zipslocation:0
+##NAME: ($zipslocation):(1.78)
 $zipslocation = "zips" # location of applets to add
- $zipsarray = [""] ; $zipsarraylocal = [""]
-##NAME:$xpcommand:0
+ $zipsarray = [""]
+  $zipsarraylocal = [""]
+##NAME: ($xpcommand):(1.78)
  $xpcommand = " "  # Linux machines
 # $xpcommand =  "cmd /C "  # XP machines with cmd shell
-##NAME:$gemdirectory_withgemfiles:0
+##NAME: ($gemdirectory_withgemfiles):(1.78)
  $gemdirectory_withgemfiles = "/var/lib/gems/1.8/gems"
 # $gemdirectory_withgemfiles = "c:\\ruby\\lib\\ruby\\gems\\1.8\\gems"  # XP machine
-##NAME:$geminstalled_directory:0
+##NAME: ($geminstalled_directory):(1.78)
 # $geminstalled_directory = "/ruby/lib/ruby/gems/1.8/gems" # XP machine
  $geminstalled_directory = "/var/lib/gems/1.8/gems" # Debian Linux
 
-RwdTinkerWin2Version = "0.8"
+$rwdapplicationidentity = "rwdtinker main application"
 
+RwdTinkerWin2Version = "1.81"
+Browser_Exe = 'mozilla '
+#language selection file
+##NAME: ($langarray):(1.82)
+$langarray = [ "en","ja", "nl","es", "fr","hi"]

data/gui/00coreguibegin/applicationguitop.rwd

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

data/gui/frontwindowselections/{superant.com.rwdtinkerwin2selectiontab/jumplinkcommands.rwd → jumplinkcommands.rwd}

@@ -2,7 +2,7 @@ $rwdguivar=
 "
 <horizontal>
 <button caption=#{Message[:showjump_links]} action=\"showjumplinkoptions\"/>
-
+<button caption=#{Message[:help]} action=\"runhelpwindowtinkerwin2\"/>
 </horizontal>
  <table>
       <select name=\"a_jumplinkinput\">  %%jumplinkoptions%% </select>

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

@@ -1,6 +1,6 @@
 $rwdguivar=  
 	"
-		<tab name=\"superantcomhtmlnoterecordfile\" caption=\"Text Notes\">
+		<tab name=\"superantcomhtmlnoterecordfile\" caption=\"Notes View\">
 
     <table>
     <row>View your note list and detail on this Tab (only click on text files)</row>

data/gui/tinkerbackwindows/superant.com.hypernote/15htmlview.rwd

@@ -5,24 +5,19 @@ $rwdguivar=
     <table>
     <row>View your directory file list here (must be under rwd_files directory)</row>
      <row> <p> </row> 
-      
-
+      
     </table>
       <horizontal>
       
-       <button caption=\"List Directories\" action=\"rwdhypernotedirectories3\"/>
-<button caption=\"Reset to top Directory\" action=\"rwdhypernoteresetdir\"/>
-      
-    
-      
-  
-     <button caption=\"Help\" action=\"runhelpwindowrwdhypernote\"/>
+          <button caption=\"List Directories\" action=\"rwdhypernotedirectories3\"/>
+          <button caption=\"Reset to top Directory\" action=\"rwdhypernoteresetdir\"/>
+           <button caption=\"Help\" action=\"runhelpwindowrwdhypernote\"/>
       
     </horizontal>
     
      <horizontal>
     
-    %%hypernotetxt_directory%%
+    %%hypernotetxt_directory3%%
     
      </horizontal>
     
  

data/gui/tinkerbackwindows/superant.com.hypernote/21editnote.rwd

@@ -1,6 +1,6 @@
 $rwdguivar=  
 	"
-		<tab name=\"superantcomeditnoterecordfile\" caption=\"View/Edit HTML Note\">
+		<tab name=\"superantcomeditnoterecordfile\" caption=\"View/Edit  Note 2nd\">
 
     <table>
     <row>View your text note list and detail on this Tab</row>

data/gui/tinkerbackwindows/superant.com.hypernote/25html2note.rwd

@@ -1,6 +1,6 @@
 $rwdguivar=  
 	"
-		<tab name=\"superantcomhtml2noterecordfile\" caption=\"2nd Note tab\">
+		<tab name=\"superantcomhtml2noterecordfile\" caption=\"Note view 2nd\">
 
     <table>
     <row>View your note list and detail on this Tab (only click on text files)</row>
@@ -10,7 +10,7 @@ $rwdguivar=
     </table>
       <horizontal>
       <button caption=\"Open Detail\" action=\"loadhtmlnoterecord2\"/>
-          <button caption=\"List Directories\" action=\"rwdhypernotedirectories\"/>
+          <button caption=\"List Directories\" action=\"rwdhypernotedirectories2\"/>
 <button caption=\"Reset to top Directory\" action=\"rwdhypernoteresetdir\"/>
      
       
@@ -18,7 +18,11 @@ $rwdguivar=
       
     </horizontal>
     
-         
+         <horizontal>
+    
+    %%hypernotetxt_directory2%%
+    
+     </horizontal>
      <horizontal>
      <button caption=\"List Notes\" action=\"listnotedirshtml2\"/>
        

data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/75rwdlogfile.rwd

@@ -0,0 +1,20 @@
+$rwdguivar=
+"
+	<tab name=\"rwdlogfiletab\" caption=\"RWD Log Files\">
+             <table>   
+                      <horizontal>
+  
+  
+                             <p align=\"left\">Number of lines to display</p>  <text size=11  name=\"a_rwdtinkerlognumber\"/> 
+
+                           <button caption=#{Message[:viewlogger_information]} action=\"rwdtinkerrunviewlog\"/>
+                      </horizontal>
+        
+                </table>    
+
+                <p>%returnlogdisplay%</p>
+
+	</tab>"
+
+
+

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

@@ -3,7 +3,7 @@ $rwdguivar=
 <tab name=selectiontab caption=#{Message[:selection_tab]}>
 <horizontal>
 <button caption=#{Message[:showjump_links]} action=\"showjumplinkoptions\"/>
-
+<button caption=#{Message[:help]} action=\"runhelpwindowtinkerwin2\"/>
 </horizontal>
  <table>
       <select name=\"a_jumplinkinput\">  %%jumplinkoptions%% </select>