manqod 1.1559.0 → 1.1570.0

data/lib/Common/Fixnum.rb

@@ -10,6 +10,7 @@ class Fixnum
 		ret=String.new(format)
 		ret.sub!("%j","#{d}")
 		ret.sub!("%d","#{d}")
+		ret.sub!("%h","#{h + d*24}")
 		ret.sub!("%H","#{"%02d" % h}")
 		ret.sub!("%M","#{"%02d" % m}")
 		ret.sub!("%S","#{"%02d" % s.round}")

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

@@ -22,7 +22,7 @@ class QBuilder <  Gtk::HPaned
 			pack_start(@info=Gtk::Table.new(2,3),false).
 			pack_start(Gtk::ScrolledWindow.new.set_policy(Gtk::PolicyType::AUTOMATIC,Gtk::PolicyType::AUTOMATIC).add_with_viewport(@holder=Gtk::VBox.new(false,0))).
 			pack_start(@controls=Gtk::VBox.new,false,true))
-		add2(@rb=RelationBuilder.new(true))
+		add2(@rb=RelationBuilder.new(false))
 
 		@info.attach_defaults(Gtk::Label.new("name"),0,1,0,1).attach_defaults(@name=Gtk::Entry.new,1,2,0,1).
 			attach_defaults(Gtk::Label.new("base"),0,1,1,2).attach_defaults(Gtk::HBox.new.pack_start(@base=Gtk::ComboBox.new(Gtk::ListStore.new(Integer,String))).pack_end(@goto_button=Gtk::Button.new.set_image(Gtk::Image.new(Gtk::Stock::JUMP_TO,Gtk::IconSize.from_name(get_conf(0,0,"button-size")))),false,false),1,2,1,2).

data/lib/ListHolder/EditableList/DrbListModel.rb

@@ -686,6 +686,7 @@ class ListModel
   end
 
 	def iter2csv(iter)
+		separator=(list.gtk_attribute("csv_field_separator") ? list.gtk_attribute("csv_field_separator") : ',')
 		row=""
 		list.columns.each{|col|
 			case col.header["type"] 
@@ -698,7 +699,7 @@ class ListModel
 						else iter[col.colnum].to_s
 				end
 			end
-			row="#{row}#{ct.to_s},"
+			row="#{row}#{ct.to_s}#{separator}"
 		}
 		row="#{row[0..row.length]}\n"
 	end
@@ -706,10 +707,10 @@ class ListModel
 	def to_csv(filename,ids=nil)
 		file = File.new(filename, "wb+")
 		ids=Array.new
-		
+		separator=(list.gtk_attribute("csv_field_separator") ? list.gtk_attribute("csv_field_separator") : ',')
 		row=""
 		list.columns.each{|col|
-			row="#{row}#{col.header['header']},"
+			row="#{row}#{col.header['header']}#{separator}"
 		}
 		file.write("#{row[0..row.length]}\n")
 
@@ -723,11 +724,14 @@ class ListModel
 	end
 	
 	def from_csv(filename)
-		header=true
+		separator=(list.gtk_attribute("csv_field_separator") ? list.gtk_attribute("csv_field_separator") : ',')
+		skip_header_lines=(list.gtk_attribute("csv_skip_header_lines") ? list.gtk_attribute("csv_skip_header_lines").to_i : 1)
+		row_counter=0
 		ids=Array.new
 		IO.foreach(filename){|line|
-			row=line.chomp.split(",")
-			unless header
+			row=line.chomp.split(separator)
+			row_counter+=1
+			if row_counter > skip_header_lines && row.size>0
 				sql="insert into #{base} set"
 				comma=false
 				#child key auto adding
@@ -755,7 +759,6 @@ class ListModel
 				inserted_id=qrow("select id from #{base} order by id desc limit 1")["id"].to_i
 				ids.push(inserted_id)
 			end
-			header=false
 		}
 		drbmodel.rows_changed(ids,nick) if ids.size>0
 		edebug("csv loaded","list")

data/lib/ListHolder/EditableList/ListPrintOperation.rb

@@ -39,7 +39,7 @@ class ListPrintOperation < Gtk::PrintOperation
 
 			@header_line_width=(list.gtk_attribute("header_line_width") || 1.0).to_f
 			@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
+			@cell_line_width=(list.gtk_attribute("cell_line_width") || 0.1).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"
@@ -270,7 +270,23 @@ class ListPrintOperation < Gtk::PrintOperation
 				cr = context.cairo_context
 				@header.draw(cr)
 				@columns_header.draw(cr)
