From f4796cc776b42be9435ea9e8e482ccc89f60db7a Mon Sep 17 00:00:00 2001
From: Oliver Duis <oduis@hotmail.com>
Date: Mon, 6 Dec 2010 21:41:06 +0100
Subject: [PATCH] Added filename to info panel, on behalf of Michael Ezra; see
 issue #379

---
 rtgui/editorpanel.cc | 7 ++++---
 rtgui/imagearea.cc   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index 661c7f735..995ad2ea0 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -615,13 +615,14 @@ void EditorPanel::info_toggled () {
 //            M("QINFO_FOCALLENGTH"), idata->getFocalLen())
 //            + Glib::ustring::compose ("%1: %2", M("QINFO_LENS"), Glib::ustring(idata->getLens()));
 infoString = Glib::ustring::compose (
-            "%1 + %2\n<span size=\"large\">%3</span>s  f/<span size=\"large\">%4</span>  %5<span size=\"large\">%6</span>  f=<span size=\"large\">%7</span>mm",
+            "%1 + %2\n<span size=\"small\">f/</span><span size=\"large\">%3</span>  <span size=\"large\">%4</span><span size=\"small\">s</span>  <span size=\"small\">%5</span><span size=\"large\">%6</span>  <span size=\"large\">%7</span><span size=\"small\">mm</span>\n<span size=\"small\">%8</span>",
             Glib::ustring(idata->getModel()),
             Glib::ustring(idata->getLens()),
-            Glib::ustring(idata->shutterToString(idata->getShutterSpeed())),
             Glib::ustring(idata->apertureToString(idata->getFNumber())),
+            Glib::ustring(idata->shutterToString(idata->getShutterSpeed())),
             M("QINFO_ISO"), idata->getISOSpeed(),
-            idata->getFocalLen()
+            idata->getFocalLen(),
+            openThm->getFileName ()
             );
     else
         infoString = M("QINFO_NOEXIF");
diff --git a/rtgui/imagearea.cc b/rtgui/imagearea.cc
index b5506f1f7..175ac32b1 100644
--- a/rtgui/imagearea.cc
+++ b/rtgui/imagearea.cc
@@ -109,7 +109,7 @@ void ImageArea::setInfoText (Glib::ustring text) {
     Glib::RefPtr<Pango::Context> context = get_pango_context () ;
     Pango::FontDescription fontd = context->get_font_description ();
     fontd.set_weight (Pango::WEIGHT_BOLD);
-    fontd.set_size (12*Pango::SCALE);
+    fontd.set_size (9*Pango::SCALE);
     context->set_font_description (fontd);
     ilayout = create_pango_layout("");
     ilayout->set_markup(text);