manqod 1.1575.0 → 1.1580.0

data/lib/About.rb

@@ -24,7 +24,7 @@ class About < Gtk::VBox
 		Gem.cache.gems.each_pair{|key,gem| v.add(gem.name,gem.version) if gem.name.include?("manqod") }
 		pack_start(Gtk::Label.new("User logged in: #{nick}"))
 		pack_start(Gtk::Label.new("Homepage of manqod: http://manqod.sourceforge.net"))
-		pack_start(Gtk::Label.new("LICENCE: CDDL
+		pack_start(Gtk::Label.new("LICENSE: CDDL
 the author of this program(manqod) is Dobai-Pataky Balint(dpblnt@gmail.com)
 manqod is released under the CDDL licence(http://www.opensource.org/licenses/cddl1.php) don't worry this only means the following: 
 * you can use it, copy it, modify it

data/lib/FormHolder/Form.rb

@@ -111,7 +111,7 @@ class MyForm < Gtk::Notebook
 		@ag=ag
 		ag.connect(Gdk::Keyval::GDK_KEY_space, Gdk::Window::CONTROL_MASK, Gtk::ACCEL_VISIBLE){
 			focused=@caller.holder.focus.parent
-			if focused and focused.class.name=="MySourceView"
+			if focused && ["MySourceView"].include?(focused.class.name)
 				ret=focused.test_content
 				if ret
 					tell_exception("query is ok","fields: #{ret.num_fields}\n rows: #{ret.num_rows}","sql","normal",false)
@@ -120,13 +120,13 @@ class MyForm < Gtk::Notebook
 		}
 		ag.connect(Gdk::Keyval::GDK_KEY_f, Gdk::Window::CONTROL_MASK, Gtk::ACCEL_VISIBLE){
 			unless @caller.holder.focus.nil?
-				if (focused=@caller.holder.focus.parent) && focused.class.name == "MySourceView" then 
+				if (focused=@caller.holder.focus.parent) && ["MyRendererMultiline","MySourceView"].include?(focused.class.name) then 
 					focused.run_search(self)
 				end
 				if (focused=@caller.holder.focus.parent) && ["MyRendererComboWithNew","MyRendererCombo","MyRendererConstCombo","FieldCombo"].include?(focused.class.name) then
 					focused.model.filterer.run(self)
 				end
-				if (focused=@caller.holder.focus.parent.parent) && focused.class.name == "MyRendererList" then 
+				if (focused=@caller.holder.focus.parent.parent) && ["MyRendererList","FieldList"].include?(focused.class.name) then 
 					focused.model.filterer.run(self)
 				end
 			end

data/lib/FormHolder/Form/InputHolder.rb

@@ -8,7 +8,9 @@ class MyInputHolder
 	include Observable
 	include GtkAttributes
 
-
+# The InputHolders is a container widget, holds input widets for the Form
+#* item is a hash read from mysql
+#* caller is the parent widget, usually the Form
 	def initialize(item,caller)
 		@item=item
 		@visibility=true
@@ -228,7 +230,7 @@ class MyInputHolder
 		item['querysql']=add_where(item['querysql'],"#{guess_base(item['querysql'])}.id = '" + "#" +"{default}'") if caller.runmode == 'info' && item['querysql'].length>0
 		self
 	end
-	
+# Sets the widget's gtk shadow
 	def set_shadow
 		shadow=case caller.runmode
 			when "info" then Gtk::SHADOW_ETCHED_IN
@@ -247,18 +249,23 @@ class MyInputHolder
 		@widget.set_shadow_type(shadow) unless shadow.nil?
 	end
 
+# Returns the current value of the input widget
 	def text
 		renderer.text if renderer
 	end
-	
+
+# Returns the mysql field name of this widget	
 	def data
 		item['data']
 	end
+
+# Sets the default value, the Form uses this before update
 	def set_default(new_value)
 		item['default']=new_value
 		@default_is_set=true
 		self
 	end
+
 	def unset_default
 		@default_is_set=false
 	end
@@ -267,15 +274,18 @@ class MyInputHolder
 		@default_is_set == true
 	end
 	
+# Returns the default value of the input widget
 	def default
 		item['default']
 	end
-	
+
+# Sets the mysql field of this widget, the Form uses this	
 	def set_data(da)
 		item['data']=da
 		self
 	end
-	
+
+#hides/unhides the widget	
 	def set_visibility(vis)
 		@visibility=vis
 		@widget.set_no_show_all(!@visibility)
@@ -297,31 +307,31 @@ class MyInputHolder
 		set_shadow
 		self
 	end
-	
+# Returns the input widget type
 	def type
 		item['gtktype']
 	end
-	
+# Returns the input widget's initial value(set by the Form on init)
 	def initial
 		item["initial"]
 	end
-	
+# Returns the description of the input widget
 	def description
 		item['description']
 	end
-	
+# Returns the widget's query SQL, if there is one
 	def querySQL
 		item['querysql']
 	end
-	
+# Returns String 'true' if the widget is editable
 	def editable
 		editable?
 	end
-
+# Returns boolean true if the widget is editable
 	def editable?
 		item['editable'].to_s.upcase=='TRUE'
 	end
-	
+
 	def set_editable(ed=item['editable'])
 		item['editable']=parentM.batch? ? ed.to_s.upcase=='TRUE' && batch? : ed.to_s
 		renderer.set_sensitive(self.editable?)
@@ -336,7 +346,7 @@ class MyInputHolder
 	def batch?
 		(gtk_attribute("batch") || "false").upcase == "TRUE"
 	end
-
+# Returns true if the widget will be included in the Form's query buiding; will it be saved?
 	def set_include_in_query_building(iqb=nil)
 		if(iqb.nil?) then
 			@include_in_query_building=nil
@@ -345,37 +355,41 @@ class MyInputHolder
 		end
 		self
 	end
-	
-	def sefmin(l_min)
+# Sets the widget's min value, used only if widget is SpinButton
+	def set_min(l_min)
 		item["min"]=l_min.to_s
 		self
 	end
 
+# Sets the widget's max value, used only if widget is SpinButton
 	def set_max(l_max)
 		item["max"]=l_max.to_s
 		self
 	end
-	
+# Returns widget's min value
 	def get_min
 		item["min"]
 	end
+
+# Returns widget's max value
 	def get_max
 		item["max"]
 	end
-
+# Returns String 'true' if the widget is required to have data entered by the user on Form submit
+# If the widget has no data and the Form is submitted by the user, a warning popup window will be presented to the user
 	def required
 		item['required'].to_s=='true'
 	end
-	
+# Sets the required's value
 	def set_required(req)
 		item['required']=req.to_s
 		self
 	end
-	
+# Returns the widget's target module item
 	def target
 		item['to_call']
 	end
-
+# Returns the widget's target runmode
 	def target_runmode
 		case parentM.runmode 
 			when "info" then "info"
@@ -383,19 +397,19 @@ class MyInputHolder
 			else (text.to_i == -1 || text.to_i == 0 ? "add" : "modify" )
 		end
 	end
-
+# Returns the widget's target module
 	def target_module
 		item['modname']
 	end
-	
+# Sets the widget's target module item
 	def set_target(new_target)
 		item['to_call']=new_target
 	end
-	
+# Returns the parent's selected id, usualy the calling List row's id
 	def parentselected
 		caller.parentselected
 	end
-	
+# Updates the widget
 	def update(notifier=nil,new_value=item['default'])
 		item['default']=new_value
 		edebug("Update notification from #{notifier} for #{data} = [#{new_value}]","form","info")
@@ -406,15 +420,15 @@ class MyInputHolder
 		diff=after-before
 		edebug("#{@item['gtktype']}:#{@item['data']} updated in #{diff.to_s}","time","info")
 	end
-	
+# Returns the parent module	
 	def parentM
 		@caller
 	end
-	
+# Returns true if the widget handles multiediting
 	def multiselector?
 		gtk_attribute("multiselector") == "true"
 	end
-	
+# Returns the item's mysql field value
 	def short_data
 		if i=item['data'].rindex(".")
 			item['data'][i+1 .. item['data'].length]
@@ -422,7 +436,7 @@ class MyInputHolder
 			item['data']
 		end
 	end
-	
+# Runs the item's query sql and sets the item's default to the returned value
 	def run_query
 		@query_result=Hash.new
 		return false if item['querysql'].length<5
@@ -435,19 +449,19 @@ class MyInputHolder
 			item['default']=@query_result[short_data]
 		end
 	end
-
+# This hack returns the contained widget's if this class is called without method
 	def method_missing(sym,*args)
   	renderer
   end
-  
+# Reattaches the widget, useful on dynamic changing Forms and in the wysiwyg editor
   def reattach
   	@caller.reattach(self)
   end
-  
+# Sets if the widget is expanded
   def set_expanded(exp)
   	@expander.set_expanded(exp)
   end
-  
+# Identify this widget
 	def inspect
 		"InputHolder of #{renderer.inspect}"
 	end
@@ -455,5 +469,5 @@ class MyInputHolder
 		inspect
 	end
 
-end #end MyInputHolder
+end
 

data/lib/FormHolder/Form/InputHolder/List.rb

@@ -41,8 +41,6 @@ class MyRendererList < Gtk::VBox
 			set_enable_tree_lines(true)
 			set_rules_hint(true)
 			set_enable_search(false)
-#			enable_search=false
-#			set_search_column(nil)
 		end
 		attr_accessor :pc
 		

data/lib/FormHolder/Form/InputHolder/MultiLine.rb

@@ -11,6 +11,28 @@ class MyRendererMultiline < Gtk::ScrolledWindow
 		@tv=Gtk::TextView.new(@source_buffer = Gtk::TextBuffer.new)
 		add(@tv)
 		@tv.modify_font(Pango::FontDescription.new('Monospace 10'))
+		@found_tag=@tv.buffer.create_tag('found',{'background' => 'yellow'})
+		@search_window=Gtk::Window.new(Gtk::Window::POPUP).set_destroy_with_parent(true).set_modal(true).set_window_position(Gtk::Window::POS_CENTER_ON_PARENT).set_decorated(false)
+		@search_window.add(Gtk::VBox.new.
+			pack_start(Gtk::Label.new("filter: #{item['description']}")).
+			pack_start(@entry=Gtk::Entry.new.set_can_focus(true).set_can_default(true))
+		)
+
+		@entry.signal_connect("key-release-event"){|me,ev|
+			@tv.buffer.remove_tag(@found_tag,@tv.buffer.start_iter,@tv.buffer.end_iter)
+			if ev.keyval == Gdk::Keyval::GDK_KEY_Escape
+				@search_window.hide
+				else
+				start_iter=@tv.buffer.start_iter
+				while bounds=start_iter.forward_search(me.text,Gtk::TextIter::SEARCH_TEXT_ONLY,nil)
+					@tv.buffer.apply_tag(@found_tag,bounds[0],bounds[1])
+					start_iter=bounds[1]
+				end
+			end
+		}
+		@entry.signal_connect("activate"){|me|
+			@search_window.hide
+		}
 	end
 	attr_accessor :tv
 	attr_accessor :pc
@@ -44,6 +66,10 @@ class MyRendererMultiline < Gtk::ScrolledWindow
 		edebug("#{self} updated to #{item['default']}","form","info")
 		run_events(item['id'],'form_item-AfterUpdate')
 	end
+
+  def run_search(form_holder)
+  	@search_window.set_transient_for(form_holder.get_ancestor(Gtk::Window)).show_all
+  end
   
 	def parentselected
 		@pc.parentselected

data/lib/ListHolder/EditableList/CellRenderers/Combo.rb

@@ -12,7 +12,7 @@ class MyCellRendererCombo < Gtk::CellRendererCombo
 		set_text_column(1)
 		set_has_entry(false)
 		
-		set_ellipsize(Pango::ELLIPSIZE_END)
+		set_ellipsize(column.pango_ellipsize)
 		set_ellipsize_set(true)
 		set_mode(Gtk::CellRenderer::MODE_EDITABLE)
 

data/lib/ListHolder/EditableList/CellRenderers/Text.rb

@@ -6,7 +6,7 @@ class MyCellRendererText < Gtk::CellRendererText
 	def initialize(column)
 		@jump_to_next=false
 		super()
-		set_ellipsize(Pango::ELLIPSIZE_END)
+		set_ellipsize(column.pango_ellipsize)
 		set_ellipsize_set(true)
 #		set_wrap_mode(Pango::WRAP_WORD)
 		signal_connect("edited") { |me,path,new_value|

data/lib/ListHolder/EditableList/Column.rb

@@ -194,6 +194,21 @@ class MyColumn < Gtk::TreeViewColumn
 			end
 		end
 	end
+	
+	def pango_ellipsize
+		if gtk_attribute("ellipsize")
+			case gtk_attribute("ellipsize")
+				when 'NONE' then Pango::ELLIPSIZE_NONE
+				when 'START' then Pango::ELLIPSIZE_START
+				when 'END' then Pango::ELLIPSIZE_END
+				when 'MIDDLE' then Pango::ELLIPSIZE_MIDDLE
+				else Pango::ELLIPSIZE_NONE
+			end
+			else
+			Pango::ELLIPSIZE_NONE
+		end
+	end
+
 	def set_renderers_background
 		unless @list.list_model.column_of_background.nil?
 			add_attribute(@renderer,"cell-background",@list.list_model.column_of_background)

data/lib/ListHolder/EditableList/DrbListModel.rb

@@ -650,14 +650,14 @@ class ListModel
 					sql=sql+", "+moditem['additional_on_insert'] if moditem['additional_on_insert'].length>0
 				else
 					if moditem['additional_on_insert'].length>0 
-						sql=sql+" set #{moditem['additional_on_insert']}"
+						sql="#{sql} set #{moditem['additional_on_insert']}"
 					else 
 						sql="#{sql} () VALUES()";
 					end
 				end
 			end
 		end
-		query(sql)
+		query(eeval("\"#{sql}\""))
 		inserted_id=qrow("select id from #{table} order by id desc limit 1")["id"].to_i
 		row_modified(inserted_id)
 		inserted_id

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1575
+  - 1580
   - 0
-  version: 1.1575.0
+  version: 1.1580.0
 platform: ruby
 authors: 
 - Dobai-Pataky Balint
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-16 00:00:00 +03:00
+date: 2011-10-13 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency