Merge lp:~vikoadi/pantheon-photos/fix-modified into lp:~pantheon-photos/pantheon-photos/trunk

[Viko Adi Rahmawan]

dont create _modified file if photo is not modified

[meese (meese)]

I think

LibraryWindow app = AppWindow.get_instance () as LibraryWindow;
if (app == null || modified_file.get_file_format () == PhotoFileFormat.RAW)

might work better as photo viewer shouldn't be saving a modified copy unless explicitly told to with save?

[meese (meese)]

** if (app != null || modified_file.get_file_format () == PhotoFileFormat.RAW)

[Viko Adi Rahmawan (vikoadi)]

But it will return unmodified image if its modified in image viewer.
Or maybe we should just ask user to save their modification?
But currently .modified files is already being used in open with menu.
is it really a big deal?

[Victor Martinez (victored)]

Why not just pass the original file to Open With?

[Viko Adi Rahmawan (vikoadi)]

If we just pass the original, all the changes we do will be discarded. That would be weird is it?

[Danielle Foré (danrabbit)]

Yeah, Viko is right. That doesn't really make sense to pass the original file IMO.

[Artem Anufrij (artem-anufrij)]

open an image in the edit mode (double click)

#1 set as desktop background
-> modified file will not be created! OK

#2 click on "automaticly improve", and than set it as desktop background again
-> photo will be improved by "photos"; modified file will be created; modified file will be set as background. OK

#3 edit the foto with the "adjust tool", and than set it as desktop backgound again
-> the photo will be reseted in the preview. FAIL

review: Needs Fixing

Unmerged revisions

2667. By Viko Adi Rahmawan on 2014-10-18

dont make modified file for unmodified file

=== modified file 'src/Page.vala'
--- src/Page.vala	2014-09-29 15:08:44 +0000
+++ src/Page.vala	2014-10-18 13:05:25 +0000
@@ -2710,7 +2710,7 @@
             File[] modified_files = null;
             foreach (var source in sources) {
                 Photo modified_file = (Photo)source;
-                if (modified_file.get_file_format () == PhotoFileFormat.RAW)
+                if (!modified_file.has_transformations () || modified_file.get_file_format () == PhotoFileFormat.RAW)
                     modified_files += modified_file.get_file ();
                 else
                     modified_files += modified_file.get_modified_file ();
@@ -2720,4 +2720,4 @@
             warning (err.message);
         }
     }
-}
\ No newline at end of file
+}