liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

InfoText improvement & typo correction in FF (issue 777)

Browse Source
This commit is contained in:
michael
2011-06-15 20:08:45 -04:00
parent aff832f721
commit b1e8ed3f75
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtgui/editorpanel.cc
View File

@@ -681,14 +681,15 @@ 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=\"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->getMake()+" "+idata->getModel()),
Glib::ustring(idata->getLens()), Glib::ustring(idata->getLens()),
Glib::ustring(idata->apertureToString(idata->getFNumber())), Glib::ustring(idata->apertureToString(idata->getFNumber())),
Glib::ustring(idata->shutterToString(idata->getShutterSpeed())), Glib::ustring(idata->shutterToString(idata->getShutterSpeed())),
M("QINFO_ISO"), idata->getISOSpeed(), M("QINFO_ISO"), idata->getISOSpeed(),
idata->getFocalLen(), idata->getFocalLen(),
openThm->getFileName () Glib::path_get_dirname(openThm->getFileName()) + G_DIR_SEPARATOR_S,
Glib::path_get_basename(openThm->getFileName())
); );
else else
infoString = M("QINFO_NOEXIF"); infoString = M("QINFO_NOEXIF");

2
rtgui/flatfield.cc
View File

@@ -215,7 +215,7 @@ void FlatField::flatFieldAutoSelectChanged()
// retrieve the auto-selected ff filename // retrieve the auto-selected ff filename
rtengine::RawImage *img = ffp->getFF(); rtengine::RawImage *img = ffp->getFF();
if( img ){ 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{ }else{
ffInfo->set_text(Glib::ustring(M("TP_PREPROCESS_NO_FOUND"))); ffInfo->set_text(Glib::ustring(M("TP_PREPROCESS_NO_FOUND")));
} }