* add widget demo scripts

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 253 insertions, 4 deletions

diff --git a/ext/tk/MANIFEST b/ext/tk/MANIFEST
index 3fb7b664ef..ee1968984f 100644
--- a/ext/tk/MANIFEST
+++ b/ext/tk/MANIFEST
@@ -68,6 +68,7 @@ sample/demos-en/hscale.rb
 sample/demos-en/icon.rb
 sample/demos-en/image1.rb
 sample/demos-en/image2.rb
+sample/demos-en/image3.rb
 sample/demos-en/images/earth.gif
 sample/demos-en/images/earthris.gif
 sample/demos-en/images/face.xbm
@@ -144,6 +145,7 @@ sample/demos-jp/hscale.rb
 sample/demos-jp/icon.rb
 sample/demos-jp/image1.rb
 sample/demos-jp/image2.rb
+sample/demos-jp/image3.rb
 sample/demos-jp/images/earth.gif
 sample/demos-jp/images/earthris.gif
 sample/demos-jp/images/face.bmp
diff --git a/ext/tk/sample/demos-en/image3.rb b/ext/tk/sample/demos-en/image3.rb
new file mode 100644
index 0000000000..d997ef7772
--- /dev/null
+++ b/ext/tk/sample/demos-en/image3.rb
@@ -0,0 +1,121 @@
+# image3.rb
+#
+# This demonstration script creates a simple collection of widgets
+# that allow you to select and view images in a Tk label.
+#
+# widget demo 'load image' (called by 'widget')
+#
+
+# toplevel widget
+if defined?($image3_demo) && $image3_demo
+  $image3_demo.destroy 
+  $image3_demo = nil
+end
+
+# demo toplevel widget
+$image3_demo = TkToplevel.new {|w|
+  title('Image Demonstration #3')
+  iconname("Image3")
+  positionWindow(w)
+}
+
+# 
+def loadDir(w)
+  w.delete(0,'end')
+  Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
+    w.insert('end',File.basename(f))
+  }
+end
+
+# selectAndLoadDir --
+# This procedure pops up a dialog to ask for a directory to load into
+# the listobx and (if the user presses OK) reloads the directory
+# listbox from the directory named in the demo's entry.
+#
+# Arguments:
+# w -			Name of the toplevel window of the demo.
+def selectAndLoadDir(w, lbox)
+  dir = Tk.chooseDirectory(:initialdir=>$dirName, :parent=>w, :mustexist=>true)
+  if dir.length > 0
+    $dirName.value = dir 
+    loadDir(lbox)
+  end
+end
+
+def loadImage(w,x,y)
+  $image3a.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
+end
+
+
+# label
+msg = TkLabel.new($image3_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "This demonstration allows you to view images using a Tk \"photo\" image.  First type a directory name in the listbox, then type Return to load the directory into the listbox.  Then double-click on a file name in the listbox to see that image."
+}
+msg.pack('side'=>'top')
+
+# frame
+TkFrame.new($image3_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $image3_demo
+      $image3_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'image3'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# variable
+$dirName = TkVariable.new([$demo_dir,'images'].join(File::Separator))
+
+# image
+begin
+  $image3a.delete
+rescue
+end
+$image3a = TkPhotoImage.new
+
+#
+image3_f = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
+
+image3_df = TkLabelFrame.new($image3_demo, :text=>'Directory:')
+
+image3_ff = TkLabelFrame.new($image3_demo, :text=>'File:', 
+			     :padx=>'2m', :pady=>'2m')
+image3_lbx = TkListbox.new(image3_ff, :width=>20, :height=>10) {
+  pack(:side=>:left, :fill=>:y, :expand=>true)
+  yscrollbar(TkScrollbar.new(image3_ff).pack(:side=>:left, :fill=>:y, 
+					     :expand=>true))
+  insert(0, *(%w(earth.gif earthris.gif teapot.ppm)))
+  bind('Double-1', proc{|x,y| loadImage(self, x, y)}, '%x %y')
+}
+
+image3_ent = TkEntry.new(image3_df, :width=>30, :textvariable=>$dirName){
+  pack(:side=>:left, :fill=>:both, :padx=>'2m', :pady=>'2m', :expand=>true)
+  bind('Return', proc{loadDir(image3_lbx)})
+}
+
+TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"Select Dir.", 
+	     :command=>proc{selectAndLoadDir(image3_ent, image3_lbx)}) {
+  pack(:side=>:left, :fill=>:y, :padx=>[0, '2m'], :pady=>'2m')
+}
+
+image3_if = TkLabelFrame.new($image3_demo, :text=>'Image:') {|f|
+  TkLabel.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
+}
+
+Tk.grid(image3_df,  '-',
+	:sticky=>:ew, :padx=>'1m', :pady=>'1m', :in=>image3_f)
+Tk.grid(image3_ff, image3_if, 
+	:sticky=>:nw, :padx=>'1m', :pady=>'1m', :in=>image3_f)
+TkGrid.columnconfigure(image3_f, 1, :weight=>1)
+
diff --git a/ext/tk/sample/demos-en/widget b/ext/tk/sample/demos-en/widget
index 590da01088..647464f84e 100644
--- a/ext/tk/sample/demos-en/widget
+++ b/ext/tk/sample/demos-en/widget
@@ -208,7 +208,9 @@ txt.insert('end', "8. Two labels displaying images.\n", tag_demo, "demo-image1")
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "9. A simple user interface for viewing images.\n", tag_demo, "demo-image2")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "10. Labelled frames (if supported)\n", tag_demo, "demo-labelframe")
+txt.insert('end', "10. A simple user interface for viewing images. (if supported)\n", tag_demo, "demo-image3")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "11. Labelled frames (if supported)\n", tag_demo, "demo-labelframe")
 txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
