summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib')
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py15
-rw-r--r--bitbake/lib/bb/ui/crumbs/hobeventhandler.py6
-rw-r--r--bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py2
3 files changed, 9 insertions, 14 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index e5222da285..ecf5371bf6 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -947,10 +947,10 @@ class Builder(gtk.Window):
947 self.package_details_page.refresh_selection() 947 self.package_details_page.refresh_selection()
948 948
949 def handler_recipe_populated_cb(self, handler): 949 def handler_recipe_populated_cb(self, handler):
950 self.image_configuration_page.update_progress_bar("Populated recipes", 0.99) 950 self.image_configuration_page.update_progress_bar("Populating recipes", 0.99)
951 951
952 def handler_package_populated_cb(self, handler): 952 def handler_package_populated_cb(self, handler):
953 self.image_configuration_page.update_progress_bar("Populated packages", 1.0) 953 self.image_configuration_page.update_progress_bar("Populating packages", 1.0)
954 954
955 def handler_parsing_started_cb(self, handler, message): 955 def handler_parsing_started_cb(self, handler, message):
956 if self.current_step != self.RCPPKGINFO_POPULATING: 956 if self.current_step != self.RCPPKGINFO_POPULATING:
@@ -960,12 +960,9 @@ class Builder(gtk.Window):
960 if message["eventname"] == "TreeDataPreparationStarted": 960 if message["eventname"] == "TreeDataPreparationStarted":
961 fraction = 0.6 + fraction 961 fraction = 0.6 + fraction
962 self.image_configuration_page.stop_button.set_sensitive(False) 962 self.image_configuration_page.stop_button.set_sensitive(False)
963 else:
964 self.image_configuration_page.stop_button.set_sensitive(True)
965
966 if message["eventname"] == "TreeDataPreparationProgress":
967 self.image_configuration_page.update_progress_bar("Generating dependency tree", fraction) 963 self.image_configuration_page.update_progress_bar("Generating dependency tree", fraction)
968 else: 964 else:
965 self.image_configuration_page.stop_button.set_sensitive(True)
969 self.image_configuration_page.update_progress_bar(message["title"], fraction) 966 self.image_configuration_page.update_progress_bar(message["title"], fraction)
970 967
971 def handler_parsing_cb(self, handler, message): 968 def handler_parsing_cb(self, handler, message):
@@ -975,11 +972,9 @@ class Builder(gtk.Window):
975 fraction = message["current"] * 1.0/message["total"] 972 fraction = message["current"] * 1.0/message["total"]
976 if message["eventname"] == "TreeDataPreparationProgress": 973 if message["eventname"] == "TreeDataPreparationProgress":
977 fraction = 0.6 + 0.38 * fraction 974 fraction = 0.6 + 0.38 * fraction
975 self.image_configuration_page.update_progress_bar("Generating dependency tree", fraction)
978 else: 976 else:
979 fraction = 0.6 * fraction 977 fraction = 0.6 * fraction
980 if message["eventname"] == "TreeDataPreparationProgress":
981 self.image_configuration_page.update_progress_bar("Generating dependency tree", fraction)
982 else:
983 self.image_configuration_page.update_progress_bar(message["title"], fraction) 978 self.image_configuration_page.update_progress_bar(message["title"], fraction)
984 979
985 def handler_parsing_completed_cb(self, handler, message): 980 def handler_parsing_completed_cb(self, handler, message):
@@ -990,7 +985,7 @@ class Builder(gtk.Window):
990 fraction = 0.98 985 fraction = 0.98
991 else: 986 else:
992 fraction = 0.6 987 fraction = 0.6
993 self.image_configuration_page.update_progress_bar(message["title"], fraction) 988 self.image_configuration_page.update_progress_bar("Generating dependency tree", fraction)
994 989
995 def handler_build_started_cb(self, running_build): 990 def handler_build_started_cb(self, running_build):
996 if self.current_step == self.FAST_IMAGE_GENERATING: 991 if self.current_step == self.FAST_IMAGE_GENERATING:
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index 7d3af6c725..350b00b9ae 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
@@ -243,7 +243,7 @@ class HobHandler(gobject.GObject):
243 message["eventname"] = bb.event.getName(event) 243 message["eventname"] = bb.event.getName(event)
244 message["current"] = 0 244 message["current"] = 0
245 message["total"] = None 245 message["total"] = None
246 message["title"] = "Parsing recipes: " 246 message["title"] = "Parsing recipes"
247 self.emit("parsing-started", message) 247 self.emit("parsing-started", message)
248 elif isinstance(event, (bb.event.ParseProgress, 248 elif isinstance(event, (bb.event.ParseProgress,
249 bb.event.CacheLoadProgress, 249 bb.event.CacheLoadProgress,
@@ -252,7 +252,7 @@ class HobHandler(gobject.GObject):
252 message["eventname"] = bb.event.getName(event) 252 message["eventname"] = bb.event.getName(event)
253 message["current"] = event.current 253 message["current"] = event.current
254 message["total"] = event.total 254 message["total"] = event.total
255 message["title"] = "Parsing recipes: " 255 message["title"] = "Parsing recipes"
256 self.emit("parsing", message) 256 self.emit("parsing", message)
257 elif isinstance(event, (bb.event.ParseCompleted, 257 elif isinstance(event, (bb.event.ParseCompleted,
258 bb.event.CacheLoadCompleted, 258 bb.event.CacheLoadCompleted,
@@ -261,7 +261,7 @@ class HobHandler(gobject.GObject):
261 message["eventname"] = bb.event.getName(event) 261 message["eventname"] = bb.event.getName(event)
262 message["current"] = event.total 262 message["current"] = event.total
263 message["total"] = event.total 263 message["total"] = event.total
264 message["title"] = "Parsing recipes: " 264 message["title"] = "Parsing recipes"
265 self.emit("parsing-completed", message) 265 self.emit("parsing-completed", message)
266 elif isinstance(event, bb.event.NetworkTestFailed): 266 elif isinstance(event, bb.event.NetworkTestFailed):
267 self.emit("network-failed") 267 self.emit("network-failed")
diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
index 660319a9c9..b94f35c66d 100644
--- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
+++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
@@ -117,7 +117,7 @@ class ImageConfigurationPage (HobPage):
117 def update_progress_bar(self, title, fraction, status=None): 117 def update_progress_bar(self, title, fraction, status=None):
118 if self.stopping == False: 118 if self.stopping == False:
119 self.progress_bar.update(fraction) 119 self.progress_bar.update(fraction)
120 self.progress_bar.set_title(title) 120 self.progress_bar.set_text(title)
121 self.progress_bar.set_rcstyle(status) 121 self.progress_bar.set_rcstyle(status)
122 122
123 def show_info_populating(self): 123 def show_info_populating(self):