manqod 1.1532.0 → 1.1556.0

data/lib/ManqodRPC.rb

@@ -17,10 +17,10 @@ class ManqodRPC
 		@manqod_server=DRb::DRbObject.new(nil,server_uri)
 	end
 	def unregister_client
-		manqod_server.unregister_client(self)
+		manqod_server.unregister_client(ManqodRPC.instance.to_s)
 	end
 	def register_client
-		manqod_server.register_client(self,ManqodDB.instance.manqod_db.name.to_s)
+		manqod_server.register_client(ManqodRPC.instance.to_s,self,ManqodDB.instance.manqod_db.name.to_s)
 	end
 	def nick
 		Nick.instance.get_nick

data/lib/Print/PrintItem.rb

@@ -23,7 +23,7 @@ class PrintItem
 	end
 	attr_reader :type, :x, :y, :txt, :font, :width, :height, :page, :cr, :text_alignment
 	attr_reader :column_width, :draw_header_cell_borders, :column_pos, :fill_header_background, :header_line_width, :row_underline
-	attr_reader :cell_line_width, :sum_line_width, :list, :next_iter
+	attr_reader :cell_line_width, :sum_line_width, :list, :next_iter, :print_with_gantt
 
 	def draw(cr_to_draw_to)
 		@cr=cr_to_draw_to
@@ -104,6 +104,7 @@ class PrintItem
 							@sum_line_width=list.gtk_attribute("sum_line_width").to_f || 0.6
 							@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"
 							
 							@layouts=Array.new
 							@current_height=y
@@ -179,7 +180,7 @@ class PrintItem
 										edebug("breaking list #{list} to the next page","printing","info")
 										break
 									end
-									il.y=@current_height
+									il.set_y(@current_height)
 									@current_height+=il.row_height+@row_spacing
 									@layouts.push(il)
 									@sums.each_key{|key| @sums[key]=@sums[key]+iter[key].to_f}

data/lib/RelationBuilder.rb

