[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/lib/kopainter
From: Tim Beaulen <tbscope () gmail ! com>
Date: 2005-12-19 20:23:07
Message-ID: 1135023787.037417.18173.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 489807 by beaulen:
Cleanup, remove debug and better layout of the widget.
M +9 -14 ko_cmyk_widget.cc
--- trunk/koffice/lib/kopainter/ko_cmyk_widget.cc #489806:489807
@@ -98,7 +98,7 @@
mKIn->setFixedHeight(20);
mKIn->setFocusPolicy( QWidget::ClickFocus );
- mGrid->addMultiCellWidget(m_ColorButton, 0, 3, 0, 0, Qt::AlignTop);
+ mGrid->addMultiCellWidget(m_ColorButton, 0, 4, 0, 0, Qt::AlignTop);
mGrid->addWidget(mCLabel, 0, 1);
mGrid->addWidget(mMLabel, 1, 1);
mGrid->addWidget(mYLabel, 2, 1);
@@ -130,8 +130,6 @@
void KoCMYKWidget::slotCChanged(int c)
{
- kdDebug() << "slotCChanged: " << c << endl;
-
if (m_ColorButton->current() == KDualColorButton::Foreground){
m_fgC = c / 255;
int r = int((1 - m_fgC * (1 - m_fgK) - m_fgK) * 255);
@@ -139,7 +137,7 @@
int b = m_fgColor.blue();
m_fgColor.setRgb(r, g, b);
m_ColorButton->setCurrent(KDualColorButton::Foreground);
- emit sigFgColorChanged(m_fgColor);
+ emit sigFgColorChanged(m_fgColor);
}
else{
m_bgC = c / 255;
@@ -148,7 +146,7 @@
int b = m_bgColor.blue();
m_bgColor.setRgb(r, g, b);
m_ColorButton->setCurrent(KDualColorButton::Background);
- emit sigBgColorChanged(m_bgColor);
+ emit sigBgColorChanged(m_bgColor);
}
}
@@ -161,7 +159,7 @@
int b = m_fgColor.blue();
m_fgColor.setRgb(r, g, b);
m_ColorButton->setCurrent(KDualColorButton::Foreground);
- emit sigFgColorChanged(m_fgColor);
+ emit sigFgColorChanged(m_fgColor);
}
else{
m_bgM = m / 255;
@@ -170,7 +168,7 @@
int b = m_bgColor.blue();
m_bgColor.setRgb(r, g, b);
m_ColorButton->setCurrent(KDualColorButton::Background);
- emit sigBgColorChanged(m_bgColor);
+ emit sigBgColorChanged(m_bgColor);
}
}
@@ -183,7 +181,7 @@
int b = int((1 - m_fgY * (1 - m_fgK) - m_fgK) * 255);
m_fgColor.setRgb(r, g, b);
m_ColorButton->setCurrent(KDualColorButton::Foreground);
- emit sigFgColorChanged(m_fgColor);
+ emit sigFgColorChanged(m_fgColor);
}
else{
m_bgY = y / 255;
@@ -192,7 +190,7 @@
int b = int((1 - m_bgY * (1 - m_bgK) - m_bgK) * 255);
m_bgColor.setRgb(r, g, b);
m_ColorButton->setCurrent(KDualColorButton::Background);
- emit sigBgColorChanged(m_bgColor);
+ emit sigBgColorChanged(m_bgColor);
}
}
@@ -205,7 +203,7 @@
int b = int((1 - m_fgY * (1 - m_fgK) - m_fgK) * 255);
m_fgColor.setRgb(r, g, b);
m_ColorButton->setCurrent(KDualColorButton::Foreground);
- emit sigFgColorChanged(m_fgColor);
+ emit sigFgColorChanged(m_fgColor);
}
else{
m_bgK = k / 255;
@@ -214,7 +212,7 @@
int b = int((1 - m_bgY * (1 - m_bgK) - m_bgK) * 255);
m_bgColor.setRgb(r, g, b);
m_ColorButton->setCurrent(KDualColorButton::Background);
- emit sigBgColorChanged(m_bgColor);
+ emit sigBgColorChanged(m_bgColor);
}
}
@@ -230,7 +228,6 @@
void KoCMYKWidget::update(const QColor fgColor, const QColor bgColor)
{
- kdDebug() << "update" << endl;
m_fgColor = fgColor;
m_bgColor = bgColor;
@@ -261,8 +258,6 @@
y = (ay - k) / (1 - k);
}
- kdDebug() << "c = " << c << endl << "m = " << m << endl << "y = " << y << endl << \
"k = " << k << endl;
-
disconnect(m_ColorButton, SIGNAL(fgChanged(const QColor &)), this, \
SLOT(slotFGColorSelected(const QColor &)));
disconnect(m_ColorButton, SIGNAL(bgChanged(const QColor &)), this, \
SLOT(slotBGColorSelected(const QColor &)));
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic