diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-03-24 16:56:12 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 15:41:32 +0100 |
commit | 7acc132cac873e60005516272473a55a8160b9c4 (patch) | |
tree | 2e4122862ffd856803160b6089fcb979d3efd630 /bitbake/lib/bb/ui | |
parent | bbf83fd988ca3cf9dae7d2b542a11a7c942b1702 (diff) | |
download | poky-7acc132cac873e60005516272473a55a8160b9c4.tar.gz |
Formatting cleanups
(Bitbake rev: 2caf134b43a44dad30af4fbe33033b3c58deee57)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/ui')
-rw-r--r-- | bitbake/lib/bb/ui/__init__.py | 1 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/__init__.py | 1 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/buildmanager.py | 39 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/runningbuild.py | 24 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/depexp.py | 3 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/goggle.py | 13 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/knotty.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/ncurses.py | 7 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/puccho.py | 110 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/uievent.py | 5 |
10 files changed, 98 insertions, 107 deletions
diff --git a/bitbake/lib/bb/ui/__init__.py b/bitbake/lib/bb/ui/__init__.py index c6a377a8e6..a4805ed028 100644 --- a/bitbake/lib/bb/ui/__init__.py +++ b/bitbake/lib/bb/ui/__init__.py | |||
@@ -15,4 +15,3 @@ | |||
15 | # You should have received a copy of the GNU General Public License along | 15 | # You should have received a copy of the GNU General Public License along |
16 | # with this program; if not, write to the Free Software Foundation, Inc., | 16 | # with this program; if not, write to the Free Software Foundation, Inc., |
17 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 17 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
18 | |||
diff --git a/bitbake/lib/bb/ui/crumbs/__init__.py b/bitbake/lib/bb/ui/crumbs/__init__.py index c6a377a8e6..a4805ed028 100644 --- a/bitbake/lib/bb/ui/crumbs/__init__.py +++ b/bitbake/lib/bb/ui/crumbs/__init__.py | |||
@@ -15,4 +15,3 @@ | |||
15 | # You should have received a copy of the GNU General Public License along | 15 | # You should have received a copy of the GNU General Public License along |
16 | # with this program; if not, write to the Free Software Foundation, Inc., | 16 | # with this program; if not, write to the Free Software Foundation, Inc., |
17 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 17 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
18 | |||
diff --git a/bitbake/lib/bb/ui/crumbs/buildmanager.py b/bitbake/lib/bb/ui/crumbs/buildmanager.py index f89e8eefd4..f5a15329d5 100644 --- a/bitbake/lib/bb/ui/crumbs/buildmanager.py +++ b/bitbake/lib/bb/ui/crumbs/buildmanager.py | |||
@@ -28,7 +28,7 @@ import time | |||
28 | class BuildConfiguration: | 28 | class BuildConfiguration: |
29 | """ Represents a potential *or* historic *or* concrete build. It | 29 | """ Represents a potential *or* historic *or* concrete build. It |
30 | encompasses all the things that we need to tell bitbake to do to make it | 30 | encompasses all the things that we need to tell bitbake to do to make it |
31 | build what we want it to build. | 31 | build what we want it to build. |
32 | 32 | ||
33 | It also stored the metadata URL and the set of possible machines (and the | 33 | It also stored the metadata URL and the set of possible machines (and the |
34 | distros / images / uris for these. Apart from the metdata URL these are | 34 | distros / images / uris for these. Apart from the metdata URL these are |
@@ -73,8 +73,8 @@ class BuildConfiguration: | |||
73 | return self.urls | 73 | return self.urls |
74 | 74 | ||
75 | # It might be a lot lot better if we stored these in like, bitbake conf | 75 | # It might be a lot lot better if we stored these in like, bitbake conf |
76 | # file format. | 76 | # file format. |
77 | @staticmethod | 77 | @staticmethod |
78 | def load_from_file (filename): | 78 | def load_from_file (filename): |
79 | f = open (filename, "r") | 79 | f = open (filename, "r") |
80 | 80 | ||
@@ -140,13 +140,13 @@ class BuildResult(gobject.GObject): | |||
140 | ".conf" in the directory for the build. | 140 | ".conf" in the directory for the build. |
141 | 141 | ||
142 | This is GObject so that it can be included in the TreeStore.""" | 142 | This is GObject so that it can be included in the TreeStore.""" |
143 | 143 | ||
144 | (STATE_COMPLETE, STATE_FAILED, STATE_ONGOING) = \ | 144 | (STATE_COMPLETE, STATE_FAILED, STATE_ONGOING) = \ |
145 | (0, 1, 2) | 145 | (0, 1, 2) |
146 | 146 | ||
147 | def __init__ (self, parent, identifier): | 147 | def __init__ (self, parent, identifier): |
148 | gobject.GObject.__init__ (self) | 148 | gobject.GObject.__init__ (self) |
149 | self.date = None | 149 | self.date = None |
150 | 150 | ||
151 | self.files = [] | 151 | self.files = [] |
152 | self.status = None | 152 | self.status = None |
@@ -181,7 +181,7 @@ class BuildResult(gobject.GObject): | |||
181 | self.add_file (file) | 181 | self.add_file (file) |
182 | 182 | ||
183 | def add_file (self, file): | 183 | def add_file (self, file): |
184 | # Just add the file for now. Don't care about the type. | 184 | # Just add the file for now. Don't care about the type. |
185 | self.files += [(file, None)] | 185 | self.files += [(file, None)] |
186 | 186 | ||
187 | class BuildManagerModel (gtk.TreeStore): | 187 | class BuildManagerModel (gtk.TreeStore): |
@@ -194,7 +194,7 @@ class BuildManagerModel (gtk.TreeStore): | |||
194 | 194 | ||
195 | def __init__ (self): | 195 | def __init__ (self): |
196 | gtk.TreeStore.__init__ (self, | 196 | gtk.TreeStore.__init__ (self, |
197 | gobject.TYPE_STRING, | 197 | gobject.TYPE_STRING, |
198 | gobject.TYPE_STRING, | 198 | gobject.TYPE_STRING, |
199 | gobject.TYPE_STRING, | 199 | gobject.TYPE_STRING, |
200 | gobject.TYPE_STRING, | 200 | gobject.TYPE_STRING, |
@@ -207,7 +207,7 @@ class BuildManager (gobject.GObject): | |||
207 | "results" directory but is also used for starting a new build.""" | 207 | "results" directory but is also used for starting a new build.""" |
208 | 208 | ||
209 | __gsignals__ = { | 209 | __gsignals__ = { |
210 | 'population-finished' : (gobject.SIGNAL_RUN_LAST, | 210 | 'population-finished' : (gobject.SIGNAL_RUN_LAST, |
211 | gobject.TYPE_NONE, | 211 | gobject.TYPE_NONE, |
212 | ()), | 212 | ()), |
213 | 'populate-error' : (gobject.SIGNAL_RUN_LAST, | 213 | 'populate-error' : (gobject.SIGNAL_RUN_LAST, |
@@ -220,13 +220,13 @@ class BuildManager (gobject.GObject): | |||
220 | date = long (time.mktime (result.date.timetuple())) | 220 | date = long (time.mktime (result.date.timetuple())) |
221 | 221 | ||
222 | # Add a top level entry for the build | 222 | # Add a top level entry for the build |
223 | 223 | ||
224 | self.model.set (iter, | 224 | self.model.set (iter, |
225 | BuildManagerModel.COL_IDENT, result.identifier, | 225 | BuildManagerModel.COL_IDENT, result.identifier, |
226 | BuildManagerModel.COL_DESC, result.conf.image, | 226 | BuildManagerModel.COL_DESC, result.conf.image, |
227 | BuildManagerModel.COL_MACHINE, result.conf.machine, | 227 | BuildManagerModel.COL_MACHINE, result.conf.machine, |
228 | BuildManagerModel.COL_DISTRO, result.conf.distro, | 228 | BuildManagerModel.COL_DISTRO, result.conf.distro, |
229 | BuildManagerModel.COL_BUILD_RESULT, result, | 229 | BuildManagerModel.COL_BUILD_RESULT, result, |
230 | BuildManagerModel.COL_DATE, date, | 230 | BuildManagerModel.COL_DATE, date, |
231 | BuildManagerModel.COL_STATE, result.state) | 231 | BuildManagerModel.COL_STATE, result.state) |
232 | 232 | ||
@@ -257,7 +257,7 @@ class BuildManager (gobject.GObject): | |||
257 | 257 | ||
258 | while (iter): | 258 | while (iter): |
259 | (ident, state) = self.model.get(iter, | 259 | (ident, state) = self.model.get(iter, |
260 | BuildManagerModel.COL_IDENT, | 260 | BuildManagerModel.COL_IDENT, |
261 | BuildManagerModel.COL_STATE) | 261 | BuildManagerModel.COL_STATE) |
262 | 262 | ||
263 | if state == BuildResult.STATE_ONGOING: | 263 | if state == BuildResult.STATE_ONGOING: |
@@ -422,29 +422,29 @@ class BuildManagerTreeView (gtk.TreeView): | |||
422 | 422 | ||
423 | # Misc descriptiony thing | 423 | # Misc descriptiony thing |
424 | renderer = gtk.CellRendererText () | 424 | renderer = gtk.CellRendererText () |
425 | col = gtk.TreeViewColumn (None, renderer, | 425 | col = gtk.TreeViewColumn (None, renderer, |
426 | text=BuildManagerModel.COL_DESC) | 426 | text=BuildManagerModel.COL_DESC) |
427 | self.append_column (col) | 427 | self.append_column (col) |
428 | 428 | ||
429 | # Machine | 429 | # Machine |
430 | renderer = gtk.CellRendererText () | 430 | renderer = gtk.CellRendererText () |
431 | col = gtk.TreeViewColumn ("Machine", renderer, | 431 | col = gtk.TreeViewColumn ("Machine", renderer, |
432 | text=BuildManagerModel.COL_MACHINE) | 432 | text=BuildManagerModel.COL_MACHINE) |
433 | self.append_column (col) | 433 | self.append_column (col) |
434 | 434 | ||
435 | # distro | 435 | # distro |
436 | renderer = gtk.CellRendererText () | 436 | renderer = gtk.CellRendererText () |
437 | col = gtk.TreeViewColumn ("Distribution", renderer, | 437 | col = gtk.TreeViewColumn ("Distribution", renderer, |
438 | text=BuildManagerModel.COL_DISTRO) | 438 | text=BuildManagerModel.COL_DISTRO) |
439 | self.append_column (col) | 439 | self.append_column (col) |
440 | 440 | ||
441 | # date (using a custom function for formatting the cell contents it | 441 | # date (using a custom function for formatting the cell contents it |
442 | # takes epoch -> human readable string) | 442 | # takes epoch -> human readable string) |
443 | renderer = gtk.CellRendererText () | 443 | renderer = gtk.CellRendererText () |
444 | col = gtk.TreeViewColumn ("Date", renderer, | 444 | col = gtk.TreeViewColumn ("Date", renderer, |
445 | text=BuildManagerModel.COL_DATE) | 445 | text=BuildManagerModel.COL_DATE) |
446 | self.append_column (col) | 446 | self.append_column (col) |
447 | col.set_cell_data_func (renderer, | 447 | col.set_cell_data_func (renderer, |
448 | self.date_format_custom_cell_data_func) | 448 | self.date_format_custom_cell_data_func) |
449 | 449 | ||
450 | # For status. | 450 | # For status. |
@@ -454,4 +454,3 @@ class BuildManagerTreeView (gtk.TreeView): | |||
454 | self.append_column (col) | 454 | self.append_column (col) |
455 | col.set_cell_data_func (renderer, | 455 | col.set_cell_data_func (renderer, |
456 | self.state_format_custom_cell_data_fun) | 456 | self.state_format_custom_cell_data_fun) |
457 | |||
diff --git a/bitbake/lib/bb/ui/crumbs/runningbuild.py b/bitbake/lib/bb/ui/crumbs/runningbuild.py index 18afd6674d..79e2c9060d 100644 --- a/bitbake/lib/bb/ui/crumbs/runningbuild.py +++ b/bitbake/lib/bb/ui/crumbs/runningbuild.py | |||
@@ -24,7 +24,7 @@ import gobject | |||
24 | class RunningBuildModel (gtk.TreeStore): | 24 | class RunningBuildModel (gtk.TreeStore): |
25 | (COL_TYPE, COL_PACKAGE, COL_TASK, COL_MESSAGE, COL_ICON, COL_ACTIVE) = (0, 1, 2, 3, 4, 5) | 25 | (COL_TYPE, COL_PACKAGE, COL_TASK, COL_MESSAGE, COL_ICON, COL_ACTIVE) = (0, 1, 2, 3, 4, 5) |
26 | def __init__ (self): | 26 | def __init__ (self): |
27 | gtk.TreeStore.__init__ (self, | 27 | gtk.TreeStore.__init__ (self, |
28 | gobject.TYPE_STRING, | 28 | gobject.TYPE_STRING, |
29 | gobject.TYPE_STRING, | 29 | gobject.TYPE_STRING, |
30 | gobject.TYPE_STRING, | 30 | gobject.TYPE_STRING, |
@@ -34,7 +34,7 @@ class RunningBuildModel (gtk.TreeStore): | |||
34 | 34 | ||
35 | class RunningBuild (gobject.GObject): | 35 | class RunningBuild (gobject.GObject): |
36 | __gsignals__ = { | 36 | __gsignals__ = { |
37 | 'build-succeeded' : (gobject.SIGNAL_RUN_LAST, | 37 | 'build-succeeded' : (gobject.SIGNAL_RUN_LAST, |
38 | gobject.TYPE_NONE, | 38 | gobject.TYPE_NONE, |
39 | ()), | 39 | ()), |
40 | 'build-failed' : (gobject.SIGNAL_RUN_LAST, | 40 | 'build-failed' : (gobject.SIGNAL_RUN_LAST, |
@@ -82,12 +82,12 @@ class RunningBuild (gobject.GObject): | |||
82 | 82 | ||
83 | # Add the message to the tree either at the top level if parent is | 83 | # Add the message to the tree either at the top level if parent is |
84 | # None otherwise as a descendent of a task. | 84 | # None otherwise as a descendent of a task. |
85 | self.model.append (parent, | 85 | self.model.append (parent, |
86 | (event.__name__.split()[-1], # e.g. MsgWarn, MsgError | 86 | (event.__name__.split()[-1], # e.g. MsgWarn, MsgError |
87 | package, | 87 | package, |
88 | task, | 88 | task, |
89 | event._message, | 89 | event._message, |
90 | icon, | 90 | icon, |
91 | False)) | 91 | False)) |
92 | elif isinstance(event, bb.build.TaskStarted): | 92 | elif isinstance(event, bb.build.TaskStarted): |
93 | (package, task) = (event._package, event._task) | 93 | (package, task) = (event._package, event._task) |
@@ -101,10 +101,10 @@ class RunningBuild (gobject.GObject): | |||
101 | if (self.tasks_to_iter.has_key ((package, None))): | 101 | if (self.tasks_to_iter.has_key ((package, None))): |
102 | parent = self.tasks_to_iter[(package, None)] | 102 | parent = self.tasks_to_iter[(package, None)] |
103 | else: | 103 | else: |
104 | parent = self.model.append (None, (None, | 104 | parent = self.model.append (None, (None, |
105 | package, | 105 | package, |
106 | None, | 106 | None, |
107 | "Package: %s" % (package), | 107 | "Package: %s" % (package), |
108 | None, | 108 | None, |
109 | False)) | 109 | False)) |
110 | self.tasks_to_iter[(package, None)] = parent | 110 | self.tasks_to_iter[(package, None)] = parent |
@@ -114,10 +114,10 @@ class RunningBuild (gobject.GObject): | |||
114 | self.model.set(parent, self.model.COL_ICON, "gtk-execute") | 114 | self.model.set(parent, self.model.COL_ICON, "gtk-execute") |
115 | 115 | ||
116 | # Add an entry in the model for this task | 116 | # Add an entry in the model for this task |
117 | i = self.model.append (parent, (None, | 117 | i = self.model.append (parent, (None, |
118 | package, | 118 | package, |
119 | task, | 119 | task, |
120 | "Task: %s" % (task), | 120 | "Task: %s" % (task), |
121 | None, | 121 | None, |
122 | False)) | 122 | False)) |
123 | 123 | ||
@@ -176,5 +176,3 @@ class RunningBuildTreeView (gtk.TreeView): | |||
176 | renderer = gtk.CellRendererText () | 176 | renderer = gtk.CellRendererText () |
177 | col = gtk.TreeViewColumn ("Message", renderer, text=3) | 177 | col = gtk.TreeViewColumn ("Message", renderer, text=3) |
178 | self.append_column (col) | 178 | self.append_column (col) |
179 | |||
180 | |||
diff --git a/bitbake/lib/bb/ui/depexp.py b/bitbake/lib/bb/ui/depexp.py index cfa5b6564e..c596cad5cf 100644 --- a/bitbake/lib/bb/ui/depexp.py +++ b/bitbake/lib/bb/ui/depexp.py | |||
@@ -233,7 +233,7 @@ def init(server, eventHandler): | |||
233 | x = event.sofar | 233 | x = event.sofar |
234 | y = event.total | 234 | y = event.total |
235 | if x == y: | 235 | if x == y: |
236 | print("\nParsing finished. %d cached, %d parsed, %d skipped, %d masked, %d errors." | 236 | print("\nParsing finished. %d cached, %d parsed, %d skipped, %d masked, %d errors." |
237 | % ( event.cached, event.parsed, event.skipped, event.masked, event.errors)) | 237 | % ( event.cached, event.parsed, event.skipped, event.masked, event.errors)) |
238 | pbar.hide() | 238 | pbar.hide() |
239 | gtk.gdk.threads_enter() | 239 | gtk.gdk.threads_enter() |
@@ -269,4 +269,3 @@ def init(server, eventHandler): | |||
269 | server.runCommand(["stateShutdown"]) | 269 | server.runCommand(["stateShutdown"]) |
270 | shutdown = shutdown + 1 | 270 | shutdown = shutdown + 1 |
271 | pass | 271 | pass |
272 | |||
diff --git a/bitbake/lib/bb/ui/goggle.py b/bitbake/lib/bb/ui/goggle.py index 94995d82db..bcba38be9c 100644 --- a/bitbake/lib/bb/ui/goggle.py +++ b/bitbake/lib/bb/ui/goggle.py | |||
@@ -25,13 +25,13 @@ from bb.ui.crumbs.runningbuild import RunningBuildTreeView, RunningBuild | |||
25 | 25 | ||
26 | def event_handle_idle_func (eventHandler, build): | 26 | def event_handle_idle_func (eventHandler, build): |
27 | 27 | ||
28 | # Consume as many messages as we can in the time available to us | 28 | # Consume as many messages as we can in the time available to us |
29 | event = eventHandler.getEvent() | 29 | event = eventHandler.getEvent() |
30 | while event: | 30 | while event: |
31 | build.handle_event (event) | 31 | build.handle_event (event) |
32 | event = eventHandler.getEvent() | 32 | event = eventHandler.getEvent() |
33 | 33 | ||
34 | return True | 34 | return True |
35 | 35 | ||
36 | class MainWindow (gtk.Window): | 36 | class MainWindow (gtk.Window): |
37 | def __init__ (self): | 37 | def __init__ (self): |
@@ -74,4 +74,3 @@ def init (server, eventHandler): | |||
74 | running_build) | 74 | running_build) |
75 | 75 | ||
76 | gtk.main() | 76 | gtk.main() |
77 | |||
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py index ed26bb2b4c..3261792dfc 100644 --- a/bitbake/lib/bb/ui/knotty.py +++ b/bitbake/lib/bb/ui/knotty.py | |||
@@ -132,7 +132,7 @@ def init(server, eventHandler): | |||
132 | sys.stdout.write("done.") | 132 | sys.stdout.write("done.") |
133 | sys.stdout.flush() | 133 | sys.stdout.flush() |
134 | if x == y: | 134 | if x == y: |
135 | print("\nParsing of %d .bb files complete (%d cached, %d parsed). %d targets, %d skipped, %d masked, %d errors." | 135 | print("\nParsing of %d .bb files complete (%d cached, %d parsed). %d targets, %d skipped, %d masked, %d errors." |
136 | % ( event.total, event.cached, event.parsed, event.virtuals, event.skipped, event.masked, event.errors)) | 136 | % ( event.total, event.cached, event.parsed, event.virtuals, event.skipped, event.masked, event.errors)) |
137 | continue | 137 | continue |
138 | 138 | ||
diff --git a/bitbake/lib/bb/ui/ncurses.py b/bitbake/lib/bb/ui/ncurses.py index da3690e5ca..0eb1cf013b 100644 --- a/bitbake/lib/bb/ui/ncurses.py +++ b/bitbake/lib/bb/ui/ncurses.py | |||
@@ -136,7 +136,7 @@ class NCursesUI: | |||
136 | """Thread Activity Window""" | 136 | """Thread Activity Window""" |
137 | def __init__( self, x, y, width, height ): | 137 | def __init__( self, x, y, width, height ): |
138 | NCursesUI.DecoratedWindow.__init__( self, "Thread Activity", x, y, width, height ) | 138 | NCursesUI.DecoratedWindow.__init__( self, "Thread Activity", x, y, width, height ) |
139 | 139 | ||
140 | def setStatus( self, thread, text ): | 140 | def setStatus( self, thread, text ): |
141 | line = "%02d: %s" % ( thread, text ) | 141 | line = "%02d: %s" % ( thread, text ) |
142 | width = self.dimensions[WIDTH] | 142 | width = self.dimensions[WIDTH] |
@@ -225,7 +225,7 @@ class NCursesUI: | |||
225 | 225 | ||
226 | helper = uihelper.BBUIHelper() | 226 | helper = uihelper.BBUIHelper() |
227 | shutdown = 0 | 227 | shutdown = 0 |
228 | 228 | ||
229 | try: | 229 | try: |
230 | cmdline = server.runCommand(["getCmdLineAction"]) | 230 | cmdline = server.runCommand(["getCmdLineAction"]) |
231 | if not cmdline: | 231 | if not cmdline: |
@@ -263,7 +263,7 @@ class NCursesUI: | |||
263 | y = event.total | 263 | y = event.total |
264 | if x == y: | 264 | if x == y: |
265 | mw.setStatus("Idle") | 265 | mw.setStatus("Idle") |
266 | mw.appendText("Parsing finished. %d cached, %d parsed, %d skipped, %d masked." | 266 | mw.appendText("Parsing finished. %d cached, %d parsed, %d skipped, %d masked." |
267 | % ( event.cached, event.parsed, event.skipped, event.masked )) | 267 | % ( event.cached, event.parsed, event.skipped, event.masked )) |
268 | else: | 268 | else: |
269 | mw.setStatus("Parsing: %s (%04d/%04d) [%2d %%]" % ( parsespin.next(), x, y, x*100/y ) ) | 269 | mw.setStatus("Parsing: %s (%04d/%04d) [%2d %%]" % ( parsespin.next(), x, y, x*100/y ) ) |
@@ -332,4 +332,3 @@ def init(server, eventHandler): | |||
332 | except: | 332 | except: |
333 | import traceback | 333 | import traceback |
334 | traceback.print_exc() | 334 | traceback.print_exc() |
335 | |||
diff --git a/bitbake/lib/bb/ui/puccho.py b/bitbake/lib/bb/ui/puccho.py index 713aa1f4a6..dfcb0f7651 100644 --- a/bitbake/lib/bb/ui/puccho.py +++ b/bitbake/lib/bb/ui/puccho.py | |||
@@ -38,7 +38,7 @@ class MetaDataLoader(gobject.GObject): | |||
38 | on what machines are available. The distribution and images available for | 38 | on what machines are available. The distribution and images available for |
39 | the machine and the the uris to use for building the given machine.""" | 39 | the machine and the the uris to use for building the given machine.""" |
40 | __gsignals__ = { | 40 | __gsignals__ = { |
41 | 'success' : (gobject.SIGNAL_RUN_LAST, | 41 | 'success' : (gobject.SIGNAL_RUN_LAST, |
42 | gobject.TYPE_NONE, | 42 | gobject.TYPE_NONE, |
43 | ()), | 43 | ()), |
44 | 'error' : (gobject.SIGNAL_RUN_LAST, | 44 | 'error' : (gobject.SIGNAL_RUN_LAST, |
@@ -293,7 +293,7 @@ class BuildSetupDialog (gtk.Dialog): | |||
293 | if (active_iter): | 293 | if (active_iter): |
294 | self.configuration.machine = model.get(active_iter, 0)[0] | 294 | self.configuration.machine = model.get(active_iter, 0)[0] |
295 | 295 | ||
296 | # Extract the chosen distro from the combo | 296 | # Extract the chosen distro from the combo |
297 | model = self.distribution_combo.get_model() | 297 | model = self.distribution_combo.get_model() |
298 | active_iter = self.distribution_combo.get_active_iter() | 298 | active_iter = self.distribution_combo.get_active_iter() |
299 | if (active_iter): | 299 | if (active_iter): |
@@ -311,62 +311,62 @@ class BuildSetupDialog (gtk.Dialog): | |||
311 | # | 311 | # |
312 | # TODO: Should be a method on the RunningBuild class | 312 | # TODO: Should be a method on the RunningBuild class |
313 | def event_handle_timeout (eventHandler, build): | 313 | def event_handle_timeout (eventHandler, build): |
314 | # Consume as many messages as we can ... | 314 | # Consume as many messages as we can ... |
315 | event = eventHandler.getEvent() | 315 | event = eventHandler.getEvent() |
316 | while event: | 316 | while event: |
317 | build.handle_event (event) | 317 | build.handle_event (event) |
318 | event = eventHandler.getEvent() | 318 | event = eventHandler.getEvent() |
319 | return True | 319 | return True |
320 | 320 | ||
321 | class MainWindow (gtk.Window): | 321 | class MainWindow (gtk.Window): |
322 | 322 | ||
323 | # Callback that gets fired when the user hits a button in the | 323 | # Callback that gets fired when the user hits a button in the |
324 | # BuildSetupDialog. | 324 | # BuildSetupDialog. |
325 | def build_dialog_box_response_cb (self, dialog, response_id): | 325 | def build_dialog_box_response_cb (self, dialog, response_id): |
326 | conf = None | 326 | conf = None |
327 | if (response_id == BuildSetupDialog.RESPONSE_BUILD): | 327 | if (response_id == BuildSetupDialog.RESPONSE_BUILD): |
328 | dialog.update_configuration() | 328 | dialog.update_configuration() |
329 | print dialog.configuration.machine, dialog.configuration.distro, \ | 329 | print dialog.configuration.machine, dialog.configuration.distro, \ |
330 | dialog.configuration.image | 330 | dialog.configuration.image |
331 | conf = dialog.configuration | 331 | conf = dialog.configuration |
332 | 332 | ||
333 | dialog.destroy() | 333 | dialog.destroy() |
334 | 334 | ||
335 | if conf: | 335 | if conf: |
336 | self.manager.do_build (conf) | 336 | self.manager.do_build (conf) |
337 | 337 | ||
338 | def build_button_clicked_cb (self, button): | 338 | def build_button_clicked_cb (self, button): |
339 | dialog = BuildSetupDialog () | 339 | dialog = BuildSetupDialog () |
340 | 340 | ||
341 | # For some unknown reason Dialog.run causes nice little deadlocks ... :-( | 341 | # For some unknown reason Dialog.run causes nice little deadlocks ... :-( |
342 | dialog.connect ("response", self.build_dialog_box_response_cb) | 342 | dialog.connect ("response", self.build_dialog_box_response_cb) |
343 | dialog.show() | 343 | dialog.show() |
344 | 344 | ||
345 | def __init__ (self): | 345 | def __init__ (self): |
346 | gtk.Window.__init__ (self) | 346 | gtk.Window.__init__ (self) |
347 | 347 | ||
348 | # Pull in *just* the main vbox from the Glade XML data and then pack | 348 | # Pull in *just* the main vbox from the Glade XML data and then pack |
349 | # that inside the window | 349 | # that inside the window |
350 | gxml = gtk.glade.XML (os.path.dirname(__file__) + "/crumbs/puccho.glade", | 350 | gxml = gtk.glade.XML (os.path.dirname(__file__) + "/crumbs/puccho.glade", |
351 | root = "main_window_vbox") | 351 | root = "main_window_vbox") |
352 | vbox = gxml.get_widget ("main_window_vbox") | 352 | vbox = gxml.get_widget ("main_window_vbox") |
353 | self.add (vbox) | 353 | self.add (vbox) |
354 | 354 | ||
355 | # Create the tree views for the build manager view and the progress view | 355 | # Create the tree views for the build manager view and the progress view |
356 | self.build_manager_view = BuildManagerTreeView() | 356 | self.build_manager_view = BuildManagerTreeView() |
357 | self.running_build_view = RunningBuildTreeView() | 357 | self.running_build_view = RunningBuildTreeView() |
358 | 358 | ||
359 | # Grab the scrolled windows that we put the tree views into | 359 | # Grab the scrolled windows that we put the tree views into |
360 | self.results_scrolledwindow = gxml.get_widget ("results_scrolledwindow") | 360 | self.results_scrolledwindow = gxml.get_widget ("results_scrolledwindow") |
361 | self.progress_scrolledwindow = gxml.get_widget ("progress_scrolledwindow") | 361 | self.progress_scrolledwindow = gxml.get_widget ("progress_scrolledwindow") |
362 | 362 | ||
363 | # Put the tree views inside ... | 363 | # Put the tree views inside ... |
364 | self.results_scrolledwindow.add (self.build_manager_view) | 364 | self.results_scrolledwindow.add (self.build_manager_view) |
365 | self.progress_scrolledwindow.add (self.running_build_view) | 365 | self.progress_scrolledwindow.add (self.running_build_view) |
366 | 366 | ||
367 | # Hook up the build button... | 367 | # Hook up the build button... |
368 | self.build_button = gxml.get_widget ("main_toolbutton_build") | 368 | self.build_button = gxml.get_widget ("main_toolbutton_build") |
369 | self.build_button.connect ("clicked", self.build_button_clicked_cb) | 369 | self.build_button.connect ("clicked", self.build_button_clicked_cb) |
370 | 370 | ||
371 | # I'm not very happy about the current ownership of the RunningBuild. I have | 371 | # I'm not very happy about the current ownership of the RunningBuild. I have |
372 | # my suspicions that this object should be held by the BuildManager since we | 372 | # my suspicions that this object should be held by the BuildManager since we |
diff --git a/bitbake/lib/bb/ui/uievent.py b/bitbake/lib/bb/ui/uievent.py index 36302f4da7..5b3efffcba 100644 --- a/bitbake/lib/bb/ui/uievent.py +++ b/bitbake/lib/bb/ui/uievent.py | |||
@@ -19,7 +19,7 @@ | |||
19 | 19 | ||
20 | 20 | ||
21 | """ | 21 | """ |
22 | Use this class to fork off a thread to recieve event callbacks from the bitbake | 22 | Use this class to fork off a thread to recieve event callbacks from the bitbake |
23 | server and queue them for the UI to process. This process must be used to avoid | 23 | server and queue them for the UI to process. This process must be used to avoid |
24 | client/server deadlocks. | 24 | client/server deadlocks. |
25 | """ | 25 | """ |
@@ -116,10 +116,9 @@ class UIXMLRPCServer (SimpleXMLRPCServer): | |||
116 | if request is None: | 116 | if request is None: |
117 | return | 117 | return |
118 | SimpleXMLRPCServer.close_request(self, request) | 118 | SimpleXMLRPCServer.close_request(self, request) |
119 | 119 | ||
120 | def process_request(self, request, client_address): | 120 | def process_request(self, request, client_address): |
121 | if request is None: | 121 | if request is None: |
122 | return | 122 | return |
123 | SimpleXMLRPCServer.process_request(self, request, client_address) | 123 | SimpleXMLRPCServer.process_request(self, request, client_address) |
124 | 124 | ||
125 | |||