Changeset 196

Show
Ignore:
Timestamp:
Wed Dec 12 10:58:34 2007
Author:
manatlan
Message:

- use gtk themed colors when possible. Now :jbrout should be displayed
well with a "gtk dark theme"
- correct a bug in winshow which didn't display the picture when jpeg
info (tags, comment ...) contained bad chars

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/listview2.py

    r138 r196  
    112 112     def __init__(self):  
    113 113         gtk.Layout.__init__(self, None, None)  
    114           self.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse('white'))  
      114          
      115         w = gtk.Window()    # create a fake window  
      116         w.realize()         # realize it ...  
      117         style=w.get_style() # ... to obtain the REAL theme style  
      118         del(w)              # it's the only trick i've found  
      119         BACKGROUND = style.base[gtk.STATE_NORMAL]  
      120          
      121         self.modify_bg(gtk.STATE_NORMAL, BACKGROUND)  
    115 122         self.loading_pixbuf = gtk.gdk.pixbuf_new_from_file('gfx/refresh.png')  
    116 123         self.selection = selection  

  • trunk/winshow.py

    r172 r196  
    223 223         d.image = PixbufCache().get(node.file)  
    224 224         d.title = "%d/%d"%(self.idx+1,len(self.ln))  
    225           self.lbl_info.set_text(msg)  
      225         try:  
      226             self.lbl_info.set_text(msg)  
      227         except Exception,m:  
      228             self.lbl_info.set_text("")  
      229             print "*ERROR* bad characters in jpeg info : ",m  
    226 230         d.isSelected = (node in self.selected)  
    227 231         d.nbSelected = len(self.selected)  

  • trunk/jbrout.py

    r195 r196  
    107 107  
    108 108  
      109 class JStyle:  
      110     """ static class to handle jbrout colors """  
      111      
      112     w = gtk.Window()    # create a fake window  
      113     w.realize()         # realize it ...  
      114     style=w.get_style() # ... to obtain the REAL theme style  
      115     del(w)              # it's the only trick i've found  
      116      
      117     # Normal text  
      118     TEXT= style.text[gtk.STATE_NORMAL].to_string()  
      119      
      120     # grey text (folder without jpg, category, ...)  
      121     TEXT_LOLIGHT = style.fg[gtk.STATE_INSENSITIVE].to_string()  
      122      
      123     # colored text (basket color ...)  
      124     TEXT_HILIGHT = "#FF0000" #style.bg[gtk.STATE_PRELIGHT].to_string()  
      125      
      126     # input background  
      127     BACKGROUND = style.base[gtk.STATE_NORMAL].to_string()  
      128  
      129  
      130  
    109 131 #========================================================  
    110 132 class JPlugin:  
    …… 
    495 517         self.set_value(it,1,len(node.getPhotos()))  
    496 518         self.set_value(it,2,node)  
    497           color = len(node.getPhotos())>0 and "#000000" or "#888888"  
      519          
      520         color = len(node.getPhotos())>0 and JStyle.TEXT or JStyle.TEXT_LOLIGHT  
    498 521         self.set_value(it,3,color)  
    499 522  
    500 523     def add(self,it,node):  
    501 524         """ append the 'node' to the iter """  
    502           color = len(node.getPhotos())>0 and "#000000" or "#888888"  
      525         color = len(node.getPhotos())>0 and JStyle.TEXT or JStyle.TEXT_LOLIGHT  
      526          
    503 527         return self.append(it,[node.name,len(node.getPhotos()),node,color])  
    504 528  
    …… 
    510 534  
    511 535             nb = len(JBrout.db.getBasket())  
    512               self.__iterBasket = self.prepend(None,[_("Basket"),nb,None,"#FF3333"])  
      536             self.__iterBasket = self.prepend(None,[_("Basket"),nb,None,JStyle.TEXT_HILIGHT])  
    512 536         else:  
    513 537             if self.__iterBasket:  
    …… 
    682 706         """ append the 'node' to the iter """  
    683 707         if node.__class__.__name__ == "TagNode":  
    684               return self.append(it,[node.name,node,"#000088",0,self.__displayKey(node)])  
      708             return self.append(it,[node.name,node,JStyle.TEXT,0,self.__displayKey(node)])  
    684 708         else:  
    685               return self.append(it,["[%s]" % node.name,node,"#888888",0,""])  
    686    
      709             return self.append(it,["[%s]" % node.name,node,JStyle.TEXT_LOLIGHT,0,""])  
    687 710  
    688 711