Merge lp:~lindekleiv/kazam/unstable into lp:kazam/unstable

[Olav Andreas Lindekleiv]

Fixes autosave directory being reset after restarting Kazam.

[David Klasinc (bigwhale)]

Rejecting old requests. This was fixed in a different manner.

Unmerged revisions

390. By Olav Andreas Lindekleiv on 2013-03-15

Use autosave_*_dir instead of *_dest for video and pictures.

389. By Olav Andreas Lindekleiv on 2013-03-15

Fixes Kazam not saving video_dest and picture_dest directories.

388. By Launchpad Translations on behalf of kazam-team on 2013-03-07

Launchpad automatic translations update.

=== modified file 'kazam/app.py'
--- kazam/app.py	2013-02-28 16:51:10 +0000
+++ kazam/app.py	2013-03-16 22:31:23 +0000
@@ -596,7 +596,7 @@
     def cb_flush_done(self, widget):
         if self.main_mode == MODE_SCREENCAST and prefs.autosave_video:
             logger.debug("Autosaving enabled.")
-            fname = get_next_filename(prefs.video_dest,
+            fname = get_next_filename(prefs.autosave_video_dir,
                                       prefs.autosave_video_file,
                                       CODEC_LIST[prefs.codec][3])
 
@@ -633,7 +633,7 @@
             self.indicator.menuitem_quit.set_sensitive(True)
 
             if prefs.autosave_picture:
-                fname = get_next_filename(prefs.picture_dest, prefs.autosave_picture_file, ".png")
+                fname = get_next_filename(prefs.autosave_picture_dir, prefs.autosave_picture_file, ".png")
                 self.grabber.autosave(fname)
             else:
                 self.grabber.save_capture(self.old_pic_path)

=== modified file 'kazam/backend/gstreamer.py'
--- kazam/backend/gstreamer.py	2013-03-06 06:50:23 +0000
+++ kazam/backend/gstreamer.py	2013-03-16 22:31:23 +0000
@@ -51,7 +51,7 @@
     def __init__(self):
         GObject.GObject.__init__(self)
 
-        self.temp_fh = tempfile.mkstemp(prefix="kazam_", dir=prefs.video_dest, suffix=".movie")
+        self.temp_fh = tempfile.mkstemp(prefix="kazam_", dir=prefs.autosave_video_dir, suffix=".movie")
         self.tempfile = self.temp_fh[1]
         self.muxer_tempfile = "{0}.mux".format(self.tempfile)
         self.pipeline = Gst.Pipeline()

=== modified file 'kazam/backend/prefs.py'
--- kazam/backend/prefs.py	2013-02-28 07:32:48 +0000
+++ kazam/backend/prefs.py	2013-03-16 22:31:23 +0000
@@ -77,9 +77,11 @@
         self.pa_q = None
         self.framerate = 15
         self.autosave_video = False
+        self.autosave_video_dir = None
         self.autosave_video_file = None
 
         self.autosave_picture = False
+        self.autosave_picture_dir = None
         self.autosave_picture_file = None
         self.shutter_sound = True
         self.shutter_type = 0
@@ -208,9 +210,11 @@
 
         self.autosave_video = self.config.getboolean("main", "autosave_video")
         self.autosave_video_file = self.config.get("main", "autosave_video_file")
+        self.autosave_video_dir = self.config.get("main", "autosave_video_dir")
 
         self.autosave_picture = self.config.getboolean("main", "autosave_picture")
         self.autosave_picture_file = self.config.get("main", "autosave_picture_file")
+        self.autosave_picture_dir = self.config.get("main", "autosave_picture_dir")
 
         self.shutter_sound = self.config.getboolean("main", "shutter_sound")
         self.shutter_type = int(self.config.get("main", "shutter_type"))
@@ -234,10 +238,15 @@
         self.config.set("main", "counter", self.countdown_timer)
         self.config.set("main", "codec", self.codec)
         self.config.set("main", "framerate", self.framerate)
+
         self.config.set("main", "autosave_video", self.autosave_video)
+        self.config.set("main", "autosave_video_dir", self.autosave_video_dir)
         self.config.set("main", "autosave_video_file", self.autosave_video_file)
+
         self.config.set("main", "autosave_picture", self.autosave_picture)
+        self.config.set("main", "autosave_picture_dir", self.autosave_picture_dir)
         self.config.set("main", "autosave_picture_file", self.autosave_picture_file)
+
         self.config.set("main", "shutter_sound", self.shutter_sound)
         self.config.set("main", "shutter_type", self.shutter_type)
 

=== modified file 'kazam/frontend/preferences.py'
--- kazam/frontend/preferences.py	2013-03-06 06:50:23 +0000
+++ kazam/frontend/preferences.py	2013-03-16 22:31:23 +0000
@@ -167,7 +167,7 @@
 
         self.entry_autosave_video.set_text(prefs.autosave_video_file)
 
-        self.filechooser_video.set_current_folder(prefs.video_dest)
+        self.filechooser_video.set_current_folder(prefs.autosave_video_dir)
 
         if prefs.shutter_sound:
             self.switch_shutter_sound.set_active(True)
@@ -190,7 +190,7 @@
 
         self.entry_autosave_picture.set_text(prefs.autosave_picture_file)
 
-        self.filechooser_picture.set_current_folder(prefs.picture_dest)
+        self.filechooser_picture.set_current_folder(prefs.autosave_picture_dir)
 
         #
         # Crappy code below ... Can this be done some other way?
@@ -319,8 +319,8 @@
             self.entry_autosave_video.set_sensitive(False)
 
     def cb_filechooser_video(self, widget):
-        prefs.video_dest = self.filechooser_video.get_current_folder()
-        logger.debug("Video folder set to: {0}".format(prefs.video_dest))
+        prefs.autosave_video_dir = self.filechooser_video.get_current_folder()
+        logger.debug("Video autosave folder set to: {0}".format(prefs.autosave_video_dir))
 
     def cb_entry_autosave_video(self, widget):
         prefs.autosave_video_file = widget.get_text()
@@ -355,10 +355,9 @@
             self.entry_autosave_picture.set_sensitive(False)
 
     def cb_filechooser_picture(self, widget):
-        prefs.picture_dest = self.filechooser_picture.get_current_folder()
-        logger.debug("Picture folder set to: {0}".format(prefs.picture_dest))
+        prefs.autosave_picture_dir = self.filechooser_picture.get_current_folder()
+        logger.debug("Picture autosave folder set to: {0}".format(prefs.autosave_picture_dir))
 
     def cb_entry_autosave_picture(self, widget):
         prefs.autosave_picture_file = widget.get_text()
         logger.debug("Picture autosave file set to: {0}".format(prefs.autosave_picture_file))
-