rwddialogmap 0.01 → 0.02

Sign up to get free protection for your applications and to get access to all the features.
Files changed (71) hide show
  1. data/code/01rwdcore/02helptexthashbegin.rb +10 -0
  2. data/code/01rwdcore/03helptexthash.rb +18 -20
  3. data/code/01rwdcore/runopentinkerdocument.rb +1 -1
  4. data/code/superant.com.dialogmap/0uninstallapplet.rb +6 -1
  5. data/code/superant.com.dialogmap/createnewnote.rb +1 -1
  6. data/code/superant.com.dialogmap/helptexthashload.rb +21 -0
  7. data/code/superant.com.dialogmap/loadconfigurationrecord.rb +1 -1
  8. data/code/superant.com.dialogmap/loadconfigurationvariables.rb +1 -1
  9. data/code/superant.com.dialogmap/saveconfigurationrecord.rb +1 -1
  10. data/code/superant.com.rwdtinkerbackwindow/initiateapplets.rb +62 -132
  11. data/code/superant.com.rwdtinkerbackwindow/installgemapplet.rb +9 -7
  12. data/code/superant.com.rwdtinkerbackwindow/removeappletvariables.rb +6 -6
  13. data/code/superant.com.rwdtinkerbackwindow/viewlogfile.rb +13 -0
  14. data/configuration/rwdtinker.dist +3 -3
  15. data/configuration/{rwdwdialogmap-0.01.dist → rwdwdialogmap.dist} +5 -3
  16. data/configuration/tinkerwin2variables.dist +7 -2
  17. data/gui/tinkerbackwindows/superant.com.slideshow/10appletbegin.rwd +4 -0
  18. data/gui/tinkerbackwindows/superant.com.slideshow/11viewnamedata.rwd +19 -0
  19. data/gui/tinkerbackwindows/superant.com.slideshow/13listnamerecordfiles.rwd +21 -0
  20. data/gui/tinkerbackwindows/superant.com.slideshow/16editrecord.rwd +39 -0
  21. data/gui/tinkerbackwindows/superant.com.slideshow/17viewvcardrecord.rwd +32 -0
  22. data/gui/tinkerbackwindows/superant.com.slideshow/18contactutilities.rwd +34 -0
  23. data/gui/tinkerbackwindows/superant.com.slideshow/81jumplinkcommands.rwd +17 -0
  24. data/gui/tinkerbackwindows/superant.com.slideshow/9end.rwd +6 -0
  25. data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/75rwdlogfile.rwd +20 -0
  26. data/init.rb +59 -163
  27. data/installed/{rwdwdialogmap-0.01.inf → rwdwdialogmap.inf} +1 -2
  28. data/lang/en/rwdcore/en.po +166 -0
  29. data/lang/es/rwdcore/es.po +172 -0
  30. data/lang/fr/rwdcore/fr.po +166 -0
  31. data/lang/hi/rwdcore/hi.po +170 -0
  32. data/lang/ja/rwdcore/ja.po +168 -0
  33. data/lang/nl/rwdcore/nl.po +166 -0
  34. data/lib/rwd/net.rb +8 -7
  35. data/lib/rwd/rwd.rb +34 -31
  36. data/lib/rwdthemes/default.rwd +1 -1
  37. data/lib/rwdtinker/rwdcodedir.rb +56 -0
  38. data/lib/rwdtinker/rwdguidir.rb +57 -0
  39. data/lib/rwdtinker/rwdlangdir.rb +60 -0
  40. data/lib/rwdtinker/rwdtinkertools.rb +25 -0
  41. data/rwd_files/HowTo_Tinker.txt +26 -7
  42. data/rwd_files/Tinkerhelptexthash.txt +81 -0
  43. data/rwd_files/log/rwdtinker.log +7249 -0
  44. data/{code/superant.com.dialogmap/helptexthashrwdhypernote.rb → rwd_files/rwddialogmaphelpfiles.txt} +6 -3
  45. data/rwddialogmap-0.02.gem +0 -0
  46. data/tests/makedist-rwdwdialogmap.rb +2 -2
  47. data/tests/makedist.rb +2 -2
  48. data/zips/{rwdwcalc-0.62.zip → rwdwcalc-0.63.zip} +0 -0
  49. data/zips/rwdwdialogmap-0.02.zip +0 -0
  50. data/zips/rwdwfoldeditor-0.06.zip +0 -0
  51. data/zips/rwdwmovies-0.98.zip +0 -0
  52. data/zips/{rwdwruby-1.07.zip → rwdwruby-1.08.zip} +0 -0
  53. data/zips/rwdwschedule-1.05.zip +0 -0
  54. data/zips/tinkerbellw-0.03.zip +0 -0
  55. data/zips/wrubyslippers-1.08.zip +0 -0
  56. metadata +38 -22
  57. data/code/01rwdcore/04helptextend.rb +0 -6
  58. data/code/superant.com.rwdtinkerbackwindow/helptexthashtinkerwin2.rb +0 -61
  59. data/configuration/language.dist +0 -8
  60. data/configuration/rwdapplicationidentity.dist +0 -3
  61. data/lang/en/rwdcore/languagefile.rb +0 -58
  62. data/lang/es/rwdcore/languagefile-es.rb +0 -62
  63. data/lang/fr/rwdcore/languagefile.rb +0 -64
  64. data/lang/jp/rwdcore/languagefile.rb +0 -72
  65. data/lang/nl/rwdcore/languagefile.rb +0 -75
  66. data/zips/rwdwaddresses-1.06.zip +0 -0
  67. data/zips/rwdwdialogmap-0.01.zip +0 -0
  68. data/zips/rwdwfoldeditor-0.04.zip +0 -0
  69. data/zips/rwdwgutenberg-0.09.zip +0 -0
  70. data/zips/tinkerbellw-0.02.zip +0 -0
  71. data/zips/wrubyslippers-1.06.zip +0 -0
