rwdfoldeditor 0.03 → 0.05

Sign up to get free protection for your applications and to get access to all the features.
Files changed (60) hide show
  1. data/Readme.txt +20 -7
  2. data/code/01rwdcore/01rwdcore.rb +2 -2
  3. data/code/superant.com.foldeditor/0uninstallapplet.rb +1 -1
  4. data/code/superant.com.foldeditor/launchfoldeditorurl.rb +9 -2
  5. data/code/superant.com.foldeditor/loadconfigurationrecord.rb +1 -1
  6. data/code/superant.com.foldeditor/loadconfigurationvariables.rb +1 -1
  7. data/code/superant.com.foldeditor/loadfolddocument.rb +2 -5
  8. data/code/superant.com.foldeditor/loadnextnote.rb +32 -0
  9. data/code/superant.com.foldeditor/loadprevnote.rb +32 -0
  10. data/code/superant.com.foldeditor/rwddisplayfoldlinks.rb +11 -3
  11. data/code/superant.com.foldeditor/saveconfigurationrecord.rb +1 -1
  12. data/code/superant.com.rwdtinkerbackwindow/initiateapplets.rb +35 -34
  13. data/code/superant.com.rwdtinkerbackwindow/installgemapplet.rb +9 -7
  14. data/code/superant.com.rwdtinkerbackwindow/listzips.rb +8 -2
  15. data/code/superant.com.rwdtinkerbackwindow/removeappletvariables.rb +6 -6
  16. data/code/superant.com.rwdtinkerbackwindow/viewlogfile.rb +13 -0
  17. data/configuration/rwdtinker.dist +4 -8
  18. data/configuration/rwdwfoldeditor.dist +14 -0
  19. data/configuration/tinkerwin2variables.dist +17 -7
  20. data/gui/00coreguibegin/applicationguitop.rwd +1 -1
  21. data/gui/tinkerbackwindows/superant.com.foldeditor/10aviewnote.rwd +2 -1
  22. data/gui/tinkerbackwindows/superant.com.foldeditor/15htmlview.rwd +5 -8
  23. data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/75rwdlogfile.rwd +20 -0
  24. data/init.rb +5 -0
  25. data/installed/{rwdwfoldeditor-0.03.inf → rwdwfoldeditor.inf} +2 -1
  26. data/lang/en/rwdcore/languagefile.rb +1 -0
  27. data/lang/es/rwdcore/languagefile-es.rb +1 -0
  28. data/lang/fr/rwdcore/languagefile.rb +1 -0
  29. data/lang/jp/rwdcore/languagefile.rb +1 -0
  30. data/lang/nl/rwdcore/languagefile.rb +1 -0
  31. data/lib/rconftool.rb +13 -6
  32. data/lib/rwd/net.rb +15 -4
  33. data/lib/rwd/ruby.rb +1 -1
  34. data/lib/rwd/rwd.rb +103 -620
  35. data/lib/rwdthemes/default.rwd +317 -0
  36. data/lib/rwdthemes/pda.rwd +72 -0
  37. data/lib/rwdthemes/windowslike.rwd +171 -0
  38. data/lib/rwdtinker/rwdtinkertools.rb +24 -0
  39. data/rwd_files/HowTo_FoldEditor.txt +9 -0
  40. data/rwd_files/HowTo_Tinker.txt +17 -1
  41. data/rwd_files/log/rwdtinker.log +2 -0
  42. data/rwdconfig.dist +14 -13
  43. data/tests/makedist-rwdwfoldeditor.rb +8 -4
  44. data/tests/makedist.rb +2 -2
  45. data/zips/rwdwcalc-0.63.zip +0 -0
  46. data/zips/rwdwfoldeditor-0.05.zip +0 -0
  47. data/zips/{rwdwgutenberg-0.09.zip → rwdwgutenberg-0.11.zip} +0 -0
  48. data/zips/rwdwhypernote-0.15.zip +0 -0
  49. data/zips/rwdwruby-1.08.zip +0 -0
  50. data/zips/wrubyslippers-1.07.zip +0 -0
  51. metadata +19 -13
  52. data/configuration/language.dist +0 -8
  53. data/configuration/rwdapplicationidentity.dist +0 -3
  54. data/configuration/rwdwfoldeditor-0.03.dist +0 -14
  55. data/zips/rwdwaddresses-1.05.zip +0 -0
  56. data/zips/rwdwcalc-0.61.zip +0 -0
  57. data/zips/rwdwfoldeditor-0.03.zip +0 -0
  58. data/zips/rwdwruby-1.05.zip +0 -0
  59. data/zips/temp.rb +0 -1
  60. data/zips/wrubyslippers-1.06.zip +0 -0
@@ -1,17 +1,27 @@
1
- ##VERSION:1.69
1
+ ##VERSION: (1.80)
2
2
  TinkerWin2ConfigurationFileName = "tinkerwin2variables.cnf" # this file name - do not change
3
- ##NAME:$zipslocation:0
3
+ ##NAME: ($zipslocation):(1.78)
4
4
  $zipslocation = "zips" # location of applets to add
5
- $zipsarray = [""] ; $zipsarraylocal = [""]
6
- ##NAME:$xpcommand:0
5
+ $zipsarray = [""]
6
+ $zipsarraylocal = [""]
7
+ ##NAME: ($xpcommand):(1.78)
7
8
  $xpcommand = " " # Linux machines
8
9
  # $xpcommand = "cmd /C " # XP machines with cmd shell
9
- ##NAME:$gemdirectory_withgemfiles:0
10
+ ##NAME: ($gemdirectory_withgemfiles):(1.78)
10
11
  $gemdirectory_withgemfiles = "/var/lib/gems/1.8/gems"
11
12
  # $gemdirectory_withgemfiles = "c:\\ruby\\lib\\ruby\\gems\\1.8\\gems" # XP machine
12
- ##NAME:$geminstalled_directory:0
13
+ ##NAME: ($geminstalled_directory):(1.78)
13
14
  # $geminstalled_directory = "/ruby/lib/ruby/gems/1.8/gems" # XP machine
14
15
  $geminstalled_directory = "/var/lib/gems/1.8/gems" # Debian Linux
15
16
 
16
- RwdTinkerWin2Version = "0.8"
17
+ $rwdapplicationidentity = "RwdFoldeditor main application"
17
18
 
19
+ RwdTinkerWin2Version = "1.80"
20
+ Browser_Exe = 'mozilla '
21
+ #language selection file
22
+ ##NAME: ($lang):(1.78)
23
+ #$lang = "jp"
24
+ $lang= "en"
25
+ #$lang= "nl"
26
+ #$lang= "es"
27
+ #$lang= "fr"
@@ -1,4 +1,4 @@
1
1
  $rwdguivar=
2
2
  "<application>
3
- <window name=\"main\" title=\"RwdFoldEditor - Book Writing tool for rwdtinker\">
3
+ <window name=\"main\" title=\"RwdFoldEditor on Rwdtinker for Ruby\">
4
4
  <tabs>"
@@ -10,7 +10,8 @@ $rwdguivar=
10
10
  </table>
11
11
  <horizontal>
12
12
  <button caption=\"Open Detail\" action=\"loadfolddocument\"/>
13
-
13
+ <button caption='Prev' action=\"loadprevfoldnote\"/>
14
+ <button caption='Next' action=\"loadnextfoldnote\"/>
14
15
  <button caption=\"Create New Note\" action=\"rwdfoldeditcreatenewnote\"/>
15
16
 
16
17
  <button caption=\"Save Changes\" action=\"savefoldeditrecord\"/>
@@ -4,11 +4,9 @@ $rwdguivar=
4
4
 
5
5
  <table>
6
6
 
7
-
8
- <text size=70 name=\"a_viewfoldlink\"/>
7
+ <text size=70 name=\"a_viewfoldlink\"/>
9
8
 
10
-
11
- </table>
9
+ </table>
12
10
 
13
11
  <horizontal>
14
12
 
@@ -26,12 +24,11 @@ $rwdguivar=
26
24
  </table>
27
25
 
28
26
  </horizontal>
29
-
30
27
 
28
+
31
29
  <horizontal>
32
30
 
33
-
34
-
35
- <button caption=\"Launch Links URL\" action=\"foldeditorlaunchurl\"/>
31
+ <button caption=\"Launch Local URL\" action=\"foldeditorlaunchurl\"/>
32
+ <button caption=\"Launch remote URL\" action=\"foldeditorlaunchhttp\"/>
36
33
  <button caption=\"Choose note file\" action=\"choosefoldnotefile\"/>
37
34
  <button caption=\"Clear file list\" action=\"clearfoldlinklist3\"/>
38
35
 
@@ -0,0 +1,20 @@
1
+ $rwdguivar=
2
+ "
3
+ <tab name=\"rwdlogfiletab\" caption=\"RWD Log Files\">
4
+ <table>
5
+ <horizontal>
6
+
7
+
8
+ <p align=\"left\">Number of lines to display</p> <text size=11 name=\"a_rwdtinkerlognumber\"/>
9
+
10
+ <button caption=#{Message[:viewlogger_information]} action=\"rwdtinkerrunviewlog\"/>
11
+ </horizontal>
12
+
13
+ </table>
14
+
15
+ <p>%returnlogdisplay%</p>
16
+
17
+ </tab>"
18
+
19
+
20
+
data/init.rb CHANGED
@@ -21,6 +21,11 @@
21
21
  #* at "smalllinux@gmail.com".
22
22
  #***********************************************************************/
23
23
 
24
+ require 'logger'
25
+
26
+ $rwdtinkerlog = Logger.new( 'rwd_files/log/rwdtinker.log', 'weekly' )
27
+ $rwdtinkerlog.level = Logger::INFO
28
+
24
29
  require "lib/rwd/rwd"
25
30
  require 'fileutils'
26
31
  require 'lib/rconftool'
@@ -8,7 +8,8 @@ tests/gemspec-rwdwfoldeditor
8
8
  rwd_files/HowTo_FoldEditor.txt
9
9
  lib/oothesaurus.rb
10
10
  lib/dict.rb
11
- configuration/rwdwfoldeditor-0.03.dist
11
+ configuration/rwdwfoldeditor.dist
12
+ configuration/rwdwfoldeditor.cnf
12
13
  rwd_files/default.fld
13
14
  rwd_files/rwdhypernote-0.13.fld
14
15
 
@@ -51,6 +51,7 @@
51
51
  :viewinstalled_text => '"View Install Text"',
52
52
  :view_platform => '"view platform"',
53
53
  :viewplatform_information => '"View Platform Information"',
54
+ :viewlogger_information => '"View Logger Information"',
54
55
  :view_event => '"View event"',
55
56
  :viewinstall_text => '"View Install Text"' ,
56
57
  :viewlistinstall_files => '"View List of Installed Files"',
@@ -55,6 +55,7 @@
55
55
  :viewinstalled_text => '"View Install Text"',
56
56
  :view_platform => '"view platform"',
57
57
  :viewplatform_information => '"View Platform Information"',
58
+ :viewlogger_information => '"View Logger Information"',
58
59
  :view_event => '"Ver evento"',
59
60
  :viewinstall_text => '"Ver Texto"' ,
60
61
  :viewlistinstall_files => '"View List of Installed Files"',
@@ -56,6 +56,7 @@
56
56
  :viewinstalled_text => '"View Install Text"',
57
57
  :view_platform => '"view platform"',
58
58
  :viewplatform_information => '"View Platform Information"',
59
+ :viewlogger_information => '"View Logger Information"',
59
60
  :view_event => '"View event"',
60
61
  :view_gem => '"View Gem"',
61
62
  :viewinstall_text => '"View Install Text"' ,
@@ -66,6 +66,7 @@
66
66
  :viewinstalled_text => '"View Install Text"',
67
67
  :view_platform => '"view platform"',
68
68
  :viewplatform_information => '"View Platform Information"',
69
+ :viewlogger_information => '"View Logger Information"',
69
70
  :viewinstall_text => '"View Install Text"' ,
70
71
  :viewlistinstall_files => '"View List of Installed Files"',
71
72
  :view_photo => '"View Photo"',
@@ -68,6 +68,7 @@
68
68
  :viewinstalled_text => '"View Install Text"',
69
69
  :view_platform => '"view platform"',
70
70
  :viewplatform_information => '"View Platform Information"',
71
+ :viewlogger_information => '"View Logger Information"',
71
72
  :view_event => '"View event"',
72
73
  :viewinstall_text => '"View Install Text"' ,
73
74
  :viewlistinstall_files => '"View List of Installed Files"',
data/lib/rconftool.rb CHANGED
@@ -121,13 +121,17 @@ module Rconftool
121
121
  next
122
122
  end
123
123
  if old_setting.version == src_setting.version
124
+ if $DEBUG
125
+ $stderr.puts "old setting: #{old_setting.version}"
126
+ $stderr.puts "src setting: #{src_setting.version}"
127
+ end
124
128
  debug << " #{name}: unchanged\n"
125
- src_setting.add_comment("\n DEFAULT SETTING from #{distfile}:\n")
129
+ src_setting.add_comment("\n DEFAULT SETTING from #{distfile}:\n")
126
130
  src_setting.add_comment(src_setting.content)
127
131
  src_setting.content = old_setting.content
128
132
  next
129
133
  end
130
- # Otherwise, must install updated setting and comment out
134
+ # Otherwise, must install updated setting and comment out
131
135
  # the current setting for reference
132
136
  debug << " #{name}: UPDATED\n"
133
137
  src_setting.add_comment("\n Previous setting (inserted by rconftool):\n\n")
@@ -215,9 +219,10 @@ module Rconftool
215
219
  20.times do
216
220
  line = f.gets
217
221
  break unless line
218
- curr_setting << line
222
+ linetmp = line.chop + "\r\n"
223
+ curr_setting << linetmp
219
224
  if line =~ /\A##VERSION:/
220
- @version = line
225
+ @version = line.chop
221
226
  break
222
227
  end
223
228
  end
@@ -225,7 +230,8 @@ module Rconftool
225
230
 
226
231
  while line = f.gets
227
232
  unless line =~ /\A##NAME:(.*):(.*)/
228
- curr_setting << line
233
+ linetmp = line.chop + "\r\n"
234
+ curr_setting << linetmp
229
235
  next
230
236
  end
231
237
  curr_setting = Setting.new($1,$2)
@@ -238,7 +244,8 @@ module Rconftool
238
244
  def write(filename)
239
245
  File.open(filename,"w") do |f|
240
246
  @settings.each do |s|
241
- f << s.to_s
247
+ stmp = s.to_s.chop + "\r\n"
248
+ f << stmp
242
249
  end
243
250
  end
244
251
  end
data/lib/rwd/net.rb CHANGED
@@ -562,6 +562,12 @@ class RequestRequest
562
562
  end
563
563
  end
564
564
 
565
+ def url_unescape(string)
566
+ string.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n) do
567
+ [$1.delete('%')].pack('H*')
568
+ end
569
+ end
570
+
565
571
  class Request < Hash
566
572
  attr_reader :peeraddr
567
573
  attr_reader :request
@@ -604,10 +610,14 @@ class Request < Hash
604
610
  @vars = RequestGet.new(@request.data.nil? ? "" : @request.data)
605
611
  when "POST"
606
612
  data = (@io.read(self["content-length"].to_i) or "")
613
+ # data = url_unescape(data)
607
614
  @vars = RequestPost.new((self["content-type"] == "application/x-www-form-urlencoded") ? data : "")
608
615
  else
609
616
  $stderr.puts "Unknown request ('#{firstline}')."
610
- end
617
+ end
618
+
619
+ $rwdtinkerlog.debug data
620
+
611
621
  end
612
622
 
613
623
  @peeraddr = @io.peeraddr
@@ -729,14 +739,15 @@ class HTTPServerException < Exception
729
739
  end
730
740
 
731
741
  class HTTPServer
732
- def self.serve(portio=80, remote=false, auth=nil, realm="ev/net")
742
+ def self.serve(portio=80, remote=false, auth=nil, realm="rwd/net")
733
743
  port, server = portio
734
744
 
735
745
  begin
736
746
  server = TCPServer.new(remote ? "0.0.0.0" : "localhost", port) if server.nil?
737
-
747
+ if $DEBUG
738
748
  $stderr.puts "Just point your browser to http://localhost:#{port}/ ..."
739
- rescue
749
+ end
750
+ rescue
740
751
  server = nil
741
752
 
742
753
  $stderr.puts "Port #{port} is in use."
data/lib/rwd/ruby.rb CHANGED
@@ -275,7 +275,7 @@ class String
275
275
  s.gsub!(/&#34;/ , "\"")
276
276
  s.gsub!(/&#180;/, "\'")
277
277
 
278
- s = CGI.unescapeHTML(self)
278
+ # s = CGI.unescapeHTML(self)
279
279
 
280
280
  if eolconversion
281
281
  s.gsub!(/<br>/, "\n")
data/lib/rwd/rwd.rb CHANGED
@@ -6,6 +6,8 @@ require "lib/rwd/thread"
6
6
  require "md5"
7
7
  require "rbconfig"
8
8
 
9
+
10
+
9
11
  begin
10
12
  require "win32ole"
11
13
  require "win32/registry"
@@ -50,6 +52,22 @@ unless rcfile.nil?
50
52
  end
51
53
  end
52
54
 
55
+ if ENV["RWDTHEME"]
56
+ if ENV["RWDTHEME"] = "PDA"
57
+ load 'lib/rwdthemes/default.rwd'
58
+ end
59
+ if ENV["RWDTHEME"] = "DEFAULT"
60
+ $rwdtinkerlog.info "rwd: loading theme DEFAULT"
61
+
62
+ load 'lib/rwdthemes/default.rwd'
63
+ end
64
+ if ENV["RWDTHEME"] = "WINDOWSLOOKALIKE"
65
+ load 'lib/rwdthemes/windowslike.rwd'
66
+ end
67
+ else
68
+ load 'lib/rwdthemes/default.rwd'
69
+ end
70
+
53
71
  ENV["RWDBROWSER"] = (ENV["RWDBROWSER"] or defaultbrowser) or puts "No browser found."
54
72
  ENV["RWDPORTS"] = (ENV["RWDPORTS"] or "7701-7709")
55
73
  ENV["RWDTHEME"] = (ENV["RWDTHEME"] or "DEFAULT")
@@ -250,7 +268,7 @@ class EVTable
250
268
  end
251
269
 
252
270
  class OpenTag
253
- def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda)
271
+ def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda=false)
254
272
  bef = before[-1]
