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

List:       kde-commits
Subject:    kdenonbeta/kopete/libkopete/ui
From:       Richard Smith <kde () metafoo ! co ! uk>
Date:       2003-03-21 0:10:25
[Download RAW message or body]

CVS commit by lilachaze: 

More chatview cleanups


  M +4 -33     kopetechatwindow.cpp   1.203


--- kdenonbeta/kopete/libkopete/ui/kopetechatwindow.cpp  #1.202:1.203
@@ -448,5 +448,4 @@ void KopeteChatWindow::createTabBar()
                         m_tabBar->showPage( m_activeView );
 
-                actionTabPlacementMenu->setEnabled( true );
                 KGlobal::config()->setGroup( \
                QString::fromLatin1("ChatWindowSettings") );
                 int tabPosition = KGlobal::config()->readNumEntry( \
QString::fromLatin1("Tab Placement") , 0 ); @@ -488,5 +487,4 @@ void \
KopeteChatWindow::deleteTabBar()  setPrimaryChatView( chatViewList.first() );
         
-                actionTabPlacementMenu->setEnabled( false );
                 m_tabBar->deleteLater();
                 m_tabBar = 0L;
@@ -511,4 +509,6 @@ void KopeteChatWindow::attachChatView( C
         connect( newView, SIGNAL(captionChanged( bool)), this, \
                SLOT(slotSetCaption(bool)) );
         connect( newView, SIGNAL(messageSuccess( ChatView* )), this, \
SLOT(slotStopAnimation( ChatView* )) ); +
+        checkDetachEnable();
 }
 
@@ -554,10 +554,10 @@ void KopeteChatWindow::detachChatView( C
         }
 
-        checkDetachEnable();
-
         if( chatViewList.isEmpty() )
                 close();
         else if( chatViewList.count() == 1)
                 deleteTabBar();
+
+        checkDetachEnable();
 }
 
@@ -672,6 +672,4 @@ void KopeteChatWindow::setActiveView( QW
         setStatus( m_activeView->status() );
         m_activeView->setFocus();
-
-        checkDetachEnable();
 }
 
@@ -683,32 +681,5 @@ void KopeteChatWindow::slotChatClosed()
                 m_activeView->closeView();
 }
-/*
-void KopeteChatWindow::closeChat( ChatView *closedView )
-{
-        kdDebug(14010) << k_funcinfo << endl;
-        if( closedView == m_activeView )
-                m_activeView = 0L;
-
-        chatViewList.removeRef( closedView );
 
-        if( chatViewList.isEmpty() )
-        {
-                // We can't delete this here, because we return to close() where we
-                // still need to be able to access at least chatViewList.
-                deleteLater();
-        }
-        else
-        {
-                if( m_tabBar )
-                {
-                        m_tabBar->removePage( closedView );
-                        checkDetachEnable();
-                }
-
-                if( m_tabBar && chatViewList.count() == 1 )
-                        deleteTabBar();
-        }
-}
-*/
 void KopeteChatWindow::slotPrepareDetachMenu(void)
 {


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