mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-01 06:32:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hob: Fixed the hobwidget code and make it like a pythonista

Browse Source 
fixed the 'for..in..' range dance code, and use the 'iterator' approach to replaced the index for quote the 'children' list

(From Poky rev: 74e7286a4e875eda5e8abeb5db1015031d21c35f)

(Bitbake rev: 3dc443663b97515a54b70c9047a9b22c6b8a0c14)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Liming An
2012-03-20 17:38:02 +08:00
committed by Richard Purdie
parent 4dc552a216
commit 5e0461c0e0
1 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
bitbake/lib/bb/ui/crumbs/hobwidget.py
View File

@@ -309,7 +309,7 @@ class HobTabBar(gtk.DrawingArea):
self.tab_h_ratio = 52 * 1.0/53
self.set_size_request(self.width, self.height)
self.current_child = 0
self.current_child = None
self.font = self.get_style().font_desc
self.font.set_size(pango.SCALE * 13)
self.update_children_text_layout_and_bg_color()
@@ -339,10 +339,10 @@ class HobTabBar(gtk.DrawingArea):
if self.is_focus() or event.type == gtk.gdk.BUTTON_PRESS:
x, y = event.get_coords()
# check which tab be clicked
for i, child in enumerate(self.children):
for child in self.children:
if (child["x"] < x) and (x < child["x"] + self.tab_width) \
and (child["y"] < y) and (y < child["y"] + self.tab_height):
self.current_child = i
self.current_child = child
result = True
break
@@ -353,7 +353,7 @@ class HobTabBar(gtk.DrawingArea):
self.grab_focus()
if result == True:
page = self.children[self.current_child]["toggled_page"]
page = self.current_child["toggled_page"]
self.emit("tab-switched", page)
self.tab_pressed = True
self.queue_draw()
@@ -383,16 +383,16 @@ class HobTabBar(gtk.DrawingArea):
pangolayout = self.create_pango_layout(child["title"])
pangolayout.set_font_description(self.font)
child["title_layout"] = pangolayout
child[i]["r"] = color.red
child[i]["g"] = color.green
child[i]["b"] = color.blue
child["r"] = color.red
child["g"] = color.green
child["b"] = color.blue
def append_tab_child(self, title, page):
num = len(self.children) + 1
self.tab_width = self.tab_width * len(self.children) / num
i = 0
for child in self.children:
for i, child in enumerate(self.children):
child["x"] = self.tab_x + i * self.tab_width
i += 1
@@ -414,6 +414,9 @@ class HobTabBar(gtk.DrawingArea):
"indicator_number" : 0,
}
self.children.append(new_one)
# set the default current child
if not self.current_child:
self.current_child = new_one
def on_draw(self, widget, event):
cr = widget.window.cairo_create()
@@ -425,11 +428,12 @@ class HobTabBar(gtk.DrawingArea):
self.draw_background(cr)
self.draw_toggled_tab(cr)
self.draw_tab_text(cr)
for i, child in enumerate(self.children):
for child in self.children:
if child["indicator_show"] == True:
self.draw_indicator(cr, i)
self.draw_indicator(cr, child)
self.draw_tab_text(cr)
def draw_background(self, cr):
style = self.get_style()
@@ -476,14 +480,15 @@ class HobTabBar(gtk.DrawingArea):
# center pos
off_x = (self.tab_width - fontw) / 2
off_y = (self.tab_height - fonth) / 2
x = child[i]["x"] + off_x
y = child[i]["y"] + off_y
x = child["x"] + off_x
y = child["y"] + off_y
self.window.draw_layout(self.style.fg_gc[gtk.STATE_NORMAL], int(x), int(y), pangolayout)
def draw_toggled_tab(self, cr):
i = self.current_child
x = self.children[i]["x"]
y = self.children[i]["y"]
if not self.current_child:
return
x = self.current_child["x"]
y = self.current_child["y"]
width = self.tab_width
height = self.tab_height
style = self.get_style()
@@ -515,10 +520,10 @@ class HobTabBar(gtk.DrawingArea):
cr.arc(x + r, y + r, r, math.pi, 1.5*math.pi)
cr.fill()
def draw_indicator(self, cr, i):
tab_x = self.children[i]["x"]
tab_y = self.children[i]["y"]
number = self.children[i]["indicator_number"]
def draw_indicator(self, cr, child):
tab_x = child["x"]
tab_y = child["y"]
number = child["indicator_number"]
dest_w = int(32 * self.tab_w_ratio)
dest_h = int(32 * self.tab_h_ratio)
if dest_h < self.tab_height:
@@ -541,13 +546,13 @@ class HobTabBar(gtk.DrawingArea):
cr.move_to(x, y)
self.window.draw_layout(self.style.fg_gc[gtk.STATE_NORMAL], int(x), int(y), layout)
def show_indicator_icon(self, i, number):
self.children[i]["indicator_show"] = True
self.children[i]["indicator_number"] = number
def show_indicator_icon(self, child, number):
child["indicator_show"] = True
child["indicator_number"] = number
self.queue_draw()
def hide_indicator_icon(self, i):
self.children[i]["indicator_show"] = False
def hide_indicator_icon(self, child):
child["indicator_show"] = False
self.queue_draw()
def set_blank_size(self, x, y, w, h):
@@ -618,18 +623,18 @@ class HobNotebook(gtk.VBox):
self.tb.show()
def show_indicator_icon(self, title, number):
for i, child in enumerate(self.tabbar.children):
for child in self.tabbar.children:
if child["toggled_page"] == -1:
continue
if child["title"] == title:
self.tabbar.show_indicator_icon(i, number)
self.tabbar.show_indicator_icon(child, number)
def hide_indicator_icon(self, title):
for i, child in enumerate(self.tabbar.children):
for child in self.tabbar.children:
if child["toggled_page"] == -1:
continue
if child["title"] == title:
self.tabbar.hide_indicator_icon(i)
self.tabbar.hide_indicator_icon(child)
def tab_switched_cb(self, widget, page):
self.notebook.set_current_page(page)