visualruby 1.0.19 → 3.0.2

data/{visualruby_examples → examples}/child_window/bin/glade/MyChildClass.glade

@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="window1">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Title</property>
     <property name="modal">True</property>
-    <signal name="destroy" handler="destroy_window" swapped="no"/>
+    <property name="window_position">center</property>
     <child>
-      <object class="GtkVBox" id="vbox1">
+      <object class="GtkBox" id="box1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="margin_left">30</property>
+        <property name="margin_right">30</property>
+        <property name="margin_top">30</property>
+        <property name="margin_bottom">30</property>
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkLabel" id="label1">
+          <object class="GtkLabel" id="labelMessage">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xpad">80</property>
@@ -27,28 +30,27 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox1">
+          <object class="GtkButtonBox" id="buttonbox1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="layout_style">spread</property>
             <child>
               <object class="GtkButton" id="buttonCancel">
                 <property name="label" translatable="yes">Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="padding">10</property>
             <property name="position">1</property>
           </packing>
         </child>

data/examples/child_window/main.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/ruby
+
+#Updated for Gtk3!
+
+# ignore -- this is for development, same as require 'vrlib'
+require File.exists?("./../../vrlib/vrlib.rb") ?  "./../../vrlib/vrlib.rb" : "vrlib"
+
+# from require_all gem:
+require_rel 'bin/'
+
+ChildWindowDemo.new.show_glade()
+

data/{visualruby_examples → examples}/drag_drop/bin/DragDropDemo.rb

@@ -4,14 +4,13 @@ class DragDropDemo
 	include GladeGUI
 
 	def before_show()
-		@treeview1 = "I'm a widget named textview2.\n\nTry dragging a file or the button onto me."
-		@view = VR::FileTreeView.new("./img")
+		@window1 = "Drag and Drop Demo"
+		@textview1 = "I'm a widget named textview1.\n\nTry dragging a file or the button onto me."
+		@view = VR::FileTreeView.new(Dir.pwd,"./img")
 		@view.refresh()
-    @builder["scrolledwindow1"].add(@view)
-		@view.drag_to(@builder["textview1"])
-		@view.drag_to(@builder["button1"])
-		drag_to(@builder["button1"], @builder["textview1"])
-		drag_to(@builder["textview1"], @builder["button1"])
+		@view.expand_row(@view.model.iter_first.path, false)
+   @builder["scrolledwindow1"].add(@view)
+		set_drag_drop("button1" => "textview1", @view => "textview1", "textview1" => "button1")
 	end	
 
 
@@ -19,7 +18,7 @@ class DragDropDemo
 #    receives a drag_drop signal, an instance variable named dragged_widget is set automatically set
 #    by visualruby containing a reference to the dragged widget:
 
-	def button1__drag_drop(*args)
+	def button1__drag_drop(widget, *args)
 		but1 = @builder["button1"]
 		if but1.dragged_widget.is_a?(Gtk::TextView)
 			but1.label = but1.dragged_widget.buffer.text.slice(0,15) 
@@ -28,11 +27,11 @@ class DragDropDemo
 		end
 	end
 
-	def textview1__drag_drop(*args)
+	def textview1__drag_drop(widget, context, *args)
 		tv1 = @builder["textview1"]
 		if tv1.dragged_widget == @view
 			path = @view.get_selected_path()
-			tv1.buffer.text = File.directory?(path) ? path :  File.read(path)
+			tv1.buffer.text = File.basename(path)
 		elsif tv1.dragged_widget.is_a?(Gtk::Button)
 			tv1.buffer.text = tv1.dragged_widget.label
 		end

data/examples/drag_drop/bin/glade/DragDropDemo.glade

@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
+<interface>
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkWindow" id="window1">
+    <property name="width_request">650</property>
+    <property name="height_request">500</property>
+    <property name="can_focus">False</property>
+    <property name="window_position">center</property>
+    <property name="default_width">650</property>
+    <property name="default_height">500</property>
+    <child>
+      <object class="GtkBox" id="box1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_left">10</property>
+        <property name="margin_right">10</property>
+        <property name="margin_top">10</property>
+        <property name="margin_bottom">10</property>
+        <property name="vexpand">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">10</property>
+        <child>
+          <object class="GtkFrame" id="frame1">
+            <property name="width_request">520</property>
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">in</property>
+            <child>
+              <object class="GtkAlignment" id="alignment1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="top_padding">12</property>
+                <property name="bottom_padding">13</property>
+                <property name="left_padding">13</property>
+                <property name="right_padding">13</property>
+                <child>
+                  <object class="GtkLabel" id="label2">
+                    <property name="width_request">600</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">With visualruby, you can drag-n-drop any widget onto another widget.  Try dragging files or the button onto the textview in the middle of the screen.  Also, try dragging between the textview and the button.</property>
+                    <property name="wrap">True</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;Instructions&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="padding">5</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">17</property>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="margin_top">5</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="shadow_type">in</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFrame" id="frame2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">etched-out</property>
+                <child>
+                  <object class="GtkScrolledWindow" id="scrolledwindow2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="shadow_type">in</property>
+                    <child>
+                      <object class="GtkTextView" id="textview1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">textview1 </property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="padding">10</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButtonBox" id="buttonbox1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="layout_style">spread</property>
+                <child>
+                  <object class="GtkButton" id="button1">
+                    <property name="label" translatable="yes">button1</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="yalign">0.63999998569488525</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