@@ -0,0 +1,13 @@
1
+ def rwdtinkerrunviewlog
2
+ require 'lib/rwdtinker/rwdtinkertools'
3
+
4
+ if @a_rwdtinkerlognumber == nil
5
+ @a_rwdtinkerlognumber = 11
6
+ @returnlogdisplay = RwdtinkerTools.tail("rwd_files/log/rwdtinker.log",@a_rwdtinkerlognumber.to_i)
7
+
8
+ else
9
+ @returnlogdisplay = RwdtinkerTools.tail("rwd_files/log/rwdtinker.log",@a_rwdtinkerlognumber.to_i)
10
+
11
+ end
12
+ end
13
+
@@ -1,4 +1,4 @@
1
- ##VERSION: (1.79)
1
+ ##VERSION: (1.82)
2
2
  ConfigurationDir = "configuration" # for use in program - init.rb has this value without using this constant
3
3
  CodeName = "rwdtinker"
4
4
  CodeNameFile = CodeName + ".rb"
@@ -10,6 +10,6 @@ LangDir = "lang"
10
10
  $prevouswindow ="main"
11
11
  $rwdcontrolports =["13713","13714","13715","13716"] # remote control code not actived 2007
12
12
  $port = 7705
13
- Browser_Exe = 'mozilla '
14
- RwdTinkerVersion = "1.79"
13
+ ##NAME: (RwdTinkerVersion):(1.82)
14
+ RwdTinkerVersion = "1.82"
15
15
 
@@ -1,4 +1,4 @@
1
- ##VERSION: (0.01)
1
+ ##VERSION: (0.02)
2
2
  ##NAME: ($rwddialogmap_directory):(0.01)
3
3
  $rwddialogmap_directory = "rwd_files"
4
4
  ##NAME: ($dialogmapbrowser):(0.01)
