Changeset 5549

Show
Ignore:
Timestamp:
10/04/07 14:05:45 (14 months ago)
Author:
eugene
Message:
  • Moved chatChangeFg icon into IconManager? as barTextColor;
  • Added this icon into kde iconset.
Location:
branches/qt-gui_qt4
Files:
1 added
5 modified
1 moved

Legend:

Unmodified
Added
Removed

  • branches/qt-gui_qt4/share/icons/kde/kde.icons

    r5547 r5549  
    3232GPGKey = gpgkey.png 
    3333MultipleRec = multiplerec.png 
     34TextColor = textcolor.png 

  • branches/qt-gui_qt4/src/config/iconmanager.cpp

    r5547 r5549  
    3030 
    3131#include "xpm/barMultipleRec.xpm" 
     32#include "xpm/barTextColor.xpm" 
    3233#include "xpm/history.xpm" 
    3334#include "xpm/info.xpm" 
    … …  
    170171  // Toolbar icons 
    171172  LOAD2_ICON("MultipleRec",     MultipleRecIcon, barMultipleRec_xpm); 
     173  LOAD2_ICON("TextColor",       TextColorIcon, barTextColor_xpm); 
    172174 
    173175#undef LOAD_ICON 

  • branches/qt-gui_qt4/src/config/iconmanager.h

    r5547 r5549  
    8787    // Toolbar icons 
    8888    MultipleRecIcon, 
     89    TextColorIcon, 
    8990  }; 
    9091 

  • branches/qt-gui_qt4/src/dialogs/chatdlg.cpp

    r5478 r5549  
    8383#include "xpm/chatBeep.xpm" 
    8484#include "xpm/chatIgnore.xpm" 
    85 #include "xpm/chatChangeFg.xpm" 
    8685#include "xpm/chatChangeBg.xpm" 
    8786 
    … …  
    216215  barChat->addSeparator(); 
    217216 
    218   tbtFg = barChat->addAction(QPixmap(chatChangeFg_xpm), tr("Foreground color")); 
     217  tbtFg = barChat->addAction(IconManager::instance()->getIcon(IconManager::TextColorIcon), tr("Foreground color")); 
    219218  tbtFg->setToolTip(tr("Changes the foreground color")); 
    220219  mnuFg = new QMenu(); 

  • branches/qt-gui_qt4/src/userevents/usersendcommon.cpp

    r5547 r5549  
    6666#include "usersendurlevent.h" 
    6767 
    68 #include "xpm/chatChangeFg.xpm" 
    6968#include "xpm/chatChangeBg.xpm" 
    7069#include "xpm/sendThroughServer.xpm" 
    … …  
    201200  pushToolTip(myEmoticon, tr("Insert smileys")); 
    202201 
    203   myForeColor = myToolBar->addAction(QPixmap(chatChangeFg_xpm), "Text Color...", this, SLOT(slotSetForegroundICQColor())); 
     202  myForeColor = myToolBar->addAction(iconman->getIcon(IconManager::TextColorIcon), "Text Color...", 
     203      this, SLOT(slotSetForegroundICQColor())); 
    204204  myForeColor->setShortcut(Qt::ALT + Qt::Key_T); 
    205205  pushToolTip(myForeColor, tr("Change text color")); 
    206206 
    207   myBackColor = myToolBar->addAction(QPixmap(chatChangeBg_xpm), "Background Color...", this, SLOT(slotSetBackgroundICQColor())); 
     207  myBackColor = myToolBar->addAction(QPixmap(chatChangeBg_xpm), "Background Color...", 
     208      this, SLOT(slotSetBackgroundICQColor())); 
    208209  myBackColor->setShortcut(Qt::ALT + Qt::Key_B); 
    209210  pushToolTip(myBackColor, tr("Change background color")); 

  • branches/qt-gui_qt4/src/xpm/barTextColor.xpm

    r4526 r5549  
    11/* XPM */ 
    2 static const char * chatChangeFg_xpm[] = { 
     2static const char * barTextColor_xpm[] = { 
    33"16 16 49 1", 
    44"   c None",