data/examples/drag_drop/main.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/ruby
+
+# ignore -- this is for development, same as require 'vrlib'
+require File.exists?("./../../vrlib/vrlib.rb") ?  "./../../vrlib/vrlib.rb" : "vrlib"
+
+# from require_all gem:
+require_rel 'bin/'
+
+
+DragDropDemo.new.show_glade()
+

data/examples/filetreeview/bin/ProjectTree.rb

@@ -0,0 +1,32 @@
+
+class ProjectTree < VR::FileTreeView  #(change name)
+ 
+	attr_accessor :ftv
+
+	include GladeGUI
+
+	def initialize()
+		path = File.join(ENV["HOME"], "visualruby")
+		super(path,  "/home/eric/vrp/vr3/img")
+		@test_block = proc { |folder| has_settings_file?(folder) }
+	end
+
+  def self__row_activated(_self, path, col)
+  		row = vr_row(get_iter(path))
+			if File.exists?(File.join(row[:path], ".vr_settings.yaml")) #test if its a vr project.
+ 				alert "You selected:		\n\n" + row[:file_name]
+			else
+				expand_or_collapse_folder()
+			end
+	end
+
+	def has_settings_file?(path)
+		Find.find(path) do |file|
+  		if File.basename(file) == ".vr_settings.yaml"
+				return true
+			end
+		end
+		return false
+	end
+
+end

data/examples/filetreeview/bin/ProjectTreeGUI.rb

@@ -0,0 +1,28 @@
+
+class ProjectTreeGUI #(change name)
+ 
+	attr_accessor :ftv
+
+	include GladeGUI
+
+	def before_show()
+		@ftv = ProjectTree.new()
+		@builder["scrolledwindow1"].add(@ftv)  #needs show_all
+		@open_folders = []
+	end	
+
+	def show_expanders__toggled(*a)
+		@ftv.set_show_expanders(@builder[:show_expanders].active?)
+	end
+
+	def save_state__clicked(*a)
+		@open_folders = @ftv.get_open_folders()
+		alert("Saving folders: " + @open_folders.to_s, :parent=>self)
+	end
+
+	def load_state__clicked(*a)
+		@ftv.refresh( :open_folders => @open_folders )
+	end
+
+end
+

data/examples/filetreeview/bin/glade/ProjectTreeGUI.glade

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
+<interface>
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkWindow" id="window1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">FileTreeView Demo</property>
+    <property name="modal">True</property>
+    <property name="window_position">center</property>
+    <property name="default_width">400</property>
+    <property name="default_height">600</property>
+    <child>
+      <object class="GtkBox" id="box1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_left">20</property>
+        <property name="margin_right">20</property>
+        <property name="margin_top">20</property>
+        <property name="margin_bottom">20</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">10</property>
+        <child>
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">&lt;big&gt;FileTreeView Demo&lt;/big&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFrame" id="frame1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">in</property>
+            <child>
+              <object class="GtkAlignment" id="alignment1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">This filetreeview shows only the folders that contain the hidden file, .vr_settings.  This is how a visualruby project is identified.</property>
+                    <property name="wrap">True</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Instructions</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="margin_top">8</property>
+            <property name="margin_bottom">8</property>
+            <property name="vexpand">True</property>
+            <property name="shadow_type">in</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkCheckButton" id="show_expanders">
+                <property name="label" translatable="yes">Show Expanders</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="xalign">0</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButtonBox" id="buttonbox1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="layout_style">spread</property>
+                <child>
+                  <object class="GtkButton" id="load_state">
+                    <property name="label" translatable="yes">Load State</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="save_state">
+                    <property name="label" translatable="yes">Save State</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

data/examples/filetreeview/main.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/ruby
+
+# ignore -- this is for development, same as require 'vrlib'
+require File.exists?("./../../vrlib/vrlib.rb") ?  "./../../vrlib/vrlib.rb" : "vrlib"
+require 'find'
+
+
+# from require_all gem:
+require_rel 'bin/'
+
+
+ProjectTreeGUI.new.show_glade()
+

data/{visualruby_examples → examples}/listview/bin/SongListView.rb

@@ -14,24 +14,26 @@ class SongListView < VR::ListView
 	def initialize 
 		@cols = {}
 		@cols[:pix] = {:pix => Gdk::Pixbuf, :song => String } #two renderers in this column
-		@cols[:date] = DateTime
+		@cols[:date] = VR::CalendarCol # DateTime
 		@cols[:artist] = String
 		@cols[:first_name] = String	  
 		@cols[:last_name] = String
 		@cols[:popular] = VR::ProgressCol
 		@cols[:buy] = VR::ComboCol
 		@cols[:quantity] = VR::SpinCol
-    @cols[:price] = VR::CurrencyCol
+   	@cols[:price] = VR::CurrencyCol
 		@cols[:check] = TrueClass
 		super(@cols)
 
 		col_sort_column_id(:artist => id(:last_name), :song => id(:song), :first_name=> id(:first_name))
+		col_sort_column_id(:last_name => id(:last_name), :popular => id(:popular))
 		col_sort_column_id(:last_name => id(:last_name), :popular => id(:popular), :buy=> id(:buy))
-		col_sort_column_id(:quantity => id(:quantity), :price => id(:price), :check => id(:check), :date => id(:date))
-
-		col_title(:first_name => "First", :last_name => "Last", :quantity => "Qty", :check => "Ok")
-		ren_width(:buy => 70, :popular => 80, :quantity => 40)
-		ren_attr(:price, :edit_inline => true)
+		col_sort_column_id(:check => id(:check), :date => id(:date))
+		col_sort_column_id(:price => id(:price), :check => id(:check), :date => id(:date))
+		col_sort_column_id(:quantity => id(:quantity))
+		col_title(:first_name => "First", :last_name => "Last", :check => "Ok", :quantity => "Qty")
+		ren_width(:popular => 80, :check=> 20, :buy => 80, :quantity=>90)
+#		ren_attr(:price, :edit_inline => true)
 		ren_editable(true)
 	
 		# this block executes after ARTIST is edited ("edited" event).   
@@ -46,30 +48,32 @@ class SongListView < VR::ListView
 			if text.split.size == 2 # insist on two names
 				true
 			else
-				VR::Dialog.message_box("You must enter two names.")
+				alert("You must enter two names.", :parent => self)
 				false
 			end 
 		} 
 		refresh()
+		self.visible = true
 	end		
 
 	# this just loads the data into the model
 	def refresh()
 		data = get_data() # returns array of songs
 		(0..6).each do |i|
-			row = add_row()
-  		row[:pix] = AUDIO_ICON   
-  		row[:first_name] = data[i][0]
-  		row[:last_name] = data[i][1]
-  		row[:artist] = row[:first_name] + " " + row[:last_name]
-  		row[:song] = data[i][2]
-  		row[:quantity] = VR::SpinCol.new(0,0,100,1)
-			row[:price] = VR::CurrencyCol.new(2.99)
-  		row[:popular] = data[i][3]
-  		row[:buy] = VR::ComboCol.new("Buy", "Buy", "Rent", "Listen") # all rows use the same combobox
-  		row[:check] = false
-			row[:date] = data[i][4]
+			row = model.append # add_row()
+  		row[id(:pix)] = AUDIO_ICON   
+  		row[id(:first_name)] = data[i][0]
+  		row[id(:last_name)] = data[i][1]
+  		row[id(:artist)] = row[id(:first_name)] + " " + row[id(:last_name)]
+  		row[id(:song)] = data[i][2]
+  		row[id(:quantity)] = VR::SpinCol.new(0,0,100,1) # Gtk::Adjustment.new(0,0,100,1,0,0)  # 
+			row[id(:price)] = VR::CurrencyCol.new(2.99)
+  		row[id(:popular)] = data[i][3]
+  		row[id(:buy)] = VR::ComboCol.new("Buy", "Buy", "Rent", "Listen") # all rows use the same combobox
+  		row[id(:check)] = false
+			row[id(:date)] = VR::CalendarCol.new(data[i][4], :format => "%d %b %Y ", :hide_time=>true, :hide_date => false)
 		end
+
 	end
 
 	def get_data