Changeset 324

Timestamp:

08/06/09 01:32:18 (3 years ago)

Author:

marc

Message:

First try at backport

Files:

• branches/release/0.2/README (modified) (1 diff)
• branches/release/0.2/screenshot.py (modified) (2 diffs)
• branches/release/0.2/uigtk.py (modified) (1 diff)
• trunk/uigtk.py (modified) (1 diff)

branches/release/0.2/README

@@ -68 +68 @@
 6. HACKING
 
-If you intend to change Itaka source coude, please read the HACKING file.
+If you intend to change Itaka source code, please read the HACKING file.
 
 Any questions should be emailed to me directly.

branches/release/0.2/screenshot.py

@@ -51 +51 @@
         self.currentwindowfailed = False
 
-        #: Final absolute path to the screenshot file
-        self.shotFile = os.path.join(self.configuration['screenshot']['path'], 'itakashot.%s' % (self.configuration['screenshot']['format']))
-        
         self.rootscreen = gtk.gdk.screen_get_default()
         self.rootwindow = gtk.gdk.get_default_root_window()
@@ -101 +98 @@
         
         self.configuration = self.gui.configuration
+
+        #: Final absolute path to the screenshot file
+        self.shot_file = os.path.join(self.configuration['screenshot']['path'], 'itakashot.%s' % (self.configuration['screenshot']['format']))
 
         if self.configuration['screenshot']['currentwindow'] and not self.itakaglobals.system == 'nt':

branches/release/0.2/uigtk.py

@@ -660 +660 @@
             self.configuration['screenshot']['format'] = 'jpeg'
 
+        # Delete stale old screenshot
+        if (self.current_configuration['screenshot']['format'] != self.configuration['screenshot']['format']):
+            if os.path.exists(os.path.join(self.current_configuration['screenshot']['path'], 'itakashot.%s' % (self.current_configuration['screenshot']['format']))): 
+                os.remove(os.path.join(self.current_configuration['screenshot']['path'], 'itakashot.%s' % (self.current_configuration['screenshot']['format'])))
+                if self.itaka_globals.console_verbosity['debug']: print_m(_("Deleting stale screenshot file '%s'" % ((os.path.join(self.current_configuration['screenshot']['path'], 'itakashot.%s' % (self.current_configuration['screenshot']['format']))))))
+
         if self.itakaglobals.notifyavailable:
             notifyvalue = self.preferencesChecknotifications.get_active()

trunk/uigtk.py

@@ -771 +771 @@
                 if self.itaka_globals.console_verbosity['debug']: print_m(_("Deleting stale screenshot file '%s'" % ((os.path.join(self.current_configuration['screenshot']['path'], 'itakashot.%s' % (self.current_configuration['screenshot']['format']))))))
 
-
         if self.itaka_globals.notify_available:
             self.notify_value = self.check_preferences_notifications.get_active()