mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: hob: Search strings and results should be persistent

Browse Source 
Now, the search results stay until I clear the search field,
so that I can manipulate the search results.

[YOCTO #4112 & #4117]
(Bitbake rev: d880ce966ca825aa66a23755fcb47497fb3f26c3)

Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Cristiana Voicu
2013-03-27 17:20:07 +02:00
committed by Richard Purdie
parent e98716fc92
commit 2f4fe1ee11
3 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/ui/crumbs/hobwidget.py
+7 -2
View File
@@ -537,14 +537,18 @@ class HobNotebook(gtk.Notebook):
def set_search_entry_editable_cb(self, search, event): def set_search_entry_editable_cb(self, search, event):
search.set_editable(True) search.set_editable(True)
search.set_text("") text = search.get_text()
if text in self.search_names:
search.set_text("")
style = self.search.get_style() style = self.search.get_style()
style.text[gtk.STATE_NORMAL] = self.get_colormap().alloc_color(HobColors.BLACK, False, False) style.text[gtk.STATE_NORMAL] = self.get_colormap().alloc_color(HobColors.BLACK, False, False)
search.set_style(style) search.set_style(style)
def set_search_entry_reset_cb(self, search, event): def set_search_entry_reset_cb(self, search, event):
page_num = self.get_current_page() page_num = self.get_current_page()
self.reset_entry(search, page_num) text = search.get_text()
if not text:
self.reset_entry(search, page_num)
def reset_entry(self, entry, page_num): def reset_entry(self, entry, page_num):
style = entry.get_style() style = entry.get_style()
@@ -559,6 +563,7 @@ class HobNotebook(gtk.Notebook):
if search.get_editable() == True: if search.get_editable() == True:
search.set_text("") search.set_text("")
search.set_icon_sensitive(gtk.ENTRY_ICON_SECONDARY, False) search.set_icon_sensitive(gtk.ENTRY_ICON_SECONDARY, False)
search.grab_focus()
def set_page(self, title): def set_page(self, title):
for child in self.pages: for child in self.pages:
bitbake/lib/bb/ui/crumbs/packageselectionpage.py
+18 -17
View File
@@ -180,24 +180,25 @@ class PackageSelectionPage (HobPage):
self.button_box.pack_end(self.back_button, expand=False, fill=False) self.button_box.pack_end(self.back_button, expand=False, fill=False)
def search_entry_changed(self, entry): def search_entry_changed(self, entry):
current_tab = self.ins.get_current_page()
filter = self.pages[current_tab]['filter']
text = entry.get_text() text = entry.get_text()
filter[PackageListModel.COL_NAME] = text if text not in self.ins.search_names:
self.tables[current_tab].set_model(self.package_model.tree_model(filter, search_data=text)) current_tab = self.ins.get_current_page()
if self.package_model.filtered_nb == 0: filter = self.pages[current_tab]['filter']
if not self.ins.get_nth_page(current_tab).top_bar: filter[PackageListModel.COL_NAME] = text
self.ins.get_nth_page(current_tab).add_no_result_bar(entry) self.tables[current_tab].set_model(self.package_model.tree_model(filter, search_data=text))
self.ins.get_nth_page(current_tab).top_bar.show() if self.package_model.filtered_nb == 0:
self.ins.get_nth_page(current_tab).scroll.hide() if not self.ins.get_nth_page(current_tab).top_bar:
else: self.ins.get_nth_page(current_tab).add_no_result_bar(entry)
if self.ins.get_nth_page(current_tab).top_bar: self.ins.get_nth_page(current_tab).top_bar.show()
self.ins.get_nth_page(current_tab).top_bar.hide() self.ins.get_nth_page(current_tab).scroll.hide()
self.ins.get_nth_page(current_tab).scroll.show() else:
if entry.get_text() == '': if self.ins.get_nth_page(current_tab).top_bar:
entry.set_icon_sensitive(gtk.ENTRY_ICON_SECONDARY, False) self.ins.get_nth_page(current_tab).top_bar.hide()
else: self.ins.get_nth_page(current_tab).scroll.show()
entry.set_icon_sensitive(gtk.ENTRY_ICON_SECONDARY, True) if entry.get_text() == '':
entry.set_icon_sensitive(gtk.ENTRY_ICON_SECONDARY, False)
else:
entry.set_icon_sensitive(gtk.ENTRY_ICON_SECONDARY, True)
def button_click_cb(self, widget, event): def button_click_cb(self, widget, event):
path, col = widget.table_tree.get_cursor() path, col = widget.table_tree.get_cursor()
bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
+18 -17
View File
@@ -195,24 +195,25 @@ class RecipeSelectionPage (HobPage):
button_box.pack_end(self.back_button, expand=False, fill=False) button_box.pack_end(self.back_button, expand=False, fill=False)
def search_entry_changed(self, entry): def search_entry_changed(self, entry):
current_tab = self.ins.get_current_page()
filter = self.pages[current_tab]['filter']
text = entry.get_text() text = entry.get_text()
filter[RecipeListModel.COL_NAME] = text if text not in self.ins.search_names:
self.tables[current_tab].set_model(self.recipe_model.tree_model(filter, search_data=text)) current_tab = self.ins.get_current_page()
if self.recipe_model.filtered_nb == 0: filter = self.pages[current_tab]['filter']
if not self.ins.get_nth_page(current_tab).top_bar: filter[RecipeListModel.COL_NAME] = text
self.ins.get_nth_page(current_tab).add_no_result_bar(entry) self.tables[current_tab].set_model(self.recipe_model.tree_model(filter, search_data=text))
self.ins.get_nth_page(current_tab).top_bar.show() if self.recipe_model.filtered_nb == 0:
self.ins.get_nth_page(current_tab).scroll.hide() if not self.ins.get_nth_page(current_tab).top_bar:
else: self.ins.get_nth_page(current_tab).add_no_result_bar(entry)
if self.ins.get_nth_page(current_tab).top_bar: self.ins.get_nth_page(current_tab).top_bar.show()
self.ins.get_nth_page(current_tab).top_bar.hide() self.ins.get_nth_page(current_tab).scroll.hide()
self.ins.get_nth_page(current_tab).scroll.show() else:
if entry.get_text() == '': if self.ins.get_nth_page(current_tab).top_bar:
entry.set_icon_sensitive(gtk.ENTRY_ICON_SECONDARY, False) self.ins.get_nth_page(current_tab).top_bar.hide()
else: self.ins.get_nth_page(current_tab).scroll.show()
entry.set_icon_sensitive(gtk.ENTRY_ICON_SECONDARY, True) if entry.get_text() == '':
entry.set_icon_sensitive(gtk.ENTRY_ICON_SECONDARY, False)
else:
entry.set_icon_sensitive(gtk.ENTRY_ICON_SECONDARY, True)
def button_click_cb(self, widget, event): def button_click_cb(self, widget, event):
path, col = widget.table_tree.get_cursor() path, col = widget.table_tree.get_cursor()