summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-12-02 18:58:47 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-03 17:45:54 (GMT)
commit0a5fdfbf36d168182480874c6175a33fec603db7 (patch)
tree2bbf4aabfd66133daf04fc53fcbb5237fc19d3a0
parent27ae6871db4f7282754be7d19eebeceb81f2f813 (diff)
downloadpoky-0a5fdfbf36d168182480874c6175a33fec603db7.tar.gz
bitbake: hob: fix package property dialog for changes to FILES_INFO
The FILES_INFO structure is now much simpler, so remove all of the horrible mangling we had to do here in order to read it. (Bitbake rev: 11a664292064dbf76850bf21ba386f78a43a56b6) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/ui/crumbs/hig/propertydialog.py44
1 files changed, 15 insertions, 29 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hig/propertydialog.py b/bitbake/lib/bb/ui/crumbs/hig/propertydialog.py
index 9ab7d75..09b9ce6 100644
--- a/bitbake/lib/bb/ui/crumbs/hig/propertydialog.py
+++ b/bitbake/lib/bb/ui/crumbs/hig/propertydialog.py
@@ -105,13 +105,14 @@ class PropertyDialog(CrumbsDialog):
105 105
106 def create_package_visual_elements(self): 106 def create_package_visual_elements(self):
107 107
108 import json
109
108 name = self.properties['name'] 110 name = self.properties['name']
109 binb = self.properties['binb'] 111 binb = self.properties['binb']
110 size = self.properties['size'] 112 size = self.properties['size']
111 recipe = self.properties['recipe'] 113 recipe = self.properties['recipe']
112 file_list = self.properties['files_list'] 114 file_list = json.loads(self.properties['files_list'])
113 115
114 file_list = file_list.strip("{}'")
115 files_temp = '' 116 files_temp = ''
116 paths_temp = '' 117 paths_temp = ''
117 files_binb = [] 118 files_binb = []
@@ -180,7 +181,7 @@ class PropertyDialog(CrumbsDialog):
180 181
181 #################################### FILES BROUGHT BY PACKAGES ################################### 182 #################################### FILES BROUGHT BY PACKAGES ###################################
182 183
183 if file_list != '': 184 if file_list:
184 185
185 self.textWindow = gtk.ScrolledWindow() 186 self.textWindow = gtk.ScrolledWindow()
186 self.textWindow.set_shadow_type(gtk.SHADOW_IN) 187 self.textWindow.set_shadow_type(gtk.SHADOW_IN)
@@ -199,33 +200,18 @@ class PropertyDialog(CrumbsDialog):
199 col1.set_cell_data_func(self.cell1, self.regex_field) 200 col1.set_cell_data_func(self.cell1, self.regex_field)
200 self.packagefiles_tv.append_column(col1) 201 self.packagefiles_tv.append_column(col1)
201 202
202 for items in file_list.split(']'): 203 items = file_list.keys()
203 if len(items) > 1: 204 items.sort()
204 paths_temp = items.split(":")[0] 205 for item in items:
205 paths_binb.append(paths_temp.strip(" ,'")) 206 fullpath = item
206 files_temp = items.split(":")[1] 207 while len(item) > 35:
207 files_binb.append(files_temp.strip(" ['")) 208 item = item[:len(item)/2] + "" + item[len(item)/2+1:]
209 if len(item) == 35:
210 item = item[:len(item)/2] + "..." + item[len(item)/2+3:]
211 self.tooltip_items[item] = fullpath
212
213 packagefiles_store.append([str(item)])
208 214
209 unsorted_list = []
210
211 for items in range(len(paths_binb)):
212 if len(files_binb[items]) > 1:
213 for aduse in (files_binb[items].split(",")):
214 unsorted_list.append(paths_binb[items].split(name)[len(paths_binb[items].split(name))-1] + '/' + aduse.strip(" '"))
215
216
217 unsorted_list.sort()
218 for items in unsorted_list:
219 temp = items
220 while len(items) > 35:
221 items = items[:len(items)/2] + "" + items[len(items)/2+1:]
222 if len(items) == 35:
223 items = items[:len(items)/2] + "..." + items[len(items)/2+3:]
224 self.tooltip_items[items] = temp
225
226 packagefiles_store.append([str(items)])
227
228
229 self.packagefiles_tv.set_model(packagefiles_store) 215 self.packagefiles_tv.set_model(packagefiles_store)
230 216
231 tips = gtk.Tooltips() 217 tips = gtk.Tooltips()