rwdtinker 1.81 → 1.82

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

@@ -30,8 +30,6 @@ def initiateapplet(nametextlocal)
 	
 	$rwdtinkerlog.info  "initiateapplet: starting config load with: #{nametextlocal}"
 
-
-
   Dir.chdir($progdir )    #changes the current working directory
 	  
   @confignew =  "configuration/" + "#{nametextlocal}.cnf"
@@ -44,13 +42,10 @@ begin
 	 
        eval configfileload  #load  config file
        
-    
-	
 	 rescue
 	 
    $rwdtinkerlog.error  "initiateapplet: error in initiateapplets - config load"
         
-  
         debuginitiate += 1
 end
 $tempdoc = " "
@@ -58,80 +53,24 @@ $tempdoc = " "
   Dir.chdir($progdir) # change back to top program directory
 
   # build the English Language hash file from the parts
-  languagehashvariable = 'Message.update('
-  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
-
+  require 'lib/rwdtinker/rwdlangdir'
+  
+  tempdoc  = RwdtinkerTools.findlanguagefiles(LangDir,"en")
 
   #writes the contents of doc into the  languagehashvariable 
-
   
-  languagehashvariable  =  languagehashvariable + $tempdoc + ' :rwdtinker => "Rwdtinker" ) ;'
+  languagehashvariable  =  tempdoc  
 
   # 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
-
+  tempdoc  = RwdtinkerTools.findlanguagefiles(LangDir,$lang)
 
-  #writes the contents of doc into the variable
+   #writes the contents of doc into the variable
 
- languagehashvariable =  languagehashvariable  + "  Message.update(" + $tempdoc + ' :rwdtinker => "Rwdtinker" ) '
- 
-  
-    
-  $tempdoc = " "
+ languagehashvariable =  languagehashvariable + tempdoc 
 
   Dir.chdir($progdir) # change back to top program directory
 
@@ -142,44 +81,18 @@ $tempdoc = " "
   begin # error trap
   
 	# build the actual GUI from the gui parts
-  $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
-
-$rwd_gui_tinker = $tempdoc
-
+  tempdoc = " "
+  
+   require 'lib/rwdtinker/rwdguidir'
+   
+  tempdoc = RwdtinkerTools.findguifiles(GuiDir)
+  
+ $rwd_gui_tinker = tempdoc
   
  rescue
     $rwd_gui_tinker = tempguistorage # restore old gui
     
     $rwdtinkerlog.error  "error in initiateapplets - gui building"
-     
 
         debuginitiate += 1
 end
@@ -237,5 +150,21 @@ begin # error trap
 end
 
 
+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
+
 
   

data/configuration/rwdtinker.dist

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

data/configuration/tinkerwin2variables.dist

@@ -1,4 +1,4 @@
-##VERSION: (1.81)
+##VERSION: (1.82)
 TinkerWin2ConfigurationFileName = "tinkerwin2variables.cnf" # this file name - do not change
 ##NAME: ($zipslocation):(1.78)
 $zipslocation = "zips" # location of applets to add
@@ -19,9 +19,5 @@ $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"
+##NAME: ($langarray):(1.82)
+$langarray = [ "en","ja", "nl","es", "fr","hi"]

data/init.rb

@@ -32,38 +32,7 @@ require 'lib/rconftool'
 
 $progdir = File::expand_path( File.dirname(__FILE__))
 