@@ -8,6 +8,8 @@ $tinkerdocumentsarray += ["HowTo_DialogMap.txt"]
8
8
  JumpLink.update(:RwdDialogMap=>"runrwddialogmapmain")
9
9
  $rwdjumplink +=["RwdDialogMap"]
10
10
  $dialogchoicepull = ["default.dlg"]
11
- ##NAME: (RwdDialogMapVersion):(0.01)
12
- RwdDialogMapVersion = "0.01"
11
+ ##NAME: (DeleteDialogMapConfig):(0.02)
12
+ DeleteDialogMapConfig = true
13
+ ##NAME: (RwdDialogMapVersion):(0.02)
14
+ RwdDialogMapVersion = "0.02"
13
15
 
@@ -1,4 +1,4 @@
1
- ##VERSION: (1.79)
1
+ ##VERSION: (1.82)
2
2
  TinkerWin2ConfigurationFileName = "tinkerwin2variables.cnf" # this file name - do not change
3
3
  ##NAME: ($zipslocation):(1.78)
4
4
  $zipslocation = "zips" # location of applets to add
@@ -14,5 +14,10 @@ $zipslocation = "zips" # location of applets to add
14
14
  # $geminstalled_directory = "/ruby/lib/ruby/gems/1.8/gems" # XP machine
15
15
  $geminstalled_directory = "/var/lib/gems/1.8/gems" # Debian Linux
16
16
 
17
- RwdTinkerWin2Version = "1.79"
17
+ $rwdapplicationidentity = "rwdtinker main application"
18
18
 