255
273
  res << Format % ["Before", @subtype] if ($rwd_debug and not bef.nil?)
256
274
  res << bef if not bef.nil?
@@ -282,7 +300,7 @@ class OpenTag
282
300
  args["nohelpbutton"] = (not help)
283
301
 
284
302
  template = $rwd_html_1
285
- template = $rwd_html_PDA_1 if pda
303
+ # template = $rwd_html_PDA_1 if pda
286
304
 
287
305
  res << (template(template, args))
288
306
  when "p" then res << "<p #{align}>"
@@ -476,7 +494,7 @@ class OpenTag
476
494
  after.push(aft)
477
495
  end
478
496
 
479
- def postchildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda)
497
+ def postchildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda=false)
480
498
  case @subtype
481
499
  when "vertical", "window", "helpwindow", "tab", "panel"
482
500
  res << Format % ["BefPost", @subtype] if $rwd_debug
@@ -618,7 +636,7 @@ class OpenTag
618
636
  end
619
637
 
620
638
  class Text
621
- def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda)
639
+ def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda=false)
622
640
  if not @text.scan(/[^ \t\r\n]/).empty?
623
641
  res << Format % ["Text", ""] if $rwd_debug
624
642
  res << "#{@text}"
@@ -666,70 +684,70 @@ class RWDWindow
666
684
 
667
685
  vars = vars.deep_dup
668
686
 
669
- begin # error wrap
687
+ begin # error wrap
670
688
 
