rubyslippers 0.95 → 0.96

data/Readme.txt

@@ -157,6 +157,12 @@ http://www.erikveen.dds.nl/rubywebdialogs/index.html
 Thanks, Steven Gibson
 
 =Changelog
+Version 0.96
+  updated for rwdtinker 1.44 - refactored gui files
+ Changed gui directory names - more like  Java package titles
+ added error feedback on gem commands
+   
+
 Version 0.95
  Updated for version 1.42 - semi-live updates should work
  Changed gem commands tab - added pull down choices

data/code/{ii6rubyslippers → superant.com.rubyslippers}/gemcommands.rb

@@ -5,7 +5,7 @@
     commandtemp = $xpcommand  + commandtext
     begin # exception trapped block
          
-     @gemcommandresult = `#{commandtemp}`
+     @gemcommandresult = `#{commandtemp}  2>&1`
                 
     rescue SystemCallError, StandardError
      @gemcommandresult = "system call error: " + $!

data/code/xb1rwdtinkerbackwindow/installapplet.rb

@@ -3,9 +3,10 @@
     nametext = "%s" % [@a_installapplet]
 	 
         begin # exception trapped block
-   	 fileName = "zips/" + nametext + ".zip"
+   	 fullname =  nametext + ".zip"
+     fileName = File.join($zipslocation,fullname)
   	
-	        commandline = "unzip -o " + fileName
+	        commandline = $unzipprogram + fileName
          system( commandline+' > temp.output' )
         
     

data/code/xb1rwdtinkerbackwindow/listinstalledfiles.rb

@@ -1,4 +1,4 @@
-# this code is to list the files
+# this code is to list the applets that are installed
 def listinstalledfiles
   fileList      = Dir.new("installed").entries.sort.reverse.delete_if { |x| ! (x =~ /inf$/) }
   @filesresult  = fileList.rwd_method("fillappletname")

data/code/xb1rwdtinkerbackwindow/listzips.rb

@@ -1,7 +1,9 @@
 # this code is to list the zipped applets that can be installed
-def listzipfilestoinstall
-  fileList      = Dir.new("zips").entries.sort.reverse.delete_if { |x| ! (x =~ /zip$/) }
-  @zipslistresult  = fileList.rwd_method("fillziptoinstallname")
+def listzipfilestoinstall
+ if File.exist?($zipslocation)
+  fileList      = Dir.new($zipslocation).entries.sort.delete_if { |x| ! (x =~ /zip$/) }
+  @zipslistresult  = fileList.rwd_method("fillziptoinstallname")
+  end
 end
  
 def fillziptoinstallname(inffile)

data/code/xb1rwdtinkerbackwindow/loadconfigurationrecord.rb

@@ -0,0 +1,32 @@
+   # this method views an existing address record
+  def loadconfigurationrecord
+ 
+         require 'fileutils'
+         if TinkerWin2ConfigurationFileName 
+               @a_configurationfilename = TinkerWin2ConfigurationFileName 
+         end
+	      
+        begin # exception trapped block
+       
+       Dir.chdir($progdir)
+	      fileName = File.join(ConfigurationDir, TinkerWin2ConfigurationFileName)
+        
+	      fd = File.open(fileName,"r")
+	      @a_configline1=        fd.readline.chomp
+	      @a_configline2 =  fd.readline.chomp
+        @a_configline3 = fd.readline.chomp
+          @a_configline4 = fd.readline.chomp
+        @a_configline5 = fd.readline.chomp
+         @a_configline6 = fd.readline.chomp 
+          @a_configline7 =fd.readline.chomp
+          @a_configline8 = fd.readline.chomp
+	 
+	      while ! fd.eof?
+	        @extraconfigdatadisplay = fd.readline
+	      end
+        fd.close
+        rescue SystemCallError, StandardError
+            $stderr.print "system call error: " + $!
+        end # exception rescue
+
+  end

data/code/xb1rwdtinkerbackwindow/loadconfigurationvariables.rb

@@ -0,0 +1,13 @@
+   # this method clears the on screen variables
+   def loadconfigurationvariables
+   
+   configfiletoload = File.join(ConfigurationDir,TinkerWin2ConfigurationFileName)
+   begin
+    load configfiletoload
+    @extraconfigdatadisplay = ""
+@newconfigurationresult = "Config Variables loaded"
+rescue
+ @extraconfigdatadisplay = ""
+ @newconfigurationresult = "loading error"
+ end
+  end

data/code/xb1rwdtinkerbackwindow/saveconfigurationrecord.rb

@@ -0,0 +1,18 @@
+  # this method adds a new address record
+  def saveconfigurationrecord 
+   require 'fileutils'
+   if @a_configurationfilename
+   newname = "%s" %   [@a_configurationfilename] # grab the filename to create
+   newdata =@a_configline1.to_s + "\n" + @a_configline2.to_s + "\n" + @a_configline3.to_s + "\n" + @a_configline4.to_s + "\n" + @a_configline5.to_s + "\n" + @a_configline6.to_s + "\n" + @a_configline7.to_s + "\n" + @a_configline8.to_s + "\n"
+	 
+        begin # exception trapped block
+          fileName = File.join( ConfigurationDir, newname )
+        	fd = File.open(fileName,"w")
+	        fd.print(newdata) # save the record info to the file
+	        fd.close
+          @newconfigurationresult=newdata # show the record info in the browser
+        rescue SystemCallError, StandardError
+            $stderr.print "system call error: " + $!
+        end # exception rescue
+    end
+  end

data/configuration/rubyslippersversion.cnf

@@ -1,2 +1,2 @@
 