19
+ RwdTinkerWin2Version = "1.81"
20
+ Browser_Exe = 'mozilla '
21
+ #language selection file
22
+ ##NAME: ($langarray):(1.82)
23
+ $langarray = [ "en","ja", "nl","es", "fr","hi"]
@@ -0,0 +1,4 @@
1
+ $rwdguivar=
2
+ "<application>
3
+ <window name=\"rwdaddresseswindow\" title=\"RwdAddresses RwdTinker\">
4
+ <tabs>"
@@ -0,0 +1,19 @@
1
+ $rwdguivar=
2
+ "
3
+ <tab name=\"Viewnamedata\" caption=\"View Contact\">
4
+
5
+ <table>
6
+ <row> <p align=\"right\">Contact Name:</p> <text name=\"a_viewnamedata\"/> </row>
7
+
8
+ </table>
9
+
10
+ <horizontal>
11
+ <button caption=\"Open\" action=\"viewnamedata\"/>
12
+ <button caption=\"View Photo\" action=\"viewcontactphoto\"/>
13
+ <button caption=\"Help\" action=\"runhelpwindowrwdaddresses\"/>
14
+
15
+ </horizontal>
16
+
17
+ "
18
+
19
+
@@ -0,0 +1,21 @@
1
+ $rwdguivar=
2
+ "
3
+ <table>
4
+
5
+
6
+
7
+ <p>%viewnamedatadisplay%</p>
8
+ </table>
9
+ <table>
10
+ <image src=\"contacttmp.jpg\"></image>
11
+ </table>
12
+ <table>
13
+ <horizontal>
14
+ <button caption=\"List Contacts\" action=\"listnamerecordfiles\"/>
15
+ </horizontal>
16
+ <p>%%listnamerecordfilesresult%%</p>
17
+ </table>
18
+ </tab>"
19
+
20
+
21
+
@@ -0,0 +1,39 @@
1
+ $rwdguivar=
2
+ "
3
+ <tab name=\"editnamerecordfile\" caption=\"Edit Contact\">
4
+ <table>
5
+ <row> <p> </row>
6
+ <row> <p align=\"right\">You can create a new record here or edit one</row>
7
+ <row> <p> </row>
8
+ <horizontal>
9
+ <button caption=\"Fill Record\" action=\"loadnamerecord\"/>
10
+ <button caption=\"Save Changes\" action=\"createnewnamerecord\"/>
11
+ <button caption=\"Clear\" action=\"clearnamescreendisplay\"/>
12
+ <button caption=\"Help\" action=\"runhelpwindowrwdaddresses\"/>
13
+
14
+
15
+
16
+
17
+ </horizontal>
18
+ <table>
19
+ <row> <p align=\"right\">FileName:</p> <text size=50 name=\"a_filename\"/> </row>
20
+ <row> <p align=\"right\">Contact Name:</p> <text size=70 name=\"a_name\"/> </row>
21
+ <row> <p align=\"right\">Address:</p> <text size=70 name=\"a_address\"/> </row>
22
+ <row> <p align=\"right\">CityStateZip:</p> <text size=70 name=\"a_citystatezip\"/> </row>
23
+ <row> <p align=\"right\">Phone:</p> <text size=70 name=\"a_phone\"/> </row>
24
+ <row> <p align=\"right\">Email:</p> <text size=70 name=\"a_email\"/> </row>
25
+ <row> <p align=\"right\">Comment1:</p> <text size=70 name=\"a_comment1\"/> </row>
26
+ <row> <p align=\"right\">Comment2:</p> <text size=70 name=\"a_comment2\"/> </row>
27
+ <row> <p align=\"right\">Comment3:</p> <text size=70 name=\"a_comment3\"/> </row>
28
+
29
+ </table>
30
+ <horizontal>
31
+ <button caption=\"Export vCard\" action=\"savevcardrecord\"/>
32
+
33
+
34
+ </horizontal>
35
+ <p>%extranamedatadisplay%</p>
36
+ <p>
37
+ <p>%createnewnamerecorddisplay%</p>
38
+ </tab>"
39
+
@@ -0,0 +1,32 @@
1
+ $rwdguivar=
2
+ "
3
+ <tab name=\"Viewvcardrecord\" caption=\"View vCard Record\">
4
+
5
+ <table>
6
+ <row> <p align=\"right\">Contact Name:</p> <text name=\"a_viewvcarddata\"/> </row>
7
+
8
+ </table>
9
+
10
+ <horizontal>
11
+ <button caption=\"Open\" action=\"viewvcarddata\"/>
12
+ <button caption=\"Help\" action=\"runhelpwindowrwdaddresses\"/>
13
+
14
+ </horizontal>
15
+
16
+
17
+ <table>
18
+
19
+
20
+ <p>%viewvcarddatadisplay%</p>
21
+
22
+
23
+ </table>
24
+ <horizontal>
25
+ <button caption=\"List vCard Records\" action=\"listvcardrecordfiles\"/>
26
+ </horizontal>
27
+ <p>%%listvcardrecordfilesresult%%</p>
28
+
29
+ </tab>"
30
+
31
+
32
+
@@ -0,0 +1,34 @@
1
+ $rwdguivar=
2
+ "
3
+ <tab name=\"contactutilitiesrwdaddresses\" caption=\"Contact Utilities\">
4
+
5
+ <table>
6
+ <row> <p align=\"right\">Contact Name:</p> <text name=\"a_viewnamedata\"/> </row>
7
+ <row> <p align=\"right\">New Name:</p> <text name=\"a_changenamedata\"/> </row>
8
+
9
+ </table>
10
+
11
+ <horizontal>
12
+ <button caption=\"Rename Record\" action=\"changenamedata\"/>
13
+ <button caption=\"Delete Record\" action=\"deletecontactrecord\"/>
14
+ </horizontal>
15
+ <table>
16
+
17
+ <row> <p align=\"right\">Photo Name:</p> <text name=\"a_tmpphotoname\"/> </row>
18
+ </table>
19
+
20
+ <horizontal>
21
+ <button caption=\"Attach Photo\" action=\"attachtmpcontactphoto\"/>
22
+ <button caption=\"Help\" action=\"runhelpwindowrwdaddresses\"/>
23
+ </horizontal>
24
+
25
+ <horizontal>
26
+ <button caption=\"List Contacts\" action=\"listnamerecordfiles\"/>
27
+
28
+
29
+ <button caption=\"List Photos\" action=\"viewtmpcontactphoto\"/>
30
+ </horizontal>
31
+
32
+ <p>%%listnamerecordfilesresult%%</p>
33
+ <p>%%listphotosfromtmp%%</p>
34
+ </tab>"
@@ -0,0 +1,17 @@
1
+ $rwdguivar=
2
+ "
3
+ <tab name=selectiontab caption=#{Message[:selection_tab]}>
4
+ <horizontal>
5
+ <button caption=#{Message[:showjump_links]} action=\"showjumplinkoptions\"/>
6
+
7
+ </horizontal>
8
+ <table>
9
+ <select name=\"a_jumplinkinput\"> %%jumplinkoptions%% </select>
10
+
11
+ </table>
12
+
13
+ <horizontal>
14
+ <button caption=#{Message[:jumptoapplication_location]} action=\"runjumplinkcommand\"/>
15
+ </horizontal>
16
+ </tab>
17
+ "
@@ -0,0 +1,6 @@
1
+ $rwdguivar=
2
+ "
3
+ </tabs>
4
+ </window>"
5
+
6
+
@@ -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,44 +21,18 @@
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'
27
32
 
