Merging changes from BRANCH_1_0 to HEAD

1 files changed, 17 insertions, 12 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 34bf7f1..6819085 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -2,4 +2,5 @@
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2003 Stefan Eilers (eilers.stefan@epost.de)
 **
-** This file is part of Qt Palmtop Environment.
+** This file is part of the Open Palmtop Environment (see www.opie.info).
 **
@@ -15,4 +16,2 @@
 **
-** OContact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
 **
@@ -115,3 +114,3 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 	// View Icons
-	m_tableViewButton  = new QAction( tr( "List" ), Resource::loadPixmap( "addressbook/weeklst" ),
+	m_tableViewButton  = new QAction( tr( "List" ), Resource::loadPixmap( "addressbook/listview" ),
 					  QString::null, 0, this, 0 );
@@ -120,3 +119,3 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 	m_tableViewButton->addTo( listTools );
-	m_cardViewButton = new QAction( tr( "Card" ), Resource::loadPixmap( "day" ),  QString::null, 0, this, 0 );
+	m_cardViewButton = new QAction( tr( "Card" ), Resource::loadPixmap( "addressbook/cardview" ),  QString::null, 0, this, 0 );
 	connect( m_cardViewButton, SIGNAL( activated() ), this, SLOT( slotCardView() ) );
@@ -654,3 +653,5 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 {
-	qWarning("Receiving QCop-Call with message %s", QString( msg ).latin1() );
+        bool needShow = FALSE;
+        qWarning("Receiving QCop-Call with message %s", QString( msg ).latin1() );
+
 
@@ -691,2 +692,3 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 	} else if ( msg == "show(int)" ) {
+                raise();
 		QDataStream stream(data,IO_ReadOnly);
@@ -707,5 +709,5 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 		slotViewSwitched ( AbView::CardView );
-		
-		showMaximized();
-		qApp->exec();
+
+	        needShow = true;
+
 
@@ -726,3 +728,6 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 		slotViewEdit();
-	} 
+	}
+
+        if (needShow)
+            QPEApplication::setKeepRunning();
 
@@ -902,3 +907,3 @@ void AddressbookWindow::slotNotFound()
 	QMessageBox::information( this, tr( "Not Found" ),
-				  tr( "Unable to find a contact for this \n search pattern!" ) );
+				 "<qt>" + tr( "Unable to find a contact for this search pattern!" ) + "</qt>" );
 
@@ -952,3 +957,3 @@ void AddressbookWindow::slotSetCategory( int c )
 				cat = "Unfiled";
-				qWarning ("Unfiled selected!!!");
+				qWarning ("Unfiled selected!");
 			}else{