rwdruby 1.05 → 1.06

data/Readme.txt

@@ -19,13 +19,6 @@ ruby init.rb
 Then point your web browser to:
 http://localhost:7705/
 
-Change language at:
-
-configuration/language.dist
-
-Change to Windows XP directory structure at:
-configuration/tinkerwin2variables.dist
-
 == Viewing installed Applets:
  
 Go to "List Scripts" tab
@@ -234,6 +227,26 @@ http://www.erikveen.dds.nl/rubywebdialogs/index.html
 Thanks, Steven Gibson
 
 == Changelog
+Version 1.77
+ Fixed zips location to be relative or absolute
+ Made themes loadable
+
+Version 1.76
+ Move rwd code files into lib directory - bug - 21886
+ change tab name list applets - bug - 21864	
+ change extra folder to be lib folder - bug 21887
+  remove duplicate intall applet code - bug  21885	
+  On Menu tab/Selection Tab - add help button - bug 21884
+  clean up directory structure in gui directory - bug 21882
+
+Version 1.75
+ change rwd.rb to use UTF-8 for web pages
+ add language load for applets
+ 
+Version 1.74
+  remove remote control from help
+  more dependable gui loading for applets
+
 Version 1.73
   more debug info in initiateapplet
   remove gutenberg lang translations 

data/code/superant.com.rwdshell/0uninstallapplet.rb

@@ -1,6 +1,6 @@
 # uninstall
 
-def rwdwruby_1_05()
+def rwdwruby_1_06()
 
 $tinkerdocumentsarray.delete_if {|x| x == "HowTo_Ruby.txt"} 
 $tinkerhelpaboutarray.delete_if {|x| x == "RwdRuby"} 

data/code/superant.com.rwdshell/helptexthashshell.rb

@@ -27,5 +27,17 @@
     :shelledit_help =>  "You can edit scripts here
  'Fill Record'   will load the file selected on the script run tab
   'Save Changes' will save the changes you have made - 
- 'Clear' will clear the screen " 
+ 'Clear' will clear the screen " ,
+  :RubyScript_help=> ' you can put in something like "Hello!" 
+  <p>
+  "Howdy Steven".upcase
+  <p>
+  carray = ["one "] ; carray << " two" ; carray.each{|x| x.upcase} 
+  <p>
+  10.between?(7,12)
+  <p>
+  ["tivo","nokia", "ipaq"].length
+  <p>
+  xhash = { "altima" => "nissan", "camry" => "toyota", "rx7" => "mazda" }  ; xhash.keys
+'
 )

data/code/superant.com.rwdshell/openhelpwindowshell.rb

@@ -15,7 +15,9 @@ def runhelpwindowrwdshell
     if @rwd_tab == "editrubyrecordfile"
        $help_topic = "shelledit_help"
        end
-       
+         if @rwd_tab == "rwdshellruby"
+       $help_topic = "RubyScript_help"
+       end
      
     
    $helptopicsarray =  $helptopicsarray | ["rwdshell_help", "ShellEnvironment_help"]

data/code/superant.com.rwdshell/rubyeval.rb

@@ -1,28 +1,23 @@
-  $buffer = ''
-    def $buffer.write(str) # create a variable to use in rubyeval 
-      self << str
-    end
+#
+    
    def rubyeval
      
      require 'English'
-#     $tmpout = $stdout # save the original STDOUT
-#     $stdout = $buffer
-    begin      # begin rescue monitored block	
-
-    commandtextruby = "%s " % [@a_rubyeval]
-
-# @rubydisplay = "hello"
- 
- @rubydisplay  = eval( commandtextruby ).to_s
 
+       commandtextruby = "%s " % [@a_rubyeval]
     
-
+  
+  begin      # begin rescue monitored block	
+        if commandtextruby.include? '�'
+	@rubydisplay = "\n" + "problem in eval"
+	else
+    @rubydisplay  = eval( commandtextruby ).to_s
+     end
         
- rescue # process exeption
-	# $stdout = $tmpout # restore STDOUT to normal
- @rubydisplay = "\n" + "error in eval"
- end # end of rescue process  # of rescure monitored block        
-	
+  rescue # process exeption
+
+@rubydisplay = "\n" + "error in eval"
 
-  end
+  end # end of rescue process  # of rescure monitored block        
+ end
   

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/configuration/rwdtinker.dist

@@ -1,4 +1,4 @@
-##VERSION:1.76
+##VERSION:1.77
 ConfigurationDir = "configuration" # for use in program - init.rb has this value without using this constant
 CodeName = "rwdtinker"
 CodeNameFile = CodeName + ".rb"
@@ -14,5 +14,5 @@ LangDir = "lang"
 $rwdjumplink = ["helpscreen","tinkerbackwindow","returntomain","opendocuments","editconfiguration"]
 Browser_Exe = 'mozilla '
 $tinkerdocumentsarray +=["HowTo_Tinker.txt","rwdapplications.html","RubyWebDialogs.html"]
-RwdTinkerVersion = "1.76"
+RwdTinkerVersion = "1.77"
 

data/configuration/{rwdwruby-1.05.dist → rwdwruby-1.06.dist}

@@ -1,4 +1,4 @@
-##VERSION:1.04
+##VERSION:1.06
 ##NAME:$shellscript_directory:0
 $shellscript_directory = "scripts"
 AcpiCommand = "acpi"
@@ -21,4 +21,4 @@ JumpLink.update(:RwdRubyBackWindow=>"runrwdrubybackwindow", :RunRuby=>"runrwdrub
 ##NAME:$rwdjumplink:0
 $rwdjumplink +=["RwdRubyBackWindow", "RunRuby", "RefreshAcpi"]
 ##NAME:RwdRubyVersion:0
-RwdRubyVersion = "1.05"
+RwdRubyVersion = "1.06"

data/gui/00coreguibegin/applicationguitop.rwd

@@ -1,4 +1,4 @@
 $rwdguivar=
 "<application>
-  <window name=\"main\" title=\"RwdRuby - Operating System tools for rwdtinker\">
+  <window name=\"main\" title=\"RwdRuby - Script Evals for RwdTinker\">
 <tabs>"

data/gui/tinkerbackwindows/superant.com.ashellscripts/1rwdrubyeval.rwd

@@ -2,11 +2,12 @@ $rwdguivar=
 "
 	<tab name=\"rwdshellruby\" caption=\"ruby\">
     <table>
-      <row> <p align=\"right\">Ruby Command:</p>  <text name=\"a_rubyeval\"/> </row>
+      <row> <p align=\"left\">Ruby Command:</p>  <text size=70 name=\"a_rubyeval\"/> </row>
     </table>
       <horizontal>
       <button caption=\"Execute\" action=\"rubyeval\"/>
       <button caption=\"Cancel\" action=\"main\"/>
+      <button caption=\"Help\" action=\"runhelpwindowrwdshell\"/>
     </horizontal>
     <p>%rubydisplay%</p>
 

data/installed/{rwdwruby-1.05.inf → rwdwruby-1.06.inf}

@@ -7,7 +7,6 @@ code/superant.com.rwdshell
 tests/gemspec-rwdwruby
 tests/makedist-rwdwruby.rb
 rwd_files/HowTo_Ruby.txt
-configuration/rwdwruby-1.05.dist
-configuration/rwdwruby-1.05.cnf
-
+configuration/rwdwruby-1.06.dist
+configuration/rwdwruby-1.06.cnf
 

data/lib/rwd/rwd.rb

@@ -6,6 +6,8 @@ require "lib/rwd/thread"
 require "md5"
 require "rbconfig"
 
+
+
 begin
   require "win32ole"
   require "win32/registry"
@@ -50,6 +52,21 @@ unless rcfile.nil?
   end
 end
 
+if ENV["RWDTHEME"]
+	if ENV["RWDTHEME"] = "PDA"
+		load 'lib/rwdthemes/default.rwd'
+	end
+	if ENV["RWDTHEME"] = "DEFAULT"
+           $stderr.puts  "loading theme DEFAULT"
+          load 'lib/rwdthemes/default.rwd'
+       end
+        if ENV["RWDTHEME"] = "WINDOWSLOOKALIKE"
+         load 'lib/rwdthemes/windowslike.rwd'
+ end
+ else
+	 load 'lib/rwdthemes/default.rwd'
+ end
+ 
 ENV["RWDBROWSER"]	= (ENV["RWDBROWSER"] or defaultbrowser) or puts "No browser found."
 ENV["RWDPORTS"]		= (ENV["RWDPORTS"] or "7701-7709")
 ENV["RWDTHEME"]		= (ENV["RWDTHEME"] or "DEFAULT")
@@ -1364,562 +1381,7 @@ class RWDServer
   end
 end
 
-$rwd_html["DEFAULT"]	= "
-<!-- Generated by RubyWebDialog.                                               -->
-<!-- For more information, please contact Erik Veenstra <rwd@erikveen.dds.nl>. -->
-<html>
-  <head>
-    <title>%TITLE%</title>
-
-    <meta http-equiv='Content-Type' content='text/html; charset=%CHARSET%'>
-    <meta http-equiv='Content-Style-Type' content='text/html ; charset=UTF-8'>
-    <meta http-equiv='Refresh' content='%REFRESH%, javascript:document.bodyform.submit();'>
-
-    <link rel='shortcut icon' href='%LOGO%'>
-
-    <style type='text/css'>
-    <!--
-
-	body {
-		background		: url(%WATERMARK%) white center center no-repeat fixed;
-	}
-
-	a {
-		text-decoration		: none;
-	}
-
-	a:hover {
-		background		: #AAAAAA;
-	}
-
-	td.panel1 {
-		border-color		: #888888 #EEEEEE #EEEEEE #888888;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.panel2 {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.panel1high {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.panel2high {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: none none none none;
-	}
-
-	td.panel1low {
-		border-color		: #888888 #EEEEEE #EEEEEE #888888;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.panel2low {
-		border-color		: #888888 #EEEEEE #EEEEEE #888888;
-		border-width		: 1pt;
-		border-style		: none none none none;
-	}
-
-	td.tabblad {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: none solid solid solid;
-	}
-
-	td.passivetab {
-                background-color	: #BBBBBB;
-		border-color		: #DDDDDD #DDDDDD #EEEEEE #DDDDDD;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.activetab {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: solid solid none solid;
-	}
-
-	td.notab {
-		border-color		: #EEEEEE #EEEEEE #EEEEEE #EEEEEE;
-		border-width		: 1pt;
-		border-style		: none none solid none;
-	}
-
-    //-->
-    </style>
-
-    <script type='text/javascript'>
-    <!--
-      function BodyGo() {
-        $RWD_FOCUS$
-      }
-    //-->
-    </script>
-  </head>
-
-  <body bgcolor='white' onload='BodyGo()' link='#000000' vlink='#000000' alink='#000000'>
-    <form name='bodyform' action='/' method='post'>
-      <table align='center' border='0' cellspacing='0' cellpadding='0' width='100%' height='100%'>
-        <tr align='center' valign='middle'>
-          <td align='center'>
-
-            <table align='center' border='0' cellspacing='0' cellpadding='0'>
-
-              <tr align='center'>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-
-                <td align='center'>
-
-                  <table align='center' border='0' cellspacing='0' cellpadding='0' %WIDTH1%>
-                    <tr align='center'>
-                      <td align='center' bgcolor='#444488'>
-
-                        <table align='left' border='0' cellspacing='1' cellpadding='0'>
-                          <tr align='center'>
-                            <td align='border'><img src='%LOGO%' width='14' height='14'></td>
-                            <td align='center'><b><small><font color='#FFFFFF'>&nbsp;%TITLE%&nbsp;</font></small></b></td>
-                          </tr>
-                        </table>
-
-                        <table align='right' border='0' cellspacing='1' cellpadding='0'>
-                          <tr align='center'>
-                            <!-- %HELPBUTTON%  --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_help\";document.bodyform.submit();'>&nbsp;?&nbsp;</a></small></b></td>
-                            <!-- %BACKBUTTONS% --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_main\";document.bodyform.submit();'>&nbsp;&lt;&lt;&nbsp;</a></small></b></td>
-                            <!-- %BACKBUTTONS% --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_back\";document.bodyform.submit();'>&nbsp;&lt;&nbsp;</a></small></b></td>
-                            <!-- %CLOSEBUTTON% --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_quit\";document.bodyform.submit();'>&nbsp;X&nbsp;</a></small></b></td>
-                          </tr>
-                        </table>
-
-                      </td>
-                    </tr>
-
-                    <tr align='center'>
-                      <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='%WIDTH2%'></td>
-                    </tr>
-
-                    <tr align='center'>
-                      <td align='center' bgcolor='#CCCCCC'>
-                        <table align='center' border='0' cellspacing='3' cellpadding='0'>
-                          %BODY%
-                        </table>
-
-                        <input name='rwd_action' value='$RWD_FIRSTACTION$' type='hidden'>
-                        <input name='rwd_session' value='$RWD_SESSION$' type='hidden'>
-                      </td>
-                    </tr>
-                  </table>
-
-                </td>
-
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-            </table>
-
-          </td>
-        </tr>
-      </table>
-    </form>
-  </body>
-</html>
-"
-
-$rwd_html["WINDOWSLOOKALIKE"]	= "
-<!-- Generated by RubyWebDialog.                                               -->
-<!-- For more information, please contact Erik Veenstra <rwd@erikveen.dds.nl>. -->
-<html>
-  <head>
-    <title>%TITLE%</title>
-
-    <meta http-equiv='Content-Type' content='text/html; charset=%CHARSET%'>
-    <meta http-equiv='Content-Style-Type' content='text/css; charset=UTF-8' >
-    <meta http-equiv='Refresh' content='%REFRESH%, javascript:document.bodyform.submit();'>
-
-    <link rel='shortcut icon' href='%LOGO%'>
-
-    <style type='text/css'>
-    <!--
-
-	body {
-		background		: url(%WATERMARK%) white center center no-repeat fixed;
-	}
-
-	a {
-		text-decoration		: none;
-	}
-
-	a:hover {
-		background		: #AAAAAA;
-	}
-
-	td.window {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 3pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.panel1 {
-		border-color		: #888888 #EEEEEE #EEEEEE #888888;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.panel2 {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.panel1high {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.panel2high {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: none none none none;
-	}
-
-	td.panel1low {
-		border-color		: #888888 #EEEEEE #EEEEEE #888888;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.panel2low {
-		border-color		: #888888 #EEEEEE #EEEEEE #888888;
-		border-width		: 1pt;
-		border-style		: none none none none;
-	}
-
-	td.tabblad {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: none solid solid solid;
-	}
-
-	td.passivetab {
-                background-color	: #BBBBBB;
-		border-color		: #DDDDDD #DDDDDD #EEEEEE #DDDDDD;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.activetab {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: solid solid none solid;
-	}
-
-	td.notab {
-		border-color		: #EEEEEE #EEEEEE #EEEEEE #EEEEEE;
-		border-width		: 1pt;
-		border-style		: none none solid none;
-	}
-
-    //-->
-    </style>
-
-    <script type='text/javascript'>
-    <!--
-      function BodyGo() {
-        $RWD_FOCUS$
-      }
-    //-->
-    </script>
-  </head>
-
-  <body bgcolor='white' onload='BodyGo()' link='#000000' vlink='#000000' alink='#000000'>
-    <form name='bodyform' action='/' method='post'>
-      <table align='center' border='0' cellspacing='0' cellpadding='0' width='100%' height='100%'>
-        <tr align='center' valign='middle'>
-          <td align='center'>
-
-            <table align='center' border='0' cellspacing='0' cellpadding='0'>
-
-              <tr align='center'>
-                <td align='center' class='window'>
-
-                  <table align='center' border='0' cellspacing='0' cellpadding='0' %WIDTH1%>
-                    <tr align='center'>
-                      <td align='center' bgcolor='#444488'>
-
-                        <table align='left' border='0' cellspacing='1' cellpadding='0'>
-                          <tr align='center'>
-                            <td align='border'><img src='%LOGO%' width='14' height='14'></td>
-                            <td align='center'><b><small><font color='#FFFFFF'>&nbsp;%TITLE%&nbsp;</font></small></b></td>
-                          </tr>
-                        </table>
-
-                        <table align='right' border='0' cellspacing='1' cellpadding='0'>
-                          <tr align='center'>
-                            <!-- %HELPBUTTON%  --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_help\";document.bodyform.submit();'>&nbsp;?&nbsp;</a></small></b></td>
-                            <!-- %BACKBUTTONS% --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_main\";document.bodyform.submit();'>&nbsp;&lt;&lt;&nbsp;</a></small></b></td>
-                            <!-- %BACKBUTTONS% --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_back\";document.bodyform.submit();'>&nbsp;&lt;&nbsp;</a></small></b></td>
-                            <!-- %CLOSEBUTTON% --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_quit\";document.bodyform.submit();'>&nbsp;X&nbsp;</a></small></b></td>
-                          </tr>
-                        </table>
-
-                      </td>
-                    </tr>
-
-                    <tr align='center'>
-                      <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='%WIDTH2%'></td>
-                    </tr>
-
-                    <tr align='center'>
-                      <td align='center' bgcolor='#CCCCCC'>
-                        <table align='center' border='0' cellspacing='3' cellpadding='0'>
-                          %BODY%
-                        </table>
-
-                        <input name='rwd_action' value='$RWD_FIRSTACTION$' type='hidden'>
-                        <input name='rwd_session' value='$RWD_SESSION$' type='hidden'>
-                      </td>
-                    </tr>
-                  </table>
-
-                </td>
-              </tr>
-
-            </table>
-
-          </td>
-        </tr>
-      </table>
-    </form>
-  </body>
-</html>
-"
-
-$rwd_html["PDA"]	= "
-<!-- Generated by RubyWebDialog.                                               -->
-<!-- For more information, please contact Erik Veenstra <rwd@erikveen.dds.nl>. -->
-<html>
-  <head>
-    <title>%TITLE%</title>
-
-    <meta http-equiv='Content-Type' content='text/html; charset=%CHARSET%'>
-    <meta http-equiv='Refresh' content='%REFRESH%, javascript:document.bodyform.submit();'>
-
-    <link rel='shortcut icon' href='%LOGO%'>
-
-    <script type='text/javascript'>
-    <!--
-      function BodyGo() {
-        $RWD_FOCUS$
-      }
-    //-->
-    </script>
-  </head>
-
-  <body bgcolor='white' onload='BodyGo()' link='#000000' vlink='#000000' alink='#000000'>
-    <form name='bodyform' action='/' method='post'>
-      <table align='center' border='0' cellspacing='0' cellpadding='0' width='100%' height='100%'>
-
-        <tr align='center'>
-          <td align='center' bgcolor='#444488'>
-
-            <table align='left' border='0' cellspacing='1' cellpadding='0'>
-              <tr align='center'>
-                <td align='border'><img src='%LOGO%' width='14' height='14'></td>
-                <td align='center'><b><small><font color='#FFFFFF'>&nbsp;%TITLE%&nbsp;</font></small></b></td>
-              </tr>
-            </table>
-
-            <table align='right' border='0' cellspacing='1' cellpadding='0'>
-              <tr align='center'>
-                <!-- %HELPBUTTON%  --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_help\";document.bodyform.submit();'>&nbsp;?&nbsp;</a></small></b></td>
-                <!-- %BACKBUTTONS% --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_main\";document.bodyform.submit();'>&nbsp;&lt;&lt;&nbsp;</a></small></b></td>
-                <!-- %BACKBUTTONS% --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_back\";document.bodyform.submit();'>&nbsp;&lt;&nbsp;</a></small></b></td>
-                <!-- %CLOSEBUTTON% --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_quit\";document.bodyform.submit();'>&nbsp;X&nbsp;</a></small></b></td>
-              </tr>
-            </table>
-
-          </td>
-        </tr>
-
-        <!--
-        <tr align='center'>
-          <td align='center' bgcolor='#FFFFFF'>&nbsp;</td>
-        </tr>
-        -->
-
-        <tr align='center'>
-          <td align='center' bgcolor='#FFFFFF'>
-
-              <table align='center' border='0' cellspacing='0' cellpadding='0'>
-                %BODY%
-              </table>
-
-              <input name='rwd_action' value='$RWD_FIRSTACTION$' type='hidden'>
-              <input name='rwd_session' value='$RWD_SESSION$' type='hidden'>
-          </td>
-        </tr>
-
-      </table>
-    </form>
-  </body>
-</html>
-"
+
 
 $rwd_pixel	= "
 R0lGODlhAQABAMIAAAAAAP///+7u7kREiP///////////////yH5BAEKAAMA
@@ -1934,8 +1396,9 @@ jefB+oo6l6AxBAx7M2HRePQph5xga0RsJqfELPI2DSUAADs=
 
 
 $rwd_html_1, $rwd_html_2		= $rwd_html[ENV["RWDTHEME"]].split(/^\s*%BODY%\s*\r*$/)
-$rwd_html_PDA_1, $rwd_html_PDA_2	= $rwd_html["PDA"].split(/^\s*%BODY%\s*\r*$/)
-
+#if ENV["RWDTHEME"] == "PDA"
+#$rwd_html_PDA_1, $rwd_html_PDA_2	= $rwd_html["PDA"].split(/^\s*%BODY%\s*\r*$/)
+#end
 #end
 #
 #class RWDialog < RWD::RWDialog