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

List:       kde-commits
Subject:    kdenonbeta/kopete/libkopete/ui
From:       Olivier Goffart <ogoffart () tiscalinet ! be>
Date:       2003-03-19 17:20:45
[Download RAW message or body]

CVS commit by ogoffart: 

Color the tab in gray with Low message (Group chat or internal messages)


  M +26 -8     chatview.cpp   1.211
  M +1 -1      chatview.h   1.96


--- kdenonbeta/kopete/libkopete/ui/chatview.cpp  #1.210:1.211
@@ -330,10 +330,16 @@ void ChatView::setTabState( KopeteTabSta
                                 break;
 
-                        case Changed:
+                        case Message:
                                 if( m_tabState != Highlighted )
                                         m_tabBar->setLabelTextColor( this, Qt::red \
);  break;
 
+                        case Changed:
+                                if( m_tabState != Highlighted && m_tabState != \
Message  ) +                                        m_tabBar->setLabelTextColor( \
this, Qt::darkGray ); +                                break;
+
                         case Typing:
+                                if( m_tabState != Highlighted && m_tabState != \
                Message  )
                                 m_tabBar->setLabelTextColor( this, Qt::darkGreen );
                                 break;
@@ -345,6 +351,7 @@ void ChatView::setTabState( KopeteTabSta
                 }
 
-                if( newState != Typing && ( newState != Changed || m_tabState != \
Highlighted ) ) +                if( newState != Typing &&  (  newState!=Changed || \
(m_tabState != Message && m_tabState != Highlighted) ) && ( newState != Message ||  \
m_tabState != Highlighted ) )  m_tabState = newState;
+
         }
 }
@@ -671,8 +677,20 @@ void ChatView::messageReceived(KopeteMes
         KopeteMessage m = message;
         addChatMessage(m);
-        if( !isActive && m.importance()==KopeteMessage::Highlight )
+        if( !isActive )
+        {
+                switch (m.importance())
+                {
+                        case KopeteMessage::Highlight:
                 setTabState( Highlighted );
-        else if( !isActive )
+                        case KopeteMessage::Normal:
+                                if(m.direction() == KopeteMessage::Inbound || \
m.direction() == KopeteMessage::Action) +                                {
+                                        setTabState( Message );
+                                        break;
+                                }
+                        default:
                 setTabState( Changed );
+                }
+        }
 
         if( !m_sendInProgress || message.from() != m_manager->user() )

--- kdenonbeta/kopete/libkopete/ui/chatview.h  #1.95:1.96
@@ -358,5 +358,5 @@ private slots:
 
 private:
-        enum KopeteTabState { Normal , Highlighted , Changed , Typing , Undefined };
+        enum KopeteTabState { Normal , Highlighted , Changed , Typing , Message , \
Undefined };  
         QPtrDict<QTimer> m_remoteTypingMap;


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