Diffstat (limited to 'core/pim/addressbook/addressbook.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | core/pim/addressbook/addressbook.cpp | 29 |
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,6 +1,7 @@ /********************************************************************** ** 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 @@ -14,6 +15,4 @@ ** 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. ** **********************************************************************/ @@ -114,10 +113,10 @@ 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 ); 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 ); @@ -653,5 +652,7 @@ 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()") { @@ -690,4 +691,5 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) ir->send( beamFilename, description, "text/x-vCard" ); } else if ( msg == "show(int)" ) { + raise(); QDataStream stream(data,IO_ReadOnly); int uid; @@ -706,7 +708,7 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) m_abView -> setCurrentUid( uid ); slotViewSwitched ( AbView::CardView ); - - showMaximized(); - qApp->exec(); + + needShow = true; + } else if ( msg == "edit(int)" ) { @@ -725,5 +727,8 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) m_abView -> setCurrentUid( uid ); slotViewEdit(); - } + } + + if (needShow) + QPEApplication::setKeepRunning(); } @@ -901,5 +906,5 @@ 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>" ); @@ -951,5 +956,5 @@ void AddressbookWindow::slotSetCategory( int c ) }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]; |