manqod 1.1570.0 → 1.1575.0

data/lib/ListHolder/EditableList/DrbListModel.rb

@@ -481,6 +481,7 @@ class ListModel
 			list.progress.zero(list.object_id,0,@moditem["display"])
 
 			prep_time=Time.now.to_f-before.to_f
+			before=Time.now
 			ff=nil
 			pkeys=Array.new
 #			@thread=Thread.new{
@@ -495,6 +496,7 @@ class ListModel
 			fetch_time=Time.now.to_f-before.to_f
 			list.progress.zero(list.object_id,@rowcount,@moditem["display"])
 
+			before=Time.now
 					pkeys.each{|idx|
 						row=ff[idx]
 						eerror("row #{idx} is nil!","list") if row.nil?
@@ -519,11 +521,12 @@ class ListModel
 
 					} unless ff.nil? #nil if no keys found, the list is empty
 
+			load_time=Time.now.to_f-before.to_f
 				t=Time.new
 				refilter
 				filtert=Time.new.to_f-t.to_f
 				update_time=Time.now.to_f-before.to_f
-				enormal("total: #{@filtered_rowcount}/#{@rows_loaded}/#{@rowcount} (p:"+sprintf("%.2fs",prep_time)+",f:"+sprintf("%.2fs",fetch_time)+",refilter:"+sprintf("%.2fs",filtert)+")"+sprintf("%.2fs",update_time),"time")
+				enormal("total: #{@filtered_rowcount}/#{@rows_loaded}/#{@rowcount} (prep:"+sprintf("%.2fs",prep_time)+",fetch:"+sprintf("%.2fs",fetch_time)+",load:"+sprintf("%.2fs",load_time)+",refilter:"+sprintf("%.2fs",filtert)+")"+sprintf("%.2fs",update_time),"time")
 				einfo("data loaded #{ids or 'all rows'}","list")
 		else
 			ids.each{|row_id|

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

@@ -3,12 +3,15 @@
 #the author of manqod is Dobai-Pataky Balint(dpblnt@gmail.com)
 
 class HeaderLayout
+	include ManqodCommon
 	def initialize(cr,pop)
 		@pop=pop
 		@layout = cr.create_pango_layout
-		layout.set_text(pop.list.title).set_width(@pop.pango_width)
+		text=pop.list.gtk_attribute("print_custom_header").nil? ? pop.list.title : eeval(pop.list.gtk_attribute("print_custom_header"),pop.list).to_s
+		ecode(text)
+		layout.set_text(text).set_width(@pop.pango_width)
 		layout.set_font_description(Pango::FontDescription.new(@pop.header_font))
-		layout.set_wrap(Pango::Layout::WRAP_WORD).set_ellipsize(Pango::Layout::ELLIPSIZE_NONE).set_single_paragraph_mode(true)
+		layout.set_wrap(Pango::Layout::WRAP_WORD).set_ellipsize(Pango::Layout::ELLIPSIZE_NONE).set_single_paragraph_mode(false)
 		layout.set_alignment(Pango::Layout::Alignment::CENTER)
 
 		@tlayout = cr.create_pango_layout

data/lib/ListHolder/EditableList.rb

@@ -11,6 +11,7 @@ class MyEditableList < Gtk::TreeView
   
 	def initialize(caller)
 		@caller=caller
+		@back_button=false
 		@list_id=nil
 		@parentM=nil
 		@info=caller.info
@@ -60,8 +61,11 @@ class MyEditableList < Gtk::TreeView
 		signal_connect("row-collapsed"){|me, iter, path|
 			me.expand_all if @keep_expanded
 		}
+		
+		@popup=Gtk::Menu.new
 	end
 	attr_accessor :caller, :selected, :list_id, :list_model, :parentM, :headertypes, :headers, :info, :title, :tip, :pop, :tmp, :is_embedded
+	attr_reader :single_list_mode
 
 	def holder
 		@caller
@@ -110,6 +114,11 @@ class MyEditableList < Gtk::TreeView
 		self
 	end
 	
+	def set_back_button(bb=true)
+		@back_button=bb
+		self
+	end
+	
 	def set_parentM(parentM)
 		@parentM=parentM
 		self
@@ -193,6 +202,7 @@ class MyEditableList < Gtk::TreeView
 			return
 		end
 		@keep_expanded=(gtk_attribute("keep_expanded") || "false") == "true"
+		@single_list_mode=(gtk_attribute('single_list_mode')  || "false") == "true"
 		set_model(nil)
 		@list_model.create_skeleton
 		set_info("initializing")
@@ -220,6 +230,32 @@ class MyEditableList < Gtk::TreeView
 		@caller.advanced_filter.update
 		@caller.sum_button.update
 		@caller.buttonholder.update(self)
+		#build context menu
+		if single_list_mode
+			@list_model.drbmodel.childs.each{|ch|
+				@popup.append(item=Gtk::MenuItem.new(ch["display"]))
+				item.signal_connect("activate",ch["id"].to_i){|me,child_id|
+					einfo("#{me.label.inspect}(#{child_id}) activated on #{get_cursor_id}")
+					holder.pack_child(child_id)
+				}
+			}
+		end
+		#add back
+		if @back_button
+			@popup.append(item=Gtk::MenuItem.new("back"))
+				item.signal_connect("activate"){|me|
+				einfo("#{me.label} activated on #{get_cursor_id}")
+				parentM.holder.repack_self
+			}
+		end
+
+		@popup.show_all
+		signal_connect("button_release_event"){|me,ev|
+		  if ev.kind_of? Gdk::EventButton and ev.button == 3
+				@popup.popup(nil,nil,ev.button,ev.time)
+			end
+		}
+
 		self
 	end
 	

data/lib/ListHolder.rb

@@ -39,6 +39,7 @@ module Mylist
 			@caller=caller
 			@list_id=nil
 			@parentM=nil
+			@single_mode_child=nil
 			@info=Gtk::Label.new('initializing')
 			@list=MyEditableList.new(self)
 			@list.signal_connect('size-allocate'){|me,alloc|
@@ -114,7 +115,7 @@ module Mylist
 			case notifier.class.name 
 				when 'BarMenuItem', 'ButtonMenuItem', 'MyRendererButton'
 					list.set_id(@list_id=notifier.target)
-				when 'MyEditableList' 
+				when 'MyEditableList', 'Mylist::MyListHolder'
 					list.set_id(@list_id) #preserve the last id
 				else
 					edebug("unknown routing: #{notifier.class.name}","list","warning")
@@ -161,7 +162,7 @@ module Mylist
 			
 			#children
 			@submodules=list.list_model.drbmodel.childs.size
-  		if @submodules>0
+  		if @submodules>0 && !list.single_list_mode
 				@notebook=MyNotebook.new(self)
     		@notebook.show_all
 				pack2(@notebook)
@@ -177,13 +178,29 @@ module Mylist
 
 			show_all
 			list_panel.set_visibility
-			@notebook.update(@list) if @submodules>0
+			@notebook.update(@list) if @submodules>0 && !list.single_list_mode
 			@list.load_data(notifier)
 			@gantt.update unless @gantt.nil?
 		end
 		
 		def repack_widget
 		end
+		
+		def pack_child(child_id)
+			remove(@widget)
+		 	@single_mode_child=Mylist::MyListHolder.new(self)
+			@single_mode_child.set_parentM(list)
+			@single_mode_child.list.set_back_button(true).set_id(child_id)
+			@single_mode_child.update(self)
+
+			
+			add(@single_mode_child)
+		end
+		def repack_self
+			remove(@single_mode_child)
+			@single_mode_child.destroy unless @single_mode_child.nil? || @single_mode_child.destroyed?
+			add(@widget)
+		end
 
 		def history_window
 			HistoryWindow.new(self)

data/lib/Memcache.rb

@@ -25,7 +25,7 @@ class Memcache
 		case memcache_lib
 			when :memcached
 				options[:default_ttl] = 0
-				options[:timeout] = 2
+				options[:timeout] = 30
 				@memcache = Memcached.new(servers,options)
 			when :dalli
 				options.delete(:prefix_key)

metadata

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