manqod 1.1532.0 → 1.1556.0

data/bin/manqod

@@ -109,6 +109,7 @@ erequire "PrintEditor/ItemInfo/ItemTextAlignment.rb"
 
 erequire 'ListHolder/ListButtonHolder/FilterButton'
 erequire 'ListHolder/ListButtonHolder/ArchiveButton'
+erequire 'ListHolder/ListButtonHolder/LegendsButton'
 erequire 'ListHolder/ListButtonHolder/OrderingButton'
 erequire 'ListHolder/ListButtonHolder/SumPanelButton'
 erequire 'ListHolder/ListButtonHolder/ButtonGroup'

data/lib/Common/Fixnum.rb

@@ -16,3 +16,34 @@ class Fixnum
 		ret
 	end
 end
+
+class Time
+	def wday_non_gb
+		wday==0 ? 6 : wday-1
+	end
+	def strftime_w(str)
+		s=str.clone
+		s.sub!("%W",(strftime("%W").to_i+1).to_s) if str.include?("%W")
+		strftime(s)
+	end
+	def round(res='d')
+		#res can be H=hour,d=day,W=week
+		#Time.gm(0,0,res=="H" ? hour : 0,day,month,year)#,yday - (res=="W" ? wday_non_gb : 0),false)
+		m=month
+		y=year
+		if res=="W"
+			if day <= wday_non_gb
+				t=Time.at(self-7*24*60*60)
+				d=t.day
+				m=t.month
+				y=t.year
+			else
+				d=day - wday_non_gb
+			end
+		else
+			d=day
+		end
+		Time.mktime(y, m, d, res=="H" ? hour : 0)
+	end
+
+end

data/lib/Common/Nick.rb

@@ -29,7 +29,6 @@ class Nick
 	end
 	def ingroup_id?(group_id)
 		@mygroups=ManqodDB.instance.manqod_db.mygroups(@nick).clone if @mygroups.nil?
-		ecode(@mygroups.inspect)
 		@mygroups.has_key?(group_id.to_i)
 	end
 end

data/lib/FormHolder/Form/InputHolder.rb

@@ -97,7 +97,7 @@ class MyInputHolder
 		end
 		
 		#Button in info mode is editable
-		item["editable"]="false" if item['gtktype']!='gtk_button' if caller.runmode == 'info'
+		item['editable']=(item['gtktype']=='gtk_button').to_s if caller.runmode == 'info'
 		@widget.set_border_width(1)
 
 		@widget.add(@eventbox=Gtk::EventBox.new)
@@ -225,6 +225,7 @@ class MyInputHolder
 			item['querysql']="#{item['querysql']} #{(gtk_attribute("tree_key").nil? ? "order by":",")} #{s[2..s.length]}" if s.length>0
 			edebug("generated query:#{querySQL}","sql")
 		end
+		item['querysql']=add_where(item['querysql'],"#{guess_base(item['querysql'])}.id = '" + "#" +"{default}'") if caller.runmode == 'info' && item['querysql'].length>0
 		self
 	end
 	
@@ -314,7 +315,7 @@ class MyInputHolder
 	end
 	
 	def editable
-		item['editable'].to_s=='true'
+		editable?
 	end
 
 	def editable?

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

@@ -96,7 +96,7 @@ class MyRendererButton < Gtk::Button
 				s="#{s}#{@pc.query_result[key]}" if @pc.query_result.has_key?(key)
 			}
 			set_label(s)
-		  set_image(Gtk::Image.new((text=="-1" || text=="0" ? Gtk::Stock::ADD : Gtk::Stock::EDIT ),Gtk::IconSize.from_name(get_conf(0,0,"button-size"))))
+		  set_image(Gtk::Image.new((parentM.runmode=='info' ? Gtk::Stock::INFO : (text=="-1" || text=="0" ? Gtk::Stock::ADD : Gtk::Stock::EDIT )),Gtk::IconSize.from_name(get_conf(0,0,"button-size"))))
 		  notify_changes
 		end
 		edebug("#{text} updated","gtk_button","info")

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

@@ -80,10 +80,10 @@ class MyFileChooserButton < Gtk::FileChooserWidget
   	ftp=Net::FTP.new(@ftp[0],@ftp[1],@ftp[2])
   	@ftp[3].each("/"){|s|
 			begin
-				ecode("changing ftp dir: #{s}")
+				einfo("changing ftp dir: #{s}","form")
 				ftp.chdir(s)
 			rescue =>err
-				ecode("creating ftp dir: #{s}")
+				einfo("creating ftp dir: #{s}","form")
 				ftp.mkdir(s)
 				retry
 			end
@@ -105,11 +105,11 @@ class MyFileChooserButton < Gtk::FileChooserWidget
 		set_conf(0,item['id'],"path",current_folder)
   	ftp=Net::FTP.new(@ftp[0],@ftp[1],@ftp[2])
   	@ftp[3].each("/"){|s|
-			ecode("changing ftp dir: #{s}")
+			einfo("changing ftp dir: #{s}","form")
 			ftp.chdir(s)
 		} if @ftp[3]
   	perc=0
-  	ecode(item["initial"])
+  	einfo(item["initial"],"form")
   	ftp.getbinaryfile(item["initial"],filename,ftp.size(item["initial"])/100){
   		progress.set_fraction(perc/100.0)
   		Gtk.show_thread_changes

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

@@ -121,7 +121,7 @@ class QBuilder <  Gtk::HPaned
 					}
 					begin
 						i=model.append
-						row.each{|k,v| i[headers.index(k)]=v}
+						row.each{|k,v| i[headers.key(k)]=v}
 					end while (row=res.fetch_hash(true))
 					sview.set_model(model)
 					w.vbox.add(Gtk::ScrolledWindow.new.add(sview).set_policy(Gtk::POLICY_AUTOMATIC,Gtk::POLICY_AUTOMATIC)).set_size_request(600,400)
@@ -189,7 +189,7 @@ class QBuilder <  Gtk::HPaned
 			when "QBuilder"
 				#we update ourself
 			else
-				edebug("notifier: #{new_value.class.name}","relation-builder",WARNING)
+				ewarn("notifier: #{new_value.class.name}","relation-builder")
 		end
 		@qobjects.each{|qobject| qobject.update}
 		test_query if @autotest.active?

data/lib/FormHolder/Form/InputHolder/QBuilder/QObject.rb

@@ -109,7 +109,7 @@ class QObject < Gtk::HBox
 		ret=rel.rfield1 if rel.rfield1.table.table_id.to_i == @q.base_object.obj_id.to_i
 		ret=rel.rfield2 if rel.rfield2.table.table_id.to_i == @q.base_object.obj_id.to_i
 		unless ret
-			@q.rb.relations.each{|r|
+			@q.rb.relations.each_pair{|rel_id,r|
 				unless been_there.include?(r.relation_id)
 					if r.rfield1.table.table_id == rel.rfield1.table.table_id or r.rfield2.table.table_id == rel.rfield1.table.table_id 
 						if other_dir=find_base_dir(r,been_there)
@@ -172,7 +172,7 @@ class QObject < Gtk::HBox
 			@link=case @obj_type
 				when "b" then @q.rb.table_by_id(@obj_id)
 				when "f" then if table=@q.rb.table_by_id(@obj_id) then table.fields[@field]; end
-				when "r" then @q.rb.relation_by_id(@obj_id)
+				when "r" then @q.rb.relations[@obj_id]
 				else 
 					edebug("unknown type: #{@obj_type}","relation-builder",WARNING)
 					nil

data/lib/Gtk.rb

@@ -69,6 +69,28 @@ module Gtk
 			self
 		end
 	end
+	
+	class TreeIter
+		def next_with_children
+			ret=nil
+			if self.has_child?
+				ret=self.first_child
+			else
+				if clone.next!
+					self.next!
+					ret=self
+					else
+					if par=self.parent
+						if par.clone.next!
+							par.next!
+							ret=par
+						end
+					end
+				end
+			end
+			ret
+		end
+	end
 
   def self.is_windows?
      RUBY_PLATFORM.downcase.include?("mswin") || RUBY_PLATFORM.downcase.include?("mingw")

data/lib/ListHolder.rb

@@ -103,7 +103,7 @@ module Mylist
 		end
 		attr_accessor :list, :list_scroller, :list_panel, :list_id
 		attr_accessor :notebook, :child_placement
-		attr_reader :caller, :parentM, :widget, :info
+		attr_reader :caller, :parentM, :widget, :info, :gantt
 		attr_accessor :buttonholder, :placeholder_button
 
 	def embedd?

data/lib/ListHolder/EditableList.rb

@@ -55,6 +55,11 @@ class MyEditableList < Gtk::TreeView
 		}
 		@tmp=Hash.new
 		@is_embedded=nil
+		@keep_expanded=false
+
+		signal_connect("row-collapsed"){|me, iter, path|
+			me.expand_all if @keep_expanded
+		}
 	end
 	attr_accessor :caller, :selected, :list_id, :list_model, :parentM, :headertypes, :headers, :info, :title, :tip, :pop, :tmp, :is_embedded
 
@@ -157,6 +162,7 @@ class MyEditableList < Gtk::TreeView
 		set_cursor_id(id_to_scroll,scroll)
 		changed
 		notify_observers(self)
+		expand_all if @keep_expanded
 		get_cursor_id
 	end
   
@@ -168,13 +174,12 @@ class MyEditableList < Gtk::TreeView
 		case get_conf(0,0,"list-tooltip")
 			when "filters" then
 				t="filters:"
-				@caller.list_filter_panel.list_filter.columns.each_key{|key|
-					h=@caller.list_filter_panel.list_filter.columns[key].header
-					fl=get_conf(get_id,h['id'],"filter")
-					case h['type']
+				@caller.list_panel.list_filter.columns.each_value{|frenderer|
+					fl=get_conf(get_id,frenderer.header['id'],"filter")
+					case frenderer.header['type']
 						when 'gtk_combo', 'gtk_const_combo' then fl = (fl=="-1" or fl=="") ? "" : "=#{fl}"
 					end
-					t+="\n#{h['header']}: #{fl}" if !fl.nil? and fl.length>0
+					t+="\n#{frenderer.header['header']}: #{fl}" if !fl.nil? and fl.length>0
 				}
 				t="#{t}\nnone" if t=="filters:"
 				@tip.set_tip(self,t,'extra hint')
@@ -187,6 +192,7 @@ class MyEditableList < Gtk::TreeView
 			edebug(" can't update","list","error")
 			return
 		end
+		@keep_expanded=(gtk_attribute("keep_expanded") || "false") == "true"
 		set_model(nil)
 		@list_model.create_skeleton
 		set_info("initializing")
@@ -283,6 +289,25 @@ class MyEditableList < Gtk::TreeView
 		next_col
 	end
 
+	def column_by_id(column_id)
+		ret=nil
+		columns.each{|col|
+			if col.header['id'].to_i == column_id.to_i
+				ret=col
+				break
+			end
+		}
+		ret
+	end
+
+	def columns_height
+		colh=0
+		columns.each{|col|
+			colh=col.header_widget.allocation.height if col.header_widget.allocation.height > colh
+		}
+		colh
+	end
+
 	def wipe
 		save_config
 		set_model(nil)

data/lib/ListHolder/EditableList/Column.rb

@@ -34,8 +34,10 @@ class MyColumn < Gtk::TreeViewColumn
 		end
 
 		super(header['header'],@renderer,attributes)
-		set_widget(header_widget=Gtk::Label.new(header['header']).set_visible(true))
+		set_widget(@header_widget=Gtk::Label.new(header['header']).set_visible(true))
 		header_widget.set_angle(gtk_attribute("header_angle").to_f) if gtk_attribute("header_angle")
+		@list.tip.set_tip(header_widget,header['header'],'extra hint')
+		@list.tip.enable
 		#set color
 #		header_widget.modify_fg(Gtk::STATE_NORMAL,Gdk::Color.new(0,35000, 0))
 #		header_widget.modify_fg(Gtk::STATE_PRELIGHT,Gdk::Color.new(0,35000, 0))
@@ -122,7 +124,7 @@ class MyColumn < Gtk::TreeViewColumn
 =end
 	end
 	attr_accessor :list
-	attr_accessor :header
+	attr_accessor :header, :header_widget
 	attr_accessor :renderer
 	attr_reader :decimals_attribute, :duration_format, :timestamp_format
 	

data/lib/ListHolder/EditableList/DrbListModel.rb

@@ -39,6 +39,7 @@ class ListModel
 	attr_reader :column_of_gantt_start, :column_of_gantt_duration, :column_of_gantt_successors, :column_of_gantt_group, :column_of_gantt_group_color, :column_of_gantt_partial, :column_of_gantt_percentage
 	attr_reader :show_archive, :archive_key
 	attr_reader :headers, :headertypes
+	attr_reader :foreground_legend, :background_legend
 
 
 	def drbmodel
@@ -57,7 +58,7 @@ class ListModel
 	def resubscribe
 		begin
 			@remote_model=manqod_db.moditem(get_id)
-			drbmodel.subscribe(self)
+			drbmodel.subscribe(ManqodRPC.instance.to_s,self)
 		rescue =>err
 			retry if warn("can't reconnect to server",err.to_s,"list",ERROR,false,true)
 		end
@@ -72,7 +73,7 @@ class ListModel
 
 	def wipe
 		begin
-	  	drbmodel.unsubscribe(self) if @remote_model && @remote_model.alive?
+	  	drbmodel.unsubscribe(ManqodRPC.instance.to_s) if @remote_model && @remote_model.alive?
 	  rescue =>err
 	  	eerror("unsubscribing: #{err}","main")
 	 	end
@@ -174,7 +175,7 @@ class ListModel
 #		list.progress.pulse(list.get_id)
 #		@thread=Thread.new{
 		begin
-			drbmodel.unsubscribe(self) unless @remote_model.nil?
+			drbmodel.unsubscribe(ManqodRPC.instance.to_s) unless @remote_model.nil?
 		rescue => err
 			ewarn("server model is gone")
 		end
@@ -215,7 +216,7 @@ class ListModel
 		@column_of_fetch_filter=moditem_attributes[:column_of_fetch_filter]
 		@archive_key=moditem_attributes[:archive_key]
 
-		drbmodel.subscribe(self)
+		drbmodel.subscribe(ManqodRPC.instance.to_s,self)
 
 
 		@parentM=list.parentM.get_model if list.parentM
@@ -287,6 +288,9 @@ class ListModel
 		if gantt_percentage=list.gtk_attribute('gantt_percentage')
 			@column_of_gantt_percentage=headers[gantt_percentage]
 		end
+		
+		@foreground_legend=cache.get("#{get_id}foreground")
+		@background_legend=cache.get("#{get_id}background")
 
 		list.set_info("created")
 #		}
@@ -356,7 +360,7 @@ class ListModel
   	edebug("refiltering #{one}")
   	if one.nil?
   		list.set_model(nil)
-  		list.progress.zero(list.object_id,@rowcount,@moditem["display"])
+  		list.progress.zero(list.object_id,@rows_loaded,@moditem["display"])
   		@thread=Thread.new{
 				r=0
 				@data.each{|model, path, iter|
@@ -382,7 +386,7 @@ class ListModel
 		
 		@filtered_rowcount=0
 		@data.each{|model, path, iter| @filtered_rowcount+=1 if iter[column_of_visible]}
-		list.set_info("#{@filtered_rowcount}/#{@rowcount}")
+		list.set_info("#{@filtered_rowcount}/#{@rows_loaded}")
 		self
 	end
 

data/lib/ListHolder/EditableList/ListPrintOperation.rb

@@ -8,21 +8,22 @@ class ListPrintOperation < Gtk::PrintOperation
 		
 		def initialize(list)
 			@list=list
-			@print_sums=list.gtk_attribute("print_sums") || "true" =="true"
+			@print_sums=(list.gtk_attribute("print_sums") || "true") =="true"
 			@sum_font=list.gtk_attribute("sum_font") || "verdana bold 6"
 			@cell_font=list.gtk_attribute("cell_font") || "verdana 6"
 			@columns_header_font=list.gtk_attribute("columns_header_font") || "verdana bold 6"
 			@header_font=list.gtk_attribute("header_font") || "verdana bold 10"
 			@footer_font=list.gtk_attribute("footer_font") || "verdana 6"
 			@date_font=list.gtk_attribute("date_font") || "verdana 5"
-			@print_date=list.gtk_attribute("print_date") || "true" == "true"
+			@print_date=(list.gtk_attribute("print_date") || "true") == "true"
 			@row_spacing=(list.gtk_attribute("row_spacing") || 1.0).to_f
 			@column_spacing=(list.gtk_attribute("column_spacing") || 1.0).to_f
-			@draw_footer_line=list.gtk_attribute("draw_footer_line") || "true" == "true"
-			@line_above_parent=list.gtk_attribute("line_above_parent") || "true" == "true"
-			@draw_header_line=list.gtk_attribute("draw_header_line") || "true" == "true"
-			@draw_header_cell_borders=list.gtk_attribute("draw_header_cell_borders") || "true" == "true"
-			@fill_header_background=list.gtk_attribute("fill_header_background") || "true" == "true"
+			@draw_footer_line=(list.gtk_attribute("draw_footer_line") || "true") == "true"
+			@line_above_parent=(list.gtk_attribute("line_above_parent") || "true") == "true"
+			@draw_header_line=(list.gtk_attribute("draw_header_line") || "true") == "true"
+			@print_title=(list.gtk_attribute("print_title") || "true") == "true"
+			@draw_header_cell_borders=(list.gtk_attribute("draw_header_cell_borders") || "true") == "true"
+			@fill_header_background=(list.gtk_attribute("fill_header_background") || "true") == "true"
 			@row_underline=(list.gtk_attribute("row_underline") || 0.0).to_f
 
 			if @print_with_child=list.gtk_attribute("print_with_child")
@@ -30,7 +31,7 @@ class ListPrintOperation < Gtk::PrintOperation
 				@child_model=Gtk::TreeModelSort.new(@child_list.list_model.data)
 				@child_model.set_sort_column_id(@child_list.list_model.sorter.sort_column_id[0],@child_list.list_model.sorter.sort_column_id[1]) unless @child_list.list_model.sorter.sort_column_id.nil?
 			end
-			@print_sub_sums=list.gtk_attribute("print_sub_sums") || "true" == "true"
+			@print_sub_sums=(list.gtk_attribute("print_sub_sums") || "true") == "true"
 			@child_indent=(list.gtk_attribute("child_indent") || 100).to_f
 			@child_cell_font=list.gtk_attribute("child_cell_font") || "verdana 5"
 			@child_sum_font=list.gtk_attribute("child_sum_font") || "verdana bold 5"
@@ -40,6 +41,9 @@ class ListPrintOperation < Gtk::PrintOperation
 			@footer_line_width=(list.gtk_attribute("footer_line_width") || 1.0).to_f
 			@cell_line_width=(list.gtk_attribute("cell_line_width") || 0.3).to_f
 			@sum_line_width=(list.gtk_attribute("sum_line_width") || 0.6).to_f
+			
+			@print_with_gantt=(list.gtk_attribute("print_with_gantt") || "false") == "true"
+			@gantt_cell_font=list.gtk_attribute("gantt_cell_font") || "verdana 5"
 
 			@line_width=1
 
@@ -66,8 +70,9 @@ class ListPrintOperation < Gtk::PrintOperation
 						col_cnt+=1
 					end
 				} #summ the width of all columns
+				columns_width_sum+=list.holder.widget.allocation.width - list.allocation.width if @print_with_gantt
 				coef=(width-col_cnt*@column_spacing)/columns_width_sum
-				edebug("colums width sum: #{columns_width_sum}","printing","info")
+				einfo("colums width sum: #{columns_width_sum}","printing")
 				
 				#@column_width will store the column positions on the context
 				@column_width=Hash.new
@@ -80,6 +85,10 @@ class ListPrintOperation < Gtk::PrintOperation
 						col_cur_pos+=@column_width[col.data]+@column_spacing
 					end
 				}
+				if @print_with_gantt
+					@column_pos[:gantt]=col_cur_pos
+					@column_width[:gantt]=(list.holder.widget.allocation.width - list.allocation.width).to_f*coef
+				end
 				if child_list
 					columns_width_sum=@child_indent.to_f
 					col_cnt=0
@@ -90,7 +99,7 @@ class ListPrintOperation < Gtk::PrintOperation
 						end
 					} #summ the width of all columns
 					coef=(width-col_cnt*@column_spacing)/columns_width_sum
-					edebug("child colums width sum: #{columns_width_sum}","printing","info")
+					einfo("child colums width sum: #{columns_width_sum}","printing")
 				
 					#@column_width will store the column positions on the context
 					col_cur_pos=@child_indent.to_f*coef
@@ -109,11 +118,11 @@ class ListPrintOperation < Gtk::PrintOperation
 				@header=HeaderLayout.new(cr,self)
 				@current_height=@current_height+@header.height
 				@columns_header=ColumnsHeaderLayout.new(self,cr,list.columns,@columns_header_font)
-				@columns_header.y=@current_height
+				@columns_header.set_y(@current_height)
 				@current_height=@current_height+@columns_header.height+@row_spacing
 				if child_list
 					@child_columns_header=ColumnsHeaderLayout.new(self,cr,child_list.columns,@child_columns_header_font) if child_list
-					@child_columns_header.y=@current_height
+					@child_columns_header.set_y(@current_height)
 					@current_height=@current_height+@child_columns_header.height+@row_spacing
 				end
 				@headers_height=@current_height
@@ -211,7 +220,7 @@ class ListPrintOperation < Gtk::PrintOperation
 									if @piter.nil?
 										break if past_last=!@piter=list.model.iter_first
 									else
-										break if past_last=!@piter.next!
+										break if past_last=!@piter.next_with_children
 									end
 									@sums.each_key{|key| @sums[key]=@sums[key]+@piter[key].to_f}
 									il=IterLayout.new(cr,@piter,list.columns, self,cell_font)
@@ -237,10 +246,10 @@ class ListPrintOperation < Gtk::PrintOperation
 							il=IterLayout.new(cr,@piter,list.columns, self,cell_font)
 							if lay_it(il)
 								#do not print it twice
-								past_last=!@piter.next!
+								past_last=!@piter.next_with_children
 								break
 							end
-							break if past_last=!@piter.next!
+							break if past_last=!@piter=@piter.next_with_children
 							edebug("piter: #{@piter[list.list_model.column_of_id]} #{@past_last}","printing","debug")
 						end
 				end
@@ -299,7 +308,7 @@ class ListPrintOperation < Gtk::PrintOperation
 	attr_accessor :fill_header_background, :header_line_width
 	attr_accessor :row_spacing
 	attr_accessor :column_spacing
-	attr_reader :cell_line_width, :sum_line_width, :row_underline
+	attr_reader :cell_line_width, :sum_line_width, :row_underline, :print_title, :print_with_gantt, :gantt_cell_font
 		def lay_it(il)
 			if @current_height + il.row_height > @footer.y
 				#page full
@@ -309,8 +318,8 @@ class ListPrintOperation < Gtk::PrintOperation
 				@current_height=@headers_height
 				@page_n=@page_n+1
 			end
-			il.page=@page_n
-			il.y=@current_height
+			il.set_page(@page_n)
+			il.set_y(@current_height)
 			@current_height=@current_height+il.row_height+@row_spacing
 			@iter_layouts.push(il)
 			edebug(il.inspect,"printing")