[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/kopete
From:       Will Stephenson <lists () stevello ! free-online ! co ! uk>
Date:       2003-07-31 20:43:28
[Download RAW message or body]

CVS commit by wstephens: 

Move icons to the automagic make structure.  The code changes are necessary because \
we load icons using SmallIcon() et al - since we only have small icons at the moment, \
UserIcon() failed to load anything.


  A            icons/hi16-action-emoticon.png   1.1
  A            icons/hi16-action-history.png   1.1
  A            icons/hi16-action-metacontact_away.png   1.1
  A            icons/hi16-action-metacontact_offline.png   1.1
  A            icons/hi16-action-metacontact_online.png   1.1
  A            icons/hi16-action-metacontact_unknown.png   1.1
  A            icons/hi16-action-newmsg.png   1.1
  A            icons/hi16-action-status_unknown.png   1.1
  M +1 -1      kopete/contactlist/kopetecontactlistview.cpp   1.27
  M +4 -4      kopete/contactlist/kopetemetacontactlvi.cpp   1.30
  M +1 -5      pics/Makefile.am   1.14
  R            pics/addside.png   1.1
  R            pics/emoticon.png   1.1
  R            pics/history.png   1.1
  R            pics/metacontact_away.png   1.1
  R            pics/metacontact_offline.png   1.1
  R            pics/metacontact_online.png   1.1
  R            pics/metacontact_unknown.png   1.3
  R            pics/newmsg.png   1.1
  R            pics/status_unknown.png   1.1


--- kdenonbeta/kopete/pics/Makefile.am  #1.13:1.14
@@ -1,7 +1,3 @@
 SUBDIRS = emoticons
 icondir = $(kde_datadir)/kopete/pics
-icon_DATA = newmsg.png newmessage.mng history.png metacontact_online.png \
-            metacontact_offline.png metacontact_away.png \
-            metacontact_unknown.png emoticon.png addside.png \
-            status_unknown.png
-
+icon_DATA = newmessage.mng

--- kdenonbeta/kopete/kopete/contactlist/kopetecontactlistview.cpp  #1.26:1.27
@@ -1375,5 +1375,5 @@ QDragObject *KopeteContactListView::drag
                                 //QPainter p( pm );
                                 //source_metaLVI->paintCell( p, cg?, width(), 0, 0 \
                );
-                                pm = UserIcon( \
source_metaLVI->metaContact()->statusIcon() ); +                                pm = \
SmallIcon( source_metaLVI->metaContact()->statusIcon() );  }
                 }

--- kdenonbeta/kopete/kopete/contactlist/kopetemetacontactlvi.cpp  #1.29:1.30
@@ -212,5 +212,5 @@ void KopeteMetaContactLVI::slotUpdateIco
         KopetePrefs *prefs = KopetePrefs::prefs();
 
-        QPixmap statusIcon = UserIcon( m_metaContact->statusIcon() );
+        QPixmap statusIcon = SmallIcon( m_metaContact->statusIcon() );
         if(
                 prefs->greyIdleMetaContacts() &&
@@ -492,5 +492,5 @@ bool KopeteMetaContactLVI::isGrouped() c
 void KopeteMetaContactLVI::slotIdleStateChanged()
 {
-        QPixmap theIcon = UserIcon( m_metaContact->statusIcon() );
+        QPixmap theIcon = SmallIcon( m_metaContact->statusIcon() );
         if ( KopetePrefs::prefs()->greyIdleMetaContacts() && ( \
m_metaContact->idleState() == KopeteMetaContact::Idle ) )  {
@@ -522,5 +522,5 @@ void KopeteMetaContactLVI::slotBlink()
         if (mIsBlinkIcon)
         {
-                setPixmap(0,UserIcon(m_metaContact->statusIcon()));
+                setPixmap(0,SmallIcon(m_metaContact->statusIcon()));
                 mIsBlinkIcon = false;
         }
@@ -539,5 +539,5 @@ void KopeteMetaContactLVI::slotEventDone
                 mBlinkTimer->stop();
         }
-        setPixmap(0,UserIcon(m_metaContact->statusIcon()));
+        setPixmap(0,SmallIcon(m_metaContact->statusIcon()));
         mIsBlinkIcon = false;
 }


[prev in list] [next in list] [prev in thread] [next in thread]