manqod 1.1521.0 → 1.1530.0

data/lib/Common/Nick.rb

@@ -6,6 +6,7 @@ class Nick
 	include Singleton
 	@nick=nil
 	@nickid=nil
+	@mygroups=nil
 
 	def set_nick(new_nick)
 		@nick=new_nick
@@ -21,5 +22,15 @@ class Nick
 		end
 		@nickid
 	end
+
+	def ingroup?(group_name)
+		@mygroups=ManqodDB.instance.manqod_db.mygroups(@nick).clone if @mygroups.nil?
+		@mygroups.has_value?(group_name)
+	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/FormImage.rb

@@ -59,7 +59,7 @@ class FormImage < Gtk::Button
 	def set_image(im)
 		super
 		begin
-			item['default']=Marshal.dump(Gdk::Pixdata.from_pixbuf(im.pixbuf,true).serialize)
+			item['default']=Marshal.dump(Gdk::Pixdata.from_pixbuf(im.pixbuf,true).serialize) if im.pixbuf
 		rescue =>err
 			ewarn(err)
 		end

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

@@ -51,7 +51,7 @@ class MyCellRendererCombo < Gtk::CellRendererCombo
 		  rows(column.header['querySQL'],column.header['key'].include?(".")){|row| append_row(row[column.header['key']],row[column.header['display']])}
 		end unless column.header['querySQL'].length == 0
 
-		set_editable(column.header['editable']=="true")
+		set_editable(column.header['editable'])
   end
 	  
   def get_value_from_text(selected_combo_text)

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

@@ -33,10 +33,8 @@ class MyCellRendererText < Gtk::CellRendererText
 		@column=column
 		@view=column.list
 		@model_col_num=column.colnum
-		if column.header['editable']=="true"
-			set_editable_set(true)
-			set_editable(true)
-		end
+		set_editable_set(column.header['editable'])
+		set_editable(column.header['editable'])
 #		set_mode(Gtk::CellRenderer::MODE_INERT)
 #		set_sensitive(false)
 	end

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

@@ -15,7 +15,7 @@ class MyCellRendererToggle < Gtk::CellRendererToggle
 
 	def set_column(column)
 		@column=column
-		set_activatable(@column.header['editable']=="true")
+		set_activatable(@column.header['editable'])
 	end
 	
 	def text

data/lib/ListHolder/EditableList/Column.rb

@@ -12,6 +12,7 @@ class MyColumn < Gtk::TreeViewColumn
 
 		#replace our type if list has set 'ordering' attribute to us
 		@header['type']='gtk_ordering' if list.gtk_attribute("ordering") == data
+		@header['editable']=@header['editable']=='true' && (@header['wgrp_id'].to_i<1 || Nick.instance.ingroup_id?(@header['wgrp_id'].to_i))
 
 		attributes=Hash.new
 

data/lib/ListHolder/EditableList/DrbListModel.rb

@@ -226,10 +226,13 @@ class ListModel
 			@data = Gtk::ListStore.new(*headertypes)
 		end
 
-		hdebug="#{hdebug}\nheadertypes: #{headertypes.inspect}\nheaders:\n"
+		hdebug="#{hdebug}\nheadertypes: #{headertypes.inspect}\nheaders:[result]order<[editable]>[rgrp_id]\n"
 		
-		headers.each_value{|val| hdebug="#{hdebug} #{val['data']} #{val['model_col']}\n"}
-		edebug("#{hdebug}","list","debug")
+		headers.delete_if{|key,val|			
+			hdebug="#{hdebug}[#{val['data']}]#{val['model_col']}#{val['editable'] == 'true' ? '[ed]' : ''}[#{val['rgrp_id']}]\n"
+			val['rgrp_id'].to_i>0 && !Nick.instance.ingroup_id?(val['rgrp_id'].to_i)
+		}
+		edebug("#{hdebug}","list")
 		@column_of_child_key=nil
 		if @key_child && headers.has_key?(@key_child)
 			@column_of_child_key=headers[@key_child]["model_col"]
@@ -502,7 +505,7 @@ class ListModel
 						begin
 							row.each_pair{|key,val| iter[key]=val}
 						rescue =>err
-							eerror("filling row: #{err}\n#{key.inspect}=>#{val}\niter:#{iter.inspect}, row:#{row.inspect}","list")
+#							eerror("filling row: #{err}\n#{key.inspect}=>#{val}\niter:#{iter.inspect}, row:#{row.inspect}","list")
 						end
 						@id_index[row[@column_of_id].to_i]=iter
 						@rows_loaded+=1

data/lib/ListHolder/EditableList/ListPrintOperation.rb

@@ -27,6 +27,8 @@ class ListPrintOperation < Gtk::PrintOperation
 
 			if @print_with_child=list.gtk_attribute("print_with_child")
 				@child_list=list.child_by_id(@print_with_child.to_i)
+				@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"
 			@child_indent=(list.gtk_attribute("child_indent") || 100).to_f
@@ -145,7 +147,7 @@ class ListPrintOperation < Gtk::PrintOperation
 						if @child_list
 								#step first on citer if citer is nil
 								if @citer.nil?
-									@citer=@child_list.list_model.data.iter_first
+									@citer=@child_model.iter_first
 									else 
 									@citer=nil unless @citer.next!
 								end unless @piter.nil?

data/lib/ListHolder/EditableList.rb

@@ -39,7 +39,7 @@ class MyEditableList < Gtk::TreeView
 			end
 			if id_at_cursor != get_cursor_id
 				save_cursor_id(id_at_cursor)
-				edebug("#{self} selection changed to #{id_at_cursor}, notifying observers","list","info")
+				einfo("#{self} selection changed to #{id_at_cursor}, notifying observers","list")
 				changed
 				begin
 					notify_observers(self)
@@ -206,7 +206,7 @@ class MyEditableList < Gtk::TreeView
 				col_num+=1
 			end if header['visible']
 		}
-		edebug("#{self} skeleton created","list","info")
+		einfo("#{self} skeleton created","list")
 		set_search_column(get_conf(get_id,0,"search").to_i)
 		
 		set_info("loading")

data/lib/ListHolder/GanttHolder/Gantt.rb

@@ -230,8 +230,8 @@ class Gantt < Gtk::Viewport
 				starts,finishs,percents,heights=create_rectangle(iter.first_child,level+1)
 				r.set_height(heights-r.y1) unless heights-r.y1 == r.height
 				height=r.y1+r.height if height.nil? || height<r.height+r.y1 #recalc height, since it changes by depth
-				r.set_start(starts,true) unless starts == r.start
-				r.set_duration(finishs-starts,true) unless finishs-starts == r.dur
+				r.set_start(starts,false) unless starts == r.start
+				r.set_duration(finishs-starts,false) unless finishs-starts == r.dur
 				r.set_percentage(percents,true) unless percents == r.percentage
 			end
 			vi=iter.next!

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1521
+  - 1530
   - 0
-  version: 1.1521.0
+  version: 1.1530.0
 platform: ruby
 authors: 
 - Dobai-Pataky Balint
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-14 00:00:00 +02:00
+date: 2011-04-27 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency