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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/oscar
From:       Roman Jarosz <kedgedev () centrum ! cz>
Date:       2008-05-31 20:42:53
Message-ID: 1212266573.874739.16139.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 814981 by rjarosz:

Fix "Edit User Info" icon.
Disable actions when we are offline.



 M  +4 -1      aim/aimaccount.cpp  
 M  +2 -1      icq/icqaccount.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/oscar/aim/aimaccount.cpp #814980:814981
@@ -232,7 +232,7 @@
 	mJoinChatAction = new KAction( i18n( "Join Chat..." ), this );
 	QObject::connect( mJoinChatAction, SIGNAL(triggered(bool)), this, SLOT(slotJoinChat()) );
 	
-	mEditInfoAction = new KAction( KIcon("identity"), i18n( "Edit User Info..." ), this );
+	mEditInfoAction = new KAction( KIcon("user-properties"), i18n( "Edit User Info..." ), this );
 	QObject::connect( mEditInfoAction, SIGNAL(triggered(bool)), this, SLOT(slotEditInfo()) );
 	
 	mActionInvisible = new KToggleAction( i18n( "In&visible" ), this );
@@ -330,7 +330,10 @@
 
 	actionMenu->addSeparator();
 
+	mJoinChatAction->setEnabled( isConnected() );
 	actionMenu->addAction( mJoinChatAction );
+
+	mEditInfoAction->setEnabled( isConnected() );
 	actionMenu->addAction( mEditInfoAction );
 
 	Oscar::Presence pres( presence().type(), presence().flags() | Oscar::Presence::Invisible );
--- trunk/KDE/kdenetwork/kopete/protocols/oscar/icq/icqaccount.cpp #814980:814981
@@ -132,7 +132,7 @@
 	                  this, SLOT( slotGotAuthRequest( const QString&, const QString& ) ) );
 
 	// Create actions
-	mEditInfoAction = new KAction( KIcon("identity"), i18n( "Edit User Info..." ), this );
+	mEditInfoAction = new KAction( KIcon("user-properties"), i18n( "Edit User Info..." ), this );
 	QObject::connect( mEditInfoAction, SIGNAL(triggered(bool)), this, SLOT(slotUserInfo()) );
 	
 	mActionInvisible = new KToggleAction( i18n( "In&visible" ), this );
@@ -171,6 +171,7 @@
 
 	actionMenu->addSeparator();
 
+	mEditInfoAction->setEnabled( isConnected() );
 	actionMenu->addAction( mEditInfoAction );
 
 	Oscar::Presence pres( presence().type(), presence().flags() | Oscar::Presence::Invisible );
[prev in list] [next in list] [prev in thread] [next in thread]