Changeset 5547

Show
Ignore:
Timestamp:
10/04/07 13:15:05 (14 months ago)
Author:
eugene
Message:
  • Moved off Multiple Recipients icon into IconManager?;
  • Added this type of icon into kde iconset.
Location:
branches/qt-gui_qt4
Files:
1 added
4 modified
1 moved

Legend:

Unmodified
Added
Removed

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

    r4629 r5547  
    3131MSNOccupied = msn_occupied.png 
    3232GPGKey = gpgkey.png 
     33MultipleRec = multiplerec.png 

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

    r5546 r5547  
    2929#include "gui-defines.h" 
    3030 
     31#include "xpm/barMultipleRec.xpm" 
    3132#include "xpm/history.xpm" 
    3233#include "xpm/info.xpm" 
    … …  
    157158 
    158159  // General icons 
    159   LOAD2_ICON("SecureOff",        SecureOffIcon, secure_off_xpm); 
    160   LOAD2_ICON("SecureOn",         SecureOnIcon, secure_on_xpm); 
    161   LOAD2_ICON("History",          HistoryIcon, history_xpm); 
    162   LOAD2_ICON("Info",             InfoIcon, info_xpm); 
    163   LOAD2_ICON("Remove",           RemoveIcon, remove_xpm); 
    164   LOAD2_ICON("Search",           SearchIcon, search_xpm); 
     160  LOAD2_ICON("SecureOff",       SecureOffIcon, secure_off_xpm); 
     161  LOAD2_ICON("SecureOn",        SecureOnIcon, secure_on_xpm); 
     162  LOAD2_ICON("History",         HistoryIcon, history_xpm); 
     163  LOAD2_ICON("Info",            InfoIcon, info_xpm); 
     164  LOAD2_ICON("Remove",          RemoveIcon, remove_xpm); 
     165  LOAD2_ICON("Search",          SearchIcon, search_xpm); 
    165166#ifdef HAVE_LIBGPGME 
    166167  LOAD2_ICON("GPGKey",          GpgKeyIcon, pixKeyEnabled_xpm); 
    167168#endif 
     169 
     170  // Toolbar icons 
     171  LOAD2_ICON("MultipleRec",     MultipleRecIcon, barMultipleRec_xpm); 
    168172 
    169173#undef LOAD_ICON 

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

    r5546 r5547  
    8484    GpgKeyEnabledIcon, 
    8585    GpgKeyDisabledIcon, 
     86 
     87    // Toolbar icons 
     88    MultipleRecIcon, 
    8689  }; 
    8790 

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

    r5528 r5547  
    6868#include "xpm/chatChangeFg.xpm" 
    6969#include "xpm/chatChangeBg.xpm" 
    70 #include "xpm/multipleRecipients.xpm" 
    7170#include "xpm/sendThroughServer.xpm" 
    7271#include "xpm/smile.xpm" 
    … …  
    190189  chkUrgent->setCheckable(true); 
    191190 
    192   chkMass = myToolBar->addAction(QPixmap(multipleRecipients_xpm), tr("Multiple Recipients")); 
     191  chkMass = myToolBar->addAction(iconman->getIcon(IconManager::MultipleRecIcon), tr("Multiple Recipients")); 
    193192  chkMass->setShortcut(Qt::ALT + Qt::Key_U); 
    194193  pushToolTip(chkMass, tr("Multiple recipients")); 

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

    r5228 r5547  
    11/* XPM */ 
    2 static const char *multipleRecipients_xpm[] = { 
     2static const char *barMultipleRec_xpm[] = { 
    33/* columns rows colors chars-per-pixel */ 
    44"16 16 14 1",