Version: 1.6.0 (using KDE KDE 3.5.5) Installed from: Debian testing/unstable Packages Menu: Layer -> Histogram The Channel listbox is too small here in standard size of the dialog. I have to broaden the dialog to have the list items "RGB8 Histogram" and "L*a*b Histogram" in full length. I'm wondering if these are needed to have "Histogram" in their name due to their position inside the Histogram dialog.

They don't, but because of message freeze there isn't much we can do about it. For 1.6.2 I've given the message box a minimum lenght so it'll look better.

SVN commit 602927 by rempt: BUG: 136978 Remove superfluous "histogram" from labels, fix cimg filter spello, fix the size of the swappiness slider. M +1 -1 colorspaces/cmyk_u16/cmyk_u16_plugin.cc M +1 -1 colorspaces/cmyk_u8/cmyk_plugin.cc M +1 -1 colorspaces/gray_u16/gray_u16_plugin.cc M +1 -1 colorspaces/gray_u8/gray_plugin.cc M +1 -1 colorspaces/lms_f32/lms_f32_plugin.cc M +1 -1 colorspaces/rgb_f16half/rgb_f16half_plugin.cc M +1 -1 colorspaces/rgb_f32/rgb_f32_plugin.cc M +1 -1 colorspaces/rgb_u16/rgb_u16_plugin.cc M +1 -1 colorspaces/rgb_u8/rgb_plugin.cc M +1 -1 colorspaces/wet/wet_plugin.cc M +1 -1 colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc M +1 -1 colorspaces/ycbcr_u16/ycbcr_u16_plugin.cc M +1 -1 colorspaces/ycbcr_u8/ycbcr_u8_plugin.cc M +3 -13 core/kis_alpha_mask.cc M +9 -1 core/kis_alpha_mask.h M +2 -1 core/kis_paintop.cc M +3 -0 core/kis_strategy_move.cc M +1 -0 core/kis_transform_worker.cc M +1 -0 core/kis_transform_worker.h M +2 -2 kritacolor/kis_basic_histogram_producers.h M +1 -1 plugins/filters/cimg/kis_cimg_filter.h M +1 -0 plugins/paintops/Makefile.am M +12 -0 plugins/viewplugins/histogram/wdghistogram.ui M +4 -1 ui/kis_view.cc M +1 -1 ui/kis_view.h M +11 -1 ui/wdgperformancesettings.ui --- branches/koffice/1.6/koffice/krita/colorspaces/cmyk_u16/cmyk_u16_plugin.cc #602926:602927 @@ -49,7 +49,7 @@ f->add(csf); KisHistogramProducerFactoryRegistry::instance()->add( new KisBasicHistogramProducerFactory<KisBasicU16HistogramProducer> - (KisID("CMYK16HISTO", i18n("CMYK16 Histogram")), colorSpaceCMYKU16) ); + (KisID("CMYK16HISTO", i18n("CMYK16")), colorSpaceCMYKU16) ); } } --- branches/koffice/1.6/koffice/krita/colorspaces/cmyk_u8/cmyk_plugin.cc #602926:602927 @@ -54,7 +54,7 @@ KisHistogramProducerFactoryRegistry::instance()->add( new KisBasicHistogramProducerFactory<KisBasicU8HistogramProducer> - (KisID("CMYKHISTO", i18n("CMYK Histogram")), colorSpaceCMYK) ); + (KisID("CMYKHISTO", i18n("CMYK")), colorSpaceCMYK) ); } } --- branches/koffice/1.6/koffice/krita/colorspaces/gray_u16/gray_u16_plugin.cc #602926:602927 @@ -51,7 +51,7 @@ KisHistogramProducerFactoryRegistry::instance()->add( new KisBasicHistogramProducerFactory<KisBasicU16HistogramProducer> - (KisID("GRAYA16HISTO", i18n("GRAY/Alpha16 Histogram")), colorSpaceGRAYU16) ); + (KisID("GRAYA16HISTO", i18n("GRAY/Alpha16")), colorSpaceGRAYU16) ); } } --- branches/koffice/1.6/koffice/krita/colorspaces/gray_u8/gray_plugin.cc #602926:602927 @@ -65,7 +65,7 @@ KisHistogramProducerFactoryRegistry::instance()->add( new KisBasicHistogramProducerFactory<KisBasicU8HistogramProducer> - (KisID("GRAYA8HISTO", i18n("GRAY/Alpha8 Histogram")), colorSpaceGrayA) ); + (KisID("GRAYA8HISTO", i18n("GRAY/Alpha8")), colorSpaceGrayA) ); } } --- branches/koffice/1.6/koffice/krita/colorspaces/lms_f32/lms_f32_plugin.cc #602926:602927 @@ -52,7 +52,7 @@ KisHistogramProducerFactoryRegistry::instance()->add( new KisBasicHistogramProducerFactory<KisBasicF32HistogramProducer> - (KisID("LMSF32HISTO", i18n("Float32 Histogram")), colorSpaceLMSF32) ); + (KisID("LMSF32HISTO", i18n("Float32")), colorSpaceLMSF32) ); } } --- branches/koffice/1.6/koffice/krita/colorspaces/rgb_f16half/rgb_f16half_plugin.cc #602926:602927 @@ -50,7 +50,7 @@ f->add(csf); KisHistogramProducerFactoryRegistry::instance()->add( new KisBasicHistogramProducerFactory<KisBasicF16HalfHistogramProducer> - (KisID("RGBF16HALFHISTO", i18n("Float16 Half Histogram")), colorSpaceRGBF16Half) ); + (KisID("RGBF16HALFHISTO", i18n("Float16 Half")), colorSpaceRGBF16Half) ); } } --- branches/koffice/1.6/koffice/krita/colorspaces/rgb_f32/rgb_f32_plugin.cc #602926:602927 @@ -51,7 +51,7 @@ KisHistogramProducerFactoryRegistry::instance()->add( new KisBasicHistogramProducerFactory<KisBasicF32HistogramProducer> - (KisID("RGBF32HISTO", i18n("Float32 Histogram")), colorSpaceRGBF32) ); + (KisID("RGBF32HISTO", i18n("Float32")), colorSpaceRGBF32) ); } } --- branches/koffice/1.6/koffice/krita/colorspaces/rgb_u16/rgb_u16_plugin.cc #602926:602927 @@ -49,7 +49,7 @@ KisHistogramProducerFactoryRegistry::instance()->add( new KisBasicHistogramProducerFactory<KisBasicU16HistogramProducer> - (KisID("RGB16HISTO", i18n("RGB16 Histogram")), colorSpaceRGBU16) ); + (KisID("RGB16HISTO", i18n("RGB16")), colorSpaceRGBU16) ); } } --- branches/koffice/1.6/koffice/krita/colorspaces/rgb_u8/rgb_plugin.cc #602926:602927 @@ -62,7 +62,7 @@ KisColorSpace * colorSpaceRGBA = new KisRgbColorSpace(f, 0); KisHistogramProducerFactoryRegistry::instance()->add( new KisBasicHistogramProducerFactory<KisBasicU8HistogramProducer> - (KisID("RGB8HISTO", i18n("RGB8 Histogram")), colorSpaceRGBA) ); + (KisID("RGB8HISTO", i18n("RGB8")), colorSpaceRGBA) ); } } --- branches/koffice/1.6/koffice/krita/colorspaces/wet/wet_plugin.cc #602926:602927 @@ -86,7 +86,7 @@ // histogram producer KisHistogramProducerFactoryRegistry::instance()->add( new KisBasicHistogramProducerFactory<KisBasicU16HistogramProducer> - (KisID("WETHISTO", i18n("Wet Histogram")), colorSpaceWet) ); + (KisID("WETHISTO", i18n("Wet")), colorSpaceWet) ); // wet brush op KisPaintOpRegistry::instance()->add(new KisWetOpFactory); --- branches/koffice/1.6/koffice/krita/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc #602926:602927 @@ -174,7 +174,7 @@ } Q_UINT32 KisYCbCrU16ColorSpace::pixelSize() const { - return MAX_CHANNEL_YCbCrA*sizeof(Q_UINT16); + return MAX_CHANNEL_YCbCrA * sizeof(Q_UINT16); } --- branches/koffice/1.6/koffice/krita/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cc #602926:602927 @@ -48,7 +48,7 @@ f->add(csf); KisHistogramProducerFactoryRegistry::instance()->add( new KisBasicHistogramProducerFactory<KisBasicU16HistogramProducer> - (KisID("YCbCr16HISTO", i18n("YCbCr16 Histogram")), colorSpaceYCbCrU16) ); + (KisID("YCbCr16HISTO", i18n("YCbCr16")), colorSpaceYCbCrU16) ); } } --- branches/koffice/1.6/koffice/krita/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cc #602926:602927 @@ -50,7 +50,7 @@ f->add(csf); KisHistogramProducerFactoryRegistry::instance()->add( new KisBasicHistogramProducerFactory<KisBasicU16HistogramProducer> - (KisID("YCBR8HISTO", i18n("YCBR8 Histogram")), colorSpaceYCbCrU8) ); + (KisID("YCBR8HISTO", i18n("YCBR8")), colorSpaceYCbCrU8) ); } } --- branches/koffice/1.6/koffice/krita/core/kis_alpha_mask.cc #602926:602927 @@ -59,7 +59,7 @@ m_data.resize(width * height, OPACITY_TRANSPARENT); } -KisAlphaMask::~KisAlphaMask() +KisAlphaMask::~KisAlphaMask() { } @@ -73,16 +73,6 @@ return m_height; } -Q_UINT8 KisAlphaMask::alphaAt(Q_INT32 x, Q_INT32 y) const -{ - if (y >= 0 && y < m_height && x >= 0 && x < m_width) { - return m_data[(y * m_width) + x]; - } - else { - return OPACITY_TRANSPARENT; - } -} - void KisAlphaMask::setAlphaAt(Q_INT32 x, Q_INT32 y, Q_UINT8 alpha) { if (y >= 0 && y < m_height && x >= 0 && x < m_width) { @@ -90,7 +80,7 @@ } } -void KisAlphaMask::copyAlpha(const QImage& img) +void KisAlphaMask::copyAlpha(const QImage& img) { for (int y = 0; y < img.height(); y++) { for (int x = 0; x < img.width(); x++) { @@ -102,7 +92,7 @@ } } -void KisAlphaMask::computeAlpha(const QImage& img) +void KisAlphaMask::computeAlpha(const QImage& img) { // The brushes are mostly grayscale on a white background, // although some do have a colors. The alpha channel is seldom --- branches/koffice/1.6/koffice/krita/core/kis_alpha_mask.h #602926:602927 @@ -77,7 +77,15 @@ Q_INT32 alphaPos). That would be fastest, or we could provide an iterator over the mask, that would be nice, too. */ - Q_UINT8 alphaAt(Q_INT32 x, Q_INT32 y) const; + inline Q_UINT8 alphaAt(Q_INT32 x, Q_INT32 y) const + { + if (y >= 0 && y < m_height && x >= 0 && x < m_width) { + return m_data[(y * m_width) + x]; + } + else { + return OPACITY_TRANSPARENT; + } + } void setAlphaAt(Q_INT32 x, Q_INT32 y, Q_UINT8 alpha); --- branches/koffice/1.6/koffice/krita/core/kis_paintop.cc #602926:602927 @@ -31,7 +31,8 @@ #include "kis_iterators_pixel.h" #include "kis_color.h" -KisPaintOp::KisPaintOp(KisPainter * painter) : m_dab(0) +KisPaintOp::KisPaintOp(KisPainter * painter) + : m_dab(0) { m_painter = painter; setSource(painter->device()); --- branches/koffice/1.6/koffice/krita/core/kis_strategy_move.cc #602926:602927 @@ -96,8 +96,10 @@ pos -= m_dragStart; // convert to delta rc = dev->extent(); + kdDebug() << "Before move extent: " << rc << endl; dev->setX(dev->x() + pos.x()); dev->setY(dev->y() + pos.y()); + kdDebug() << "Extent afdter move: " << dev->extent() << endl; rc = rc.unite(dev->extent()); m_layerPosition = QPoint(dev->x(), dev->y()); @@ -110,6 +112,7 @@ void KisStrategyMove::endDrag(const QPoint& pos, bool undo) { + kdDebug() << "Done dragging\n"; if (m_subject && m_dragging) { KisImageSP img = m_subject->currentImg(); KisLayerSP dev; --- branches/koffice/1.6/koffice/krita/core/kis_transform_worker.cc #602926:602927 @@ -129,6 +129,7 @@ void KisTransformWorker::rotate180(KisPaintDeviceSP src, KisPaintDeviceSP dst) { + kdDebug() << "Rotating 180\n"; KisSelectionSP dstSelection; Q_INT32 pixelSize = src->pixelSize(); QRect r; --- branches/koffice/1.6/koffice/krita/core/kis_transform_worker.h #602926:602927 @@ -48,6 +48,7 @@ // XXX (BSAR): Why didn't we use the shared-pointer versions of the paint device classes? template <class T> void transformPass(KisPaintDevice *src, KisPaintDevice *dst, double xscale, double shear, Q_INT32 dx, KisFilterStrategy *filterStrategy); +public: void rotateRight90(KisPaintDeviceSP src, KisPaintDeviceSP dst); void rotateLeft90(KisPaintDeviceSP src, KisPaintDeviceSP dst); void rotate180(KisPaintDeviceSP src, KisPaintDeviceSP dst); --- branches/koffice/1.6/koffice/krita/kritacolor/kis_basic_histogram_producers.h #602926:602927 @@ -155,7 +155,7 @@ class KisGenericRGBHistogramProducerFactory : public KisHistogramProducerFactory { public: KisGenericRGBHistogramProducerFactory() - : KisHistogramProducerFactory(KisID("GENRGBHISTO", i18n("Generic RGB Histogram"))) {} + : KisHistogramProducerFactory(KisID("GENRGBHISTO", i18n("Generic RGB"))) {} virtual ~KisGenericRGBHistogramProducerFactory() {} virtual KisHistogramProducerSP generate() { return new KisGenericRGBHistogramProducer(); } virtual bool isCompatibleWith(KisColorSpace*) const { return true; } @@ -186,7 +186,7 @@ class KisGenericLabHistogramProducerFactory : public KisHistogramProducerFactory { public: KisGenericLabHistogramProducerFactory() - : KisHistogramProducerFactory(KisID("GENLABHISTO", i18n("Generic L*a*b* Histogram"))) {} + : KisHistogramProducerFactory(KisID("GENLABHISTO", i18n("Generic L*a*b*"))) {} virtual ~KisGenericLabHistogramProducerFactory() {} virtual KisHistogramProducerSP generate() { return new KisGenericLabHistogramProducer(); } virtual bool isCompatibleWith(KisColorSpace*) const { return true; } --- branches/koffice/1.6/koffice/krita/plugins/filters/cimg/kis_cimg_filter.h #602926:602927 @@ -55,7 +55,7 @@ KisCImgFilter(); public: virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const QRect&); - static inline KisID id() { return KisID("cimg", i18n("Image Restauration (cimg-based)")); }; + static inline KisID id() { return KisID("cimg", i18n("Image Restoration (cimg-based)")); }; virtual bool supportsPainting() { return false; } virtual bool supportsPreview() { return false; } virtual ColorSpaceIndependence colorSpaceIndependence(); --- branches/koffice/1.6/koffice/krita/plugins/paintops/Makefile.am #602926:602927 @@ -1,2 +1,3 @@ SUBDIRS = \ + cpaint defaultpaintops --- branches/koffice/1.6/koffice/krita/plugins/viewplugins/histogram/wdghistogram.ui #602926:602927 @@ -12,6 +12,9 @@ <height>380</height> </rect> </property> + <property name="caption"> + <string>WdgHistogram</string> + </property> <vbox> <property name="name"> <cstring>unnamed</cstring> @@ -75,6 +78,12 @@ <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>200</width> + <height>0</height> + </size> + </property> </widget> <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> @@ -217,4 +226,7 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> +<includehints> + <includehint>kis_histogram_view.h</includehint> +</includehints> </UI> --- branches/koffice/1.6/koffice/krita/ui/kis_view.cc #602926:602927 @@ -631,7 +631,10 @@ m_layerRm = new KAction(i18n("&Remove"), 0, this, SLOT(layerRemove()), actionCollection(), "remove_layer"); m_layerDup = new KAction(i18n("Duplicate"), 0, this, SLOT(layerDuplicate()), actionCollection(), "duplicate_layer"); - m_layerHide = new KAction(i18n("&Hide/Show"), 0, this, SLOT(layerToggleVisible()), actionCollection(), "hide_layer"); + m_layerHide = new KToggleAction(i18n("&Hide"), 0, this, SLOT(layerToggleVisible()), actionCollection(), "hide_layer"); + m_layerHide->setCheckedState(KGuiItem(i18n("&Show"))); + m_layerHide->setChecked(false); + m_layerRaise = new KAction(i18n("Raise"), "raise", "Ctrl+]", this, SLOT(layerRaise()), actionCollection(), "raiselayer"); m_layerLower = new KAction(i18n("Lower"), "lower", "Ctrl+[", this, SLOT(layerLower()), actionCollection(), "lowerlayer"); m_layerTop = new KAction(i18n("To Top"), "bring_forward", "Ctrl+Shift+]", this, SLOT(layerFront()), actionCollection(), "toplayer"); --- branches/koffice/1.6/koffice/krita/ui/kis_view.h #602926:602927 @@ -551,7 +551,7 @@ KAction *m_layerAdd; KAction *m_layerBottom; KAction *m_layerDup; - KAction *m_layerHide; + KToggleAction *m_layerHide; KAction *m_layerLower; KAction *m_layerProperties; KAction *m_layerRaise; --- branches/koffice/1.6/koffice/krita/ui/wdgperformancesettings.ui #602926:602927 @@ -8,10 +8,13 @@ <rect> <x>0</x> <y>0</y> - <width>373</width> + <width>495</width> <height>220</height> </rect> </property> + <property name="caption"> + <string>WdgPerformanceSettings</string> + </property> <vbox> <property name="name"> <cstring>unnamed</cstring> @@ -93,6 +96,12 @@ <property name="name"> <cstring>m_swappiness</cstring> </property> + <property name="maximumSize"> + <size> + <width>600</width> + <height>32767</height> + </size> + </property> <property name="maxValue"> <number>6</number> </property> @@ -135,5 +144,6 @@ <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> + <includehint>knuminput.h</includehint> </includehints> </UI>