[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/graphics/digikam/utilities
From: Andi Clemens <andi.clemens () gmx ! net>
Date: 2008-09-12 21:27:30
Message-ID: 1221254850.562845.24447.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 860386 by aclemens:
Fixed contractions issues in utilities folder.
The KDE Style Guide recommends not using contractions in strings.
M +7 -7 cameragui/camerafolderview.cpp
M +12 -12 cameragui/umscamera.cpp
M +20 -20 imageeditor/canvas/colorcorrectiondlg.cpp
M +1 -1 setup/setupcollections.cpp
M +1 -1 setup/setupicc.cpp
--- trunk/extragear/graphics/digikam/utilities/cameragui/camerafolderview.cpp \
#860385:860386 @@ -5,7 +5,7 @@
*
* Date : 2003-01-23
* Description : A widget to display a list of camera folders.
- *
+ *
* Copyright (C) 2003-2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu>
* Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
@@ -14,12 +14,12 @@
* Public License as published bythe Free Software Foundation;
* either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* ============================================================ */
// KDE includes.
@@ -107,7 +107,7 @@
DDebug() << "CameraFolderView: Adding Subfolder " << subFolder
<< " of folder " << folder << endl;
- if (parentItem)
+ if (parentItem)
{
QString path(folder);
@@ -124,9 +124,9 @@
item->setExpanded(true);
return item;
}
- else
+ else
{
- DWarning() << "CameraFolderView: Couldn't find parent for subFolder "
+ DWarning() << "CameraFolderView: Could not find parent for subFolder "
<< subFolder << " of folder " << folder << endl;
return 0;
}
@@ -154,7 +154,7 @@
void CameraFolderView::slotCurrentChanged(QTreeWidgetItem* item, int)
{
- if (!item)
+ if (!item)
emit signalFolderChanged(0);
else
emit signalFolderChanged(dynamic_cast<CameraFolderItem *>(item));
--- trunk/extragear/graphics/digikam/utilities/cameragui/umscamera.cpp #860385:860386
@@ -7,7 +7,7 @@
* Description : USB Mass Storage camera interface
*
* Copyright (C) 2004-2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu>
- * Copyright (C) 2005-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2005-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -59,7 +59,7 @@
namespace Digikam
{
-UMSCamera::UMSCamera(const QString& title, const QString& model,
+UMSCamera::UMSCamera(const QString& title, const QString& model,
const QString& port, const QString& path)
: DKCamera(title, model, port, path)
{
@@ -155,7 +155,7 @@
#warning "TODO: kde4 port it";
/* TODO: KDE4PORT: KFileMetaInfo API as Changed.
Check if new method to search "Dimensions" information \
is enough.
-
+
if (meta.isValid())
{
if (meta.containsGroup("Jpeg EXIF Data"))
@@ -165,7 +165,7 @@
else if (meta.containsGroup("Technical"))
dims = \
meta.group("Technical").item("Dimensions").value().toSize(); }*/
-
+
if (meta.isValid() && meta.item("Dimensions").isValid())
{
dims = meta.item("Dimensions").value().toSize();
@@ -208,8 +208,8 @@
if (!thumbnail.isNull())
return true;
- // THM files: try to get thumbnail from '.thm' files if we didn't manage to get
- // thumbnail from Exif. Any cameras provides *.thm files like JPEG files with \
RAW files. + // THM files: try to get thumbnail from '.thm' files if we didn't \
manage to get + // thumbnail from Exif. Any cameras provides *.thm files like JPEG \
files with RAW files.
// Using this way is always speed up than ultimate loading using DImg.
// Nota: the thumbnail extracted with this method can be in poor quality.
// 2006/27/01 - Gilles - Tested with my Minolta Dynax 5D USM camera.
@@ -307,19 +307,19 @@
bool UMSCamera::setLockItem(const QString& folder, const QString& itemName, bool \
lock) {
- QString src = folder + QString("/") + itemName;
+ QString src = folder + QString("/") + itemName;
if (lock)
{
// Lock the file to set read only flag
if (::chmod(QFile::encodeName(src), S_IREAD) == -1)
- return false;
+ return false;
}
else
{
// Unlock the file to set read/write flag
if (::chmod(QFile::encodeName(src), S_IREAD | S_IWRITE) == -1)
- return false;
+ return false;
}
return true;
@@ -424,7 +424,7 @@
#warning "TODO: kde4 port it";
/* TODO: KDE4PORT: KFileMetaInfo API as Changed.
Check if new method to search "Dimensions" information is \
enough.
-
+
if (meta.isValid())
{
if (meta.containsGroup("Jpeg EXIF Data"))
@@ -434,7 +434,7 @@
else if (meta.containsGroup("Technical"))
dims = \
meta.group("Technical").item("Dimensions").value().toSize(); }*/
-
+
if (meta.isValid() && meta.item("Dimensions").isValid())
{
dims = meta.item("Dimensions").value().toSize();
@@ -523,7 +523,7 @@
{
about = QString(i18n("The <b>Mounted Camera</b> driver is a simple interface to \
a camera disk " "mounted locally on your system.<br><br>"
- "It doesn't use libgphoto2 drivers.<br><br>"
+ "It does not use libgphoto2 drivers.<br><br>"
"To report any problems with this driver, please contact \
the digiKam team at:<br><br>" "http://www.digikam.org/?q=contact"));
return true;
--- trunk/extragear/graphics/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp \
#860385:860386 @@ -2,11 +2,11 @@
*
* This file is a part of digiKam project
* http://www.digikam.org
- *
+ *
* Date : 2006-05-15
- * Description : a dialog to see preview ICC color correction
+ * Description : a dialog to see preview ICC color correction
* before to apply color profile.
- *
+ *
* Copyright (C) 2006-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
* This program is free software; you can redistribute it
@@ -14,12 +14,12 @@
* Public License as published by the Free Software Foundation;
* either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* ============================================================ */
// Qt includes.
@@ -53,7 +53,7 @@
namespace Digikam
{
-ColorCorrectionDlg::ColorCorrectionDlg(QWidget* parent, DImg *preview,
+ColorCorrectionDlg::ColorCorrectionDlg(QWidget* parent, DImg *preview,
IccTransform *iccTrans, const QString& file)
: KDialog(parent)
{
@@ -70,11 +70,11 @@
setButtonToolTip(Cancel, i18n("Do not change the image"));
setButtonText(Apply, i18n("Assign"));
setButtonToolTip(Apply, i18n("Only embed the color workspace profile in the \
image, "
- "don't change the image"));
+ "do not change the image"));
QFileInfo fi(file);
setCaption(fi.fileName());
-
+
QWidget *page = new QWidget(this);
QGridLayout* grid = new QGridLayout(page);
setMainWidget(page);
@@ -94,12 +94,12 @@
\
.arg(m_iccTrans->getEmbeddedProfileDescriptor()), page);
QPushButton *embeddedProfInfo = new QPushButton(i18n("Info..."), page);
KSeparator *line = new KSeparator(Qt::Horizontal, page);
-
+
if (m_iccTrans->embeddedProfile().isEmpty())
{
message->setText(i18n("<p>This image has not been assigned a color \
profile.</p>"
"<p>Do you want to convert it to your workspace color \
profile?</p>"));
-
+
line->hide();
embeddedProfileTitle->hide();
embeddedProfileDesc->hide();
@@ -124,12 +124,12 @@
previewTarget->setPixmap(preview->convertToPixmap(m_iccTrans));
logo->setPixmap(QPixmap(KStandardDirs::locate("data", \
"digikam/data/logo-digikam.png"))
.scaled(128, 128, Qt::KeepAspectRatio, \
Qt::SmoothTransformation));
-
+
QHBoxLayout *hlay1 = new QHBoxLayout();
hlay1->setSpacing( KDialog::spacingHint() );
hlay1->addWidget(currentProfInfo);
hlay1->addStretch();
-
+
QHBoxLayout *hlay2 = new QHBoxLayout();
hlay2->setSpacing( KDialog::spacingHint() );
hlay2->addWidget(embeddedProfInfo);
@@ -145,29 +145,29 @@
vlay->addLayout(hlay1);
vlay->addWidget(line);
vlay->addWidget(embeddedProfileTitle);
- vlay->addWidget(embeddedProfileDesc);
+ vlay->addWidget(embeddedProfileDesc);
vlay->addLayout(hlay2);
vlay->addStretch();
-
+
grid->setMargin(0);
grid->setSpacing(KDialog::spacingHint());
grid->addWidget(originalTitle, 0, 0, 1, 1);
grid->addWidget(previewOriginal, 1, 0, 1, 1);
grid->addWidget(targetTitle, 2, 0, 1, 1);
grid->addWidget(previewTarget, 3, 0, 1, 1);
- grid->addItem(new QSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(),
+ grid->addItem(new QSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(),
QSizePolicy::Minimum, QSizePolicy::Expanding), 0, 1, 3, 1);
grid->addLayout(vlay, 0, 2, 4, 1);
-
+
// --------------------------------------------------------------------
-
+
connect(currentProfInfo, SIGNAL(clicked()),
this, SLOT(slotCurrentProfInfo()) );
-
+
connect(embeddedProfInfo, SIGNAL(clicked()),
this, SLOT(slotEmbeddedProfInfo()) );
-
- connect(this, SIGNAL(applyClicked()),
+
+ connect(this, SIGNAL(applyClicked()),
this, SLOT(slotApplyClicked()));
}
--- trunk/extragear/graphics/digikam/utilities/setup/setupcollections.cpp \
#860385:860386 @@ -536,7 +536,7 @@
{
if (KUrl(result).equals(KUrl(QDir::homePath()), \
KUrl::CompareWithoutTrailingSlash)) {
- KMessageBox::sorry(0, i18n("Sorry you can't use your home directory as root \
album path.")); + KMessageBox::sorry(0, i18n("Sorry you can not use your home \
directory as root album path.")); }
else
{
--- trunk/extragear/graphics/digikam/utilities/setup/setupicc.cpp #860385:860386
@@ -181,7 +181,7 @@
d->defaultAskICC->setText(i18n("Ask when opening an image in the Image \
Editor"));
d->defaultAskICC->setWhatsThis( i18n("<p>If this option is enabled, digiKam asks \
the user "
"before it applies the Workspace default color profile to an \
image which has no "
- "embedded profile or, if the image has an embedded profile, \
when it's not the same " + "embedded profile or, if the image has \
an embedded profile, when it is not the same " "as the workspace profile.</p>"));
behaviourOptions->addButton(d->defaultAskICC);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic