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
@@ -1,23 +1,22 @@
 /**********************************************************************
 ** 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).
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
-** OContact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_FD
 
 #include "contacteditor.h"
@@ -110,18 +109,18 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 	listTools = new QPEToolBar( this, "list operations" );
 	listTools->setHorizontalStretchable( true );
 	addToolBar( listTools );
 	moveToolBar( listTools, m_config.getToolBarPos() );
 
 	// 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 );
 	connect( m_tableViewButton, SIGNAL( activated() ), this, SLOT( slotListView() ) );
 	m_tableViewButton->setToggleAction( true );
 	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() ) );
 	m_cardViewButton->setToggleAction( true );
 	m_cardViewButton->addTo( listTools );
 
 	listTools->addSeparator();
 
@@ -649,13 +648,15 @@ static void parseName( const QString& name, QString *first, QString *middle,
 
 }
 
 
 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() );
+
 
 	if (msg == "editPersonal()") {
 		editPersonal();
 	} else if (msg == "editPersonalAndClose()") {
 		editPersonal();
 		close();
@@ -686,12 +687,13 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 
 		Ir *ir = new Ir( this );
 		connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
 		QString description = "mycard.vcf";
 		ir->send( beamFilename, description, "text/x-vCard" );
 	} else if ( msg == "show(int)" ) {
+                raise();
 		QDataStream stream(data,IO_ReadOnly);
 		int uid;
 		stream >> uid;
 
 		qWarning( "Showing uid: %d" , uid );
 
@@ -702,15 +704,15 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 		}
 
 		// Reset category and show as card..
 		m_abView -> setShowByCategory( QString::null );
 		m_abView -> setCurrentUid( uid );
 		slotViewSwitched ( AbView::CardView );
-		
-		showMaximized();
-		qApp->exec();
+
+	        needShow = true;
+
 
 	} else if ( msg == "edit(int)" ) {
 		QDataStream stream(data,IO_ReadOnly);
 		int uid;
 		stream >> uid;
 
@@ -721,13 +723,16 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 		}
 
 		// Reset category and edit..
 		m_abView -> setShowByCategory( QString::null );
 		m_abView -> setCurrentUid( uid );
 		slotViewEdit();
-	} 
+	}
+
+        if (needShow)
+            QPEApplication::setKeepRunning();
 
 }
 
 void AddressbookWindow::editEntry( EntryMode entryMode )
 {
 	OContact entry;
@@ -897,13 +902,13 @@ void AddressbookWindow::slotSave()
 
 
 void AddressbookWindow::slotNotFound()
 {
 	qWarning("Got notfound signal!");
 	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>" );
 
 
 }
 void AddressbookWindow::slotWrapAround()
 {
 	qWarning("Got wrap signal!");
@@ -947,13 +952,13 @@ void AddressbookWindow::slotSetCategory( int c )
 // 				book = tr( "Personal" );
 // 				view = AbView:: PersonalView;
 			}else if ( i == 3 ){ // default All Categories
 				cat = QString::null;
 			}else if ( i == (unsigned int)catMenu->count() - 1 ){ // last menu option (seperator is counted, too) will be Unfiled
 				cat = "Unfiled";
-				qWarning ("Unfiled selected!!!");
+				qWarning ("Unfiled selected!");
 			}else{
 				cat = m_abView->categories()[i - 4];
 			}
 		}
 	}