Merge lp:~ozzmos/pantheon-files/fix-1011176 into lp:~elementary-apps/pantheon-files/trunk

[Christophe Bastin]

show image size in Properties Window

[Julián Unrrein (junrrein)]

Hi Christophe,

I tested your branch and it works as intended.

The code is fine too, though you'll have to fix the code style:
* Newline before line 27.
* In lines 33 and 34: (pixbuf.get_width ().to_string ()) -> pixbuf.get_width ().to_string ();
* Put a space before an opening parenthesis. Lines 29 and 38.
* Move "catch(Error e){" to the previous line -> "} catch (Error e) {"
* Put a space before an opening curly brace. Lines 31 and 38.

You can read our coding style guide at http://elementaryos.org/docs/code/code-style.

Also, it seems you updated the translation template in this branch. When it's necessary, we tend do it in another branch, so the revision log gets less polluted. You don't need to revert it this time, just keep it in mind for the future.

review: Needs Fixing

[Christophe Bastin (ozzmos)]

Thanks for the review. I'm going to fix that.

[Cody Garver (codygarver)]

Design team wants it to be "Size: 852 x 576 px"

review: Needs Fixing

[David Gomes (davidgomes)]

Diff line 36 should be:

>info.add (new Pair<string, string> (_("Size") + (": "), width + " x " + height + " px"));

Also newline after diff line 31.

review: Needs Fixing

[lp:~ozzmos/pantheon-files/fix-1011176]

1379. By Christophe Bastin on 2013-12-01

fix coding style

[Danielle Foré (danrabbit)]

Instead of an " x " we should be using the " × " character

review: Needs Fixing

[Julián Unrrein (junrrein)]

After pushing new commits, you don't need to "Resubmit" the merge proposal. Just leave a comment saying that you applied the requested changes and we will be notified.

[lp:~ozzmos/pantheon-files/fix-1011176]

1380. By Christophe Bastin on 2013-12-02

fix typo

[Christophe Bastin (ozzmos)]

Ok, sorry for that ;)

[David Gomes (davidgomes)]

Diff line 28 is over-indented.

review: Needs Fixing

[David Gomes (davidgomes)]

Diff line 30 should be if ("image" in mime) {

Make sure you fix these two when you manually merge it Cody.

review: Needs Fixing

[lp:~ozzmos/pantheon-files/fix-1011176]

1381. By Christophe Bastin on 2013-12-03

fix coding style

[Julián Unrrein (junrrein)]

Insert a new line after diff line 41.

This should be the last thing to fix.

review: Needs Fixing

[lp:~ozzmos/pantheon-files/fix-1011176]

1382. By Christophe Bastin on 2013-12-09

fix coding style

=== modified file 'po/pantheon-files.pot'
--- po/pantheon-files.pot	2013-10-02 16:59:49 +0000
+++ po/pantheon-files.pot	2013-12-09 16:56:45 +0000
@@ -408,6 +408,14 @@
 msgid "MimeTypes"
 msgstr ""
 
+#: /home/codygarver/f/po/../src/View/PropertiesWindow.vala:431
+msgid "Width"
+msgstr ""
+
+#: /home/codygarver/f/po/../src/View/PropertiesWindow.vala:432
+msgid "Height"
+msgstr ""
+
 #: /home/codygarver/f/po/../src/View/PropertiesWindow.vala:424
 msgid "Location"
 msgstr ""

=== modified file 'src/View/PropertiesWindow.vala'
--- src/View/PropertiesWindow.vala	2013-09-09 03:08:16 +0000
+++ src/View/PropertiesWindow.vala	2013-12-09 16:56:45 +0000
@@ -420,6 +420,22 @@
                 info.add (new Pair<string, string>(_("MimeTypes") + (": "), str));
             }
         }
+
+        /* get image size in pixels */
+        var mime = file.icon.to_string ();
+        if ("image" in mime) {
+            var path = file.location.get_path ();
+
+            try {
+                Gdk.Pixbuf pixbuf = new Gdk.Pixbuf.from_file (path);
+                var width = pixbuf.get_width ().to_string ();
+                var height = pixbuf.get_height ().to_string ();
+                info.add (new Pair<string, string> (_("Size") + (": "), width +" × " + height + " px"));
+            } catch (Error e) {
+                stdout.printf ("Error: %s\n", e.message);
+            }
+        }
+
         if (got_common_location ())
             info.add (new Pair<string, string>(_("Location") + (": "), "<a href=\"" + Markup.escape_text (file.directory.get_uri ()) + "\">"
                                                             + Markup.escape_text (file.directory.get_parse_name ()) + "</a>"));