summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2012-03-28 16:32:28 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-30 17:20:20 +0100
commit8c5536543fb9b4681ac32517f100f9abec6f2162 (patch)
tree6d17b90c5125f33d8af47033989f13d190f81383 /bitbake/lib/bb/ui
parentbcd4d14425cadc5bd6296f59f14733e8c39c49dd (diff)
downloadpoky-8c5536543fb9b4681ac32517f100f9abec6f2162.tar.gz
Hob: tweak font sizes and layout
Switch to proportional font sizes and tweak padding and layout based on feedback from design team. (Bitbake rev: 356f190bb3f0ee9a15df900714edcb85593d6989) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui')
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/hobpages.py6
-rw-r--r--bitbake/lib/bb/ui/crumbs/hobwidget.py8
-rw-r--r--bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py36
3 files changed, 25 insertions, 25 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hobpages.py b/bitbake/lib/bb/ui/crumbs/hobpages.py
index 8ea39e70d0..024737d89c 100755
--- a/bitbake/lib/bb/ui/crumbs/hobpages.py
+++ b/bitbake/lib/bb/ui/crumbs/hobpages.py
@@ -59,7 +59,7 @@ class HobPage (gtk.VBox):
59 hbox = gtk.HBox() 59 hbox = gtk.HBox()
60 60
61 label = gtk.Label() 61 label = gtk.Label()
62 label.set_markup("<span font_desc=\'14\'>%s</span>" % self.title) 62 label.set_markup("<span size='x-large'>%s</span>" % self.title)
63 hbox.pack_start(label, expand=False, fill=False, padding=20) 63 hbox.pack_start(label, expand=False, fill=False, padding=20)
64 64
65 if widget: 65 if widget:
@@ -69,8 +69,8 @@ class HobPage (gtk.VBox):
69 69
70 return eventbox 70 return eventbox
71 71
72 def span_tag(self, px="12px", weight="normal", forground="#1c1c1c"): 72 def span_tag(self, size="medium", weight="normal", forground="#1c1c1c"):
73 span_tag = "weight=\'%s\' foreground=\'%s\' font_desc=\'%s\'" % (weight, forground, px) 73 span_tag = "weight='%s' foreground='%s' size='%s'" % (weight, forground, size)
74 return span_tag 74 return span_tag
75 75
76 def append_toolbar_button(self, toolbar, buttonname, icon_disp, icon_hovor, tip, cb): 76 def append_toolbar_button(self, toolbar, buttonname, icon_disp, icon_hovor, tip, cb):
diff --git a/bitbake/lib/bb/ui/crumbs/hobwidget.py b/bitbake/lib/bb/ui/crumbs/hobwidget.py
index bcc44ccfb9..9625c6dddd 100644
--- a/bitbake/lib/bb/ui/crumbs/hobwidget.py
+++ b/bitbake/lib/bb/ui/crumbs/hobwidget.py
@@ -254,7 +254,7 @@ class HobAltButton(gtk.Button):
254 colour = HobColors.PALE_BLUE 254 colour = HobColors.PALE_BLUE
255 else: 255 else:
256 colour = HobColors.LIGHT_GRAY 256 colour = HobColors.LIGHT_GRAY
257 button.set_label("<span color='%s'><b>%s</b></span>" % (colour, gobject.markup_escape_text(button.text))) 257 button.set_label("<span size='large' color='%s'><b>%s</b></span>" % (colour, gobject.markup_escape_text(button.text)))
258 button.child.set_use_markup(True) 258 button.child.set_use_markup(True)
259 259
260 @staticmethod 260 @staticmethod
@@ -281,7 +281,7 @@ class HobImageButton(gtk.Button):
281 self.icon_path = icon_path 281 self.icon_path = icon_path
282 self.hover_icon_path = hover_icon_path 282 self.hover_icon_path = hover_icon_path
283 283
284 hbox = gtk.HBox(False, 6) 284 hbox = gtk.HBox(False, 10)
285 hbox.show() 285 hbox.show()
286 self.add(hbox) 286 self.add(hbox)
287 self.icon = gtk.Image() 287 self.icon = gtk.Image()
@@ -295,10 +295,10 @@ class HobImageButton(gtk.Button):
295 label = gtk.Label() 295 label = gtk.Label()
296 label.set_alignment(0.0, 0.5) 296 label.set_alignment(0.0, 0.5)
297 colour = soften_color(label) 297 colour = soften_color(label)
298 mark = "<span size='larger'>%s</span>\n<span fgcolor='%s'>%s</span>" % (primary_text, colour, secondary_text) 298 mark = "<span size='x-large'>%s</span>\n<span size='medium' fgcolor='%s' weight='ultralight'>%s</span>" % (primary_text, colour, secondary_text)
299 label.set_markup(mark) 299 label.set_markup(mark)
300 label.show() 300 label.show()
301 hbox.pack_start(label, True, True, 6) 301 hbox.pack_start(label, True, True, 0)
302 302
303 def set_hover_icon_cb(self, widget, event): 303 def set_hover_icon_cb(self, widget, event):
304 self.icon.set_from_file(self.hover_icon_path) 304 self.icon.set_from_file(self.hover_icon_path)
diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
index 8914b1cde0..30f89795d2 100644
--- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
+++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
@@ -133,13 +133,13 @@ class ImageConfigurationPage (HobPage):
133 def create_config_machine(self): 133 def create_config_machine(self):
134 self.machine_title = gtk.Label() 134 self.machine_title = gtk.Label()
135 self.machine_title.set_alignment(0.0, 0.5) 135 self.machine_title.set_alignment(0.0, 0.5)
136 mark = "<span %s>Select a machine</span>" % self.span_tag('24px', 'bold') 136 mark = "<span %s>Select a machine</span>" % self.span_tag('x-large', 'bold')
137 self.machine_title.set_markup(mark) 137 self.machine_title.set_markup(mark)
138 138
139 self.machine_title_desc = gtk.Label() 139 self.machine_title_desc = gtk.Label()
140 self.machine_title_desc.set_alignment(0, 0.5) 140 self.machine_title_desc.set_alignment(0.0, 0.5)
141 mark = ("<span %s>This is the profile of the target machine for which you" 141 mark = ("<span %s>This is the profile of the target machine for which you"
142 " are building the image.\n</span>") % (self.span_tag(px='14px')) 142 " are building the image.\n</span>") % (self.span_tag('medium'))
143 self.machine_title_desc.set_markup(mark) 143 self.machine_title_desc.set_markup(mark)
144 144
145 self.machine_combo = gtk.combo_box_new_text() 145 self.machine_combo = gtk.combo_box_new_text()
@@ -170,31 +170,31 @@ class ImageConfigurationPage (HobPage):
170 def set_config_machine_layout(self, show_progress_bar = False): 170 def set_config_machine_layout(self, show_progress_bar = False):
171 self.gtable.attach(self.machine_title, 0, 40, 0, 4) 171 self.gtable.attach(self.machine_title, 0, 40, 0, 4)
172 self.gtable.attach(self.machine_title_desc, 0, 40, 4, 6) 172 self.gtable.attach(self.machine_title_desc, 0, 40, 4, 6)
173 self.gtable.attach(self.machine_combo, 0, 12, 6, 9) 173 self.gtable.attach(self.machine_combo, 0, 12, 7, 10)
174 self.gtable.attach(self.layer_button, 15, 36, 6, 11) 174 self.gtable.attach(self.layer_button, 14, 36, 7, 12)
175 self.gtable.attach(self.layer_info_icon, 36, 40, 6, 10) 175 self.gtable.attach(self.layer_info_icon, 36, 40, 7, 11)
176 if show_progress_bar: 176 if show_progress_bar:
177 self.gtable.attach(self.progress_box, 0, 40, 13, 17) 177 self.gtable.attach(self.progress_box, 0, 40, 15, 19)
178 self.gtable.attach(self.machine_separator, 0, 40, 12, 13) 178 self.gtable.attach(self.machine_separator, 0, 40, 13, 14)
179 179
180 def create_config_baseimg(self): 180 def create_config_baseimg(self):
181 self.image_title = gtk.Label() 181 self.image_title = gtk.Label()
182 self.image_title.set_alignment(0, 1.0) 182 self.image_title.set_alignment(0, 1.0)
183 mark = "<span %s>Select a base image</span>" % self.span_tag('24px', 'bold') 183 mark = "<span %s>Select a base image</span>" % self.span_tag('x-large', 'bold')
184 self.image_title.set_markup(mark) 184 self.image_title.set_markup(mark)
185 185
186 self.image_title_desc = gtk.Label() 186 self.image_title_desc = gtk.Label()
187 self.image_title_desc.set_alignment(0, 0.5) 187 self.image_title_desc.set_alignment(0, 0.5)
188 mark = ("<span %s>Base images are a starting point for the type of image you want. " 188 mark = ("<span %s>Base images are a starting point for the type of image you want. "
189 "You can build them as \n" 189 "You can build them as \n"
190 "they are or customize them to your specific needs.\n</span>") % self.span_tag('14px') 190 "they are or customize them to your specific needs.\n</span>") % self.span_tag('medium')
191 self.image_title_desc.set_markup(mark) 191 self.image_title_desc.set_markup(mark)
192 192
193 self.image_combo = gtk.combo_box_new_text() 193 self.image_combo = gtk.combo_box_new_text()
194 self.image_combo_id = self.image_combo.connect("changed", self.image_combo_changed_cb) 194 self.image_combo_id = self.image_combo.connect("changed", self.image_combo_changed_cb)
195 195
196 self.image_desc = gtk.Label() 196 self.image_desc = gtk.Label()
197 self.image_desc.set_alignment(0, 0.5) 197 self.image_desc.set_alignment(0.0, 0.5)
198 self.image_desc.set_line_wrap(True) 198 self.image_desc.set_line_wrap(True)
199 199
200 # button to view recipes 200 # button to view recipes
@@ -216,15 +216,15 @@ class ImageConfigurationPage (HobPage):
216 self.image_separator = gtk.HSeparator() 216 self.image_separator = gtk.HSeparator()
217 217
218 def set_config_baseimg_layout(self): 218 def set_config_baseimg_layout(self):
219 self.gtable.attach(self.image_title, 0, 40, 13, 17) 219 self.gtable.attach(self.image_title, 0, 40, 15, 17)
220 self.gtable.attach(self.image_title_desc, 0, 40, 18, 23) 220 self.gtable.attach(self.image_title_desc, 0, 40, 18, 22)
221 self.gtable.attach(self.image_combo, 0, 12, 24, 27) 221 self.gtable.attach(self.image_combo, 0, 12, 23, 26)
222 self.gtable.attach(self.image_desc, 14, 38, 24, 29) 222 self.gtable.attach(self.image_desc, 13, 38, 23, 28)
223 self.gtable.attach(self.image_separator, 0, 40, 35, 36) 223 self.gtable.attach(self.image_separator, 0, 40, 35, 36)
224 224
225 def set_rcppkg_layout(self): 225 def set_rcppkg_layout(self):
226 self.gtable.attach(self.view_recipes_button, 0, 20, 30, 35) 226 self.gtable.attach(self.view_recipes_button, 0, 20, 28, 33)
227 self.gtable.attach(self.view_packages_button, 20, 40, 30, 35) 227 self.gtable.attach(self.view_packages_button, 20, 40, 28, 33)
228 228
229 def create_config_build_button(self): 229 def create_config_build_button(self):
230 # Create the "Build packages" and "Build image" buttons at the bottom 230 # Create the "Build packages" and "Build image" buttons at the bottom
@@ -295,7 +295,7 @@ class ImageConfigurationPage (HobPage):
295 image_iter = self.builder.recipe_model.get_iter(image_path) 295 image_iter = self.builder.recipe_model.get_iter(image_path)
296 selected_packages = self.builder.recipe_model.get_value(image_iter, self.builder.recipe_model.COL_INSTALL).split() 296 selected_packages = self.builder.recipe_model.get_value(image_iter, self.builder.recipe_model.COL_INSTALL).split()
297 297
298 mark = ("<span %s>%s</span>\n") % (self.span_tag('14px'), self.builder.recipe_model.get_value(image_iter, self.builder.recipe_model.COL_DESC)) 298 mark = ("<span %s>%s</span>\n") % (self.span_tag('small'), self.builder.recipe_model.get_value(image_iter, self.builder.recipe_model.COL_DESC))
299 self.image_desc.set_markup(mark) 299 self.image_desc.set_markup(mark)
300 300
301 self.builder.recipe_model.reset() 301 self.builder.recipe_model.reset()