rwdtinker 1.75 → 1.76

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

@@ -1,7 +1,7 @@
 # install rwdtinker applet from a long directory location 
 def installgemapplet
 	require 'fileutils'
-	require 'extras/zip/zip'
+	require 'lib/zip/zip'
 	nametext = "%s" % [@a_installapplet]
 
 	begin # exception trapped block

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

@@ -1,7 +1,7 @@
 #view contents of a tinker applet
 def viewappletcontents
 	require 'fileutils'
-	require 'extras/zip/zip'
+	require 'lib/zip/zip'
 	nametext = "%s" % [@a_installapplet]
 
 	begin # exception trapped block

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

@@ -1,7 +1,7 @@
 #view gem info
 def viewgemappletcontents
 	require 'fileutils'
-	require 'extras/zip/zip'
+	require 'lib/zip/zip'
 	nametext = "%s" % [@a_installapplet]
 
 	begin # exception trapped block

data/configuration/rwdtinker.dist

@@ -1,4 +1,4 @@
-##VERSION:1.75
+##VERSION:1.76
 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.75"
+RwdTinkerVersion = "1.76"
 

data/gui/frontwindowselections/{superant.com.rwdtinkerwin2selectiontab/jumplinkcommands.rwd → jumplinkcommands.rwd}

@@ -2,7 +2,7 @@ $rwdguivar=
 "
 <horizontal>
 <button caption=#{Message[:showjump_links]} action=\"showjumplinkoptions\"/>
-
+<button caption=#{Message[:help]} action=\"runhelpwindowtinkerwin2\"/>
 </horizontal>
  <table>
       <select name=\"a_jumplinkinput\">  %%jumplinkoptions%% </select>

data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/81jumplinkcommands.rwd

@@ -3,7 +3,7 @@ $rwdguivar=
 <tab name=selectiontab caption=#{Message[:selection_tab]}>
 <horizontal>
 <button caption=#{Message[:showjump_links]} action=\"showjumplinkoptions\"/>
-
+<button caption=#{Message[:help]} action=\"runhelpwindowtinkerwin2\"/>
 </horizontal>
  <table>
       <select name=\"a_jumplinkinput\">  %%jumplinkoptions%% </select>

data/init.rb

@@ -21,9 +21,9 @@
 #* at "smalllinux@gmail.com".
 #***********************************************************************/
 
-require "ev/rwd"
+require "lib/rwd/rwd"
 require 'fileutils'
-require 'extras/rconftool'
+require 'lib/rconftool'
 
 $progdir = File::expand_path( File.dirname(__FILE__))
 

data/lang/en/rwdcore/languagefile.rb

@@ -14,7 +14,7 @@
  :help_about => '"Help About"',
  :install_applet => '"install (rwdtinker) applet"',  
  :jumptoapplication_location => '"Jump to Application Location"', 
- :list_applets   => '"List Applets"',
+ :list_applets   => '"Remove Applets"',
  :listappletsinthegem_directory => '"List applets in the Gem Directory"',
  :listappletsavailablefor_installation => "List applets available for installation",   
   :list_files => '"List Files"',          
@@ -42,8 +42,8 @@
   
  :save     => "Save" ,   
  :save_changes   => '"Save Changes"',
- :selection_panel => '"Selection Panel"',
- :selection_tab => '"Selection Tab"',
+ :selection_panel => '"Menu Panel"',
+ :selection_tab => '"Menu Tab"',
  :tinker_logo         => "Tinker Logo",
  :tinkerback_window => '"Tinker Back Window"',
  :viewapplet_contents => '"View Applet Contents"',

data/{ev → lib/rwd}/browser.rb

@@ -1,5 +1,5 @@
-require "ev/ruby"
-require "ev/net"
+require "lib/rwd/ruby"
+require "lib/rwd/net"
 
 begin
   require "win32ole"

data/{ev → lib/rwd}/net.rb

@@ -1,6 +1,6 @@
-require "ev/ruby"
-require "ev/ftools"
-require "ev/mime"
+require "lib/rwd/ruby"
+require "lib/rwd/ftools"
+require "lib/rwd/mime"
 require "net/http"
 require "socket"
 require "uri"

data/{ev → lib/rwd}/rwd.rb

@@ -1,8 +1,8 @@
-require "ev/ruby"
-require "ev/xml"
-require "ev/net"
-require "ev/browser"
-require "ev/thread"
+require "lib/rwd/ruby"
+require "lib/rwd/xml"
+require "lib/rwd/net"
+require "lib/rwd/browser"
+require "lib/rwd/thread"
 require "md5"
 require "rbconfig"
 

data/{ev → lib/rwd}/sgml.rb