- RubySlippersVersion = "0.95"
+ RubySlippersVersion = "0.96"

data/configuration/rwdtinker.cnf

@@ -1,12 +1,12 @@
 
+ConfigurationDir = "configuration" # for use in program - init.rb has this value without using this constant
 CodeName = "rwdtinker"
 CodeNameFile = CodeName + ".rb"
 LangNameFile = "rwdlanguage.rb"
 RWDFile	= "rwdtinker.rwd"
- @@codedir = "code"
- @@guidir = "gui" 
- @@langdir = "lang"
-
-TempLangHashFile = @@langdir + "/" + "templangfile.rb"
-LocalLangHashFile = @@langdir + "/" + "xlocallangfile.rb" 
-$port = 7705
+LangDir = "lang"
+TempLangHashFile = LangDir + "/" + "templangfile.rb"
+LocalLangHashFile = LangDir + "/" + "xlocallangfile.rb" 
+ CodeDir = "code"
+ GuiDir = "gui" 
+ $port = 7705

data/configuration/rwdtinkerversion.cnf

@@ -1,2 +1,2 @@
 
-RwdTinkerVersion = "1.42"
+RwdTinkerVersion = "1.44"

data/configuration/tinkerwin2variables.cnf

@@ -0,0 +1,8 @@
+
+TinkerWin2ConfigurationFileName = "tinkerwin2variables.cnf" # this file name - do not change
+$zipslocation = "zips" # location of applets to add
+$unzipprogram = "unzip -o " 
+
+
+
+

data/configuration/tinkerwin2version.cnf

@@ -1,3 +1,3 @@
 
-RwdTinkerWin2Version = "0.6"
+RwdTinkerWin2Version = "0.7"
 

data/gui/00coreguibegin/applicationguitop.rwd

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

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

@@ -0,0 +1,36 @@
+$rwdguivar=
+"
+	<tab name=\"editconfigurationfile\" caption=\"Edit Configuration\">
+ <table>
+ <row> <p> </row>
+ <row> <p align=\"right\">You can view or edit the rwdtinker applet confiruration file here</row>
+ <row> <p> </row>
+ <horizontal>
+      <button caption=\"Load Record\" action=\"loadconfigurationrecord\"/>
+      <button caption=\"Save Changes\" action=\"saveconfigurationrecord\"/>
+      <button caption=\"Reload Variables\" action=\"loadconfigurationvariables\"/>
+      
+
+
+    
+    </horizontal>
+    <table>
+      <row> <p align=\"right\">FileName:</p>  <text name=\"a_configurationfilename\"/> </row>
+      <row> <p align=\"right\">1:</p>  <text name=\"a_configline1\"/> </row>
+      <row> <p align=\"right\">2:</p>  <text name=\"a_configline2\"/> </row>
+      <row> <p align=\"right\">3:</p>  <text name=\"a_configline3\"/> </row>
+      <row> <p align=\"right\">4:</p>  <text name=\"a_configline4\"/> </row>
+      <row> <p align=\"right\">5:</p>  <text name=\"a_configline5\"/> </row>
+      <row> <p align=\"right\">6:</p>  <text name=\"a_configline6\"/> </row>
+      <row> <p align=\"right\">7:</p>  <text name=\"a_configline7\"/> </row>
+      <row> <p align=\"right\">8:</p>  <text name=\"a_configline8\"/> </row>
+
+    </table>
+    <p>%extraconfigdatadisplay%</p>
+    <p>
+    <p>%newconfigurationresult%</p>
+     
+      
+
+	</tab>"
+

data/gui/{xb1rwdtinkerbackwindow/4arwdlistapplets.rwd → tinkerbackwindows/superant.com.tinkerbackwindow/50rwdlistapplets.rwd}

@@ -9,7 +9,7 @@ $rwdguivar=
     </table>
 
       <horizontal>
-       <button caption=\"View Install Text\" action=\"openname\"/>
+       <button caption=\"View Install Text\" action=\"openappletname\"/>
       <button caption=\"Cancel\" action=\"main\"/>
     </horizontal>
           <p>%displaytext%</p>

data/init.rb

@@ -73,7 +73,7 @@ $progdir = File::expand_path( File.dirname(__FILE__))
  Dir.chdir($progdir) # change back to top program directory
 
  # build the English Language hash file from the parts
- startlangdir = @@langdir +"/" + "en"
+ 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
@@ -108,7 +108,7 @@ $progdir = File::expand_path( File.dirname(__FILE__))
   Dir.chdir($progdir) # change back to top program directory
  
  # build the local Language hash file from the parts
- startlangdir = @@langdir +"/" + $lang
+ 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
@@ -145,11 +145,11 @@ $tempdoc = " "
 
  # build the language hash constant object from the lang parts
  #get a list of the files in lang directory only
-        alangfile = Dir.new(@@langdir).entries.sort.reverse.delete_if { |x| ! (x =~ /rb$/) }
+        alangfile = Dir.new(LangDir).entries.sort.reverse.delete_if { |x| ! (x =~ /rb$/) }
         alangfile.length.times{
         fileName = alangfile.pop
         Dir.chdir($progdir)
-        Dir.chdir(@@langdir) 
+        Dir.chdir(LangDir) 
         fileLangA=File.open("#{fileName}","r")        #opens the file thats in fileName as read only
         $tempdoc += fileLangA.read    #reads the file into the doc string
         fileLangA.close    
@@ -165,7 +165,7 @@ Dir.chdir($progdir)
 
  # 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)
+        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...
@@ -198,7 +198,7 @@ Dir.chdir($progdir)
 # 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)
+        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...