@@ -9,6 +9,7 @@ class RelationBuilder < Gtk::ScrolledWindow
 		@img_unique=Gdk::Pixdata.deserialize([71, 100, 107, 80, 0, 0, 1, 216, 2, 1, 0, 2, 0, 0, 0, 64, 0, 0, 0, 16, 0, 0, 0, 16, 145, 0, 0, 0, 0, 142, 102, 102, 102, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 131, 153, 153, 204, 255, 1, 102, 102, 102, 255, 136, 153, 153, 204, 255, 1, 102, 102, 102, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 131, 153, 153, 204, 255, 1, 102, 102, 102, 255, 136, 153, 153, 204, 255, 1, 102, 102, 102, 255, 130, 0, 0, 0, 0, 142, 102, 102, 102, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 131, 255, 255, 255, 255, 1, 102, 102, 102, 255, 136, 255, 255, 255, 255, 1, 102, 102, 102, 255, 130, 0, 0, 0, 0, 3, 102, 102, 102, 255, 255, 255, 255, 255, 0, 0, 0, 255, 130, 255, 255, 255, 255, 130, 204, 0, 0, 255, 131, 255, 255, 255, 255, 130, 204, 0, 0, 255, 2, 255, 255, 255, 255, 102, 102, 102, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 132, 255, 255, 255, 255, 130, 204, 0, 0, 255, 131, 255, 255, 255, 255, 130, 204, 0, 0, 255, 2, 255, 255, 255, 255, 102, 102, 102, 255, 130, 0, 0, 0, 0, 3, 102, 102, 102, 255, 255, 255, 255, 255, 0, 0, 0, 255, 130, 255, 255, 255, 255, 130, 204, 0, 0, 255, 131, 255, 255, 255, 255, 130, 204, 0, 0, 255, 2, 255, 255, 255, 255, 102, 102, 102, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 132, 255, 255, 255, 255, 130, 204, 0, 0, 255, 131, 255, 255, 255, 255, 130, 204, 0, 0, 255, 2, 255, 255, 255, 255, 102, 102, 102, 255, 130, 0, 0, 0, 0, 3, 102, 102, 102, 255, 255, 255, 255, 255, 0, 0, 0, 255, 130, 255, 255, 255, 255, 130, 204, 0, 0, 255, 131, 255, 255, 255, 255, 130, 204, 0, 0, 255, 2, 255, 255, 255, 255, 102, 102, 102, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 132, 255, 255, 255, 255, 135, 204, 0, 0, 255, 2, 255, 255, 255, 255, 102, 102, 102, 255, 130, 0, 0, 0, 0, 6, 102, 102, 102, 255, 255, 255, 255, 255, 0, 0, 0, 255, 255, 255, 255, 255, 102, 102, 102, 255, 255, 255, 255, 255, 133, 204, 0, 0, 255, 130, 255, 255, 255, 255, 1, 102, 102, 102, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 131, 255, 255, 255, 255, 1, 102, 102, 102, 255, 136, 255, 255, 255, 255, 1, 102, 102, 102, 255, 130, 0, 0, 0, 0, 142, 102, 102, 102, 255, 145, 0, 0, 0, 0]).to_pixbuf(true)
 		@img_index=Gdk::Pixdata.deserialize([71, 100, 107, 80, 0, 0, 2, 106, 2, 1, 0, 2, 0, 0, 0, 64, 0, 0, 0, 16, 0, 0, 0, 16, 145, 0, 0, 0, 0, 142, 102, 102, 102, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 131, 153, 153, 204, 255, 1, 102, 102, 102, 255, 132, 153, 153, 204, 255, 5, 128, 128, 128, 255, 255, 255, 255, 255, 255, 255, 153, 255, 255, 204, 51, 255, 0, 0, 0, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 131, 153, 153, 204, 255, 1, 102, 102, 102, 255, 131, 153, 153, 204, 255, 4, 128, 128, 128, 255, 255, 255, 255, 255, 255, 255, 153, 255, 255, 204, 51, 255, 130, 0, 0, 0, 255, 130, 0, 0, 0, 0, 135, 102, 102, 102, 255, 4, 128, 128, 128, 255, 255, 255, 255, 255, 255, 255, 153, 255, 255, 204, 51, 255, 130, 0, 0, 0, 255, 1, 102, 102, 102, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 131, 255, 255, 255, 255, 1, 102, 102, 102, 255, 130, 255, 255, 255, 255, 3, 128, 128, 128, 255, 255, 255, 153, 255, 255, 204, 51, 255, 130, 0, 0, 0, 255, 2, 255, 255, 255, 255, 102, 102, 102, 255, 130, 0, 0, 0, 0, 9, 102, 102, 102, 255, 255, 255, 255, 255, 0, 0, 0, 255, 255, 255, 255, 255, 102, 102, 102, 255, 255, 255, 255, 255, 128, 128, 128, 255, 255, 255, 255, 255, 255, 204, 51, 255, 130, 0, 0, 0, 255, 130, 255, 255, 255, 255, 1, 102, 102, 102, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 131, 255, 255, 255, 255, 3, 102, 102, 102, 255, 128, 128, 128, 255, 255, 255, 255, 255, 133, 255, 204, 51, 255, 130, 0, 0, 0, 255, 130, 0, 0, 0, 0, 5, 102, 102, 102, 255, 255, 255, 255, 255, 0, 0, 0, 255, 255, 255, 255, 255, 102, 102, 102, 255, 132, 0, 0, 0, 255, 2, 255, 255, 255, 255, 255, 204, 51, 255, 130, 0, 0, 0, 255, 1, 102, 102, 102, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 131, 255, 255, 255, 255, 1, 102, 102, 102, 255, 130, 255, 255, 255, 255, 3, 128, 128, 128, 255, 255, 255, 255, 255, 255, 204, 51, 255, 130, 0, 0, 0, 255, 2, 255, 255, 255, 255, 102, 102, 102, 255, 130, 0, 0, 0, 0, 9, 102, 102, 102, 255, 255, 255, 255, 255, 0, 0, 0, 255, 255, 255, 255, 255, 102, 102, 102, 255, 255, 255, 255, 255, 128, 128, 128, 255, 255, 255, 255, 255, 255, 204, 51, 255, 130, 0, 0, 0, 255, 130, 255, 255, 255, 255, 1, 102, 102, 102, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 131, 255, 255, 255, 255, 1, 102, 102, 102, 255, 130, 255, 255, 255, 255, 1, 255, 204, 51, 255, 130, 0, 0, 0, 255, 131, 255, 255, 255, 255, 1, 102, 102, 102, 255, 130, 0, 0, 0, 0, 7, 102, 102, 102, 255, 255, 255, 255, 255, 0, 0, 0, 255, 255, 255, 255, 255, 102, 102, 102, 255, 255, 255, 255, 255, 255, 204, 51, 255, 130, 0, 0, 0, 255, 132, 255, 255, 255, 255, 1, 102, 102, 102, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 131, 255, 255, 255, 255, 2, 102, 102, 102, 255, 255, 255, 255, 255, 130, 0, 0, 0, 255, 133, 255, 255, 255, 255, 1, 102, 102, 102, 255, 130, 0, 0, 0, 0, 142, 102, 102, 102, 255, 145, 0, 0, 0, 0]).to_pixbuf(true)
 		@img_primary=Gdk::Pixdata.deserialize([71, 100, 107, 80, 0, 0, 2, 190, 2, 1, 0, 2, 0, 0, 0, 64, 0, 0, 0, 16, 0, 0, 0, 16, 145, 0, 0, 0, 0, 135, 102, 102, 102, 255, 133, 0, 0, 0, 255, 130, 102, 102, 102, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 131, 153, 153, 204, 255, 10, 102, 102, 102, 255, 153, 153, 204, 255, 0, 0, 0, 255, 230, 184, 0, 255, 234, 187, 0, 255, 240, 192, 0, 255, 245, 196, 0, 255, 250, 200, 0, 255, 0, 0, 0, 255, 102, 102, 102, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 131, 153, 153, 204, 255, 7, 102, 102, 102, 255, 0, 0, 0, 255, 232, 186, 0, 255, 234, 187, 0, 255, 238, 190, 0, 255, 0, 0, 0, 255, 249, 199, 0, 255, 130, 254, 203, 0, 255, 1, 0, 0, 0, 255, 130, 0, 0, 0, 0, 133, 102, 102, 102, 255, 3, 0, 0, 0, 255, 236, 189, 0, 255, 238, 190, 0, 255, 131, 244, 195, 0, 255, 3, 252, 202, 0, 255, 249, 199, 0, 255, 0, 0, 0, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 131, 255, 255, 255, 255, 10, 102, 102, 102, 255, 255, 255, 255, 255, 0, 0, 0, 255, 251, 201, 0, 255, 253, 202, 0, 255, 245, 196, 0, 255, 239, 191, 0, 255, 234, 187, 0, 255, 0, 0, 0, 255, 102, 102, 102, 255, 130, 0, 0, 0, 0, 5, 102, 102, 102, 255, 255, 255, 255, 255, 0, 0, 0, 255, 255, 255, 255, 255, 102, 102, 102, 255, 130, 255, 255, 255, 255, 7, 0, 0, 0, 255, 250, 200, 0, 255, 243, 194, 0, 255, 236, 189, 0, 255, 0, 0, 0, 255, 255, 255, 255, 255, 102, 102, 102, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 131, 255, 255, 255, 255, 1, 102, 102, 102, 255, 131, 255, 255, 255, 255, 3, 0, 0, 0, 255, 241, 193, 0, 255, 0, 0, 0, 255, 130, 255, 255, 255, 255, 1, 102, 102, 102, 255, 130, 0, 0, 0, 0, 6, 102, 102, 102, 255, 255, 255, 255, 255, 0, 0, 0, 255, 255, 255, 255, 255, 102, 102, 102, 255, 255, 255, 255, 255, 130, 0, 0, 0, 255, 3, 249, 199, 0, 255, 242, 194, 0, 255, 0, 0, 0, 255, 130, 255, 255, 255, 255, 1, 102, 102, 102, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 131, 255, 255, 255, 255, 1, 102, 102, 102, 255, 131, 255, 255, 255, 255, 3, 0, 0, 0, 255, 243, 194, 0, 255, 0, 0, 0, 255, 130, 255, 255, 255, 255, 1, 102, 102, 102, 255, 130, 0, 0, 0, 0, 6, 102, 102, 102, 255, 255, 255, 255, 255, 0, 0, 0, 255, 255, 255, 255, 255, 102, 102, 102, 255, 255, 255, 255, 255, 130, 0, 0, 0, 255, 3, 250, 200, 0, 255, 245, 196, 0, 255, 0, 0, 0, 255, 130, 255, 255, 255, 255, 1, 102, 102, 102, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 131, 255, 255, 255, 255, 1, 102, 102, 102, 255, 131, 255, 255, 255, 255, 3, 0, 0, 0, 255, 247, 198, 0, 255, 0, 0, 0, 255, 130, 255, 255, 255, 255, 1, 102, 102, 102, 255, 130, 0, 0, 0, 0, 6, 102, 102, 102, 255, 255, 255, 255, 255, 0, 0, 0, 255, 255, 255, 255, 255, 102, 102, 102, 255, 255, 255, 255, 255, 130, 0, 0, 0, 255, 3, 252, 202, 0, 255, 248, 198, 0, 255, 0, 0, 0, 255, 130, 255, 255, 255, 255, 1, 102, 102, 102, 255, 130, 0, 0, 0, 0, 1, 102, 102, 102, 255, 131, 255, 255, 255, 255, 1, 102, 102, 102, 255, 131, 255, 255, 255, 255, 3, 0, 0, 0, 255, 249, 199, 0, 255, 0, 0, 0, 255, 130, 255, 255, 255, 255, 1, 102, 102, 102, 255, 130, 0, 0, 0, 0, 137, 102, 102, 102, 255, 1, 0, 0, 0, 255, 132, 102, 102, 102, 255, 145, 0, 0, 0, 0]).to_pixbuf(true)
