From b1e8ed3f757c819ba15a7729dbcde37a527b02b4 Mon Sep 17 00:00:00 2001
From: michael <michael@michaelezra.com>
Date: Wed, 15 Jun 2011 20:08:45 -0400
Subject: [PATCH] InfoText improvement & typo correction in FF (issue 777)

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

diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index af4bd1401..2884e31bb 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -681,14 +681,15 @@ 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=\"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>",
+            "%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><span>%9</span>",
             Glib::ustring(idata->getMake()+" "+idata->getModel()),
             Glib::ustring(idata->getLens()),
             Glib::ustring(idata->apertureToString(idata->getFNumber())),
             Glib::ustring(idata->shutterToString(idata->getShutterSpeed())),
             M("QINFO_ISO"), idata->getISOSpeed(),
             idata->getFocalLen(),
-            openThm->getFileName ()
+            Glib::path_get_dirname(openThm->getFileName()) + G_DIR_SEPARATOR_S,
+            Glib::path_get_basename(openThm->getFileName())
             );
     else
         infoString = M("QINFO_NOEXIF");
diff --git a/rtgui/flatfield.cc b/rtgui/flatfield.cc
index 467722313..f4f82f101 100644
--- a/rtgui/flatfield.cc
+++ b/rtgui/flatfield.cc
@@ -215,7 +215,7 @@ void FlatField::flatFieldAutoSelectChanged()
  	  // retrieve the auto-selected ff filename
        rtengine::RawImage *img = ffp->getFF();
       if( img ){
-        ffInfo->set_text( Glib::ustring::compose("%1: f/%2s", Glib::path_get_basename(img->get_filename()), img->get_aperture()) ); // !!! need to add focallength in mm and format aperture to ##.#
+        ffInfo->set_text( Glib::ustring::compose("%1: f/%2", Glib::path_get_basename(img->get_filename()), img->get_aperture()) ); // !!! need to add focallength in mm and format aperture to ##.#
       }else{
     	  ffInfo->set_text(Glib::ustring(M("TP_PREPROCESS_NO_FOUND")));
       }