671
- vars.each do |key, value|
672
- if not key.empty?
673
- if value.respond_to? "to_s"
674
- @rwd.gsub!(/%%#{key}%%/, value.to_s)
675
- @rwd.gsub!(/%#{key}%/, value.to_s.to_html)
689
+ vars.each do |key, value|
690
+ if not key.empty?
691
+ if value.respond_to? "to_s"
692
+ @rwd.gsub!(/%%#{key}%%/, value.to_s)
693
+ @rwd.gsub!(/%#{key}%/, value.to_s.to_html)
676
694
 
677
- @helprwd.gsub!(/%%#{key}%%/, value.to_s)
678
- @helprwd.gsub!(/%#{key}%/, value.to_s.to_html)
695
+ @helprwd.gsub!(/%%#{key}%%/, value.to_s)
696
+ @helprwd.gsub!(/%#{key}%/, value.to_s.to_html)
679
697
 
680
- varshtml[key] = value.to_s.to_html
681
- varsstring[key] = value.to_s
682
- end
683
- end
684
- end
698
+ varshtml[key] = value.to_s.to_html
699
+ varsstring[key] = value.to_s
700
+ end
701
+ end
702
+ end
685
703
 
686
- windowobject = RWDTree.new(@rwd).children.dup.delete_if{|obj| obj.subtype != "window"}[0]
687
- helpobject = RWDTree.new(@helprwd).children.dup.delete_if{|obj| obj.subtype != "helpwindow"}[0]
704
+ windowobject = RWDTree.new(@rwd).children.dup.delete_if{|obj| obj.subtype != "window"}[0]
705
+ helpobject = RWDTree.new(@helprwd).children.dup.delete_if{|obj| obj.subtype != "helpwindow"}[0]
688
706
 
689
- tabsobj = windowobject.children.dup.delete_if{|obj| obj.subtype != "tabs"}[0]
707
+ tabsobj = windowobject.children.dup.delete_if{|obj| obj.subtype != "tabs"}[0]
690
708
 
691
- if not tabsobj.nil?
692
- tabs = tabsobj.children.dup.delete_if{|obj| (not obj.kind_of?(OpenTag)) or (obj.subtype != "tab")}
709
+ if not tabsobj.nil?
710
+ tabs = tabsobj.children.dup.delete_if{|obj| (not obj.kind_of?(OpenTag)) or (obj.subtype != "tab")}
693
711
 
694
- if tab.empty?
695
- tab = tabs[0].args["name"]
696
- end
712
+ if tab.empty?
713
+ tab = tabs[0].args["name"]
714
+ end
697
715
 
698
- tabsobj.children.delete_if{|obj| (obj.kind_of?(OpenTag)) and (obj.subtype == "tab") and obj.args["name"] != tab}
699
- end
716
+ tabsobj.children.delete_if{|obj| (obj.kind_of?(OpenTag)) and (obj.subtype == "tab") and obj.args["name"] != tab}
717
+ end
700
718
 
701
- if help
702
- helpobject.parsetree("prechildren", "postchildren", html, [""], [""], varshtml, varsstring, switches, false, oneormorefields, firstaction, tabs, tab, pda)
703
- else
704
- windowobject.parsetree("prechildren", "postchildren", html, [""], [""], varshtml, varsstring, switches, (not @helprwd.empty?), oneormorefields, firstaction, tabs, tab, pda)
705
- end
719
+ if help
720
+ helpobject.parsetree("prechildren", "postchildren", html, [""], [""], varshtml, varsstring, switches, false, oneormorefields, firstaction, tabs, tab, pda)
721
+ else
722
+ windowobject.parsetree("prechildren", "postchildren", html, [""], [""], varshtml, varsstring, switches, (not @helprwd.empty?), oneormorefields, firstaction, tabs, tab, pda)
723
+ end
706
724
 
707
- html = html.join("") # ???
725
+ html = html.join("") # ???
708
726
 
709
- html.gsub!(/%%*[[:alnum:]_\-]+%%*/, "") if not $rwd_debug
710
- html.gsub!(/%%/, "%")
711
- html.gsub!(/\n\n*/, "\n")
727
+ html.gsub!(/%%*[[:alnum:]_\-]+%%*/, "") if not $rwd_debug
728
+ html.gsub!(/%%/, "%")
729
+ html.gsub!(/\n\n*/, "\n")
712
730
 
713
- if oneormorefields.empty?
714
- focus = ""
715
- else
716
- focus = "document.bodyform.elements[0].focus();"
717
- end
731
+ if oneormorefields.empty?
732
+ focus = ""
733
+ else
734
+ focus = "document.bodyform.elements[0].focus();"
735
+ end
718
736
 
719
- firstaction = action if windowobject.args.keys.include?("refresh") unless action.nil?
737
+ firstaction = action if windowobject.args.keys.include?("refresh") unless action.nil?
720
738
 
721
- html.gsub!(/\$RWD_FIRSTACTION\$/ , firstaction)
722
- html.gsub!(/\$RWD_FOCUS\$/ , focus)
739
+ html.gsub!(/\$RWD_FIRSTACTION\$/ , firstaction)
740
+ html.gsub!(/\$RWD_FOCUS\$/ , focus)
723
741
 
724
- html
725
- end
742
+ html
743
+ end
726
744
 
727
745
  rescue
728
- if $DEBUG
729
- $stderr.puts "error in RWDWindow - render method"
746
+ $rwdtinkerlog.error "error in RWDWindow - render method"
747
+
730
748
  end
731
749
  end
732
- end
750
+
733
751
 
734
752
  class RWDMessage < RWDWindow
735
753
  def initialize(msg)
@@ -813,7 +831,9 @@ class RWDialog
813
831
 
814
832
  self
815
833
  end
834
+
816
835
 
836
+
817
837
  def render(res, path, post, download, downloadfile, pda, sessionid)
818
838
  # Avoid a timeout.
819
839
 
@@ -845,8 +865,11 @@ class RWDialog
845
865
 
846
866
  post.sort.each do |key, value|
847
867
  puts "Post: #{key} -> #{value.from_html.inspect}" if $rwd_debug
868
+ $rwdtinkerlog.info "Post: #{key} -> #{value.from_html.inspect}\n"
848
869
 
849
870
  vars[key] = value.from_html
871
+ $rwdtinkerlog.info "rwd: #{value.from_html}\n"
872
+
850
873
  end
851
874
 
852
875
  # Stack handling for rwd_action, rwd_window and rwd_tab.
@@ -914,14 +937,24 @@ class RWDialog
914
937
  # Copy vars from window to instance.
915
938
 
916
939
  vars.each do |k, v|
917
- instance_eval "@#{k} = vars['#{k}']" if ((not k.empty?) and k.scan(/^rwd_/).empty? and not @rwd_ignore_vars.include?("@#{k}"))
940
+ $rwdtinkerlog.info "rwd: Post: #{k} -> #{v}\n"
941
+
942
+ if ((not k.empty?) and k.scan(/^rwd_/).empty? and not @rwd_ignore_vars.include?("@#{k}"))
943
+
944
+ instance_eval "@#{k} = ''"
945
+ instance_variable_set("@#{k}", vars.fetch("#{k}"))
946
+ $rwdtinkerlog.info "rwd: Post: #{k} -> #{v}\n"
947
+
948
+ end
918
949
  end
919
950
 
920
951
  # Callback.
921
952
 
922
953
  if (not back) or @rwd_call_after_back.include?(@rwd_action)
923
954
  unless @rwd_action =~ /^rwd_/
924
- puts "Method: #{@rwd_action}(#{@rwd_args.join(", ")})" if $rwd_debug
955
+
956
+ $rwdtinkerlog.debug "Method: #{@rwd_action}(#{@rwd_args})"
957
+
925
958
  if methods.include?(@rwd_action)
926
959
  method(@rwd_action).call(*@rwd_args)
927
960
  else
@@ -991,9 +1024,9 @@ begin # error block
991
1024
  end
992
1025
  res << RWDWindow.new($rwd_gui_tinker, @rwd_window).render(pda, @rwd_refresh_action, vars, @rwd_switches, help, @rwd_tab)
993
1026
  rescue
994
- if $DEBUG
995
- $stderr.puts "error in render"
996
- end
1027
+
1028
+ $rwdtinkerlog.error "rwd: error in render"
1029
+
997
1030
  end
998
1031
  end
999
1032
  end
@@ -1071,7 +1104,9 @@ end
1071
1104
  Thread.new do
1072
1105
  loop do
1073
1106
  if Time.now - @rwd_time > @rwd_timeout
1074
- $stderr.puts "Exiting due to timeout (#{@rwd_timeout} seconds)."
1107
+
1108
+ $rwdtinkerlog.info "rwd: Exiting due to timeout (#{@rwd_timeout} seconds)."
1109
+
1075
1110
  exit 1
1076
1111
  end
1077
1112
  sleep interval
@@ -1151,7 +1186,7 @@ class RWDSession < Hash
1151
1186
  @lastaccess = Time.now
1152
1187
  end
1153
1188
 
1154
- def render(res, path, post, download, downloadfile, pda)
1189
+ def render(res, path, post, download, downloadfile, pda=false)
1155
1190
  done = self["object"].render(res, path, post, download, downloadfile, pda, @sessionid)
1156
1191
 
1157
1192
  res.gsub!(/\$RWD_SESSION\$/, done ? "" : "#{@sessionid}")
@@ -1178,7 +1213,8 @@ class RWDServer
1178
1213
 
1179
1214
  @browserthread =
1180
1215
  Thread.new do
1181
- puts "Starting the browser..."
1216
+ $rwdtinkerlog.warn "rwd: Starting the browser..."
1217
+
1182
1218
 
1183
1219
  #if ENV["RWDBROWSER"].downcase =~ /iexplore/ # ???
1184
1220
  #@ie = IE.new("http://localhost:#{port}/")
@@ -1192,7 +1228,7 @@ class RWDServer
1192
1228
 
1193
1229
  command.gsub!(/%port%/, port.to_s)
1194
1230
 
1195
- system(command) or $stderr.puts "Starting of the browser failed, or the browser terminated abnormally.\nCommand => #{command}"
1231
+ system(command) or $rwdtinkerlog.error "Starting of the browser failed, or the browser terminated abnormally.\nCommand => #{command}"
1196
1232
  #end
1197
1233
 
1198
1234
  puts "The browser has terminated."
@@ -1303,8 +1339,8 @@ class RWDServer
1303
1339
  resp << download
1304
1340
  end
1305
1341
  rescue
1306
- puts "Sending response to browser failed."
1307
-
1342
+
1343
+ $rwdtinkerlog.error "rwd: Sending response to browser failed."
1308
1344
  @sessions.delete(session.sessionid)
1309
1345
  end
1310
1346
 
@@ -1318,8 +1354,9 @@ class RWDServer
1318
1354
 
1319
1355
  if @browserstarted and not @browserthread.nil? and @browserthread.alive?
1320
1356
  resp.stop do
1321
- puts "Waiting for the browser to terminate..."
1322
-
1357
+
1358
+ $rwdtinkerlog.warn "rwd: Waiting for the browser to terminate..."
1359
+
1323
1360
  @browserthread.join
1324
1361
  end
1325
1362
  end
@@ -1364,562 +1401,7 @@ class RWDServer
1364
1401
  end
1365
1402
  end
1366
1403
 
1367
- $rwd_html["DEFAULT"] = "
1368
- <!-- Generated by RubyWebDialog. -->
1369
- <!-- For more information, please contact Erik Veenstra <rwd@erikveen.dds.nl>. -->
1370
- <html>
1371
- <head>
1372
- <title>%TITLE%</title>
1373
-
1374
- <meta http-equiv='Content-Type' content='text/html; charset=%CHARSET%'>
1375
- <meta http-equiv='Content-Style-Type' content='text/html ; charset=UTF-8'>
1376
- <meta http-equiv='Refresh' content='%REFRESH%, javascript:document.bodyform.submit();'>
1377
-
1378
- <link rel='shortcut icon' href='%LOGO%'>
1379
-
1380
- <style type='text/css'>
1381
- <!--
1382
-
1383
- body {
1384
- background : url(%WATERMARK%) white center center no-repeat fixed;
1385
- }
1386
-
1387
- a {
1388
- text-decoration : none;
1389
- }
1390
-
1391
- a:hover {
1392
- background : #AAAAAA;
1393
- }
1394
-
1395
- td.panel1 {
1396
- border-color : #888888 #EEEEEE #EEEEEE #888888;
1397
- border-width : 1pt;
1398
- border-style : solid solid solid solid;
1399
- }
1400
-
1401
- td.panel2 {
1402
- border-color : #EEEEEE #888888 #888888 #EEEEEE;
1403
- border-width : 1pt;
1404
- border-style : solid solid solid solid;
1405
- }
1406
-
1407
- td.panel1high {
1408
- border-color : #EEEEEE #888888 #888888 #EEEEEE;
1409
- border-width : 1pt;
1410
- border-style : solid solid solid solid;
1411
- }
1412
-
1413
- td.panel2high {
1414
- border-color : #EEEEEE #888888 #888888 #EEEEEE;
1415
- border-width : 1pt;
1416
- border-style : none none none none;
1417
- }
1418
-
1419
- td.panel1low {
1420
- border-color : #888888 #EEEEEE #EEEEEE #888888;
1421
- border-width : 1pt;
1422
- border-style : solid solid solid solid;
1423
- }
1424
-
1425
- td.panel2low {
1426
- border-color : #888888 #EEEEEE #EEEEEE #888888;
1427
- border-width : 1pt;
1428
- border-style : none none none none;
1429
- }
1430
-
1431
- td.tabblad {
1432
- border-color : #EEEEEE #888888 #888888 #EEEEEE;
1433
- border-width : 1pt;
1434
- border-style : none solid solid solid;
1435
- }
1436
-
1437
- td.passivetab {
1438
- background-color : #BBBBBB;
1439
- border-color : #DDDDDD #DDDDDD #EEEEEE #DDDDDD;
1440
- border-width : 1pt;
1441
- border-style : solid solid solid solid;
1442
- }
1443
-
1444
- td.activetab {
1445
- border-color : #EEEEEE #888888 #888888 #EEEEEE;
1446
- border-width : 1pt;
1447
- border-style : solid solid none solid;
1448
- }
1449
-
1450
- td.notab {
1451
- border-color : #EEEEEE #EEEEEE #EEEEEE #EEEEEE;
1452
- border-width : 1pt;
1453
- border-style : none none solid none;
1454
- }
1455
-
1456
- //-->
1457
- </style>
1458
-
1459
- <script type='text/javascript'>
1460
- <!--
1461
- function BodyGo() {
1462
- $RWD_FOCUS$
1463
- }
1464
- //-->
1465
- </script>
1466
- </head>
1467
-
1468
- <body bgcolor='white' onload='BodyGo()' link='#000000' vlink='#000000' alink='#000000'>
1469
- <form name='bodyform' action='/' method='post'>
1470
- <table align='center' border='0' cellspacing='0' cellpadding='0' width='100%' height='100%'>
1471
- <tr align='center' valign='middle'>
1472
- <td align='center'>
1473
-
1474
- <table align='center' border='0' cellspacing='0' cellpadding='0'>
1475
-
1476
- <tr align='center'>
1477
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1478
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1479
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1480
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1481
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1482
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1483
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1484
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1485
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1486
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1487
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1488
- </tr>
1489
-
1490
- <tr align='center'>
1491
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1492
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1493
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1494
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1495
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1496
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1497
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1498
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1499
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1500
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1501
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1502
- </tr>
1503
-
1504
- <tr align='center'>
1505
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1506
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1507
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1508
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1509
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1510
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1511
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1512
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1513
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1514
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1515
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1516
- </tr>
1517
-
1518
- <tr align='center'>
1519
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1520
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1521
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1522
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1523
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1524
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1525
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1526
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1527
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1528
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1529
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1530
- </tr>
1531
-
1532
- <tr align='center'>
1533
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1534
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1535
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1536
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1537
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1538
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1539
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1540
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1541
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1542
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1543
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1544
- </tr>
1545
-
1546
- <tr align='center'>
1547
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1548
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1549
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1550
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1551
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1552
-
1553
- <td align='center'>
1554
-
1555
- <table align='center' border='0' cellspacing='0' cellpadding='0' %WIDTH1%>
1556
- <tr align='center'>
1557
- <td align='center' bgcolor='#444488'>
1558
-
1559
- <table align='left' border='0' cellspacing='1' cellpadding='0'>
1560
- <tr align='center'>
1561
- <td align='border'><img src='%LOGO%' width='14' height='14'></td>
1562
- <td align='center'><b><small><font color='#FFFFFF'>&nbsp;%TITLE%&nbsp;</font></small></b></td>
1563
- </tr>
1564
- </table>
1565
-
1566
- <table align='right' border='0' cellspacing='1' cellpadding='0'>
1567
- <tr align='center'>
1568
- <!-- %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>
1569
- <!-- %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>
1570
- <!-- %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>
1571
- <!-- %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>
1572
- </tr>
1573
- </table>
1574
-
1575
- </td>
1576
- </tr>
1577
-
1578
- <tr align='center'>
1579
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='%WIDTH2%'></td>
1580
- </tr>
1581
-
1582
- <tr align='center'>
1583
- <td align='center' bgcolor='#CCCCCC'>
1584
- <table align='center' border='0' cellspacing='3' cellpadding='0'>
1585
- %BODY%
1586
- </table>
1587
-
1588
- <input name='rwd_action' value='$RWD_FIRSTACTION$' type='hidden'>
1589
- <input name='rwd_session' value='$RWD_SESSION$' type='hidden'>
1590
- </td>
1591
- </tr>
1592
- </table>
1593
-
1594
- </td>
1595
-
1596
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1597
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1598
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1599
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1600
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1601
- </tr>
1602
-
1603
- <tr align='center'>
1604
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1605
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1606
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1607
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1608
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1609
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1610
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1611
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1612
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1613
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1614
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1615
- </tr>
1616
-
1617
- <tr align='center'>
1618
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1619
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1620
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1621
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1622
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1623
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1624
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1625
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1626
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1627
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1628
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1629
- </tr>
1630
-
1631
- <tr align='center'>
1632
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1633
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1634
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1635
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1636
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1637
- <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
1638
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1639
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1640
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1641
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1642
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1643
- </tr>
1644
-
1645
- <tr align='center'>
1646
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1647
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1648
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1649
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1650
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1651
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1652
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
1653
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1654
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1655
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1656
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1657
- </tr>
1658
-
1659
- <tr align='center'>
1660
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1661
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1662
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1663
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1664
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1665
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1666
- <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
1667
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1668
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1669
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1670
- <td align='center' ><img src='rwd_pixel.gif' height='1' width='1'></td>
1671
- </tr>
1672
-
1673
- </table>
1674
-
1675
- </td>
1676
- </tr>
1677
- </table>
1678
- </form>
1679
- </body>
1680
- </html>
1681
- "
1682
-
1683
- $rwd_html["WINDOWSLOOKALIKE"] = "
1684
- <!-- Generated by RubyWebDialog. -->
1685
- <!-- For more information, please contact Erik Veenstra <rwd@erikveen.dds.nl>. -->
1686
- <html>
1687
- <head>
1688
- <title>%TITLE%</title>
1689
-
1690
- <meta http-equiv='Content-Type' content='text/html; charset=%CHARSET%'>
1691
- <meta http-equiv='Content-Style-Type' content='text/css; charset=UTF-8' >
1692
- <meta http-equiv='Refresh' content='%REFRESH%, javascript:document.bodyform.submit();'>
1693
-
1694
- <link rel='shortcut icon' href='%LOGO%'>
1695
-
1696
- <style type='text/css'>
1697
- <!--
1698
-
1699
- body {
1700
- background : url(%WATERMARK%) white center center no-repeat fixed;
1701
- }
1702
-
1703
- a {
1704
- text-decoration : none;
1705
- }
1706
-
1707
- a:hover {
1708
- background : #AAAAAA;
1709
- }
1710
-
1711
- td.window {
1712
- border-color : #EEEEEE #888888 #888888 #EEEEEE;
1713
- border-width : 3pt;
1714
- border-style : solid solid solid solid;
1715
- }
1716
-
1717
- td.panel1 {
1718
- border-color : #888888 #EEEEEE #EEEEEE #888888;
1719
- border-width : 1pt;
1720
- border-style : solid solid solid solid;
1721
- }
1722
-
1723
- td.panel2 {
1724
- border-color : #EEEEEE #888888 #888888 #EEEEEE;
1725
- border-width : 1pt;
1726
- border-style : solid solid solid solid;
1727
- }
1728
-
1729
- td.panel1high {
1730
- border-color : #EEEEEE #888888 #888888 #EEEEEE;
1731
- border-width : 1pt;
1732
- border-style : solid solid solid solid;
1733
- }
1734
-
1735
- td.panel2high {
1736
- border-color : #EEEEEE #888888 #888888 #EEEEEE;
1737
- border-width : 1pt;
1738
- border-style : none none none none;
1739
- }
1740
-
1741
- td.panel1low {
1742
- border-color : #888888 #EEEEEE #EEEEEE #888888;
1743
- border-width : 1pt;
1744
- border-style : solid solid solid solid;
1745
- }
1746
-
1747
- td.panel2low {
1748
- border-color : #888888 #EEEEEE #EEEEEE #888888;
1749
- border-width : 1pt;
1750
- border-style : none none none none;
1751
- }
1752
-
1753
- td.tabblad {
1754
- border-color : #EEEEEE #888888 #888888 #EEEEEE;
1755
- border-width : 1pt;
1756
- border-style : none solid solid solid;
1757
- }
1758
-
1759
- td.passivetab {
1760
- background-color : #BBBBBB;
1761
- border-color : #DDDDDD #DDDDDD #EEEEEE #DDDDDD;
1762
- border-width : 1pt;
1763
- border-style : solid solid solid solid;
1764
- }
1765
-
1766
- td.activetab {
1767
- border-color : #EEEEEE #888888 #888888 #EEEEEE;
1768
- border-width : 1pt;
1769
- border-style : solid solid none solid;
1770
- }
1771
-
1772
- td.notab {
1773
- border-color : #EEEEEE #EEEEEE #EEEEEE #EEEEEE;
1774
- border-width : 1pt;
1775
- border-style : none none solid none;
1776
- }
1777
-
1778
- //-->
1779
- </style>
1780
-
1781
- <script type='text/javascript'>
1782
- <!--
1783
- function BodyGo() {
1784
- $RWD_FOCUS$
1785
- }
1786
- //-->
1787
- </script>
1788
- </head>
1789
-
1790
- <body bgcolor='white' onload='BodyGo()' link='#000000' vlink='#000000' alink='#000000'>
1791
- <form name='bodyform' action='/' method='post'>
1792
- <table align='center' border='0' cellspacing='0' cellpadding='0' width='100%' height='100%'>
1793
- <tr align='center' valign='middle'>
1794
- <td align='center'>
1795
-
1796
- <table align='center' border='0' cellspacing='0' cellpadding='0'>
1797
-
1798
- <tr align='center'>
1799
- <td align='center' class='window'>
1800
-
1801
- <table align='center' border='0' cellspacing='0' cellpadding='0' %WIDTH1%>
1802
- <tr align='center'>
1803
- <td align='center' bgcolor='#444488'>
1804
-
1805
- <table align='left' border='0' cellspacing='1' cellpadding='0'>
1806
- <tr align='center'>
1807
- <td align='border'><img src='%LOGO%' width='14' height='14'></td>
1808
- <td align='center'><b><small><font color='#FFFFFF'>&nbsp;%TITLE%&nbsp;</font></small></b></td>
1809
- </tr>
1810
- </table>
1811
-
1812
- <table align='right' border='0' cellspacing='1' cellpadding='0'>
1813
- <tr align='center'>
1814
- <!-- %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>
1815
- <!-- %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>
1816
- <!-- %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>
1817
- <!-- %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>
1818
- </tr>
1819
- </table>
1820
-
1821
- </td>
1822
- </tr>
1823
-
1824
- <tr align='center'>
1825
- <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='%WIDTH2%'></td>
1826
- </tr>
1827
-
1828
- <tr align='center'>
1829
- <td align='center' bgcolor='#CCCCCC'>
1830
- <table align='center' border='0' cellspacing='3' cellpadding='0'>
1831
- %BODY%
1832
- </table>
1833
-
1834
- <input name='rwd_action' value='$RWD_FIRSTACTION$' type='hidden'>
1835
- <input name='rwd_session' value='$RWD_SESSION$' type='hidden'>
1836
- </td>
1837
- </tr>
1838
- </table>
1839
-
1840
- </td>
1841
- </tr>
1842
-
1843
- </table>
1844
-
1845
- </td>
1846
- </tr>
1847
- </table>
1848
- </form>
1849
- </body>
1850
- </html>
1851
- "
1852
-
1853
- $rwd_html["PDA"] = "
1854
- <!-- Generated by RubyWebDialog. -->
1855
- <!-- For more information, please contact Erik Veenstra <rwd@erikveen.dds.nl>. -->
1856
- <html>
1857
- <head>
1858
- <title>%TITLE%</title>
1859
-
1860
- <meta http-equiv='Content-Type' content='text/html; charset=%CHARSET%'>
1861
- <meta http-equiv='Refresh' content='%REFRESH%, javascript:document.bodyform.submit();'>
1862
-
1863
- <link rel='shortcut icon' href='%LOGO%'>
1864
-
1865
- <script type='text/javascript'>
1866
- <!--
1867
- function BodyGo() {
1868
- $RWD_FOCUS$
1869
- }
1870
- //-->
1871
- </script>
1872
- </head>
1873
-
1874
- <body bgcolor='white' onload='BodyGo()' link='#000000' vlink='#000000' alink='#000000'>
1875
- <form name='bodyform' action='/' method='post'>
1876
- <table align='center' border='0' cellspacing='0' cellpadding='0' width='100%' height='100%'>
1877
-
1878
- <tr align='center'>
1879
- <td align='center' bgcolor='#444488'>
1880
-
1881
- <table align='left' border='0' cellspacing='1' cellpadding='0'>
1882
- <tr align='center'>
1883
- <td align='border'><img src='%LOGO%' width='14' height='14'></td>
1884
- <td align='center'><b><small><font color='#FFFFFF'>&nbsp;%TITLE%&nbsp;</font></small></b></td>
1885
- </tr>
1886
- </table>
1887
-
1888
- <table align='right' border='0' cellspacing='1' cellpadding='0'>
1889
- <tr align='center'>
1890
- <!-- %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>
1891
- <!-- %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>
1892
- <!-- %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>
1893
- <!-- %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>
1894
- </tr>
1895
- </table>
1896
-
1897
- </td>
1898
- </tr>
1899
-
1900
- <!--
1901
- <tr align='center'>
1902
- <td align='center' bgcolor='#FFFFFF'>&nbsp;</td>
1903
- </tr>
1904
- -->
1905
-
1906
- <tr align='center'>
1907
- <td align='center' bgcolor='#FFFFFF'>
1908
-
1909
- <table align='center' border='0' cellspacing='0' cellpadding='0'>
1910
- %BODY%
1911
- </table>
1912
-
1913
- <input name='rwd_action' value='$RWD_FIRSTACTION$' type='hidden'>
1914
- <input name='rwd_session' value='$RWD_SESSION$' type='hidden'>
1915
- </td>
1916
- </tr>
1917
-
1918
- </table>
1919
- </form>
1920
- </body>
1921
- </html>
1922
- "
1404
+
1923
1405
 
1924
1406
  $rwd_pixel = "
1925
1407
  R0lGODlhAQABAMIAAAAAAP///+7u7kREiP///////////////yH5BAEKAAMA
@@ -1934,8 +1416,9 @@ jefB+oo6l6AxBAx7M2HRePQph5xga0RsJqfELPI2DSUAADs=
1934
1416
 
1935
1417
 
1936
1418
  $rwd_html_1, $rwd_html_2 = $rwd_html[ENV["RWDTHEME"]].split(/^\s*%BODY%\s*\r*$/)
1937
- $rwd_html_PDA_1, $rwd_html_PDA_2 = $rwd_html["PDA"].split(/^\s*%BODY%\s*\r*$/)
1938
-
1419
+ #if ENV["RWDTHEME"] == "PDA"
1420
+ #$rwd_html_PDA_1, $rwd_html_PDA_2 = $rwd_html["PDA"].split(/^\s*%BODY%\s*\r*$/)
1421
+ #end
1939
1422
  #end
1940
1423
  #
1941
1424
  #class RWDialog < RWD::RWDialog