+
 		@field_style={
 			'tinyint'=>Gtk::Style.new.set_bg(Gtk::STATE_NORMAL,0x4000,0x5700,0xdd00),
 			'int'=>Gtk::Style.new.set_bg(Gtk::STATE_NORMAL,0x4000,0xa500,0xdd00),
@@ -34,7 +35,7 @@ class RelationBuilder < Gtk::ScrolledWindow
 		super()
 		@base_object=nil
 		@rel_ed=Array.new
-		@relations=Array.new
+		@relations=Hash.new
 		@tables=Hash.new
 		@holder=Gtk::VBox.new
 		@widget=Gtk::Fixed.new
@@ -61,11 +62,7 @@ class RelationBuilder < Gtk::ScrolledWindow
 						dialog.show_all
 						if dialog.run == Gtk::Dialog::ResponseType::OK
 							client.query("CREATE TABLE `#{table_name.text}` (`id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY) ENGINE = MYISAM")
-							query("insert into tables set name='#{table_name.text}'")
-							if trow=qrow("select * from tables where name='#{table_name.text}'")
-								@tables[trow["name"]]=RTable.new(self,trow["name"],trow["id"],@widget.pointer[0],@widget.pointer[1]).show_me
-								@widget.show_all
-							end
+							add_existing_table(table_name.text)
 						end
 						dialog.destroy
 					
@@ -129,7 +126,7 @@ class RelationBuilder < Gtk::ScrolledWindow
 
 	def table_by_id(table_id)
 		found=nil
-		@tables.each{|table_name,tableo|
+		@tables.each_pair{|table_name,tableo|
 			if tableo.table_id.to_i == table_id.to_i
 				found=tableo
 				break
@@ -137,16 +134,6 @@ class RelationBuilder < Gtk::ScrolledWindow
 		}
 		found
 	end
-	def relation_by_id(rel_id)
-		found=nil
-		@relations.each{|rel|
-			if rel.relation_id.to_i == rel_id.to_i
-				found=rel
-				break
-			end
-		}
-		found
-	end
 	
 	def update(notifier=nil)
 		reload
@@ -158,13 +145,21 @@ class RelationBuilder < Gtk::ScrolledWindow
 		@search_window=SearchWindow.new(self) unless @search_window
 		@rq_window=RunQuery.new(self) unless @rq_window
 
-		rows("select * from tables"){|row|
-			@tables[row["name"]]=RTable.new(self,row["name"],row["id"],row["rbx"].to_f,row["rby"].to_f)
+		ctables=cache.get("tables")
+		crelations=cache.get("relations")
+		ctables.each_pair{|table_name,table|
+			if @tables.has_key?(table_name)
+				@tables[table_name].update(table)
+			else
+				@tables[table_name]=RTable.new(self,table)
+			end
 		}
-		rows("select * from relations"){|row|
-			r1=tables[row["src_table"]].fields[row["src_field"]] if tables.has_key?(row["src_table"])
-			r2=tables[row["dst_table"]].fields[row["dst_field"]] if tables.has_key?(row["dst_table"])
-			@relations.push(r=Relation.new(self,r1,r2,row['rel_name'],row["rel_type"],row["id"],row["rbx"].to_f,row["rby"].to_f,row['rel_custom']))
+		crelations.each_pair{|rel_id,rel|
+			if @relations.has_key?(rel_id)
+				@relations[rel_id].reload(rel)
+			else
+				@relations[rel_id]=Relation.new(self,rel)
+			end
 		}
 		review_all
 	end
@@ -173,21 +168,18 @@ class RelationBuilder < Gtk::ScrolledWindow
 		if @show_only_query
 			#show only related to query
 			@tables.each_value{|table| table.set_visibility(false)}
-			@relations.each{|rel| rel.set_visibility(rel.active?)}
-			@relations.each{|rel|
+			@relations.each_value{|rel| rel.set_visibility(rel.active?)}
+			@relations.each_value{|rel|
 				if rel.active?
 					rel.rfield1.table.show_neighbours
 					rel.rfield2.table.show_neighbours
 				end
 			}
 			@base_object.show_neighbours if @base_object
-#			@relations.each{|rel|
-#				rel.set_visibility(rel.rfield1.table.shown? && rel.rfield2.table.shown?)
-#			}
 		else
 			#show all
 			@tables.each_value{|table| table.set_visibility(true)}
-			@relations.each{|rel| rel.set_visibility(true)}
+			@relations.each_value{|rel| rel.set_visibility(true)}
 		end
 		clear
 	end
@@ -235,7 +227,7 @@ class RelationBuilder < Gtk::ScrolledWindow
 
 	def draw_relations
 		cr=@widget.window.create_cairo_context
-		@relations.each{|rel|
+		@relations.each_value{|rel|
 			next unless rel.visible? && rel.handle.realized?
 			begin
 				x1=rel.rfield1.table.widget.translate_coordinates(@widget,0,0)[0]
@@ -399,8 +391,8 @@ class RelationBuilder < Gtk::ScrolledWindow
 		case status
 			when :start
 				x1,y1=rfield.translate_coordinates(@widget,0,0)
-				@rel_in_ed=Relation.new(self,rfield,nil,"",nil,nil,x1-30,y1-30)
-				@relations.push(@rel_in_ed)
+				@rel_in_ed=Relation.new(self,{"src_table" => rfield.table_name, "src_field" => rfield.field_name, "rbx" => x1-30, "rby" => y1-30})
+				@relations[0]=@rel_in_ed
 				@rel_in_ed.show_me
 			when :finish
 				@rel_in_ed.set_rfield2(rfield)
@@ -413,7 +405,7 @@ class RelationBuilder < Gtk::ScrolledWindow
 
 	def find_relation(rfield1,rfield2)
 		rel=nil
-		@relations.each{|r| 
+		@relations.each_value{|r| 
 			if [r.rfield1,r.rfield2] == [rfield1,rfield2] or [r.rfield1,r.rfield2] == [rfield2,rfield1]
 				rel=r 
 			end
@@ -423,9 +415,9 @@ class RelationBuilder < Gtk::ScrolledWindow
 
 	def remove_table(table,from_sql=false)
 		@tables[table].fields.each{|field,field_wg|
-			@relations.each{|rel|
+			@relations.each_value{|rel|
 				if rel.rfield1 == field_wg or rel.rfield2 == field_wg
-					edebug("removing #{rel}","relation-builder","debug")
+					edebug("removing #{rel}","relation-builder")
 					rel.remove
 				end
 			}
@@ -434,19 +426,22 @@ class RelationBuilder < Gtk::ScrolledWindow
 		client.query("drop table `#{table}`") if from_sql
 		@tables[table].widget.destroy
 		@tables.delete(table)
+		reload_server_rb(true)
 		changed(@tables[table])
 	end
 	def add_existing_table(table_name)
 		unless @tables.has_key?(table_name)
-			query("insert into tables set name='#{table_name}'")
-			if trow=qrow("select * from tables where name='#{table_name}'")
-				@tables[trow["name"]]=RTable.new(self,trow["name"],trow["id"],@widget.pointer[0],@widget.pointer[1])
-				@tables[trow["name"]].show_me
-				@widget.show_all
-				changed(@tables[trow["name"]])
-			end
+			query("insert into tables (name,rbx,rby) values('#{table_name}','#{@widget.pointer[0]}','#{@widget.pointer[1]}')")
+			reload_server_rb(true)
 		end
 	end
+	
+	def reload_server_rb(reload_me_too=true)
+		Thread.new{
+		ManqodDB.instance.manqod_db.relation_builder.update if ManqodDB.instance.manqod_db.relation_builder
+		reload if reload_me_too
+		}
+	end
 
 	def build_query
 		sql=@query_id
@@ -457,7 +452,7 @@ class RelationBuilder < Gtk::ScrolledWindow
 		@base_object.center_on_me
 	end
 	def changed(notifier=nil)
-		edebug("#{notifier} changed, notifying observers","relation-builder","debug")
+		edebug("#{notifier} changed, notifying observers","relation-builder")
 		super()
 		notify_observers(self,notifier)
 	end

data/lib/RelationBuilder/RTable.rb

@@ -4,11 +4,8 @@
 
 class RTable < Gtk::EventBox
 	include ManqodCommon
-	def initialize(parentM,table=nil,table_id = nil,x=0,y=0)
+	def initialize(parentM,td)
 		@parentM=parentM
-		@table_id=if table_id then table_id.to_i else nil end
-		@x=x
-		@y=y
 		@shown=false
 		super()
 		visible_window=false
@@ -21,8 +18,7 @@ class RTable < Gtk::EventBox
 		@widget.add(Gtk::VButtonBox.new)
 		@widget.set_label_xalign(0.5)
 		@fields=Hash.new
-		@indexes=Array.new
-		set_table(table)
+		update(td)
 		
 		signal_connect('button-press-event'){|me,ev|
 			parentM.set_focused_item(self)
@@ -90,9 +86,7 @@ class RTable < Gtk::EventBox
 	def set_table(table)
 		@table=table
 		@label.set_label(table)
-		if !table.nil?
-			@is_view=false
-			client_fields("show create table `#{table}`"){|f| @is_view=true if f["name"].include?("View")}
+		unless table.nil?
 			if is_view?
 				@frame_button.set_image(Gtk::Image.new(Gtk::Stock::ABOUT,Gtk::IconSize::MENU))
 				@widget.set_shadow_type(Gtk::ShadowType::IN).modify_bg(Gtk::StateType::NORMAL,Gdk::Color.parse('#E0D130'))
@@ -104,13 +98,25 @@ class RTable < Gtk::EventBox
 		end
 	end
 
+	def update(td)
+		@table_id=(td["id"] ? td["id"].to_i : nil)
+		@x=td["rbx"]
+		@y=td["rby"]
+		@fields_data=td["fields"]
+		@indexes=td["indexes"]
+		@is_view=td["view"]
+		set_table(td["name"])
+	end
+
 	def reload
+=begin
 		@indexes.clear
 		client_rows("show indexes from #{table}"){|index|
 			@indexes.push({"name"=>index["Key_name"],"unique"=>index["Non_unique"]=="0", "field"=>index["Column_name"]})
 		}
+=end
 		i=0
-		client_rows("show fields from #{table}"){|field|
+		@fields_data.each_pair{|field_name,field|
 			if @fields.has_key?(field["Field"])
 				@fields[field["Field"]].set_field(field)
 				else
@@ -132,7 +138,7 @@ class RTable < Gtk::EventBox
 		client_query("rename table `#{@table}` to `#{new_table}`")
 		@table=new_table
 		@fields.each{|field,field_wg|
-			parentM.relations.each{|rel|
+			parentM.relations.each_value{|rel|
 				if rel.rfield1 == field_wg or rel.rfield2 == field_wg
 					rel.save
 				end
@@ -141,10 +147,12 @@ class RTable < Gtk::EventBox
 
 		save_me
 		set_table(new_table)
+		parentM.reload_server_rb
 	end
 
 	def save_me
 		query("update tables set rbx='#{x}', rby='#{y}', name='#{@table}' where id='#{table_id}'")
+		@parentM.reload_server_rb
 	end
 	
 	def show_me
@@ -173,7 +181,7 @@ class RTable < Gtk::EventBox
 
 	def show_neighbours
 		show_me
-		@parentM.relations.each{|rel|
+		@parentM.relations.each_value{|rel|
 			if rel.rfield1.table == self || rel.rfield2.table == self
 				rel.rfield1.table.show_me
 				rel.rfield2.table.show_me
@@ -186,7 +194,7 @@ class RTable < Gtk::EventBox
 		dialog=Gtk::MessageDialog.new(nil,Gtk::Dialog::Flags::MODAL,Gtk::MessageDialog::QUESTION,Gtk::MessageDialog::ButtonsType::YES_NO,"remove field `#{field}`?")
 		dialog.show_all
 		if dialog.run == Gtk::Dialog::ResponseType::YES
-			parentM.relations.each{|rel|
+			parentM.relations.each_value{|rel|
 				if rel.rfield1 == @fields[field] or rel.rfield2 == @fields[field]
 					edebug("removing #{rel}","relation-builder","debug")
 					rel.remove
@@ -197,7 +205,7 @@ class RTable < Gtk::EventBox
 			@fields[field].destroy
 			@fields.delete(field)
 			parentM.clear
-#			reload
+			parentM.reload_server_rb
 		end
 		dialog.destroy
 	end
@@ -267,7 +275,7 @@ class RTable < Gtk::EventBox
 			rescue =>err
 				retry if tell_exception("error altering the table",backtrace_to_debug(err),"server","error",false,true,err)
 			end
-			reload
+			parentM.reload_server_rb
 		end
 		dialog.destroy
 	end

data/lib/RelationBuilder/RTable/RField.rb

@@ -8,7 +8,11 @@ class RField < Gtk::ToggleButton
 		super("",false)
 		remove(child)
 		@label=Gtk::Label.new
-		set_child(@index_holder=Gtk::Table.new(5,2))
+		set_child(@index_holder=Gtk::Table.new(5,1))
+		@index_holder.attach(@label,0,1,0,1)
+		@index_holder.attach(@primary_img=Gtk::Image.new(@table.parentM.img_primary.scale(10,10)).set_no_show_all(true),1,2,0,1,Gtk::SHRINK)
+		@index_holder.attach(@unique_img=Gtk::Image.new(@table.parentM.img_unique.scale(10,10)).set_no_show_all(true),2,3,0,1,Gtk::SHRINK)
+		@index_holder.attach(@index_img=Gtk::Image.new(@table.parentM.img_index.scale(10,10)).set_no_show_all(true),3,4,0,1,Gtk::SHRINK)
 		set_field(field)
 		signal_connect("toggled"){|me,ev| @table.parentM.changed(self)}
 		signal_connect('button-press-event'){|me,ev|
@@ -43,31 +47,32 @@ class RField < Gtk::ToggleButton
 
 	def set_field(field)
 		@field=field
-		@label.set_label(field["Field"])
+		@label.set_label(field["Field"]) unless field["Field"] == @label.label
 		if f=@field["Type"].index("(")
 			@field["Size"]=field["Type"][f+1 .. field["Type"].index(")") -1]
 			@field["Type"]=field["Type"][0 .. f-1]
 		end
 		
 		#set style
-		set_style(@table.parentM.field_style[@field["Type"]]) if @table.parentM.field_style.has_key?(@field["Type"])
+		set_style(@table.parentM.field_style[@field["Type"]]) if @table.parentM.field_style.has_key?(@field["Type"]) && style != @table.parentM.field_style[@field["Type"]]
 		#remove old images
-		@index_holder.children.each{|ch| @index_holder.remove(ch)}
-		#read label
-		@index_holder.attach(@label,0,1,0,2)
-		#add images
+		#@index_holder.children.each{|ch| @index_holder.remove(ch)}
+		#re-add label
+		#@index_holder.attach(@label,0,1,0,2)
+		#show images
+		show_primary=false
+		show_unique=false
+		show_index=false
 		@table.indexes.each{|index|
-			n=@index_holder.children.size-1
 			if index["field"]==@field["Field"]
-				@index_holder.attach(Gtk::Image.new(if index["name"]=="PRIMARY" 
-						then @table.parentM.img_primary.scale(10,10)
-						else if index["unique"] 
-							then @table.parentM.img_unique.scale(10,10)
-							else @table.parentM.img_index.scale(10,10)
-						end
-					end),1+n/2,1+n/2+1,n%2,n%2+1,Gtk::SHRINK)
+				show_primary=(index["name"]=="PRIMARY")
+				show_unique=(index["unique"] == true)
+				show_index=(index["unique"] == false)
 			end
 		}
+		@primary_img.set_visible(show_primary) if @primary_img.visible? != show_primary
+		@unique_img.set_visible(show_unique) if @unique_img.visible? != show_unique
+		@index_img.set_visible(show_index) if @index_img.visible? != show_index
 		show_all
 	end
 	

data/lib/RelationBuilder/Relation.rb

@@ -5,20 +5,10 @@
 class Relation 
 	include ManqodCommon
 
-	def initialize(parentM,rfield1,rfield2,rel_name="",rel_type="o",relation_id=nil,xi=0,yi=0,rel_custom="")
+	def initialize(parentM,rel_data)
 		super()
-		@rfield1=rfield1
-		@rfield2=rfield2
 		@parentM=parentM
-		@rel_type=rel_type
-		@rel_name=rel_name
-		@rel_custom=rel_custom
-		@relation_id=if relation_id then relation_id.to_i else nil;end
-		@handle=RelationHandle.new(self,xi,yi)
-#		if coo=rfield1.translate_coordinates(parentM.widget,0,0) and coo2=rfield2.translate_coordinates(parentM.widget,0,0)
-#		@handle.move_me(x || 0,y || 0)
-#		end
-#		parentM.widget.show_all
+		reload(rel_data)
 		@shown=false
 	end
 	attr_reader :rfield1, :rfield2, :parentM, :rel_type, :handle, :relation_id, :rel_name, :rel_custom
@@ -29,6 +19,20 @@ class Relation
 	def y
 		@handle.y
 	end
+	
+	def reload(rel)
+		@rfield1=parentM.tables[rel["src_table"]].fields[rel["src_field"]] if parentM.tables.has_key?(rel["src_table"])
+		@rfield2=parentM.tables[rel["dst_table"]].fields[rel["dst_field"]] if parentM.tables.has_key?(rel["dst_table"])
+		@rel_type=rel["rel_type"]
+		@rel_name=rel['rel_name']
+		@rel_custom=rel['rel_custom']
+		@relation_id=if rel["id"] then rel["id"].to_i else nil;end
+		if @handle then
+			@handle.move_me(rel["rbx"].to_f,rel["rby"].to_f)
+		else
+			@handle=RelationHandle.new(self,rel["rbx"].to_f,rel["rby"].to_f)
+		end
+	end
 
 	def show_me
 		parentM.widget.put(@handle,@handle.x,@handle.y) unless @shown
@@ -69,13 +73,14 @@ class Relation
 			query("insert into relations set rel_type='#{@rel_type}'")
 			@relation_id=qrow("select id from `relations` order by id desc limit 1")["id"]
 			parentM.clear
-			edebug("#{self} inserted","relation-builder","info")
+			einfo("inserted","relation-builder")
 		end
 		if rfield1.nil? or rfield2.nil?
-			edebug("id:#{@relation_id} has a lost table","relation-builder","warning")
-			else
+			ewarn("id:#{@relation_id} has a lost table","relation-builder")
+		else
 			query("update relations set src_table = '#{@rfield1.table.table}', dst_table = '#{@rfield2.table.table}', src_field='#{@rfield1.field["Field"]}', dst_field='#{@rfield2.field["Field"]}', rel_type='#{@rel_type}', rbx='#{@handle.x}', rby='#{@handle.y}', rel_name='#{@rel_name}', rel_custom='#{@rel_custom}' where id='#{@relation_id}'")
-			edebug("updated","relation-builder","info")
+			einfo("updated","relation-builder")
+			parentM.reload_server_rb
 		end
 	end
 	
@@ -87,7 +92,8 @@ class Relation
 		query("delete from relations where id='#{@relation_id}'") if !@relation_id.nil?
 		parentM.relations.delete(self)
 		parentM.clear
-		@handle.destroy
+		@handle.destroy unless @handle.destroyed?
+		@parentM.reload_server_rb
 	end
 
 	def edit
@@ -149,7 +155,7 @@ class Relation
 	end
 	
 	def visible?
-		@handle.visible?
+		@handle && !@handle.destroyed? && @handle.visible?
 	end
 
 	def inspect