[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/extragear/graphics/digikam/0.11/utilities/queuemanager/basetools
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2009-03-01 9:48:10
Message-ID: 1235900890.213241.8992.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 933532 by cgilles:

background transparent color work fine now


 M  +18 -13    watermark.cpp  


--- branches/extragear/graphics/digikam/0.11/utilities/queuemanager/basetools/watermark.cpp \
#933531:933532 @@ -70,7 +70,7 @@
     QLabel *label  = new QLabel(hbox);
     m_textEdit     = new KLineEdit(hbox);
     m_textEdit->setClearButtonShown(true);
-    m_textEdit->setWhatsThis(i18n("Here, enter your watermark."));
+    m_textEdit->setWhatsThis(i18n("Here, enter your watermark string."));
     label->setText(i18n("Text:"));
 
     m_fontChooserWidget = new KFontChooser(vbox, KFontChooser::NoDisplayFlags);
@@ -106,7 +106,7 @@
     connect(m_fontColorButton, SIGNAL(changed(const QColor&)),
             this, SLOT(slotSettingsChanged()));
 
-    connect(m_textEdit, SIGNAL(textChanged()),
+    connect(m_textEdit, SIGNAL(textChanged(const QString&)),
             this, SLOT(slotSettingsChanged()));
 }
 
@@ -119,7 +119,7 @@
     BatchToolSettings settings;
     settings.insert("Text",   QString());
     settings.insert("Font",   QFont());
-    settings.insert("Color",  Qt::red);
+    settings.insert("Color",  Qt::black);
     settings.insert("Corner", BottomRight);
     return settings;
 }
@@ -134,6 +134,10 @@
 
 void WaterMark::slotSettingsChanged()
 {
+    m_fontChooserWidget->setSampleText(m_textEdit->text());
+    m_fontChooserWidget->setColor(m_fontColorButton->color());
+    m_fontChooserWidget->setBackgroundColor(QColor(0xCC, 0xCC, 0xCC));
+
     BatchToolSettings settings;
     settings.insert("Text",   m_textEdit->text());
     settings.insert("Font",   m_fontChooserWidget->font());
@@ -176,6 +180,17 @@
             break;
     }
 
+    DColorComposer *composer = \
DColorComposer::getComposer(DColorComposer::PorterDuffNone); +
+    // Add a transparent layer.
+    DImg transparentLayer(fontRect.width(), fontRect.height(), image().sixteenBit(), \
true); +    DColor transparent(0xCC, 0xCC, 0xCC, 210, image().sixteenBit());
+    transparentLayer.fill(transparent);
+    image().bitBlendImage(composer, &transparentLayer, 0, 0, 
+                          transparentLayer.width(), transparentLayer.height(),
+                          fontRect.x(), fontRect.y());
+
+    // Draw text
     QImage img = image().copyQImage(fontRect);
     QPainter p(&img);
     p.setPen(QPen(color, 1));
@@ -185,16 +200,6 @@
     p.restore();
     p.end();
 
-    DColorComposer *composer = \
                DColorComposer::getComposer(DColorComposer::PorterDuffNone);
-
-    DImg transparentLayer(fontRect.width(), fontRect.height(), image().sixteenBit(), \
                true);
-    DColor transparent(QColor(0xCC, 0xCC, 0xCC));
-    transparent.setAlpha(210);
-    if (image().sixteenBit()) transparent.convertToSixteenBit();
-    transparentLayer.fill(transparent);
-    image().bitBlendImage(composer, &transparentLayer, 0, 0, fontRect.width(), \
                fontRect.height(),
-                          fontRect.x(), fontRect.y());
-
     DImg textDrawn(img);
 
     // convert to 16 bit if needed


[prev in list] [next in list] [prev in thread] [next in thread]