-				@child_columns_header.draw(cr) if child_list
+				if child_list
+					@child_columns_header.draw(cr) 
+				else
+					cr.set_line_width(@cell_line_width)
+					lcol=nil
+					list.columns.each{|col|
+						if col.printable?
+							cr.move_to(@column_pos[col.data],@columns_header.y + @columns_header.height + @header_line_width)
+							cr.line_to(@column_pos[col.data],@footer.y) #FIXME
+							lcol=col
+						end
+					}
+					cr.move_to(@column_pos[lcol.data]+@column_width[lcol.data],@columns_header.y + @columns_header.height + @header_line_width)
+					cr.line_to(@column_pos[lcol.data]+@column_width[lcol.data],@footer.y) #FIXME
+					cr.stroke
+				end
+
 				@footer.draw(cr,page_number)
 				
 				#draw cells	
@@ -319,8 +335,8 @@ class ListPrintOperation < Gtk::PrintOperation
 				@page_n=@page_n+1
 			end
 			il.set_page(@page_n)
-			il.set_y(@current_height)
-			@current_height=@current_height+il.row_height+@row_spacing
+			il.set_y(@current_height).set_row_spacing(@row_spacing)
+			@current_height=@current_height+il.row_height+2*@row_spacing
 			@iter_layouts.push(il)
 			edebug(il.inspect,"printing")
 			page_full

data/lib/ListHolder/EditableList/ListPrintOperation/IterLayout.rb

@@ -8,6 +8,7 @@ class IterLayout
 		@row_height=0
 		@page=0
 		@y=0
+		@row_spacing=1
 		@pop=pop
 		@iter=iter.clone
 		@cell_layouts=Hash.new
@@ -23,7 +24,7 @@ class IterLayout
 				text_cell.set_alignment(col.pango_layout_alignment)
 				text_cell.set_wrap(Pango::Layout::WRAP_WORD_CHAR).set_ellipsize(Pango::Layout::ELLIPSIZE_NONE)
 				text_to_display=case col.header["type"]
-					when "gtk_ordering" then col.path_format(@iter) unless iter.nil?
+					when "gtk_ordering" then col.path_format(@iter) if iter && iter.class.name == "Gtk::TreeIter"
 					when "gtk_duration" then (@iter[col.colnum] || 0).to_i.strftime(col.duration_format)
 					when "gtk_timestamp" then Time.at(@iter[col.colnum] || 0).strftime(col.timestamp_format)
 					when "gtk_const_text" then col.renderer.get_display(@iter[col.colnum].to_s)
@@ -72,6 +73,10 @@ class IterLayout
 		@gr.py1=@y if @gr
 		self
 	end
+	def set_row_spacing(ns)
+		@row_spacing=ns
+		self
+	end
 	def set_page(page)
 		@page=page
 	end
@@ -148,14 +153,14 @@ class IterLayout
 		cr.set_source_rgba(0.1,0.1,0.1,0.7).set_dash(100000)
 		if @line_above
 			cr.set_line_width(@pop.sum_line_width)
-			cr.move_to(min_x,y+@crlw)
-			cr.line_to(max_x,y+@crlw)
+			cr.move_to(min_x,y+@crlw-@row_spacing)
+			cr.line_to(max_x,y+@crlw-@row_spacing)
  	  	cr.stroke
 		end
 		if @pop.row_underline>0
 			cr.set_line_width(@pop.row_underline)
-			cr.move_to(min_x,y+@row_height)
-			cr.line_to(max_x,y+@row_height)
+			cr.move_to(min_x,y+@row_height+@row_spacing)
+			cr.line_to(max_x,y+@row_height+@row_spacing)
  	  	cr.stroke
 		end
 	end

data/lib/ListHolder/ListButtonHolder/ListButton.rb

@@ -12,7 +12,14 @@ class MyButton < Gtk::Button
 	@holder=holder
 	@show_icon=if gtk_attribute('show-mode') then gtk_attribute('show-mode') == 'icon only' || gtk_attribute('show-mode') == 'icon and text' || false else true end
 	@show_text=if gtk_attribute('show-mode') then gtk_attribute('show-mode') == 'text only' || gtk_attribute('show-mode') == 'icon and text' || false else true end
-	@column_of_sensitivity=if gtk_attribute('column-of-sensitivity') then @caller.list.list_model.headers[gtk_attribute('column-of-sensitivity')]["model_col"] else nil end
+	@column_of_sensitivity=nil
+	if gtk_attribute('column-of-sensitivity') 
+		if @caller.list.list_model.headers.has_key?(gtk_attribute('column-of-sensitivity'))
+			@column_of_sensitivity=@caller.list.list_model.headers[gtk_attribute('column-of-sensitivity')]["model_col"] 
+		else
+			warn("You need to add \"#{gtk_attribute('column-of-sensitivity')}\" as Invisible String to #{@caller.list}")
+		end
+	end
 	super()
 	set_use_underline(true)
 	set_relief(Gtk::ReliefStyle::NONE)
@@ -205,8 +212,12 @@ class MyButton < Gtk::Button
 					[Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
 					[Gtk::Stock::CONVERT, Gtk::Dialog::RESPONSE_ACCEPT])
 				filechooser.set_filename(get_conf(@caller.list.list_id,0,"csvfilename")) unless get_conf(@caller.list.list_id,0,"csvfilename").nil?
-				filechooser.add_filter(csv=Gtk::FileFilter.new.add_pattern("*.csv").set_name('csv'))
-				filechooser.set_filter(csv)
+				ftype=(@caller.list.gtk_attribute("file_filter") ? @caller.list.gtk_attribute("file_filter").split(",") : ["*.csv"])
+				ftt=nil
+				ftype.each{|ft|
+					filechooser.add_filter(ftt=Gtk::FileFilter.new.add_pattern(ft).set_name(ft))
+				}
+				filechooser.set_filter(ftt) if ftt
 
 		  	if filechooser.run == Gtk::Dialog::RESPONSE_ACCEPT
   				set_conf(@caller.list.list_id,0,"csvfilename",filechooser.filename)

data/lib/ListHolder/ListPanel/ListSum/Text.rb

@@ -19,7 +19,7 @@ class SumRendererText < Gtk::Label
 		set_text(case column.header['type']
 			when "gtk_int" then number_format(new_value,@column.decimals_attribute)
 			when "gtk_float" then number_format(new_value,@column.decimals_attribute)
-			when "gtk_duration" then Time.at(new_value).strftime(column.duration_format)
+			when "gtk_duration" then new_value.to_i.strftime(column.duration_format)
 		end)
 	end
 	

data/lib/Print/PrintItem.rb

@@ -94,14 +94,14 @@ class PrintItem
 							@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"
-							@row_spacing=list.gtk_attribute("row_spacing").to_f || 1.0
-							@column_spacing=list.gtk_attribute("column_spacing").to_f || 1.0
+							@row_spacing=(list.gtk_attribute("row_spacing") || 1.0).to_f
+							@column_spacing=(list.gtk_attribute("column_spacing") || 1.0).to_f
 							@draw_header_cell_borders=list.gtk_attribute("draw_header_cell_borders")=="true"
 							@fill_header_background=list.gtk_attribute("fill_header_background")=="true"
-							@header_line_width=list.gtk_attribute("header_line_width").to_f || 1.0
+							@header_line_width=(list.gtk_attribute("header_line_width") || 0.5).to_f
 							@draw_header_line=list.gtk_attribute("draw_header_line") == "true"
-							@cell_line_width=list.gtk_attribute("cell_line_width").to_f || 0.3
-							@sum_line_width=list.gtk_attribute("sum_line_width").to_f || 0.6
+							@cell_line_width=(list.gtk_attribute("cell_line_width") || 0.1).to_f
+							@sum_line_width=(list.gtk_attribute("sum_line_width") || 0.3).to_f
 							@print_title=list.gtk_attribute("print_title")=="true"
 							@row_underline=(list.gtk_attribute("row_underline") || 0.0).to_f
 							@print_with_gantt=(list.gtk_attribute("print_with_gantt") || "false") == "true"
@@ -144,7 +144,7 @@ class PrintItem
 							
 							@columns_header=ColumnsHeaderLayout.new(self,cr,list.columns,@columns_header_font).set_y(@current_height)
 							@layouts.push(@columns_header)
-							@current_height += @columns_header.height + @header_line_width
+							@current_height += @columns_header.height + @header_line_width + @row_spacing
 
 							@sum_y=@y+height #max y for iters, when less rows than designed, we'll have the footer @ design position
 							
@@ -180,9 +180,10 @@ class PrintItem
 										edebug("breaking list #{list} to the next page","printing","info")
 										break
 									end
-									il.set_y(@current_height)
-									@current_height+=il.row_height+@row_spacing
+									il.set_y(@current_height).set_row_spacing(@row_spacing)
+									@current_height+=il.row_height+2*@row_spacing
 									@layouts.push(il)
+									edebug("row :#{il.inspect}","printing")
 									@sums.each_key{|key| @sums[key]=@sums[key]+iter[key].to_f}
 								end
 							end

data/lib/PrintEditor.rb

@@ -54,7 +54,11 @@ class WysiwygPrintEditor <  Gtk::Window
 		buttons.append("image",nil,nil,Gtk::Image.new(Gtk::Stock::ADD,is)){set_focused_item(nth_page(tabs.page).put(@tabs.page,'image')) if tabs.page>-1}
 		buttons.append(Gtk::VSeparator.new)
 		buttons.append("clone",nil,nil,Gtk::Image.new(Gtk::Stock::COPY,is)){
-			set_focused_item(nth_page(tabs.page).put(@tabs.page,@focused_item.gtk_type,nil,@focused_item.x+@info.clone_x.value,@focused_item.y+@info.clone_y.value,@focused_item.width,@focused_item.height,@focused_item.text,@focused_item.font,@focused_item.text_alignment)) if tabs.page>-1 && @focused_item
+			set_focused_item(nth_page(tabs.page).
+				put(@tabs.page,@focused_item.gtk_type,nil,@focused_item.x+@info.clone_x.value,@focused_item.y+@info.clone_y.value,@focused_item.width,@focused_item.height,@focused_item.text,@focused_item.font,@focused_item.text_alignment)) if tabs.page>-1 && @focused_item
+		}
+		buttons.append("move",nil,nil,Gtk::Image.new(Gtk::Stock::MEDIA_FORWARD,is)){
+			@focused_item.move_me(@focused_item.x+@info.clone_x.value,@focused_item.y+@info.clone_y.value) if tabs.page>-1 && @focused_item
 		}
 		buttons.append(Gtk::VSeparator.new)
 		buttons.append("remove",nil,nil,Gtk::Image.new(Gtk::Stock::DELETE,is)){
@@ -107,7 +111,7 @@ class WysiwygPrintEditor <  Gtk::Window
 		buttons.append(Gtk::VSeparator.new)
 		signal_connect("destroy"){|me,ev| to_mysql}
 
-		@info=LayItemInfo.new.set_width_request(200)
+		@info=LayItemInfo.new.set_width_request(220)
 
 		tab_holder=Gtk::HPaned.new#(false,0)
 		tab_holder.pack1(tabs,true,true)

data/lib/PrintEditor/ItemInfo.rb

@@ -28,9 +28,9 @@ class LayItemInfo < Gtk::Table
 		attach(@list_frame=Gtk::Frame.new("list").add(@item_list=ItemList.new),0,3,7,8,Gtk::FILL,Gtk::SHRINK)
 		attach(@align_frame=Gtk::Frame.new("list").add(@item_align=ItemTextAlignment.new),0,3,8,9,Gtk::FILL,Gtk::SHRINK)
 
-		attach(Gtk::Label.new("clone"),0,1,9,10,Gtk::FILL,Gtk::SHRINK)
-		attach(Gtk::Frame.new("left+").add(@clone_x=Gtk::SpinButton.new(0,5000,1)),1,2,9,10,Gtk::FILL,Gtk::SHRINK)
-		attach(Gtk::Frame.new("top+").add(@clone_y=Gtk::SpinButton.new(0,5000,1)),2,3,9,10,Gtk::FILL,Gtk::SHRINK)
+		attach(Gtk::Label.new("clone\r\nor move"),0,1,9,10,Gtk::FILL,Gtk::SHRINK)
+		attach(Gtk::Frame.new("left+").add(@clone_x=Gtk::SpinButton.new(-5000,5000,1).set_value(0)),1,2,9,10,Gtk::FILL,Gtk::SHRINK)
+		attach(Gtk::Frame.new("top+").add(@clone_y=Gtk::SpinButton.new(-5000,5000,1).set_value(0)),2,3,9,10,Gtk::FILL,Gtk::SHRINK)
 		
 		
 		attach(Gtk::Label.new,0,3,10,11)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1559
+  - 1570
   - 0
-  version: 1.1559.0
+  version: 1.1570.0
 platform: ruby
 authors: 
 - Dobai-Pataky Balint
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 +03:00
+date: 2011-08-23 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,13 +36,11 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 90
-        - 7
-        version: 0.90.7
+        version: "0"
   type: :runtime
   version_requirements: *id002
 description: Manqod is a desktop application for small companies to organize their data on an interface customised for them by themselves