(cherry picked from commit 28e2c0ec38)
v3.5.13-sru
Darrell Anderson 13 years ago committed by Slávek Banko
parent 200a7544af
commit 3c05aa63d0

@ -23100,7 +23100,7 @@ v0.9.1-beta1 - 11-Feb-2007
trunk/extragear/graphics/digikam/libs/dmetadata/photoinfocontainer.h,
trunk/extragear/graphics/digikam/libs/imageproperties/cameraitempropertiestab.cpp,
trunk/extragear/graphics/digikam/libs/imageproperties/imagepropertiestab.cpp:
digikam from trunk : focalLength ==>focalLenght
digikam from trunk : focalLength ==>focalLength
2007-02-05 12:09 cgilles

@ -99,7 +99,7 @@ public:
labelPhotoModel = 0;
labelPhotoDateTime = 0;
labelPhotoAperture = 0;
labelPhotoFocalLenght = 0;
labelPhotoFocalLength = 0;
labelPhotoExposureTime = 0;
labelPhotoSensitivity = 0;
labelPhotoExposureMode = 0;
@ -148,7 +148,7 @@ public:
KSqueezedTextLabel *labelPhotoModel;
KSqueezedTextLabel *labelPhotoDateTime;
KSqueezedTextLabel *labelPhotoAperture;
KSqueezedTextLabel *labelPhotoFocalLenght;
KSqueezedTextLabel *labelPhotoFocalLength;
KSqueezedTextLabel *labelPhotoExposureTime;
KSqueezedTextLabel *labelPhotoSensitivity;
KSqueezedTextLabel *labelPhotoExposureMode;
@ -219,7 +219,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar)
d->labelPhotoModel = new KSqueezedTextLabel(0, d->settingsArea);
d->labelPhotoDateTime = new KSqueezedTextLabel(0, d->settingsArea);
d->labelPhotoAperture = new KSqueezedTextLabel(0, d->settingsArea);
d->labelPhotoFocalLenght = new KSqueezedTextLabel(0, d->settingsArea);
d->labelPhotoFocalLength = new KSqueezedTextLabel(0, d->settingsArea);
d->labelPhotoExposureTime = new KSqueezedTextLabel(0, d->settingsArea);
d->labelPhotoSensitivity = new KSqueezedTextLabel(0, d->settingsArea);
d->labelPhotoExposureMode = new KSqueezedTextLabel(0, d->settingsArea);
@ -264,7 +264,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar)
d->labelPhotoModel->setMaximumHeight(hgt);
d->labelPhotoDateTime->setMaximumHeight(hgt);
d->labelPhotoAperture->setMaximumHeight(hgt);
d->labelPhotoFocalLenght->setMaximumHeight(hgt);
d->labelPhotoFocalLength->setMaximumHeight(hgt);
d->labelPhotoExposureTime->setMaximumHeight(hgt);
d->labelPhotoSensitivity->setMaximumHeight(hgt);
d->labelPhotoExposureMode->setMaximumHeight(hgt);
@ -315,7 +315,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar)
settingsLayout->addMultiCellWidget(d->aperture, 20, 20, 0, 0);
settingsLayout->addMultiCellWidget(d->labelPhotoAperture, 20, 20, 1, 1);
settingsLayout->addMultiCellWidget(d->focalLength, 21, 21, 0, 0);
settingsLayout->addMultiCellWidget(d->labelPhotoFocalLenght, 21, 21, 1, 1);
settingsLayout->addMultiCellWidget(d->labelPhotoFocalLength, 21, 21, 1, 1);
settingsLayout->addMultiCellWidget(d->exposureTime, 22, 22, 0, 0);
settingsLayout->addMultiCellWidget(d->labelPhotoExposureTime, 22, 22, 1, 1);
settingsLayout->addMultiCellWidget(d->sensitivity, 23, 23, 0, 0);
@ -356,7 +356,7 @@ void CameraItemPropertiesTab::setCurrentItem(const GPItemInfo* itemInfo,
d->labelPhotoModel->setText(TQString());
d->labelPhotoDateTime->setText(TQString());
d->labelPhotoAperture->setText(TQString());
d->labelPhotoFocalLenght->setText(TQString());
d->labelPhotoFocalLength->setText(TQString());
d->labelPhotoExposureTime->setText(TQString());
d->labelPhotoSensitivity->setText(TQString());
d->labelPhotoExposureMode->setText(TQString());
@ -480,7 +480,7 @@ void CameraItemPropertiesTab::setCurrentItem(const GPItemInfo* itemInfo,
d->labelPhotoModel->hide();
d->labelPhotoDateTime->hide();
d->labelPhotoAperture->hide();
d->labelPhotoFocalLenght->hide();
d->labelPhotoFocalLength->hide();
d->labelPhotoExposureTime->hide();
d->labelPhotoSensitivity->hide();
d->labelPhotoExposureMode->hide();
@ -504,7 +504,7 @@ void CameraItemPropertiesTab::setCurrentItem(const GPItemInfo* itemInfo,
d->labelPhotoModel->show();
d->labelPhotoDateTime->show();
d->labelPhotoAperture->show();
d->labelPhotoFocalLenght->show();
d->labelPhotoFocalLength->show();
d->labelPhotoExposureTime->show();
d->labelPhotoSensitivity->show();
d->labelPhotoExposureMode->show();
@ -526,11 +526,11 @@ void CameraItemPropertiesTab::setCurrentItem(const GPItemInfo* itemInfo,
d->labelPhotoAperture->setText(photoInfo.aperture.isEmpty() ? unavailable : photoInfo.aperture);
if (photoInfo.focalLength35mm.isEmpty())
d->labelPhotoFocalLenght->setText(photoInfo.focalLength.isEmpty() ? unavailable : photoInfo.focalLength);
d->labelPhotoFocalLength->setText(photoInfo.focalLength.isEmpty() ? unavailable : photoInfo.focalLength);
else
{
str = i18n("%1 (35mm: %2)").arg(photoInfo.focalLength).arg(photoInfo.focalLength35mm);
d->labelPhotoFocalLenght->setText(str);
d->labelPhotoFocalLength->setText(str);
}
d->labelPhotoExposureTime->setText(photoInfo.exposureTime.isEmpty() ? unavailable : photoInfo.exposureTime);

@ -107,7 +107,7 @@ public:
labelPhotoModel = 0;
labelPhotoDateTime = 0;
labelPhotoAperture = 0;
labelPhotoFocalLenght = 0;
labelPhotoFocalLength = 0;
labelPhotoExposureTime = 0;
labelPhotoSensitivity = 0;
labelPhotoExposureMode = 0;
@ -161,7 +161,7 @@ public:
KSqueezedTextLabel *labelPhotoModel;
KSqueezedTextLabel *labelPhotoDateTime;
KSqueezedTextLabel *labelPhotoAperture;
KSqueezedTextLabel *labelPhotoFocalLenght;
KSqueezedTextLabel *labelPhotoFocalLength;
KSqueezedTextLabel *labelPhotoExposureTime;
KSqueezedTextLabel *labelPhotoSensitivity;
KSqueezedTextLabel *labelPhotoExposureMode;
@ -240,7 +240,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar)
d->labelPhotoModel = new KSqueezedTextLabel(0, d->settingsArea);
d->labelPhotoDateTime = new KSqueezedTextLabel(0, d->settingsArea);
d->labelPhotoAperture = new KSqueezedTextLabel(0, d->settingsArea);
d->labelPhotoFocalLenght = new KSqueezedTextLabel(0, d->settingsArea);
d->labelPhotoFocalLength = new KSqueezedTextLabel(0, d->settingsArea);
d->labelPhotoExposureTime = new KSqueezedTextLabel(0, d->settingsArea);
d->labelPhotoSensitivity = new KSqueezedTextLabel(0, d->settingsArea);
d->labelPhotoExposureMode = new KSqueezedTextLabel(0, d->settingsArea);
@ -289,7 +289,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar)
d->labelPhotoModel->setMaximumHeight(hgt);
d->labelPhotoDateTime->setMaximumHeight(hgt);
d->labelPhotoAperture->setMaximumHeight(hgt);
d->labelPhotoFocalLenght->setMaximumHeight(hgt);
d->labelPhotoFocalLength->setMaximumHeight(hgt);
d->labelPhotoExposureTime->setMaximumHeight(hgt);
d->labelPhotoSensitivity->setMaximumHeight(hgt);
d->labelPhotoExposureMode->setMaximumHeight(hgt);
@ -352,7 +352,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar)
settingsLayout->addMultiCellWidget(d->aperture, 26, 26, 0, 0);
settingsLayout->addMultiCellWidget(d->labelPhotoAperture, 26, 26, 1, 1);
settingsLayout->addMultiCellWidget(d->focalLength, 27, 27, 0, 0);
settingsLayout->addMultiCellWidget(d->labelPhotoFocalLenght, 27, 27, 1, 1);
settingsLayout->addMultiCellWidget(d->labelPhotoFocalLength, 27, 27, 1, 1);
settingsLayout->addMultiCellWidget(d->exposureTime, 28, 28, 0, 0);
settingsLayout->addMultiCellWidget(d->labelPhotoExposureTime, 28, 28, 1, 1);
settingsLayout->addMultiCellWidget(d->sensitivity, 29, 29, 0, 0);
@ -396,7 +396,7 @@ void ImagePropertiesTab::setCurrentURL(const KURL& url)
d->labelPhotoModel->setText(TQString());
d->labelPhotoDateTime->setText(TQString());
d->labelPhotoAperture->setText(TQString());
d->labelPhotoFocalLenght->setText(TQString());
d->labelPhotoFocalLength->setText(TQString());
d->labelPhotoExposureTime->setText(TQString());
d->labelPhotoSensitivity->setText(TQString());
d->labelPhotoExposureMode->setText(TQString());
@ -526,7 +526,7 @@ void ImagePropertiesTab::setCurrentURL(const KURL& url)
d->labelPhotoModel->hide();
d->labelPhotoDateTime->hide();
d->labelPhotoAperture->hide();
d->labelPhotoFocalLenght->hide();
d->labelPhotoFocalLength->hide();
d->labelPhotoExposureTime->hide();
d->labelPhotoSensitivity->hide();
d->labelPhotoExposureMode->hide();
@ -550,7 +550,7 @@ void ImagePropertiesTab::setCurrentURL(const KURL& url)
d->labelPhotoModel->show();
d->labelPhotoDateTime->show();
d->labelPhotoAperture->show();
d->labelPhotoFocalLenght->show();
d->labelPhotoFocalLength->show();
d->labelPhotoExposureTime->show();
d->labelPhotoSensitivity->show();
d->labelPhotoExposureMode->show();
@ -572,11 +572,11 @@ void ImagePropertiesTab::setCurrentURL(const KURL& url)
d->labelPhotoAperture->setText(photoInfo.aperture.isEmpty() ? unavailable : photoInfo.aperture);
if (photoInfo.focalLength35mm.isEmpty())
d->labelPhotoFocalLenght->setText(photoInfo.focalLength.isEmpty() ? unavailable : photoInfo.focalLength);
d->labelPhotoFocalLength->setText(photoInfo.focalLength.isEmpty() ? unavailable : photoInfo.focalLength);
else
{
str = i18n("%1 (35mm: %2)").arg(photoInfo.focalLength).arg(photoInfo.focalLength35mm);
d->labelPhotoFocalLenght->setText(str);
d->labelPhotoFocalLength->setText(str);
}
d->labelPhotoExposureTime->setText(photoInfo.exposureTime.isEmpty() ? unavailable : photoInfo.exposureTime);

Loading…
Cancel
Save