@@ -506,7 +508,7 @@ end
 #
 def aboutBox
   Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo', 
-		'message'=>"Ruby/Tk widget demonstration Ver.1.3.1-en\n\n( based on Tk 8.1 Copyright (c) 1996-1997 Sun Microsystems, Inc. )\n\nRunning Version :: Ruby#{VERSION}/Tk#{$tk_version}")
+		'message'=>"Ruby/Tk widget demonstration Ver.1.3.2-en\n\n( based on Tk 8.1 Copyright (c) 1996-1997 Sun Microsystems, Inc. )\n\nRunning Version :: Ruby#{VERSION}/Tk#{$tk_version}")
 end
 
 ################################
diff --git a/ext/tk/sample/demos-jp/image3.rb b/ext/tk/sample/demos-jp/image3.rb
new file mode 100644
index 0000000000..84257a2b32
--- /dev/null
+++ b/ext/tk/sample/demos-jp/image3.rb
@@ -0,0 +1,121 @@
+# image3.rb
+#
+# This demonstration script creates a simple collection of widgets
+# that allow you to select and view images in a Tk label.
+#
+# widget demo 'load image' (called by 'widget')
+#
+
+# toplevel widget
+if defined?($image3_demo) && $image3_demo
+  $image3_demo.destroy 
+  $image3_demo = nil
+end
+
+# demo toplevel widget
+$image3_demo = TkToplevel.new {|w|
+  title('Image Demonstration #3')
+  iconname("Image3")
+  positionWindow(w)
+}
+
+# 
+def loadDir(w)
+  w.delete(0,'end')
+  Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
+    w.insert('end',File.basename(f))
+  }
+end
+
+# selectAndLoadDir --
+# This procedure pops up a dialog to ask for a directory to load into
+# the listobx and (if the user presses OK) reloads the directory
+# listbox from the directory named in the demo's entry.
+#
+# Arguments:
+# w -			Name of the toplevel window of the demo.
+def selectAndLoadDir(w, lbox)
+  dir = Tk.chooseDirectory(:initialdir=>$dirName, :parent=>w, :mustexist=>true)
+  if dir.length > 0
+    $dirName.value = dir 
+    loadDir(lbox)
+  end
+end
+
+def loadImage(w,x,y)
+  $image3a.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
+end
+
+
+# label
+msg = TkLabel.new($image3_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "このデモではTkの photo image を使用して画像を 見ることができます。最初にエントリ内ににディレクトリ名を入れて下さい。次に下のリストボックスにこのディレクトリをロードするため、リターンを押してください。その後、画像を選択するためにリストボックスの中のファイル名をダブルクリックして下さい。"
+}
+msg.pack('side'=>'top')
+
+# frame
+TkFrame.new($image3_demo) {|frame|
+  TkButton.new(frame) {
+    text '了解'
+    command proc{
+      tmppath = $image3_demo
+      $image3_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'image3'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# variable
+$dirName = TkVariable.new([$demo_dir,'images'].join(File::Separator))
+
+# image
+begin
+  $image3a.delete
+rescue
+end
+$image3a = TkPhotoImage.new
+
+#
+image3_f = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
+
+image3_df = TkLabelFrame.new($image3_demo, :text=>'ディレクトリ:')
+
+image3_ff = TkLabelFrame.new($image3_demo, :text=>'ファイル:', 
+			     :padx=>'2m', :pady=>'2m')
+image3_lbx = TkListbox.new(image3_ff, :width=>20, :height=>10) {
+  pack(:side=>:left, :fill=>:y, :expand=>true)
+  yscrollbar(TkScrollbar.new(image3_ff).pack(:side=>:left, :fill=>:y, 
+					     :expand=>true))
+  insert(0, *(%w(earth.gif earthris.gif teapot.ppm)))
+  bind('Double-1', proc{|x,y| loadImage(self, x, y)}, '%x %y')
+}
+
+image3_ent = TkEntry.new(image3_df, :width=>30, :textvariable=>$dirName){
+  pack(:side=>:left, :fill=>:both, :padx=>'2m', :pady=>'2m', :expand=>true)
+  bind('Return', proc{loadDir(image3_lbx)})
+}
+
+TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"ディレクトリ選択", 
+	     :command=>proc{selectAndLoadDir(image3_ent, image3_lbx)}) {
+  pack(:side=>:left, :fill=>:y, :padx=>[0, '2m'], :pady=>'2m')
+}
+
+image3_if = TkLabelFrame.new($image3_demo, :text=>'イメージ:') {|f|
+  TkLabel.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
+}
+
+Tk.grid(image3_df,  '-',
+	:sticky=>:ew, :padx=>'1m', :pady=>'1m', :in=>image3_f)
+Tk.grid(image3_ff, image3_if, 
+	:sticky=>:nw, :padx=>'1m', :pady=>'1m', :in=>image3_f)
+TkGrid.columnconfigure(image3_f, 1, :weight=>1)
+
diff --git a/ext/tk/sample/demos-jp/widget b/ext/tk/sample/demos-jp/widget
index 6c9bf2aa7e..6b7c8c43d0 100644
--- a/ext/tk/sample/demos-jp/widget
+++ b/ext/tk/sample/demos-jp/widget
@@ -226,7 +226,10 @@ txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "9. 画像を見るための簡単なユーザインターフェース\n", 
 	   tag_demo, "demo-image2")
 txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "10. ラベル付きフレーム (機能に対応したバージョンのTkが必要)\n", 
+txt.insert('end', "10. 画像を見るための簡単なユーザインターフェース (機能に対応したバージョンのTkが必要)\n", 
+	   tag_demo, "demo-image3")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "11. ラベル付きフレーム (機能に対応したバージョンのTkが必要)\n", 
 	   tag_demo, "demo-labelframe")
 txt.insert('end', " \n ", tag_demospace)
 
@@ -518,7 +521,7 @@ end
 #
 def aboutBox
   Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo', 
-		'message'=>"Ruby/Tk ウィジェットデモ Ver.1.3.0-jp\n\n( based on Tk ウィジェットデモ :: Copyright (c) 1996-1997 Sun Microsystems, Inc. )\n\nRunning Version :: Ruby#{VERSION}/Tk#{$tk_version}#{(Tk::JAPANIZED_TK)? 'jp': ''}")
+		'message'=>"Ruby/Tk ウィジェットデモ Ver.1.3.2-jp\n\n( based on Tk ウィジェットデモ :: Copyright (c) 1996-1997 Sun Microsystems, Inc. )\n\nRunning Version :: Ruby#{VERSION}/Tk#{$tk_version}#{(Tk::JAPANIZED_TK)? 'jp': ''}")
 end
 
 ################################