| -rw-r--r-- | core/pim/addressbook/addressbook.cpp | 29 | ||||
| -rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 2 | ||||
| -rw-r--r-- | core/pim/addressbook/opie-addressbook.control | 6 | ||||
| -rw-r--r-- | core/pim/addressbook/version.h | 6 |
4 files changed, 24 insertions, 19 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{ diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index ce14f98..9d1a1c7 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp @@ -599,3 +599,3 @@ void ContactEditor::init() { - l = new QLabel( mapIdToStr[mapStrToID[*it]].utf8() , container ); + l = new QLabel( mapIdToStr[mapStrToID[*it]], container ); listName.append( l ); diff --git a/core/pim/addressbook/opie-addressbook.control b/core/pim/addressbook/opie-addressbook.control index f06fa91..d949bd4 100644 --- a/core/pim/addressbook/opie-addressbook.control +++ b/core/pim/addressbook/opie-addressbook.control @@ -1,3 +1,3 @@ Package: opie-addressbook -Files: bin/addressbook apps/1Pim/addressbook.desktop pics/addressbook/*.png +Files: bin/addressbook apps/1Pim/addressbook.desktop Priority: optional @@ -7,5 +7,5 @@ Maintainer: Stefan Eilers <eilers.stefan@epost.de> Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION -Depends: task-opie-minimal, libopie1 +Depends: task-opie-minimal, libopie1, opie-pics Description: Contacts A simple addressbook for the Opie environment. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/pim/addressbook/version.h b/core/pim/addressbook/version.h index 4c93584..9621826 100644 --- a/core/pim/addressbook/version.h +++ b/core/pim/addressbook/version.h @@ -3,5 +3,5 @@ -#define MAINVERSION "0" -#define SUBVERSION "9" -#define PATCHVERSION "5" +#define MAINVERSION "1" +#define SUBVERSION "0" +#define PATCHVERSION "0" |