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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/kopete
From:       Matt Broadstone <mbroadst () gmail ! com>
Date:       2005-08-27 6:03:20
Message-ID: 1125122600.899850.12022.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 453777 by mbroadst:

Get-Kopete-Building

 M  +2 -1      contactlist/kopetecontactlistview.cpp  
 M  +1 -1      contactlist/kopetelviprops.cpp  
 M  +2 -2      kopeteapplication.cpp  
 M  +1 -1      kopeteballoon.cpp  
 M  +7 -7      kopetewindow.cpp  
 M  +8 -8      systemtray.cpp  
 M  +2 -2      systemtray.h  


--- trunk/KDE/kdenetwork/kopete/kopete/contactlist/kopetecontactlistview.cpp \
#453776:453777 @@ -42,6 +42,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
+#include <kicondialog.h>
 #include <klocale.h>
 #include <kmainwindow.h>
 #include <kmessagebox.h>
@@ -1219,7 +1220,7 @@
 void KopeteContactListView::contentsMousePressEvent( QMouseEvent *e )
 {
 	KListView::contentsMousePressEvent( e );
-	if (e->button() == LeftButton )
+	if (e->button() == Qt::LeftButton )
 	{
 		QPoint p=contentsToViewport(e->pos());
 		Q3ListViewItem *i=itemAt( p );
--- trunk/KDE/kdenetwork/kopete/kopete/contactlist/kopetelviprops.cpp #453776:453777
@@ -377,7 +377,7 @@
 		break;
 	}
 	if( !photo.isNull() )
-		mainWidget->photoLabel->setPixmap(QPixmap(photo.smoothScale( 64, 92, \
QImage::ScaleMin ))); +		mainWidget->photoLabel->setPixmap(QPixmap(photo.scaled(64, \
92)));  }
 
 Kopete::MetaContact::PropertySource KopeteMetaLVIProps::selectedNameSource() const
--- trunk/KDE/kdenetwork/kopete/kopete/kopeteapplication.cpp #453776:453777
@@ -214,8 +214,8 @@
 	if ( args->isSet( "connect" )  && KopetePrefs::prefs()->autoConnect() )
 		Kopete::AccountManager::self()->connectAll();
 
-	QCStringList connectArgs = args->getOptionList( "autoconnect" );
-	for ( QCStringList::ConstIterator i = connectArgs.begin(); i != connectArgs.end(); \
++i ) +	QByteArrayList connectArgs = args->getOptionList( "autoconnect" );
+	for ( QByteArrayList::ConstIterator i = connectArgs.begin(); i != \
connectArgs.end(); ++i )  {
 		QString id = QString::fromLatin1( *i );
 
--- trunk/KDE/kdenetwork/kopete/kopete/kopeteballoon.cpp #453776:453777
@@ -109,7 +109,7 @@
 	// END Layout2
 
 	setPalette(QToolTip::palette());
-	setAutoMask(TRUE);
+	//setAutoMask(TRUE);
 
 	connect(mViewButton, SIGNAL(clicked()),
 		this, SIGNAL(signalButtonClicked()));
--- trunk/KDE/kdenetwork/kopete/kopete/kopetewindow.cpp #453776:453777
@@ -245,9 +245,9 @@
 	KStdAction::configureToolbars( this, SLOT(slotConfToolbar()), actionCollection() );
 	KStdAction::configureNotifications(this, SLOT(slotConfNotifications()), \
actionCollection(), "settings_notifications" );  
-	actionShowOffliners = new KToggleAction( i18n( "Show Offline &Users" ), "viewmag", \
CTRL + Key_U, +	actionShowOffliners = new KToggleAction( i18n( "Show Offline &Users" \
), "viewmag", Qt::CTRL + Qt::Key_U,  this, SLOT( slotToggleShowOffliners() ), \
                actionCollection(), "settings_show_offliners" );
-	actionShowEmptyGroups = new KToggleAction( i18n( "Show Empty &Groups" ), \
"folder_green", CTRL + Key_G, +	actionShowEmptyGroups = new KToggleAction( i18n( \
"Show Empty &Groups" ), "folder_green", Qt::CTRL + Qt::Key_G,  this, SLOT( \
slotToggleShowEmptyGroups() ), actionCollection(), "settings_show_empty_groups" );  
 	actionShowOffliners->setCheckedState(i18n("Hide Offline &Users"));
@@ -279,13 +279,13 @@
 
 	globalAccel = new KGlobalAccel( this );
 	globalAccel->insert( QString::fromLatin1("Read Message"), i18n("Read Message"), \
                i18n("Read the next pending message"),
-		CTRL+SHIFT+Key_I, KKey::QtWIN+CTRL+Key_I, Kopete::ChatSessionManager::self(), \
SLOT(slotReadMessage()) ); +		Qt::CTRL + Qt::SHIFT + Qt::Key_I, KKey::QtWIN + \
Qt::CTRL + Qt::Key_I, Kopete::ChatSessionManager::self(), SLOT(slotReadMessage()) );  \
  globalAccel->insert( QString::fromLatin1("Show/Hide Contact List"), i18n("Show/Hide \
                Contact List"), i18n("Show or hide the contact list"),
-		CTRL+SHIFT+Key_A, KKey::QtWIN+CTRL+Key_A, this, SLOT(slotShowHide()) );
+		Qt::CTRL + Qt::SHIFT + Qt::Key_A, KKey::QtWIN + Qt::CTRL + Qt::Key_A, this, \
SLOT(slotShowHide()) );  
 	globalAccel->insert( QString::fromLatin1("Set Away/Back"), i18n("Set Away/Back"), \
                i18n("Sets away from keyboard or sets back"),
-		CTRL+SHIFT+Key_W, KKey::QtWIN+CTRL+SHIFT+Key_W, this, SLOT(slotToggleAway()) );
+		Qt::CTRL + Qt::SHIFT + Qt::Key_W, KKey::QtWIN + Qt::CTRL + Qt::SHIFT + Qt::Key_W, \
this, SLOT(slotToggleAway()) );  
 	globalAccel->readSettings();
 	globalAccel->updateConnections();
@@ -702,9 +702,9 @@
 	// we can't use the SmallIcon() method directly
 	KIconLoader *loader = KGlobal::instance()->iconLoader();
 
-	QMovie mv = loader->loadMovie( status.overlayIcons().first(), KIcon::Small );
+	QMovie *mv = new QMovie(loader->loadMovie( status.overlayIcons().first(), \
KIcon::Small ));  
-	if ( mv.isNull() )
+	if ( mv->isNull() )
 	{
 		// No movie found, fallback to pixmap
 		// Get the icon for our status
--- trunk/KDE/kdenetwork/kopete/kopete/systemtray.cpp #453776:453777
@@ -104,8 +104,8 @@
 void KopeteSystemTray::mousePressEvent( QMouseEvent *me )
 {
 	if (
-		(me->button() == QEvent::MidButton ||
-			(me->button() == QEvent::LeftButton && \
KopetePrefs::prefs()->trayflashNotifyLeftClickOpensMessage())) && +		(me->button() == \
Qt::MidButton || +			(me->button() == Qt::LeftButton && \
KopetePrefs::prefs()->trayflashNotifyLeftClickOpensMessage())) &&  mIsBlinking )
 	{
 		mouseDoubleClickEvent( me );
@@ -157,18 +157,18 @@
 	}
 }
 
-void KopeteSystemTray::startBlink( const QMovie &movie )
+void KopeteSystemTray::startBlink( QMovie *movie )
 {
 	//kdDebug( 14010 ) << k_funcinfo << "starting movie." << endl;
-	const_cast<QMovie &>( movie ).unpause();
+	const_cast<QMovie *>( movie )->unpause();
 	setMovie( movie );
 	mIsBlinking = true;
 }
 
 void KopeteSystemTray::startBlink()
 {
-	if ( mMovie.isNull() )
-		mMovie = KGlobal::iconLoader()->loadMovie( QString::fromLatin1( "newmessage" ), \
KIcon::Panel ); +	if ( mMovie->isNull() )
+		mMovie = new QMovie(KGlobal::iconLoader()->loadMovie( QString::fromLatin1( \
"newmessage" ), KIcon::Panel ));  
 	startBlink( mMovie );
 }
@@ -180,8 +180,8 @@
 	else if ( mBlinkTimer->isActive() )
 		mBlinkTimer->stop();
 
-	if ( !mMovie.isNull() )
-		mMovie.pause();
+	if ( !mMovie->isValid() )
+		mMovie->pause();
 
 	mIsBlinkIcon = false;
 	mIsBlinking = false;
--- trunk/KDE/kdenetwork/kopete/kopete/systemtray.h #453776:453777
@@ -57,7 +57,7 @@
 	// One method, multiple interfaces :-)
 	void startBlink( const QString &icon );
 	void startBlink( const QPixmap &icon );
-	void startBlink( const QMovie &movie );
+	void startBlink( QMovie *movie );
 	void startBlink();
 
 	void stopBlink();
@@ -87,7 +87,7 @@
 	QTimer *mBlinkTimer;
 	QPixmap mKopeteIcon;
 	QPixmap mBlinkIcon;
-	QMovie mMovie;
+	QMovie *mMovie;
 
 	bool mIsBlinkIcon;
 	bool mIsBlinking;


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