28
33
  $progdir = File::expand_path( File.dirname(__FILE__))
29
34
 
30
- $tempdoc = " "
31
-
32
- def findfiles(d)
33
- a = Array.new(Dir[d].entries.sort)
34
- #loop through and get the files names
35
- a.each do |x|
36
- #adjust the filters to the files you want to see...
37
- if(!test(?d,x))
38
- # only rwd files
39
- if x =~ /rb|rwd|txt/
40
- fileA=File.open("#{x}","r") #opens the file thats in fileName as read only
41
- $tempdoc+=fileA.read #reads the file into the doc string
42
- fileA.close
43
- end
44
- end
45
- end
46
- end
47
- def loadguifile(d)
48
- a = Array.new(Dir[d].entries.sort)
49
- #loop through and get the files names
50
- a.each do |x|
51
- #adjust the filters to the files you want to see...
52
- if(!test(?d,x))
53
- # only rwd files
54
- if x =~ /rb|rwd|txt/
55
-
56
- load x #opens the file thats in fileName and reads it
57
- $tempdoc += $rwdguivar # adds the file into the doc string
58
- end
59
- end
60
- end
61
- end
35
+ tempdoc = " "
62
36
 
63
37
  # integrate the new configuration files
64
38
  MAINconfignew = "rwdconfig.cnf"
@@ -94,148 +68,70 @@ Rconftool::install(configdist,confignew) #integrates new file with old
94
68
 
95
69
  Dir.chdir($progdir) # change back to top program directory
96
70
 
71
+
97
72
  # build the English Language hash file from the parts