-$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
-def loadguifile(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/
-
-				load x      #opens the file thats in fileName and reads it
-				$tempdoc += $rwdguivar # adds the file into the doc string
-			end
-		end
-	end
-end 
+tempdoc = " "
 
 # integrate the new configuration files
 MAINconfignew =  "rwdconfig.cnf"
@@ -99,148 +68,70 @@ Rconftool::install(configdist,confignew)     #integrates new file with old
 
   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
+  Message = Hash.new { |hh, kk| hh[kk] = "ERROR: Message not found: #{kk.inspect}."; hh[kk] }
+  langmessage = { :clear => "Clear", :rwdtinker => "Rwdtinker" }  ; langmessage.each { |kk, vv| Message[kk] = vv }
+  
+    def msgid(programkey)
+	  $programkey = programkey
   end
-
+  
+  def msgstr(programmsg)
+	  if programmsg == ""
+		  $rwdtinkerlog.info "msgstr: no translation for #{$programkey}"
+	 else
+                 Message.update( $programkey.to_sym => programmsg ) 
+        end
+end
+ 
+  require 'lib/rwdtinker/rwdlangdir'
+ 
+  tempdoc = " "
+  #go get all the po language file files in english
+    tempdoc = RwdtinkerTools.findlanguagefiles(LangDir,"en")
 
   #writes the contents of doc into the  languagehashvariable 
-  languagehashvariable  =  languagehashvariable + $tempdoc + "}  ; langmessage.each { |kk, vv| Message[kk] = vv }"
+  languagehashvariable  =  tempdoc 
 
   # END of en Lang building
-  $tempdoc = " "
+  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
+    
+    $lang = $langarray[0]  # pick the language of choice
+  
+   # Go get all the po files for the language of choice
+    tempdoc  = RwdtinkerTools.findlanguagefiles(LangDir,$lang)
+    # the contents of doc into the variable
+    languagehashvariable =  languagehashvariable   + tempdoc 
 
-  temp = eval(   languagehashvariable )
+    Dir.chdir($progdir) # change back to top program directory
+    
+    # lets read those po files, first english then the chosen language
+    temp = eval(   languagehashvariable )
 
-  $tempdoc = " "
+  
 
   # build the actual program from the code parts
-  #get a list of the files and subdirectories on the starting directory only
-  a = Array.new(Dir[CodeDir].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))
-		  # 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...
-		  findfiles(x + "/**")
-	  end
-  end
-
+  require 'lib/rwdtinker/rwdcodedir'
+  
+  tempdoc =  RwdtinkerTools.findprogramfiles(CodeDir)
 
   # load the program file
-  tempcoderesult = eval( $tempdoc )
+ 
+  tempcoderesult = eval( tempdoc )
 
   # build the actual GUI from the gui parts
-  $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
+   require 'lib/rwdtinker/rwdguidir'
+   
+  tempdoc = RwdtinkerTools.findguifiles(GuiDir)
+  
 
   # gui variable is done
   guiRWD = ""
-  $rwd_gui_tinker = $tempdoc
+  $rwd_gui_tinker =  tempdoc
   require 'socket'		# Network stuff
   host = "127.0.0.1"
   port = $port
@@ -275,7 +166,7 @@ Rconftool::install(configdist,confignew)     #integrates new file with old
 		  $rwdtinkerlog.warn "trying port: #{port}"
 		  # Rescue all other errors
 	  end
-
+  $port = port
   end
 
   

data/lang/en/rwdcore/en.po

@@ -0,0 +1,166 @@
+# English Language files for RwdTinker core
+ 
+  msgid "applet_installed"  
+  msgstr '"applet installed!"'
+  
+  msgid "application_version"   
+msgstr  "Application Version"
+   
+   msgid "cancel" 
+   msgstr  "Cancel"
+   
+  msgid "clickfor_version"  
+  msgstr  "Click for Version" 
+  
+  msgid "clickbelowtoviewlistof_zip" 
+  msgstr  "click below to view lists of zips"
+  
+  msgid "documents"     
+  msgstr  "Documents"
+
+msgid "edit"    
+  msgstr    "edit"  
+
+msgid "file_name"   
+  msgstr  "File Name:"
+  
+  msgid "fill_record"   
+  msgstr  "Fill Record"
+  
+  msgid "help"    
+    msgstr  "Help"
+  
+  msgid "help_about"  
+  msgstr  '"Help About"'
+  
+  msgid "install_applet"   
+    msgstr  '"install (rwdtinker) applet"'  
+  
+  msgid "jumptoapplication_location"   
+    msgstr  '"Jump to Application Location"' 
+  
+  msgid "list_applets"    
+  msgstr  '"Remove Applets"'
+  
+  msgid "listappletsinthegem_directory" 
+  msgstr  '"List applets in the Gem Directory"'
+  
+  msgid "listappletsavailablefor_installation" 
+  msgstr  '"List applets available for installation"'   
+  
+   msgid "list_files"  
+   msgstr  '"List Files"'      
+   
+   msgid "list_installed_gems "     
+   msgstr  '"List installed Gems"'   
+  
+  msgid "list_photos"   
+  msgstr  '"List Photos"'
+  
+  msgid "list_zips"    
+  msgstr  '"List Zips"'
+  
+  msgid "listzipdirappletsavailable"  
+  msgstr  '"List (zip directory) applets available for installation"'
+  
+  msgid "menu_panel"     
+  msgstr  '"Menu Panel"'
+  
+  msgid "module_unknown"   
+  msgstr  '"Unknown Module"'
+  
+  msgid "next"    
+  msgstr  "Next"
+  
+  msgid "open"   
+  msgstr  "Open"
+  
+  msgid "open_document"    
+ msgstr  '"Open Document"'
+
+  msgid "openselectedhelp_about"  
+  msgstr  '"Open selected help about"'
+  
+  msgid "reload_variables"   
+  msgstr  '"Reload Variables"' 
+  
+  msgid "remove_applet"  
+  msgstr   '"remove applet"'
+  
+  msgid "return"   
+  msgstr  "Return"
+  
+  msgid "rwdtinker_window_2"    
+  msgstr  '"RwdTinker Window 2"'
+  
+  msgid "rwdtinker"   
+  msgstr  "RwdTinker"
+  
+  msgid "rwdtinker_back_window"  
+  msgstr  '"RwdTinker Back Window"'
+  
+  msgid "rwdtinker_help"    
+  msgstr  '"RwdTinker Help"'
+  
+  msgid "rwdtinker_help_window"   
+  msgstr  '"RwdTinker Help Window"'
+  
+  msgid "showjump_links"  
+  msgstr  '"Show Jump Links"'
+
+msgid "showdocument_list"  
+  msgstr  '"Show Document List"'
+
+msgid "showhelpabout_links"  
+    msgstr  '"Show Help About Links"'
+  
+  msgid "save"
+  msgstr  "Save"    
+
+msgid "save_changes"     
+  msgstr  '"Save Changes"'
+
+msgid "selection_panel"  
+  msgstr  '"Menu Panel"'
+
+msgid "selection_tab" 
+  msgstr  '"Menu Tab"'
+
+msgid "tinker_logo"
+  msgstr  '"Tinker Logo"'
+
+msgid "tinkerback_window"  
+msgstr  '"Tinker Back Window"'
+
+msgid "viewapplet_contents" 
+  msgstr  '"View Applet Contents"'
+
+msgid "viewalreadyinstalled_applications"   
+msgstr  '"View already installed GEM applications"'
+
+msgid "viewinstalled_text"  
+  msgstr  '"View Install Text"' 
+
+msgid "view_platform"   
+  msgstr  '"view platform"' 
+
+msgid "viewplatform_information"   
+  msgstr  '"View Platform Information"'  
+
+msgid "viewlogger_information"    
+msgstr  '"View Logger Information"'  
+
+msgid "view_event"   
+  msgstr  '"View event"'     
+
+msgid "viewinstall_text"  
+msgstr  '"View Install Text"'   
+
+  msgid "viewlistinstall_files"   
+  msgstr  '"View List of Installed Files"' 
+ 
+ msgid "view_photo"   
+  msgstr  '"View Photo"'  
+
+ msgid "window"    
+  msgstr  "Window"