Changeset 215


Ignore:
Timestamp:
06/30/07 03:57:45 (5 years ago)
Author:
marc
Message:

Minor UI changes, debug meta option in config, fixed a major bug in screenshooting active windows

Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/release/0.2/config.py

    r210 r215  
    9292 
    9393#: Default HTML header. 
     94# Putting <meta http-equiv="Refresh" content="5; url=http://localhost:8000"> is very useful for debugging 
    9495headhtml = '''<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> 
    9596<html> 

  • branches/release/0.2/screenshot.py

    r193 r215  
    8181        else: 
    8282            self.currentwindowfailed = True 
    83             raise error.ItakaScreenshotErrorWmHints 
     83            raise error.ItakaScreenshotErrorWmHints, 'Window Manager does not support _NET_WM hints' 
    8484     
    8585        # We do not want to grab the desktop window 
    8686        if self.activewindow.property_get("_NET_WM_WINDOW_TYPE")[-1][0] == '_NET_WM_WINDOW_TYPE_DESKTOP': 
    8787            self.currentwindowfailed = True 
    88             raise error.ItakaScreenshotErrorActiveDesktop 
     88            raise error.ItakaScreenshotErrorActiveDesktop, 'Active window is desktop' 
    8989 
    9090        return (self.windowwidth, self.windowheight, self.windowpositionx, self.windowpositiony) 
    … …  
    121121                        self.currentwindow[2], self.currentwindow[3], 0, 0, self.activewindowwidth, self.activewindowheight) 
    122122 
    123         elif not self.configuration['screenshot']['currentwindow'] or self.currentwindowfailed or self.itakaglobals.system == 'nt':  
     123        if self.currentwindowfailed or not self.configuration['screenshot']['currentwindow'] or self.itakaglobals.system == 'nt':  
    124124            self.screenshot = gtk.gdk.Pixbuf.get_from_drawable( 
    125125                    gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, self.screenwidth, self.screenheight), 
    … …  
    129129 
    130130        # GTK manages errors this way 
    131         if self.screenshot is None: 
    132             self.gui.log.failure(('Screenshot', 'take_screenshot'), 'Could not grab screenshot, GTK+ error', 'ERROR') 
     131        if not hasattr(self, 'screenshot') or self.screenshot is None: 
     132            # Reset the failure flag 
     133            self.currentwindowfailed = False 
     134            self.gui.log.failure(('Screenshot', 'take_screenshot'), ('Could not grab screenshot', 'GTK+ could not grab a screenshot of the screen.'), 'ERROR') 
    133135            raise error.ItakaScreenshotError, 'Could not grab screenshot, GTK+ error' 
    134136 
    … …  
    161163        gc.collect() 
    162164 
     165        # Reset the failure flag 
     166        self.currentwindowfailed = False 
     167 
    163168        return self.shotFile 

  • branches/release/0.2/server.py

    r214 r215  
    340340                n = pynotify.Notification("Screenshot taken",  
    341341                "%s requested screenshot" 
    342                 % (self.ip, self.counter), uri) 
     342                % (self.ip), uri) 
    343343 
    344344                n.set_timeout(1500) 

  • branches/release/0.2/uigtk.py

    r210 r215  
    517517 
    518518        if not self.itakaglobals.system == 'nt': 
    519             self.preferencesLabelscreenshot = gtk.Label('Screenshot window  ') 
     519            self.preferencesLabelscreenshot = gtk.Label('Window  ') 
    520520            self.preferencesLabelscreenshot.set_justify(gtk.JUSTIFY_LEFT) 
    521521            self.preferencesLabelscreenshot.set_alignment(0, 0.50) 

  • trunk/config.py

    r211 r215  
    9292 
    9393#: Default HTML header. 
     94# Putting <meta http-equiv="Refresh" content="5; url=http://localhost:8000"> is very useful for debugging 
    9495headhtml = '''<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> 
    9596<html> 

  • trunk/screenshot.py

    r193 r215  
    8181        else: 
    8282            self.currentwindowfailed = True 
    83             raise error.ItakaScreenshotErrorWmHints 
     83            raise error.ItakaScreenshotErrorWmHints, 'Window Manager does not support _NET_WM hints' 
    8484     
    8585        # We do not want to grab the desktop window 
    8686        if self.activewindow.property_get("_NET_WM_WINDOW_TYPE")[-1][0] == '_NET_WM_WINDOW_TYPE_DESKTOP': 
    8787            self.currentwindowfailed = True 
    88             raise error.ItakaScreenshotErrorActiveDesktop 
     88            raise error.ItakaScreenshotErrorActiveDesktop, 'Active window is desktop' 
    8989 
    9090        return (self.windowwidth, self.windowheight, self.windowpositionx, self.windowpositiony) 
    … …  
    121121                        self.currentwindow[2], self.currentwindow[3], 0, 0, self.activewindowwidth, self.activewindowheight) 
    122122 
    123         elif not self.configuration['screenshot']['currentwindow'] or self.currentwindowfailed or self.itakaglobals.system == 'nt':  
     123        if self.currentwindowfailed or not self.configuration['screenshot']['currentwindow'] or self.itakaglobals.system == 'nt':  
    124124            self.screenshot = gtk.gdk.Pixbuf.get_from_drawable( 
    125125                    gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, self.screenwidth, self.screenheight), 
    … …  
    129129 
    130130        # GTK manages errors this way 
    131         if self.screenshot is None: 
    132             self.gui.log.failure(('Screenshot', 'take_screenshot'), 'Could not grab screenshot, GTK+ error', 'ERROR') 
     131        if not hasattr(self, 'screenshot') or self.screenshot is None: 
     132            # Reset the failure flag 
     133            self.currentwindowfailed = False 
     134            self.gui.log.failure(('Screenshot', 'take_screenshot'), ('Could not grab screenshot', 'GTK+ could not grab a screenshot of the screen.'), 'ERROR') 
    133135            raise error.ItakaScreenshotError, 'Could not grab screenshot, GTK+ error' 
    134136 
    … …  
    161163        gc.collect() 
    162164 
     165        # Reset the failure flag 
     166        self.currentwindowfailed = False 
     167 
    163168        return self.shotFile 

  • trunk/server.py

    r214 r215  
    340340                n = pynotify.Notification("Screenshot taken",  
    341341                "%s requested screenshot" 
    342                 % (self.ip, self.counter), uri) 
     342                % (self.ip), uri) 
    343343 
    344344                n.set_timeout(1500) 

  • trunk/uigtk.py

    r211 r215  
    517517 
    518518        if not self.itakaglobals.system == 'nt': 
    519             self.preferencesLabelscreenshot = gtk.Label('Screenshot window  ') 
     519            self.preferencesLabelscreenshot = gtk.Label('Window  ') 
    520520            self.preferencesLabelscreenshot.set_justify(gtk.JUSTIFY_LEFT) 
    521521            self.preferencesLabelscreenshot.set_alignment(0, 0.50) 
Note: See TracChangeset for help on using the changeset viewer.