[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/graphics/digikam/digikam
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2007-04-20 6:23:16
Message-ID: 1177050196.627594.29419.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 656069 by cgilles:
polish
M +16 -15 albumfiletip.cpp
--- trunk/extragear/graphics/digikam/digikam/albumfiletip.cpp #656068:656069
@@ -23,9 +23,6 @@
*
* ============================================================ */
-#define MAXSTRINGLEN 30
-#define TIPBORDER 5
-
// Qt includes.
#include <qtooltip.h>
@@ -68,7 +65,8 @@
{
public:
- AlbumFileTipPriv()
+ AlbumFileTipPriv() :
+ maxStringLen(30), tipBorder(5)
{
corner = 0;
label = 0;
@@ -76,6 +74,9 @@
iconItem = 0;
}
+ const uint maxStringLen;
+ const uint tipBorder;
+
int corner;
QLabel *label;
@@ -99,7 +100,7 @@
setFrameStyle(QFrame::Plain | QFrame::Box);
setLineWidth(1);
- QVBoxLayout *layout = new QVBoxLayout(this, TIPBORDER+1, 0);
+ QVBoxLayout *layout = new QVBoxLayout(this, d->tipBorder+1, 0);
d->label = new QLabel(this);
d->label->setMargin(0);
@@ -192,7 +193,7 @@
void AlbumFileTip::renderArrows()
{
- int w = TIPBORDER;
+ int w = d->tipBorder;
// -- left top arrow -------------------------------------
@@ -424,7 +425,7 @@
{
str = QString("%1 / %2").arg(photoInfo.make.isEmpty() ? unavailable \
: photoInfo.make)
.arg(photoInfo.model.isEmpty() ? unavailable \
: photoInfo.model);
- if (str.length() > MAXSTRINGLEN) str = str.left(MAXSTRINGLEN-3) + \
"..."; + if (str.length() > d->maxStringLen) str = \
str.left(d->maxStringLen-3) + "...";
metaStr += cellBeg + i18n("Make/Model:") + cellMid + \
QStyleSheet::escape( str ) + cellEnd; }
@@ -433,7 +434,7 @@
if (photoInfo.dateTime.isValid())
{
str = KGlobal::locale()->formatDateTime(photoInfo.dateTime, \
true, true);
- if (str.length() > MAXSTRINGLEN) str = str.left(MAXSTRINGLEN-3) \
+ "..."; + if (str.length() > d->maxStringLen) str = \
str.left(d->maxStringLen-3) + "...";
metaStr += cellBeg + i18n("Created:") + cellMid + \
QStyleSheet::escape( str ) + cellEnd; }
else
@@ -449,7 +450,7 @@
else
str += QString(" / %1").arg(i18n("%1 (35mm: \
%2)").arg(photoInfo.focalLength).arg(photoInfo.focalLength35mm));
- if (str.length() > MAXSTRINGLEN) str = str.left(MAXSTRINGLEN-3) + \
"..."; + if (str.length() > d->maxStringLen) str = \
str.left(d->maxStringLen-3) + "...";
metaStr += cellBeg + i18n("Aperture/Focal:") + cellMid + \
QStyleSheet::escape( str ) + cellEnd; }
@@ -457,7 +458,7 @@
{
str = QString("%1 / %2").arg(photoInfo.exposureTime.isEmpty() ? \
unavailable : photoInfo.exposureTime)
.arg(photoInfo.sensitivity.isEmpty() ? \
unavailable : i18n("%1 ISO").arg(photoInfo.sensitivity));
- if (str.length() > MAXSTRINGLEN) str = str.left(MAXSTRINGLEN-3) + \
"..."; + if (str.length() > d->maxStringLen) str = \
str.left(d->maxStringLen-3) + "...";
metaStr += cellBeg + i18n("Exposure/Sensitivity:") + cellMid + \
QStyleSheet::escape( str ) + cellEnd; }
@@ -472,21 +473,21 @@
str = photoInfo.exposureProgram;
else
str = QString("%1 / \
%2").arg(photoInfo.exposureMode).arg(photoInfo.exposureProgram);
- if (str.length() > MAXSTRINGLEN) str = str.left(MAXSTRINGLEN-3) + \
"..."; + if (str.length() > d->maxStringLen) str = \
str.left(d->maxStringLen-3) + "...";
metaStr += cellBeg + i18n("Mode/Program:") + cellMid + \
QStyleSheet::escape( str ) + cellEnd; }
if (settings->getToolTipsShowPhotoFlash())
{
str = photoInfo.flash.isEmpty() ? unavailable : photoInfo.flash;
- if (str.length() > MAXSTRINGLEN) str = str.left(MAXSTRINGLEN-3) + \
"..."; + if (str.length() > d->maxStringLen) str = \
str.left(d->maxStringLen-3) + "...";
metaStr += cellBeg + i18n("Flash:") + cellMid + QStyleSheet::escape( \
str ) + cellEnd; }
if (settings->getToolTipsShowPhotoWB())
{
str = photoInfo.whiteBalance.isEmpty() ? unavailable : \
photoInfo.whiteBalance;
- if (str.length() > MAXSTRINGLEN) str = str.left(MAXSTRINGLEN-3) + \
"..."; + if (str.length() > d->maxStringLen) str = \
str.left(d->maxStringLen-3) + "...";
metaStr += cellBeg + i18n("White Balance:") + cellMid + \
QStyleSheet::escape( str ) + cellEnd; }
@@ -523,7 +524,7 @@
str = tagPaths.join(", ");
if (str.isEmpty()) str = QString("---");
- if (str.length() > MAXSTRINGLEN) str = str.left(MAXSTRINGLEN-3) + "...";
+ if (str.length() > d->maxStringLen) str = str.left(d->maxStringLen-3) + \
"...";
tip += cellSpecBeg + i18n("Tags:") + cellSpecMid + str + cellSpecEnd;
}
@@ -544,7 +545,7 @@
{
QString str = input.simplifyWhiteSpace();
str = QStyleSheet::escape(str);
- uint maxLen = MAXSTRINGLEN;
+ uint maxLen = d->maxStringLen;
if (str.length() <= maxLen)
return str;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic