From: <rs...@us...> - 2003-03-30 20:50:07
|
Update of /cvsroot/freevo/freevo/src/gui In directory sc8-pr-cvs1:/tmp/cvs-serv27740 Modified Files: Button.py ConfirmBox.py GUIObject.py LetterBox.py LetterBoxGroup.py ListBox.py ListItem.py OptionBox.py PopupBox.py RegionScroller.py Scrollbar.py Log Message: Improvements in how we get skin properties. Index: Button.py =================================================================== RCS file: /cvsroot/freevo/freevo/src/gui/Button.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Button.py 30 Mar 2003 18:19:53 -0000 1.6 --- Button.py 30 Mar 2003 20:49:59 -0000 1.7 *************** *** 10,13 **** --- 10,16 ---- # ----------------------------------------------------------------------- # $Log$ + # Revision 1.7 2003/03/30 20:49:59 rshortt + # Improvements in how we get skin properties. + # # Revision 1.6 2003/03/30 18:19:53 rshortt # Adding self to the other GetPopupBoxStyle calls. *************** *** 98,101 **** --- 101,106 ---- border=None, bd_color=None, bd_width=None): + GUIObject.__init__(self, left, top, width, height) + self.border = border self.bd_color = bd_color *************** *** 107,154 **** self.selected_bg_color = selected_bg_color - self.skin = skin.get_singleton() - - (BLAH, BLAH, BLAH, BLAH, - button_default, button_selected) = \ - self.skin.GetPopupBoxStyle(self) if not self.bg_color: ! if button_default.rectangle.bgcolor: ! self.bg_color = Color(button_default.rectangle.bgcolor) else: self.bg_color = Color(self.osd.default_bg_color) if not self.fg_color: ! if button_default.font.color: ! self.fg_color = Color(button_default.font.color) else: self.fg_color = Color(self.osd.default_fg_color) if not self.selected_bg_color: ! if button_selected.rectangle.bgcolor: ! self.selected_bg_color = Color(button_selected.rectangle.bgcolor) else: self.selected_bg_color = Color((0,255,0,128)) if not self.selected_fg_color: ! if button_selected.font.color: ! self.selected_fg_color = Color(button_selected.font.color) else: self.selected_fg_color = Color(self.osd.default_fg_color) - - GUIObject.__init__(self, left, top, width, height, - self.bg_color, self.fg_color) - - if not self.bd_color: ! if button_default.rectangle.color: ! self.bd_color = Color(button_default.rectangle.color) else: self.bd_color = Color(self.osd.default_fg_color) if not self.bd_width: ! if button_default.rectangle.size: ! self.bd_width = button_default.rectangle.size else: self.bd_width = 2 --- 112,149 ---- self.selected_bg_color = selected_bg_color if not self.bg_color: ! if self.skin_info_widget.rectangle.bgcolor: ! self.bg_color = Color(self.skin_info_widget.rectangle.bgcolor) else: self.bg_color = Color(self.osd.default_bg_color) if not self.fg_color: ! if self.skin_info_widget.font.color: ! self.fg_color = Color(self.skin_info_widget.font.color) else: self.fg_color = Color(self.osd.default_fg_color) if not self.selected_bg_color: ! if self.skin_info_widget_selected.rectangle.bgcolor: ! self.selected_bg_color = Color(self.skin_info_widget_selected.rectangle.bgcolor) else: self.selected_bg_color = Color((0,255,0,128)) if not self.selected_fg_color: ! if self.skin_info_widget_selected.font.color: ! self.selected_fg_color = Color(self.skin_info_widget_selected.font.color) else: self.selected_fg_color = Color(self.osd.default_fg_color) if not self.bd_color: ! if self.skin_info_widget.rectangle.color: ! self.bd_color = Color(self.skin_info_widget.rectangle.color) else: self.bd_color = Color(self.osd.default_fg_color) if not self.bd_width: ! if self.skin_info_widget.rectangle.size: ! self.bd_width = self.skin_info_widget.rectangle.size else: self.bd_width = 2 *************** *** 166,183 **** raise TypeError, text ! if button_default.font: self.set_font(self.label, ! button_default.font.name, ! button_default.font.size, ! Color(button_default.font.color)) else: self.set_font(config.OSD_DEFAULT_FONTNAME, config.OSD_DEFAULT_FONTSIZE) ! if button_selected.font: self.set_font(self.selected_label, ! button_selected.font.name, ! button_selected.font.size, ! Color(button_selected.font.color)) else: self.set_font(self.selected_label, --- 161,178 ---- raise TypeError, text ! if self.skin_info_widget.font: self.set_font(self.label, ! self.skin_info_widget.font.name, ! self.skin_info_widget.font.size, ! Color(self.skin_info_widget.font.color)) else: self.set_font(config.OSD_DEFAULT_FONTNAME, config.OSD_DEFAULT_FONTSIZE) ! if self.skin_info_widget_selected.font: self.set_font(self.selected_label, ! self.skin_info_widget_selected.font.name, ! self.skin_info_widget_selected.font.size, ! Color(self.skin_info_widget_selected.font.color)) else: self.set_font(self.selected_label, Index: ConfirmBox.py =================================================================== RCS file: /cvsroot/freevo/freevo/src/gui/ConfirmBox.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ConfirmBox.py 30 Mar 2003 15:54:07 -0000 1.7 --- ConfirmBox.py 30 Mar 2003 20:49:59 -0000 1.8 *************** *** 11,14 **** --- 11,17 ---- # ----------------------------------------------------------------------- # $Log$ + # Revision 1.8 2003/03/30 20:49:59 rshortt + # Improvements in how we get skin properties. + # # Revision 1.7 2003/03/30 15:54:07 rshortt # Added 'parent' as a constructor argument for PopupBox and all of its *************** *** 119,123 **** btop = self.top + self.height - self.b0.height - 25 self.b0.set_position(bleft, btop) - # self.b0.toggle_selected() self.add_child(self.b0) --- 122,125 ---- Index: GUIObject.py =================================================================== RCS file: /cvsroot/freevo/freevo/src/gui/GUIObject.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** GUIObject.py 30 Mar 2003 18:04:18 -0000 1.14 --- GUIObject.py 30 Mar 2003 20:50:00 -0000 1.15 *************** *** 8,11 **** --- 8,14 ---- #----------------------------------------------------------------------- # $Log$ + # Revision 1.15 2003/03/30 20:50:00 rshortt + # Improvements in how we get skin properties. + # # Revision 1.14 2003/03/30 18:04:18 dischi # do not override parent and use self to get skin informations *************** *** 188,193 **** # This if/else should be removed when the new skin is in place. if config.NEW_SKIN: ! ((bg_type, skin_bg), skin_spacing, skin_color, BLAH, BLAH, BLAH) = \ ! self.skin.GetPopupBoxStyle(self) else: skin_spacing = None --- 191,202 ---- # This if/else should be removed when the new skin is in place. if config.NEW_SKIN: ! self.skin_info = self.skin.GetPopupBoxStyle(self) ! self.skin_info_background = self.skin_info[0] ! self.skin_info_spacing = self.skin_info[1] ! self.skin_info_color = self.skin_info[2] ! self.skin_info_font = self.skin_info[3] ! self.skin_info_widget = self.skin_info[4] ! self.skin_info_widget_selected = self.skin_info[5] ! else: skin_spacing = None *************** *** 198,204 **** ! if skin_spacing: ! self.h_margin = skin_spacing ! self.v_margin = skin_spacing else: self.h_margin = 10 --- 207,213 ---- ! if self.skin_info_spacing: ! self.h_margin = self.skin_info_spacing ! self.v_margin = self.skin_info_spacing else: self.h_margin = 10 *************** *** 206,217 **** if not self.bg_color: ! if skin_bg.bgcolor: ! self.bg_color = Color(skin_bg.bgcolor) else: self.bg_color = Color(self.osd.default_bg_color) if not self.fg_color: ! if skin_color: ! self.fg_color = Color(skin_color) else: self.fg_color = Color(self.osd.default_fg_color) --- 215,227 ---- if not self.bg_color: ! if self.skin_info_background[0] == 'rectangle' \ ! and self.skin_info_background[1].bgcolor: ! self.bg_color = Color(self.skin_info_background[1].bgcolor) else: self.bg_color = Color(self.osd.default_bg_color) if not self.fg_color: ! if self.skin_info_color: ! self.fg_color = Color(self.skin_info_color) else: self.fg_color = Color(self.osd.default_fg_color) Index: LetterBox.py =================================================================== RCS file: /cvsroot/freevo/freevo/src/gui/LetterBox.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** LetterBox.py 30 Mar 2003 18:19:53 -0000 1.7 --- LetterBox.py 30 Mar 2003 20:50:00 -0000 1.8 *************** *** 10,13 **** --- 10,16 ---- # ----------------------------------------------------------------------- # $Log$ + # Revision 1.8 2003/03/30 20:50:00 rshortt + # Improvements in how we get skin properties. + # # Revision 1.7 2003/03/30 18:19:53 rshortt # Adding self to the other GetPopupBoxStyle calls. *************** *** 123,126 **** --- 126,131 ---- border=None, bd_color=None, bd_width=None): + GUIObject.__init__(self, left, top, width, height) + self.border = border self.bd_color = bd_color *************** *** 131,178 **** self.selected_bg_color = selected_bg_color - self.skin = skin.get_singleton() - - (BLAH, BLAH, BLAH, BLAH, - button_default, button_selected) = \ - self.skin.GetPopupBoxStyle(self) if not self.bg_color: ! if button_default.rectangle.bgcolor: ! self.bg_color = Color(button_default.rectangle.bgcolor) else: self.bg_color = Color(self.osd.default_bg_color) if not self.fg_color: ! if button_default.font.color: ! self.fg_color = Color(button_default.font.color) else: self.fg_color = Color(self.osd.default_fg_color) if not self.selected_bg_color: ! if button_selected.rectangle.bgcolor: ! self.selected_bg_color = Color(button_selected.rectangle.bgcolor) else: self.selected_bg_color = Color((0,255,0,128)) if not self.selected_fg_color: ! if button_selected.font.color: ! self.selected_fg_color = Color(button_selected.font.color) else: self.selected_fg_color = Color(self.osd.default_fg_color) - - GUIObject.__init__(self, left, top, width, height, - self.bg_color, self.fg_color) - - if not self.bd_color: ! if button_default.rectangle.color: ! self.bd_color = Color(button_default.rectangle.color) else: self.bd_color = Color(self.osd.default_fg_color) if not self.bd_width: ! if button_default.rectangle.size: ! self.bd_width = button_default.rectangle.size else: self.bd_width = 1 --- 136,173 ---- self.selected_bg_color = selected_bg_color if not self.bg_color: ! if self.skin_info_widget.rectangle.bgcolor: ! self.bg_color = Color(self.skin_info_widget.rectangle.bgcolor) else: self.bg_color = Color(self.osd.default_bg_color) if not self.fg_color: ! if self.skin_info_widget.font.color: ! self.fg_color = Color(self.skin_info_widget.font.color) else: self.fg_color = Color(self.osd.default_fg_color) if not self.selected_bg_color: ! if self.skin_info_widget_selected.rectangle.bgcolor: ! self.selected_bg_color = Color(self.skin_info_widget_selected.rectangle.bgcolor) else: self.selected_bg_color = Color((0,255,0,128)) if not self.selected_fg_color: ! if self.skin_info_widget_selected.font.color: ! self.selected_fg_color = Color(self.skin_info_widget_selected.font.color) else: self.selected_fg_color = Color(self.osd.default_fg_color) if not self.bd_color: ! if self.skin_info_widget.rectangle.color: ! self.bd_color = Color(self.skin_info_widget.rectangle.color) else: self.bd_color = Color(self.osd.default_fg_color) if not self.bd_width: ! if self.skin_info_widget.rectangle.size: ! self.bd_width = self.skin_info_widget.rectangle.size else: self.bd_width = 1 *************** *** 190,207 **** raise TypeError, text ! if button_default.font: self.set_font(self.label, ! button_default.font.name, ! button_default.font.size, ! Color(button_default.font.color)) else: self.set_font(config.OSD_DEFAULT_FONTNAME, config.OSD_DEFAULT_FONTSIZE) ! if button_selected.font: self.set_font(self.selected_label, ! button_selected.font.name, ! button_selected.font.size, ! Color(button_selected.font.color)) else: self.set_font(self.selected_label, --- 185,202 ---- raise TypeError, text ! if self.skin_info_widget.font: self.set_font(self.label, ! self.skin_info_widget.font.name, ! self.skin_info_widget.font.size, ! Color(self.skin_info_widget.font.color)) else: self.set_font(config.OSD_DEFAULT_FONTNAME, config.OSD_DEFAULT_FONTSIZE) ! if self.skin_info_widget_selected.font: self.set_font(self.selected_label, ! self.skin_info_widget_selected.font.name, ! self.skin_info_widget_selected.font.size, ! Color(self.skin_info_widget_selected.font.color)) else: self.set_font(self.selected_label, Index: LetterBoxGroup.py =================================================================== RCS file: /cvsroot/freevo/freevo/src/gui/LetterBoxGroup.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** LetterBoxGroup.py 30 Mar 2003 18:19:53 -0000 1.7 --- LetterBoxGroup.py 30 Mar 2003 20:50:00 -0000 1.8 *************** *** 11,14 **** --- 11,17 ---- # ----------------------------------------------------------------------- # $Log$ + # Revision 1.8 2003/03/30 20:50:00 rshortt + # Improvements in how we get skin properties. + # # Revision 1.7 2003/03/30 18:19:53 rshortt # Adding self to the other GetPopupBoxStyle calls. *************** *** 103,106 **** --- 106,111 ---- fg_color=None, border=None, bd_color=None, bd_width=None): + GUIObject.__init__(self, left, top, width, height) + # XXX: text not supported yet self.text = text *************** *** 115,149 **** self.boxes = [] - self.skin = skin.get_singleton() - - (BLAH, BLAH, BLAH, BLAH, - button_default, BLAH) = \ - self.skin.GetPopupBoxStyle(self) if not self.bg_color: ! if button_default.rectangle.bgcolor: ! self.bg_color = Color(button_default.rectangle.bgcolor) else: self.bg_color = Color(self.osd.default_bg_color) if not self.fg_color: ! if button_default.font.color: ! self.fg_color = Color(button_default.font.color) else: self.fg_color = Color(self.osd.default_fg_color) - GUIObject.__init__(self, left, top, width, height, - self.bg_color, self.fg_color) - - if not self.bd_color: ! if button_default.rectangle.color: ! self.bd_color = Color(button_default.rectangle.color) else: self.bd_color = Color(self.osd.default_fg_color) if not self.bd_width: ! if button_default.rectangle.size: ! self.bd_width = button_default.rectangle.size else: self.bd_width = 1 --- 120,145 ---- self.boxes = [] if not self.bg_color: ! if self.skin_info_widget.rectangle.bgcolor: ! self.bg_color = Color(self.skin_info_widget.rectangle.bgcolor) else: self.bg_color = Color(self.osd.default_bg_color) if not self.fg_color: ! if self.skin_info_widget.font.color: ! self.fg_color = Color(self.skin_info_widget.font.color) else: self.fg_color = Color(self.osd.default_fg_color) if not self.bd_color: ! if self.skin_info_widget.rectangle.color: ! self.bd_color = Color(self.skin_info_widget.rectangle.color) else: self.bd_color = Color(self.osd.default_fg_color) if not self.bd_width: ! if self.skin_info_widget.rectangle.size: ! self.bd_width = self.skin_info_widget.rectangle.size else: self.bd_width = 1 Index: ListBox.py =================================================================== RCS file: /cvsroot/freevo/freevo/src/gui/ListBox.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ListBox.py 30 Mar 2003 18:19:53 -0000 1.8 --- ListBox.py 30 Mar 2003 20:50:00 -0000 1.9 *************** *** 10,13 **** --- 10,16 ---- # ----------------------------------------------------------------------- # $Log$ + # Revision 1.9 2003/03/30 20:50:00 rshortt + # Improvements in how we get skin properties. + # # Revision 1.8 2003/03/30 18:19:53 rshortt # Adding self to the other GetPopupBoxStyle calls. *************** *** 107,110 **** --- 110,115 ---- bd_width=None, show_h_scrollbar=None, show_v_scrollbar=None): + GUIObject.__init__(self, None, None, width, height) + self.items = items self.width = width *************** *** 123,160 **** self.set_surface(pygame.Surface(self.get_size(), 0, 32)) - self.skin = skin.get_singleton() - self.osd = osd.get_singleton() - - (BLAH, BLAH, BLAH, BLAH, - button_default, button_selected) = \ - self.skin.GetPopupBoxStyle(self) - - # I am commenting a lot of this out until I get alpha - # transparencies working correctly. if not self.bg_color: ! # self.bg_color = Color(self.osd.default_bg_color) ! if button_default.rectangle.bgcolor: ! self.bg_color = Color(button_default.rectangle.bgcolor) else: self.bg_color = Color(self.osd.default_bg_color) if not self.fg_color: ! # self.fg_color = Color(self.osd.default_fg_color) ! if button_default.font.color: ! self.fg_color = Color(button_default.font.color) else: self.fg_color = Color(self.osd.default_fg_color) if not self.selected_bg_color: ! # self.selected_bg_color = Color((0,255,0,128)) ! if button_selected.rectangle.bgcolor: ! self.selected_bg_color = Color(button_selected.rectangle.bgcolor) else: self.selected_bg_color = Color((0,255,0,128)) if not self.selected_fg_color: ! # self.fg_color = Color(self.osd.default_fg_color) ! if button_selected.font.color: ! self.selected_fg_color = Color(button_selected.font.color) else: self.selected_fg_color = Color(self.osd.default_fg_color) --- 128,152 ---- self.set_surface(pygame.Surface(self.get_size(), 0, 32)) if not self.bg_color: ! if self.skin_info_widget.rectangle.bgcolor: ! self.bg_color = Color(self.skin_info_widget.rectangle.bgcolor) else: self.bg_color = Color(self.osd.default_bg_color) if not self.fg_color: ! if self.skin_info_widget.font.color: ! self.fg_color = Color(self.skin_info_widget.font.color) else: self.fg_color = Color(self.osd.default_fg_color) if not self.selected_bg_color: ! if self.skin_info_widget_selected.rectangle.bgcolor: ! self.selected_bg_color = Color(self.skin_info_widget_selected.rectangle.bgcolor) else: self.selected_bg_color = Color((0,255,0,128)) if not self.selected_fg_color: ! if self.skin_info_widget_selected.font.color: ! self.selected_fg_color = Color(self.skin_info_widget_selected.font.color) else: self.selected_fg_color = Color(self.osd.default_fg_color) Index: ListItem.py =================================================================== RCS file: /cvsroot/freevo/freevo/src/gui/ListItem.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ListItem.py 30 Mar 2003 18:19:53 -0000 1.5 --- ListItem.py 30 Mar 2003 20:50:00 -0000 1.6 *************** *** 10,13 **** --- 10,16 ---- # ----------------------------------------------------------------------- # $Log$ + # Revision 1.6 2003/03/30 20:50:00 rshortt + # Improvements in how we get skin properties. + # # Revision 1.5 2003/03/30 18:19:53 rshortt # Adding self to the other GetPopupBoxStyle calls. *************** *** 83,138 **** bd_width=None): ! self.text = text ! self.value = value ! self.border = border ! self.bd_color = bd_color ! self.bd_width = bd_width self.bg_color = bg_color self.fg_color = fg_color self.selected_fg_color = selected_fg_color self.selected_bg_color = selected_bg_color - self.skin = skin.get_singleton() - - (BLAH, BLAH, BLAH, BLAH, - button_default, button_selected) = \ - self.skin.GetPopupBoxStyle(self) if not self.bg_color: ! if button_default.rectangle.bgcolor: ! self.bg_color = Color(button_default.rectangle.bgcolor) else: self.bg_color = Color(self.osd.default_bg_color) if not self.fg_color: ! if button_default.font.color: ! self.fg_color = Color(button_default.font.color) else: self.fg_color = Color(self.osd.default_fg_color) if not self.selected_bg_color: ! if button_selected.rectangle.bgcolor: ! self.selected_bg_color = Color(button_selected.rectangle.bgcolor) else: self.selected_bg_color = Color((0,255,0,128)) if not self.selected_fg_color: ! if button_selected.font.color: ! self.selected_fg_color = Color(button_selected.font.color) else: self.selected_fg_color = Color(self.osd.default_fg_color) - GUIObject.__init__(self, None, None, width, height, - self.bg_color, self.fg_color) - - - self.h_margin = 20 - self.v_margin = 2 - - # XXX: Place a call to the skin object here then set the defaults - # acodringly. self.skin is set in the superclass. - # No border by default. # if not self.bd_color: self.bd_color = Color(self.osd.default_fg_color) --- 86,129 ---- bd_width=None): ! GUIObject.__init__(self, None, None, width, height) ! self.text = text ! self.value = value ! self.border = border ! self.bd_color = bd_color ! self.bd_width = bd_width self.bg_color = bg_color self.fg_color = fg_color self.selected_fg_color = selected_fg_color self.selected_bg_color = selected_bg_color + self.h_margin = 20 + self.v_margin = 2 if not self.bg_color: ! if self.skin_info_widget.rectangle.bgcolor: ! self.bg_color = Color(self.skin_info_widget.rectangle.bgcolor) else: self.bg_color = Color(self.osd.default_bg_color) if not self.fg_color: ! if self.skin_info_widget.font.color: ! self.fg_color = Color(self.skin_info_widget.font.color) else: self.fg_color = Color(self.osd.default_fg_color) if not self.selected_bg_color: ! if self.skin_info_widget_selected.rectangle.bgcolor: ! self.selected_bg_color = Color(self.skin_info_widget_selected.rectangle.bgcolor) else: self.selected_bg_color = Color((0,255,0,128)) if not self.selected_fg_color: ! if self.skin_info_widget_selected.font.color: ! self.selected_fg_color = Color(self.skin_info_widget_selected.font.color) else: self.selected_fg_color = Color(self.osd.default_fg_color) # No border by default. # if not self.bd_color: self.bd_color = Color(self.osd.default_fg_color) *************** *** 149,157 **** raise TypeError, text ! if button_default.font: self.set_font(self.label, ! button_default.font.name, ! button_default.font.size, ! Color(button_default.font.color)) else: self.set_font(self.label, --- 140,148 ---- raise TypeError, text ! if self.skin_info_widget.font: self.set_font(self.label, ! self.skin_info_widget.font.name, ! self.skin_info_widget.font.size, ! Color(self.skin_info_widget.font.color)) else: self.set_font(self.label, *************** *** 159,167 **** config.OSD_DEFAULT_FONTSIZE) ! if button_selected.font: self.set_font(self.selected_label, ! button_selected.font.name, ! button_selected.font.size, ! Color(button_selected.font.color)) else: self.set_font(self.selected_label, --- 150,158 ---- config.OSD_DEFAULT_FONTSIZE) ! if self.skin_info_widget_selected.font: self.set_font(self.selected_label, ! self.skin_info_widget_selected.font.name, ! self.skin_info_widget_selected.font.size, ! Color(self.skin_info_widget_selected.font.color)) else: self.set_font(self.selected_label, *************** *** 170,174 **** - def _draw(self, surface=None): """ --- 161,164 ---- *************** *** 197,206 **** else: self.osd.screen.blit(box, self.get_position()) - - # XXX: need to fix support for 'selected label' - # if self.selected and self.selected_label: - # print 'self.selected and self.selected_label' - # self.selected_label.draw(surface) - # else: self.label.draw(surface) if self.selected: --- 187,190 ---- Index: OptionBox.py =================================================================== RCS file: /cvsroot/freevo/freevo/src/gui/OptionBox.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** OptionBox.py 30 Mar 2003 18:19:53 -0000 1.4 --- OptionBox.py 30 Mar 2003 20:50:00 -0000 1.5 *************** *** 10,13 **** --- 10,16 ---- # ----------------------------------------------------------------------- # $Log$ + # Revision 1.5 2003/03/30 20:50:00 rshortt + # Improvements in how we get skin properties. + # # Revision 1.4 2003/03/30 18:19:53 rshortt # Adding self to the other GetPopupBoxStyle calls. *************** *** 86,89 **** --- 89,94 ---- bd_width=None): + GUIObject.__init__(self, left, top, width, height) + self.border = border self.bd_color = bd_color *************** *** 94,144 **** self.selected_bg_color = selected_bg_color self.max_visible = 5 - self.skin = skin.get_singleton() - - (BLAH, BLAH, BLAH, BLAH, - button_default, button_selected) = \ - self.skin.GetPopupBoxStyle(self) if not self.bg_color: ! if button_default.rectangle.bgcolor: ! self.bg_color = Color(button_default.rectangle.bgcolor) else: self.bg_color = Color(self.osd.default_bg_color) if not self.fg_color: ! if button_default.font.color: ! self.fg_color = Color(button_default.font.color) else: self.fg_color = Color(self.osd.default_fg_color) if not self.selected_bg_color: ! if button_selected.rectangle.bgcolor: ! self.selected_bg_color = Color(button_selected.rectangle.bgcolor) else: self.selected_bg_color = Color((0,255,0,128)) if not self.selected_fg_color: ! if button_selected.font.color: ! self.selected_fg_color = Color(button_selected.font.color) else: self.selected_fg_color = Color(self.osd.default_fg_color) - - GUIObject.__init__(self, left, top, width, height, - self.bg_color, self.fg_color) - - self.h_margin = 6 - self.v_margin = 2 - if not self.bd_color: ! if button_default.rectangle.color: ! self.bd_color = Color(button_default.rectangle.color) else: self.bd_color = Color(self.osd.default_fg_color) if not self.bd_width: ! if button_default.rectangle.size: ! self.bd_width = button_default.rectangle.size else: self.bd_width = 2 --- 99,139 ---- self.selected_bg_color = selected_bg_color self.max_visible = 5 + self.h_margin = 6 + self.v_margin = 2 if not self.bg_color: ! if self.skin_info_widget.rectangle.bgcolor: ! self.bg_color = Color(self.skin_info_widget.rectangle.bgcolor) else: self.bg_color = Color(self.osd.default_bg_color) if not self.fg_color: ! if self.skin_info_widget.font.color: ! self.fg_color = Color(self.skin_info_widget.font.color) else: self.fg_color = Color(self.osd.default_fg_color) if not self.selected_bg_color: ! if self.skin_info_widget_selected.rectangle.bgcolor: ! self.selected_bg_color = Color(self.skin_info_widget_selected.rectangle.bgcolor) else: self.selected_bg_color = Color((0,255,0,128)) if not self.selected_fg_color: ! if self.skin_info_widget_selected.font.color: ! self.selected_fg_color = Color(self.skin_info_widget_selected.font.color) else: self.selected_fg_color = Color(self.osd.default_fg_color) if not self.bd_color: ! if self.skin_info_widget.rectangle.color: ! self.bd_color = Color(self.skin_info_widget.rectangle.color) else: self.bd_color = Color(self.osd.default_fg_color) if not self.bd_width: ! if self.skin_info_widget.rectangle.size: ! self.bd_width = self.skin_info_widget.rectangle.size else: self.bd_width = 2 *************** *** 156,173 **** raise TypeError, text ! if button_default.font: self.set_font(self.label, ! button_default.font.name, ! button_default.font.size, ! Color(button_default.font.color)) else: self.set_font(config.OSD_DEFAULT_FONTNAME, config.OSD_DEFAULT_FONTSIZE) ! if button_selected.font: self.set_font(self.selected_label, ! button_selected.font.name, ! button_selected.font.size, ! Color(button_selected.font.color)) else: self.set_font(self.selected_label, --- 151,168 ---- raise TypeError, text ! if self.skin_info_widget.font: self.set_font(self.label, ! self.skin_info_widget.font.name, ! self.skin_info_widget.font.size, ! Color(self.skin_info_widget.font.color)) else: self.set_font(config.OSD_DEFAULT_FONTNAME, config.OSD_DEFAULT_FONTSIZE) ! if self.skin_info_widget_selected.font: self.set_font(self.selected_label, ! self.skin_info_widget_selected.font.name, ! self.skin_info_widget_selected.font.size, ! Color(self.skin_info_widget_selected.font.color)) else: self.set_font(self.selected_label, Index: PopupBox.py =================================================================== RCS file: /cvsroot/freevo/freevo/src/gui/PopupBox.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** PopupBox.py 30 Mar 2003 18:02:31 -0000 1.11 --- PopupBox.py 30 Mar 2003 20:50:00 -0000 1.12 *************** *** 11,14 **** --- 11,17 ---- #----------------------------------------------------------------------- # $Log$ + # Revision 1.12 2003/03/30 20:50:00 rshortt + # Improvements in how we get skin properties. + # # Revision 1.11 2003/03/30 18:02:31 dischi # set parent before calling the parent constructor *************** *** 159,166 **** self.duration = 0 - # XXX: skin settings - ((bg_type, skin_bg), BLAH, BLAH, skin_font, BLAH, BLAH) = \ - self.skin.GetPopupBoxStyle(self) - if not self.left: self.left = self.osd.width/2 - self.width/2 if not self.top: self.top = self.osd.height/2 - self.height/2 --- 162,165 ---- *************** *** 168,179 **** if not self.bd_color: ! if skin_bg.color: ! self.bd_color = Color(skin_bg.color) else: self.bd_color = Color(self.osd.default_fg_color) if not self.bd_width: ! if skin_bg.size: ! self.bd_width = skin_bg.size else: self.bd_width = 2 --- 167,180 ---- if not self.bd_color: ! # XXX TODO: background type 'image' is not supported here yet ! if self.skin_info_background[0] == 'rectangle': ! self.bd_color = Color(self.skin_info_background[1].color) else: self.bd_color = Color(self.osd.default_fg_color) if not self.bd_width: ! if self.skin_info_background[0] == 'rectangle' \ ! and self.skin_info_background[1].size: ! self.bd_width = self.skin_info_background[1].size else: self.bd_width = 2 *************** *** 191,198 **** raise TypeError, text ! if skin_font: ! self.set_font(skin_font.name, ! skin_font.size, ! Color(skin_font.color)) else: self.set_font(config.OSD_DEFAULT_FONTNAME, --- 192,199 ---- raise TypeError, text ! if self.skin_info_font: ! self.set_font(self.skin_info_font.name, ! self.skin_info_font.size, ! Color(self.skin_info_font.color)) else: self.set_font(config.OSD_DEFAULT_FONTNAME, Index: RegionScroller.py =================================================================== RCS file: /cvsroot/freevo/freevo/src/gui/RegionScroller.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** RegionScroller.py 30 Mar 2003 18:19:53 -0000 1.7 --- RegionScroller.py 30 Mar 2003 20:50:00 -0000 1.8 *************** *** 10,13 **** --- 10,16 ---- # ----------------------------------------------------------------------- # $Log$ + # Revision 1.8 2003/03/30 20:50:00 rshortt + # Improvements in how we get skin properties. + # # Revision 1.7 2003/03/30 18:19:53 rshortt # Adding self to the other GetPopupBoxStyle calls. *************** *** 114,131 **** - self.skin = skin.get_singleton() - - (BLAH, BLAH, BLAH, BLAH, - button_default, BLAH) = self.skin.GetPopupBoxStyle(self) - if not self.bd_color: ! if button_default.rectangle.color: ! self.bd_color = Color(button_default.rectangle.color) else: self.bd_color = Color(self.osd.default_fg_color) if not self.bd_width: ! if button_default.rectangle.size: ! self.bd_width = button_default.rectangle.size else: self.bd_width = 2 --- 117,129 ---- if not self.bd_color: ! if self.skin_info_widget.rectangle.color: ! self.bd_color = Color(self.skin_info_widget.rectangle.color) else: self.bd_color = Color(self.osd.default_fg_color) if not self.bd_width: ! if self.skin_info_widget.rectangle.size: ! self.bd_width = self.skin_info_widget.rectangle.size else: self.bd_width = 2 Index: Scrollbar.py =================================================================== RCS file: /cvsroot/freevo/freevo/src/gui/Scrollbar.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Scrollbar.py 30 Mar 2003 18:19:53 -0000 1.5 --- Scrollbar.py 30 Mar 2003 20:50:00 -0000 1.6 *************** *** 10,13 **** --- 10,16 ---- # ----------------------------------------------------------------------- # $Log$ + # Revision 1.6 2003/03/30 20:50:00 rshortt + # Improvements in how we get skin properties. + # # Revision 1.5 2003/03/30 18:19:53 rshortt # Adding self to the other GetPopupBoxStyle calls. *************** *** 84,87 **** --- 87,92 ---- raise TypeError, 'orientation' + GUIObject.__init__(self, left, top, width, height) + self.orientation = orientation self.bg_color = bg_color *************** *** 92,121 **** self.bd_width = bd_width - self.skin = skin.get_singleton() - - (BLAH, BLAH, BLAH, BLAH, - button_default, BLAH) = \ - self.skin.GetPopupBoxStyle(self) if not self.bg_color: ! if button_default.rectangle.bgcolor: ! self.bg_color = Color(button_default.rectangle.bgcolor) else: self.bg_color = Color(self.osd.default_bg_color) if not self.fg_color: ! if button_default.font.color: ! self.fg_color = Color(button_default.font.color) else: self.fg_color = Color(self.osd.default_fg_color) - - GUIObject.__init__(self, left, top, width, height, - self.bg_color, self.fg_color) - - if not self.bd_color: ! if button_default.rectangle.color: ! self.bd_color = Color(button_default.rectangle.color) else: self.bd_color = Color(self.osd.default_fg_color) --- 97,116 ---- self.bd_width = bd_width if not self.bg_color: ! if self.skin_info_widget.rectangle.bgcolor: ! self.bg_color = Color(self.skin_info_widget.rectangle.bgcolor) else: self.bg_color = Color(self.osd.default_bg_color) if not self.fg_color: ! if self.skin_info_widget.font.color: ! self.fg_color = Color(self.skin_info_widget.font.color) else: self.fg_color = Color(self.osd.default_fg_color) if not self.bd_color: ! if self.skin_info_widget.rectangle.color: ! self.bd_color = Color(self.skin_info_widget.rectangle.color) else: self.bd_color = Color(self.osd.default_fg_color) |