OSSP CVS Repository

Check-in Number:	3901
Date:	2002-Dec-19 12:25:19 (local) 2002-Dec-19 11:25:19 (UTC)
User:	ms
Branch:
Comment:	Fixed two bugs, added placeholder pixmap to avoid stale data reference, and removed incorrect pixmap logic when reading a problem row with warning on.
Tickets:
Inspections:
Files:	ossp-pkg/as/as-gui/as_slot.cpp      1.70 -> 1.71     7 inserted, 2 deleted

---

ossp-pkg/as/as-gui/as_slot.cpp 1.70 -> 1.71

--- as_slot.cpp 2002/12/18 15:47:18 1.70 +++ as_slot.cpp 2002/12/19 11:25:19 1.71 @@ -48,6 +48,7 @@ #include "as_gfx/statok.xpm" // static const char *s_kpcStatokay_xpm[] #include "as_gfx/staterr.xpm" // static const char *s_kpcStaterror_xpm[] #include "as_gfx/statwrn.xpm" // static const char *s_kpcStatwarn_xpm[] +#include "as_gfx/statvoid.xpm" // static const char *s_kpcStatvoid_xpm[] // @@ -689,7 +690,10 @@ m_pMaintable->setEdition(); // Set text of member edit controls - m_pStatusedit->setPixmap(m_pMaintable->pixmap(nRow, TITRAQ_IDXSTATUS)); + if (m_pMaintable->text(nRow, TITRAQ_IDXSTATUS).isEmpty()) // If row is empty + m_pStatusedit->setPixmap(s_kpcStatvoid_xpm); // add a placeholder + else + m_pStatusedit->setPixmap(m_pMaintable->pixmap(nRow, TITRAQ_IDXSTATUS)); m_pLineedit->setText(Textline); m_pUseredit->setText(Textuser); m_pGuidedit->setText(Textguid); @@ -740,7 +744,8 @@ m_pMaintable->text(nRow, TITRAQ_IDXTASK).isEmpty()) { // No K&R style to show where actual code begins if (Statis.startsWith(QString("W"))) { // Conditionally set pixmap to avoid overhead - m_pStatusedit->setPixmap(m_pMaintable->pixmap(nRow, TITRAQ_IDXSTATUS)); +// FIXME: Next line commented out, and I see that this algorythm needs help +// m_pStatusedit->setPixmap(m_pMaintable->pixmap(nRow, TITRAQ_IDXSTATUS)); } else if (!Statis.startsWith(QString("E"))) { // Conditionally set pixmap to avoid overhead m_pMaintable->setText(nRow, TITRAQ_IDXSTATUS, Statis.replace(TITRAQ_IDXSTATERROR, sizeof(char), 'E'));