98
- languagehashvariable = 'Message = Hash.new { |hh, kk| hh[kk] = "ERROR: Message not found: #{kk.inspect}."; hh[kk] }
99
- langmessage = {' + "\n"
100
- startlangdir = File.join(LangDir,"en")
101
- #get a list of the files and subdirectories on the starting directory only
102
- alanghash = Array.new(Dir[startlangdir].entries.sort)
103
- #loop through the list, ignore the files and add all new directories found
104
- alanghash.each do |x|
105
- #if a directory...
106
- if(test(?d,x))
107
- # add to the original list of directories
108
- @@tmproot = x + "/**"
109
- #adds the new ones to the array
110
- blanghash = Dir[@@tmproot].entries.sort
111
- blanghash.each do |x|
112
- if(test(?d,x))
113
- alanghash.push(x) #appends to the end of the array...
114
- end
115
- end
116
- end
117
- end
118
- alanghash.each do |x|
119
- #if it is a file...
120
- if(!test(?d,x))
121
- alanghash.delete(x)
122
- else #it is a directory...
123
- findfiles(x + "/**")
124
- end
73
+ Message = Hash.new { |hh, kk| hh[kk] = "ERROR: Message not found: #{kk.inspect}."; hh[kk] }
74
+ langmessage = { :clear => "Clear", :rwdtinker => "Rwdtinker" } ; langmessage.each { |kk, vv| Message[kk] = vv }
75
+
76
+ def msgid(programkey)
77
+ $programkey = programkey
125
78
  end
126
-
79
+
80
+ def msgstr(programmsg)
81
+ if programmsg == ""
82
+ $rwdtinkerlog.info "msgstr: no translation for #{$programkey}"
83
+ else
84
+ Message.update( $programkey.to_sym => programmsg )
85
+ end
86
+ end
87
+
88
+ require 'lib/rwdtinker/rwdlangdir'
89
+
90
+ tempdoc = " "
91
+ #go get all the po language file files in english
92
+ tempdoc = RwdtinkerTools.findlanguagefiles(LangDir,"en")
127
93
 
128
94
  #writes the contents of doc into the languagehashvariable
129
- languagehashvariable = languagehashvariable + $tempdoc + "} ; langmessage.each { |kk, vv| Message[kk] = vv }"
95
+ languagehashvariable = tempdoc
130
96
 
131
97
  # END of en Lang building
132
- $tempdoc = " "
98
+ tempdoc = " "
133
99
  Dir.chdir($progdir) # change back to top program directory
134
100
 
135
101
  # build the local Language hash file from the parts
136
- startlangdir = File.join(LangDir,$lang)
137
- #get a list of the files and subdirectories on the starting directory only
138
- alanghash = Array.new(Dir[startlangdir].entries.sort)
139
- #loop through the list, ignore the files and add all new directories found
140
- alanghash.each do |x|
141
- #if a directory...
142
- if(test(?d,x))
143
- # add to the original list of directories
144
- @@tmproot = x + "/**"
145
- #adds the new ones to the array
146
- blanghash = Dir[@@tmproot].entries.sort
147
- blanghash.each do |x|
148
- if(test(?d,x))
149
- alanghash.push(x) #appends to the end of the array...
150
- end
151
- end
152
- end
153
- end
154
- alanghash.each do |x|
155
- #if it is a file...
156
- if(!test(?d,x))
157
- alanghash.delete(x)
158
- else #it is a directory...
159
- findfiles(x + "/**")
160
- end
161
- end
162
-
163
-
164
- #writes the contents of doc into the variable
165
- languagehashvariable = languagehashvariable + " ; Message.update(" + $tempdoc + ' :rwdtinker => "Rwdtinker" ) '
166
-
167
-
168
- $tempdoc = " "
169
-
170
- Dir.chdir($progdir) # change back to top program directory
102
+
103
+ $lang = $langarray[0] # pick the language of choice
104
+
105
+ # Go get all the po files for the language of choice
106
+ tempdoc = RwdtinkerTools.findlanguagefiles(LangDir,$lang)
107
+ # the contents of doc into the variable
108
+ languagehashvariable = languagehashvariable + tempdoc
171
109
 
172
- temp = eval( languagehashvariable )
110
+ Dir.chdir($progdir) # change back to top program directory
111
+
112
+ # lets read those po files, first english then the chosen language
113
+ temp = eval( languagehashvariable )
173
114
 
174
- $tempdoc = " "
115
+
175
116
 
176
117
  # build the actual program from the code parts
177
- #get a list of the files and subdirectories on the starting directory only
178
- a = Array.new(Dir[CodeDir].entries.sort)
179
- #loop through the list, ignore the files and add all new directories found
180
- a.each do |x|
181
- #if a directory...
182
- if(test(?d,x))
183
- # add to the original list of directories
184
- @@root = x + "/**"
185
- #adds the new ones to the array
186
- b = Dir[@@root].entries.sort
187
- b.each do |x|
188
- if(test(?d,x))
189
- a.push(x) #appends to the end of the array...
190
- end
191
- end
192
- end
193
- end
194
- a.each do |x|
195
- #if it is a file...
196
- if(!test(?d,x))
197
- a.delete(x)
198
- else #it is a directory...
199
- findfiles(x + "/**")
200
- end
201
- end
202
-
118
+ require 'lib/rwdtinker/rwdcodedir'
119
+
120
+ tempdoc = RwdtinkerTools.findprogramfiles(CodeDir)
203
121
 
204
122
  # load the program file
205
- tempcoderesult = eval( $tempdoc )
123
+
124
+ tempcoderesult = eval( tempdoc )
206
125
 
207
126
  # build the actual GUI from the gui parts
208
- $tempdoc = " "
209
- #get a list of the files and subdirectories on the starting directory only
210
- a = Array.new(Dir[GuiDir].entries.sort)
211
- #loop through the list, ignore the files and add all new directories found
212
- a.each do |x|
213
- #if a directory...
214
- if(test(?d,x))
215
- #use this new dir find to add to the original list of directories
216
- @@root = x + "/**"
217
- #adds the new ones to the array
218
- b = Dir[@@root].entries.sort
219
- b.each do |x|
220
- if(test(?d,x))
221
- a.push(x) #appends to the end of the array...
222
- end
223
- end
224
- end
225
- end
226
- a.each do |x|
227
- #if it is a file...
228
- if(!test(?d,x))
229
- a.delete(x)
230
-
231
- else #it is a directory...
232
- loadguifile(x + "/**")
233
- end
234
- end
127
+ require 'lib/rwdtinker/rwdguidir'
128
+
129
+ tempdoc = RwdtinkerTools.findguifiles(GuiDir)
130
+
235
131
 
236
132
  # gui variable is done
237
133
  guiRWD = ""
238
- $rwd_gui_tinker = $tempdoc
134
+ $rwd_gui_tinker = tempdoc
239
135
  require 'socket' # Network stuff
240
136
  host = "127.0.0.1"
241
137
  port = $port
@@ -250,27 +146,27 @@ Rconftool::install(configdist,confignew) #integrates new file with old
250
146
  $port = port
251
147
  # Rescue the "Address in use" error
252
148
  rescue Errno::EADDRINUSE
253
- puts "RWD Startup: Port #{port} on host #{host} is already in use."
149
+ $rwdtinkerlog.warn "RWD Startup: Port #{port} on host #{host} is already in use."
254
150
  port=port +1
255
- puts "trying port: #{port}"
151
+ $rwdtinkerlog.warn "trying port: #{port}"
256
152
  # Rescue the "Address not available' error
257
153
  rescue Errno::EADDRNOTAVAIL
258
- puts "RWD Startup: Address #{host} is not available to bind."
154
+ $rwdtinkerlog.warn "RWD Startup: Address #{host} is not available to bind."
259
155
  port =port + 1
260
- puts "trying port: #{port}"
156
+ $rwdtinkerlog.warn "trying port: #{port}"
261
157
  # Rescue "permission denied errors
262
158
  rescue Errno::EACCES
263
- puts "RWD Startup: Access denied when binding interface addresses. ?"
159
+ $rwdtinkerlog.warn "RWD Startup: Access denied when binding interface addresses. ?"
264
160
  port =port + 1
265
- puts "trying port: #{port}"
161
+ $rwdtinkerlog.warn "trying port: #{port}"
266
162
  # Rescue all other errors
267
163
  rescue
268
- puts "RWD Startup: An error occured."
164
+ $rwdtinkerlog.warn "RWD Startup: An error occured."
269
165
  port =port + 1
270
- puts "trying port: #{port}"
166
+ $rwdtinkerlog.warn "trying port: #{port}"
271
167
  # Rescue all other errors
272
168
  end
273
-
169
+ $port = port
274
170
  end
275
171
 
276
172