visualruby 3.1.11 → 3.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dff4419936129ec895048b530c4d650ecbb36046
-  data.tar.gz: de2d3ef93f67cf8b69557a61ba57ba4cae98ff5e
+  metadata.gz: e967b476050bebb494a5f0a515d7adb9b72e4954
+  data.tar.gz: 8ff6c40b576ac24d3412b88b88d5961af5c88462
 SHA512:
-  metadata.gz: 11e260a5b247e13210c38d82d337e584d4900d7766cc1a223e3607f5bb4e6fd2f7c3410a794c320bf6b29d872183dc39e74fd6d1bf215a544dd32613f72d5d16
-  data.tar.gz: a85226146021efaad4d304220d2c0d2e8b381d2310c341e8d024532ef1774a838e3e0e7d715169c63ff389f043fd8366fcc0da23193a3bef5ea6fd6f63b518a3
+  metadata.gz: 3d20446fb57553c073f852c6da86cbed39172a9fdf5c52ae72de4181d2848cc5447dd67d83f54995e9731d96c73a3cfa6c7963931610e203fe2b881b014222b2
+  data.tar.gz: de1198fdd197a9fb32fbb4ea374b3ce2cc4c80c138bcfc414ed801fe235ca01ed4b8082f467b7961d7580edd9ce91ccfaee4aa34cabd6ef057d5bc79310403ef

data/.vr_settings.yaml

@@ -6,27 +6,22 @@ panel_pos: 300
 notebook_panel_position: 472
 run_command_line: ruby vr
 open_files:
-- "/home/eric/vrp/vr3/vr"
-- "/home/eric/vrp/vr3/src/editor/VR_Document.rb"
-- "/home/eric/vrp/vr3/src/version.rb"
 - "/home/eric/vrp/vr3/lib/treeview/ListView.rb"
-- "/home/eric/vrp/vr3/lib/treeview/ViewCommon.rb"
-- "/home/eric/vrp/vr3/lib/treeview/TreeView.rb"
-- "/home/eric/vrp/vr3/lib/treeview/columns/ProgressCol.rb"
-- "/home/eric/vrp/vr3/lib/treeview/columns/CellRendererProgress.rb"
-- "/home/eric/vrp/vr3/lib/treeview/columns/TreeViewColumn.rb"
+- "/home/eric/vrp/vr3/vr.gemspec"
+- "/home/eric/vrp/vr3/src/version.rb"
+- "/home/eric/vrp/vr3/src/main/VR_File_Tree.rb"
+- "/home/eric/vrp/vr3/lib/Alert.rb"
+- "/home/eric/vrp/vr3/vr"
+- "/home/eric/vrp/vr3/src/main/VR_Main.rb"
+- "/home/eric/vrp/vr3/lib/GladeGUI.rb"
 open_folders:
 - "/home/eric/vrp/vr3"
 - "/home/eric/vrp/vr3/lib"
-- "/home/eric/vrp/vr3/lib/glade"
-- "/home/eric/vrp/vr3/lib/treeview"
-- "/home/eric/vrp/vr3/lib/treeview/columns"
-- "/home/eric/vrp/vr3/lib/treeview/glade"
 - "/home/eric/vrp/vr3/site"
 - "/home/eric/vrp/vr3/src"
 - "/home/eric/vrp/vr3/src/main"
-current_file: "/home/eric/vrp/vr3/lib/treeview/columns/ProgressCol.rb"
-current_line: 10
+current_file: "/home/eric/vrp/vr3/lib/Alert.rb"
+current_line: 125
 rdoc_command_line: yardoc lib - site/*.*
 builder: !ruby/object:Gtk::Builder {}
 top_level_window: false

data/lib/Alert.rb

@@ -26,19 +26,31 @@ module VR
       @builder[:window1].resize(@flags[:width],100) if @flags[:width].to_i > 100
       @builder[:headline].show if @flags[:headline]
     
-      if text = @flags[:input_text]
+      if @flags[:input_text]
         @flags[:button_yes] ||= "Save"
         @flags[:button_no] ||= "Cancel"
-        @builder[:input_text].show 
+        @builder[:input_text].show
+      elsif choices = @flags[:choices]
+        @flags[:button_yes] ||= "Select"
+        @flags[:button_no] ||= "Cancel"
+        choices.each { |c| @builder[:choices_text].append_text(c) }
+        @choices_text = choices[0]
+        @builder[:choices_text].show 
       end 
 
       @builder[:button_no].show if @flags[:button_no]
       @builder[:button_cancel].show if @flags[:button_cancel]
-       set_glade_hash(@flags)
+      set_glade_hash(@flags)
     end
 
     def button_yes__clicked(but)
-      @answer.answer = @flags[:input_text] ? @builder[:input_text].text : true
+      if @flags[:input_text]
+        @answer.answer = @builder[:input_text].text 
+      elsif @flags[:choices]
+        @answer.answer = @builder[:choices_text].active_text
+      else
+        @answer.answer = true
+      end
       @builder[:window1].destroy
     end
 

data/lib/glade/Alert.glade

@@ -113,6 +113,16 @@
             <property name="position">3</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkComboBoxText" id="choices_text">
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
       </object>
     </child>
   </object>

data/lib/treeview/ListView.rb

@@ -21,7 +21,7 @@ module VR
 # from ActiveRecordBase.  The common types that are included by default are:
 #
 # * String - Displays and edits as a String.
-# * Integer - Displays number, edits like a String.
+# * Integer - Displays numadd_activeber, edits like a String.
 # * FixNum - ditto
 # * Integer - ditto
 # * Float - ditto
@@ -60,11 +60,11 @@ module VR
       ar.each do |obj|
         row = add_row()
         matches.each do |f|
-          begin  
-            row[f] = obj[f]    #     unless obj[f].nil?
-          rescue
-            row[f] = obj[f].to_s
-          end
+#          begin  
+            row[f] = obj[f] unless obj[f].nil?
+#          rescue
+#            row[f] = obj[f].to_s
+#          end
         end          
       end
       self.visible = true

data/src/main/VR_Main.rb

@@ -10,7 +10,7 @@ class VR_Main
     @proj_path = @proj_path.chomp("/")
   end
 
-  def before_show
+  def before_show
     # there must be a visualruby directory:
     required_project = File.join(ENV["HOME"],"","visualruby", "examples", "alert_box")
     menuInstallExamples__activate if not File.directory?(required_project)

data/src/version.rb

@@ -1 +1 @@
-VERSION = "3.1.11"
+VERSION = "3.1.12"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visualruby
 version: !ruby/object:Gem::Version
-  version: 3.1.11
+  version: 3.1.12
 platform: ruby
 authors:
 - Eric Cunningham
@@ -9,7 +9,7 @@ autorequire:
 bindir:
 - "."
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2018-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3