@@ -1,4 +1,4 @@
-require "ev/tree"
+require "lib/rwd/tree"
 
 class SGMLObject < TreeObject
   def to_s

data/{ev → lib/rwd}/thread.rb

@@ -1,4 +1,4 @@
-require "ev/ruby"
+require "lib/rwd/ruby"
 require "thread"
 
 class FakeThread

data/{ev → lib/rwd}/tree.rb

@@ -1,5 +1,5 @@
-require "ev/ruby"
-require "ev/net"
+require "lib/rwd/ruby"
+require "lib/rwd/net"
 require "md5"
 require "thread"
 

data/{ev → lib/rwd}/xml.rb

@@ -1,4 +1,4 @@
-require "ev/sgml"
+require "lib/rwd/sgml"
 
 class SGMLObject
   def to_x(closetags=true)

data/{extras → lib}/zip/zip.rb

@@ -4,8 +4,8 @@ require 'singleton'
 require 'tempfile'
 require 'ftools'
 require 'zlib'
-require 'extras/zip/stdrubyext'
-require 'extras/zip/ioextras'
+require 'lib/zip/stdrubyext'
+require 'lib/zip/ioextras'
 
 if Tempfile.superclass == SimpleDelegator
   require 'zip/tempfile_bugfixed'

data/rwd_files/HowTo_Tinker.txt

@@ -227,6 +227,14 @@ http://www.erikveen.dds.nl/rubywebdialogs/index.html
 Thanks, Steven Gibson
 
 == Changelog
+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

data/tests/makedist.rb

@@ -14,7 +14,7 @@ require 'fileutils'
 
 DistroName = "rwdtinker"
 
-DistroVersion="1.75"
+DistroVersion="1.76"
 
 DistroTitle="#{DistroName}.dist"
 load "configuration/#{DistroTitle}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rwdtinker
 version: !ruby/object:Gem::Version 
-  version: "1.75"
+  version: "1.76"
 platform: ruby
 authors: 
 - Steven Gibson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-07 00:00:00 -07:00
+date: 2008-09-09 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -24,7 +24,23 @@ extra_rdoc_files:
 - rwd_files/HowTo_Tinker.txt
 - rwd_files/HowTo_TinkerWin2.txt
 files: 
-- lib/temp.rb
+- lib/rwd/browser.rb
+- lib/rwd/sgml.rb
+- lib/rwd/ftools.rb
+- lib/rwd/ruby.rb
+- lib/rwd/thread.rb
+- lib/rwd/mime.rb
+- lib/rwd/tree.rb
+- lib/rwd/net.rb
+- lib/rwd/rwd.rb
+- lib/rwd/xml.rb
+- lib/zip/stdrubyext.rb
+- lib/zip/ziprequire.rb
+- lib/zip/ioextras.rb
+- lib/zip/zip.rb
+- lib/zip/zipfilesystem.rb
+- lib/zip/tempfile_bugfixed.rb
+- lib/rconftool.rb
 - code/zz0applicationend/zz0end.rb
 - code/superant.com.rwdtinkerbackwindow/listgemdirs.rb
 - code/superant.com.rwdtinkerbackwindow/diagnostictab.rb
@@ -36,7 +52,6 @@ files:
 - code/superant.com.rwdtinkerbackwindow/loadconfigurationrecord.rb
 - code/superant.com.rwdtinkerbackwindow/runrwdtinkerbackwindow.rb
 - code/superant.com.rwdtinkerbackwindow/viewappletcontents.rb
-- code/superant.com.rwdtinkerbackwindow/installapplet.rb
 - code/superant.com.rwdtinkerbackwindow/openhelpwindowtinkerwin2.rb
 - code/superant.com.rwdtinkerbackwindow/loadconfigurationvariables.rb
 - code/superant.com.rwdtinkerbackwindow/listzips.rb
@@ -74,30 +89,14 @@ files:
 - configuration/tinkerwin2variables.dist
 - configuration/language.dist
 - configuration/rwdapplicationidentity.dist
-- ev/browser.rb
-- ev/sgml.rb
-- ev/ftools.rb
-- ev/ruby.rb
-- ev/thread.rb
-- ev/mime.rb
-- ev/tree.rb
-- ev/net.rb
-- ev/rwd.rb
-- ev/xml.rb
-- extras/zip/stdrubyext.rb
-- extras/zip/ziprequire.rb
-- extras/zip/ioextras.rb
-- extras/zip/zip.rb
-- extras/zip/zipfilesystem.rb
-- extras/zip/tempfile_bugfixed.rb
-- extras/rconftool.rb
 - lang/en/rwdcore/languagefile.rb
 - lang/es/rwdcore/languagefile-es.rb
 - lang/fr/rwdcore/languagefile.rb
 - lang/jp/rwdcore/languagefile.rb
 - lang/nl/rwdcore/languagefile.rb
-- gui/frontwindowtdocuments/superant.com.documents
-- gui/frontwindowtdocuments/superant.com.documents/tinkerdocuments.rwd
+- gui/frontwindowtdocuments/00documentbegin.rwd
+- gui/frontwindowtdocuments/tinkerdocuments.rwd
+- gui/frontwindowtdocuments/zzdocumentend.rwd
 - gui/00coreguibegin/applicationguitop.rwd
 - gui/tinkerbackwindows/superant.com.tinkerhelpwindow
 - gui/tinkerbackwindows/superant.com.tinkerhelpwindow/1appname.rwd
@@ -114,24 +113,18 @@ files:
 - gui/tinkerbackwindows/superant.com.versionwindow
 - gui/tinkerbackwindows/superant.com.versionwindow/helpaboutwindow.rwd
 - gui/tinkerbackwindows/superant.com.versionwindow/1appname.rwd
-- gui/helpaboutzend/superant.com.helpaboutend
-- gui/helpaboutzend/superant.com.helpaboutend/zzzzhelpscreen2end.rwd
-- gui/helpaboutzend/superant.com.helpaboutend/zzzzhelpabout2.rwd
-- gui/helpaboutzend/superant.com.helpaboutend/zhelpscreenstart2.rwd
-- gui/helpaboutzend/superant.com.helpaboutend/helpscreenend.rwd
-- gui/frontwindow0/viewlogo/cc0openphoto.rwd
-- gui/helpaboutbegin/superant.com.helpaboutbegin
-- gui/helpaboutbegin/superant.com.helpaboutbegin/zzzzhelpscreenstart.rwd
-- gui/helpaboutbegin/superant.com.helpaboutbegin/zzdocumentend.rwd
-- gui/helpaboutbegin/superant.com.helpaboutbegin/zzzrwdlasttab.rwd
-- gui/frontwindowselectionbegin/selectiontabbegin/00selectiontabbegin.rwd
-- gui/frontwindowselections/superant.com.rwdtinkerwin2selectiontab
-- gui/frontwindowselections/superant.com.rwdtinkerwin2selectiontab/jumplinkcommands.rwd
-- gui/frontwindowselectionzend/viewselectionzend/zzdocumentbegin.rwd
-- gui/frontwindowselectionzend/viewselectionzend/wwselectionend.rwd
-- gui/zzcoreguiend/tinkerapplicationguiend/yy9rwdend.rwd
-- gui/helpaboutinstalled/superant.com.tinkerhelpabout
-- gui/helpaboutinstalled/superant.com.tinkerhelpabout/helpabouttab.rwd
+- gui/helpaboutzend/zzzzhelpscreen2end.rwd
+- gui/helpaboutzend/zzzzhelpabout2.rwd
+- gui/helpaboutzend/zhelpscreenstart2.rwd
+- gui/helpaboutzend/helpscreenend.rwd
+- gui/frontwindow0/cc0openphoto.rwd
+- gui/helpaboutbegin/zzzzzzhelpabouttab.rwd
+- gui/helpaboutbegin/zzzzhelpscreenstart.rwd
+- gui/helpaboutbegin/zzzrwdlasttab.rwd
+- gui/frontwindowselections/jumplinkcommands.rwd
+- gui/frontwindowselections/wwselectionend.rwd
+- gui/frontwindowselections/00selectiontabbegin.rwd
+- gui/zzcoreguiend/yy9rwdend.rwd
 - installed/temp.rb
 - rwd_files/tinker.png
 - rwd_files/favicon.ico
@@ -180,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rwdapplications
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: rwdtinker application is a framework to program for RubyWebDialogs.

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

@@ -1,27 +0,0 @@
-# code in install rwdtinker applets - now uses ruby.zip module
-def installapplet
-
-	nametext = "%s" % [@a_installapplet]
-
-	begin # exception trapped block
-
-
-		require 'extras/zip/zip'
-		fullname =  nametext + ".zip"
-		fileName = File.join($zipslocation,fullname)
-
-		zf = Zip::ZipFile.new(fileName)
-		zf.sort.each {
-		
-			|entry|
-			zf.extract(entry.to_s, entry.to_s)
-		}
-		@returninitateresults = initiateapplet(nametext)
-		@installapplettext = Message[:applet_installed] + " " +   @returninitateresults 
-
-	rescue
-		@installapplettext = "unzip error - applet may not be installed correctly"
-	end # exception rescue
-
-end
-

data/lib/temp.rb

@@ -1 +0,0 @@
-# this file does nothing