Changeset 6174

Show
Ignore:
Timestamp:
2008-04-27 23:46:02 (2 months ago)
Author:
flynd
Message:

Fixed so color dialog for messages uses current color from correct role.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/qt4-gui/src/userevents/usersendcommon.cpp

    r6173 r6174  
    13891389    return; 
    13901390 
     1391  QColor c = myMessageEdit->palette().color(QPalette::Base); 
    13911392#ifdef USE_KDE 
    1392   QColor c = myMessageEdit->palette().color(myMessageEdit->backgroundRole()); 
    13931393  if (KColorDialog::getColor(c, this) != KColorDialog::Accepted) 
    13941394    return; 
    13951395#else 
    1396   QColor c = QColorDialog::getColor(myMessageEdit->palette().color(myMessageEdit->backgroundRole()), this); 
     1396  c = QColorDialog::getColor(c, this); 
    13971397  if (!c.isValid()) 
    13981398    return; 
    …… 
    14081408    return; 
    14091409 
     1410  QColor c = myMessageEdit->palette().color(QPalette::Text); 
    14101411#ifdef USE_KDE 
    1411   QColor c = myMessageEdit->palette().color(myMessageEdit->foregroundRole()); 
    14121412  if (KColorDialog::getColor(c, this) != KColorDialog::Accepted) 
    14131413    return; 
    14141414#else 
    1415   QColor c = QColorDialog::getColor(myMessageEdit->palette().color(myMessageEdit->foregroundRole()), this); 
     1415  c = QColorDialog::getColor(c, this); 
    14161416  if (!c.isValid()) 
    14171417    return;