Changeset 199

Show
Ignore:
Timestamp:
Wed Dec 26 09:40:37 2007
Author:
manatlan
Message:

patches from rob
- viewExif plugin : Modification to allow the grid lines to be shown in
the tag table under those versions of GTK that support it.
- main : Modification of new window color to work on versions of GTK
that do not have the to_string() function for gtk.gdk.color types.
- main : Work around for resize bug in pygtk/gtk 2.10.6 on windows (see
attached png file for an example of this bug).
- main : Addition of parameter to the option parser to allow the use of
"jbrout.py --version" to return the version.
- winsearch : Work around for resize bug in pygtk/gtk 2.10.6 on windows

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/plugins/viewExif/__init__.py

    r192 r199  
    17 17     """ Plugin to display the full exif info contained in one ore more photos """  
    18 18     __author__ = "Rob Wallace"  
    19       __version__ = "0.0.1"  
      19     __version__ = "0.0.2"  
    19 19  
    20 20     def menuEntries(self,list):  

  • trunk/plugins/viewExif/viewExif.py

    r197 r199  
    70 70         # Gridlines commented out as libries shipped with current windows  
    71 71         # jbrout pack do not support this, need new libs to enable.  
    72           #self.treeview.set_grid_lines(gtk.TREE_VIEW_GRID_LINES_BOTH)  
      72         try:  
      73             self.treeview.set_grid_lines(gtk.TREE_VIEW_GRID_LINES_BOTH)  
      74         except:  
      75             pass  
    73 76  
    74 77         self.scrolledwindow1.add(self.treeview)  
    …… 
    112 115  
    113 116 if __name__ == "__main__":  
      117     from libs.i18n import createGetText  
      118  
      119     # make translation available in the gui/gtk  
      120     GladeApp.bindtextdomain("jbrout",os.path.join(os.path.dirname(__file__), 'po'))  
      121  
      122     # make translation available in the code  
      123     __builtins__.__dict__["_"] = createGetText("jbrout",os.path.join(os.path.dirname(__file__), 'po'))  
      124      
    114 125     main()  

  • trunk/jbrout.py

    r198 r199  
    107 107  
    108 108  
      109 def colorToString(color):  
      110     """  
      111     Converts a gtk.gdk color to a string  
      112     (fix for windows not having the to_string member function)"""  
      113     return "#%x%x%x" %(color.red, color.blue, color.green)  
      114  
      115  
    109 116 class JStyle:  
    110 117     """ static class to handle jbrout colors """  
    …… 
    115 122     del(w)              # it's the only trick i've found  
    116 123      
    117       try:  
    118           # Normal text  
    119           TEXT= style.text[gtk.STATE_NORMAL].to_string()  
    120            
    121           # grey text (folder without jpg, category, ...)  
    122           TEXT_LOLIGHT = style.fg[gtk.STATE_INSENSITIVE].to_string()  
    123            
    124           # colored text (basket color ...)  
    125           TEXT_HILIGHT = "#FF0000" #style.bg[gtk.STATE_PRELIGHT].to_string()  
    126            
    127           # input background  
    128           BACKGROUND = style.base[gtk.STATE_NORMAL].to_string()  
    129       except: # on win32 : gdk.Color don't have methods to_string() ?!?  
    130            
    131           TEXT= "#000000"  
    132           TEXT_LOLIGHT = "#666666"  
    133           TEXT_HILIGHT = "#FF0000"  
    134           BACKGROUND = "#FFFFFF"  
      124     # Normal text  
      125     TEXT= colorToString(style.text[gtk.STATE_NORMAL])  
      126      
      127     # grey text (folder without jpg, category, ...)  
      128     TEXT_LOLIGHT = colorToString(style.fg[gtk.STATE_INSENSITIVE])  
      129      
      130     # colored text (basket color ...)  
      131     TEXT_HILIGHT = "#FF0000" #colorToString(style.bg[gtk.STATE_PRELIGHT])  
      132      
      133     # input background  
      134     BACKGROUND = colorToString(style.base[gtk.STATE_NORMAL])  
      135  
    135 136  
    136 137  
    …… 
    990 991  
    991 992         w,h=JBrout.conf["width"] or 800,JBrout.conf["height"] or 600  
    992           self.main_widget.resize( w,h )  
      993         #self.main_widget.resize( w,h )  
      994         # work arround for bug in pygtk/gtk 2.10.6 on windows set default size  
      995         # then reshow with initial (default) size instead of simple resize  
      996         self.main_widget.set_default_size(w,h)  
      997         self.main_widget.reshow_with_initial_size()  
      998          
    993 999         self.hpaned1.set_position( JBrout.conf["hpaned"] or 160 )  
    994 1000         self.frameFilter.hide()  
    …… 
    2411 2417 if __name__ == "__main__":  
    2412 2418     try:  
    2413           parser = optparse.OptionParser(usage=USAGE)  
      2419         parser = optparse.OptionParser(usage=USAGE, version=("JBrout "+__version__))  
    2413 2419         parser.add_option("-v","--view",action="store_true",dest="view",  
    2414 2420                             help="run in view mode only")  

  • trunk/winsearch.py

    r178 r199  
    133 133         self.main_widget.set_transient_for(parent)  
    134 134         w,h=JBrout.conf["search.width"] or 500,JBrout.conf["search.height"] or 400  
    135           self.main_widget.resize( w,h )  
      135         #self.main_widget.resize( w,h )  
      136         # work arround for bug in pygtk/gtk 2.10.6 on windows set default size  
      137         # then reshow with initial (default) size instead of simple resize  
      138         self.main_widget.set_default_size(w,h)  
      139         self.main_widget.reshow_with_initial_size()  
      140          
    136 141         self.main_widget.resize_children()  
    137 142         try: