diff -r 65602f1ef0f8 -r f77bb02b669f QTfrontend/ui/widget/itemNum.cpp --- a/QTfrontend/ui/widget/itemNum.cpp Mon Jan 30 23:20:28 2012 +0100 +++ b/QTfrontend/ui/widget/itemNum.cpp Mon Jan 30 17:32:18 2012 -0500 @@ -23,8 +23,8 @@ #include ItemNum::ItemNum(const QImage& im, const QImage& img, QWidget * parent, unsigned char min, unsigned char max) : - QFrame(parent), m_im(im), m_img(img), infinityState(false), nonInteractive(false), minItems(min), maxItems(max), - numItems(min+2 >= max ? min : min+2) + QFrame(parent), m_im(im), m_img(img), infinityState(false), nonInteractive(false), minItems(min), maxItems(max), + numItems(min+2 >= max ? min : min+2) { enabled = true; //if(frontendEffects) setAttribute(Qt::WA_PaintOnScreen, true); @@ -36,29 +36,40 @@ void ItemNum::mousePressEvent ( QMouseEvent * event ) { - if(nonInteractive) return; - if(event->button()==Qt::LeftButton && enabled) { - event->accept(); - if((infinityState && numItems <= maxItems) || (!infinityState && numItems < maxItems)) { - incItems(); - } else { - numItems = minItems+1; - // appears there's an emit in there - decItems(); + if(nonInteractive) return; + if(event->button()==Qt::LeftButton && enabled) + { + event->accept(); + if((infinityState && numItems <= maxItems) || (!infinityState && numItems < maxItems)) + { + incItems(); + } + else + { + numItems = minItems+1; + // appears there's an emit in there + decItems(); + } } - } else if (event->button()==Qt::RightButton && enabled) { - event->accept(); - if(numItems > minItems) { - decItems(); - } else { - numItems = maxItems+(infinityState?0:-1); - incItems(); + else if (event->button()==Qt::RightButton && enabled) + { + event->accept(); + if(numItems > minItems) + { + decItems(); + } + else + { + numItems = maxItems+(infinityState?0:-1); + incItems(); + } } - } else { - event->ignore(); - return; - } - repaint(); + else + { + event->ignore(); + return; + } + repaint(); } void ItemNum::wheelEvent ( QWheelEvent * event ) { @@ -86,57 +97,67 @@ if(numItems > minItems) decItems(); } - repaint(); + repaint(); } QSize ItemNum::sizeHint () const { - return QSize((maxItems+1)*12, 32); + return QSize((maxItems+1)*12, 32); } void ItemNum::paintEvent(QPaintEvent* event) { - Q_UNUSED(event); + Q_UNUSED(event); - QPainter painter(this); + QPainter painter(this); - if (numItems==maxItems+1) { - QRect target(0, 0, 100, 32); - if (enabled) { - painter.drawImage(target, QImage(":/res/infinity.png")); - } else { - painter.drawImage(target, QImage(":/res/infinitygrey.png")); + if (numItems==maxItems+1) + { + QRect target(0, 0, 100, 32); + if (enabled) + { + painter.drawImage(target, QImage(":/res/infinity.png")); + } + else + { + painter.drawImage(target, QImage(":/res/infinitygrey.png")); + } } - } else { - for(int i=0; i