Added filename to info panel, on behalf of Michael Ezra; see issue #379

This commit is contained in:
Oliver Duis
2010-12-06 21:41:06 +01:00
parent 024fdb29ce
commit f4796cc776
2 changed files with 5 additions and 4 deletions

View File

@@ -615,13 +615,14 @@ void EditorPanel::info_toggled () {
// M("QINFO_FOCALLENGTH"), idata->getFocalLen()) // M("QINFO_FOCALLENGTH"), idata->getFocalLen())
// + Glib::ustring::compose ("%1: %2", M("QINFO_LENS"), Glib::ustring(idata->getLens())); // + Glib::ustring::compose ("%1: %2", M("QINFO_LENS"), Glib::ustring(idata->getLens()));
infoString = Glib::ustring::compose ( 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->getModel()),
Glib::ustring(idata->getLens()), Glib::ustring(idata->getLens()),
Glib::ustring(idata->shutterToString(idata->getShutterSpeed())),
Glib::ustring(idata->apertureToString(idata->getFNumber())), Glib::ustring(idata->apertureToString(idata->getFNumber())),
Glib::ustring(idata->shutterToString(idata->getShutterSpeed())),
M("QINFO_ISO"), idata->getISOSpeed(), M("QINFO_ISO"), idata->getISOSpeed(),
idata->getFocalLen() idata->getFocalLen(),
openThm->getFileName ()
); );
else else
infoString = M("QINFO_NOEXIF"); infoString = M("QINFO_NOEXIF");

View File

@@ -109,7 +109,7 @@ void ImageArea::setInfoText (Glib::ustring text) {
Glib::RefPtr<Pango::Context> context = get_pango_context () ; Glib::RefPtr<Pango::Context> context = get_pango_context () ;
Pango::FontDescription fontd = context->get_font_description (); Pango::FontDescription fontd = context->get_font_description ();
fontd.set_weight (Pango::WEIGHT_BOLD); fontd.set_weight (Pango::WEIGHT_BOLD);
fontd.set_size (12*Pango::SCALE); fontd.set_size (9*Pango::SCALE);
context->set_font_description (fontd); context->set_font_description (fontd);
ilayout = create_pango_layout(""); ilayout = create_pango_layout("");
ilayout->set_markup(text); ilayout->set_markup(text);