manqod 1.1521.0 → 1.1530.0
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/Common/Nick.rb +11 -0
- data/lib/FormHolder/Form/InputHolder/FormImage.rb +1 -1
- data/lib/ListHolder/EditableList/CellRenderers/Combo.rb +1 -1
- data/lib/ListHolder/EditableList/CellRenderers/Text.rb +2 -4
- data/lib/ListHolder/EditableList/CellRenderers/Toggle.rb +1 -1
- data/lib/ListHolder/EditableList/Column.rb +1 -0
- data/lib/ListHolder/EditableList/DrbListModel.rb +7 -4
- data/lib/ListHolder/EditableList/ListPrintOperation.rb +3 -1
- data/lib/ListHolder/EditableList.rb +2 -2
- data/lib/ListHolder/GanttHolder/Gantt.rb +2 -2
- metadata +3 -3
data/lib/Common/Nick.rb
CHANGED
@@ -6,6 +6,7 @@ class Nick
|
|
6
6
|
include Singleton
|
7
7
|
@nick=nil
|
8
8
|
@nickid=nil
|
9
|
+
@mygroups=nil
|
9
10
|
|
10
11
|
def set_nick(new_nick)
|
11
12
|
@nick=new_nick
|
@@ -21,5 +22,15 @@ class Nick
|
|
21
22
|
end
|
22
23
|
@nickid
|
23
24
|
end
|
25
|
+
|
26
|
+
def ingroup?(group_name)
|
27
|
+
@mygroups=ManqodDB.instance.manqod_db.mygroups(@nick).clone if @mygroups.nil?
|
28
|
+
@mygroups.has_value?(group_name)
|
29
|
+
end
|
30
|
+
def ingroup_id?(group_id)
|
31
|
+
@mygroups=ManqodDB.instance.manqod_db.mygroups(@nick).clone if @mygroups.nil?
|
32
|
+
ecode(@mygroups.inspect)
|
33
|
+
@mygroups.has_key?(group_id.to_i)
|
34
|
+
end
|
24
35
|
end
|
25
36
|
|
@@ -59,7 +59,7 @@ class FormImage < Gtk::Button
|
|
59
59
|
def set_image(im)
|
60
60
|
super
|
61
61
|
begin
|
62
|
-
item['default']=Marshal.dump(Gdk::Pixdata.from_pixbuf(im.pixbuf,true).serialize)
|
62
|
+
item['default']=Marshal.dump(Gdk::Pixdata.from_pixbuf(im.pixbuf,true).serialize) if im.pixbuf
|
63
63
|
rescue =>err
|
64
64
|
ewarn(err)
|
65
65
|
end
|
@@ -51,7 +51,7 @@ class MyCellRendererCombo < Gtk::CellRendererCombo
|
|
51
51
|
rows(column.header['querySQL'],column.header['key'].include?(".")){|row| append_row(row[column.header['key']],row[column.header['display']])}
|
52
52
|
end unless column.header['querySQL'].length == 0
|
53
53
|
|
54
|
-
set_editable(column.header['editable']
|
54
|
+
set_editable(column.header['editable'])
|
55
55
|
end
|
56
56
|
|
57
57
|
def get_value_from_text(selected_combo_text)
|
@@ -33,10 +33,8 @@ class MyCellRendererText < Gtk::CellRendererText
|
|
33
33
|
@column=column
|
34
34
|
@view=column.list
|
35
35
|
@model_col_num=column.colnum
|
36
|
-
|
37
|
-
|
38
|
-
set_editable(true)
|
39
|
-
end
|
36
|
+
set_editable_set(column.header['editable'])
|
37
|
+
set_editable(column.header['editable'])
|
40
38
|
# set_mode(Gtk::CellRenderer::MODE_INERT)
|
41
39
|
# set_sensitive(false)
|
42
40
|
end
|
@@ -12,6 +12,7 @@ class MyColumn < Gtk::TreeViewColumn
|
|
12
12
|
|
13
13
|
#replace our type if list has set 'ordering' attribute to us
|
14
14
|
@header['type']='gtk_ordering' if list.gtk_attribute("ordering") == data
|
15
|
+
@header['editable']=@header['editable']=='true' && (@header['wgrp_id'].to_i<1 || Nick.instance.ingroup_id?(@header['wgrp_id'].to_i))
|
15
16
|
|
16
17
|
attributes=Hash.new
|
17
18
|
|
@@ -226,10 +226,13 @@ class ListModel
|
|
226
226
|
@data = Gtk::ListStore.new(*headertypes)
|
227
227
|
end
|
228
228
|
|
229
|
-
hdebug="#{hdebug}\nheadertypes: #{headertypes.inspect}\nheaders
|
229
|
+
hdebug="#{hdebug}\nheadertypes: #{headertypes.inspect}\nheaders:[result]order<[editable]>[rgrp_id]\n"
|
230
230
|
|
231
|
-
headers.
|
232
|
-
|
231
|
+
headers.delete_if{|key,val|
|
232
|
+
hdebug="#{hdebug}[#{val['data']}]#{val['model_col']}#{val['editable'] == 'true' ? '[ed]' : ''}[#{val['rgrp_id']}]\n"
|
233
|
+
val['rgrp_id'].to_i>0 && !Nick.instance.ingroup_id?(val['rgrp_id'].to_i)
|
234
|
+
}
|
235
|
+
edebug("#{hdebug}","list")
|
233
236
|
@column_of_child_key=nil
|
234
237
|
if @key_child && headers.has_key?(@key_child)
|
235
238
|
@column_of_child_key=headers[@key_child]["model_col"]
|
@@ -502,7 +505,7 @@ class ListModel
|
|
502
505
|
begin
|
503
506
|
row.each_pair{|key,val| iter[key]=val}
|
504
507
|
rescue =>err
|
505
|
-
eerror("filling row: #{err}\n#{key.inspect}=>#{val}\niter:#{iter.inspect}, row:#{row.inspect}","list")
|
508
|
+
# eerror("filling row: #{err}\n#{key.inspect}=>#{val}\niter:#{iter.inspect}, row:#{row.inspect}","list")
|
506
509
|
end
|
507
510
|
@id_index[row[@column_of_id].to_i]=iter
|
508
511
|
@rows_loaded+=1
|
@@ -27,6 +27,8 @@ class ListPrintOperation < Gtk::PrintOperation
|
|
27
27
|
|
28
28
|
if @print_with_child=list.gtk_attribute("print_with_child")
|
29
29
|
@child_list=list.child_by_id(@print_with_child.to_i)
|
30
|
+
@child_model=Gtk::TreeModelSort.new(@child_list.list_model.data)
|
31
|
+
@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?
|
30
32
|
end
|
31
33
|
@print_sub_sums=list.gtk_attribute("print_sub_sums") || "true" == "true"
|
32
34
|
@child_indent=(list.gtk_attribute("child_indent") || 100).to_f
|
@@ -145,7 +147,7 @@ class ListPrintOperation < Gtk::PrintOperation
|
|
145
147
|
if @child_list
|
146
148
|
#step first on citer if citer is nil
|
147
149
|
if @citer.nil?
|
148
|
-
@citer=@
|
150
|
+
@citer=@child_model.iter_first
|
149
151
|
else
|
150
152
|
@citer=nil unless @citer.next!
|
151
153
|
end unless @piter.nil?
|
@@ -39,7 +39,7 @@ class MyEditableList < Gtk::TreeView
|
|
39
39
|
end
|
40
40
|
if id_at_cursor != get_cursor_id
|
41
41
|
save_cursor_id(id_at_cursor)
|
42
|
-
|
42
|
+
einfo("#{self} selection changed to #{id_at_cursor}, notifying observers","list")
|
43
43
|
changed
|
44
44
|
begin
|
45
45
|
notify_observers(self)
|
@@ -206,7 +206,7 @@ class MyEditableList < Gtk::TreeView
|
|
206
206
|
col_num+=1
|
207
207
|
end if header['visible']
|
208
208
|
}
|
209
|
-
|
209
|
+
einfo("#{self} skeleton created","list")
|
210
210
|
set_search_column(get_conf(get_id,0,"search").to_i)
|
211
211
|
|
212
212
|
set_info("loading")
|
@@ -230,8 +230,8 @@ class Gantt < Gtk::Viewport
|
|
230
230
|
starts,finishs,percents,heights=create_rectangle(iter.first_child,level+1)
|
231
231
|
r.set_height(heights-r.y1) unless heights-r.y1 == r.height
|
232
232
|
height=r.y1+r.height if height.nil? || height<r.height+r.y1 #recalc height, since it changes by depth
|
233
|
-
r.set_start(starts,
|
234
|
-
r.set_duration(finishs-starts,
|
233
|
+
r.set_start(starts,false) unless starts == r.start
|
234
|
+
r.set_duration(finishs-starts,false) unless finishs-starts == r.dur
|
235
235
|
r.set_percentage(percents,true) unless percents == r.percentage
|
236
236
|
end
|
237
237
|
vi=iter.next!
|
metadata
CHANGED
@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
|
|
4
4
|
prerelease: false
|
5
5
|
segments:
|
6
6
|
- 1
|
7
|
-
-
|
7
|
+
- 1530
|
8
8
|
- 0
|
9
|
-
version: 1.
|
9
|
+
version: 1.1530.0
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- Dobai-Pataky Balint
|
@@ -14,7 +14,7 @@ autorequire:
|
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
16
|
|
17
|
-
date: 2011-
|
17
|
+
date: 2011-04-27 00:00:00 +03:00
|
18
18
|
default_executable:
|
19
19
|
dependencies:
|
20
20
|
- !ruby/object:Gem::Dependency
|